diff --git a/src/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue b/src/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue index adaed7fa..ad8ef6d6 100644 --- a/src/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue +++ b/src/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue @@ -80,7 +80,7 @@ methods: { onChange() { this.$emit("input", this.svalue); - let itemData ={}; + let itemData =null; this.optionItems.forEach(item=>{ if(item.custNo === this.svalue){ itemData = item; diff --git a/src/views/emis/emisTmsPack/index.vue b/src/views/emis/emisTmsPack/index.vue deleted file mode 100644 index e1a03e17..00000000 --- a/src/views/emis/emisTmsPack/index.vue +++ /dev/null @@ -1,492 +0,0 @@ - - - - - diff --git a/src/views/emis/emisTransProduct/index.vue b/src/views/emis/emisTransProduct/index.vue index 4c8c57d4..fa9b4a74 100644 --- a/src/views/emis/emisTransProduct/index.vue +++ b/src/views/emis/emisTransProduct/index.vue @@ -211,7 +211,7 @@ import TransLinePicker from '@/views/emis/EmisBaseTools/TransLinePicker.vue'; export default { - name: "emisTransProduct", + name: "TransProduct", components: { elDateSimplePicker,CountryTreePicker,CountryPicker,TransLinePicker,emisTransProductForm }, dicts: [ 'sys_normal_disable', diff --git a/src/views/emis/emisWaybill/waybillModify.vue b/src/views/emis/emisWaybill/waybillModify.vue index 0db728a1..5b1cad0b 100644 --- a/src/views/emis/emisWaybill/waybillModify.vue +++ b/src/views/emis/emisWaybill/waybillModify.vue @@ -119,7 +119,7 @@ - + + + + + + + + + + @@ -309,8 +318,8 @@ - - + + @@ -1179,9 +1188,9 @@ methods: { }, onPaymentTypeChange(){ // 非月结清空月结客户选择 - if(this.form.paymentType == 1 || - this.form.paymentType == 3 || - this.form.paymentType == 6 + if(this.form.paymentType == '1' || + this.form.paymentType == '3' || + this.form.paymentType == '6' ){ this.form.custNo=null; this.form.customerCode=null; @@ -1190,9 +1199,16 @@ methods: { }, onSelectMonthUser(item){ - this.form.payee=item.payee; - this.form.salesmen=item.salesmen; - + if(item!=null){ + this.form.payee=item.payee; + this.form.salesmen=item.salesmen; + this.form.paymentType= '2'; + }else{ + this.form.paymentType= '1'; + this.form.payee=null; + this.form.salesmen=null; + this.onPaymentTypeChange(); + } this.calcBillFee(); }, handleAddFee(){ @@ -1493,7 +1509,7 @@ methods: { // 新开单才需要打印 if(this.action == "add"){ // 做揽收扫描记录 - this.handDoGotScan(); + // this.handDoGotScan(); // 弹出打印预览界面 this.handlePrintPreview(); diff --git a/src/views/emis/emisWaybill/waybillRecord.vue b/src/views/emis/emisWaybill/waybillRecord.vue index 442709c6..5dd73a7b 100644 --- a/src/views/emis/emisWaybill/waybillRecord.vue +++ b/src/views/emis/emisWaybill/waybillRecord.vue @@ -119,7 +119,7 @@ - + + + + + + + + + + @@ -1179,9 +1188,9 @@ methods: { }, onPaymentTypeChange(){ // 非月结清空月结客户选择 - if(this.form.paymentType == 1 || - this.form.paymentType == 3 || - this.form.paymentType == 6 + if(this.form.paymentType == '1' || + this.form.paymentType == '3' || + this.form.paymentType == '6' ){ this.form.custNo=null; this.form.customerCode=null; @@ -1190,9 +1199,16 @@ methods: { }, onSelectMonthUser(item){ - this.form.payee=item.payee; - this.form.salesmen=item.salesmen; - + if(item!=null){ + this.form.payee=item.payee; + this.form.salesmen=item.salesmen; + this.form.paymentType= '2'; + }else{ + this.form.paymentType= '1'; + this.form.payee=null; + this.form.salesmen=null; + this.onPaymentTypeChange(); + } this.calcBillFee(); }, handleAddFee(){ diff --git a/src/views/emis/emisWaybillProblemInfo/receivedProblemInquiries.vue b/src/views/emis/emisWaybillProblemInfo/receivedProblemInquiries.vue index c0e8ff26..5acc2fa1 100644 --- a/src/views/emis/emisWaybillProblemInfo/receivedProblemInquiries.vue +++ b/src/views/emis/emisWaybillProblemInfo/receivedProblemInquiries.vue @@ -204,88 +204,12 @@ - - - {{$t('问题件回复')}} - - - - - {{$t('登记网点联系人和电话')}} - - - - {{$t("登记网点:") + (reversion.registerSiteCode || '总部')}} - - - {{$t("负责人:") + (reversion.registerManCode || '未填写')}} - - - {{$t("联系电话:") + (reversion.empPhone || '未填写')}} - - - - - - {{$t('问题原因:')}} - - - - {{(reversion.problemCause || "暂无")}} - - - - - - - 处理结果: - - - - - - - - - - - 回复: - - - - - - {{ $t('保存') }} - - - {{ $t('取消') }} - - - - - {{$t('回复列表:')}} - - - - - - + + + + + +