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

src/components/mapdrag/warehouseReceiptMap.vue

@@ -40,6 +40,7 @@
     TextToCode
   } from 'element-china-area-data'
   import image from '../../../public/img/ic_locationmarker.jpg'
+    import AMapLoader from '@amap/amap-jsapi-loader';
   export default {
     data() {
       return {
@@ -70,6 +71,7 @@
       }
     },
     async created() {
+      // AMapLoader.reset();
       // 已载入高德地图API，则直接初始化地图
       if (window.AMap && window.AMapUI) {
         this.initMap()

src/views/contractManagement/purchaseContract.vue

@@ -218,8 +218,7 @@
           <div
             v-if="
               (scope.row.approveStatus != '待决策人审核' &&
-                scope.row.approveStatus) ||
-              (scope.row.status != '执行中' && scope.row.status)
+                scope.row.approveStatus) 
             "
             style="display: inline-block"
           >

src/views/contractManagement/salesContract.vue

@@ -222,8 +222,7 @@
           <div
             v-if="
               (scope.row.approveStatus != '待决策人审核' &&
-                scope.row.approveStatus) ||
-              (scope.row.status != '执行中' && scope.row.status)
+                scope.row.approveStatus)
             "
             style="display: inline-block"
           >

src/views/houseSelfCollect/inspectInfo.vue

@@ -62,7 +62,7 @@
                 disabled />
             </ws-form-item>
             <ws-form-item label="类型" span="1" prop="type"  >
-              <ws-select v-model="inspect.type" :disabled="disabled" @change="typeChange">
+              <ws-select v-model="inspect.type" disabled @change="typeChange">
                 <ws-option v-for="item in typeList" :key="item" :label="item" :value="item" />
               </ws-select>
             </ws-form-item>
@@ -752,7 +752,7 @@
           else{
             this.inspect.type='干粮'
           }
-          if(!this.inspect.dryGrainPrice||this.inspect.dryGrainPrice == 0){
+        if(!this.inspect.dryGrainPrice||this.inspect.dryGrainPrice == 0){
             getDryGrainPrice({warehouseId:this.cangid,goodsName:this.inspect.goodsName})
             .toPromise()
             .then((response) => { 

src/views/houseSelfCollect/paymentManagement.vue

@@ -111,7 +111,7 @@
       </el-table-column>
       <el-table-column class="table_td" prop="status" width="100" label="是否开票">
         <template scope="scope">
-          <span v-if="scope.row.invoicing=='0'">未开票</span>
+          <span v-if="scope.row.invoicing == '0'">未开票</span>
           <span v-else>已开票</span>
         </template>
       </el-table-column>
@@ -361,9 +361,12 @@ import download from '../../components/WsDownload/download'
           year: dayjs().format('YYYY'),
           month: dayjs().format('MM'),
         },
+        
       }
     },
     activated() {
+     
+     
       this.userJurisdiction = getHp('acquisitionManagement.acquisitionPay.print')
       this.getPassYearFormatDate()
       this.getWarehouse()
@@ -722,7 +725,11 @@ import download from '../../components/WsDownload/download'
           .toPromise()
           .then(response => {
             this.warehouseList = response
-            if (_wareHouse) {
+            if(this.$route.query.warehouseName){//判断是否在任务页面进来
+                this.warehouseName =  this.$route.query.warehouseName
+               this.warehouseNameKey = this.$route.query.warehouseName
+            }else{
+               if (_wareHouse) {
               this.warehouseNameKey = _wareHouse.id
               this.warehouseName = _wareHouse.value
             } else {
@@ -734,6 +741,7 @@ import download from '../../components/WsDownload/download'
                 this.warehouseName = this.warehouseList[0].warehouseName
               }
             }
+            }
             this.getList()
           })
       },
@@ -856,8 +864,6 @@ import download from '../../components/WsDownload/download'
             }
           })
         }
-
-
       },
       payment() {
         this.imageUrl = ''

src/views/houseSelfCollect/weightCheck.vue

@@ -483,7 +483,7 @@
                 }
               }
             }
