调整企业名称、税号功能

src/views/emis/emisWaybill/waybillGot.vue

@@ -257,14 +257,16 @@
                         <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blMessage" :true-label="'1'" :false-label="'0'"><span style="font-size:10px">  {{ $t('寄件/签收短信') }} </span></el-checkbox>
                       </el-form-item>
                     </el-col>
-                    <el-col :span="12" v-if="form.sender.country=='0086' || ['2','4','5'].includes(form.paymentType)">
+                    <el-col :span="12" v-if="form.sender.country=='0086' ">
                       <el-form-item :label="$t('企业名称')" prop="sender.enterpriseName">
-                         <el-input v-model="form.sender.enterpriseName" placeholder="请输入企业名称"></el-input>
+                         <el-input v-model="form.sender.enterpriseName" placeholder="请输入企业名称" :disabled="['2','4','5'].includes(form.paymentType)"></el-input>
+
                       </el-form-item>
                     </el-col>
-                    <el-col :span="12" v-if="form.sender.country=='0086' || ['2','4','5'].includes(form.paymentType)">
+                    <el-col :span="12" v-if="form.sender.country=='0086' ">
                       <el-form-item :label="$t('企业税号')" prop="sender.enterpriseTaxId">
-                         <el-input v-model="form.sender.enterpriseTaxId" placeholder="请输入企业税号"></el-input>
+                         <el-input v-model="form.sender.enterpriseTaxId" placeholder="请输入企业税号" :disabled="['2','4','5'].includes(form.paymentType)"></el-input>
+
                       </el-form-item>
                     </el-col>
                   </el-row>
