前端

src/views/warehouse/warehouseManagementDelivery.vue

@@ -68,7 +68,7 @@
             </ws-select>
           </ws-form-item>
           <ws-form-item label="类型" span="1" prop="type">
-              <ws-select v-model="deptBudgetList.type"  @change="typeChange">
+              <ws-select disabled v-model="deptBudgetList.type"  @change="typeChange">
                 <ws-option v-for="item in typeList" :key="item" :label="item" :value="item" />
               </ws-select>
             </ws-form-item>
@@ -1318,6 +1318,11 @@ export default {
       for (var i = 0; i < this.goodnameList.length; i++) {
         if (this.goodnameList[i].goodsName == e) {
           this.deptBudgetList.goodsNameKey = this.goodnameList[i].goodsNameKey
+          if(e=='玉米（潮粮）'){
+              this.deptBudgetList.type='潮粮'
+            }else{
+              this.deptBudgetList.type='干粮'
+            }
         }
       }
     },

src/views/warehouse/warehouseManagementGross.vue

@@ -32,12 +32,16 @@
           </ws-form-item>
           <!--合同编号-->
           <ws-form-item label="合同编号" span="1" prop="contractNo">
-            <el-select filterable clearable v-model="deptBudgetList.contractNo" placeholder="请选择合同编号或移库任务编号"
+            <el-select disabled filterable clearable v-model="deptBudgetList.contractNo" placeholder="请选择合同编号或移库任务编号"
               class="typeselect" @change="contractNoChange1">
               <el-option v-for="item in options1" :key="item.constKey" :label="item.contractNo"
                 :value="item.contractNo" />
             </el-select>
           </ws-form-item>
+          <ws-form-item label="提示" span="1" prop="tips">
+           <ws-input disabled v-model="deptBudgetList.tips"
+              maxlength="20" size="small" />
+          </ws-form-item>
           <!-- 货名 -->
           <ws-form-item label="货名" span="1">
             <ws-select disabled v-model="deptBudgetList.goodsName" placeholder class="typeselect"
@@ -47,7 +51,7 @@
             </ws-select>
           </ws-form-item>
           <ws-form-item label="类型" span="1" prop="type">
-            <ws-select v-model="deptBudgetList.type" @change="typeChange">
+            <ws-select disabled v-model="deptBudgetList.type" @change="typeChange">
               <ws-option v-for="item in typeList" :key="item" :label="item" :value="item" />
             </ws-select>
           </ws-form-item>
@@ -394,7 +398,7 @@
 
         }
       }
