Merge branch 'master' of git.echepei.com:zhujiawei/Warehouse_management_ui

src/api/fleet/ftmsorderbills.js

@@ -62,7 +62,7 @@ export function RetreatFtmsorderbills(data) {
 }
 
 
-// 修改
+// 总变更
 export function allowChangesFtmsorderbills(data) {
   return request({
     url: '/fleet/ftmsorderbills/planStatusChange',

src/views/fleet/plans/AddOrUpdate.vue

@@ -645,7 +645,7 @@
                     <el-select
                       v-model="scope.row.cntrId"
                       placeholder="请选择箱型"
-                      :disabled="disabled || scope.row.billStatus == 6"
+                      :disabled="scope.row.billStatus >= 6"
                       @change="checkPid(scope.row)"
                     >
                       <el-option
@@ -664,12 +664,12 @@
                   prop="carcorPid"
                 >
                   <template slot-scope="scope">
-                     <el-select
+                    <el-select
                       v-model="scope.row.carcorPid"
                       placeholder="请输入车队名称"
                       :clearable="true"
                       filterable
-                      :disabled="disabled || scope.row.billStatus == 6"
+                      :disabled="scope.row.billStatus >= 6"
                     >
                       <el-option
                         v-for="(dict, index) in companyList"
@@ -692,7 +692,7 @@
                       v-model="scope.row.cntrQty"
                       placeholder="调度安排货量"
                       v-input-limit="2"
-                      :disabled="disabled || scope.row.billStatus == 6"
+                      :disabled="scope.row.billStatus >= 6"
                     />
                   </template>
                 </el-table-column>
@@ -714,7 +714,7 @@
                     <el-input
                       v-model="scope.row.remarks"
                       placeholder="备注"
-                      :disabled="disabled || scope.row.billStatus == 6"
+                      :disabled="scope.row.billStatus >= 6"
                     />
                   </template>
                 </el-table-column>
@@ -723,7 +723,7 @@
                   label="操作"
                   align="center"
                   class-name="small-padding fixed-width"
-                  width="150"
+                  width="200"
                 >
                   <template slot-scope="scope">
                     <el-button
@@ -733,7 +733,7 @@
                       @click.native.prevent="
                         delplansRow(scope.$index, schedulingList, scope.row)
                       "
-                      :disabled="disabled || scope.row.billStatus == 6"
+                      :disabled="scope.row.billStatus >= 6"
                       >删除</el-button
                     >
                     <el-button
@@ -741,7 +741,7 @@
                       type="text"
                       icon="el-icon-document-checked"
                       @click.native.prevent="addplansRow(scope.row)"
-                      :disabled="disabled || scope.row.billStatus == 6"
+                      :disabled="scope.row.billStatus >= 6"
                       >提交</el-button
                     >
                     <el-button
@@ -754,6 +754,14 @@
                       :disabled="true"
                       >撤销</el-button
                     >
+                    <el-button
+                      size="mini"
+                      type="text"
+                      icon="el-icon-refresh"
+                      @click.native.prevent="changeplansRow(scope.row)"
+                      :disabled="scope.row.billStatus < 6"
+                      >变更</el-button
+                    >
                   </template>
                 </el-table-column>
               </el-table>
@@ -1272,14 +1280,19 @@
         >提 交</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 < 6"
+        >修 改</el-button
+      >
       <el-button type="info" @click="submitSave" :disabled="disabled"
         >保 存</el-button
       >
       <el-button
         type="warning"
         @click="submitRetreat"
-        :disabled="this.form.billStatus != 40"
+        :disabled="this.form.billStatus < 6"
         >撤 回</el-button
       >
       <el-button @click="showDialog = false">取 消</el-button>
@@ -1299,6 +1312,8 @@ import {
   singleaddFtmsorderbillsplans,
   revokeFtmsorderbillsplans,
   removeFtmsorderbillsplans,
+  changeFtmsorderbillsplans,
+  planChangeFtmsorderbillsplans,
 } from "@/api/fleet/ftmsorderbillsplans";
 import { company } from "@/api/fleet/carManage";
 import { listGoods } from "@/api/basicdata/goods";
@@ -1419,8 +1434,8 @@ export default {
       ffeeunitidList: [],
       collapses2: [],
       polList: [],
-      podList:[],
-      companyList:[],
+      podList: [],
+      companyList: [],
       uploadImgUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
       headers: {
         Authorization: "Bearer " + getToken(),
@@ -1465,7 +1480,7 @@ export default {
     listFees().then((response) => {
       this.fWbuOptions = response.rows;
     });
-        company({
+    company({
       delFlag: "0",
       billStatus: 6,
     }).then((response) => {
@@ -1577,9 +1592,11 @@ export default {
     submitForm() {
       this.$refs["form"].validate((valid) => {
         if (valid) {
-          let arr = this.schedulingList.filter((e) => e.billStatus == 6);
+          let arr = this.schedulingList.filter((e) => e.billStatus >= 6);
           if (this.schedulingList.length == arr.length) {
-            this.form["billStatus"] = "6";
+            if (this.form.billStatus != 5) {
+              this.form["billStatus"] = "6";
+            }
             this.DList.map((e) => {
               return (e.fDc = "D");
             });
@@ -1600,6 +1617,7 @@ export default {
             }
             this.form["cntrDesc"] = this.cntrDesc;
             let formData = new window.FormData();
+            console.log(this.form);
             formData.append("tmsorder", JSON.stringify(this.form));
             formData.append(
               "attachs",
@@ -1611,7 +1629,7 @@ export default {
               JSON.stringify(this.DList.concat(this.CList))
             );
             formData.append("plans", JSON.stringify(this.schedulingList));
-            if (this.form.billStatus != 50) {
+            if (this.form.billStatus != 5) {
               addFtmsorderbills(formData).then((response) => {
                 this.msgSuccess("新增成功");
                 this.$parent.getList();
@@ -1658,12 +1676,13 @@ export default {
     },
     //撤回
     submitRetreat() {
-      if (this.form.billStatus <= 3) {
-        const data = { id: this.form.id };
+      if (this.form.billStatus >= 6) {
+        const data = { id: this.form.id,actId: 1000 };
         RetreatFtmsorderbills(data).then((response) => {
           if (response.code == 200) {
             this.msgSuccess("撤回成功");
             this.$parent.getList();
+            this.$set(this.form, "billStatus", 3);
             this.$emit("fixDisabled", "false");
           }
         });
@@ -1673,40 +1692,34 @@ export default {
     },
     //修改
     submitAllowChanges() {
-      this.$emit("fixDisabled", "false");
-      this.msgSuccess("允许修改");
-      // if (this.form.billStatus == 20 || this.form.billStatus == 50) {
-      //   this.$emit("fixDisabled", "false");
-      //   this.msgSuccess("允许修改");
-      // } else if (this.form.billStatus == 30) {
-      //   this.msgSuccess("单据已撤销不允许修改");
-      // } else if (this.form.billStatus > 50) {
-      //   this.msgSuccess("单据已进行业务调度不允许修改");
-      // } else {
-      //   this.$confirm("该单据已经提交，是否进行变更操作?", "提示", {
-      //     confirmButtonText: "确定",
-      //     cancelButtonText: "取消",
-      //     type: "warning",
-      //   })
-      //     .then(() => {
-      //       const data = { id: this.form.id, billType: 1000 };
-      //       allowChangesFtmsorderbills(data).then((response) => {
-      //         if (response.code == 200) {
-      //           this.$emit("fixDisabled", "false");
-      //           this.msgSuccess("允许修改");
-      //           this.$set(this.form, "billStatus", 50);
-      //         } else {
-      //           this.msgSuccess("不允许修改");
-      //         }
-      //       });
-      //     })
-      //     .catch(() => {
-      //       this.$message({
-      //         type: "info",
-      //         message: "已取消",
-      //       });
-      //     });
-      // }
+      if (this.form.billStatus < 6) {
+        this.$emit("fixDisabled", "false");
+        this.msgSuccess("允许修改");
+      } else {
+        this.$confirm("该单据已经提交，是否进行变更操作?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            const data = { id: this.form.id, actId: 1000 };
+            allowChangesFtmsorderbills(data).then((response) => {
+              if (response.code == 200) {
+                this.$emit("fixDisabled", "false");
+                this.msgSuccess("允许修改");
+                this.$set(this.form, "billStatus", 5);
+              } else {
+                this.msgSuccess("不允许修改");
+              }
+            });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消",
+            });
+          });
+      }
     },
     //调度安排新增
     addschedulingRow(tableData, event) {
@@ -1739,11 +1752,18 @@ export default {
     },
     //单条订单调度提交
     addplansRow(row) {
-      console.log(row);
-      if (row.billStatus != 6) {
-        let formData = new window.FormData();
-        formData.append("tmsorder", JSON.stringify(this.form));
-        formData.append("plans", JSON.stringify(row));
+      let formData = new window.FormData();
+      formData.append("tmsorder", JSON.stringify(this.form));
+      formData.append("plans", JSON.stringify(row));
+      if (row.billStatus == 5) {
+        planChangeFtmsorderbillsplans(formData).then((response) => {
+          this.msgSuccess("成功提交");
+          if (response.code == 200) {
+            this.$set(row, "billStatus", 6);
+            this.$set(row, "disabled", true);
+          }
+        });
+      } else if (row.billStatus != 6) {
         singleaddFtmsorderbillsplans(formData).then((response) => {
           this.msgSuccess("成功提交");
           if (response.code == 200) {
@@ -1779,6 +1799,18 @@ export default {
         this.msgSuccess("此条数据没有提交，不能申请撤回");
       }
     },
+    changeplansRow(row) {
+      if (row.billStatus != 5) {
+        changeFtmsorderbillsplans(row).then((response) => {
+          if (response.code == 200) {
+            this.msgSuccess("允许变更");
+            this.$set(row, "billStatus", 5);
+          }
+        });
+      } else {
+        this.msgSuccess("请勿重复变更");
+      }
+    },
     mbinput(val) {
       this.form.mblno = val.toUpperCase();
     },

src/views/fleet/plans/index.vue

@@ -744,13 +744,13 @@ export default {
             e.billStatus = "新建";
           }
           if (e.billStatus == 2) {
-            e.billStatus = "暂存";
+            e.billStatus = "计划暂存";
           }
           if (e.billStatus == 3) {
-            e.billStatus = "撤回";
+            e.billStatus = "计划撤回";
           }
           if (e.billStatus == 6) {
-            e.billStatus = "提交";
+            e.billStatus = "计划提交";
           }
           if (e.billStatus == 20) {
             e.billStatus = "调度暂存";

src/views/fleet/scheduling/AddOrUpdate.vue

@@ -614,7 +614,7 @@
                     icon="el-icon-plus"
                     size="mini"
                     @click="addschedulingRow(schedulingList)"
-                    :disabled="disabled"
+                    :disabled="disabled2"
                     >添加</el-button
                   >
                 </div>
@@ -750,7 +750,7 @@
                       type="text"
                       icon="el-icon-refresh"
                       @click.native.prevent="changeplansRow(scope.row)"
-                      :disabled="disabled"
+                      :disabled="scope.row.billStatus < 6"
                       >变更</el-button
                     >
                   </template>
@@ -1268,17 +1268,17 @@
       </el-form>
     </span>
     <span slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="submitForm" :disabled="disabled"
-        >提交</el-button
+      <el-button type="primary" @click="submitForm" :disabled="disabled2"
+        >提 交</el-button
       >
-      <el-button type="success" @click="submitAllowChanges">修改</el-button>
-      <el-button type="info" @click="submitSave" :disabled="disabled"
+      <el-button type="success" @click="submitAllowChanges">修 改</el-button>
+      <el-button type="info" @click="submitSave" :disabled="disabled2"
         >保 存</el-button
       >
       <el-button
         type="warning"
         @click="submitRetreat"
-        :disabled="this.form.billStatus != 80"
+        :disabled="this.form.billStatus < 6"
         >撤 回</el-button
       >
       <el-button @click="showDialog = false">取 消</el-button>
@@ -1287,7 +1287,7 @@
 </template>
 
 <script>
-import { RetreatFtmsorderbills } from "@/api/fleet/ftmsorderbills";
+import { RetreatFtmsorderbills,allowChangesFtmsorderbills } from "@/api/fleet/ftmsorderbills";
 import {
   singleaddFtmsorderbillsplans,
   revokeFtmsorderbillsplans,
@@ -1579,9 +1579,8 @@ export default {
     submitForm() {
       this.$refs["form"].validate((valid) => {
         if (valid) {
-          let arr = this.schedulingList.filter((e) => e.billStatus == 6);
+          let arr = this.schedulingList.filter((e) => e.billStatus >= 6);
           if (this.schedulingList.length == arr.length) {
-            this.form["billStatus"] = "6";
             this.DList.map((e) => {
               return (e.fDc = "D");
             });
@@ -1614,7 +1613,6 @@ export default {
     },
     //保存
     submitSave() {
-      this.form["billStatus"] = "2";
       this.DList.map((e) => {
         return (e.fDc = "D");
       });
@@ -1638,57 +1636,49 @@ export default {
     },
     //撤回
     submitRetreat() {
-      const id = { id: this.form.id };
+      const id = { id: this.form.id,actId: 1010  };
       RetreatFtmsorderbills(id).then((response) => {
         if (response.code == 200) {
           this.msgSuccess("撤回成功");
           this.$parent.getList();
           this.$emit("fixDisabled", "false");
-          // this.$emit("fixDisabled2", "false");
+          this.$emit("fixDisabled2", "false");
         }
       });
     },
     //修改
     submitAllowChanges() {
-      this.$emit("fixDisabled", "false");
-      // this.$emit("fixDisabled2", "false");
-      this.msgSuccess("允许修改");
-      // if (this.form.billStatus == 70 || this.form.billStatus == 90) {
-      //   this.$emit("fixDisabled", "false");
-      //   this.$emit("fixDisabled2", "false");
-      //   this.msgSuccess("允许修改");
-      // } else if (this.form.billStatus == 40) {
-      //   this.$emit("fixDisabled", "false");
-      //   this.$emit("fixDisabled2", "false");
-      //   this.msgSuccess("允许修改");
-      // } else if (this.form.billStatus == 70) {
-      //   this.msgSuccess("提示单据已撤销不允许修改");
-      // } else if (this.form.billStatus == 80) {
-      //   this.$confirm("该单据已经提交，是否进行变更操作?", "提示", {
-      //     confirmButtonText: "确定",
-      //     cancelButtonText: "取消",
-      //     type: "warning",
-      //   })
-      //     .then(() => {
-      //       updateFtmsorderbillsplans(this.form.id).then((response) => {
-      //         if (response == false) {
-      //           this.msgSuccess("不允许修改");
-      //         } else {
-      //           this.$emit("fixDisabled", "false");
-      //           this.$emit("fixDisabled2", "false");
-      //           this.msgSuccess("允许修改");
-      //         }
-      //       });
-      //     })
-      //     .catch(() => {
-      //       this.$message({
-      //         type: "info",
-      //         message: "已取消",
-      //       });
-      //     });
-      // } else {
-      //   this.msgSuccess("计划变更未提交，不允许修改");
-      // }
+      if (this.form.billStatus < 60) {
+        this.$emit("fixDisabled", "false");
+        this.msgSuccess("允许修改");
+      } else {
+         this.$confirm("该单据已经提交，是否进行变更操作?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            console.log("111")
+            const data = { id: this.form.id, actId: 1010 };
+            allowChangesFtmsorderbills(data).then((response) => {
+              if (response.code == 200) {
+                this.$emit("fixDisabled", "false");
+                this.$emit("fixDisabled2", "false");
+                this.msgSuccess("允许修改");
+                this.$set(this.form, "billStatus", 5);
+              } else {
+                this.msgSuccess("不允许修改");
+              }
+            });
+          })
+          .catch(() => {
+            console.log("111")
+            this.$message({
+              type: "info",
+              message: "已取消",
+            });
+          });
+      }
     },
     //调度安排新增
     addschedulingRow(tableData, event) {
@@ -1774,19 +1764,16 @@ export default {
     },
     changeplansRow(row) {
       if (row.billStatus != 5) {
-        this.msgSuccess("允许变更");
-        this.$set(row, "billStatus", 5);
-        this.$set(row, "disabled", false);
+        changeFtmsorderbillsplans(row).then((response) => {
+          if (response.code == 200) {
+            this.msgSuccess("允许变更");
+            this.$set(row, "billStatus", 5);
+            this.$set(row, "disabled", false);
+          }
+        });
       } else {
         this.msgSuccess("请勿重复变更");
       }
-
-      // changeFtmsorderbillsplans(row).then((response) => {
-      //   if (response.code == 200) {
-      //     this.msgSuccess("允许变更");
-      //     this.$set(row, "billStatus", response.data.billStatus);
-      //   }
-      // });
     },
     total(row) {
       if (row.fQty && row.fUnitprice) {

src/views/fleet/scheduling/index.vue

@@ -737,13 +737,13 @@ export default {
             e.billStatus = "新建";
           }
           if (e.billStatus == 2) {
-            e.billStatus = "暂存";
+            e.billStatus = "计划暂存";
           }
           if (e.billStatus == 3) {
-            e.billStatus = "撤销";
+            e.billStatus = "计划撤销";
           }
           if (e.billStatus == 6) {
-            e.billStatus = "提交";
+            e.billStatus = "计划提交";
           }
           if (e.billStatus == 20) {
             e.billStatus = "调度暂存";
@@ -868,7 +868,7 @@ export default {
         }
         this.disabled = true;
         this.title = "查看订单";
-        if (row.billStatus == 80) {
+        if (response.data.tmsorder.billStatus >6) {
           this.disabled2 = true;
         }
         // this.$refs.addOrUpdateRef.showSure();

src/views/fleet/sendcar/AddOrUpdate.vue

@@ -730,7 +730,7 @@
                       @click.native.prevent="
                         revokescarsRow(scope.$index, vehicleList, scope.row)
                       "
-                      :disabled="true"
+                      :disabled="scope.row.billStatus < 6"
                       >撤销</el-button
                     >
                     <el-button
@@ -738,6 +738,7 @@
                       type="text"
                       icon="el-icon-document-delete"
                       @click.native.prevent="changescarsRow(scope.row)"
+                      :disabled="scope.row.billStatus < 6"
                       >变更</el-button
                     >
                   </template>
@@ -1587,11 +1588,11 @@ export default {
           this.vehicleList.map((e) => {
             return (e.carcorPid = this.schedulingList[0].carcorPid);
           });
-          let num=0
-          this.vehicleList.map(e=>{
-            num+=parseInt(e.cntrQty)
-          })
-          if(num>this.schedulingList[0].cntrQty){
+          let num = 0;
+          this.vehicleList.map((e) => {
+            num += parseInt(e.cntrQty);
+          });
+          if (num > this.schedulingList[0].cntrQty) {
             return this.msgSuccess("车辆安排货量已超过计划货量");
           }
           let arr2 = [];
@@ -1780,11 +1781,18 @@ export default {
       }
     },
     changescarsRow(row) {
-      if (row.billStatus != 5) {
+      if (row.billStatus == 6) {
+        changeFtmsorderbillscars(row.id).then((response) => {
+          if (response.code == 200) {
+            this.msgSuccess("允许变更");
+            this.$set(row, "billStatus", 5);
+          }
+        });
+      } else if (row.billStatus == 5) {
+        this.msgSuccess("请勿重复变更");
+      } else {
         this.msgSuccess("允许变更");
         this.$set(row, "billStatus", 5);
-      } else {
-        this.msgSuccess("请勿重复变更");
       }
     },
     total(row) {

src/views/index.vue

@@ -32,7 +32,7 @@
                       margin: 2px 0 0 5px;
                     "
                   >
-                    新增计划天数
+                    新增柜数
                   </div>
                 </div>
                 <div
@@ -73,7 +73,7 @@
                       margin: 2px 0 0 5px;
                     "
                   >
-                    未安排计划
+                    未安排柜数
                   </div>
                 </div>
                 <div
@@ -113,7 +113,7 @@
                     margin: 2px 0 0 5px;
                   "
                 >
-                  今日可派车数
+                  今日派车数
                 </div>
               </div>
               <div
@@ -151,7 +151,7 @@
                     margin: 2px 0 0 5px;
                   "
                 >
-                  可派车数量
+                  可用车辆数
                 </div>
               </div>
               <div
@@ -172,19 +172,19 @@
         </chi-card>
       </div>
       <div class="home-right">
-        <chi-card title="滚动详情" iconName="el-icon-s-order">
+        <chi-card title="运输中业务" iconName="el-icon-s-order">
           <div slot="content" class="upper-right">
             <div
               style="display: flex; padding: 2px; font-size: 16px"
               v-for="(item, index) in fleetData.upperRight"
               :key="index"
             >
-              <div style="width: 15%">{{ item.mblno }}</div>
+              <div style="width: 25%">{{ item.mblno }}</div>
               <div style="width: 20%">{{ item.carregNo }}</div>
-              <div style="width: 20%">{{ item.orderStatus }}</div>
+              <div style="width: 15%">{{ item.orderStatus }}</div>
               <div
                 style="
-                  width: 45%;
+                  width: 40%;
                   overflow: hidden;
                   text-overflow: ellipsis;
                   white-space: nowrap;

src/views/track/cabinet/AddOrUpdate.vue

@@ -307,7 +307,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-          <el-row>
+        <el-row>
           <el-col :span="6">
             <el-form-item label="车号" prop="carregNo">
               <el-input
@@ -351,6 +351,7 @@
                 size="mini"
                 style="width: 180px"
                 v-input-limit="2"
+                :disabled="disabled"
               />
             </el-form-item>
           </el-col>
@@ -362,6 +363,7 @@
                 size="mini"
                 style="width: 180px"
                 v-input-limit="2"
+                :disabled="disabled"
               />
             </el-form-item>
           </el-col>
@@ -375,6 +377,7 @@
                 type="date"
                 value-format="yyyy-MM-dd"
                 placeholder="选择还卸柜时间"
+                :disabled="disabled"
               >
               </el-date-picker>
             </el-form-item>
@@ -386,6 +389,7 @@
                 placeholder="请输入还卸柜备注"
                 size="mini"
                 style="width: 180px"
+                :disabled="disabled"
               />
             </el-form-item>
           </el-col>
@@ -899,10 +903,10 @@
       </el-collapse>
     </span>
     <span slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="submitForm">提交</el-button>
-      <el-button type="success" @click="submitAllowChanges">修改</el-button>
+      <el-button type="primary" @click="submitForm">提 交</el-button>
+      <el-button type="success" @click="submitAllowChanges">修 改</el-button>
       <el-button type="info" @click="submitSave">保 存</el-button>
-      <el-button type="warning" @click="submitRetreat">撤 回</el-button>
+      <!-- <el-button type="warning" @click="submitRetreat">撤 回</el-button> -->
       <el-button @click="showDialog = false">取 消</el-button>
     </span>
   </el-dialog>
@@ -1135,7 +1139,7 @@ export default {
             "fees",
             JSON.stringify(this.DList.concat(this.CList))
           );
-          formData.append("operationType", "unloadDate");
+          formData.append("operationType", "unLoadDate");
           insertDriverFtmsorderbillscars(formData).then((response) => {
             if (response.code == 200) {
               this.msgSuccess("提交成功");
@@ -1165,7 +1169,7 @@ export default {
       formData.append("cars", JSON.stringify(this.form));
       formData.append("attachs", JSON.stringify(this.relevantAttachments));
       formData.append("fees", JSON.stringify(this.DList.concat(this.CList)));
-      formData.append("operationType", "unloadDate");
+      formData.append("operationType", "unLoadDate");
       driverSaveFtmsorderbillscars(formData).then((response) => {
         if (response.code == 200) {
           this.msgSuccess("保存成功");
@@ -1177,7 +1181,14 @@ export default {
     //撤回
     submitRetreat() {},
     //修改
-    submitAllowChanges() {},
+    submitAllowChanges() {
+      if (this.form.orderStatus <= 60) {
+        this.$emit("fixDisabled", "false");
+        this.msgSuccess("允许修改");
+      } else {
+        this.msgSuccess("不允许修改");
+      }
+    },
 
     //单条订单调度提交
     addscarsRow(row) {},

src/views/track/cabinet/index.vue

@@ -207,30 +207,30 @@
       </el-col>
       <div class="tabSetting">
         <div style="margin-right: 20px">
-           <el-button
-          type="cyan"
-          icon="el-icon-search"
-          size="mini"
-          @click="handleQuery"
-          >搜索</el-button
-        >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-          >重置</el-button
-        >
-        <el-button
-          v-show="show"
-          @click="show = !show"
-          icon="el-icon-arrow-up"
-          size="mini"
-          >展开</el-button
-        >
-        <el-button
-          v-show="!show"
-          @click="show = !show"
-          icon="el-icon-arrow-down"
-          size="mini"
-          >展开</el-button
-        >
+          <el-button
+            type="cyan"
+            icon="el-icon-search"
+            size="mini"
+            @click="handleQuery"
+            >搜索</el-button
+          >
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+            >重置</el-button
+          >
+          <el-button
+            v-show="show"
+            @click="show = !show"
+            icon="el-icon-arrow-up"
+            size="mini"
+            >展开</el-button
+          >
+          <el-button
+            v-show="!show"
+            @click="show = !show"
+            icon="el-icon-arrow-down"
+            size="mini"
+            >展开</el-button
+          >
         </div>
         <right-toolbar
           :showSearch.sync="showSearch"
@@ -366,6 +366,7 @@
       :CList="CList"
       :disabled="disabled"
       @changeShow="showAddOrUpdate"
+      @fixDisabled="fixDisabled"
       ref="addOrUpdateRef"
     ></add-or-update>
   </div>
@@ -419,7 +420,7 @@ export default {
       },
       showSetting: false,
       drag: false,
-      setRowList:[
+      setRowList: [
         {
           surface: "1",
           label: "mdLoadDate",
@@ -907,7 +908,7 @@ export default {
         if (response.data.fees.length) {
           this.DList = response.data.fees.filter((e) => e.fDc == "D");
           this.CList = response.data.fees.filter((e) => e.fDc == "C");
-            response.data.fees.map((e) => {
+          response.data.fees.map((e) => {
             if (e.fFeeunitid) {
               e.fFeeunitid = e.fFeeunitid.toString();
             }
@@ -916,7 +917,9 @@ export default {
           this.DList = [];
           this.CList = [];
         }
-        this.disabled = false;
+        if (response.data.cars.orderStatus >= 60) {
+          this.disabled = true;
+        }
         this.title = "查看装卸柜";
         this.form = response.data.cars;
         this.addOrUpdateVisible = !this.addOrUpdateVisible;
@@ -980,6 +983,11 @@ export default {
         this.addOrUpdateVisible = true;
       }
     },
+    fixDisabled(data) {
+      if (data === "false") {
+        this.disabled = false;
+      }
+    },
   },
 };
 </script>

src/views/track/goods/AddOrUpdate.vue

@@ -351,6 +351,7 @@
                 size="mini"
                 style="width: 180px"
                 v-input-limit="2"
+                :disabled="disabled"
               />
             </el-form-item>
           </el-col>
@@ -362,6 +363,7 @@
                 size="mini"
                 style="width: 180px"
                 v-input-limit="2"
+                :disabled="disabled"
               />
             </el-form-item>
           </el-col>
@@ -375,6 +377,7 @@
                 type="date"
                 value-format="yyyy-MM-dd"
                 placeholder="选择装卸货时间"
+                :disabled="disabled"
               >
               </el-date-picker>
             </el-form-item>
@@ -386,6 +389,7 @@
                 placeholder="请输入装卸货备注"
                 size="mini"
                 style="width: 180px"
+                :disabled="disabled"
               />
             </el-form-item>
           </el-col>
@@ -899,8 +903,8 @@
       </el-collapse>
     </span>
     <span slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="submitForm">提交</el-button>
-      <el-button type="success" @click="submitAllowChanges">修改</el-button>
+      <el-button type="primary" @click="submitForm">提 交</el-button>
+      <el-button type="success" @click="submitAllowChanges">修 改</el-button>
       <el-button type="info" @click="submitSave">保 存</el-button>
       <el-button type="warning" @click="submitRetreat">撤 回</el-button>
       <el-button @click="showDialog = false">取 消</el-button>
@@ -1178,7 +1182,14 @@ export default {
     //撤回
     submitRetreat() {},
     //修改
-    submitAllowChanges() {},
+    submitAllowChanges() {
+      if (this.form.orderStatus <= 50) {
+        this.$emit("fixDisabled", "false");
+        this.msgSuccess("允许修改");
+      } else {
+        this.msgSuccess("不允许修改");
+      }
+    },
 
     //单条订单调度提交
     addscarsRow(row) {},

src/views/track/goods/index.vue

@@ -366,6 +366,7 @@
       :CList="CList"
       :disabled="disabled"
       @changeShow="showAddOrUpdate"
+      @fixDisabled="fixDisabled"
       ref="addOrUpdateRef"
     ></add-or-update>
   </div>
@@ -916,12 +917,19 @@ export default {
           this.DList = [];
           this.CList = [];
         }
-        this.disabled = false;
+         if (response.data.cars.orderStatus >= 50) {
+          this.disabled = true;
+        }
         this.title = "查看装卸货";
         this.form = response.data.cars;
         this.addOrUpdateVisible = !this.addOrUpdateVisible;
       });
     },
+    fixDisabled(data) {
+      if (data === "false") {
+        this.disabled = false;
+      }
+    },
     // //获取到保存并复制
     // getSave(data) {
     //   data.data.map((e) => {s

src/views/track/meetSingle/AddOrUpdate.vue

@@ -351,6 +351,7 @@
                 size="mini"
                 style="width: 180px"
                 v-input-limit="2"
+                :disabled="disabled"
               />
             </el-form-item>
           </el-col>
@@ -362,6 +363,7 @@
                 size="mini"
                 style="width: 180px"
                 v-input-limit="2"
+                :disabled="disabled"
               />
             </el-form-item>
           </el-col>
@@ -375,6 +377,7 @@
                 type="date"
                 value-format="yyyy-MM-dd"
                 placeholder="选择接单时间"
+                :disabled="disabled"
               >
               </el-date-picker>
             </el-form-item>
@@ -386,6 +389,7 @@
                 placeholder="请输入接单备注"
                 size="mini"
                 style="width: 180px"
+                :disabled="disabled"
               />
             </el-form-item>
           </el-col>
@@ -899,8 +903,8 @@
       </el-collapse>
     </span>
     <span slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="submitForm">提交</el-button>
-      <el-button type="success" @click="submitAllowChanges">修改</el-button>
+      <el-button type="primary" @click="submitForm">提 交</el-button>
+      <el-button type="success" @click="submitAllowChanges">修 改</el-button>
       <el-button type="info" @click="submitSave">保 存</el-button>
       <el-button type="warning" @click="submitRetreat">撤 回</el-button>
       <el-button @click="showDialog = false">取 消</el-button>
@@ -1178,7 +1182,14 @@ export default {
     //撤回
     submitRetreat() {},
     //修改
-    submitAllowChanges() {},
+    submitAllowChanges() {
+      if(this.form.orderStatus<=20){
+        this.$emit("fixDisabled", "false");
+        this.msgSuccess("允许修改");
+      }else{
+        this.msgSuccess("不允许修改");
+      }
+    },
 
     //单条订单调度提交
     addscarsRow(row) {},

src/views/track/meetSingle/index.vue

@@ -366,6 +366,7 @@
       :CList="CList"
       :disabled="disabled"
       @changeShow="showAddOrUpdate"
+      @fixDisabled="fixDisabled"
       ref="addOrUpdateRef"
     ></add-or-update>
   </div>
@@ -916,7 +917,9 @@ export default {
           this.DList = [];
           this.CList = [];
         }
-        this.disabled = false;
+        if (response.data.cars.orderStatus >= 20) {
+          this.disabled = true;
+        }
         this.title = "查看接单";
         this.form = response.data.cars;
         this.addOrUpdateVisible = !this.addOrUpdateVisible;
@@ -980,6 +983,11 @@ export default {
         this.addOrUpdateVisible = true;
       }
     },
+    fixDisabled(data) {
+      if (data === "false") {
+        this.disabled = false;
+      }
+    },
   },
 };
 </script>

src/views/track/receipt/AddOrUpdate.vue

@@ -351,6 +351,7 @@
                 size="mini"
                 style="width: 180px"
                 v-input-limit="2"
+                :disabled="disabled"
               />
             </el-form-item>
           </el-col>
@@ -362,6 +363,7 @@
                 size="mini"
                 style="width: 180px"
                 v-input-limit="2"
+                :disabled="disabled"
               />
             </el-form-item>
           </el-col>
@@ -375,6 +377,7 @@
                 type="date"
                 value-format="yyyy-MM-dd"
                 placeholder="选择回单时间"
+                :disabled="disabled"
               >
               </el-date-picker>
             </el-form-item>
@@ -386,6 +389,7 @@
                 placeholder="请输入回单备注"
                 size="mini"
                 style="width: 180px"
+                :disabled="disabled"
               />
             </el-form-item>
           </el-col>
@@ -899,10 +903,10 @@
       </el-collapse>
     </span>
     <span slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="submitForm">提交</el-button>
-      <el-button type="success" @click="submitAllowChanges">修改</el-button>
+      <el-button type="primary" @click="submitForm">提 交</el-button>
+      <el-button type="success" @click="submitAllowChanges">修 改</el-button>
       <el-button type="info" @click="submitSave">保 存</el-button>
-      <el-button type="warning" @click="submitRetreat">撤 回</el-button>
+      <!-- <el-button type="warning" @click="submitRetreat">撤 回</el-button> -->
       <el-button @click="showDialog = false">取 消</el-button>
     </span>
   </el-dialog>
@@ -1178,7 +1182,14 @@ export default {
     //撤回
     submitRetreat() {},
     //修改
-    submitAllowChanges() {},
+        submitAllowChanges() {
+      if(this.form.orderStatus<=80){
+        this.$emit("fixDisabled", "false");
+        this.msgSuccess("允许修改");
+      }else{
+        this.msgSuccess("不允许修改");
+      }
+    },
 
     //单条订单调度提交
     addscarsRow(row) {},

src/views/track/receipt/index.vue

@@ -206,31 +206,31 @@
         >
       </el-col>
       <div class="tabSetting">
-         <div style="margin-right: 20px">
-           <el-button
-          type="cyan"
-          icon="el-icon-search"
-          size="mini"
-          @click="handleQuery"
-          >搜索</el-button
-        >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-          >重置</el-button
-        >
-        <el-button
-          v-show="show"
-          @click="show = !show"
-          icon="el-icon-arrow-up"
-          size="mini"
-          >展开</el-button
-        >
-        <el-button
-          v-show="!show"
-          @click="show = !show"
-          icon="el-icon-arrow-down"
-          size="mini"
-          >展开</el-button
-        >
+        <div style="margin-right: 20px">
+          <el-button
+            type="cyan"
+            icon="el-icon-search"
+            size="mini"
+            @click="handleQuery"
+            >搜索</el-button
+          >
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+            >重置</el-button
+          >
+          <el-button
+            v-show="show"
+            @click="show = !show"
+            icon="el-icon-arrow-up"
+            size="mini"
+            >展开</el-button
+          >
+          <el-button
+            v-show="!show"
+            @click="show = !show"
+            icon="el-icon-arrow-down"
+            size="mini"
+            >展开</el-button
+          >
         </div>
         <right-toolbar
           :showSearch.sync="showSearch"
@@ -366,6 +366,7 @@
       :CList="CList"
       :disabled="disabled"
       @changeShow="showAddOrUpdate"
+      @fixDisabled="fixDisabled"
       ref="addOrUpdateRef"
     ></add-or-update>
   </div>
@@ -419,7 +420,7 @@ export default {
       },
       showSetting: false,
       drag: false,
-      setRowList:[
+      setRowList: [
         {
           surface: "1",
           label: "mdLoadDate",
@@ -916,7 +917,9 @@ export default {
           this.DList = [];
           this.CList = [];
         }
-        this.disabled = false;
+        if (response.data.cars.orderStatus >= 80) {
+          this.disabled = true;
+        }
         this.title = "查看回单";
         this.form = response.data.cars;
         this.addOrUpdateVisible = !this.addOrUpdateVisible;
@@ -980,6 +983,11 @@ export default {
         this.addOrUpdateVisible = true;
       }
     },
+    fixDisabled(data) {
+      if (data === "false") {
+        this.disabled = false;
+      }
+    },
   },
 };
 </script>

src/views/track/singleCost/AddOrUpdate.vue

@@ -440,9 +440,9 @@
     </span>
     <span slot="footer" class="dialog-footer">
       <el-button type="primary" :disabled="disabled" @click="submitForm"
-        >提交</el-button
+        >提 交</el-button
       >
-      <el-button type="success" @click="submitAllowChanges">修改</el-button>
+      <el-button type="success" @click="submitAllowChanges">修 改</el-button>
       <el-button type="info" :disabled="disabled" @click="submitSave"
         >保 存</el-button
       >

src/views/track/singleCost/index.vue

@@ -637,6 +637,7 @@ export default {
       transPropList: [],
       transTypeList: [],
       billTypeList: [],
+      show:false,
     };
   },
   // 使用子组件

src/views/track/suitcase/AddOrUpdate.vue

@@ -307,7 +307,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-          <el-row>
+        <el-row>
           <el-col :span="6">
             <el-form-item label="车号" prop="carregNo">
               <el-input
@@ -351,6 +351,7 @@
                 size="mini"
                 style="width: 180px"
                 v-input-limit="2"
+                :disabled="disabled"
               />
             </el-form-item>
           </el-col>
@@ -362,6 +363,7 @@
                 size="mini"
                 style="width: 180px"
                 v-input-limit="2"
+                :disabled="disabled"
               />
             </el-form-item>
           </el-col>
@@ -375,6 +377,7 @@
                 type="date"
                 value-format="yyyy-MM-dd"
                 placeholder="选择提箱时间"
+                :disabled="disabled"
               >
               </el-date-picker>
             </el-form-item>
@@ -386,6 +389,7 @@
                 placeholder="请输入提箱备注"
                 size="mini"
                 style="width: 180px"
+                :disabled="disabled"
               />
             </el-form-item>
           </el-col>
@@ -899,10 +903,10 @@
       </el-collapse>
     </span>
     <span slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="submitForm">提交</el-button>
-      <el-button type="success" @click="submitAllowChanges">修改</el-button>
+      <el-button type="primary" @click="submitForm">提 交</el-button>
+      <el-button type="success" @click="submitAllowChanges">修 改</el-button>
       <el-button type="info" @click="submitSave">保 存</el-button>
-      <el-button type="warning" @click="submitRetreat">撤 回</el-button>
+      <!-- <el-button type="warning" @click="submitRetreat">撤 回</el-button> -->
       <el-button @click="showDialog = false">取 消</el-button>
     </span>
   </el-dialog>
@@ -1178,7 +1182,14 @@ export default {
     //撤回
     submitRetreat() {},
     //修改
-    submitAllowChanges() {},
+    submitAllowChanges() {
+      if (this.form.orderStatus <= 40) {
+        this.$emit("fixDisabled", "false");
+        this.msgSuccess("允许修改");
+      } else {
+        this.msgSuccess("不允许修改");
+      }
+    },
 
     //单条订单调度提交
     addscarsRow(row) {},

src/views/track/suitcase/index.vue

@@ -366,6 +366,7 @@
       :CList="CList"
       :disabled="disabled"
       @changeShow="showAddOrUpdate"
+      @fixDisabled="fixDisabled"
       ref="addOrUpdateRef"
     ></add-or-update>
   </div>
@@ -916,7 +917,9 @@ export default {
           this.DList = [];
           this.CList = [];
         }
-        this.disabled = false;
+        if (response.data.cars.orderStatus >= 40) {
+          this.disabled = true;
+        }
         this.title = "查看提箱";
         this.form = response.data.cars;
         this.addOrUpdateVisible = !this.addOrUpdateVisible;
@@ -980,6 +983,11 @@ export default {
         this.addOrUpdateVisible = true;
       }
     },
+    fixDisabled(data) {
+      if (data === "false") {
+        this.disabled = false;
+      }
+    },
   },
 };
 </script>