提交费用修改

src/api/basicdata/fees.js

@@ -9,6 +9,7 @@ export function listFees(query) {
   })
 }
 
+
 // 查询费用信息详细
 export function getFees(fId) {
   return request({
@@ -50,4 +51,4 @@ export function exportFees(query) {
     method: 'get',
     params: query
   })
-}
+}

src/api/fleet/ftmsorderbillscars.js

@@ -204,3 +204,10 @@ export function insertDriverFtmsorderbillscars(data) {
     data: data
   })
 }
+//查询权限
+export function permissionQuery() {
+  return request({
+    url: 'getInfo',
+    method: 'get'
+  })
+}

src/views/Warehousing/cargoClearance/AddOrUpdate.vue

@@ -3270,10 +3270,10 @@ export default {
       };
     },
     tfNetweight(row) {
-      this.tfNetweightnum = (row / 1000).toFixed(2);
+      this.tfNetweightnum = (row / 1000).toFixed(4);
     },
     tfGrossweight(row) {
-      this.tfGrossweightnum = (row / 1000).toFixed(2);
+      this.tfGrossweightnum = (row / 1000).toFixed(4);
     },
     //列设置全选
     allChecked() {
@@ -3981,8 +3981,8 @@ export default {
         this.$set(this.form, "fBstifime", Date.parse(this.form.fBstime));
         this.$set(this.form, "createTime", Date.parse(this.form.createTime));
         this.$set(this.form, "fFeetUnit", this.form.fFeetunit);
-        this.tfNetweightnum = (this.form.fPlannetweight / 1000).toFixed(2);
-        this.tfGrossweightnum = (this.form.fPlangrossweight / 1000).toFixed(2);
+        this.tfNetweightnum = (this.form.fPlannetweight / 1000).toFixed(4);
+        this.tfGrossweightnum = (this.form.fPlangrossweight / 1000).toFixed(4);
         if (this.form.fCartype || this.form.fCartype == 0) {
           this.$set(this.form, "fCartype", this.form.fCartype.toString());
         }
@@ -4422,9 +4422,9 @@ export default {
             }
           }, 0);
           if (column.property === "fGrossweight") {
-            sums[index] = (sums[index] / 1000).toFixed(2) + "吨";
+            sums[index] = (sums[index] / 1000).toFixed(4) + "吨";
           } else if (column.property === "fNetweight") {
-            sums[index] = (sums[index] / 1000).toFixed(2) + "吨";
+            sums[index] = (sums[index] / 1000).toFixed(4) + "吨";
           } else {
             sums[index] = sums[index].toFixed(2);
           }

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -1499,7 +1499,7 @@
                     v-input-limit="2"
                     style="width: 100%"
                     placeholder="毛重">
-                  <template slot="append">{{ (importList.fPlangrossweight / 1000).toFixed(2) }}吨</template>
+                  <template slot="append">{{ (importList.fPlangrossweight / 1000).toFixed(4) }}吨</template>
                 </el-input>
               </el-form-item>
             </el-col>
@@ -1511,7 +1511,7 @@
                     style="width: 100%"
                     placeholder="净重"
                 >
-                  <template slot="append">{{ (importList.fPlannetweight / 1000).toFixed(2) }}吨</template>
+                  <template slot="append">{{ (importList.fPlannetweight / 1000).toFixed(4) }}吨</template>
                 </el-input>
               </el-form-item>
             </el-col>
@@ -3015,8 +3015,8 @@
               <td>{{ item.fMblno }}</td>
               <td>{{ item.fCntrno }}</td>
               <td>{{ item.fQty }}</td>
-              <td>{{ (item.fGrossweight / 1000).toFixed(2) }}</td>
-              <td>{{ (item.fNetweight / 1000).toFixed(2) }}</td>
+              <td>{{ (item.fGrossweight / 1000).toFixed(4) }}</td>
+              <td>{{ (item.fNetweight / 1000).toFixed(4) }}</td>
               <td>{{ item.remark }}</td>
             </tr>
             <tr>
@@ -3398,8 +3398,8 @@
               <td>{{ item.fQty }}</td>
               <td>{{ item.fWarehouseInformation }}</td>
               <td>{{ item.fQty }}</td>
