gjy 2 years ago
parent
commit
e3de9e8fe4

+ 2 - 0
src/api/V2/outboundManagement/index.js

@@ -48,4 +48,6 @@ export const API_POST_IMPORT_SALE ='/weighingManagement/api/importWeighingOut'
 export const API_POST_IMPORT_YK ='/weighingManagement/api/importWeighingMoveOut'
 export const API_POST_IMPORT_YK ='/weighingManagement/api/importWeighingMoveOut'
 //出库类型查询
 //出库类型查询
 export const API_GAT_INFO = '/commonSysParameter/getInfo'
 export const API_GAT_INFO = '/commonSysParameter/getInfo'
+// 是否创建运输任务
+export const API_GET_TRANTASK ='/inOutWarehouseTask/tranTaskCount'
 
 

+ 5 - 2
src/model/outboundManagement/index.js

@@ -26,7 +26,8 @@ import {
     API_POST_IMPORT_SALE,
     API_POST_IMPORT_SALE,
     API_POST_IMPORT_YK,
     API_POST_IMPORT_YK,
     API_POST_GO_BACK,
     API_POST_GO_BACK,
-    API_GAT_INFO
+    API_GAT_INFO,
+    API_GET_TRANTASK
 }   from '@/api/V2/outboundManagement'
 }   from '@/api/V2/outboundManagement'
 
 
   //质检列表
   //质检列表
@@ -78,4 +79,6 @@ export const importWordSale = appRx.post(API_POST_IMPORT_SALE, errorCatcher, err
 // 导入移库出库
 // 导入移库出库
 export const importWordYk = appRx.post(API_POST_IMPORT_YK, errorCatcher, errorHandle, filter)
 export const importWordYk = appRx.post(API_POST_IMPORT_YK, errorCatcher, errorHandle, filter)
 // 导入移库出库
 // 导入移库出库
-export const getInfo = appRx.get(API_GAT_INFO, errorCatcher, errorHandle, filter)
+export const getInfo = appRx.get(API_GAT_INFO, errorCatcher, errorHandle, filter)
+// 是否创建运输任务
+export const gettask = appRx.get(API_GET_TRANTASK, errorCatcher, errorHandle, filter)

+ 1 - 1
src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -3148,7 +3148,7 @@ export default {
           }
           }
           this.deptBudgetList.inOutType = this.outContractNo[i].inOutType
           this.deptBudgetList.inOutType = this.outContractNo[i].inOutType
           if (this.outContractNo[i].inOutType == '移库入库') {
           if (this.outContractNo[i].inOutType == '移库入库') {
-            this.isSelectType = false
+            this.isSelectType = true
 
 
           } else {
           } else {
             this.isSelectType = true
             this.isSelectType = true

+ 11 - 2
src/views/outboundManagement/weighingManagementNew.vue

@@ -374,7 +374,8 @@
     selectWarehouseSelf,
     selectWarehouseSelf,
     delelteWeighing,
     delelteWeighing,
     newSubmit,
     newSubmit,
-    getInfo
+    getInfo,
+    gettask
   } from '@/model/outboundManagement/index'
   } from '@/model/outboundManagement/index'
   import {
   import {
     pullDown,
     pullDown,
@@ -1888,7 +1889,15 @@
             data = this.taskNolist[i]
             data = this.taskNolist[i]
             if(this.taskNolist[i].inOutType=='移库出库'){
             if(this.taskNolist[i].inOutType=='移库出库'){
               this.weighingList.contractNo = this.taskNolist[i].moveTaskNo
               this.weighingList.contractNo = this.taskNolist[i].moveTaskNo
-              
+              gettask({moveTaskNo:this.taskNolist[i].moveTaskNo,compId:localStorage.getItem('ws-pf_compId')}).toPromise().then((response) => {
+                console.log(response)
+                if(!response){
+                  this.$message({
+                      message: '联系内勤创建运输任务',
+                      type: 'warning'
+                    });
+                }
+              })
               if(this.warehouseType == '1'){
               if(this.warehouseType == '1'){
                 this.recheckPrice = true
                 this.recheckPrice = true
               }else{
               }else{

+ 1 - 1
src/views/taskManagement/supplyofgoodsedit.vue

@@ -58,7 +58,7 @@
         </el-table-column>
         </el-table-column>
         <el-table-column prop="surplusWeight" class="table_td" label="剩余重量(吨)"></el-table-column>
         <el-table-column prop="surplusWeight" class="table_td" label="剩余重量(吨)"></el-table-column>
         <el-table-column prop="avgCost" class="table_td" label="平均成本(吨)"></el-table-column>
         <el-table-column prop="avgCost" class="table_td" label="平均成本(吨)"></el-table-column>
-        <el-table-column prop="issuingTimeOther" class="table_td" label="入库单日期"></el-table-column>
+        <el-table-column prop="issuingTime" class="table_td" label="入库单日期"></el-table-column>
         <el-table-column prop="outWeight" class="table_td" label="预计出库重量(吨)">
         <el-table-column prop="outWeight" class="table_td" label="预计出库重量(吨)">
             <template slot-scope="scope">
             <template slot-scope="scope">
                 <el-input  @input='outweightchange' v-model="scope.row.estimateOutWarehouseWeight" placeholder="输入本次出库重量"></el-input>
                 <el-input  @input='outweightchange' v-model="scope.row.estimateOutWarehouseWeight" placeholder="输入本次出库重量"></el-input>

+ 1 - 1
src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue

@@ -925,7 +925,7 @@ export default {
           this.$router.push({
           this.$router.push({
             name: 'supplyofgoodsedit',
             name: 'supplyofgoodsedit',
             query: {
             query: {
-              list: JSON.stringify(this.dataList1.sourceRelationInfoList),
+              list: JSON.stringify(this.dataList.sourceRelationInfoList),
               
               
             },
             },
           })
           })