提交代码

src/views/queue/components/qmsEnFacotory/queueFStart.vue

@@ -784,26 +784,28 @@ export default {
       this.materialList = this.materialList.concat(this.materialList1)
     },
     makeSureMaterial() {
-      console.log(this.materialList)
-      var materialIdList = []
-      this.materialList.forEach(e => {
-        if (materialIdList.indexOf(e.materialId) == -1) {
-          materialIdList.push(e.materialId)
+      if (this.materialList.length > 0) {
+        console.log(this.materialList)
+        var materialIdList = []
+        this.materialList.forEach(e => {
+          if (materialIdList.indexOf(e.materialId) == -1) {
+            materialIdList.push(e.materialId)
+          }
+        })
+        let map = {
+          materialList: materialIdList
         }
-      })
-      let map = {
-        materialList: materialIdList
-      }
-      // this.materialList = []
-      // this.materialList1 = []
-      if (this.activeName == 'first') {
-        this.axios
-          .post('/api/v1/qms/getQueueListByQueueUp?isSpelling=0', map)
-          .then(res => {
-            this.tableData1 = res.data.data
-          })
+        // this.materialList = []
+        // this.materialList1 = []
+        if (this.activeName == 'first') {
+          this.axios
+            .post('/api/v1/qms/getQueueListByQueueUp?isSpelling=0', map)
+            .then(res => {
+              this.tableData1 = res.data.data
+            })
+        }
+        this.table1 = false
       }
-      this.table1 = false
     },
     infomation() {
       this.axios.get('/api/v1/uc/getSteelWarehouse').then(res => {

src/views/sale/components/transportFreight/saleTruckSettlement/bmsTruckDetailsOrderNew.vue

@@ -352,6 +352,28 @@
                 width="150px"
               >
               </el-table-column>
+              <el-table-column
+                prop="priceValue"
+                label="系统建议运价"
+                width="100px"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="detailsAmount"
+                label="系统建议运费"
+                width="100px"
+              ></el-table-column>
+              <el-table-column
+                prop="futurePriceValue"
+                label="最终运价"
+                width="100px"
+              ></el-table-column>
+              <el-table-column
+                prop="futureDetailsAmount"
+                label="最终运费"
+                width="100px"
+              >
+              </el-table-column>
               <el-table-column
                 prop="orderNo"
                 label="运输订单号"
@@ -608,6 +630,28 @@
                 width="150px"
               >
               </el-table-column>
+              <el-table-column
+                prop="priceValue"
+                label="系统建议运价"
+                width="100px"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="detailsAmount"
+                label="系统建议运费"
+                width="100px"
+              ></el-table-column>
+              <el-table-column
+                prop="futurePriceValue"
+                label="最终运价"
+                width="100px"
+              ></el-table-column>
+              <el-table-column
+                prop="futureDetailsAmount"
+                label="最终运费"
+                width="100px"
+              >
+              </el-table-column>
               <el-table-column
                 prop="orderNo"
                 label="运输订单号"
@@ -1218,7 +1262,7 @@ export default {
                 this.getSteelReport()
                 this.dialogFormVisible = false
               } else {
-                this.$message.error('修改详单单价失败,请联系管理员!')
+                this.$message.error('修改失败:'+res.data.data)
                 this.dialogFormVisible = false
               }
             })
@@ -1235,6 +1279,9 @@ export default {
                   // this.operation(this.steelMap)
                   this.getSteelReport()
                   this.dialogFormVisible = false
+                }else {
+                  this.$message.error('修改失败:'+res.data.data)
+                  this.dialogFormVisible = false
                 }
               })
           }