-              <td>{{ (item.fNetweight / 1000).toFixed(2) }}</td>
-              <td>{{ (item.fGrossweight / 1000).toFixed(2) }}</td>
+              <td>{{ (item.fNetweight / 1000).toFixed(4) }}</td>
+              <td>{{ (item.fGrossweight / 1000).toFixed(4) }}</td>
               <td>{{ item.remark }}</td>
             </tr>
             <tr>
@@ -3689,8 +3689,8 @@
               <td>{{ item.fMblno }}</td>
               <td>{{ item.fCntrno }}</td>
               <td>{{ item.fQty }}</td>
-              <td>{{ (item.fGrossweight / 1000).toFixed(2) }}</td>
-              <td>{{ (item.fNetweight / 1000).toFixed(2) }}</td>
+              <td>{{ (item.fGrossweight / 1000).toFixed(4) }}</td>
+              <td>{{ (item.fNetweight / 1000).toFixed(4) }}</td>
               <td>{{ item.remark }}</td>
             </tr>
             <tr>
@@ -4197,8 +4197,8 @@
               <td>{{ item.fMblno }}</td>
               <td>{{ item.fCntrno }}</td>
               <td>{{ item.fQty }}</td>
-              <td>{{ (item.fGrossweight / 1000).toFixed(2) }}</td>
-              <td>{{ (item.fNetweight / 1000).toFixed(2) }}</td>
+              <td>{{ (item.fGrossweight / 1000).toFixed(4) }}</td>
+              <td>{{ (item.fNetweight / 1000).toFixed(4) }}</td>
               <td>{{ item.remark }}</td>
             </tr>
             <tr>
@@ -4580,8 +4580,8 @@
               <td>{{ item.fQty }}</td>
               <td>{{ item.fWarehouseInformation }}</td>
               <td>{{ item.fQty }}</td>
-              <td>{{ (item.fNetweight / 1000).toFixed(2) }}</td>
-              <td>{{ (item.fGrossweight / 1000).toFixed(2) }}</td>
+              <td>{{ (item.fNetweight / 1000).toFixed(4) }}</td>
+              <td>{{ (item.fGrossweight / 1000).toFixed(4) }}</td>
               <td>{{ item.remark }}</td>
             </tr>
             <tr>
@@ -4871,8 +4871,8 @@
               <td>{{ item.fMblno }}</td>
               <td>{{ item.fCntrno }}</td>
               <td>{{ item.fQty }}</td>
-              <td>{{ (item.fGrossweight / 1000).toFixed(2) }}</td>
-              <td>{{ (item.fNetweight / 1000).toFixed(2) }}</td>
+              <td>{{ (item.fGrossweight / 1000).toFixed(4) }}</td>
+              <td>{{ (item.fNetweight / 1000).toFixed(4) }}</td>
               <td>{{ item.remark }}</td>
             </tr>
             <tr>
@@ -5371,8 +5371,8 @@
               <td>{{ item.fMblno }}</td>
               <td>{{ item.fCntrno }}</td>
               <td>{{ item.fQty }}</td>
-              <td>{{ (item.fGrossweight / 1000).toFixed(2) }}</td>
-              <td>{{ (item.fNetweight / 1000).toFixed(2) }}</td>
+              <td>{{ (item.fGrossweight / 1000).toFixed(4) }}</td>
+              <td>{{ (item.fNetweight / 1000).toFixed(4) }}</td>
               <td>{{ item.remark }}</td>
             </tr>
             <tr>