-      getReceiptTaskNo().toPromise()
+      getReceiptTaskNo({flag:2}).toPromise()
         .then((response) => {
           console.log(response)
           this.deptBudgetList1 = response
@@ -1728,7 +1732,10 @@
       },
       contractNoChange(e) {
         for (let i = 0; i < this.deptBudgetList1.length; i++) {
-          if (this.deptBudgetList1[i].inOutTaskNo == e) {
+         
+          console.log(this.deptBudgetList1[i])
+          if (this.deptBudgetList1[i].inOutTaskNo == e) { 
+            var data=this.deptBudgetList1[i]
             if(this.deptBudgetList1[i].contractNo){
               this.deptBudgetList.contractNo = this.deptBudgetList1[i].contractNo
             }
@@ -1740,14 +1747,19 @@
         for (var i = 0; i < this.outContractNo.length; i++) {
           if (this.outContractNo[i].contractNo == this.deptBudgetList.contractNo) {
             if (this.outContractNo[i].inOutType == '采购入库') {
+              this.deptBudgetList.tips='卖方'+this.outContractNo[i].seller
               this.deptBudgetList.inOutTypeKey = 1
             } else if (this.outContractNo[i].inOutType == '移库入库') {
+              this.deptBudgetList.tips='入货库'+data.warehouseName
               this.deptBudgetList.inOutTypeKey = 3
+            }else if (this.outContractNo[i].inOutType == '移库出库') {
+              this.deptBudgetList.tips='出货库'+data.warehouseName
             } else if (this.outContractNo[i].inOutType == '暂存入库') {
               this.deptBudgetList.inOutTypeKey = 4
             } else if (this.outContractNo[i].inOutType == '贸易服务入库') {
               this.deptBudgetList.inOutTypeKey = 5
             } else if (this.outContractNo[i].inOutType == '退库') {
+              this.deptBudgetList.tips='出货库'+data.warehouseName
               this.deptBudgetList.inOutTypeKey = 6
             }
             console.log(this.outContractNo[i])
@@ -1850,6 +1862,11 @@
         for (var i = 0; i < this.goodnameList.length; i++) {
           if (this.goodnameList[i].constValue == e) {
             this.deptBudgetList.goodsNameKey = this.goodnameList[i].constKey
+            if(e=='玉米（潮粮）'){
+              this.deptBudgetList.type='潮粮'
+            }else{
+              this.deptBudgetList.type='干粮'
+            }
           }
         }
       },

src/views/warehouse/warehouseManagementNoWeightIn.vue

@@ -32,7 +32,7 @@
             </el-select>
           </ws-form-item>
           <ws-form-item label="合同编号" span="1" prop="contractNo">
-            <el-select filterable :filter-method="dataFilter1" v-model="dataList.contractNo"
+            <el-select disabled filterable :filter-method="dataFilter1" v-model="dataList.contractNo"
               placeholder="请选择合同编号或移库任务编号" class="typeselect" @change='contractNoChange'>
               <el-option v-for="item in outContractNo1" :key="item.constKey" :label="item.contractNo"
                 :value="item.contractNo" />
@@ -46,7 +46,7 @@
             </ws-select>
           </ws-form-item>
           <ws-form-item label="类型" span="1" prop="type">
-            <ws-select v-model="dataList.type" @change="typeChange">
+            <ws-select disabled v-model="dataList.type" @change="typeChange">
               <ws-option v-for="item in typeList" :key="item" :label="item" :value="item" />
             </ws-select>
           </ws-form-item>
@@ -601,22 +601,27 @@
       contractNoChange(e) {
         for (let i = 0; i < this.deptBudgetList2.length; i++) {
           if (this.deptBudgetList2[i].inOutTaskNo == e) {
+            var data=this.deptBudgetList2[i]
             this.dataList.contractNo = this.deptBudgetList2[i].contractNo
-            return
           }
         }
         for (var i = 0; i < this.outContractNo.length; i++) {
           if (this.outContractNo[i].contractNo == e) {
             if (this.outContractNo[i].inOutType == '采购入库') {
-              this.dataList.inOutTypeKey = 1
+              this.deptBudgetList.tips='卖方'+this.outContractNo[i].seller
+              this.deptBudgetList.inOutTypeKey = 1
             } else if (this.outContractNo[i].inOutType == '移库入库') {
-              this.dataList.inOutTypeKey = 3
+              this.deptBudgetList.tips='入货库'+data.warehouseName
+              this.deptBudgetList.inOutTypeKey = 3
+            }else if (this.outContractNo[i].inOutType == '移库出库') {
+              this.deptBudgetList.tips='出货库'+data.warehouseName
             } else if (this.outContractNo[i].inOutType == '暂存入库') {
-              this.dataList.inOutTypeKey = 4
+              this.deptBudgetList.inOutTypeKey = 4
             } else if (this.outContractNo[i].inOutType == '贸易服务入库') {
-              this.dataList.inOutTypeKey = 5
-            } else if (this.detailData.inOutType == '退库') {
-              this.dataList.inOutTypeKey = 6
+              this.deptBudgetList.inOutTypeKey = 5
+            } else if (this.outContractNo[i].inOutType == '退库') {
+              this.deptBudgetList.tips='出货库'+data.warehouseName
+              this.deptBudgetList.inOutTypeKey = 6
             }
             this.dataList.goodsName = this.outContractNo[i].goodsName
             this.dataList.goodsNameKey = this.outContractNo[i].goodsNameKey
@@ -1289,6 +1294,11 @@
         for (var i = 0; i < this.goodnameList.length; i++) {
           if (this.goodnameList[i].constValue == e) {
             this.dataList.goodsNameKey = this.goodnameList[i].constKey
+            if(e=='玉米（潮粮）'){
+              this.dataList.type='潮粮'
+            }else{
+              this.dataList.type='干粮'
+            }
           }
         }
       },

src/views/warehouse/warehouseManagementNoWeightOut.vue

@@ -32,7 +32,7 @@
             </el-select>
           </ws-form-item>
           <ws-form-item label="合同编号" span="1" prop="contractNo">
-            <ws-select v-model="dataList.contractNo" placeholder="请选择合同编号或移库任务编号" class="typeselect"
+            <ws-select disabled v-model="dataList.contractNo" placeholder="请选择合同编号或移库任务编号" class="typeselect"
               @change='contractNoChange'>
               <ws-option v-for="item in outContractNo" :key="item.constKey" :label="item.contractNo"
                 :value="item.contractNo" />
@@ -46,7 +46,7 @@
             </ws-select>
           </ws-form-item>
           <ws-form-item label="类型" span="1" prop="type">
-            <ws-select v-model="dataList.type" @change="typeChange">
+            <ws-select disabled v-model="dataList.type" @change="typeChange">
               <ws-option v-for="item in typeList" :key="item" :label="item" :value="item" />
             </ws-select>
           </ws-form-item>
@@ -569,6 +569,43 @@
           })
       },
       contractNoChange(e) {
+        for (let i = 0; i < this.deptBudgetList2.length; i++) {
+          if (this.deptBudgetList2[i].inOutTaskNo == e) {
+            var data=this.deptBudgetList2[i]
+            this.dataList.contractNo = this.deptBudgetList2[i].contractNo
+          }
+        }
+        for (var i = 0; i < this.outContractNo.length; i++) {
+          if (this.outContractNo[i].contractNo == e) {
+            if (this.outContractNo[i].inOutType == '销售出库') {
+              this.deptBudgetList.tips='买方'+this.outContractNo[i].buyer
+              this.deptBudgetList.inOutTypeKey = 1
+            } else if (this.outContractNo[i].inOutType == '移库出库') {
+              this.deptBudgetList.tips='出货库'+data.warehouseName
+              this.deptBudgetList.inOutTypeKey = 3
+            } else if (this.outContractNo[i].inOutType == '暂存入库') {
+              this.deptBudgetList.inOutTypeKey = 4
+            } else if (this.outContractNo[i].inOutType == '贸易服务出库') {
+              this.deptBudgetList.inOutTypeKey = 5
+            } else if (this.outContractNo[i].inOutType == '采购出库') {
+              this.deptBudgetList.inOutTypeKey = 6
+            }
+            this.dataList.goodsName = this.outContractNo[i].goodsName
+            this.dataList.goodsNameKey = this.outContractNo[i].goodsNameKey
+            if (this.outContractNo[i].deliverType == '1') {
+              this.carstatus = true
+            } else {
+              this.carstatus = false
+            }
+            if (this.outContractNo[i].tranCarInfoList) {
+              this.options2 = this.outContractNo[i].tranCarInfoList
+              this.tranCarInfoList = this.outContractNo[i].tranCarInfoList
+              // this.carstatus = true
+            }
+          }
+        }
+      },
+      contractNoChange1(e) {
         for (var i = 0; i < this.outContractNo.length; i++) {
           if (this.outContractNo[i].contractNo == e) {
             if (this.outContractNo[i].inOutType == '销售出库') {
@@ -1043,6 +1080,11 @@
         for (var i = 0; i < this.goodnameList.length; i++) {
           if (this.goodnameList[i].constValue == e) {
             this.dataList.goodsNameKey = this.goodnameList[i].constKey
+            if(e=='玉米（潮粮）'){
+              this.dataList.type='潮粮'
+            }else{
+              this.dataList.type='干粮'
+            }
           }
         }
       },

src/views/warehouse/warehouseManagementPerfectDelivery.vue

@@ -67,7 +67,7 @@
             </ws-select>
           </ws-form-item>
           <ws-form-item label="类型" span="1" prop="type">
-              <ws-select v-model="dataList.type"  @change="typeChange">
+              <ws-select disabled v-model="dataList.type"  @change="typeChange">
                 <ws-option v-for="item in typeList" :key="item" :label="item" :value="item" />
               </ws-select>
             </ws-form-item>
@@ -989,6 +989,11 @@ export default {
       for (var i = 0; i < this.goodnameList.length; i++) {
         if (this.goodnameList[i].constValue == e) {
           this.dataList.goodsNameKey = this.goodnameList[i].constKey
+          if(e=='玉米（潮粮）'){
+              this.dataList.type='潮粮'
+            }else{
+              this.dataList.type='干粮'
+            }
         }
       }
     },

src/views/warehouse/warehouseManagementPerfectput.vue

@@ -68,7 +68,7 @@
             </ws-select>
           </ws-form-item>
           <ws-form-item label="类型" span="1" prop="type">
-              <ws-select v-model="dataList.type"  @change="typeChange">
+              <ws-select disabled v-model="dataList.type"  @change="typeChange">
                 <ws-option v-for="item in typeList" :key="item" :label="item" :value="item" />
               </ws-select>
             </ws-form-item>
@@ -1299,6 +1299,11 @@ export default {
       for (var i = 0; i < this.goodnameList.length; i++) {
         if (this.goodnameList[i].constValue == e) {
           this.dataList.goodsNameKey = this.goodnameList[i].constKey
+          if(e=='玉米（潮粮）'){
+              this.dataList.type='潮粮'
+            }else{
+              this.dataList.type='干粮'
+            }
         }
       }
     },

src/views/warehouse/warehouseManagementPut.vue

@@ -76,7 +76,7 @@
             </ws-select>
           </ws-form-item>
           <ws-form-item label="类型" span="1" prop="type">
-            <ws-select v-model="deptBudgetList.type" @change="typeChange">
+            <ws-select disabled v-model="deptBudgetList.type" @change="typeChange">
               <ws-option
                 v-for="item in typeList"
                 :key="item"
@@ -1876,6 +1876,11 @@ export default {
       for (var i = 0; i < this.goodnameList.length; i++) {
         if (this.goodnameList[i].constValue == e) {
           this.deptBudgetList.goodsNameKey = this.goodnameList[i].constKey
+          if(e=='玉米（潮粮）'){
+              this.deptBudgetList.type='潮粮'
+            }else{
+              this.deptBudgetList.type='干粮'
+            }
         }
       }
     },

src/views/warehouse/warehouseManagementTare.vue

@@ -31,12 +31,16 @@
             </el-select>
           </ws-form-item>
           <ws-form-item label="合同编号" span="1" prop="contractNo">
-            <ws-select v-model="deptBudgetList.contractNo" placeholder="请选择合同编号或移库任务编号" class="typeselect"
+            <ws-select disabled v-model="deptBudgetList.contractNo" placeholder="请选择合同编号或移库任务编号" class="typeselect"
               @change='contractNoChange1'>
               <ws-option v-for="item in outContractNo" :key="item.constKey" :label="item.contractNo"
                 :value="item.contractNo" />
             </ws-select>
           </ws-form-item>
+          <ws-form-item label="提示" span="1" prop="tips">
+           <ws-input disabled v-model="deptBudgetList.tips"
+              maxlength="20" size="small" />
+          </ws-form-item>
           <!-- 货名 -->
           <ws-form-item label="货名" span="1">
             <ws-select disabled v-model="deptBudgetList.goodsName" placeholder class="typeselect"
@@ -46,7 +50,7 @@
             </ws-select>
           </ws-form-item>
           <ws-form-item label="类型" span="1" prop="type">
-            <ws-select v-model="deptBudgetList.type" @change="typeChange">
+            <ws-select disabled v-model="deptBudgetList.type" @change="typeChange">
               <ws-option v-for="item in typeList" :key="item" :label="item" :value="item" />
             </ws-select>
           </ws-form-item>
@@ -331,7 +335,7 @@
       this.deptBudgetList.warehouseType = this.$route.query.warehouseType
       this.deptBudgetList.warehouseId = this.$route.query.warehouseId
       this.getList()
-      getReceiptTaskNo().toPromise()
+      getReceiptTaskNo({flag:1}).toPromise()
         .then((response) => {
           console.log(response)
           this.deptBudgetList1 = response
@@ -499,14 +503,17 @@
       contractNoChange(e) {
         for (let i = 0; i < this.deptBudgetList1.length; i++) {
           if (this.deptBudgetList1[i].inOutTaskNo == e) {
+            var data=
             this.deptBudgetList.contractNo = this.deptBudgetList1[i].contractNo
           }
         }
         for (var i = 0; i < this.outContractNo.length; i++) {
           if (this.outContractNo[i].contractNo == this.deptBudgetList.contractNo) {
             if (this.outContractNo[i].inOutType == '销售出库') {
+              this.deptBudgetList.tips='买方'+this.outContractNo[i].buyer
               this.deptBudgetList.inOutTypeKey = 1
             } else if (this.outContractNo[i].inOutType == '移库出库') {
+              this.deptBudgetList.tips='出货库'+data.warehouseName
               this.deptBudgetList.inOutTypeKey = 3
             } else if (this.outContractNo[i].inOutType == '暂存入库') {
               this.deptBudgetList.inOutTypeKey = 4
@@ -1361,6 +1368,11 @@
         for (var i = 0; i < this.goodnameList.length; i++) {
           if (this.goodnameList[i].goodsName == e) {
             this.deptBudgetList.goodsNameKey = this.goodnameList[i].goodsNameKey
+            if(e=='玉米（潮粮）'){
+              this.deptBudgetList.type='潮粮'
+            }else{
+              this.deptBudgetList.type='干粮'
+            }
           }
         }
       },