Merge pull request '更改始发网点，取件人操作人置空' (#141) from master-dev into master

Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/141

src/views/emis/emisWaybill/waybillGot.vue

@@ -1970,7 +1970,8 @@ methods: {
 
     this.initGetTotalAvailablePag(this.form.sendSiteCode);
     this.calcBillFee();
-
+    this.form.takePieceEmployeeCode = null;
+    this.form.operateEmployeeCode = null;
 
   },
   onStartSiteSelect(item){
@@ -1981,6 +1982,8 @@ methods: {
     }
     this.form.startSiteCode=item.siteCode;
     this.form.startSiteName=item.siteName;
+    this.form.takePieceEmployeeCode = null;
+    this.form.operateEmployeeCode = null;
   },
   /** 提交按钮 */
   submitForm() {

src/views/emis/emisWaybill/waybillModify.vue

@@ -1970,6 +1970,8 @@ methods: {
     // }
     this.initGetTotalAvailablePag(this.form.sendSiteCode);
     // this.calcBillFee();
+    this.form.takePieceEmployeeCode = null;
+    this.form.operateEmployeeCode = null;
   },
   onStartSiteSelect(item){
     if(!item){
@@ -1979,6 +1981,8 @@ methods: {
     }
     this.form.startSiteCode=item.siteCode;
     this.form.startSiteName=item.siteName;
+    this.form.takePieceEmployeeCode = null;
+    this.form.operateEmployeeCode = null;
   },
   /** 提交按钮 */
   submitForm() {

src/views/emis/emisWaybill/waybillRecord.vue

@@ -1245,7 +1245,7 @@ watch: {
     },
     deep: true
   },
-  },
+},
 created() {
 
 
@@ -1950,7 +1950,8 @@ methods: {
     //深拷贝转换
     this.initGetTotalAvailablePag(this.form.sendSiteCode);
     this.calcBillFee();
-
+    this.form.takePieceEmployeeCode = null;
+    this.form.operateEmployeeCode = null;
 
   },
   onStartSiteSelect(item){
@@ -1961,6 +1962,8 @@ methods: {
     }
     this.form.startSiteCode=item.siteCode;
     this.form.startSiteName=item.siteName;
+    this.form.takePieceEmployeeCode = null;
+    this.form.operateEmployeeCode = null;
   },
   /** 提交按钮 */
   submitForm() {

src/views/emis/emisWaybillAjustApply/adjustPanel.vue

@@ -224,7 +224,7 @@
                   </el-row>
               </el-col>
 
-              <el-col :span="24" v-if="applyType&&(applyTypeArr.includes('13'))" >
+              <el-col :span="24" v-if="applyType&&(applyTypeArr.includes('13') || (applyTypeArr.includes('44') && form.pickupMethod=='2'))" >
                   <el-row :gutter="0" class="md-row">
                     <el-col :span="3" class="md-title">
                       <span>取件员调整</span>
@@ -241,7 +241,7 @@
                   </el-row>
               </el-col>
 
-              <el-col :span="24" v-if="applyType&&(applyTypeArr.includes('34'))" >
+              <el-col :span="24" v-if="applyType&&(applyTypeArr.includes('34') || (applyTypeArr.includes('44') && form.pickupMethod=='1'))" >
                   <el-row :gutter="0" class="md-row">
                     <el-col :span="3" class="md-title">
                       <span>操作员调整</span>
@@ -1383,7 +1383,7 @@ export default {
       selectedMonthUserEnterpriseName:null,
       //选中的月结客户企业税号
       selectedMonthUserEnterpriseTaxId:null,
-
+      startSiteChangeCount:0, 
       // 表单校验
       rules: {
         billCode: [
@@ -1570,6 +1570,8 @@ export default {
           // 初始化企业等级
           this.categorySender =null;
           this.categoryReciever =null;
+          this.startSiteChangeCount=0;
+
         },
         deep: true
       },
@@ -2267,6 +2269,7 @@ export default {
       }
     },
     onStartSiteSelect(item) {
+      this.startSiteChangeCount++;
       if (!item) {
         this.form.startSiteCode = null;
         this.form.startSiteName = null;
@@ -2274,6 +2277,13 @@ export default {
       }
       this.form.startSiteCode = item.siteCode;
       this.form.startSiteName = item.siteName;
+      if(this.startSiteChangeCount > 1){
+        if (this.form.pickupMethod == '1') {
+          this.form.operateEmployeeCode = null;
+        } else if (this.form.pickupMethod == '2') {
+          this.form.takePieceEmployeeCode = null;
+        }
+      }
     },
     //寄件省份变化
     onChangeSenderProvince(val){