@@ -6502,16 +6502,16 @@ export default {
       };
     },
     tfNetweight(row) {
-      this.tfNetweightnum = (row / 1000).toFixed(2);
+      this.tfNetweightnum = (row / 1000).toFixed(4);
     },
     tfNetweight2(row) {
-      this.tfNetweightnum2 = (row / 1000).toFixed(2);
+      this.tfNetweightnum2 = (row / 1000).toFixed(4);
     },
     tfGrossweight(row) {
-      this.tfGrossweightnum = (row / 1000).toFixed(2);
+      this.tfGrossweightnum = (row / 1000).toFixed(4);
     },
     tfGrossweight2(row) {
-      this.tfGrossweightnum2 = (row / 1000).toFixed(2);
+      this.tfGrossweightnum2 = (row / 1000).toFixed(4);
     },
     //列设置全选
     allChecked() {
@@ -7077,8 +7077,8 @@ export default {
           Date.parse(this.form.freeContainerDate)
       );
       this.$set(this.form, "fFeetUnit", this.form.fFeetunit);
-      this.tfNetweightnum = (this.form.fPlannetweight / 1000).toFixed(2);
-      this.tfGrossweightnum = (this.form.fPlangrossweight / 1000).toFixed(2);
+      this.tfNetweightnum = (this.form.fPlannetweight / 1000).toFixed(4);
+      this.tfGrossweightnum = (this.form.fPlangrossweight / 1000).toFixed(4);
       if (this.form.fTrademodeid) {
         this.$set(this.form, "fTrademodeid", this.form.fTrademodeid.toString());
       }
@@ -7739,9 +7739,9 @@ export default {
             }
           }, 0);
           if (column.property === "fGrossweight") {
-            sums[index] = (sums[index] / 1000).toFixed(2) + "吨";
+            sums[index] = (sums[index] / 1000).toFixed(4) + "吨";
           } else if (column.property === "fNetweight") {
-            sums[index] = (sums[index] / 1000).toFixed(2) + "吨";
+            sums[index] = (sums[index] / 1000).toFixed(4) + "吨";
           } else {
             sums[index] = sums[index].toFixed(2);
           }
@@ -7756,25 +7756,25 @@ export default {
         let Num2 =
             Number(this.importList.fPlangrossweight) / Number(this.importList.fPlanqty);
         this.importList.fNetweight = Number(
-            (this.importList.fQty * Num1).toFixed(2)
+            (this.importList.fQty * Num1).toFixed(4)
         );
-        this.tfNetweightnum2 = (this.importList.fNetweight / 1000).toFixed(2);
+        this.tfNetweightnum2 = (this.importList.fNetweight / 1000).toFixed(4);
         this.importList.fGrossweight = Number(
-            (this.importList.fQty * Num2).toFixed(2)
+            (this.importList.fQty * Num2).toFixed(4)
         );
-        this.tfGrossweightnum2 = (this.importList.fGrossweight / 1000).toFixed(2);
+        this.tfGrossweightnum2 = (this.importList.fGrossweight / 1000).toFixed(4);
       } else {
         let Num1 = Number(this.form.fPlannetweight) / Number(this.form.fPlanqty);
         let Num2 =
             Number(this.form.fPlangrossweight) / Number(this.form.fPlanqty);
         this.importList.fNetweight = Number(
-            (this.importList.fQty * Num1).toFixed(2)
+            (this.importList.fQty * Num1).toFixed(4)
         );
-        this.tfNetweightnum2 = (this.importList.fNetweight / 1000).toFixed(2);
+        this.tfNetweightnum2 = (this.importList.fNetweight / 1000).toFixed(4);
         this.importList.fGrossweight = Number(
-            (this.importList.fQty * Num2).toFixed(2)
+            (this.importList.fQty * Num2).toFixed(4)
         );
-        this.tfGrossweightnum2 = (this.importList.fGrossweight / 1000).toFixed(2);
+        this.tfGrossweightnum2 = (this.importList.fGrossweight / 1000).toFixed(4);
       }
     },
     imporComputer() {
@@ -7867,11 +7867,11 @@ export default {
             this.importList.fGrossweight = this.Printinglist[0].fGrossweight;
             this.importList.fNetweight = this.Printinglist[0].fNetweight;
             this.tfNetweightnum2 = (this.importList.fNetweight / 1000).toFixed(
-                2
+                4
             );
             this.tfGrossweightnum2 = (
                 this.importList.fGrossweight / 1000
-            ).toFixed(2);
+            ).toFixed(4);
           }
           this.weightList = true;
         }
@@ -8094,8 +8094,8 @@ export default {
         this.fWarehouseidOptions = response.data;
       });
       this.allfPlanqty += row.fQty;
-      this.tfNetweightnum2 = (row.fNetweight / 1000).toFixed(2);
-      this.tfGrossweightnum2 = (row.fGrossweight / 1000).toFixed(2);
+      this.tfNetweightnum2 = (row.fNetweight / 1000).toFixed(4);
+      this.tfGrossweightnum2 = (row.fGrossweight / 1000).toFixed(4);
       row.fBsdate = new Date(row.fBsdate).getTime();
       row.fBusinessType = row.fBusinessType.toString();
       row.fCntrtype = Number(row.fCntrtype);

