提交车队配载（未完成）

src/api/fleet/ftmsorderbillscars.js

@@ -10,12 +10,20 @@ import request from '@/utils/request'
 // }
 
 
+// 原始// 提交配车列表
+// export function addStowage(data) {
+//   return request({
+//     url: '/fleet/ftmsorderbillscars/addStowage',
+//     method: 'post',
+//     data: data
+//   })
+// }
 // 提交配车列表
 export function addStowage(data) {
   return request({
-    url: '/fleet/ftmsorderbillscars/addStowage',
-    method: 'post',
-    data: data
+    url: '/fleet/ftmsorderbillscars/autoStowage',
+    method: 'get',
+    params: data
   })
 }
 
@@ -27,10 +35,18 @@ export function revokeStowage(id) {
     method: 'get',
   })
 }
+//原来 // 查询可配车列表
+// export function selectStowage(query) {
+//   return request({
+//     url: '/fleet/ftmsorderbillscars/selectStowage',
+//     method: 'get',
+//     params: query
+//   })
+// }
 // 查询可配车列表
 export function selectStowage(query) {
   return request({
-    url: '/fleet/ftmsorderbillscars/selectStowage',
+    url: '/fleet/ftmsorderbillsplans/queryForStowage',
     method: 'get',
     params: query
   })

src/views/kaihe/domesticTrade/orderInformation/index.vue

@@ -1299,11 +1299,11 @@
       <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
       <approval-comments v-if="addOrUpdateVisib" ref="ApprovalComments" @refreshDataList="returnData"
       ></approval-comments>
-      <el-button type="info" :disabled="jumpDonot" v-if="this.form.fBillstatus == 11" @click="modify = false">修 改
+      <el-button type="info" :disabled="jumpDonot" v-if="form.fBillstatus == 11 || form.fBillstatus == 6" @click="modify = false">修 改
       </el-button>
-      <el-button type="success" :disabled="modify" v-if="this.form.fBillstatus == 11" @click="approval(1)">保 存
+      <el-button type="success" :disabled="modify" v-if="form.fBillstatus == 11 || form.fBillstatus == 6" @click="approval(1)">保 存
       </el-button>
-      <el-button type="primary" :disabled="modify" v-if="this.form.fBillstatus == 11 && this.form.moneyStatus < 4"
+      <el-button type="primary" :disabled="modify" v-if="form.fBillstatus == 11 && this.form.moneyStatus < 4"
                  @click="feeSubmission"
       >费用请核
       </el-button>
@@ -1323,7 +1323,7 @@
       >查看审批
       </el-button>
       <el-button type="primary"
-                 v-if="(form.fUpdeteStatus === 4 || form.fUpdeteStatus === 5 || form.fUpdeteStatus === 6 || form.fUpdeteStatus === 2) && (form.fSubmitUpdate == 2 || form.fSubmitUpdate == 4) && (form.fDeleteStatus === 2 || form.fDeleteStatus === 4)"
+                 v-if="(form.fUpdeteStatus === 4 || form.fUpdeteStatus === 5 || form.fUpdeteStatus === 6 || form.fUpdeteStatus === 2) && (form.fSubmitUpdate == 2 || form.fSubmitUpdate == 4) && (form.fDeleteStatus === 2 || form.fDeleteStatus === 4) && dataElist"
                  @click="revisionApproval()"
       >查看审批
       </el-button>
@@ -1560,6 +1560,7 @@ export default {
       warehouseCrList: [],
       estimatedTime: {},
       addOrUpdateVisible: false,
+      dataElist:false,
       addOrUpdateVisib: false,
       warehouseDrList: [],
       goodsList: [],
@@ -1614,6 +1615,7 @@ export default {
   },
   //页面跳转后传递参数
   activated() {
+    if (this.$route.query.testing)this.dataElist = true
     this.modify = true
     let formDate
     if (this.$route.query.list) {
@@ -1680,7 +1682,9 @@ export default {
           this.$set(this.form,'fDetentioncargo',JSON.stringify(this.form.fDetentioncargo))
           this.goodsList = response.rows[0].tWarehousebillsCntrList
           this.estimatedTime = response.rows[0].tVoyageL
-          this.dataList = response.rows[0].tWarehousebillsCntritemsList
+          if (response.rows[0].tWarehousebillsCntritemsList !== null) {
+            this.dataList = response.rows[0].tWarehousebillsCntritemsList
+          }else this.dataList = []
           this.loading = false
           if (response.rows[0].tWarehousebillsfeesDr) {
             this.warehouseDrList = response.rows[0].tWarehousebillsfeesDr
@@ -1911,7 +1915,9 @@ export default {
               })
               this.goodsList = response.rows[0].tWarehousebillsCntrList
               this.estimatedTime = response.rows[0].tVoyageL
-              this.dataList = response.rows[0].tWarehousebillsCntritemsList
+              if (response.rows[0].tWarehousebillsCntritemsList !== null) {
+                this.dataList = response.rows[0].tWarehousebillsCntritemsList
+              }else this.dataList = []
               this.loading = false
               if (response.rows[0].tWarehousebillsfeesDr) {
                 this.warehouseDrList = response.rows[0].tWarehousebillsfeesDr
@@ -2375,9 +2381,9 @@ export default {
       if(response.data.tWarehousebillsCntrList){
         this.goodsList = response.data.tWarehousebillsCntrList
       }
-        if (response.data.tWarehousebillsCntritemsList) {
+        if (response.data.tWarehousebillsCntritemsList !== null) {
           this.dataList = response.data.tWarehousebillsCntritemsList
-        }
+        }else this.dataList = []
         if (response.data.warehousebillsfeesCrList) {
           this.warehouseCrList = response.data.warehousebillsfeesCrList
           for (let item in this.warehouseCrList) {