Merge branch 'master' of http://git.zthymaoyi.com:3000/gdc/yiliangyiyun-pc

src/layout/index/top/index.vue

@@ -360,6 +360,9 @@
         let _qualityNo = this.barCode.split('&')[1]
         let _userHouseId = this.barCode.split('&')[2]
         this.cangid = this.barCode.split('&')[2]
+        if(_userCompId.indexOf(",") != -1){
+         _userCompId =  _userCompId.split(",")[1]
+        }
         this.tmp = {
           compId: _userCompId,
           number: _qualityNo,
@@ -367,7 +370,6 @@
         }
          this.barCode = ''
         //判断当前账号公司是否是二维码上公司
-        
         if (this.userINfo.userCompany != _userCompId) {
           this.$message.error('当前身份不可操作');
           return
@@ -375,9 +377,6 @@
         //判断二维码上的仓库当前账号是否有权限操作
         this.getLook(this.cangid, this.userINfo.userName)
         
-        //   //扫码枪扫码后显示弹框
-        // this.getQRCodeData(this.tmp)
-        
       },
       // 查看二维码仓库负责人
       async getLook(compId, userName) {
@@ -386,12 +385,12 @@
           })
           .toPromise()
           .then((response) => {
-              if (response.personCharge != userName || response.otherPersonCharge.indexOf(userName) < -1) {
-                this.$message.error('当前身份不可操作');
-                return
-              }else{
-                   //扫码枪扫码后显示弹框
+              if (response.otherPersonCharge.indexOf(userName) != -1 || response.personCharge == userName) {
+                  //扫码枪扫码后显示弹框
                    this.getQRCodeData(this.tmp)
+              }else{
+                 this.$message.error('当前身份不可操作');
+                 return
               }
             
           })

src/views/houseSelfCollect/component/inspectInfoPrint.vue

@@ -79,7 +79,6 @@
         <div>{{ printData.qualityDate }}</div>
       </div>
       <div class="bottom-row2">
-        {{printData.codeUrl}}
         <div class="left">
           <img :src="printData.codeUrl" alt="" />
         </div>

src/views/taskManagement/tranManagementTransportAdd.vue

@@ -178,6 +178,7 @@
           class="bg-right start-address"
         >
           <el-input
+          @change="endDetailedAddressChange"
             v-model="deptBudgetList.endDetailedAddress"
             placeholder="请输入终到地详细地址"
             maxlength="20"
@@ -202,7 +203,8 @@
       >
         <div class="driver">
           <span>运输阶段{{ item.key }} {{ item.processNo }}</span>
-          <img
+          <!-- 暂时取消添加运输阶段 -->
+          <!-- <img
             width="22"
             height="22"
             class="add"
@@ -217,7 +219,7 @@
             @click="del(index)"
             src="../../../public/img/del.png"
             alt
-          />
+          /> -->
           <el-checkbox
             @change="(val) => {engflagchange(val, index)}"
             class="endflag"
@@ -585,6 +587,9 @@ export default {
             'endDetailedAddress',
             this.warehouseList1[i].detailedAddress
           )
+          //终到地 终到地详细地址  默认第一运输阶段的收货地区（需求）
+          this.handleChange1(tmp)
+          this.endDetailedAddressChange()
         }
       }
     },