src/views/Warehousing/inStock/index.vue

@@ -904,10 +904,10 @@ export default {
             }
           }, 0);
           if (column.property === "fGrossweight") {
-            sums[index] = (sums[index] / 1000).toFixed(2) + "吨";
+            sums[index] = (sums[index] / 1000).toFixed(4) + "吨";
           }
           if (column.property === "fNetweight") {
-            sums[index] = (sums[index] / 1000).toFixed(2) + "吨";
+            sums[index] = (sums[index] / 1000).toFixed(4) + "吨";
           }
           if (column.property === "fQty") {
             sums[index] = sums[index].toFixed(2);

src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -4171,10 +4171,10 @@ export default {
       };
     },
     tfNetweight(row) {
-      this.tfNetweightnum = (row / 1000).toFixed(2);
+      this.tfNetweightnum = (row / 1000).toFixed(4);
     },
     tfGrossweight(row) {
-      this.tfGrossweightnum = (row / 1000).toFixed(2);
+      this.tfGrossweightnum = (row / 1000).toFixed(4);
     },
     //列设置全选
     allChecked() {
@@ -5007,8 +5007,8 @@ export default {
         this.$set(this.form, "fBstifime", Date.parse(this.form.fBstime));
         this.$set(this.form, "createTime", Date.parse(this.form.createTime));
         this.$set(this.form, "fFeetUnit", this.form.fFeetunit);
-        this.tfNetweightnum = (this.form.fPlannetweight / 1000).toFixed(2);
-        this.tfGrossweightnum = (this.form.fPlangrossweight / 1000).toFixed(2);
+        this.tfNetweightnum = (this.form.fPlannetweight / 1000).toFixed(4);
+        this.tfGrossweightnum = (this.form.fPlangrossweight / 1000).toFixed(4);
         if (this.form.fCartype || this.form.fCartype == 0) {
           this.$set(this.form, "fCartype", this.form.fCartype.toString());
         }
@@ -5634,9 +5634,9 @@ export default {
             }
           }, 0);
           if (column.property === "fGrossweight") {
-            sums[index] = (sums[index] / 1000).toFixed(2) + "吨";
+            sums[index] = (sums[index] / 1000).toFixed(4) + "吨";
           } else if (column.property === "fNetweight") {
-            sums[index] = (sums[index] / 1000).toFixed(2) + "吨";
+            sums[index] = (sums[index] / 1000).toFixed(4) + "吨";
           } else {
             sums[index] = sums[index].toFixed(2);
           }

src/views/Warehousing/outStock/index.vue

@@ -873,10 +873,10 @@ export default {
             }
           }, 0);
           if (column.property === "fGrossweight") {
-            sums[index] = sums[index].toFixed(2) + "吨";
+            sums[index] = sums[index].toFixed(4) + "吨";
           }
           if (column.property === "fNetweight") {
-            sums[index] = sums[index].toFixed(2) + "吨";
+            sums[index] = sums[index].toFixed(4) + "吨";
           }
           if (column.property === "fQty") {
             sums[index] = sums[index].toFixed(2);

src/views/Warehousing/stockTransfer/AddOrUpdate.vue

@@ -2817,8 +2817,8 @@
               <td>{{ item.fCntrno }}</td>
               <td>{{ item.fOrgwarehouseInformation }}</td>
               <td>{{ item.fQty }}</td>
-              <td>{{ (item.fGrossweight/1000).toFixed(2) }}</td>
-              <td>{{ (item.fNetweight/1000).toFixed(2) }}</td>
+              <td>{{ (item.fGrossweight/1000).toFixed(4) }}</td>
+              <td>{{ (item.fNetweight/1000).toFixed(4) }}</td>
 
               <td>{{ item.fWarehouseInformation }}</td>
             </tr>
@@ -3694,10 +3694,10 @@ export default {
       };
     },
     tfNetweight(row) {
-      this.tfNetweightnum = (row / 1000).toFixed(2);
+      this.tfNetweightnum = (row / 1000).toFixed(4);
     },
     tfGrossweight(row) {
-      this.tfGrossweightnum = (row / 1000).toFixed(2);
+      this.tfGrossweightnum = (row / 1000).toFixed(4);
     },
     //列设置全选
     allChecked() {
@@ -4387,8 +4387,8 @@ export default {
         this.$set(this.form, "fBstifime", Date.parse(this.form.fBstime));
         this.$set(this.form, "createTime", Date.parse(this.form.createTime));
         this.$set(this.form, "fFeetUnit", this.form.fFeetunit);
-        this.tfNetweightnum = (this.form.fPlannetweight / 1000).toFixed(2);
-        this.tfGrossweightnum = (this.form.fPlangrossweight / 1000).toFixed(2);
+        this.tfNetweightnum = (this.form.fPlannetweight / 1000).toFixed(4);
+        this.tfGrossweightnum = (this.form.fPlangrossweight / 1000).toFixed(4);
         if (this.form.fCartype || this.form.fCartype == 0) {
           this.$set(this.form, "fCartype", this.form.fCartype.toString());
         }
@@ -4917,9 +4917,9 @@ export default {
             }
           }, 0);
           if (column.property === "fGrossweight") {
-            sums[index] = (sums[index] / 1000).toFixed(2) + "吨";
+            sums[index] = (sums[index] / 1000).toFixed(4) + "吨";
           } else if (column.property === "fNetweight") {
-            sums[index] = (sums[index] / 1000).toFixed(2) + "吨";
+            sums[index] = (sums[index] / 1000).toFixed(4) + "吨";
           } else {
             sums[index] = sums[index].toFixed(2);
           }

