1.OW和箱管所有的费用批量删除修改删除逻辑

2.OW拿 新加行编辑行保存
3.海运出口 改单费 系统生成的数据 不允许审核和撤销审核
4.海运出口 超过截单日期 修改限制规则
5.提单修改 新加tabs
6.客户订舱 确认订舱 新家校验
7.财务管理统一修改合计样式 付款申请 付-收
8.海运进出口 费用删除 选中时纠正字段
9.海运出口 列表页OP修改显示异常

src/api/boxManagement/buyContainer/index.js

@@ -118,6 +118,14 @@ export function submitItemList(data) {
   })
 }
 //明细保存
+export function addSubmit(data) {
+  return request({
+    url: '/api/blade-los/tradingBoxItem/add',
+    method: 'post',
+    data
+  })
+}
+//明细保存
 export function submitFeeList(data) {
   return request({
     url: '/api/blade-los/feecenter/submitListBox',

src/components/feeModify/main.vue

@@ -38,7 +38,7 @@
             <dic-select v-model="newForm.feeCnNameUpdate" placeholder="费用名称" label="cnName" res="records"
               url="/blade-los/bfees/list?status=0&current=1&size=20" :filterable="true" :remote="true" dataName="cnName"
               @selectChange="dicChange('feeCnNameUpdate', $event)" :slotRight="true" rightLabel="code"
-              :disabled="newOption.disabled"></dic-select>
+              :disabled="newOption.disabled||newForm.automaticGenerated==1"></dic-select>
           </template>
           <template slot="unitNoUpdate">
             <!-- <dic-select v-model="newForm.unitNoUpdate" :key="updateFormKey" placeholder="计量单位" label="code"
@@ -338,6 +338,7 @@ export default {
           quantityUpdate: row.quantity,
           priceUpdate: row.price,
           amountUpdate: row.amount,
+          automaticGenerated:row.automaticGenerated
         }
         this.checkRate(null, this.curCodeDate, this.oldForm.dc, 1, this.form.branchId)
         this.type = type

src/views/approveDataH/index.vue

@@ -471,7 +471,7 @@ export default {
         obj = {
           billId: row.srcBillId,
           businessType: "TDXG",
-          classifyCode: "业务",
+          classifyCode: "提单修改",
           groupCode: "提单修改"
         };
       }

src/views/boxManagement/agentBox/detailsPage.vue

@@ -2659,13 +2659,16 @@ export default {
           const itemsWithId = multiList.filter(item => item.id != null);
           let arrIds = itemsWithId.map(item => item.id); // 获取id 数据
           // 把选中的删除掉
-          multiList.forEach(item => {
-            for (let index in arr) {
-              if (JSON.stringify(item) == JSON.stringify(arr[index])) {
-                arr.splice(Number(index), 1);
+          if (itemsWithId.length == 0) {
+            // 把选中的删除掉
+            multiList.forEach(item => {
+              for (let index in arr) {
+                if (JSON.stringify(item) == JSON.stringify(arr[index])) {
+                  arr.splice(Number(index), 1);
+                }
               }
-            }
-          });
+            });
+          }
           if (itemsWithId.length != 0) {
             const loading = this.$loading({
               lock: true,
@@ -2675,6 +2678,13 @@ export default {
             });
             tradingBoxFees({ ids: arrIds.join(",") })
               .then(res => {
+                multiList.forEach(item => {
+                  for (let index in arr) {
+                    if (JSON.stringify(item) == JSON.stringify(arr[index])) {
+                      arr.splice(Number(index), 1);
+                    }
+                  }
+                });
                 this.$message.success("删除成功");
               })
               .finally(() => {

src/views/boxManagement/boxAdjustment/detailsPage.vue

@@ -2432,13 +2432,16 @@ export default {
           const itemsWithId = multiList.filter(item => item.id != null);
           let arrIds = itemsWithId.map(item => item.id); // 获取id 数据
           // 把选中的删除掉
-          multiList.forEach(item => {
-            for (let index in arr) {
-              if (JSON.stringify(item) == JSON.stringify(arr[index])) {
-                arr.splice(Number(index), 1);
+          if (itemsWithId.length == 0) {
+            // 把选中的删除掉
+            multiList.forEach(item => {
+              for (let index in arr) {
+                if (JSON.stringify(item) == JSON.stringify(arr[index])) {
+                  arr.splice(Number(index), 1);
+                }
               }
-            }
-          });
+            });
+          }
           if (itemsWithId.length != 0) {
             const loading = this.$loading({
               lock: true,
@@ -2448,6 +2451,13 @@ export default {
             });
             tradingBoxFees({ ids: arrIds.join(",") })
               .then(res => {
+                multiList.forEach(item => {
+                  for (let index in arr) {
+                    if (JSON.stringify(item) == JSON.stringify(arr[index])) {
+                      arr.splice(Number(index), 1);
+                    }
+                  }
+                });
                 this.$message.success("删除成功");
               })
               .finally(() => {

src/views/boxManagement/boxCost/detailsPage.vue

@@ -3437,13 +3437,16 @@ export default {
           const itemsWithId = multiList.filter(item => item.id != null);
           let arrIds = itemsWithId.map(item => item.id); // 获取id 数据
           // 把选中的删除掉
-          multiList.forEach(item => {
-            for (let index in arr) {
-              if (JSON.stringify(item) == JSON.stringify(arr[index])) {
-                arr.splice(Number(index), 1);
+          if (itemsWithId.length == 0) {
+            // 把选中的删除掉
+            multiList.forEach(item => {
+              for (let index in arr) {
+                if (JSON.stringify(item) == JSON.stringify(arr[index])) {
+                  arr.splice(Number(index), 1);
+                }
               }
-            }
-          });
+            });
+          }
           if (itemsWithId.length != 0) {
             const loading = this.$loading({
               lock: true,
@@ -3453,6 +3456,13 @@ export default {
             });
             tradingBoxFees({ ids: arrIds.join(",") })
               .then(res => {
+                multiList.forEach(item => {
+                  for (let index in arr) {
+                    if (JSON.stringify(item) == JSON.stringify(arr[index])) {
+                      arr.splice(Number(index), 1);
+                    }
+                  }
+                });
                 this.$message.success("删除成功");
               })
               .finally(() => {
@@ -3519,13 +3529,16 @@ export default {
           const itemsWithId = multiList.filter(item => item.id != null);
           let arrIds = itemsWithId.map(item => item.id); // 获取id 数据
           // 把选中的删除掉
-          multiList.forEach(item => {
-            for (let index in arr) {
-              if (JSON.stringify(item) == JSON.stringify(arr[index])) {
-                arr.splice(Number(index), 1);
+          if (itemsWithId.length == 0) {
+            // 把选中的删除掉
+            multiList.forEach(item => {
+              for (let index in arr) {
+                if (JSON.stringify(item) == JSON.stringify(arr[index])) {
+                  arr.splice(Number(index), 1);
+                }
               }
-            }
-          });
+            });
+          }
           if (itemsWithId.length != 0) {
             const loading = this.$loading({
               lock: true,
@@ -3535,6 +3548,13 @@ export default {
             });
             tradingBoxFees({ ids: arrIds.join(",") })
               .then(res => {
+                multiList.forEach(item => {
+                  for (let index in arr) {
+                    if (JSON.stringify(item) == JSON.stringify(arr[index])) {
+                      arr.splice(Number(index), 1);
+                    }
+                  }
+                });
                 this.$message.success("删除成功");
               })
               .finally(() => {

src/views/boxManagement/boxExit/detailsPage.vue

@@ -2376,13 +2376,16 @@ export default {
           const itemsWithId = multiList.filter(item => item.id != null);
           let arrIds = itemsWithId.map(item => item.id); // 获取id 数据
           // 把选中的删除掉
-          multiList.forEach(item => {
-            for (let index in arr) {
-              if (JSON.stringify(item) == JSON.stringify(arr[index])) {
-                arr.splice(Number(index), 1);
+          if (itemsWithId.length == 0) {
+            // 把选中的删除掉
+            multiList.forEach(item => {
+              for (let index in arr) {
+                if (JSON.stringify(item) == JSON.stringify(arr[index])) {
+                  arr.splice(Number(index), 1);
+                }
               }
-            }
-          });
+            });
+          }
           if (itemsWithId.length != 0) {
             const loading = this.$loading({
               lock: true,
@@ -2392,6 +2395,13 @@ export default {
             });
             tradingBoxFees({ ids: arrIds.join(",") })
               .then(res => {
+                multiList.forEach(item => {
+                  for (let index in arr) {
+                    if (JSON.stringify(item) == JSON.stringify(arr[index])) {
+                      arr.splice(Number(index), 1);
+                    }
+                  }
+                });
                 this.$message.success("删除成功");
               })
               .finally(() => {

src/views/boxManagement/buyContainer/detailsPage.vue

@@ -2292,13 +2292,16 @@ export default {
           const itemsWithId = multiList.filter(item => item.id != null);
           let arrIds = itemsWithId.map(item => item.id); // 获取id 数据
           // 把选中的删除掉
-          multiList.forEach(item => {
-            for (let index in arr) {
-              if (JSON.stringify(item) == JSON.stringify(arr[index])) {
-                arr.splice(Number(index), 1);
+          if (itemsWithId.length == 0) {
+            // 把选中的删除掉
+            multiList.forEach(item => {
+              for (let index in arr) {
+                if (JSON.stringify(item) == JSON.stringify(arr[index])) {
+                  arr.splice(Number(index), 1);
+                }
               }
-            }
-          });
+            });
+          }
           if (itemsWithId.length != 0) {
             const loading = this.$loading({
               lock: true,
@@ -2308,6 +2311,14 @@ export default {
             });
             tradingBoxFees({ ids: arrIds.join(",") })
               .then(res => {
+                // 把选中的删除掉
+                multiList.forEach(item => {
+                  for (let index in arr) {
+                    if (JSON.stringify(item) == JSON.stringify(arr[index])) {
+                      arr.splice(Number(index), 1);
+                    }
+                  }
+                });
                 this.$message.success("删除成功");
               })
               .finally(() => {

src/views/boxManagement/containerNumber/detailsPage.vue

@@ -300,6 +300,8 @@
             <!-- <el-button size="small" style="margin-right: 8px" :disabled="!form.id"
                   @click="$refs.print.openDialog()">打印报表
                 </el-button> -->
+            <el-tag type="success" style="margin-right: 6px;">出场:{{ form.putBoxItemsList.filter(item=>item.boxDynamics=='空箱出场'||item.boxDynamics=='已返场').length||0 }}</el-tag>
+            <el-tag type="danger">合计:{{ form.putBoxItemsList.length||0 }}</el-tag>
           </template>
           <template slot="indexHeader" slot-scope="{ row, index }">
             <el-button
@@ -1988,13 +1990,13 @@ export default {
       this.$refs["form"].validate((valid, done) => {
         done();
         if (valid) {
-          for (let row of this.form.putBoxItemsList) {
-            if (!row.boxCode || !row.boxType || !row.boxBelongsTo || !row.boxEastName || !row.boxClass || !row.boxStatus || !row.boxCondition) {
-              this.$refs.crud.rowCell(row, row.$index);
-              this.$refs.crud.dicInit();
-              return this.$message.error("请完善箱明细信息");
-            }
-          }
+          // for (let row of this.form.putBoxItemsList) {
+          //   if (!row.boxCode || !row.boxType || !row.boxBelongsTo || !row.boxEastName || !row.boxClass || !row.boxStatus || !row.boxCondition) {
+          //     this.$refs.crud.rowCell(row, row.$index);
+          //     this.$refs.crud.dicInit();
+          //     return this.$message.error("请完善箱明细信息");
+          //   }
+          // }
           const loading = this.$loading({
             lock: true,
             text: "加载中",

src/views/boxManagement/rentalBox/detailsPage.vue

@@ -3003,13 +3003,16 @@ export default {
           const itemsWithId = multiList.filter(item => item.id != null);
           let arrIds = itemsWithId.map(item => item.id); // 获取id 数据
           // 把选中的删除掉
-          multiList.forEach(item => {
-            for (let index in arr) {
-              if (JSON.stringify(item) == JSON.stringify(arr[index])) {
-                arr.splice(Number(index), 1);
+          if (itemsWithId.length == 0) {
+            // 把选中的删除掉
+            multiList.forEach(item => {
+              for (let index in arr) {
+                if (JSON.stringify(item) == JSON.stringify(arr[index])) {
+                  arr.splice(Number(index), 1);
+                }
               }
-            }
-          });
+            });
+          }
           if (itemsWithId.length != 0) {
             const loading = this.$loading({
               lock: true,
@@ -3019,6 +3022,14 @@ export default {
             });
             tradingBoxFees({ ids: arrIds.join(",") })
               .then(res => {
+                // 把选中的删除掉
+                multiList.forEach(item => {
+                  for (let index in arr) {
+                    if (JSON.stringify(item) == JSON.stringify(arr[index])) {
+                      arr.splice(Number(index), 1);
+                    }
+                  }
+                });
                 this.$message.success("删除成功");
               })
               .finally(() => {

src/views/iosBasicData/OceanFreightImport/bills/assembly/feecenter.vue

@@ -3120,7 +3120,7 @@ export default {
           }
         }
       } else {
-        for (let item of this.feeCenterListC) {
+        for (let item of this.selectionCList) {
           if (item.accStatus == 1 || item.auditStatus > 0) {
             this.$message.warning("请选择没有生成账单或提交审核的数据");
             return;

src/views/iosBasicData/SeafreightExportF/bills/assembly/DistributionBox.vue

@@ -4,13 +4,13 @@
             <containers ref="containers" :assemblyForm="assemblyForm" :pid="assemblyForm.id" :detailData="detailData"
                 :pleasereviewType="pleasereviewType" @selectionChange="selectionChange"
                 @rowSavefun="containersSubmitfun" @billsDetailfun="billsDetailfun" @billsAddfun="billsAddfun"
-                @equalDistribution="containersEqualDistributionfun" :showLock="showLock"></containers>
+                @equalDistribution="containersEqualDistributionfun" :showLock="showLock" :disabled="disabled"></containers>
         </div>
 
         <div>
             <PackingBusiness ref="PackingBusiness" :assemblyForm="assemblyForm" :detailData="detailData"
                 :selectionList="selectionList" :pleasereviewType="pleasereviewType" @billsDetailfun="billsDetailfun"
-                @allocationfun="allocationfun" @withdrawfun="withdrawfun" :showLock="showLock"></PackingBusiness>
+                @allocationfun="allocationfun" @withdrawfun="withdrawfun" :showLock="showLock" :disabled="disabled"></PackingBusiness>
         </div>
     </div>
 </template>
@@ -40,6 +40,10 @@ export default {
         showLock: {
             type: Boolean,
             default: false
+        },
+        disabled: {
+            type: Boolean,
+            default: false
         }
     },
     data() {

src/views/iosBasicData/SeafreightExportF/bills/assembly/DistributionBox/PackingBusiness.vue

@@ -60,15 +60,15 @@
                         <el-table-column label="操作" width="100">
                             <template slot-scope="scope">
                                 <el-button type="text" size="small" v-if="scope.row.edit"
-                                    :disabled="detailData.seeDisabled || pleasereviewType || showLock"
+                                    :disabled="detailData.seeDisabled || pleasereviewType || showLock||disabled"
                                     @click="waitingBoxeditfun(scope.row, false)">保存
                                 </el-button>
                                 <el-button type="text" size="small" v-else
-                                    :disabled="detailData.seeDisabled || pleasereviewType || showLock"
+                                    :disabled="detailData.seeDisabled || pleasereviewType || showLock||disabled"
                                     @click="waitingBoxeditfun(scope.row, true)">编辑
                                 </el-button>
                                 <el-button type="text" size="small"
-                                    :disabled="detailData.seeDisabled || pleasereviewType || showLock"
+                                    :disabled="detailData.seeDisabled || pleasereviewType || showLock||disabled"
                                     @click="allocationfun(scope.row)">分配
                                 </el-button>
                             </template>
@@ -85,7 +85,7 @@
                     @saveColumn="saveColumnTwo('crudDetail', 'optionDetail', 'optionBackDetail', 309.4)">
                     <template slot="lineNoHeader" slot-scope="scope">
                         <el-button type="primary" size="small" icon="el-icon-plus" circle
-                            :disabled="selectionList.length == 0 || detailData.seeDisabled || showLock"
+                            :disabled="selectionList.length == 0 || detailData.seeDisabled ||disabled"
                             @click="DetailAdd"></el-button>
                     </template>
                     <template slot="lineNo" slot-scope="{row,index}">
@@ -93,26 +93,26 @@
                     </template>
                     <template slot-scope="scope" slot="menuLeft">
                         <el-button type="primary" plain size="small"
-                            :disabled="pleasereviewType || detailData.seeDisabled || showLock"
+                            :disabled="pleasereviewType || detailData.seeDisabled || showLock||disabled"
                             @click.stop="allEdit">一键编辑</el-button>
                         <el-button type="primary" plain size="small"
-                            :disabled="pleasereviewType || detailData.seeDisabled || showLock"
+                            :disabled="pleasereviewType || detailData.seeDisabled || showLock||disabled"
                             @click.stop="containerscommoditySubmitListfun">一键保存</el-button>
                         <el-button type="danger" plain size="small"
-                            :disabled="pleasereviewType || detailData.seeDisabled || showLock"
+                            :disabled="pleasereviewType || detailData.seeDisabled || showLock||disabled"
                             @click.stop="BatchDelete">批量删除</el-button>
                         <el-button type="primary" plain size="small"
-                            :disabled="pleasereviewType || detailData.seeDisabled || showLock"
+                            :disabled="pleasereviewType || detailData.seeDisabled || showLock||disabled"
                             @click.stop="inVerifyData">数据校验</el-button>
                     </template>
                     <template slot-scope="scope" slot="menu">
                         <el-button v-if="!scope.row.$cellEdit" size="mini" type="text" icon="el-icon-edit"
-                            :disabled="pleasereviewType || detailData.seeDisabled || showLock"
+                            :disabled="pleasereviewType || detailData.seeDisabled || showLock||disabled"
                             @click.stop="editfun(scope.row, scope.index)">
                             编辑
                         </el-button>
                         <el-button type="text" size="small"
-                            :disabled="pleasereviewType || detailData.seeDisabled || showLock"
+                            :disabled="pleasereviewType || detailData.seeDisabled || showLock||disabled"
                             @click="containerscommodityRemovefun(scope.row.id, scope.index)">删除
                         </el-button>
                     </template>
@@ -269,6 +269,10 @@ export default {
         showLock: {
             type: Boolean,
             default: false
+        },
+        disabled: {
+            type: Boolean,
+            default: false
         }
     },
     data() {

src/views/iosBasicData/SeafreightExportF/bills/assembly/DistributionBox/containers.vue

@@ -23,13 +23,13 @@
           <div style="display: flex;align-items: center;justify-content: space-between">
             <div>
               <!--<el-button type="primary" size="small" @click="DistributionBox">配箱</el-button>-->
-              <el-button type="success" size="small" plain :disabled="seeDisabled" @click.stop="equalDistribution2()"
+              <el-button type="success" size="small" plain :disabled="seeDisabled || disabled" @click.stop="equalDistribution2()"
                 >{{ $t("btn118n.generateCtnrList") }}
               </el-button>
-              <el-button type="success" size="small" plain :disabled="seeDisabled" @click.stop="equalDistribution(1)"
+              <el-button type="success" size="small" plain :disabled="seeDisabled || disabled" @click.stop="equalDistribution(1)"
                 >{{ $t("btn118n.packCtnrTeu") }}
               </el-button>
-              <el-button type="success" size="small" plain :disabled="seeDisabled" @click.stop="equalDistribution(2)"
+              <el-button type="success" size="small" plain :disabled="seeDisabled || disabled" @click.stop="equalDistribution(2)"
                 >{{ $t("btn118n.packCtnrQty") }}
               </el-button>
 
@@ -37,19 +37,24 @@
                 v-if="assemblyForm.billType != 'MM'"
                 type="primary"
                 size="small"
-                :disabled="seeDisabled || detailData.seeDisabled || pleasereviewType || showLock"
+                :disabled="seeDisabled || detailData.seeDisabled || pleasereviewType || showLock || disabled"
                 @click.stop="addRow()"
               >
                 {{ $t("btn118n.new") }}
               </el-button>
-              <el-button type="primary" size="small" :disabled="detailData.seeDisabled || pleasereviewType || showLock" @click="rootEditfun">
+              <el-button
+                type="primary"
+                size="small"
+                :disabled="detailData.seeDisabled || pleasereviewType || showLock || disabled"
+                @click="rootEditfun"
+              >
                 {{ $t("btn118n.edit") }}
               </el-button>
-              <el-button type="primary" size="small" @click="containersSubmitListfun"> {{ $t("btn118n.save") }} </el-button>
+              <el-button type="primary" size="small" @click="containersSubmitListfun" :disabled="detailData.seeDisabled || pleasereviewType || showLock || disabled"> {{ $t("btn118n.save") }} </el-button>
               <el-button
                 type="success"
                 size="small"
-                :disabled="detailData.seeDisabled || !assemblyForm.id || pleasereviewType || showLock"
+                :disabled="detailData.seeDisabled || !assemblyForm.id || pleasereviewType || showLock || disabled"
                 @click="oepnexcelBox"
                 >{{ $t("btn118n.importCtnr") }}
               </el-button>
@@ -57,20 +62,32 @@
                 type="success"
                 size="small"
                 :loading="loadingButton"
-                :disabled="detailData.seeDisabled || !assemblyForm.id || pleasereviewType || showLock"
+                :disabled="detailData.seeDisabled || !assemblyForm.id || pleasereviewType || showLock || disabled"
                 @click="extractBoxInformation"
                 >{{ $t("btn118n.getCtnr") }}
               </el-button>
-              <el-button type="warning" size="small" :disabled="detailData.seeDisabled || pleasereviewType || showLock" @click="cleanCntrNofun"
+              <el-button
+                type="warning"
+                size="small"
+                :disabled="detailData.seeDisabled || pleasereviewType || showLock || disabled"
+                @click="cleanCntrNofun"
                 >{{ $t("btn118n.clearCtnrNo") }}
               </el-button>
-              <el-button type="danger" size="small" :disabled="detailData.seeDisabled || pleasereviewType || showLock" @click="revokefun"
+              <el-button type="danger" size="small" :disabled="detailData.seeDisabled || pleasereviewType || showLock || disabled" @click="revokefun"
                 >{{ $t("btn118n.clearancePieceWeightScale") }}
               </el-button>
-              <el-button type="danger" size="small" :disabled="detailData.seeDisabled || pleasereviewType || showLock" @click="wholeRevokefun"
+              <el-button
+                type="danger"
+                size="small"
+                :disabled="detailData.seeDisabled || pleasereviewType || showLock || disabled"
+                @click="wholeRevokefun"
                 >{{ $t("btn118n.clearanceAllPieceWeightScale") }}
               </el-button>
-              <el-button type="danger" size="small" :disabled="detailData.seeDisabled || pleasereviewType || showLock" @click="handleDelete"
+              <el-button
+                type="danger"
+                size="small"
+                :disabled="detailData.seeDisabled || pleasereviewType || showLock || disabled"
+                @click="handleDelete"
                 >{{ $t("btn118n.deleteCtnrList") }}
               </el-button>
               <el-button type="success" size="small" plain @click.stop="$refs.print.openDialog()">
@@ -107,7 +124,7 @@
             v-if="assemblyForm.billType != 'MM'"
             :type="scope.type"
             :size="scope.size"
-            :disabled="detailData.seeDisabled || pleasereviewType || showLock"
+            :disabled="detailData.seeDisabled || pleasereviewType || showLock || disabled"
             @click.stop="rowDel(scope.row, scope.index)"
             >{{ $t("btn118n.deleted") }}
           </el-button>
@@ -320,6 +337,10 @@ export default {
     showLock: {
       type: Boolean,
       default: false
+    },
+    disabled: {
+      type: Boolean,
+      default: false
     }
   },
   data() {

src/views/iosBasicData/SeafreightExportF/bills/assembly/EntrustmentLnformation.vue

@@ -14,7 +14,7 @@
                       v-model="assemblyForm.detail.hshipperDetails"
                       size="small"
                       autocomplete="off"
-                      :disabled="detailData.seeDisabled"
+                      :disabled="detailData.seeDisabled || overTime"
                       :rows="textareaNumber"
                       clearable
                       placeholder="请输入发货人提单描述"
@@ -36,7 +36,7 @@
                     :remote="true"
                     :addIf="true"
                     :tableIf="false"
-                    :disabled="detailData.seeDisabled"
+                    :disabled="detailData.seeDisabled || overTime"
                     :joinData="true"
                     :forParameter="{ key: 'id', short: 'code', label: 'cnName', value: 'cnName' }"
                     placeholder="请选择发货人"
@@ -54,7 +54,7 @@
                     v-model="assemblyForm.detail.hshipperCntyName"
                     size="small"
                     autocomplete="off"
-                    :disabled="detailData.seeDisabled"
+                    :disabled="detailData.seeDisabled || overTime"
                     clearable
                     placeholder="发货人国家代码"
                   ></el-input>
@@ -69,7 +69,7 @@
                   v-model="assemblyForm.detail.hshipperDetails"
                   size="small"
                   autocomplete="off"
-                  :disabled="detailData.seeDisabled"
+                  :disabled="detailData.seeDisabled || overTime"
                   :rows="textareaNumber"
                   clearable
                   placeholder="请输入发货人提单描述"
@@ -87,7 +87,7 @@
                       v-model="assemblyForm.detail.hconsigneeDetails"
                       size="small"
                       autocomplete="off"
-                      :disabled="detailData.seeDisabled"
+                      :disabled="detailData.seeDisabled || overTime"
                       :rows="textareaNumber"
                       clearable
                       placeholder="请输入收货人提单描述"
@@ -108,7 +108,7 @@
                     :clearable="true"
                     :remote="true"
                     :joinData="true"
-                    :disabled="detailData.seeDisabled"
+                    :disabled="detailData.seeDisabled || overTime"
                     :addIf="true"
                     :tableIf="false"
                     placeholder="请选择收货人"
@@ -128,7 +128,7 @@
                     v-model="assemblyForm.detail.hconsigneeCntyName"
                     size="small"
                     autocomplete="off"
-                    :disabled="detailData.seeDisabled"
+                    :disabled="detailData.seeDisabled || overTime"
                     clearable
                     placeholder="收货人国家代码"
                   ></el-input>
@@ -151,7 +151,7 @@
                   v-model="assemblyForm.detail.hconsigneeDetails"
                   size="small"
                   autocomplete="off"
-                  :disabled="detailData.seeDisabled"
+                  :disabled="detailData.seeDisabled || overTime"
                   :rows="textareaNumber"
                   clearable
                   placeholder="请输入收货人提单描述"
@@ -169,7 +169,7 @@
                       v-model="assemblyForm.detail.hnotifyDetails"
                       size="small"
                       autocomplete="off"
-                      :disabled="detailData.seeDisabled"
+                      :disabled="detailData.seeDisabled || overTime"
                       :rows="textareaNumber"
                       clearable
                       placeholder="请输入通知人提单描述"
@@ -190,7 +190,7 @@
                     :clearable="true"
                     :remote="true"
                     :joinData="true"
-                    :disabled="detailData.seeDisabled"
+                    :disabled="detailData.seeDisabled || overTime"
                     :addIf="true"
                     :tableIf="false"
                     placeholder="请选择通知人"
@@ -212,7 +212,7 @@
                         v-model="assemblyForm.detail.hnotifyCntyName"
                         size="small"
                         autocomplete="off"
-                        :disabled="detailData.seeDisabled"
+                        :disabled="detailData.seeDisabled || overTime"
                         clearable
                         placeholder="通知人国家代码"
                       ></el-input>
@@ -238,7 +238,7 @@
                   v-model="assemblyForm.detail.hnotifyDetails"
                   size="small"
                   autocomplete="off"
-                  :disabled="detailData.seeDisabled"
+                  :disabled="detailData.seeDisabled || overTime"
                   :rows="textareaNumber"
                   clearable
                   placeholder="请输入通知人提单描述"
@@ -259,7 +259,7 @@
                         v-model="assemblyForm.foreignAgencyDetails"
                         size="small"
                         autocomplete="off"
-                        :disabled="detailData.seeDisabled"
+                        :disabled="detailData.seeDisabled || overTime"
                         :rows="textareaNumber"
                         clearable
                         placeholder="请输入国外代理提单描述"
@@ -281,7 +281,7 @@
                       :remote="true"
                       :addIf="true"
                       :tableIf="false"
-                      :disabled="detailData.seeDisabled"
+                      :disabled="detailData.seeDisabled || overTime"
                       :joinData="true"
                       :forParameter="{ key: 'id', short: 'code', label: 'cnName', value: 'cnName' }"
                       placeholder="请选择国外代理"
@@ -299,7 +299,7 @@
                       v-model="assemblyForm.foreignCntyName"
                       size="small"
                       autocomplete="off"
-                      :disabled="detailData.seeDisabled"
+                      :disabled="detailData.seeDisabled || overTime"
                       clearable
                       placeholder="国外代理国家代码"
                     ></el-input>
@@ -314,7 +314,7 @@
                     v-model="assemblyForm.foreignAgencyDetails"
                     size="small"
                     autocomplete="off"
-                    :disabled="detailData.seeDisabled"
+                    :disabled="detailData.seeDisabled || overTime"
                     :rows="textareaNumber"
                     clearable
                     placeholder="请输入国外代理提单描述"
@@ -398,7 +398,7 @@
                       v-model="assemblyForm.marks"
                       size="small"
                       autocomplete="off"
-                      :disabled="detailData.seeDisabled"
+                      :disabled="detailData.seeDisabled || overTime"
                       rows="5"
                       clearable
                       placeholder="请输入唛头"
@@ -418,7 +418,7 @@
                   v-model="assemblyForm.marks"
                   size="small"
                   autocomplete="off"
-                  :disabled="detailData.seeDisabled"
+                  :disabled="detailData.seeDisabled || overTime"
                   rows="5"
                   clearable
                   placeholder="请输入唛头"
@@ -438,7 +438,7 @@
                       v-model="assemblyForm.hscode"
                       size="small"
                       autocomplete="off"
-                      :disabled="detailData.seeDisabled"
+                      :disabled="detailData.seeDisabled || overTime"
                       clearable
                       placeholder="HS CODE"
                     ></el-input>
@@ -451,7 +451,7 @@
                       v-model="assemblyForm.commodityCnName"
                       size="small"
                       autocomplete="off"
-                      :disabled="detailData.seeDisabled"
+                      :disabled="detailData.seeDisabled || overTime"
                       clearable
                       placeholder="英文名称"
                     ></el-input>
@@ -474,7 +474,7 @@
                           v-model="assemblyForm.commodityDescr"
                           size="small"
                           autocomplete="off"
-                          :disabled="detailData.seeDisabled"
+                          :disabled="detailData.seeDisabled || overTime"
                           rows="5"
                           clearable
                           placeholder="请输入提单上货物描述"
@@ -496,7 +496,7 @@
                       :filterable="true"
                       :clearable="false"
                       :remote="true"
-                      :disabled="detailData.seeDisabled"
+                      :disabled="detailData.seeDisabled || overTime"
                       :buttonIf="false"
                       placeholder="请选择货描"
                       @remoteMethod="remoteMethod($event, 'cargoType')"
@@ -518,7 +518,7 @@
                   v-model="assemblyForm.commodityDescr"
                   size="small"
                   autocomplete="off"
-                  :disabled="detailData.seeDisabled"
+                  :disabled="detailData.seeDisabled || overTime"
                   rows="5"
                   clearable
                   placeholder="请输入提单上货物描述"
@@ -546,7 +546,8 @@
                         detailData.seeDisabled ||
                           generateBillsfalse ||
                           (assemblyForm.billType == 'MH' && assemblyForm.masterBillNo > 0) ||
-                          assemblyForm.preContainersList.filter(item => item.containerNumberStatus == '已选择').length > 0
+                          assemblyForm.preContainersList.filter(item => item.containerNumberStatus == '已选择').length > 0 ||
+                          overTime
                       "
                       :buttonIf="false"
                       placeholder="请选择装货港"
@@ -567,6 +568,7 @@
                       autocomplete="off"
                       clearable
                       placeholder="装货港"
+                      :disabled="overTime"
                       @change="textareaBlur('polNamePrint')"
                     ></el-input>
                   </el-col>
@@ -594,7 +596,8 @@
                       :disabled="
                         detailData.seeDisabled ||
                           (assemblyForm.billType == 'MH' && assemblyForm.masterBillNo > 0) ||
-                          assemblyForm.preContainersList.filter(item => item.containerNumberStatus == '已选择').length > 0
+                          assemblyForm.preContainersList.filter(item => item.containerNumberStatus == '已选择').length > 0 ||
+                          overTime
                       "
                       :buttonIf="false"
                       placeholder="请选择卸货港"
@@ -615,6 +618,7 @@
                       autocomplete="off"
                       clearable
                       placeholder="卸货港"
+                      :disabled="overTime"
                       @change="textareaBlur('podNamePrint')"
                     ></el-input>
                   </el-col>
@@ -639,7 +643,7 @@
                       :filterable="true"
                       :clearable="true"
                       :remote="true"
-                      :disabled="detailData.seeDisabled"
+                      :disabled="detailData.seeDisabled||overTime"
                       :buttonIf="false"
                       placeholder="请选择交货地"
                       :forParameter="{ key: 'id', short: 'enName', label: 'code', value: 'enName' }"
@@ -659,6 +663,7 @@
                       autocomplete="off"
                       clearable
                       placeholder="交货地"
+                      :disabled="overTime"
                       @change="textareaBlur('placeDeliveryNamePrint')"
                     ></el-input>
                   </el-col>
@@ -757,7 +762,8 @@
                       generateBillsfalse ||
                       (assemblyForm.billType == 'MH' && assemblyForm.masterBillNo > 0) ||
                       assemblyForm.feeCenterListD.filter(item => item.auditStatus > 0).length ||
-                      assemblyForm.feeCenterListC.filter(item => item.auditStatus > 0).length
+                      assemblyForm.feeCenterListC.filter(item => item.auditStatus > 0).length ||
+                      overTime
                   "
                   :buttonIf="false"
                   placeholder="请选择船名"
@@ -783,7 +789,8 @@
                       generateBillsfalse ||
                       (assemblyForm.billType == 'MH' && assemblyForm.masterBillNo > 0) ||
                       assemblyForm.feeCenterListD.filter(item => item.auditStatus > 0).length ||
-                      assemblyForm.feeCenterListC.filter(item => item.auditStatus > 0).length
+                      assemblyForm.feeCenterListC.filter(item => item.auditStatus > 0).length ||
+                      overTime
                   "
                   clearable
                   placeholder="请输入航次"
@@ -837,7 +844,8 @@
                     generateBillsfalse ||
                     (assemblyForm.billType == 'MH' && assemblyForm.masterBillNo > 0) ||
                     assemblyForm.feeCenterListD.filter(item => item.auditStatus > 0).length ||
-                    assemblyForm.feeCenterListC.filter(item => item.auditStatus > 0).length
+                    assemblyForm.feeCenterListC.filter(item => item.auditStatus > 0).length ||
+                    overTime
                 "
                 :buttonIf="false"
                 placeholder="请选择承运人"
@@ -901,7 +909,7 @@
                     size="small"
                     autocomplete="off"
                     min="1"
-                    :disabled="detailData.seeDisabled"
+                    :disabled="detailData.seeDisabled||overTime"
                     @input="quantityInput"
                     @focus="quantityFocus"
                     clearable
@@ -927,7 +935,7 @@
                     :filterable="true"
                     :clearable="true"
                     :remote="true"
-                    :disabled="detailData.seeDisabled"
+                    :disabled="detailData.seeDisabled||overTime"
                     :buttonIf="false"
                     placeholder="请选择包装"
                     :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
@@ -952,7 +960,7 @@
                     v-model="assemblyForm.grossWeight"
                     size="small"
                     autocomplete="off"
-                    :disabled="detailData.seeDisabled"
+                    :disabled="detailData.seeDisabled||overTime"
                     @input="floatingInput($event, 'grossWeight')"
                     @focus="quantityFocus"
                     clearable
@@ -973,7 +981,7 @@
                     v-model="assemblyForm.measurement"
                     size="small"
                     autocomplete="off"
-                    :disabled="detailData.seeDisabled"
+                    :disabled="detailData.seeDisabled||overTime"
                     @input="floatingInput($event, 'measurement')"
                     @focus="quantityFocus"
                     clearable
@@ -996,7 +1004,7 @@
                     keyValue="dictKey"
                     url="/blade-system/dict-biz/dictionary?code=issue_type_F"
                     :filterable="true"
-                    :disabled="detailData.seeDisabled"
+                    :disabled="detailData.seeDisabled||overTime"
                     :initData="true"
                   ></dic-select>
                 </el-form-item>
@@ -1012,7 +1020,7 @@
                     clearable
                     type="date"
                     size="small"
-                    :disabled="detailData.seeDisabled || isATD"
+                    :disabled="detailData.seeDisabled || isATD||overTime"
                     value-format="yyyy-MM-dd"
                     placeholder="选择日期"
                   >
@@ -1158,7 +1166,7 @@
                     :filterable="true"
                     :clearable="true"
                     :remote="true"
-                    :disabled="detailData.seeDisabled"
+                    :disabled="detailData.seeDisabled||overTime"
                     :buttonIf="false"
                     :forParameter="{ key: 'id', label: 'enName', value: 'enName' }"
                     placeholder="请选择签单地点"
@@ -1221,7 +1229,7 @@
                 format="yyyy-MM-dd HH:mm:ss"
                 value-format="yyyy-MM-dd HH:mm:ss"
                 size="small"
-                :disabled="detailData.seeDisabled || (assemblyForm.billType == 'MH' && assemblyForm.masterBillNo > 0)"
+                :disabled="detailData.seeDisabled || (assemblyForm.billType == 'MH' && assemblyForm.masterBillNo > 0)||overTime"
                 placeholder="请选择船司截单"
                 @change="shippingDate"
               >
@@ -1240,7 +1248,7 @@
                 format="yyyy-MM-dd HH:mm:ss"
                 value-format="yyyy-MM-dd HH:mm:ss"
                 size="small"
-                :disabled="detailData.seeDisabled || (assemblyForm.billType == 'MH' && assemblyForm.masterBillNo > 0)"
+                :disabled="detailData.seeDisabled || (assemblyForm.billType == 'MH' && assemblyForm.masterBillNo > 0)||overTime"
                 placeholder="请选择我司截单"
               >
               </el-date-picker>
@@ -1997,6 +2005,10 @@ export default {
     disabled: {
       type: Boolean,
       default: false
+    },
+    overTime: {
+      type: Boolean,
+      default: false
     }
   },
   components: { TreeSelect, bcorps, SearchQuery, precontainers, bcorpstypedefine, dicSelect, fixEtd },
@@ -3467,7 +3479,7 @@ export default {
     //ATD +2是否 小于 当前日期
     isATD() {
       const feeList = [...this.assemblyForm.feeCenterListD, ...this.assemblyForm.feeCenterListC];
-      if (this.assemblyForm.issueDate&&this.issueLock && feeList.length && feeList.filter(item => item.auditStatus > 3).length) {
+      if (this.assemblyForm.issueDate && this.issueLock && feeList.length && feeList.filter(item => item.auditStatus > 3).length) {
         const issue2day = new Date(this.assemblyForm.issueDate);
         issue2day.setDate(issue2day.getDate() + Number(this.issueLockedDays));
         const newDate = new Date(dateFormat(new Date(), "yyyy-MM-dd"));

src/views/iosBasicData/SeafreightExportF/bills/assembly/feecenter.vue

@@ -3150,13 +3150,19 @@ export default {
     batchDelete(dc) {
       if (dc == "D") {
         for (let item of this.selectionDList) {
+          if (item.automaticGenerated == 1) {
+            return this.$message.error("系统生成的费用不允许删除");
+          }
           if (item.accStatus == 1 || item.auditStatus > 0) {
             this.$message.warning("请选择没有生成账单或提交审核的数据");
             return;
           }
         }
       } else {
-        for (let item of this.feeCenterListC) {
+        for (let item of this.selectionCList) {
+          if (item.automaticGenerated == 1) {
+            return this.$message.error("系统生成的费用不允许删除");
+          }
           if (item.accStatus == 1 || item.auditStatus > 0) {
             this.$message.warning("请选择没有生成账单或提交审核的数据");
             return;
@@ -3966,6 +3972,9 @@ export default {
           if (row.stlPid && row.auditStatus != 0) {
             return this.$message.error("已申请费用，不允许重复申请");
           }
+          if (row.automaticGenerated == 1 && row.feeCnName == "改单费") {
+            return this.$message.error("系统生成的费用不允许申请");
+          }
         }
         this.$confirm("确定申请费用?", {
           confirmButtonText: "确定",
@@ -4027,6 +4036,9 @@ export default {
           if (row.auditStatus > 2 && this.expenseApplication == 1) {
             return this.$message.error("费用已经审核通过,请使用申请修改和删除功能!");
           }
+          if (row.automaticGenerated == 1 && row.feeCnName == "改单费") {
+            return this.$message.error("系统生成的费用不允许撤销");
+          }
         }
         this.$confirm("确定撤销请核?", {
           confirmButtonText: "确定",
@@ -4195,6 +4207,9 @@ export default {
           if (row.stlPid && row.auditStatus != 0) {
             return this.$message.error("已申请费用，不允许重复申请");
           }
+          if (row.automaticGenerated == 1 && row.feeCnName == "改单费") {
+            return this.$message.error("系统生成的费用不允许申请");
+          }
         }
         this.$confirm("确定申请费用?", {
           confirmButtonText: "确定",
@@ -4258,6 +4273,9 @@ export default {
           if (row.auditStatus > 2 && this.expenseApplication == 1) {
             return this.$message.error("费用已经审核通过,请使用申请修改和删除功能!");
           }
+          if (row.automaticGenerated == 1 && row.feeCnName == "改单费") {
+            return this.$message.error("系统生成的费用不允许撤销");
+          }
         }
         this.$confirm("确定撤销请核?", {
           confirmButtonText: "确定",

src/views/iosBasicData/SeafreightExportF/bills/billsDetails.vue

@@ -222,7 +222,7 @@
                               style="width: 100%;"
                               type="date"
                               size="small"
-                              :disabled="detailData.seeDisabled || item[1].disabled"
+                              :disabled="detailData.seeDisabled|| item[1].disabled"
                               value-format="yyyy-MM-dd HH:mm"
                               placeholder="选择日期"
                             >
@@ -374,6 +374,7 @@
                     :saberUserInfo="saberUserInfo"
                     :detailData="detailData"
                     :disabled="showLock"
+                    :overTime="overTime"
                     :generateBillsfalse="generateBillsfalse"
                     @billsDetailfun="billsDetailfun(form.id)"
                   >
@@ -384,6 +385,7 @@
                     :assemblyForm="form"
                     :detailData="detailData"
                     :showLock="showLock"
+                    :disabled="overTime"
                     :pleasereviewType="pleasereviewType"
                     @billsAddfun="billsAddfun"
                     @billsDetailfun="billsDetailfun(form.id)"
@@ -3211,16 +3213,10 @@ export default {
           const cutOffDate = new Date(this.form.cyTrailerTime);
           const newDate = new Date(dateFormat(new Date(), "yyyy-MM-dd"));
           if (newDate > cutOffDate) {
-            this.detailData.seeDisabled = true;
             this.overTime = true;
-          } else {
-            this.detailData.seeDisabled = false;
           }
-          
-        } else {
-          this.detailData.seeDisabled = false;
         }
-        //  this.detailData.seeDisabled = false;
+         this.detailData.seeDisabled = false;
       }
       // this.columnforfun('teamName').disabled = true
 

src/views/iosBasicData/SeafreightExportF/bills/index.vue

@@ -941,11 +941,18 @@ export default {
               label: "realName",
               value: "id"
             },
+            hide:true,
             search: true,
             span: 6,
             searchOrder: 7
           },
           {
+            label: "OP",
+            prop: "operatorName",
+            width: 120,
+            overHidden: true,
+          },
+          {
             label: this.$t("sea118n.etd"),
             prop: "etd",
             width: "120",

src/views/iosBasicData/billModify/index.vue

@@ -22,17 +22,16 @@
         @saveColumn="saveColumn('crud', 'option', 'optionBack', 536)"
         @on-load="onLoad"
       >
-        <template slot="menuLeft"> </template>
+        <template slot="menuLeft">
+          <el-tabs v-model="query.billStatus" type="card" @tab-click="handleClick">
+            <el-tab-pane label="草稿" name="0"></el-tab-pane>
+            <el-tab-pane label="提交" name="1,2"></el-tab-pane>
+            <el-tab-pane label="审核通过" name="3"></el-tab-pane>
+          </el-tabs>
+        </template>
         <template slot="menu" slot-scope="{ row, index }">
           <el-button size="small" icon="el-icon-edit" type="text" @click="rowEdit(row)">编辑</el-button>
-          <el-button
-            size="small"
-            icon="el-icon-delete"
-            type="text"
-            @click="rowDel(row, index)"
-            :disabled="row.billStatus != 0"
-            >删 除</el-button
-          >
+          <el-button size="small" icon="el-icon-delete" type="text" @click="rowDel(row, index)" :disabled="row.billStatus != 0">删 除</el-button>
         </template>
         <template slot="billNo" slot-scope="{ row }">
           <span style="color: #1e9fff;cursor: pointer;" @click="rowEdit(row)">{{ row.billNo }}</span>
@@ -57,7 +56,9 @@ export default {
       pageIds: [],
       isShow: true,
       form: {},
-      query: {},
+      query: {
+        billStatus:'0'
+      },
       loading: false,
       page: {
         pageSize: 10,
@@ -73,7 +74,7 @@ export default {
         menuWidth: 140,
         tip: false,
         searchShow: true,
-        searchMenuSpan: 6,
+        searchMenuSpan: 12,
         border: true,
         index: true,
         addBtn: false,
@@ -271,12 +272,6 @@ export default {
             prop: "updateTime",
             width: "120",
             overHidden: true
-          },
-          {
-            label: "备注",
-            prop: "remarks",
-            width: "100",
-            overHidden: true
           }
         ]
       },
@@ -295,7 +290,7 @@ export default {
   activated() {
     setTimeout(() => {
       if (this.$route.query.billId) {
-        this.isShow = false;     
+        this.isShow = false;
         this.detailData = {
           billId: this.$route.query.billId
         };
@@ -311,9 +306,6 @@ export default {
   },
   methods: {
     handleClick(tab, event) {
-      // if (this.query.billStatus == 4) {
-      //     this.query.billStatus = null;
-      // }
       this.onLoad(this.page, this.query);
     },
     addButton() {

src/views/iosBasicData/businessCenter/customerBooking/detailsPage.vue

@@ -1331,7 +1331,7 @@ export default {
         preContainersList: [],
         feeCenterListC: [],
         filesList: [],
-        containersList:[]
+        containersList: []
       },
       polFeeList: [],
       podFeeList: [],
@@ -1376,7 +1376,7 @@ export default {
         preContainersList: [],
         feeCenterListC: [],
         filesList: [],
-        containersList:[]
+        containersList: []
       },
       optionForm2: {
         menuBtn: false,
@@ -2723,6 +2723,28 @@ export default {
           if (!item.id) {
             return this.$message.error("请保存数据");
           }
+          let textList = [];
+          if (!item.cntrTypeCode) {
+            textList.push("箱型");
+          }
+          if (!item.cntrNo) {
+            textList.push("箱号");
+          }
+          if (!item.sealNo) {
+            textList.push("封号");
+          }
+          if (!item.quantity || Number(item.quantity) == 0) {
+            textList.push("件数");
+          }
+          if (!item.grossWeight || Number(item.grossWeight) == 0) {
+            textList.push("毛重");
+          }
+          if (!item.measurement || Number(item.measurement) == 0) {
+            textList.push("尺码/体积");
+          }
+          if (textList.length) {
+            return this.$message.error(`请完善配箱信息的${textList.join(",")}!`);
+          }
         }
         submit(this.form).then(res => {
           this.$confirm(`预定集装箱:${htmlText.join(",")}<br/>是否提交订舱?`, {

src/views/iosBasicData/financialManagement/PaymentApplication/detailsPage.vue

@@ -136,15 +136,8 @@
                       >选定删除
                     </el-button>
                     <el-button size="small" type="danger" style="margin-left: 10px" :disabled="editDisabled" @click="allDelete">全部删除 </el-button>
-                    <span style="font-size:18px;font-weight:600;margin-left:10px;">
-                      <!-- <span style="color:#F56C6C;">总行数:{{
-                                                form.finStlBillsItemsList.length }}</span> -->
-                      <span style="color: #67C23A;margin-right: 10px;"> 应收本币:{{ form.amountDr || 0 }}元 </span>
-                      <span style="color: #E6A23C;margin-right: 10px;"> 应付本币:{{ form.amountCr || 0 }}元 </span>
-                      <span style="color: #67C23A;margin-right: 10px;"> 应收外币:{{ form.amountDrUsd || 0 }}元 </span>
-                      <span style="color: #E6A23C;margin-right: 10px;"> 应付外币:{{ form.amountCrUsd || 0 }}元 </span>
-                      <span style="color: #E6A23C;margin-right: 10px;"> 总合计:{{ form.amountSubLoc || 0 }}元 </span>
-                    </span>
+                    <el-tag type="success" style="margin-right: 6px;">本币合计:{{ Number(form.amountCr||0 - form.amountDr||0).toFixed(2)||0 }}元 </el-tag>
+                    <el-tag type="warning" style="margin-right: 6px;">外币合计:{{ Number(form.amountCrUsd||0 - form.amountDrUsd||0).toFixed(2)||0 }}元</el-tag>
                   </template>
                 </avue-crud>
               </trade-card>
@@ -187,12 +180,10 @@
                     <el-button type="success" size="small" @click="allClick('导入')">
                       导入
                     </el-button>
-                    <span style="font-size:18px;font-weight:600;margin-left:10px;">
-                      <span style="color: #67C23A;margin-right: 10px;"> 应收本币:{{ sumDRMB.toFixed(2) }}元 </span>
-                      <span style="color: #E6A23C;margin-right: 10px;"> 应付本币:{{ sumCRMB.toFixed(2) }}元 </span>
-                      <span style="color: #67C23A;margin-right: 10px;"> 应收外币:{{ sumDUSD.toFixed(2) }}元 </span>
-                      <span style="color: #E6A23C;margin-right: 10px;"> 应付外币:{{ sumCUSD.toFixed(2) }}元 </span>
-                    </span>
+                    <el-tag type="success" style="margin-right: 6px;">应收本币:{{ sumDRMB.toFixed(2) }}元 </el-tag>
+                    <el-tag type="warning" style="margin-right: 6px;">应付本币:{{ sumCRMB.toFixed(2) }}元</el-tag>
+                    <el-tag type="success" style="margin-right: 6px;">应收外币:{{ sumDUSD.toFixed(2) }}元</el-tag>
+                    <el-tag type="warning">应收本币:{{ sumCUSD.toFixed(2) }}元</el-tag>
                   </template>
                   <template slot-scope="{ disabled, size }" slot="feeCnNameSearch">
                     <dic-select
@@ -253,9 +244,7 @@
                       @click="allClick('明细加入')"
                       >明细加入
                     </el-button>
-                    <span style="font-size:18px;font-weight:600;margin-left:10px;">
-                      <span style="color: #67C23A;margin-right: 10px;"> 金额合计:{{ amountSum.toFixed(2) }}元 </span>
-                    </span>
+                    <el-tag type="success">金额合计:{{ amountSum.toFixed(2) }}元</el-tag>
                   </template>
                   <tempalte slot="appliedCurrentStlAmount" slot-scope="{ row }">
                     <el-input-number
@@ -1482,7 +1471,7 @@ export default {
     finstlbillslistAccBillV1fun() {
       let obj = {};
       obj.type = "2";
-      obj.operationType="付费申请";
+      obj.operationType = "付费申请";
       obj.branchId = this.form.branchId;
       obj.branchName = this.form.branchName;
       obj.corpCnName = this.form.corpId; // 付费对象

src/views/iosBasicData/financialManagement/computationCenter/detailsPage.vue

@@ -130,13 +130,11 @@
                     <el-button size="small" type="danger" :disabled="!form.id" v-if="form.requestNo && form.status == 0" @click="allClick('撤销生成')"
                       >全部删除
                     </el-button>
-                    <span style="font-size:18px;font-weight:600;margin-left:10px;">
-                      <span style="color: #67C23A;margin-right: 10px;"> 应收本币:{{ form.amountDr || 0 }}元 </span>
-                      <span style="color: #E6A23C;margin-right: 10px;"> 应付本币:{{ form.amountCr || 0 }}元 </span>
-                      <span style="color: #67C23A;margin-right: 10px;"> 应收外币:{{ form.amountDrUsd || 0 }}元 </span>
-                      <span style="color: #E6A23C;margin-right: 10px;"> 应付外币:{{ form.amountCrUsd || 0 }}元 </span>
-                      <span style="color: #E6A23C;margin-right: 10px;"> 总合计:{{ form.amountSubLoc || 0 }}元 </span>
-                    </span>
+                    <el-tag type="success" style="margin-right: 6px;">应收本币:{{ form.amountDr || 0 }}元 </el-tag>
+                    <el-tag type="warning" style="margin-right: 6px;">应付本币:{{ form.amountCr || 0 }}元</el-tag>
+                    <el-tag type="success" style="margin-right: 6px;">应收外币:{{ form.amountDrUsd || 0 }}元</el-tag>
+                    <el-tag type="warning" style="margin-right: 6px;">应付外币:{{ form.amountCrUsd || 0 }}元</el-tag>
+                    <el-tag type="warning">总合计:{{ form.amountSubLoc || 0 }}元</el-tag>
                   </template>
                 </avue-crud>
               </trade-card>
@@ -176,12 +174,10 @@
                     <el-button type="warning" size="small" @click="outExport">
                       导出
                     </el-button>
-                    <span style="font-size:18px;font-weight:600;margin-left:10px;">
-                      <span style="color: #67C23A;margin-right: 10px;"> 应收本币:{{ sumDRMB.toFixed(2) }}元 </span>
-                      <span style="color: #E6A23C;margin-right: 10px;"> 应付本币:{{ sumCRMB.toFixed(2) }}元 </span>
-                      <span style="color: #67C23A;margin-right: 10px;"> 应收外币:{{ sumDUSD.toFixed(2) }}元 </span>
-                      <span style="color: #E6A23C;margin-right: 10px;"> 应付外币:{{ sumCUSD.toFixed(2) }}元 </span>
-                    </span>
+                    <el-tag type="success" style="margin-right: 6px;">应收本币:{{ sumDRMB.toFixed(2) }}元 </el-tag>
+                    <el-tag type="warning" style="margin-right: 6px;">应付本币:{{ sumCRMB.toFixed(2) }}元</el-tag>
+                    <el-tag type="success" style="margin-right: 6px;">应收外币:{{ sumDUSD.toFixed(2) }}元</el-tag>
+                    <el-tag type="warning">应收本币:{{ sumCUSD.toFixed(2) }}元</el-tag>
                   </template>
                   <template slot-scope="{ disabled, size }" slot="feeCnNameSearch">
                     <dic-select
@@ -242,9 +238,7 @@
                       @click="allClick('明细加入')"
                       >明细加入
                     </el-button>
-                    <span style="font-size:18px;font-weight:600;margin-left:10px;">
-                      <span style="color: #67C23A;margin-right: 10px;"> 金额合计:{{ amountSum.toFixed(2) }}元 </span>
-                    </span>
+                    <el-tag type="success">金额合计:{{ amountSum.toFixed(2) }}元</el-tag>
                   </template>
                   <tempalte slot="amount" slot-scope="{ row }">
                     <el-input-number

src/views/iosBasicData/financialManagement/computationCenter/index.vue

@@ -44,10 +44,8 @@
           <el-button v-if="tabsValue == 'D'" type="success" size="small" plain @click="allClick('已开已收')">已开已收 </el-button>
           <el-button v-if="tabsValue == '业务单据'" type="primary" size="small" plain @click="addfun()">添加单据 </el-button>
           <el-button v-if="tabsValue == '业务单据'" type="danger" size="small" plain @click="handleDelete()">一键删除 </el-button>
-          <span style="font-size: 24px;font-weight: 600;">
-            <span style="color: #67C23A;margin-right: 10px;"> 本币:{{ amountSubSum.toFixed(2) }}元 </span>
-            <span style="color: #E6A23C;"> 外币:{{ amountSubUsdSum.toFixed(2) }}元 </span>
-          </span>
+          <el-tag type="success" style="margin-right: 6px;">本币:{{ amountSubSum.toFixed(2) }}元 </el-tag>
+          <el-tag type="warning">外币:{{ amountSubUsdSum.toFixed(2) }}元</el-tag>
         </template>
         <tempalte slot="feeCnNameSearch">
           <dic-select
@@ -120,7 +118,7 @@ import dicSelect from "@/components/dicSelect/main";
 import { dateFormat } from "@/util/date";
 import detailsPage from "./detailsPage";
 export default {
-  name:"结算中心(N)",
+  name: "结算中心(N)",
   components: { detailsPage, dicSelect },
   data() {
     return {
@@ -185,7 +183,7 @@ export default {
             prop: "branchName",
             width: "120",
             overHidden: true,
-            hide: true,
+            hide: true
           },
           {
             label: "往来单位",
@@ -290,7 +288,7 @@ export default {
             type: "date",
             format: "yyyy-MM-dd",
             valueFormat: "yyyy-MM-dd HH:mm:ss",
-            width: 100,
+            width: 100
           },
           {
             label: "结算日期起",

src/views/iosBasicData/financialManagement/fininvoicesApplyfor/detailsPage.vue

@@ -10,7 +10,7 @@
         <el-button size="small" :disabled="!form.id" @click="previewreportfun">预 览 </el-button>
         <el-button size="small" v-if="roleName.indexOf('admin') != -1" :disabled="!form.id" @click="DesignreportDialog = true">报表设计 </el-button>
         <el-button type="success" size="small" :disabled="!form.id" plain @click="newbill">新建发票申请 </el-button>
-        <el-button size="small" type="danger" plain :disabled="!form.id || editPower" v-if="form.status !=0" @click="allClick('撤销')"
+        <el-button size="small" type="danger" plain :disabled="!form.id || editPower" v-if="form.status != 0" @click="allClick('撤销')"
           >撤销
         </el-button>
         <el-button size="small" type="success" plain :disabled="!form.id || editPower" v-else @click="allClick('提交')">提交 </el-button>
@@ -174,13 +174,9 @@
                       >选定删除
                     </el-button>
                     <el-button size="small" type="danger" style="margin-left: 10px" :disabled="editDisabled" @click="allDelete">全部删除 </el-button>
-                    <span style="font-size:18px;font-weight:600;margin-left:10px;">
-                      <!-- <span style="color:#F56C6C;">总行数:{{
-                                                form.finInvoicesItemsList.length }}</span> -->
-                      <span style="color: #67C23A;margin-right: 10px;"> 开票本币:{{ form.amountCny || 0 }}元 </span>
-                      <span style="color: #E6A23C;margin-right: 10px;"> 开票外币:{{ form.amountUsd || 0 }}元 </span>
-                      <span style="color: #67C23A;margin-right: 10px;"> 开票本币合计:{{ form.amountLoc || 0 }}元 </span>
-                    </span>
+                    <el-tag type="success" style="margin-right: 6px;">开票本币:{{ form.amountCny || 0 }}元 </el-tag>
+                    <el-tag type="warning" style="margin-right: 6px;">开票外币:{{ form.amountUsd || 0 }}元</el-tag>
+                    <el-tag type="success">开票本币合计:{{ form.amountLoc || 0 }}元</el-tag>
                   </template>
                 </avue-crud>
               </trade-card>
@@ -220,12 +216,10 @@
                     <el-button type="warning" size="small" @click="outExport">
                       导出
                     </el-button>
-                    <span style="font-size:18px;font-weight:600;margin-left:10px;">
-                      <span style="color: #67C23A;margin-right: 10px;"> 应收本币:{{ sumDRMB.toFixed(2) }}元 </span>
-                      <span style="color: #E6A23C;margin-right: 10px;"> 应付本币:{{ sumCRMB.toFixed(2) }}元 </span>
-                      <span style="color: #67C23A;margin-right: 10px;"> 应收外币:{{ sumDUSD.toFixed(2) }}元 </span>
-                      <span style="color: #E6A23C;margin-right: 10px;"> 应付外币:{{ sumCUSD.toFixed(2) }}元 </span>
-                    </span>
+                    <el-tag type="success" style="margin-right: 6px;">应收本币:{{ sumDRMB.toFixed(2) }}元 </el-tag>
+                    <el-tag type="warning" style="margin-right: 6px;">应付本币:{{ sumCRMB.toFixed(2) }}元</el-tag>
+                    <el-tag type="success" style="margin-right: 6px;">应收外币:{{ sumDUSD.toFixed(2) }}元</el-tag>
+                    <el-tag type="warning">应收本币:{{ sumCUSD.toFixed(2) }}元</el-tag>
                   </template>
                   <template slot-scope="{ disabled, size }" slot="feeCnNameSearch">
                     <dic-select
@@ -286,9 +280,7 @@
                       @click="allClick('明细加入')"
                       >明细加入
                     </el-button>
-                    <span style="font-size:18px;font-weight:600;margin-left:10px;">
-                      <span style="color: #67C23A;margin-right: 10px;"> 金额合计:{{ amountSum.toFixed(2) }}元 </span>
-                    </span>
+                     <el-tag type="success" >金额合计:{{ amountSum.toFixed(2) }}元</el-tag>
                   </template>
                   <tempalte slot="appliedInvoiceCurrentAmount" slot-scope="{ row }">
                     <el-input-number
@@ -418,7 +410,7 @@ export default {
   },
   data() {
     return {
-      invoiceReview:false,
+      invoiceReview: false,
       checkId: "", // 审核需要的id
       batchNo: "",
       checkScheduleDialog: false, // 审核弹窗
@@ -1017,7 +1009,7 @@ export default {
       this.form.corpEnName = this.$route.query.corpEnName;
       this.form.corpArgreementNo = this.$route.query.corpEnName;
     }
-        isProcurement({ param: "whether.open.Invoice.review" }).then(res => {
+    isProcurement({ param: "whether.open.Invoice.review" }).then(res => {
       if (res.data.data == 1) {
         this.invoiceReview = true;
       }
@@ -1029,7 +1021,7 @@ export default {
   methods: {
     inEdit() {
       this.editButton = false;
-      if (this.form.status !=0) return;
+      if (this.form.status != 0) return;
       this.editDisabled = false;
       this.optionForm.disabled = false;
     },
@@ -1250,9 +1242,9 @@ export default {
           this.form.businessTypeCode = "FPSQ";
           let obj = {
             ...this.form,
-            url:'/iosBasicData/financialManagement/fininvoicesApplyfor/index',
-            pageLabel:'发票申请(N)',
-            pageStatus:'',
+            url: "/iosBasicData/financialManagement/fininvoicesApplyfor/index",
+            pageLabel: "发票申请(N)",
+            pageStatus: ""
           };
           fininvoicesSubmit(obj);
           this.$confirm("是否提交?", "提示", {
@@ -1454,7 +1446,7 @@ export default {
       });
       fininvoicesDetail(id)
         .then(res => {
-          if (res.data.data.status !=0) {
+          if (res.data.data.status != 0) {
             this.editButton = true;
             this.editDisabled = true;
             this.optionForm.disabled = true;

src/views/iosBasicData/financialManagement/fininvoicesOutput/detailsPage.vue

@@ -173,13 +173,9 @@
                     <el-button size="small" type="danger" :disabled="!form.id" v-if="form.applyNo && form.status == 0" @click="allClick('撤销生成')"
                       >全部删除
                     </el-button>
-                    <span style="font-size:18px;font-weight:600;margin-left:10px;">
-                      <!-- <span style="color:#F56C6C;">总行数:{{
-                                                form.finInvoicesItemsList.length }}</span> -->
-                      <span style="color: #67C23A;margin-right: 10px;"> 开票本币:{{ form.amountCny || 0 }}元 </span>
-                      <span style="color: #E6A23C;margin-right: 10px;"> 开票外币:{{ form.amountUsd || 0 }}元 </span>
-                      <span style="color: #67C23A;margin-right: 10px;"> 开票本币合计:{{ form.amountLoc || 0 }}元 </span>
-                    </span>
+                    <el-tag type="success" style="margin-right: 6px;">开票本币:{{ form.amountCny || 0 }}元 </el-tag>
+                    <el-tag type="warning" style="margin-right: 6px;">开票外币:{{ form.amountUsd || 0 }}元</el-tag>
+                    <el-tag type="success">开票本币合计:{{ form.amountLoc || 0 }}元</el-tag>
                   </template>
                 </avue-crud>
               </trade-card>
@@ -219,12 +215,10 @@
                     <el-button type="warning" size="small" @click="outExport">
                       导出
                     </el-button>
-                    <span style="font-size:18px;font-weight:600;margin-left:10px;">
-                      <span style="color: #67C23A;margin-right: 10px;"> 应收本币:{{ sumDRMB.toFixed(2) }}元 </span>
-                      <span style="color: #E6A23C;margin-right: 10px;"> 应付本币:{{ sumCRMB.toFixed(2) }}元 </span>
-                      <span style="color: #67C23A;margin-right: 10px;"> 应收外币:{{ sumDUSD.toFixed(2) }}元 </span>
-                      <span style="color: #E6A23C;margin-right: 10px;"> 应付外币:{{ sumCUSD.toFixed(2) }}元 </span>
-                    </span>
+                    <el-tag type="success" style="margin-right: 6px;">应收本币:{{ sumDRMB.toFixed(2) }}元 </el-tag>
+                    <el-tag type="warning" style="margin-right: 6px;">应付本币:{{ sumCRMB.toFixed(2) }}元</el-tag>
+                    <el-tag type="success" style="margin-right: 6px;">应收外币:{{ sumDUSD.toFixed(2) }}元</el-tag>
+                    <el-tag type="warning">应收本币:{{ sumCUSD.toFixed(2) }}元</el-tag>
                   </template>
                   <template slot-scope="{ disabled, size }" slot="feeCnNameSearch">
                     <dic-select
@@ -285,9 +279,7 @@
                       @click="allClick('明细加入')"
                       >明细加入
                     </el-button>
-                    <span style="font-size:18px;font-weight:600;margin-left:10px;">
-                      <span style="color: #67C23A;margin-right: 10px;"> 金额合计:{{ amountSum.toFixed(2) }}元 </span>
-                    </span>
+                    <el-tag type="success">金额合计:{{ amountSum.toFixed(2) }}元</el-tag>
                   </template>
                   <tempalte slot="appliedInvoiceCurrentAmount" slot-scope="{ row }">
                     <el-input-number

src/views/iosBasicData/financialManagement/fininvoicesOutput/index.vue

@@ -34,10 +34,8 @@
       >
         <template slot="menuLeft" slot-scope="{ row }">
           <el-button type="success" size="small" @click="multipleInvoicing">选择开票</el-button>
-          <span style="font-size: 24px;font-weight: 600;">
-            <span style="color: #67C23A;margin-right: 10px;"> 本币:{{ amountSubSum }}元 </span>
-            <span style="color: #E6A23C;"> 外币:{{ amountSubUsdSum }}元 </span>
-          </span>
+          <el-tag type="success" style="margin-right: 6px;">本币:{{ amountSubSum.toFixed(2) }}元 </el-tag>
+          <el-tag type="warning">外币:{{ amountSubUsdSum.toFixed(2) }}元</el-tag>
         </template>
         <template slot="menu" slot-scope="{ row }">
           <el-button
@@ -88,10 +86,8 @@
         <template slot="menuLeft">
           <el-button type="success" size="small" icon="el-icon-plus" plain @click="newbillFun">新建发票 </el-button>
           <el-button type="danger" size="small" icon="el-icon-delete" plain @click="handleDelete">一键删除 </el-button>
-          <span style="font-size: 24px;font-weight: 600;">
-            <span style="color: #67C23A;margin-right: 10px;"> 本币:{{ amountSubSum }}元 </span>
-            <span style="color: #E6A23C;"> 外币:{{ amountSubUsdSum }}元 </span>
-          </span>
+          <el-tag type="success" style="margin-right: 6px;">本币:{{ amountSubSum.toFixed(2) }}元 </el-tag>
+          <el-tag type="warning">外币:{{ amountSubUsdSum.toFixed(2) }}元</el-tag>
         </template>
         <template slot="menu" slot-scope="{ row }">
           <el-button type="text" size="small" @click="rowEdit(row)">编辑 </el-button>

src/views/iosBasicData/financialManagement/finstlbills/detailsPage.vue

@@ -89,12 +89,10 @@
                       >选定删除
                     </el-button>
                     <el-button size="small" type="danger" style="margin-left: 10px" :disabled="editDisabled" @click="allDelete">全部删除 </el-button>
-                    <span style="font-size:18px;font-weight:600;margin-left:10px;">
-                      <span style="color: #67C23A;margin-right: 10px;"> 应收本币:{{ form.amountDr || 0 }}元 </span>
-                      <span style="color: #E6A23C;margin-right: 10px;"> 应付本币:{{ form.amountCr || 0 }}元 </span>
-                      <span style="color: #67C23A;margin-right: 10px;"> 应收外币:{{ form.amountDrUsd || 0 }}元 </span>
-                      <span style="color: #E6A23C;margin-right: 10px;"> 应付外币:{{ form.amountCrUsd || 0 }}元 </span>
-                    </span>
+                    <el-tag type="success" style="margin-right: 6px;">应收本币:{{ form.amountDr || 0 }}元 </el-tag>
+                    <el-tag type="warning" style="margin-right: 6px;">应付本币:{{ form.amountCr || 0 }}元</el-tag>
+                    <el-tag type="success" style="margin-right: 6px;">应收外币:{{ form.amountDrUsd || 0 }}元</el-tag>
+                    <el-tag type="warning">应收本币:{{ form.amountDr || 0 }}元</el-tag>
                   </template>
                 </avue-crud>
               </trade-card>
@@ -137,12 +135,10 @@
                     <el-button type="success" size="small" @click="allClick('导入')">
                       导入
                     </el-button>
-                    <span style="font-size:18px;font-weight:600;margin-left:10px;">
-                      <span style="color: #67C23A;margin-right: 10px;"> 应收本币:{{ sumDRMB.toFixed(2) }}元 </span>
-                      <span style="color: #E6A23C;margin-right: 10px;"> 应付本币:{{ sumCRMB.toFixed(2) }}元 </span>
-                      <span style="color: #67C23A;margin-right: 10px;"> 应收外币:{{ sumDUSD.toFixed(2) }}元 </span>
-                      <span style="color: #E6A23C;margin-right: 10px;"> 应付外币:{{ sumCUSD.toFixed(2) }}元 </span>
-                    </span>
+                    <el-tag type="success" style="margin-right: 6px;">应收本币:{{ sumDRMB.toFixed(2) }}元 </el-tag>
+                    <el-tag type="warning" style="margin-right: 6px;">应付本币:{{ sumCRMB.toFixed(2) }}元</el-tag>
+                    <el-tag type="success" style="margin-right: 6px;">应收外币:{{ sumDUSD.toFixed(2) }}元</el-tag>
+                    <el-tag type="warning">应收本币:{{ sumCUSD.toFixed(2) }}元</el-tag>
                   </template>
                   <template slot-scope="{ disabled, size }" slot="feeCnNameSearch">
                     <dic-select
@@ -206,9 +202,7 @@
                       @click="allClick('明细加入')"
                       >明细加入
                     </el-button>
-                    <span style="font-size:18px;font-weight:600;margin-left:10px;">
-                      <span style="color: #67C23A;margin-right: 10px;"> 金额合计:{{ amountSum.toFixed(2) }}元 </span>
-                    </span>
+                     <el-tag type="success" >金额合计:{{ amountSum.toFixed(2) }}元</el-tag>
                   </template>
                   <tempalte slot="reconciliationCurrentAmount" slot-scope="{ row }">
                     <el-input-number

src/views/ow/owPut/detailsPage.vue

@@ -4058,13 +4058,17 @@ export default {
           const itemsWithId = multiList.filter(item => item.id != null);
           let arrIds = itemsWithId.map(item => item.id); // 获取id 数据
           // 把选中的删除掉
-          multiList.forEach(item => {
-            for (let index in arr) {
-              if (JSON.stringify(item) == JSON.stringify(arr[index])) {
-                arr.splice(Number(index), 1);
+
+          if (itemsWithId.length == 0) {
+            // 把选中的删除掉
+            multiList.forEach(item => {
+              for (let index in arr) {
+                if (JSON.stringify(item) == JSON.stringify(arr[index])) {
+                  arr.splice(Number(index), 1);
+                }
               }
-            }
-          });
+            });
+          }
           if (itemsWithId.length != 0) {
             const loading = this.$loading({
               lock: true,
@@ -4076,6 +4080,14 @@ export default {
               ids: arrIds.join(",")
             })
               .then(res => {
+                // 把选中的删除掉
+                multiList.forEach(item => {
+                  for (let index in arr) {
+                    if (JSON.stringify(item) == JSON.stringify(arr[index])) {
+                      arr.splice(Number(index), 1);
+                    }
+                  }
+                });
                 this.$message.success("删除成功");
               })
               .finally(() => {
@@ -4140,14 +4152,16 @@ export default {
           // 获取有id 的数据
           const itemsWithId = multiList.filter(item => item.id != null);
           let arrIds = itemsWithId.map(item => item.id); // 获取id 数据
-          // 把选中的删除掉
-          multiList.forEach(item => {
-            for (let index in arr) {
-              if (JSON.stringify(item) == JSON.stringify(arr[index])) {
-                arr.splice(Number(index), 1);
+          if (itemsWithId.length == 0) {
+            // 把选中的删除掉
+            multiList.forEach(item => {
+              for (let index in arr) {
+                if (JSON.stringify(item) == JSON.stringify(arr[index])) {
+                  arr.splice(Number(index), 1);
+                }
               }
-            }
-          });
+            });
+          }
           if (itemsWithId.length != 0) {
             const loading = this.$loading({
               lock: true,
@@ -4159,6 +4173,14 @@ export default {
               ids: arrIds.join(",")
             })
               .then(res => {
+                // 把选中的删除掉
+                multiList.forEach(item => {
+                  for (let index in arr) {
+                    if (JSON.stringify(item) == JSON.stringify(arr[index])) {
+                      arr.splice(Number(index), 1);
+                    }
+                  }
+                });
                 this.$message.success("删除成功");
               })
               .finally(() => {

src/views/ow/owTask/detailsPage.vue

@@ -295,7 +295,7 @@
                   type="info"
                   plain
                   size="small"
-                  :disabled="editDisabled || !form.id || form.tradingBoxItemsList.length == 0 || searchStatus"
+                  :disabled="editDisabled || !form.id || form.tradingBoxItemsList.length == 0"
                   @click="allClick('一键保存')"
                   >一键保存</el-button
                 >
@@ -303,7 +303,7 @@
                   type="info"
                   plain
                   size="small"
-                  :disabled="editDisabled || form.tradingBoxItemsList.length == 0 || searchStatus"
+                  :disabled="editDisabled || form.tradingBoxItemsList.length == 0"
                   @click="allClick('一键编辑')"
                   >一键编辑</el-button
                 >
@@ -496,6 +496,11 @@
                 </dic-select>
                 <span v-else>{{ row.agentName }}</span>
               </tempalte>
+              <template slot="menu" slot-scope="{ row, index }">
+                <el-button size="small" type="text" @click="rowBoxEdit(row, index)" :disabled="editDisabled">{{
+                  row.$cellEdit ? "保存" : "编辑"
+                }}</el-button>
+              </template>
             </avue-crud>
             <div class="basic-container-foot" @mouseenter="enter" @mouseleave="leave">
               <div v-show="show" style="height: 20px" @click="onShow('收缩')">
@@ -1334,7 +1339,8 @@ import {
   revokeMergeGenerateCost,
   revokePickUpCost,
   finstlbillsGetAccBillIdList,
-  fininvoicesGetAccBillIdList
+  fininvoicesGetAccBillIdList,
+  addSubmit
 } from "@/api/boxManagement/buyContainer";
 
 import { bportsDetail } from "@/api/iosBasicData/bports";
@@ -2113,7 +2119,7 @@ export default {
         refreshBtn: false,
         selection: true,
         align: "center",
-        menu: false,
+        menu: true,
         index: true,
         column: [
           {
@@ -3539,7 +3545,6 @@ export default {
       if (this.boxQuery.code) {
         this.searchStatus = true;
         let boxNums = this.boxQuery.code.split(" ");
-        console.log(boxNums);
         this.form.tradingBoxItemsList = this.form.tradingBoxItemsList.filter(item => boxNums.includes(item.code));
       }
     },
@@ -4125,6 +4130,31 @@ export default {
         }
       }
     },
+    rowBoxEdit(row) {
+      if (row.$cellEdit == true) {
+        if (!row.code || !row.boxType || !row.boxBelongsTo || !row.boxEastName || !row.boxCategory || !row.boxStatus || !row.boxCondition) {
+          this.$refs.crud.rowCell(row, row.$index);
+          return this.$message.error("请完善箱明细信息");
+        }
+        const loading = this.$loading({
+          lock: true,
+          text: "加载中",
+          spinner: "el-icon-loading",
+          background: "rgba(255,255,255,0.7)"
+        });
+        addSubmit(row)
+          .then(res => {
+            this.$set(row, "$cellEdit", false);
+            this.$message.success("保存成功");
+          })
+          .finally(() => {
+            loading.close();
+          });
+      } else {
+        this.$refs.crud.dicInit();
+        this.$set(row, "$cellEdit", true);
+      }
+    },
     rowEdit(row) {
       if (row.$cellEdit == true) {
         if (!row.riseDays || Number(row.riseDays) == 0) {
@@ -4554,14 +4584,17 @@ export default {
           // 获取有id 的数据
           const itemsWithId = multiList.filter(item => item.id != null);
           let arrIds = itemsWithId.map(item => item.id); // 获取id 数据
-          // 把选中的删除掉
-          multiList.forEach(item => {
-            for (let index in arr) {
-              if (JSON.stringify(item) == JSON.stringify(arr[index])) {
-                arr.splice(Number(index), 1);
+
+          if (itemsWithId.length == 0) {
+            // 把选中的删除掉
+            multiList.forEach(item => {
+              for (let index in arr) {
+                if (JSON.stringify(item) == JSON.stringify(arr[index])) {
+                  arr.splice(Number(index), 1);
+                }
               }
-            }
-          });
+            });
+          }
           if (itemsWithId.length != 0) {
             const loading = this.$loading({
               lock: true,
@@ -4571,6 +4604,14 @@ export default {
             });
             tradingBoxFees({ ids: arrIds.join(",") })
               .then(res => {
+                // 把选中的删除掉
+                multiList.forEach(item => {
+                  for (let index in arr) {
+                    if (JSON.stringify(item) == JSON.stringify(arr[index])) {
+                      arr.splice(Number(index), 1);
+                    }
+                  }
+                });
                 this.$message.success("删除成功");
               })
               .finally(() => {
@@ -4657,14 +4698,17 @@ export default {
           // 获取有id 的数据
           const itemsWithId = multiList.filter(item => item.id != null);
           let arrIds = itemsWithId.map(item => item.id); // 获取id 数据
-          // 把选中的删除掉
-          multiList.forEach(item => {
-            for (let index in arr) {
-              if (JSON.stringify(item) == JSON.stringify(arr[index])) {
-                arr.splice(Number(index), 1);
+
+          if (itemsWithId.length == 0) {
+            // 把选中的删除掉
+            multiList.forEach(item => {
+              for (let index in arr) {
+                if (JSON.stringify(item) == JSON.stringify(arr[index])) {
+                  arr.splice(Number(index), 1);
+                }
               }
-            }
-          });
+            });
+          }
           if (itemsWithId.length != 0) {
             const loading = this.$loading({
               lock: true,
@@ -4674,6 +4718,14 @@ export default {
             });
             tradingBoxFees({ ids: arrIds.join(",") })
               .then(res => {
+                // 把选中的删除掉
+                multiList.forEach(item => {
+                  for (let index in arr) {
+                    if (JSON.stringify(item) == JSON.stringify(arr[index])) {
+                      arr.splice(Number(index), 1);
+                    }
+                  }
+                });
                 this.$message.success("删除成功");
               })
               .finally(() => {

src/views/ow/owTask/index.vue

@@ -106,6 +106,21 @@ export default {
             name: "totalAmount",
             type: "sum",
             decimals: 2
+          },
+          {
+            name: "boxNumber",
+            type: "sum",
+            decimals: 0
+          },
+          {
+            name: "suitcaseNum",
+            type: "sum",
+            decimals: 0
+          },
+          {
+            name: "notSuitcaseNum",
+            type: "sum",
+            decimals: 0
           }
         ],
         column: [
@@ -691,7 +706,7 @@ export default {
       });
     },
     rowEdit(row) {
-         this.pageIds = [];
+      this.pageIds = [];
       this.data.forEach(item => {
         this.pageIds.push(item.id);
       });