-            else if (this.warehouseName && (this.warehouseName == '顺城粮库')) {
+            else if (this.warehouseName && (this.warehouseName == '顺城粮库'||this.warehouseName == '鲅鱼圈金信库')) {
               for (var i = value.length - 1; i >= 0; i--) {
                 var tmp = String.fromCharCode(value[i])
                 if (tmp == '=') {

src/views/newTask/listPage.vue

@@ -168,6 +168,7 @@ import {
 } from '@/model/indexRx'
 import { EventBus, formatDate, dayjs } from 'base-core-lib'
 import * as utils from '@/views/workNotification/utils/index.js'
+import axios from 'axios'
 export default {
   name: 'newtask',
   data () {
@@ -380,7 +381,6 @@ export default {
       this.clickSearch()
     },
     goPath (data) {
-      console.log(data, 1234444)
       if (data.businessCode === 'PURCHASE-MA-APPL-REMIND') {
         this.$router.push({ name: 'sparepartMa' })
       } else {
@@ -394,9 +394,27 @@ export default {
         if (!url) {
           EventBus.$emit('error', this.$t('workNotification.noRelatedType'))
         } else {
-            this.$router.push({
+          if(url == 'paymentManagement'){
+            //付款模块传参仓库
+             axios({
+              method: 'get',
+              url: process.env.VUE_APP_BASE_API + '/paymentManagement/getInfo?id='+data.businessId,
+            }).then((response) => {
+              //编辑接口
+              console.log(response)
+              console.log(response.data.data.warehouseName)
+              this.$router.push({
+              name: url,
+              query:{warehouseName:response.data.data.warehouseName}
+            })
+            })
+          }else{
+            debugger
+            console.log(url)
+             this.$router.push({
               name: url
             })
+          }
           // 产品 船舶检查
         }
       }

src/views/outboundManagement/weighing.vue

@@ -233,7 +233,7 @@
 						}
 					}
 				}
-				else if (this.warehouseName && (this.warehouseName == '顺城粮库')) {
+				else if (this.warehouseName && (this.warehouseName == '顺城粮库'||this.warehouseName == '鲅鱼圈金信库')) {
 					for (var i = value.length - 1; i >= 0; i--) {
 						var tmp = String.fromCharCode(value[i])
 						if (tmp == '=') {

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -111,7 +111,7 @@
 						<!--预估运费（元/吨）-->
 					<el-form-item label="预估运费（元/吨）" span="1">
 						<el-input v-model="dataList.estimatedFreight" placeholder="请输入预估运费"
-							maxlength="20" size="small" />
+							maxlength="20" size="small" type="number"/>
 					</el-form-item>
 					<!--经办人-->
 					<el-form-item label="发货人">
@@ -217,7 +217,7 @@
 							<!--预估运费（元/吨）-->
 					<el-form-item label="预估运费（元/吨）" span="1" >
 						<el-input v-model="dataList1.estimatedFreight" placeholder="请输入预估运费"
-							maxlength="20" size="small"  />
+							maxlength="20" size="small" type="number" />
 					</el-form-item>
 					<!-- 经办人-->
 					<el-form-item label="收货人">
@@ -325,7 +325,7 @@
 							<!--预估运费（元/吨）-->
 					<el-form-item label="预估运费（元/吨）" span="1" >
 						<el-input v-model="dataList.estimatedFreight" placeholder="请输入预估运费"
-							maxlength="20" size="small"  />
+							maxlength="20" size="small" type="number" />
 					</el-form-item>
 					<!--发货人-->
 					<el-form-item label="发货人">

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
@@ -481,7 +485,7 @@
                 }
               }
             } 
-            else if (this.deptBudgetList.warehouseName && (this.deptBudgetList.warehouseName == '顺城粮库')) {
+            else if (this.deptBudgetList.warehouseName && (this.deptBudgetList.warehouseName == '顺城粮库'||this.deptBudgetList.warehouseName == '鲅鱼圈金信库')) {
               for (var i = value.length - 1; i >= 0; i--) {
                 var tmp = String.fromCharCode(value[i])
                 if (tmp == '=') {
@@ -1727,23 +1731,40 @@
         }
       },
       contractNoChange(e) {
-        console.log(e)
         for (let i = 0; i < this.deptBudgetList1.length; i++) {
-          if (this.deptBudgetList1[i].inOutTaskNo == e) {
-            this.deptBudgetList.contractNo = this.deptBudgetList1[i].contractNo
+         
+          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
+            }
+            else{
+              this.deptBudgetList.contractNo = this.deptBudgetList1[i].moveTaskNo
+            }
           }
         }
         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 == '退库') {
+              if(this.deptBudgetList1[i].contractNo){
+                this.deptBudgetList.tips='买方'+this.outContractNo[i].buyer
+              }
+              else{
+                this.deptBudgetList.tips='出货库'+data.warehouseName
+              }
               this.deptBudgetList.inOutTypeKey = 6
             }
             console.log(this.outContractNo[i])
@@ -1846,6 +1867,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>
@@ -508,7 +508,7 @@
                 this.dataList.tare = parseInt(result)
               }
             }
-            else if (this.deptBudgetList1.warehouseName && (this.deptBudgetList1.warehouseName == '顺城粮库')) {
+            else if (this.deptBudgetList1.warehouseName && (this.deptBudgetList1.warehouseName == '顺城粮库'||this.deptBudgetList1.warehouseName == '鲅鱼圈金信库')) {
               for (var i = value.length - 1; i >= 0; i--) {
                 var tmp = String.fromCharCode(value[i])
                 if (tmp == '=') {
@@ -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>
@@ -444,7 +444,7 @@
                 this.dataList.grossWeight = parseInt(result)
               }
             }
-            else if (this.deptBudgetList1.warehouseName && (this.deptBudgetList1.warehouseName == '顺城粮库')) {
+            else if (this.deptBudgetList1.warehouseName && (this.deptBudgetList1.warehouseName == '顺城粮库'||this.deptBudgetList1.warehouseName == '鲅鱼圈金信库')) {
               for (var i = value.length - 1; i >= 0; i--) {
                 var tmp = String.fromCharCode(value[i])
                 if (tmp == '=') {
@@ -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
@@ -410,7 +414,7 @@
                 }
               }
             }
-            else if (this.deptBudgetList.warehouseName && (this.deptBudgetList.warehouseName == '顺城粮库')) {
+            else if (this.deptBudgetList.warehouseName && (this.deptBudgetList.warehouseName == '顺城粮库'||this.deptBudgetList.warehouseName == '鲅鱼圈金信库')) {
               for (var i = value.length - 1; i >= 0; i--) {
                 var tmp = String.fromCharCode(value[i])
                 if (tmp == '=') {
@@ -499,14 +503,23 @@
       contractNoChange(e) {
         for (let i = 0; i < this.deptBudgetList1.length; i++) {
           if (this.deptBudgetList1[i].inOutTaskNo == e) {
+             var data=this.deptBudgetList1[i]
+            if(this.deptBudgetList1[i].contractNo){
             this.deptBudgetList.contractNo = this.deptBudgetList1[i].contractNo
+            } 
+            else{
+            this.deptBudgetList.contractNo = this.deptBudgetList1[i].moveTaskNo
+            }
+            
           }
         }
         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 +1374,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='干粮'
+            }
           }
         }
       },

src/views/workNotification/utils/index.js

@@ -21,6 +21,8 @@ export function code2Url (type, code, state) {
         // 判断 付款
     case 'PAYMENT':
       return payment(code, state)
+    case 'TRADE':
+      return warehouseReceiptRegulation(code, state)
     default:
       return ''
   }
@@ -815,6 +817,13 @@ export function payment (code, state) {
   }
   return undefined
 }
+export function warehouseReceiptRegulation (code, state) {
+  if (code === 'TRADE-WAREHOUSE-REPORT') {
+    // 付款管理
+    return 'tradeServicesManagement'
+  }
+  return undefined
+}
 // 调度
 export function checkDispatch (code, state) {
   let url = ''