车队

src/api/finance/payment.js

@@ -25,6 +25,13 @@ export function getCharge(fId) {
     method: 'get'
   })
 }
+// 查询财务数据主详细
+export function getCharges(fId) {
+  return request({
+    url: '/finances/payment/' + fId,
+    method: 'get'
+  })
+}
 
 // 新增财务数据主
 export function addCharge(data) {
@@ -34,6 +41,14 @@ export function addCharge(data) {
     data: data
   })
 }
+// 新增财务数据主
+export function addCharges(data) {
+  return request({
+    url: '/finances/payment/add',
+    method: 'post',
+    data: data
+  })
+}
 
 // 修改财务数据主
 export function updateCharge(data) {
@@ -43,6 +58,15 @@ export function updateCharge(data) {
     data: data
   })
 }
+// 修改财务数据主
+export function updateCharges(data) {
+  return request({
+    url: '/finances/payment',
+    method: 'put',
+    data: data
+  })
+}
+
 
 // 删除财务数据主
 export function delCharge(fId) {
@@ -51,6 +75,13 @@ export function delCharge(fId) {
     method: 'delete'
   })
 }
+// 删除财务数据主
+export function delCharges(fId) {
+  return request({
+    url: '/finances/payment/' + fId,
+    method: 'delete'
+  })
+}
 
 // 导出财务数据主
 export function exportCharge(query) {

src/api/fleet/ftmsorderbillscars.js

@@ -76,6 +76,14 @@ export function singleaddFtmsorderbillscars(data) {
     data: data
   })
 }
