前端

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -310,7 +310,7 @@
                 <ws-form-item v-if="serviceManagementType == 1 && deptBudgetList.outType == '汽运'" label="车牌号" span="1"
                   prop="carNo">
                   <ws-input :disabled="disabled2"
-                    v-if="carInputStatus&&!carstatus"
+                    v-if="tranTaskFlag!=1?carInputStatus:carInputStatus&&!carstatus"
                     v-model="deptBudgetList.carNo" placeholder="请输入车牌号" maxlength="7" size="small" />
                   <el-select :disabled="disabled2"
                     v-if="!carInputStatus&&carstatus"
@@ -855,6 +855,7 @@ export default {
       // checked:false,
       searchType: 0,
       id: '',
+      warehouseType:'',
       warehouseList: [],
       shipInfoList: [],
       warehouseList1: [],
@@ -2001,7 +2002,7 @@ export default {
       //       this.deptBudgetList.bulkDensity =this.deptBudgetList.reBulkDensity
       //       this.deptBudgetList.warehouseInOutDetail.bulkDensity =this.deptBudgetList.reBulkDensity
       //     }
-      if (!this.deptBudgetList.binNumber) {
+      if (!this.deptBudgetList.binNumber&&this.warehouseType==1) {
         this.$message({
           message: '请选择仓位号',
           type: 'warning',
@@ -3809,6 +3810,7 @@ export default {
               this.warehouseName = response[i].warehouseName
               this.positionInfos = response[i].positionInfos
               this.warehouseNo = response[i].commonWarehouseNo
+              this.warehouseType = response[i].warehouseType
             }
             this.warehouseList.push({
               value: response[i].warehouseName,
@@ -3817,6 +3819,7 @@ export default {
               tradeCount: response[i].tradeCount,
               No: response[i].commonWarehouseNo,
               allowEdit: response[i].allowEdit,
+              type: response[i].warehouseType,
               compId: localStorage.getItem('ws-pf_compId')
             })
             if (!_wareHouse) {
@@ -3828,6 +3831,7 @@ export default {
                 this.warehouseNo = response[i].commonWarehouseNo
                 this.allowEdit = response[i].allowEdit
                 this.positionInfos = response[i].positionInfos
+                this.warehouseType = response[i].warehouseType
               }
               if (this.warehouseList.length > 0 && !this.cangid) {
                 this.warehouseName = this.warehouseList[0].value
@@ -3839,6 +3843,7 @@ export default {
                 this.allowEdit = this.warehouseList[0].allowEdit
                 this.WAREHOUSE[1].payname = this.warehouseList[0].value
                 this.positionInfos = response[0].positionInfos
+                this.warehouseType = response[0].warehouseType
               }
             }
           }