src/views/Warehousing/stockTransfer/index.vue

@@ -832,10 +832,10 @@ export default {
             }
           }, 0);
           if (column.property === "fGrossweight") {
-            sums[index] = (sums[index] / 1000).toFixed(2) + "吨";
+            sums[index] = (sums[index] / 1000).toFixed(4) + "吨";
           }
           if (column.property === "fNetweight") {
-            sums[index] = (sums[index] / 1000).toFixed(2) + "吨";
+            sums[index] = (sums[index] / 1000).toFixed(4) + "吨";
           }
           if (column.property === "fQty") {
             sums[index] = sums[index].toFixed(2);

src/views/track/cabinet/AddOrUpdate.vue

@@ -778,10 +778,9 @@
                     icon="el-icon-plus"
                     size="small"
                     @click="feeChange"
-                    :disabled="form.orderStatus !== 80"
+                    v-if="permission"
                     v-hasPermi="['fleet:vehicleStatus:edit']"
-                >费用变更</el-button
-                >
+                >费用变更</el-button>
               </div>
             </div>
           </div>
@@ -1007,6 +1006,7 @@
               <template slot-scope="scope">
                 <span v-if="scope.row.actId == 1080">费用确认</span>
                 <span v-if="scope.row.actId == 1090">追加费用</span>
+                <span v-if="scope.row.actId == 1100">费用变更</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -1280,6 +1280,7 @@ import {
   removeFtmsorderbillscars,
   driverSaveFtmsorderbillscars,
   insertDriverFtmsorderbillscars,
+  permissionQuery
 } from "@/api/fleet/ftmsorderbillscars";
 import { getBasicInformation } from "@/api/kaihe/basicdata/container";
 import { listGoods } from "@/api/basicdata/goods";
@@ -1361,6 +1362,7 @@ export default {
       },
       jFeetunitOptions: [],
       detailsHidden: false,
+      permission:false
     };
   },
   created() {
@@ -1409,8 +1411,22 @@ export default {
     });
     this.userType = Cookies.get("userType");
     this.username = Cookies.get("userName");