@@ -793,6 +798,16 @@ export default {
       this.deptBudgetList.endPrivate = CodeToText[value[0]]
       this.deptBudgetList.endCity = CodeToText[value[1]]
       this.deptBudgetList.endArea = CodeToText[value[2]]
+      //终到地  默认第一运输阶段的收货地区（需求）
+      this.deptBudgetList.tranProcessInfoList[0].selectedOptions1 = value
+      this.deptBudgetList.tranProcessInfoList[0].receivePrivate = CodeToText[value[0]]
+      this.deptBudgetList.tranProcessInfoList[0].receiveCity =  CodeToText[value[1]]
+      this.deptBudgetList.tranProcessInfoList[0].receiveArea =  CodeToText[value[2]]
+    },
+     // 终到地详细地址改变事件
+    endDetailedAddressChange(){
+      //终到地详细地址  默认第一运输阶段的收货地详细地址（需求）
+     this.deptBudgetList.tranProcessInfoList[0].receiveDetailedAddress = this.deptBudgetList.endDetailedAddress
     },
     handleChange3(value, index) {
       this.deptBudgetList.tranProcessInfoList[index].sendPrivate =

src/views/taskManagement/tranManagementTransportEdit.vue

@@ -85,7 +85,7 @@
       </ws-info-table>
       <ws-info-table class="el-table">
         <div class="start-address" style="width: 36%">
-          <el-radio-group
+            <el-radio-group
             @change="warehouseTypechange"
             v-model="deptBudgetList.warehouseType"
           >
@@ -106,6 +106,7 @@
             ></el-option>
           </el-select>
         </div>
+        
         <el-form-item label="始发地" span="1" class="start-address">
           <el-cascader
             :options="options_"
@@ -177,6 +178,7 @@
             placeholder="请输入终到地详细地址"
             maxlength="20"
             size="small"
+            @change="endDetailedAddressChange"
           ></el-input>
         </el-form-item>
         <div class="check-box">
@@ -191,7 +193,7 @@
 
       <div
         style="width: 100%"
-        class="position"
+        class="position" 
         v-for="(item, index) in deptBudgetList.tranProcessInfoList"
         :key="index"
       >
@@ -199,7 +201,8 @@
           <span style="vertical-align: top"
             >运输阶段{{ index + 1 }} {{ item.processNo }}</span
           >
-          <img
+          <!-- 暂时取消添加运输阶段 -->
+          <!-- <img
             width="22"
             height="22"
             class="add"
@@ -215,7 +218,7 @@
             v-if="item.carNum==0||!item.carNum"
             src="../../../public/img/del.png"
             alt=""
-          />
+          /> -->
           <el-checkbox
             @change="(val) => {engflagchange(val, index)}"
             class="endflag"
@@ -525,6 +528,9 @@ export default {
             'endDetailedAddress',
             this.warehouseList1[i].detailedAddress
           )
+          //终到地 终到地详细地址  默认第一运输阶段的收货地区（需求）
+          this.handleChange1(tmp)
+          this.endDetailedAddressChange()
         }
       }
 
@@ -834,6 +840,16 @@ export default {
       this.deptBudgetList.endPrivate = CodeToText[value[0]]
       this.deptBudgetList.endCity = CodeToText[value[1]]
       this.deptBudgetList.endArea = CodeToText[value[2]]
+      //终到地  默认第一运输阶段的收货地区（需求）
+      this.deptBudgetList.tranProcessInfoList[0].selectedOptions1 = value
+      this.deptBudgetList.tranProcessInfoList[0].receivePrivate = CodeToText[value[0]]
+      this.deptBudgetList.tranProcessInfoList[0].receiveCity =  CodeToText[value[1]]
+      this.deptBudgetList.tranProcessInfoList[0].receiveArea =  CodeToText[value[2]]
+    },
+    // 终到地详细地址改变事件
+    endDetailedAddressChange(){
+      //终到地详细地址  默认第一运输阶段的收货地详细地址（需求）
+     this.deptBudgetList.tranProcessInfoList[0].receiveDetailedAddress = this.deptBudgetList.endDetailedAddress
     },
     handleChange3(value, index) {
       this.deptBudgetList.tranProcessInfoList[index].sendPrivate =
@@ -1152,7 +1168,7 @@ export default {
   width: 25%;
 }
 .typeselect {
-  width: 42%;
+  width: 30%;
   margin-left: 32px;
 }
 /deep/.position .ws-info-table .el-form-item .el-form-item__label,

src/views/tranManagement/tranManagementTransporHairRespond.vue

@@ -5,7 +5,7 @@
       <template slot="left"> </template>
       <!-- 接单开始 -->
       <template slot="right">
-        <span style="width: 142px; display: inline-block; color: #8890b1"
+        <span style="width: 160px; display: inline-block; color: #8890b1"
           >状态：</span
         >
         <ws-select
@@ -23,7 +23,7 @@
             style="color: #8890b1"
           />
         </ws-select>
-        <span style="width: 142px; display: inline-block; color: #8890b1"
+        <span style="width: 160px; display: inline-block; color: #8890b1"
           >类型：</span
         >
         <ws-select