前端

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -64,7 +64,7 @@
                 <ws-form-item v-if='serviceManagementType == 3 && qyJurisdiction&&statusTypetext == "初检"||serviceManagementType == 3 && statusTypetext != "初检"||serviceManagementType == 1' label="任务编号" span="1" prop="inOutTaskNo">
                   <el-select :disabled='recheck' filterable clearable v-model="deptBudgetList.inOutTaskNo"
                     placeholder="请选择任务编号" class="typeselect" @change="contractNoChange">
-                    <el-option v-for="item in taskNolist" :key="'renwu' + item.inOutTaskNo" :label="item.inOutTaskNo"
+                    <el-option v-for="item in taskNolist" :key="'renwu' + item.inOutTaskNo" :label="item.inOutTaskNo+(item.taskFlag?'（'+item.taskFlag+'）':'')"
                       :value="item.inOutTaskNo" />
                   </el-select>
                 </ws-form-item>

src/views/houseSelfCollect/paymentManagement.vue

@@ -36,17 +36,18 @@
         <ws-button :type="invoicing === 0 ? 'primary' : ''" @click="screen(0)">未开票</ws-button>
       </template>
       <template slot="right">
+        
+        <el-select class="warehouse_select" v-model="warehouseNameKey" placeholder="请选择仓库" @change="warehouseChange"
+          filterable clearable style="margin: 0 10px">
+          <el-option v-for="item in warehouseList" :key="item.id" :label="item.warehouseName" :value="item.id">
+          </el-option>
+        </el-select>
         <el-select class="warehouse_select" v-model="goodNames" placeholder="请选择货名" @change="goodsNameChange" filterable
           clearable  multiple :multiple-limit="multipleLimit" style="margin: 0 10px">
           <el-option label="全部货名" value="全部货名"></el-option>
           <el-option v-for="item in goodnameList" :key="item.id" :label="item.goodsName" :value="item.goodsName">
           </el-option>
         </el-select>
-        <el-select class="warehouse_select" v-model="warehouseNameKey" placeholder="请选择仓库" @change="warehouseChange"
-          filterable clearable style="margin: 0 10px">
-          <el-option v-for="item in warehouseList" :key="item.id" :label="item.warehouseName" :value="item.id">
-          </el-option>
-        </el-select>
         <el-date-picker style="margin: 0 10px 0 0" value-format="yyyy-MM-dd" v-model="value2" @change="datechange"
           type="daterange" align="right" unlink-panels range-separator="至" start-placeholder="结算时间起"
           end-placeholder="结算时间止">
