diff --git a/public/static/tpl/转件管理导出模板.xlsx b/public/static/tpl/转件管理导出模板.xlsx new file mode 100644 index 00000000..2f1f33c4 Binary files /dev/null and b/public/static/tpl/转件管理导出模板.xlsx differ diff --git a/src/utils/TanexPrinterSdk.js b/src/utils/TanexPrinterSdk.js index 380a0763..6894cf7e 100644 --- a/src/utils/TanexPrinterSdk.js +++ b/src/utils/TanexPrinterSdk.js @@ -296,6 +296,7 @@ class TanexPrinterSdk { let printData=[{ "tplCode":tplCode, "printerName":printerName, + "printManCode":this.$store.getters.empCode, "orderList":orderList.toString() }] printCmd['Data']=printData @@ -314,6 +315,7 @@ class TanexPrinterSdk { let printData=[{ "tplCode":tplCode, "printerName":printerName, + "printManCode":this.$store.getters.empCode, "orderList":orderList.toString() }] @@ -493,7 +495,7 @@ class TanexPrinterSdk { setTimeout(() => { this.connect() }, 1000 ) - + } } diff --git a/src/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue b/src/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue index 438937f4..8f242f4d 100644 --- a/src/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue +++ b/src/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue @@ -9,7 +9,7 @@ v-model="svalue" :placeholder="placeholder" auto-complete="false" - + :disabled="disabled" no-data-text="" @blur="onBlur" diff --git a/src/views/emis/emisWaybill/dispatchWaybillList.vue b/src/views/emis/emisWaybill/dispatchWaybillList.vue index c7485e29..3fc3fa4b 100644 --- a/src/views/emis/emisWaybill/dispatchWaybillList.vue +++ b/src/views/emis/emisWaybill/dispatchWaybillList.vue @@ -39,7 +39,8 @@ - + + diff --git a/src/views/emis/emisWaybill/sendWaybillList.vue b/src/views/emis/emisWaybill/sendWaybillList.vue index 5ada2713..01c5c832 100644 --- a/src/views/emis/emisWaybill/sendWaybillList.vue +++ b/src/views/emis/emisWaybill/sendWaybillList.vue @@ -42,7 +42,7 @@ - + diff --git a/src/views/emis/emisWaybillProblemInfo/receivedProblemInquiries.vue b/src/views/emis/emisWaybillProblemInfo/receivedProblemInquiries.vue index be0aa75a..a14e8214 100644 --- a/src/views/emis/emisWaybillProblemInfo/receivedProblemInquiries.vue +++ b/src/views/emis/emisWaybillProblemInfo/receivedProblemInquiries.vue @@ -186,7 +186,7 @@ - + {{$t('问题原因:')}} @@ -609,7 +609,7 @@ export default { }else{ this.currentRow = {}; this.showProblemDetail = false; - + } this.reversion = { status:'', @@ -617,7 +617,7 @@ export default { } // this.ids = selection.map(item => item.id) - + }, async saveReversion(){ let commentList = this.$refs.commentList; @@ -724,7 +724,7 @@ export default { this.getList(); }); } - + // this.$refs["form"].validate(valid => { // if (valid) { // if (this.form.id != null) {