@@ -980,6 +982,10 @@ data() {
     selectedSenderEnterpriseName:null,
     // 选中的寄件人企业税号
     selectedSenderEnterpriseTaxId:null,
+    //选中的月结客户企业号
+    selectedMonthUserEnterpriseName: null,
+    //选中的月结客户企业税号
+    selectedMonthUserEnterpriseTaxId: null,
     // 表单校验
     rules: {
       billCode: [
@@ -1532,6 +1538,10 @@ methods: {
       this.form.sender.enterpriseName=item.enterpriseName;
       // 企业税号
       this.form.sender.enterpriseTaxId=item.enterpriseTaxId;
+      // 选中的月结客户企业号
+      this.selectedMonthUserEnterpriseName = item.enterpriseName;
+      // 选中的月结客户企业税号
+      this.selectedMonthUserEnterpriseTaxId = item.enterpriseTaxId;
     }else{
       this.form.paymentType= '1';
       this.form.payee=null;
@@ -1682,7 +1692,17 @@ methods: {
 
             this.startTimer();
           }
-
+          if (['2', '4', '5'].includes(this.form.paymentType)) { //月结
+            this.selectedMonthUserEnterpriseName = this.form.sender.enterpriseName;
+            this.selectedMonthUserEnterpriseTaxId = this.form.sender.enterpriseTaxId;
+            this.selectedSenderEnterpriseName = '';
+            this.selectedSenderEnterpriseTaxId = '';
+          } else {
+            this.selectedMonthUserEnterpriseName = '';
+            this.selectedMonthUserEnterpriseTaxId = '';
+            this.selectedSenderEnterpriseName = this.form.sender.enterpriseName;
+            this.selectedSenderEnterpriseTaxId = this.form.sender.enterpriseTaxId;
+          }
         });
       }else{
 
@@ -2023,11 +2043,21 @@ methods: {
     this.selectedSenderEnterpriseName=value.enterpriseName;
     // 选中的寄件人企业税号
     this.selectedSenderEnterpriseTaxId=value.enterpriseTaxId;
-    //企业税号
+    //非月结且地址是中国 企业税号取值寄件地址
     if(!['2','4','5'].includes(this.form.paymentType) && this.form.sender.country=='0086' ){
       this.form.sender.enterpriseName=value.enterpriseName;
       this.form.sender.enterpriseTaxId=value.enterpriseTaxId;
     }
+    //非月结且地址是非中国 企业号置空
+    if(this.form.sender.country!='0086' ){
+      this.form.sender.enterpriseName='';
+      this.form.sender.enterpriseTaxId='';
+    }
+    // 月结且中国 企业号取值月结客户企业号
+    if (['2', '4', '5'].includes(this.form.paymentType) && this.form.sender.country == '0086') {
+      this.form.sender.enterpriseName = this.selectedMonthUserEnterpriseName;
+      this.form.sender.enterpriseTaxId = this.selectedMonthUserEnterpriseTaxId;
+    }
   },
   onChangeSelectReceiver(value){
     this.form.reciever.name=value.name;

src/views/emis/emisWaybill/waybillModify.vue

@@ -259,14 +259,16 @@
                         <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blMessage" :true-label="'1'" :false-label="'0'"><span style="font-size:10px">  {{ $t('寄件/签收短信') }} </span></el-checkbox>
                       </el-form-item>
                     </el-col>
-                    <el-col :span="12" v-if="form.sender.country=='0086' ||  ['2','4','5'].includes(form.paymentType)">
+                    <el-col :span="12" v-if="form.sender.country=='0086' ">
                       <el-form-item :label="$t('企业名称')" prop="sender.enterpriseName">
-                          <el-input v-model="form.sender.enterpriseName" placeholder="请输入企业名称"></el-input>
+                          <el-input v-model="form.sender.enterpriseName" placeholder="请输入企业名称" :disabled="['2','4','5'].includes(form.paymentType)"></el-input>
+
                       </el-form-item>
                     </el-col>
-                    <el-col :span="12" v-if="form.sender.country=='0086' ||  ['2','4','5'].includes(form.paymentType)">
+                    <el-col :span="12" v-if="form.sender.country=='0086' ">
                         <el-form-item :label="$t('企业税号')" prop="sender.enterpriseTaxId">
-                          <el-input v-model="form.sender.enterpriseTaxId" placeholder="请输入企业税号"></el-input>
+                          <el-input v-model="form.sender.enterpriseTaxId" placeholder="请输入企业税号" :disabled="['2','4','5'].includes(form.paymentType)"></el-input>
+
                         </el-form-item>
                     </el-col>
                   </el-row>
@@ -1008,6 +1010,10 @@ data() {
     selectedSenderEnterpriseName:null,
     // 选中的寄件人企业税号
     selectedSenderEnterpriseTaxId:null,
+    //选中的月结客户企业号
+    selectedMonthUserEnterpriseName: null,
+    //选中的月结客户企业税号
+    selectedMonthUserEnterpriseTaxId: null,
     // 表单校验
     rules: {
       billCode: [
@@ -1551,6 +1557,11 @@ methods: {
       this.form.sender.enterpriseName=item.enterpriseName;
       // 企业税号
       this.form.sender.enterpriseTaxId=item.enterpriseTaxId;
+      // 选中的月结客户企业号
+      this.selectedMonthUserEnterpriseName = item.enterpriseName;
+      // 选中的月结客户企业税号
+      this.selectedMonthUserEnterpriseTaxId = item.enterpriseTaxId;
+
     }else{
       this.form.paymentType= '1';
       this.form.payee=null;
@@ -1632,6 +1643,8 @@ methods: {
 
   },
   initData() {
+    console.log('----initData----')
+
 
     //console.log("====>this.action=2222=>",this.action);
     //console.log("====>this.billCode=2222=>",this.billCode);
@@ -1704,6 +1717,17 @@ methods: {
           }
         this.senderCountryCode = this.form.sender.country;
         this.recieverCountryCode = this.form.reciever.country;
+        if(['2','4','5'].includes(this.form.paymentType)){ //月结
+          this.selectedMonthUserEnterpriseName = this.form.sender.enterpriseName;
+          this.selectedMonthUserEnterpriseTaxId = this.form.sender.enterpriseTaxId;
+          this.selectedSenderEnterpriseName ='';
+          this.selectedSenderEnterpriseTaxId ='';
+        }else{
+          this.selectedMonthUserEnterpriseName = '';
+          this.selectedMonthUserEnterpriseTaxId = '';
+          this.selectedSenderEnterpriseName = this.form.sender.enterpriseName;
+          this.selectedSenderEnterpriseTaxId = this.form.sender.enterpriseTaxId;
+        }
         });
       }
       else{
@@ -2052,11 +2076,21 @@ methods: {
     this.selectedSenderEnterpriseName=value.enterpriseName;
     // 选中的寄件人企业税号
     this.selectedSenderEnterpriseTaxId=value.enterpriseTaxId;
-    //企业税号
+    //非月结且地址是中国 企业税号取值寄件地址
     if(!['2','4','5'].includes(this.form.paymentType) && this.form.sender.country=='0086' ){
       this.form.sender.enterpriseName=value.enterpriseName;
       this.form.sender.enterpriseTaxId=value.enterpriseTaxId;
     }
+    //非月结且地址是非中国 企业号置空
+    if(this.form.sender.country!='0086' ){
+      this.form.sender.enterpriseName='';
+      this.form.sender.enterpriseTaxId='';
+    }
+    // 月结且中国 企业号取值月结客户企业号
+    if (['2', '4', '5'].includes(this.form.paymentType) && this.form.sender.country == '0086') {
+      this.form.sender.enterpriseName = this.selectedMonthUserEnterpriseName;
+      this.form.sender.enterpriseTaxId = this.selectedMonthUserEnterpriseTaxId;
+    }
   },
   onChangeSelectReceiver(value){
     this.form.reciever.name=value.name;

src/views/emis/emisWaybill/waybillRecord.vue

@@ -260,14 +260,14 @@
                         <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blMessage" :true-label="'1'" :false-label="'0'"><span style="font-size:10px">  {{ $t('寄件/签收短信') }} </span></el-checkbox>
                       </el-form-item>
                     </el-col>
-                    <el-col :span="12" v-if="form.sender.country=='0086' || ['2','4','5'].includes(form.paymentType)">
+                    <el-col :span="12" v-if="form.sender.country=='0086'">
                       <el-form-item :label="$t('企业名称')" prop="sender.enterpriseName">
-                         <el-input v-model="form.sender.enterpriseName" placeholder="请输入企业名称"></el-input>
+                         <el-input v-model="form.sender.enterpriseName" placeholder="请输入企业名称" :disabled="['2','4','5'].includes(form.paymentType)"></el-input>
                       </el-form-item>
                     </el-col>
-                    <el-col :span="12" v-if="form.sender.country=='0086' || ['2','4','5'].includes(form.paymentType)">
+                    <el-col :span="12" v-if="form.sender.country=='0086'">
                       <el-form-item :label="$t('企业税号')" prop="sender.enterpriseTaxId">
-                         <el-input v-model="form.sender.enterpriseTaxId" placeholder="请输入企业税号"></el-input>
+                         <el-input v-model="form.sender.enterpriseTaxId" placeholder="请输入企业税号" :disabled="['2','4','5'].includes(form.paymentType)"></el-input>
                       </el-form-item>
                     </el-col>
                   </el-row>
@@ -1011,6 +1011,10 @@ data() {
     selectedSenderEnterpriseName:null,
     // 选中的寄件人企业税号
     selectedSenderEnterpriseTaxId:null,
+    //选中的月结客户企业号
+    selectedMonthUserEnterpriseName:null,
+    //选中的月结客户企业税号
+    selectedMonthUserEnterpriseTaxId:null,
     // 表单校验
     rules: {
       billCode: [
@@ -1549,6 +1553,11 @@ methods: {
       this.form.sender.enterpriseName=item.enterpriseName;
       // 企业税号
       this.form.sender.enterpriseTaxId=item.enterpriseTaxId;
+      // 选中的月结客户企业号
+      this.selectedMonthUserEnterpriseName=item.enterpriseName;
+      // 选中的月结客户企业税号
+      this.selectedMonthUserEnterpriseTaxId=item.enterpriseTaxId;
+
     }else{
       this.form.paymentType= '1';
       this.form.payee=null;
@@ -1701,7 +1710,17 @@ methods: {
 
             this.startTimer();
           }
-
+          // if (['2', '4', '5'].includes(this.form.paymentType)) { //月结
+          //   this.selectedMonthUserEnterpriseName = this.form.sender.enterpriseName;
+          //   this.selectedMonthUserEnterpriseTaxId = this.form.sender.enterpriseTaxId;
+          //   this.selectedSenderEnterpriseName = '';
+          //   this.selectedSenderEnterpriseTaxId = '';
+          // } else {
+          //   this.selectedMonthUserEnterpriseName = '';
+          //   this.selectedMonthUserEnterpriseTaxId = '';
+          //   this.selectedSenderEnterpriseName = this.form.sender.enterpriseName;
+          //   this.selectedSenderEnterpriseTaxId = this.form.sender.enterpriseTaxId;
+          // }
         });
       }else{
 
@@ -2047,11 +2066,21 @@ methods: {
     this.selectedSenderEnterpriseName=value.enterpriseName;
     // 选中的寄件人企业税号
     this.selectedSenderEnterpriseTaxId=value.enterpriseTaxId;
-    //企业税号
+    //非月结且地址是中国 企业税号取值寄件地址
     if(!['2','4','5'].includes(this.form.paymentType) && this.form.sender.country=='0086' ){
       this.form.sender.enterpriseName=value.enterpriseName;
       this.form.sender.enterpriseTaxId=value.enterpriseTaxId;
     }
+    //非月结且地址是非中国 企业号置空
+    if(this.form.sender.country!='0086' ){
+      this.form.sender.enterpriseName='';
+      this.form.sender.enterpriseTaxId='';
+    }
+    // 月结且中国 企业号取值月结客户企业号
+    if (['2', '4', '5'].includes(this.form.paymentType) && this.form.sender.country == '0086') {
+      this.form.sender.enterpriseName = this.selectedMonthUserEnterpriseName;
+      this.form.sender.enterpriseTaxId = this.selectedMonthUserEnterpriseTaxId;
+    }
   },
   onChangeSelectReceiver(value){
     this.form.reciever.name=value.name;

src/views/emis/emisWaybillAjustApply/adjustPanel.vue

@@ -648,14 +648,15 @@
                                 <el-input v-model="form.sender.address" rows="3" type="textarea"  placeholder="" />
                               </el-form-item>
                             </el-col>
-                            <el-col :span="12">
+                            <el-col :span="12" v-if="form.sender.country=='0086'">
                               <el-form-item :label="$t('企业名称')" prop="sender.enterpriseName">
-                                <el-input v-model="form.sender.enterpriseName" placeholder="请输入企业名称"></el-input>
+                                <el-input v-model="form.sender.enterpriseName" placeholder="请输入企业名称" :disabled="['2','4','5'].includes(form.paymentType)"></el-input>
+
                               </el-form-item>
                             </el-col>
-                            <el-col :span="12">
+                            <el-col :span="12" v-if="form.sender.country=='0086'">
                               <el-form-item :label="$t('企业税号')" prop="sender.enterpriseTaxId">
-                                <el-input v-model="form.sender.enterpriseTaxId" placeholder="请输入企业税号"></el-input>
+                                <el-input v-model="form.sender.enterpriseTaxId" placeholder="请输入企业税号" :disabled="['2','4','5'].includes(form.paymentType)"></el-input>
                               </el-form-item>
                             </el-col>
 
@@ -1359,6 +1360,11 @@ export default {
       selectedSenderEnterpriseName:null,
       // 选中的寄件人企业税号
       selectedSenderEnterpriseTaxId:null,
+      //选中的月结客户企业号
+      selectedMonthUserEnterpriseName:null,
+      //选中的月结客户企业税号
+      selectedMonthUserEnterpriseTaxId:null,
+
       // 表单校验
       rules: {
         billCode: [
@@ -1621,6 +1627,10 @@ export default {
         this.form.sender.enterpriseName=item.enterpriseName;
         // 企业税号
         this.form.sender.enterpriseTaxId=item.enterpriseTaxId;
+        // 选中的月结客户企业号
+        this.selectedMonthUserEnterpriseName=item.enterpriseName;
+        // 选中的月结客户企业税号
+        this.selectedMonthUserEnterpriseTaxId=item.enterpriseTaxId;
       }
       this.calcBillFee()
     },
@@ -1784,11 +1794,21 @@ export default {
       this.selectedSenderEnterpriseName=value.enterpriseName;
       // 选中的寄件人企业税号
       this.selectedSenderEnterpriseTaxId=value.enterpriseTaxId;
-      //企业税号
+      //非月结且地址是中国 企业税号取值寄件地址
       if(!['2','4','5'].includes(this.form.paymentType) && this.form.sender.country=='0086' ){
         this.form.sender.enterpriseName=value.enterpriseName;
         this.form.sender.enterpriseTaxId=value.enterpriseTaxId;
       }
+      //非月结且地址是非中国 企业号置空
+      if(this.form.sender.country!='0086' ){
+        this.form.sender.enterpriseName='';
+        this.form.sender.enterpriseTaxId='';
+      }
+      // 月结且中国 企业号取值月结客户企业号
+      if(['2','4','5'].includes(this.form.paymentType) && this.form.sender.country=='0086' ){
+        this.form.sender.enterpriseName=this.selectedMonthUserEnterpriseName;
+        this.form.sender.enterpriseTaxId=this.selectedMonthUserEnterpriseTaxId;
+      }
     },
     onChangeSelectReceiver(value){
       this.form.reciever.name=value.name;