@@ -1569,7 +1570,7 @@
       getWarehouse() {
         let _wareHouse = localStorage.getItem('houseSelfCollect_house1')
         _wareHouse = JSON.parse(_wareHouse)
-        getwarehouse({
+        selectWarehouseSelf({
             compId: localStorage.getItem('ws-pf_compId'),
           })
           .toPromise()
@@ -1733,11 +1734,14 @@
       getList() {
         for (let _temp = 0; _temp < this.warehouseList.length; _temp++) {
           if (this.warehouseName == this.warehouseList[_temp].warehouseName) {
-            for (let _num = 0; _num < this.warehouseList[_temp].goodsNameInfos.length; _num++) {
-              const res = new Map()
-              this.goodnameList = this.warehouseList[_temp].goodsNameInfos.filter((arr) => !res.has(arr.goodsName) &&
-                res.set(arr.goodsName, 1))
+            if(this.warehouseList[_temp].goodsNameInfos){
+              for (let _num = 0; _num < this.warehouseList[_temp].goodsNameInfos.length; _num++) {
+                const res = new Map()
+                this.goodnameList = this.warehouseList[_temp].goodsNameInfos.filter((arr) => !res.has(arr.goodsName) &&
+                  res.set(arr.goodsName, 1))
+              }
             }
+            
           }
         }
         this.payments = {

src/views/outboundManagement/weighingManagementNew.vue

@@ -77,7 +77,7 @@
                         <el-select v-if="tpyeNo == 1" :disabled="recheck" filterable clearable
                           v-model="weighingList.inOutTaskNo" placeholder="请选择任务编号" class="typeselect"
                           @change="contractNoChange">
-                          <el-option v-for="item in taskNolist" :key="item.id" :label="item.inOutTaskNo"
+                          <el-option v-for="item in taskNolist" :key="item.id" :label="item.inOutTaskNo+(item.taskFlag?'（'+item.taskFlag+'）':'')"
                             :value="item.inOutTaskNo" />
                         </el-select>
                         <ws-input v-else v-model="weighingList.inOutTaskNo" placeholder="自动获取，不可编辑" maxlength="100"

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -124,11 +124,15 @@
 					</el-form-item> -->
 					<!--经办人-->
 					<el-form-item label="发货人">
-            <el-select v-model="dataList.agent" placeholder="请选择发货人" filterable clearable
-              @change="selectstaff">
-              <el-option v-for="item in options" :key="item.value" :label="item.staffName" :value="item.staffName" />
-            </el-select>
-          </el-form-item>
+						<el-select v-model="dataList.agent" placeholder="请选择发货人" filterable clearable
+						@change="selectstaff">
+						<el-option v-for="item in options" :key="item.value" :label="item.staffName" :value="item.staffName" />
+						</el-select>
+					</el-form-item>
+					<!-- <el-form-item label="任务标识">
+						<el-input  @input="taskFlaginput" v-model="dataList.taskFlag"
+							placeholder="请输入任务标识" maxlength="6" size="small" class="huom" />
+					</el-form-item> -->
 					<!--业务描述=-->
 					<el-form-item v-if="dataList.taskTypeKey != 3" label="业务描述" span="20">
 						<el-input v-model="dataList.businessDescribe" placeholder="请输入业务描述（运输方式），不超过500字"
@@ -248,11 +252,15 @@
 					</el-form-item> -->
 					<!-- 经办人-->
 					<el-form-item label="收货负责人">
-            <el-select v-model="dataList1.agent" placeholder="请选择收货负责人" filterable clearable :filter-method="dataFilter1"
-              @change="selectstaff1">
-              <el-option v-for="item in options1" :key="item.value" :label="item.staffName" :value="item.staffName" />
-            </el-select>
-          </el-form-item>
+						<el-select v-model="dataList1.agent" placeholder="请选择收货负责人" filterable clearable :filter-method="dataFilter1"
+						@change="selectstaff1">
+						<el-option v-for="item in options1" :key="item.value" :label="item.staffName" :value="item.staffName" />
+						</el-select>
+					</el-form-item>
+					<!-- <el-form-item label="任务标识">
+						<el-input :disabled="dataList.taskTypeKey == 3" @input="taskFlaginput" v-model="dataList.taskFlag"
+							placeholder="请输入任务标识" maxlength="6" size="small" class="huom" />
+					</el-form-item> -->
 					<!--业务描述=-->
 					<el-form-item v-if="dataList.taskTypeKey != 4" label="业务描述">
 						<el-input v-model="dataList1.businessDescribe" placeholder="请输入业务描述（运输方式），不超过500字"
@@ -354,11 +362,15 @@
 					</el-form-item> -->
 					<!--发货人-->
 					<el-form-item label="发货负责人">
-            <el-select v-model="dataList.agent" placeholder="请选择发货负责人" filterable clearable
-              @change="selectstaff">
-              <el-option v-for="item in options" :key="item.value" :label="item.staffName" :value="item.staffName" />
-            </el-select>
-          </el-form-item>
+						<el-select v-model="dataList.agent" placeholder="请选择发货负责人" filterable clearable
+						@change="selectstaff">
+						<el-option v-for="item in options" :key="item.value" :label="item.staffName" :value="item.staffName" />
+						</el-select>
+					</el-form-item>
+					<!-- <el-form-item label="任务标识">
+						<el-input :disabled="dataList.taskTypeKey == 4" v-model="dataList.taskFlag"
+							placeholder="请输入任务标识" maxlength="6" size="small" class="huom" />
+					</el-form-item> -->
 					<!--业务描述=-->
 					<el-form-item label="业务描述">
 						<el-input v-model="dataList.businessDescribe" placeholder="请输入业务描述（运输方式），不超过500字"
@@ -632,6 +644,14 @@
 			
 		},
 		methods: {
+			taskFlaginput(e){
+				if(this.dataList.taskTypeKey==3){
+					this.dataList1.taskFlag=e
+				}
+				if(this.dataList.taskTypeKey==4){
+					this.dataList.taskFlag=e
+				}
+			},
 			//返回按钮
 			revert() {
 				this.$router.go(-1)