+    this.jurisdiction()
   },
   methods: {
+    //查询权限
+    jurisdiction(){
+      permissionQuery().then(res =>{
+        for (let item in res.roles){
+          console.log(res.roles)
+          if (res.roles[item] == 'FeeRevisionAuditor' || res.roles[item] == 'admin'){
+            return this.permission = true
+          }else {
+            return this.permission = false
+          }
+        }
+      })
+    },
     //费用变更
     feeChange(){
       this.showDialog = false
@@ -1946,7 +1962,7 @@ export default {
     submitRetreat() {},
     //修改
     submitAllowChanges() {
-      if (this.form.orderStatus <= 60) {
+      if (this.form.orderStatus >= 60) {
         this.$emit("fixDisabled", "false");
         this.msgSuccess("允许修改");
       } else {
@@ -2048,9 +2064,8 @@ export default {
     revokescarsRow(index, rows, row) {},
     changescarsRow(row) {},
     total(row) {
-      console.log(row);
-      if (row.fQty && row.fUnitprice) {
-        this.$set(row, "fAmount", (row.fQty * row.fUnitprice).toFixed(2));
+      if (row.fBillingQty && row.fUnitprice) {
+        this.$set(row, "fAmount", (row.fBillingQty * row.fUnitprice).toFixed(2));
       } else {
         this.$set(row, "fAmount", 0);
       }

src/views/track/costModification/AddOrUpdate.vue

@@ -319,6 +319,7 @@
       <template slot-scope="scope">
         <span v-if="scope.row.actId == 1080">费用确认</span>
         <span v-if="scope.row.actId == 1090">追加费用</span>
+        <span v-if="scope.row.actId == 1100">费用变更</span>
       </template>
     </el-table-column>
     <el-table-column
@@ -333,9 +334,8 @@
             size="mini"
             type="text"
             icon="el-icon-delete"
-            :disabled="form.orderStatus === 80"
             @click.native.prevent="change(scope)"
-        >变更</el-button>
+        >导入</el-button>
     </template>
     </el-table-column>
 </el-table>
@@ -352,9 +352,9 @@
             type="primary"
             icon="el-icon-plus"
             size="mini"
+            :disabled="storageClick"
             @click="addRelevtTwo"
-            :disabled="form.orderStatus === 80"
-        >保存</el-button>
+        >保 存</el-button>
   </div>
 </div>
 </div>
@@ -523,6 +523,7 @@
   <template slot-scope="scope">
     <span v-if="scope.row.actId == 1080">费用确认</span>
     <span v-if="scope.row.actId == 1090">追加费用</span>
+    <span v-if="scope.row.actId == 1100">费用变更</span>
   </template>
 </el-table-column>
 <el-table-column prop="remarks" label="录入人" align="center"></el-table-column>
@@ -558,6 +559,7 @@
       type="text"
       icon="el-icon-delete"
       :disabled="scope.row.fBillstatus === 6"
+      v-if="scope.row.fId"
       @click.native.prevent="changerequest(scope)"
     >请核</el-button>
 </template>
@@ -616,14 +618,14 @@
       >修 改</el-button
       >
       <el-button
-          type="info"
+          type="primary"
           @click="addRelevtTwo"
+          :disabled="storageClick"
           v-hasPermi="['fleet:vehicleStatus:edit']"
-          :disabled="form.orderStatus == 80"
       >保 存</el-button
       >
       <!-- <el-button type="warning" @click="submitRetreat">撤 回</el-button> -->
-      <el-button @click="showDialog = false">取 消</el-button>
+      <el-button @click="showDialog = false;disabledtwo = true">取 消</el-button>
     </span>
   </el-dialog>
 </template>
@@ -710,6 +712,7 @@ export default {
       priceTypeList: [],
       userType: null,
       username: null,
+      storageClick:false,
       collapses: [],
       fMblnoOptions: [],
       fMblnoOptions2: [],
@@ -782,18 +785,22 @@ export default {
   methods: {
     //变更按钮
     change(scope){
-      console.log(scope)
-      for (let item in this.formfeesList){
-        if (scope.row.fId === this.formfeesList[item].fId) {
-          this.$message({
-            showClose: true,
-            message: '已有相同单据',
-            type: 'error'
-          });
-        }
-      }
-      scope.row.fId = ''
-      this.formfeesList.push(scope.row)
+      console.log(scope.row)
+      let list = JSON.parse(JSON.stringify(scope.row))
+      list.fId = ''
+      list.fBillstatus = ''
+      list.actId = 1100
+      this.formfeesList.push(list)
+      // for (let item in this.formfeesList){
+      //   if (scope.row.fId === this.formfeesList[item].fId) {
+      //     this.$message({
+      //       showClose: true,
+      //       message: '已有相同单据',
+      //       type: 'error'
+      //     });
+      //     return
+      //   }
+      // }
     },
     // 新增附件上传
     addRelevt4() {
@@ -865,10 +872,13 @@ export default {
     },
     //內容删除
     deleteRow(rows,index) {
-      deleteList(rows.row.fId).then(res =>{
-        console.log(res);
+      if (rows.row.fId){
+        deleteList(rows.row.fId).then(res =>{
+          this.formfeesList.splice(index, 1);
+        })
+      }else {
         this.formfeesList.splice(index, 1);
-      })
+      }
     },
     // 上传成功返回数据
     showFile(row) {
@@ -878,11 +888,17 @@ export default {
       }
     },
     addRelevtTwo(){
+      this.storageClick = true
+      let this_ = this
+      setTimeout(function(){
+        return this_.storageClick = false
+      },3000);
       let formData = new window.FormData();
       formData.append("status", "6");
       formData.append("cars", JSON.stringify(this.form));
       formData.append("ftmsorderbillsfees", JSON.stringify(this.formfeesList));
       addStowageTwo(formData).then((response) => {
+        console.log(response)
         if (response.code == 200) {
           this.msgSuccess("保存成功");
           this.$parent.getList();
@@ -895,6 +911,7 @@ export default {
       const data = { id: this.form.id, billStatus: 1060 };
       selectDriverFtmsorderbillscars(data).then((response) => {
         this.formfeesList = response.data.feesListModify;
+        this.formfeesList.forEach(item=>item.fFeeunitid = JSON.stringify(item.fFeeunitid))
       });
     },
     changerequest(scope){
@@ -919,8 +936,7 @@ export default {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning",
-        })
-            .then(() => {
+        }).then(() => {
               this.chiFeesList = this.chiFeesList.filter(
                   (e) => e.fBillstatus == 6 || e.actId != "1080"
               );
@@ -1296,6 +1312,7 @@ export default {
     // 弹出框关闭后触发
     handleClose() {
       // 子组件调用父组件方法，并传递参数
+      this.disabledtwo = true
       this.$emit("changeShow", "false");
       this.cntrIdList.forEach((item) => (item.noOption = false));
       this.collapses = [];
@@ -1337,6 +1354,7 @@ export default {
     submitFix() {
       this.$refs["form"].validate((valid) => {
         if (valid) {
+
         }
       });
     },
@@ -1360,14 +1378,14 @@ export default {
     },
     //修改
     submitAllowChanges() {
-      console.log(this.form.orderStatus)
-      if (this.form.orderStatus == 80) {
-        this.msgSuccess("不允许修改");
-        this.disabledtwo = true
-      } else {
+      // console.log(this.form.orderStatus)
+      // if (this.form.orderStatus <= 60) {
+      //   this.msgSuccess("不允许修改");
+      //   this.disabledtwo = true
+      // } else {
         this.msgSuccess("允许修改");
         this.disabledtwo = false
-      }
+      // }
     },
     driversubmitForm() {
       if (this.chiFeesList.length == 0) {
@@ -1467,9 +1485,8 @@ export default {
     changescarsRow(row) {
     },
     total(row) {
-      console.log(row);
-      if (row.fQty && row.fUnitprice) {
-        this.$set(row, "fAmount", (row.fQty * row.fUnitprice).toFixed(2));
+      if (row.fBillingQty && row.fUnitprice) {
+        this.$set(row, "fAmount", (Number(row.fBillingQty) * Number(row.fUnitprice)).toFixed(2));
       } else {
         this.$set(row, "fAmount", 0);
       }

src/views/track/costModification/index.vue

@@ -991,6 +991,7 @@ export default {
         this.addOrUpdateVisible = !this.addOrUpdateVisible;
         this.feesList = [];
         this.feesList = response.data.feesListAudited;
+        this.feesList.forEach(item=>item.fFeeunitid = JSON.stringify(item.fFeeunitid))
         this.formfeesList = response.data.feesListModify;
       });
     }
@@ -1215,6 +1216,8 @@ export default {
         // this.relevantAttachments = response.data.attachs;
         this.feesList = response.data.feesListAudited;
         this.formfeesList = response.data.feesListModify;
+        this.formfeesList.forEach(item=>item.fFeeunitid = JSON.stringify(item.fFeeunitid))
+        console.log(this.formfeesList)
         this.addOrUpdateVisible = !this.addOrUpdateVisible;
         this.carsTable = response.data.carsTable;
       });