派车校验

src/views/fleet/plans/AddOrUpdate.vue

@@ -1283,11 +1283,11 @@
         >提 交</el-button
       >
       <!-- <el-button type="success" @click="submitFix">修改</el-button> -->
-      <el-button type="success" @click="submitAllowChanges">修 改</el-button>
+      <el-button type="success" @click="submitAllowChanges" :disabled="!this.form.billStatus">修 改</el-button>
       <el-button type="info" @click="submitSave" :disabled="disabled"
         >保 存</el-button
       >
-      <el-button type="warning" @click="submitRetreat">撤 回</el-button>
+      <el-button type="warning" @click="submitRetreat" :disabled="!this.form.billStatus">撤 回</el-button>
       <el-button @click="showDialog = false">取 消</el-button>
     </span>
   </el-dialog>

src/views/fleet/sendcar/AddOrUpdate.vue

@@ -567,7 +567,12 @@
                 </div>
               </div>
               <el-table :data="vehicleList">
-                <el-table-column label="箱型" align="center" prop="cntrId" width="120">
+                <el-table-column
+                  label="箱型"
+                  align="center"
+                  prop="cntrId"
+                  width="120"
+                >
                   <template slot-scope="scope">
                     <el-select
                       v-model="scope.row.cntrId"
@@ -607,7 +612,7 @@
                   label="箱号"
                   align="center"
                   prop="cntrNo"
-                  width="140"
+                  width="145"
                 >
                   <template slot-scope="scope">
                     <el-input
@@ -1558,9 +1563,12 @@ export default {
       tableData.push(obj);
       this.showSure(this.schedulingList);
     },
-      // 添加行
+    // 添加行
     addRow2(tableData, event) {
-      tableData.push({cntrId:this.schedulingList[0].cntrId,pid:this.schedulingList[0].id});
+      tableData.push({
+        cntrId: this.schedulingList[0].cntrId,
+        pid: this.schedulingList[0].id,
+      });
       this.showSure(this.schedulingList);
     },
     //删除行
@@ -1600,6 +1608,9 @@ export default {
     submitForm() {
       this.$refs["form"].validate((valid) => {
         if (valid) {
+          if (!this.vehicleList.length) {
+            return this.msgSuccess("车辆安排不能为空");
+          }
           this.DList.map((e) => {
             return (e.fDc = "D");
           });
@@ -1619,6 +1630,11 @@ export default {
           this.vehicleList.map((e) => {
             num += parseInt(e.cntrQty);
           });
+          for(let li in this.vehicleList) { 
+            if (this.vehicleList[li].billStatus != 6 && this.vehicleList[li].billStatus != 3) {
+              return this.msgSuccess("车辆安排存在未提交的数据");
+            }
+          }
           if (num > this.schedulingList[0].cntrQty) {
             return this.msgSuccess("车辆安排货量已超过计划货量");
           }
@@ -1746,40 +1762,42 @@ export default {
     //单条订单调度提交
     addscarsRow(row) {
       if (row.billStatus == 5) {
-          singleChangeFtmsorderbillscars(row).then((response) => {
-            if (response.code == 200) {
-              this.msgSuccess("成功提交");
-              this.$set(row, "billStatus", 6);
-              this.$set(
-                this.schedulingList[0],
-                "carQty",
-                response.data.plan.carQty
-              );
-            this.$set(row, "orderStatus",response.data.cars.orderStatus);
-            this.$set(row, "orderNo",response.data.cars.orderNo);
-            this.$set(row, "orgId",response.data.cars.orgId);
-            this.$set(row, "id",response.data.cars.id);
-            }
-          });
-        } else if (row.billStatus != 6) {
-          singleaddFtmsorderbillscars(row).then((response) => {
+        singleChangeFtmsorderbillscars(row).then((response) => {
+          if (response.code == 200) {
             this.msgSuccess("成功提交");
-            if (response.code == 200) {
-              this.$set(row, "billStatus", 6);
-              this.$set(
-                this.schedulingList[0],
-                "carQty",
-                response.data.plan.carQty
-              );
-              this.$set(row, "orderStatus",response.data.cars.orderStatus);
-              this.$set(row, "orderNo",response.data.cars.orderNo);
-              this.$set(row, "orgId",response.data.cars.orgId);
-              this.$set(row, "id",response.data.cars.id);
-            }
-          });
-        } else {
-          this.msgSuccess("请勿重复提交");
-        }
+            this.$set(row, "billStatus", 6);
+            this.$set(
+              this.schedulingList[0],
+              "carQty",
+              response.data.plan.carQty
+            );
+            this.$set(row, "orderStatus", response.data.cars.orderStatus);
+            this.$set(row, "orderNo", response.data.cars.orderNo);
+            this.$set(row, "orgId", response.data.cars.orgId);
+            this.$set(row, "id", response.data.cars.id);
+            this.$set(row, "mblno", response.data.cars.mblno);
+          }
+        });
+      } else if (row.billStatus != 6) {
+        singleaddFtmsorderbillscars(row).then((response) => {
+          this.msgSuccess("成功提交");
+          if (response.code == 200) {
+            this.$set(row, "billStatus", 6);
+            this.$set(
+              this.schedulingList[0],
+              "carQty",
+              response.data.plan.carQty
+            );
+            this.$set(row, "orderStatus", response.data.cars.orderStatus);
+            this.$set(row, "orderNo", response.data.cars.orderNo);
+            this.$set(row, "orgId", response.data.cars.orgId);
+            this.$set(row, "id", response.data.cars.id);
+            this.$set(row, "mblno", response.data.cars.mblno);
+          }
+        });
+      } else {
+        this.msgSuccess("请勿重复提交");
+      }
     },
     delscarsRow(index, rows, row) {
       if (row.billStatus != 6 && row.id != null) {
@@ -1804,9 +1822,9 @@ export default {
           if (response.code == 200) {
             this.msgSuccess("成功撤回");
             this.$set(row, "billStatus", 3);
-            this.$set(row, "orderStatus",response.data.cars.orderStatus);
-            this.$set(row, "orgId",response.data.cars.orgId);
-            this.$set(row, "id",response.data.cars.id);
+            this.$set(row, "orderStatus", response.data.cars.orderStatus);
+            this.$set(row, "orgId", response.data.cars.orgId);
+            this.$set(row, "id", response.data.cars.id);
             this.$set(
               this.schedulingList[0],
               "carQty",