!4 PC显示发票信息问题处理,结算页面商品宽度调整,后台发票开具条件增加已发货可以开具发票的按钮

Merge pull request !4 from chopper711/lifenlong
This commit is contained in:
chopper711
2021-10-26 02:40:06 +00:00
committed by Gitee
10 changed files with 163 additions and 26 deletions

View File

@@ -18,6 +18,7 @@ import {
} from "@/libs/axios";
import { setStore, getStore, removeStore } from "@/libs/storage";
import i18nBox from '@/views/lili-components/i18n-translate'
import util from "@/libs/util";
@@ -34,7 +35,7 @@ Vue.use(VueLazyload, {
});
Vue.use(ViewUI);
Vue.component('i18nBox',i18nBox)
Vue.component("vue-qr", vueQr); //此处将vue-qr添加为全局组件
// 挂载全局使用的方法

View File

@@ -0,0 +1,55 @@
<template>
<div>
<Button @click="enable = true">语言设定</Button>
<Modal v-model="enable" draggable sticky scrollable :mask="false" :title="title">
<Tabs closable type="card" @on-tab-remove="handleTabRemove" :value="language[0].title">
<TabPane v-for="(item,index) in language" :key="index" :label="item.title" :name="item.title">
<Input v-model="item.___i18n" />
</TabPane>
</Tabs>
</Modal>
</div>
</template>
<script>
import {language} from "./languages";
export default {
/**
* tabs 循环的语言内容格式 [{'title':'test','value':'val'}]
*/
props: {
value: {
type: null,
default: "",
},
},
watch: {
language: {
handler(val) {
this.$emit("language", { language: [...val], val: this.value });
},
deep: true,
},
},
data() {
return {
language,
tabVal: "",
enable: false, //是否开启modal
title: "转换语言",
};
},
methods: {
// 删除tab标签将没有用的语音进行删除
handleTabRemove(tab) {
this.language = this.language.filter((item) => {
return item.value != tab;
});
},
},
};
</script>
<style lang="scss" scoped>
</style>

View File

@@ -0,0 +1 @@
export const language = [{ title: "中文",value:1 }, { title: "英文" ,value:2}];

View File

@@ -85,7 +85,7 @@ export default {
{
title: "发票内容",
key: "receiptContent",
minWidth: 120,
minWidth: 90,
tooltip: true,
render: (h, params) => {
return h("div", params.row.receiptContent || "暂未填写");
@@ -172,10 +172,12 @@ export default {
},
attrs: {
disabled:
params.row.orderStatus == "COMPLETED" &&
params.row.receiptStatus == 0
? false
: true,
!(
(params.row.orderStatus === "COMPLETED"
||params.row.orderStatus === "DELIVERED")
&&
params.row.receiptStatus === 0),
},
style: {
marginRight: "5px",