+//单条变更提交
+export function singleChangeFtmsorderbillscars(data) {
+  return request({
+    url: '/fleet/ftmsorderbillscars/vehicleArrangementChange',
+    method: 'post',
+    data: data
+  })
+}
 //单条订单调度撤销
 export function revokeFtmsorderbillscars(data) {
   return request({

src/views/finance/payment/index.vue

@@ -523,7 +523,7 @@
         <el-table-column label="存货单号" align="center" prop="fBscorpno" />
         <el-table-column label="品名" align="center" prop="fProductName" />
         <el-table-column label="业务日期" align="center" prop="fBsdate">
-          <template slot-scope="scope">
+          <template slot-scope="scope" v-if="scope.row.fBsdate">
             <span>{{ scope.row.fBsdate.slice(0, 10) }}</span>
           </template>
         </el-table-column>
@@ -752,7 +752,11 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="审核日期" prop="timeExamine">
+          <el-form-item
+            label="审核日期"
+            prop="timeExamine"
+            v-if="typevalue == 1"
+          >
             <el-date-picker
               size="small"
               style="width: 240px"
@@ -769,6 +773,7 @@
             label="出入库日期"
             label-width="85px"
             prop="fAccbilldate"
+            v-if="typevalue == 1"
           >
             <el-date-picker
               size="small"
@@ -904,7 +909,7 @@
           prop="fBsdate"
           width="120"
         >
-          <template slot-scope="scope">
+          <template slot-scope="scope" v-if="scope.row.fBsdate">
             <span>{{ scope.row.fBsdate.slice(0, 10) }}</span>
           </template>
         </el-table-column>
@@ -966,8 +971,11 @@ import {
   listCharge,
   listCharges,
   getCharge,
+  getCharges,
   delCharge,
+  delCharges,
   addCharge,
+  addCharges,
   exportCharge,
   search,
   searchs,
@@ -1319,7 +1327,17 @@ export default {
           fFeesName: "", //结算单位
           fCorpid: "", //结算单位ID
         };
-        getCharge(this.approval.billId).then((response) => {
+        // getCharge(this.approval.billId).then((response) => {
+        //   this.Operator = response.data.tFee.createBy;
+        //   this.increase_s = response.data.feeDoList;
+        //   this.fWbuOptions = response.data.feesList;
+        //   this.queryParams = response.data.tFee;
+        //   this.fWbuOptions = response.data.feesList;
+        //   this.fMblnoOptions = response.data.corps;
+        //   this.open = true;
+        //   this.title = "修改付费列表";
+        // });
+        getCharges(this.approval.billId).then((response) => {
           this.Operator = response.data.tFee.createBy;
           this.increase_s = response.data.feeDoList;
           this.fWbuOptions = response.data.feesList;
@@ -1395,7 +1413,65 @@ export default {
     // 查看按钮
     check(row, res) {
       this.notChange = true;
-      getCharge(row.fId).then((response) => {
+      // getCharge(row.fId).then((response) => {
+      //   this.Operator = response.data.tFee.createBy;
+      //   this.increase_s = response.data.feeDoList;
+      //   this.fWbuOptions = response.data.feesList;
+      //   this.queryParams = response.data.tFee;
+      //   this.fWbuOptions = response.data.feesList;
+      //   this.fMblnoOptions = response.data.corps;
+      //   this.open = true;
+      //   this.title = "付费列表";
+      //   this.tablefilter = true;
+      //   if (res == 1) {
+      //     this.notChange = true;
+      //     if (this.Operator == this.Lander) {
+      //       this.tablefilter = false;
+      //       this.reset();
+      //       this.pass = {
+      //         fAmtdr: 0, //应收合计
+      //         fAmtcr: 0, //应付合计
+      //         fMblno: "", //提单号
+      //         fName: "", //货权方
+      //         fFeesName: "", //结算单位
+      //         fCorpid: "", //结算单位ID
+      //       };
+      //       const fId = row.fId || this.ids;
+      //       getCharge(fId).then((response) => {
+      //         this.increase_s = response.data.feeDoList;
+      //         this.fWbuOptions = response.data.feesList;
+      //         this.queryParams = response.data.tFee;
+      //         this.fWbuOptions = response.data.feesList;
+      //         this.fMblnoOptions = response.data.corps;
+      //         this.open = true;
+      //       });
+      //     } else {
+      //       this.notChange = true;
+      //       // this.$message.error('未知异常，请联系管理员')
+      //     }
+      //   } else {
+      //     this.notChange = true;
+      //     this.reset();
+      //     this.pass = {
+      //       fAmtdr: 0, //应收合计
+      //       fAmtcr: 0, //应付合计
+      //       fMblno: "", //提单号
+      //       fName: "", //货权方
+      //       fFeesName: "", //结算单位
+      //       fCorpid: "", //结算单位ID
+      //     };
+      //     const fId = row.fId || this.ids;
+      //     getCharge(fId).then((response) => {
+      //       this.increase_s = response.data.feeDoList;
+      //       this.fWbuOptions = response.data.feesList;
+      //       this.queryParams = response.data.tFee;
+      //       this.fWbuOptions = response.data.feesList;
+      //       this.fMblnoOptions = response.data.corps;
+      //       this.open = true;
+      //     });
+      //   }
+      // });
+      getCharges(row.fId).then((response) => {
         this.Operator = response.data.tFee.createBy;
         this.increase_s = response.data.feeDoList;
         this.fWbuOptions = response.data.feesList;
@@ -1419,7 +1495,7 @@ export default {
               fCorpid: "", //结算单位ID
             };
             const fId = row.fId || this.ids;
-            getCharge(fId).then((response) => {
+            getCharges(fId).then((response) => {
               this.increase_s = response.data.feeDoList;
               this.fWbuOptions = response.data.feesList;
               this.queryParams = response.data.tFee;
@@ -1443,7 +1519,7 @@ export default {
             fCorpid: "", //结算单位ID
           };
           const fId = row.fId || this.ids;
-          getCharge(fId).then((response) => {
+          getCharges(fId).then((response) => {
             this.increase_s = response.data.feeDoList;
             this.fWbuOptions = response.data.feesList;
             this.queryParams = response.data.tFee;
@@ -1861,7 +1937,7 @@ export default {
         fCorpid: "", //结算单位ID
       };
       const fId = row.fId || this.ids;
-      getCharge(fId).then((response) => {
+      getCharges(fId).then((response) => {
         this.Operator = response.data.tFee.createBy;
         this.increase_s = response.data.feeDoList;
         this.fWbuOptions = response.data.feesList;
@@ -1871,6 +1947,16 @@ export default {
         this.open = true;
         this.title = "修改付费列表";
       });
+      //   getCharge(fId).then((response) => {
+      //   this.Operator = response.data.tFee.createBy;
+      //   this.increase_s = response.data.feeDoList;
+      //   this.fWbuOptions = response.data.feesList;
+      //   this.queryParams = response.data.tFee;
+      //   this.fWbuOptions = response.data.feesList;
+      //   this.fMblnoOptions = response.data.corps;
+      //   this.open = true;
+      //   this.title = "修改付费列表";
+      // });
     },
     /** 提交按钮 */
     submitForm() {
@@ -1882,12 +1968,21 @@ export default {
             let formData = new window.FormData();
             formData.append("tFee", JSON.stringify(this.queryParams));
             formData.append("tFeeDo", JSON.stringify(this.increase_s));
-            addCharge(formData).then((response) => {
-              this.msgSuccess("新增成功");
-              // this.increase_s = []
-              // this.open = false
-              this.getList();
-            });
+            if (this.typevalue == 1) {
+              addCharge(formData).then((response) => {
+                this.msgSuccess("新增成功");
+                // this.increase_s = []
+                // this.open = false
+                this.getList();
+              });
+            } else {
+              addCharges(formData).then((response) => {
+                this.msgSuccess("新增成功");
+                // this.increase_s = []
+                // this.open = false
+                this.getList();
+              });
+            }
           } else {
             this.pass.fAmtcr = 0;
             this.pass.fAmtdr = 0;
@@ -1903,12 +1998,21 @@ export default {
             let formData = new window.FormData();
             formData.append("tFee", JSON.stringify(this.queryParams));
             formData.append("tFeeDo", JSON.stringify(this.increase_s));
-            addCharge(formData).then((response) => {
-              this.msgSuccess("修改成功");
-              // this.increase_s = []
-              // this.open = false
-              this.getList();
-            });
+            if (this.typevalue == 1) {
+              addCharge(formData).then((response) => {
+                this.msgSuccess("修改成功");
+                // this.increase_s = []
+                // this.open = false
+                this.getList();
+              });
+            } else {
+              addCharges(formData).then((response) => {
+                this.msgSuccess("修改成功");
+                // this.increase_s = []
+                // this.open = false
+                this.getList();
+              });
+            }
           }
         }
       });
@@ -1967,7 +2071,8 @@ export default {
         type: "warning",
       })
         .then(function () {
-          return delCharge(fIds);
+          // return delCharge(fIds);
+          return delCharges(fIds);
         })
         .then(() => {
           this.getList();

src/views/fleet/scheduling/index.vue

@@ -743,13 +743,13 @@ export default {
             e.billStatus = "提交";
           }
           if (e.billStatus == 20) {
-            e.billStatus = "派车暂存";
+            e.billStatus = "调度暂存";
           }
           if (e.billStatus == 30) {
-            e.billStatus = "派车撤回";
+            e.billStatus = "调度撤回";
           }
           if (e.billStatus == 60) {
-            e.billStatus = "派车提交";
+            e.billStatus = "调度提交";
           }
         });
         this.ftmsorderbillsList = response.rows;
@@ -838,7 +838,7 @@ export default {
       this.reset();
       const id = row.id || this.ids;
       getFtmsorderbillsplans(id).then((response) => {
-            if (response.data.tmsorder.billType) {
+        if (response.data.tmsorder.billType) {
           response.data.tmsorder.billType = response.data.tmsorder.billType.toString();
         }
         if (response.data.tmsorder.polId) {

src/views/fleet/sendcar/AddOrUpdate.vue

@@ -460,7 +460,7 @@
               <el-table :data="schedulingList">
                 <el-table-column label="箱型" align="center" prop="cntrId">
                   <template slot-scope="scope">
-                      <el-select
+                    <el-select
                       v-model="scope.row.cntrId"
                       placeholder="请选择箱型"
                       :disabled="disabled"
@@ -576,7 +576,12 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="货量" align="center" prop="cntrQty">
+                <el-table-column
+                  label="货量"
+                  align="center"
+                  prop="cntrQty"
+                  style="maxwidth: 50px"
+                >
                   <template slot-scope="scope">
                     <el-input
                       v-model="scope.row.cntrQty"
@@ -1253,6 +1258,7 @@ import {
   saveFtmsorderbillscars,
   changeFtmsorderbillscars,
   addFtmsorderbillscars,
+  singleChangeFtmsorderbillscars,
 } from "@/api/fleet/ftmsorderbillscars";
 
 import { listFtmsorderbillss } from "@/api/fleet/carManage";
@@ -1426,9 +1432,9 @@ export default {
     this.username = Cookies.get("userName");
   },
   methods: {
-    carChange(row){
-      let arr=[]
-      arr=this.carManages.filter(e=>e.carNum==row.carregNo)
+    carChange(row) {
+      let arr = [];
+      arr = this.carManages.filter((e) => e.carNum == row.carregNo);
       this.$set(row, "driverName", arr[0].driverName);
       this.$set(row, "driverTel", arr[0].driverTel);
     },
@@ -1437,7 +1443,6 @@ export default {
       let arr = this.schedulingList;
       let arr2 = arr.filter((e) => e.cntrId == row.cntrId);
       row["pid"] = arr2[0].id;
-
     },
     noMorecntrId(e) {
       this.cntrIdList.forEach((item) => (item.noOption = false));
@@ -1686,7 +1691,14 @@ export default {
             });
           });
       } else {
-        if (row.billStatus != 6) {
+        if (row.billStatus == 5) {
+          singleChangeFtmsorderbillscars(row).then((response) => {
+            if (response.code == 200) {
+              this.msgSuccess("成功提交");
+              this.$set(row, "billStatus", 6);
+            }
+          });
+        } else if (row.billStatus != 6) {
           singleaddFtmsorderbillscars(row).then((response) => {
             this.msgSuccess("成功提交");
             if (response.code == 200) {

src/views/fleet/sendcar/index.vue

@@ -757,6 +757,15 @@ export default {
           if (e.billStatus == 6) {
             e.billStatus = "提交";
           }
+          if (e.billStatus == 20) {
+            e.billStatus = "派车暂存";
+          }
+          if (e.billStatus == 30) {
+            e.billStatus = "派车撤回";
+          }
+          if (e.billStatus == 60) {
+            e.billStatus = "派车提交";
+          }
         });
         this.ftmsorderbillsList = response.rows;
         this.total = response.total;