修改bug

src/views/iosBasicData/ComputationCenter/index.vue

@@ -825,7 +825,7 @@ export default {
         res = await fininvoicesList(page.currentPage, page.pageSize, {
           ...Object.assign(params, this.query),
           type: "销项",
-          // cashierStatus: 2,
+          cashierStatus: 2,
           status: 3,
           billStatus: 0
         });

src/views/iosBasicData/ComputationCenter/settlementDetails.vue

@@ -3123,4 +3123,7 @@ export default {
 /deep/.el-dialog .el-dialog__body {
   padding: 0px 20px;
 }
+::v-deep .el-form-item__error{
+  display: none;
+}
 </style>

src/views/iosBasicData/PaymentApplication/assembly/finstlbillsitems.vue

@@ -28,7 +28,7 @@
           placeholder="请输入 本次对账CNY"
           size="mini"
           style="width: 100%;"
-          :disabled="row.currentStlCurCode != 'CNY'"
+          :disabled="row.currentStlCurCode != 'CNY' || (row.currentStlAmountRMB == 0 && row.currentStlAmountUSD == 0)"
         ></el-input-number>
         <span v-else>{{ row.currentStlAmountRMB }}</span>
       </tempalte>
@@ -41,7 +41,7 @@
           placeholder="请输入 本次对账USD"
           size="mini"
           style="width: 100%;"
-          :disabled="row.currentStlCurCode != 'USD'"
+          :disabled="row.currentStlCurCode != 'USD' || (row.currentStlAmountRMB == 0 && row.currentStlAmountUSD == 0)"
         ></el-input-number>
         <span v-else>{{ row.currentStlAmountUSD }}</span>
       </tempalte>
@@ -99,6 +99,18 @@
         </el-date-picker>
         <span v-else>{{ row.deductionTime }}</span>
       </template>
+      <template slot="reconciliationAmount" slot-scope="{ row }">
+        <el-popover trigger="click">
+          <avue-crud :data="rlaData" :option="rlaOption"></avue-crud>
+          <span style="color: #409EFF;cursor: pointer" slot="reference" @click="viewRLA(row)">{{ row.reconciliationAmount }}</span>
+        </el-popover>
+      </template>
+      <template slot="reconciliationAmountUsd" slot-scope="{ row }">
+        <el-popover trigger="click">
+          <avue-crud :data="rlaData" :option="rlaOption"></avue-crud>
+          <span style="color: #409EFF;cursor: pointer" slot="reference" @click="viewRLA(row)">{{ row.reconciliationAmountUsd }}</span>
+        </el-popover>
+      </template>
     </avue-crud>
   </div>
 </template>
@@ -108,8 +120,7 @@ import { getWorkDicts } from "@/api/system/dictbiz";
 import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
 import { getRateList } from "@/api/iosBasicData/rateManagement";
 import costDetails from "@/views/iosBasicData/finstlbills/assembly/costDetails.vue";
-import { feecenterSelectByAccNoList } from "@/api/iosBasicData/finstlbills";
-
+import { feecenterSelectByAccNoList, getListAll } from "@/api/iosBasicData/finstlbills";
 export default {
   components: { costDetails, SearchQuery },
   props: {
@@ -141,6 +152,44 @@ export default {
   },
   data() {
     return {
+      rlaData: [],
+      rlaOption: {
+        header: false,
+        menu: false,
+        align: "center",
+        column: [
+          {
+            label: "来源单号",
+            prop: "srcNo",
+            width: "200",
+            overHidden: true
+          },
+          {
+            label: "来源类型",
+            prop: "srcType",
+            width: "80",
+            overHidden: true
+          },
+          {
+            label: "签收金额",
+            prop: "signedAmount",
+            width: "100",
+            overHidden: true
+          },
+          {
+            label: "签收人",
+            prop: "consigneeName",
+            width: "100",
+            overHidden: true
+          },
+          {
+            label: "签收时间",
+            prop: "signingTime",
+            width: "120",
+            overHidden: true
+          }
+        ]
+      },
       ifInvoiceData: [], // 是否数据
       invoicelosDara: [], // 发票
       curCodeData: [], // 币种
@@ -170,7 +219,7 @@ export default {
               {
                 label: "未销账",
                 value: 0
-              },    
+              },
               {
                 label: "已销账",
                 value: 1
@@ -204,15 +253,15 @@ export default {
             overHidden: true
           },
           {
-            label: "原业务编号",
-            prop: "billNo",
+            label: "账单编号",
+            prop: "accBillNo",
             width: 120,
             overHidden: true
           },
           {
-            label: "账单编号",
-            prop: "accBillNo",
-            width: 80,
+            label: "原业务编号",
+            prop: "billNo",
+            width: 120,
             overHidden: true
           },
           {
@@ -270,6 +319,18 @@ export default {
             overHidden: true
           },
           {
+            label: "已签收CNY",
+            prop: "reconciliationAmount",
+            width: 100,
+            overHidden: true
+          },
+          {
+            label: "已签收USD",
+            prop: "reconciliationAmountUsd",
+            width: 100,
+            overHidden: true
+          },
+          {
             label: "ETD",
             prop: "etd",
             width: 90,
@@ -352,6 +413,12 @@ export default {
     this.invoicelosWorkDictsfun();
   },
   methods: {
+    viewRLA(row) {
+      this.rlaData = [];
+      getListAll({ billId: row.accBillId }).then(res => {
+        this.rlaData = res.data.data;
+      });
+    },
     sizeChange(val) {
       this.page.currentPage = 1;
       this.page.pageSize = val;
@@ -368,94 +435,38 @@ export default {
       this.pageData = this.queryData.slice(start, end);
     },
     armbChange(row) {
-      if (row.dc == "C") {
-        if (Number(row.amount - row.appliedAmount - row.appliedAmountStl - row.stlTtlAmount) > 0) {
-          if (Number(row.currentStlAmountRMB) < 0) {
-            row.currentStlAmountRMB = 0;
-            return this.$message.error("本次对账金额不能输入负数");
-          }
-          if (Number(row.currentStlAmountRMB) > Number(row.amount - row.appliedAmount - row.appliedAmountStl - row.stlTtlAmount)) {
-            row.currentStlAmountRMB = 0;
-            return this.$message.error("本次对账金额不能超过未对账金额");
-          }
+      if (Number(row.amount - row.reconciliationAmount) > 0) {
+        if (Number(row.currentStlAmountRMB) < 0) {
+          return this.$message.error("本次金额不能输入负数");
         }
-        if (Number(row.amount - row.appliedAmount - row.appliedAmountStl - row.stlTtlAmount) < 0) {
-          if (Number(row.currentStlAmountRMB) >= 0) {
-            row.currentStlAmountRMB = Number(row.amount - row.appliedAmount - row.appliedAmountStl - row.stlTtlAmount);
-            return this.$message.error("本次对账金额不能输入非负数");
-          }
-          if (Number(row.currentStlAmountRMB) < Number(row.amount - row.appliedAmount - row.appliedAmountStl - row.stlTtlAmount)) {
-            row.currentStlAmountRMB = Number(row.amount - row.appliedAmount - row.appliedAmountStl - row.stlTtlAmount);
-            return this.$message.error("本次对账金额不能超过未对账金额");
-          }
+        if (Number(row.currentStlAmountRMB) > Number(row.amount - row.reconciliationAmount)) {
+          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmount));
         }
       }
-      if (row.dc == "D") {
-        if (Number(row.amount - row.stlTtlAmount) > 0) {
-          if (Number(row.currentStlAmountRMB) < 0) {
-            row.currentStlAmountRMB = 0;
-            return this.$message.error("本次对账金额不能输入负数");
-          }
-          if (Number(row.currentStlAmountRMB) > Number(row.amount - row.stlTtlAmount)) {
-            row.currentStlAmountRMB = 0;
-            return this.$message.error("本次对账金额不能超过未对账金额");
-          }
+      if (Number(row.amount - row.reconciliationAmount) < 0) {
+        if (row.currentStlAmountRMB >= 0) {
+          return this.$message.error("本次金额不能输入非负数");
         }
-        if (Number(row.amount - row.stlTtlAmount) < 0) {
-          if (Number(row.currentStlAmountRMB) >= 0) {
-            row.currentStlAmountRMB = Number(row.amount - row.stlTtlAmount);
-            return this.$message.error("本次对账金额不能输入非负数");
-          }
-          if (Number(row.currentStlAmountRMB) < Number(row.amount - row.stlTtlAmount)) {
-            row.currentStlAmountRMB = Number(row.amount - row.stlTtlAmount);
-            return this.$message.error("本次对账金额不能超过未对账金额");
-          }
+        if (Number(row.currentStlAmountRMB) < Number(row.amount - row.reconciliationAmount)) {
+          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmount));
         }
       }
     },
     ausdChange(row) {
-      if (row.dc == "C") {
-        if (Number(row.amount - row.appliedAmount - row.appliedAmountStl - row.stlTtlAmount) > 0) {
-          if (Number(row.currentStlAmountUSD) < 0) {
-            row.currentStlAmountUSD = 0;
-            return this.$message.error("本次对账金额不能输入负数");
-          }
-          if (Number(row.currentStlAmountUSD) > Number(row.amount - row.appliedAmount - row.appliedAmountStl - row.stlTtlAmount)) {
-            row.currentStlAmountUSD = 0;
-            return this.$message.error("本次对账金额不能超过未对账金额");
-          }
+      if (Number(row.amount - row.reconciliationAmount) > 0) {
+        if (Number(row.currentStlAmountUSD) < 0) {
+          return this.$message.error("本次金额不能输入负数");
         }
-        if (Number(row.amount - row.appliedAmount - row.appliedAmountStl - row.stlTtlAmount) < 0) {
-          if (Number(row.currentStlAmountUSD) >= 0) {
-            row.currentStlAmountUSD = Number(row.amount - row.appliedAmount - row.appliedAmountStl - row.stlTtlAmount);
-            return this.$message.error("本次对账金额不能输入非负数");
-          }
-          if (Number(row.currentStlAmountUSD) < Number(row.amount - row.appliedAmount - row.appliedAmountStl - row.stlTtlAmount)) {
-            row.currentStlAmountUSD = Number(row.amount - row.appliedAmount - row.appliedAmountStl - row.stlTtlAmount);
-            return this.$message.error("本次对账金额不能超过未对账金额");
-          }
+        if (Number(row.currentStlAmountUSD) > Number(row.amount - row.reconciliationAmount)) {
+          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmount));
         }
       }
-      if (row.dc == "D") {
-        if (Number(row.amount - row.stlTtlAmount) > 0) {
-          if (Number(row.currentStlAmountUSD) < 0) {
-            row.currentStlAmountUSD = 0;
-            return this.$message.error("本次对账金额不能输入负数");
-          }
-          if (Number(row.currentStlAmountUSD) > Number(row.amount - row.stlTtlAmount)) {
-            row.currentStlAmountUSD = 0;
-            return this.$message.error("本次对账金额不能超过未对账金额");
-          }
+      if (Number(row.amount - row.reconciliationAmount) < 0) {
+        if (row.currentStlAmountUSD >= 0) {
+          return this.$message.error("本次金额不能输入非负数");
         }
-        if (Number(row.amount - row.stlTtlAmount) < 0) {
-          if (Number(row.currentStlAmountUSD) >= 0) {
-            row.currentStlAmountUSD = Number(row.amount - row.stlTtlAmount);
-            return this.$message.error("本次对账金额不能输入非负数");
-          }
-          if (Number(row.currentStlAmountUSD) < Number(row.amount - row.stlTtlAmount)) {
-            row.currentStlAmountUSD = Number(row.amount - row.stlTtlAmount);
-            return this.$message.error("本次对账金额不能超过未对账金额");
-          }
+        if (Number(row.currentStlAmountUSD) < Number(row.amount - row.reconciliationAmount)) {
+          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmount));
         }
       }
     },

src/views/iosBasicData/PaymentApplication/assembly/finstlbillsitems2.vue

@@ -121,7 +121,7 @@ import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
 import { getRateList } from "@/api/iosBasicData/rateManagement";
 import costDetails from "@/views/iosBasicData/finstlbills/assembly/costDetails.vue";
 import { feecenterSelectByAccNoList } from "@/api/iosBasicData/finstlbills";
-import { getListAllDetail } from "@/api/iosBasicData/finstlbills";
+import { getListAll } from "@/api/iosBasicData/finstlbills";
 export default {
   components: { costDetails, SearchQuery },
   props: {
@@ -254,15 +254,15 @@ export default {
             overHidden: true
           },
           {
-            label: "原业务编号",
-            prop: "billNo",
+            label: "账单编号",
+            prop: "accBillNo",
             width: 120,
             overHidden: true
           },
           {
-            label: "账单编号",
-            prop: "accBillNo",
-            width: 80,
+            label: "原业务编号",
+            prop: "billNo",
+            width: 120,
             overHidden: true
           },
           {
@@ -320,6 +320,18 @@ export default {
             overHidden: true
           },
           {
+            label: "已签收CNY",
+            prop: "reconciliationAmount",
+            width: 100,
+            overHidden: true
+          },
+          {
+            label: "已签收USD",
+            prop: "reconciliationAmountUsd",
+            width: 100,
+            overHidden: true
+          },
+          {
             label: "ETD",
             prop: "etd",
             width: 90,
@@ -374,18 +386,6 @@ export default {
             overHidden: true
           },
           {
-            label: "已签收CNY",
-            prop: "reconciliationAmount",
-            width: 100,
-            overHidden: true
-          },
-          {
-            label: "已签收USD",
-            prop: "reconciliationAmountUsd",
-            width: 100,
-            overHidden: true
-          },
-          {
             label: "ETA",
             prop: "eta",
             width: 120,
@@ -416,7 +416,7 @@ export default {
   methods: {
     viewRLA(row) {
       this.rlaData = [];
-      getListAllDetail({ billId: row.accBillId }).then(res => {
+      getListAll({ billId: row.accBillId }).then(res => {
         this.rlaData = res.data.data;
       });
     },
@@ -435,95 +435,39 @@ export default {
       const end = start + this.page.pageSize;
       this.pageData = this.tableData.slice(start, end);
     },
-    armbChange(row) {
-      if (row.dc == "C") {
-        if (Number(row.amount - row.appliedAmount - row.appliedAmountStl - row.stlTtlAmount) > 0) {
-          if (Number(row.currentStlAmountRMB) < 0) {
-            row.currentStlAmountRMB = 0;
-            return this.$message.error("本次对账金额不能输入负数");
-          }
-          if (Number(row.currentStlAmountRMB) > Number(row.amount - row.appliedAmount - row.appliedAmountStl - row.stlTtlAmount)) {
-            row.currentStlAmountRMB = 0;
-            return this.$message.error("本次对账金额不能超过未对账金额");
-          }
+   armbChange(row) {
+      if (Number(row.amount - row.reconciliationAmount) > 0) {
+        if (Number(row.currentStlAmountRMB) < 0) {
+          return this.$message.error("本次金额不能输入负数");
         }
-        if (Number(row.amount - row.appliedAmount - row.appliedAmountStl - row.stlTtlAmount) < 0) {
-          if (Number(row.currentStlAmountRMB) >= 0) {
-            row.currentStlAmountRMB = Number(row.amount - row.appliedAmount - row.appliedAmountStl - row.stlTtlAmount);
-            return this.$message.error("本次对账金额不能输入非负数");
-          }
-          if (Number(row.currentStlAmountRMB) < Number(row.amount - row.appliedAmount - row.appliedAmountStl - row.stlTtlAmount)) {
-            row.currentStlAmountRMB = Number(row.amount - row.appliedAmount - row.appliedAmountStl - row.stlTtlAmount);
-            return this.$message.error("本次对账金额不能超过未对账金额");
-          }
+        if (Number(row.currentStlAmountRMB) > Number(row.amount - row.reconciliationAmount)) {
+          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmount));
         }
       }
-      if (row.dc == "D") {
-        if (Number(row.amount - row.stlTtlAmount) > 0) {
-          if (Number(row.currentStlAmountRMB) < 0) {
-            row.currentStlAmountRMB = 0;
-            return this.$message.error("本次对账金额不能输入负数");
-          }
-          if (Number(row.currentStlAmountRMB) > Number(row.amount - row.stlTtlAmount)) {
-            row.currentStlAmountRMB = 0;
-            return this.$message.error("本次对账金额不能超过未对账金额");
-          }
+      if (Number(row.amount - row.reconciliationAmount) < 0) {
+        if (row.currentStlAmountRMB >= 0) {
+          return this.$message.error("本次金额不能输入非负数");
         }
-        if (Number(row.amount - row.stlTtlAmount) < 0) {
-          if (Number(row.currentStlAmountRMB) >= 0) {
-            row.currentStlAmountRMB = Number(row.amount - row.stlTtlAmount);
-            return this.$message.error("本次对账金额不能输入非负数");
-          }
-          if (Number(row.currentStlAmountRMB) < Number(row.amount - row.stlTtlAmount)) {
-            row.currentStlAmountRMB = Number(row.amount - row.stlTtlAmount);
-            return this.$message.error("本次对账金额不能超过未对账金额");
-          }
+        if (Number(row.currentStlAmountRMB) < Number(row.amount - row.reconciliationAmount)) {
+          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmount));
         }
       }
     },
     ausdChange(row) {
-      if (row.dc == "C") {
-        if (Number(row.amount - row.appliedAmount - row.appliedAmountStl - row.stlTtlAmount) > 0) {
-          if (Number(row.currentStlAmountUSD) < 0) {
-            row.currentStlAmountUSD = 0;
-            return this.$message.error("本次对账金额不能输入负数");
-          }
-          if (Number(row.currentStlAmountUSD) > Number(row.amount - row.appliedAmount - row.appliedAmountStl - row.stlTtlAmount)) {
-            row.currentStlAmountUSD = 0;
-            return this.$message.error("本次对账金额不能超过未对账金额");
-          }
+      if (Number(row.amount - row.reconciliationAmount) > 0) {
+        if (Number(row.currentStlAmountUSD) < 0) {
+          return this.$message.error("本次金额不能输入负数");
         }
-        if (Number(row.amount - row.appliedAmount - row.appliedAmountStl - row.stlTtlAmount) < 0) {
-          if (Number(row.currentStlAmountUSD) >= 0) {
-            row.currentStlAmountUSD = Number(row.amount - row.appliedAmount - row.appliedAmountStl - row.stlTtlAmount);
-            return this.$message.error("本次对账金额不能输入非负数");
-          }
-          if (Number(row.currentStlAmountUSD) < Number(row.amount - row.appliedAmount - row.appliedAmountStl - row.stlTtlAmount)) {
-            row.currentStlAmountUSD = Number(row.amount - row.appliedAmount - row.appliedAmountStl - row.stlTtlAmount);
-            return this.$message.error("本次对账金额不能超过未对账金额");
-          }
+        if (Number(row.currentStlAmountUSD) > Number(row.amount - row.reconciliationAmount)) {
+          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmount));
         }
       }
-      if (row.dc == "D") {
-        if (Number(row.amount - row.stlTtlAmount) > 0) {
-          if (Number(row.currentStlAmountUSD) < 0) {
-            row.currentStlAmountUSD = 0;
-            return this.$message.error("本次对账金额不能输入负数");
-          }
-          if (Number(row.currentStlAmountUSD) > Number(row.amount - row.stlTtlAmount)) {
-            row.currentStlAmountUSD = 0;
-            return this.$message.error("本次对账金额不能超过未对账金额");
-          }
+      if (Number(row.amount - row.reconciliationAmount) < 0) {
+        if (row.currentStlAmountUSD >= 0) {
+          return this.$message.error("本次金额不能输入非负数");
         }
-        if (Number(row.amount - row.stlTtlAmount) < 0) {
-          if (Number(row.currentStlAmountUSD) >= 0) {
-            row.currentStlAmountUSD = Number(row.amount - row.stlTtlAmount);
-            return this.$message.error("本次对账金额不能输入非负数");
-          }
-          if (Number(row.currentStlAmountUSD) < Number(row.amount - row.stlTtlAmount)) {
-            row.currentStlAmountUSD = Number(row.amount - row.stlTtlAmount);
-            return this.$message.error("本次对账金额不能超过未对账金额");
-          }
+        if (Number(row.currentStlAmountUSD) < Number(row.amount - row.reconciliationAmount)) {
+          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmount));
         }
       }
     },

src/views/iosBasicData/PaymentApplication/finstlbillsDetails.vue

@@ -56,7 +56,7 @@
           size="small"
           type="primary"
           style="margin-right: 8px"
-          :disabled="!(form.status == '0' || form.status == '4')"
+          :disabled="form.id && !(form.status == '0' || form.status == '4')"
           v-else
           :loading="saveLoading"
           @click="editCustomer()"
@@ -716,12 +716,12 @@ export default {
       ],
       vesselData: [], // 船名数据
       rules: {
-        corpCnName: [{ required: true, message: "请输入付费对象", trigger: "blur" }],
+        corpCnName: [{ required: true, message: "", trigger: "blur" }],
         // bankId: [
         //     { required: true, message: '请输入开户银行', trigger: 'blur' },
         // ],
-        remarks: [{ required: true, message: "请输入付费事由", trigger: "blur" }],
-        estimatedTime: [{ required: true, message: "请输入预计收回", trigger: "blur" }]
+        remarks: [{ required: true, message: "", trigger: "blur" }],
+        estimatedTime: [{ required: true, message: "", trigger: "blur" }]
       },
       roleName: [], // 当前的角色权限
       saberUserInfo: {}, // 当前登录人信息
@@ -1464,6 +1464,14 @@ export default {
     },
     // 确认选定行
     SelectedRows() {
+      if (this.addData.length == 0) {
+        return this.$message.error("请选择明细");
+      }
+      for (let item of this.addData) {
+        if (item.currentStlAmountRMB == 0 && item.currentStlAmountUSD == 0) {
+          return this.$message.error("账单编号:" + item.accBillNo + "的付费数据不允许选定");
+        }
+      }
       this.editCustomer("选定行");
     },
     addSelectionChange(arr) {
@@ -1753,4 +1761,7 @@ export default {
 /deep/.el-dialog .el-dialog__body {
   padding: 0px 20px;
 }
+::v-deep .el-form-item__error {
+  display: none;
+}
 </style>

src/views/iosBasicData/cashier/components/cashierItem.vue

@@ -336,7 +336,7 @@ export default {
               });
           }
           // 发票申请
-          if (this.form.type == "申请") {
+          if (this.form.type == "销项") {
             confirmCashier2(obj)
               .then(res => {
                 this.openDialog(this.form);
@@ -378,7 +378,7 @@ export default {
               });
           }
           // 发票申请
-          if (this.form.type == "申请") {
+          if (this.form.type == "销项") {
             revokeConfirmCashier2(obj)
               .then(res => {
                 this.openDialog(this.form);

src/views/iosBasicData/cashier/index.vue

@@ -6,7 +6,7 @@
           <el-tab-pane label="对账收费" name="对账收费"> </el-tab-pane>
           <el-tab-pane label="对账付费" name="对账付费"> </el-tab-pane>
           <el-tab-pane label="付费申请" name="付费申请"> </el-tab-pane>
-          <el-tab-pane label="发票申请" name="发票申请"> </el-tab-pane>
+          <el-tab-pane label="销项发票" name="销项发票"> </el-tab-pane>
         </el-tabs>
       </div>
       <avue-crud
@@ -39,7 +39,7 @@
         <template slot="menuLeft">
           <span style="font-size: 24px;font-weight: 600;">
             <el-button type="primary" size="small" @click="allClick('合并')" :disabled="selectionList.length == 0"
-              >合并{{ tabsValue == "对账收费" || tabsValue == "发票申请" ? "收费" : "支付" }}</el-button
+              >合并{{ tabsValue == "对账收费" || tabsValue == "销项发票" ? "收费" : "支付" }}</el-button
             >
             <span style="color: #67C23A;margin-right: 10px;"> CNY:￥{{ amountSubSum.toFixed(2) }}元 </span>
             <span style="color: #E6A23C;"> USD:${{ amountSubUsdSum.toFixed(2) }}元 </span>
@@ -65,13 +65,13 @@
           <span v-if="tabsValue == '对账收费'">{{ row.amountDr }} </span>
           <span v-if="tabsValue == '对账付费'">{{ row.amountCr }} </span>
           <span v-if="tabsValue == '付费申请'">{{ row.amountSub }} </span>
-          <span v-if="tabsValue == '发票申请'">{{ row.amountSub }} </span>
+          <span v-if="tabsValue == '销项发票'">{{ row.amountSub }} </span>
         </template>
         <template slot="amountSubUsd" slot-scope="{ row }">
           <span v-if="tabsValue == '对账收费'">{{ row.amountDrUsd }} </span>
           <span v-if="tabsValue == '对账付费'">{{ row.amountCrUsd }} </span>
           <span v-if="tabsValue == '付费申请'">{{ row.amountSubUsd }} </span>
-          <span v-if="tabsValue == '发票申请'">{{ row.amountSubUsd }} </span>
+          <span v-if="tabsValue == '销项发票'">{{ row.amountSubUsd }} </span>
         </template>
         <template slot="cashierStatusSearch">
           <el-checkbox v-model="query.cashierStatus" :true-label="2" :false-label="1"></el-checkbox>
@@ -483,9 +483,9 @@ export default {
             id: row.id
           }
         });
-      } else if (this.tabsValue == "发票申请") {
+      } else if (this.tabsValue == "销项发票") {
         this.$router.push({
-          path: `/iosBasicData/fininvoicesApplyfor/index`,
+          path: `/iosBasicData/fininvoicesOutput/index`,
           query: {
             id: row.id
           }
@@ -662,13 +662,13 @@ export default {
           businessType: "FFSQ",
           cashierStatus: this.query.cashierStatus?this.query.cashierStatus:1
         });
-      } else if (this.tabsValue == "发票申请") {
+      } else if (this.tabsValue == "销项发票") {
         // 应收应付 业务数据
         res = await fininvoicesList(page.currentPage, page.pageSize, {
           ...Object.assign(params, this.query),
-          type: "申请",
-          billNoFormat: "FPSQ",
-          businessTypeCode: "FPSQ",
+          type: "销项",
+          billNoFormat: "XXFP",
+          businessTypeCode: "XXFP",
           cashierStatus: this.query.cashierStatus?this.query.cashierStatus:1
         });
       }

src/views/iosBasicData/dcOffset/assembly/finstlbillsitems.vue

@@ -27,7 +27,7 @@
           placeholder="请输入 本次金额CNY"
           size="mini"
           style="width: 100%;"
-          :disabled="row.currentStlCurCode != 'CNY'"
+          :disabled="row.currentStlCurCode != 'CNY'|| (row.currentStlAmountRMB == 0 && row.currentStlAmountUSD == 0)"
         ></el-input-number>
         <span v-else>{{ row.currentStlAmountRMB }}</span>
       </tempalte>
@@ -40,7 +40,7 @@
           placeholder="请输入 本次金额USD"
           size="mini"
           style="width: 100%;"
-          :disabled="row.currentStlCurCode != 'USD'"
+          :disabled="row.currentStlCurCode != 'USD'|| (row.currentStlAmountRMB == 0 && row.currentStlAmountUSD == 0)"
         ></el-input-number>
         <span v-else>{{ row.currentStlAmountUSD }}</span>
       </tempalte>
@@ -392,95 +392,39 @@ export default {
       const end = start + this.page.pageSize;
       this.pageData = this.queryData.slice(start, end);
     },
-    armbChange(row) {
-      if (row.dc == "C") {
-        if (Number(row.amount - row.appliedAmount - row.appliedAmountStl - row.stlTtlAmount) > 0) {
-          if (Number(row.currentStlAmountRMB) < 0) {
-            row.currentStlAmountRMB = 0;
-            return this.$message.error("本次对抵金额不能输入负数");
-          }
-          if (Number(row.currentStlAmountRMB) > Number(row.amount - row.appliedAmount - row.appliedAmountStl - row.stlTtlAmount)) {
-            row.currentStlAmountRMB = 0;
-            return this.$message.error("本次对抵金额不能超过未对抵金额");
-          }
+ armbChange(row) {
+      if (Number(row.amount - row.reconciliationAmount) > 0) {
+        if (Number(row.currentStlAmountRMB) < 0) {
+          return this.$message.error("本次金额不能输入负数");
         }
-        if (Number(row.amount - row.appliedAmount - row.appliedAmountStl - row.stlTtlAmount) < 0) {
-          if (Number(row.currentStlAmountRMB) >= 0) {
-            row.currentStlAmountRMB = Number(row.amount - row.appliedAmount - row.appliedAmountStl - row.stlTtlAmount);
-            return this.$message.error("本次对抵金额不能输入非负数");
-          }
-          if (Number(row.currentStlAmountRMB) < Number(row.amount - row.appliedAmount - row.appliedAmountStl - row.stlTtlAmount)) {
-            row.currentStlAmountRMB = Number(row.amount - row.appliedAmount - row.appliedAmountStl - row.stlTtlAmount);
-            return this.$message.error("本次对抵金额不能超过未对抵金额");
-          }
+        if (Number(row.currentStlAmountRMB) > Number(row.amount - row.reconciliationAmount)) {
+          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmount));
         }
       }
-      if (row.dc == "D") {
-        if (Number(row.amount - row.stlTtlAmount) > 0) {
-          if (Number(row.currentStlAmountRMB) < 0) {
-            row.currentStlAmountRMB = 0;
-            return this.$message.error("本次对抵金额不能输入负数");
-          }
-          if (Number(row.currentStlAmountRMB) > Number(row.amount - row.stlTtlAmount)) {
-            row.currentStlAmountRMB = 0;
-            return this.$message.error("本次对抵金额不能超过未对抵金额");
-          }
+      if (Number(row.amount - row.reconciliationAmount) < 0) {
+        if (row.currentStlAmountRMB >= 0) {
+          return this.$message.error("本次金额不能输入非负数");
         }
-        if (Number(row.amount - row.stlTtlAmount) < 0) {
-          if (Number(row.currentStlAmountRMB) >= 0) {
-            row.currentStlAmountRMB = Number(row.amount - row.stlTtlAmount);
-            return this.$message.error("本次对抵金额不能输入非负数");
-          }
-          if (Number(row.currentStlAmountRMB) < Number(row.amount - row.stlTtlAmount)) {
-            row.currentStlAmountRMB = Number(row.amount - row.stlTtlAmount);
-            return this.$message.error("本次对抵金额不能超过未对抵金额");
-          }
+        if (Number(row.currentStlAmountRMB) < Number(row.amount - row.reconciliationAmount)) {
+          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmount));
         }
       }
     },
     ausdChange(row) {
-      if (row.dc == "C") {
-        if (Number(row.amount - row.appliedAmount - row.appliedAmountStl - row.stlTtlAmount) > 0) {
-          if (Number(row.currentStlAmountUSD) < 0) {
-            row.currentStlAmountUSD = 0;
-            return this.$message.error("本次对抵金额不能输入负数");
-          }
-          if (Number(row.currentStlAmountUSD) > Number(row.amount - row.appliedAmount - row.appliedAmountStl - row.stlTtlAmount)) {
-            row.currentStlAmountUSD = 0;
-            return this.$message.error("本次对抵金额不能超过未对抵金额");
-          }
+      if (Number(row.amount - row.reconciliationAmount) > 0) {
+        if (Number(row.currentStlAmountUSD) < 0) {
+          return this.$message.error("本次金额不能输入负数");
         }
-        if (Number(row.amount - row.appliedAmount - row.appliedAmountStl - row.stlTtlAmount) < 0) {
-          if (Number(row.currentStlAmountUSD) >= 0) {
-            row.currentStlAmountUSD = Number(row.amount - row.appliedAmount - row.appliedAmountStl - row.stlTtlAmount);
-            return this.$message.error("本次对抵金额不能输入非负数");
-          }
-          if (Number(row.currentStlAmountUSD) < Number(row.amount - row.appliedAmount - row.appliedAmountStl - row.stlTtlAmount)) {
-            row.currentStlAmountUSD = Number(row.amount - row.appliedAmount - row.appliedAmountStl - row.stlTtlAmount);
-            return this.$message.error("本次对抵金额不能超过未对抵金额");
-          }
+        if (Number(row.currentStlAmountUSD) > Number(row.amount - row.reconciliationAmount)) {
+          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmount));
         }
       }
-      if (row.dc == "D") {
-        if (Number(row.amount - row.stlTtlAmount) > 0) {
-          if (Number(row.currentStlAmountUSD) < 0) {
-            row.currentStlAmountUSD = 0;
-            return this.$message.error("本次对抵金额不能输入负数");
-          }
-          if (Number(row.currentStlAmountUSD) > Number(row.amount - row.stlTtlAmount)) {
-            row.currentStlAmountUSD = 0;
-            return this.$message.error("本次对抵金额不能超过未对抵金额");
-          }
+      if (Number(row.amount - row.reconciliationAmount) < 0) {
+        if (row.currentStlAmountUSD >= 0) {
+          return this.$message.error("本次金额不能输入非负数");
         }
-        if (Number(row.amount - row.stlTtlAmount) < 0) {
-          if (Number(row.currentStlAmountUSD) >= 0) {
-            row.currentStlAmountUSD = Number(row.amount - row.stlTtlAmount);
-            return this.$message.error("本次对抵金额不能输入非负数");
-          }
-          if (Number(row.currentStlAmountUSD) < Number(row.amount - row.stlTtlAmount)) {
-            row.currentStlAmountUSD = Number(row.amount - row.stlTtlAmount);
-            return this.$message.error("本次对抵金额不能超过未对抵金额");
-          }
+        if (Number(row.currentStlAmountUSD) < Number(row.amount - row.reconciliationAmount)) {
+          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmount));
         }
       }
     },

src/views/iosBasicData/dcOffset/assembly/finstlbillsitems2.vue

@@ -450,94 +450,38 @@ export default {
       this.pageData = this.tableData.slice(start, end);
     },
     armbChange(row) {
-      if (row.dc == "C") {
-        if (Number(row.amount - row.appliedAmount - row.appliedAmountStl - row.stlTtlAmount) > 0) {
-          if (Number(row.currentStlAmountRMB) < 0) {
-            row.currentStlAmountRMB = 0;
-            return this.$message.error("本次对抵金额不能输入负数");
-          }
-          if (Number(row.currentStlAmountRMB) > Number(row.amount - row.appliedAmount - row.appliedAmountStl - row.stlTtlAmount)) {
-            row.currentStlAmountRMB = 0;
-            return this.$message.error("本次对抵金额不能超过未对抵金额");
-          }
+      if (Number(row.amount - row.reconciliationAmount) > 0) {
+        if (Number(row.currentStlAmountRMB) < 0) {
+          return this.$message.error("本次金额不能输入负数");
         }
-        if (Number(row.amount - row.appliedAmount - row.appliedAmountStl - row.stlTtlAmount) < 0) {
-          if (Number(row.currentStlAmountRMB) >= 0) {
-            row.currentStlAmountRMB = Number(row.amount - row.appliedAmount - row.appliedAmountStl - row.stlTtlAmount);
-            return this.$message.error("本次对抵金额不能输入非负数");
-          }
-          if (Number(row.currentStlAmountRMB) < Number(row.amount - row.appliedAmount - row.appliedAmountStl - row.stlTtlAmount)) {
-            row.currentStlAmountRMB = Number(row.amount - row.appliedAmount - row.appliedAmountStl - row.stlTtlAmount);
-            return this.$message.error("本次对抵金额不能超过未对抵金额");
-          }
+        if (Number(row.currentStlAmountRMB) > Number(row.amount - row.reconciliationAmount)) {
+          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmount));
         }
       }
-      if (row.dc == "D") {
-        if (Number(row.amount - row.stlTtlAmount) > 0) {
-          if (Number(row.currentStlAmountRMB) < 0) {
-            row.currentStlAmountRMB = 0;
-            return this.$message.error("本次对抵金额不能输入负数");
-          }
-          if (Number(row.currentStlAmountRMB) > Number(row.amount - row.stlTtlAmount)) {
-            row.currentStlAmountRMB = 0;
-            return this.$message.error("本次对抵金额不能超过未对抵金额");
-          }
+      if (Number(row.amount - row.reconciliationAmount) < 0) {
+        if (row.currentStlAmountRMB >= 0) {
+          return this.$message.error("本次金额不能输入非负数");
         }
-        if (Number(row.amount - row.stlTtlAmount) < 0) {
-          if (Number(row.currentStlAmountRMB) >= 0) {
-            row.currentStlAmountRMB = Number(row.amount - row.stlTtlAmount);
-            return this.$message.error("本次对抵金额不能输入非负数");
-          }
-          if (Number(row.currentStlAmountRMB) < Number(row.amount - row.stlTtlAmount)) {
-            row.currentStlAmountRMB = Number(row.amount - row.stlTtlAmount);
-            return this.$message.error("本次对抵金额不能超过未对抵金额");
-          }
+        if (Number(row.currentStlAmountRMB) < Number(row.amount - row.reconciliationAmount)) {
+          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmount));
         }
       }
     },
     ausdChange(row) {
-      if (row.dc == "C") {
-        if (Number(row.amount - row.appliedAmount - row.appliedAmountStl - row.stlTtlAmount) > 0) {
-          if (Number(row.currentStlAmountUSD) < 0) {
-            row.currentStlAmountUSD = 0;
-            return this.$message.error("本次对抵金额不能输入负数");
-          }
-          if (Number(row.currentStlAmountUSD) > Number(row.amount - row.appliedAmount - row.appliedAmountStl - row.stlTtlAmount)) {
-            row.currentStlAmountUSD = 0;
-            return this.$message.error("本次对抵金额不能超过未对抵金额");
-          }
+      if (Number(row.amount - row.reconciliationAmount) > 0) {
+        if (Number(row.currentStlAmountUSD) < 0) {
+          return this.$message.error("本次金额不能输入负数");
         }
-        if (Number(row.amount - row.appliedAmount - row.appliedAmountStl - row.stlTtlAmount) < 0) {
-          if (Number(row.currentStlAmountUSD) >= 0) {
-            row.currentStlAmountUSD = Number(row.amount - row.appliedAmount - row.appliedAmountStl - row.stlTtlAmount);
-            return this.$message.error("本次对抵金额不能输入非负数");
-          }
-          if (Number(row.currentStlAmountUSD) < Number(row.amount - row.appliedAmount - row.appliedAmountStl - row.stlTtlAmount)) {
-            row.currentStlAmountUSD = Number(row.amount - row.appliedAmount - row.appliedAmountStl - row.stlTtlAmount);
-            return this.$message.error("本次对抵金额不能超过未对抵金额");
-          }
+        if (Number(row.currentStlAmountUSD) > Number(row.amount - row.reconciliationAmount)) {
+          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmount));
         }
       }
-      if (row.dc == "D") {
-        if (Number(row.amount - row.stlTtlAmount) > 0) {
-          if (Number(row.currentStlAmountUSD) < 0) {
-            row.currentStlAmountUSD = 0;
-            return this.$message.error("本次对抵金额不能输入负数");
-          }
-          if (Number(row.currentStlAmountUSD) > Number(row.amount - row.stlTtlAmount)) {
-            row.currentStlAmountUSD = 0;
-            return this.$message.error("本次对抵金额不能超过未对抵金额");
-          }
+      if (Number(row.amount - row.reconciliationAmount) < 0) {
+        if (row.currentStlAmountUSD >= 0) {
+          return this.$message.error("本次金额不能输入非负数");
         }
-        if (Number(row.amount - row.stlTtlAmount) < 0) {
-          if (Number(row.currentStlAmountUSD) >= 0) {
-            row.currentStlAmountUSD = Number(row.amount - row.stlTtlAmount);
-            return this.$message.error("本次对抵金额不能输入非负数");
-          }
-          if (Number(row.currentStlAmountUSD) < Number(row.amount - row.stlTtlAmount)) {
-            row.currentStlAmountUSD = Number(row.amount - row.stlTtlAmount);
-            return this.$message.error("本次对抵金额不能超过未对抵金额");
-          }
+        if (Number(row.currentStlAmountUSD) < Number(row.amount - row.reconciliationAmount)) {
+          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmount));
         }
       }
     },

src/views/iosBasicData/fininvoices/fininvoicesDetails.vue

@@ -945,6 +945,11 @@ export default {
       if (this.addData.length == 0) {
         return this.$message.error("请选择明细");
       }
+      for (let item of this.addData) {
+        if (item.currentAmountCNY == 0 && item.currentAmountUSD == 0) {
+          return this.$message.error("账单编号:" + item.accBillNo + "的发票数据不允许选定");
+        }
+      }
       this.editCustomer("选定行");
     },
     lastPage() {
@@ -1800,11 +1805,12 @@ export default {
 .flexBoxLeft {
   flex: 2;
   margin-right: 10px;
-  //padding-bottom: 40px;
 }
 
 .flexBoxRight {
   flex: 3;
-  //padding-bottom: 40px;
+}
+::v-deep .el-form-item__error {
+  display: none;
 }
 </style>

src/views/iosBasicData/fininvoicesApplyfor/assembly/fininvoicesitems.vue

@@ -27,7 +27,7 @@
           placeholder="请输入 本次CNY"
           size="mini"
           style="width: 100%;"
-          :disabled="row.curCode != 'CNY' || settlementdistar || !(form.status == '0' || form.status == '4' || form.status == null)"
+          :disabled="row.curCode != 'CNY' || (row.currentAmountCNY == 0 && row.currentAmountUSD == 0)"
         ></el-input-number>
         <span v-else>{{ row.currentAmountCNY }}</span>
       </tempalte>
@@ -40,10 +40,22 @@
           placeholder="请输入 本次USD"
           size="mini"
           style="width: 100%;"
-          :disabled="row.currentCurCode != 'USD'"
+          :disabled="row.currentCurCode != 'USD' || (row.currentAmountCNY == 0 && row.currentAmountUSD == 0)"
         ></el-input-number>
         <span v-else>{{ row.currentAmountUSD }}</span>
       </tempalte>
+      <template slot="reconciliationAmount" slot-scope="{ row }">
+        <el-popover trigger="click">
+          <avue-crud :data="rlaData" :option="rlaOption"></avue-crud>
+          <span style="color: #409EFF;cursor: pointer" slot="reference" @click="viewRLA(row)">{{ row.reconciliationAmount }}</span>
+        </el-popover>
+      </template>
+      <template slot="reconciliationAmountUsd" slot-scope="{ row }">
+        <el-popover trigger="click">
+          <avue-crud :data="rlaData" :option="rlaOption"></avue-crud>
+          <span style="color: #409EFF;cursor: pointer" slot="reference" @click="viewRLA(row)">{{ row.reconciliationAmountUsd }}</span>
+        </el-popover>
+      </template>
     </avue-crud>
   </div>
 </template>
@@ -51,7 +63,7 @@
 <script>
 import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
 import { getRateList } from "@/api/iosBasicData/rateManagement";
-
+import { getListAll } from "@/api/iosBasicData/finstlbills";
 export default {
   components: { SearchQuery },
   props: {
@@ -110,6 +122,12 @@ export default {
             overHidden: true
           },
           {
+            label: "账单编号",
+            prop: "accBillNo",
+            width: 120,
+            overHidden: true
+          },
+          {
             label: "MB/L NO",
             prop: "mblno",
             width: 100,
@@ -140,6 +158,18 @@ export default {
             overHidden: true
           },
           {
+            label: "已签收CNY",
+            prop: "reconciliationAmount",
+            width: 100,
+            overHidden: true
+          },
+          {
+            label: "已签收USD",
+            prop: "reconciliationAmountUsd",
+            width: 100,
+            overHidden: true
+          },
+          {
             label: "JOB NO",
             prop: "billNo",
             width: 100,
@@ -164,12 +194,6 @@ export default {
             overHidden: true
           },
           {
-            label: "账单编号",
-            prop: "accBillNo",
-            width: 120,
-            overHidden: true
-          },
-          {
             label: "账单金额",
             prop: "amount",
             width: 120,
@@ -232,6 +256,12 @@ export default {
     this.option = await this.getColumnData(this.getColumnName(494), this.optionBack);
   },
   methods: {
+    viewRLA(row) {
+      this.rlaData = [];
+      getListAll({ billId: row.accBillId }).then(res => {
+        this.rlaData = res.data.data;
+      });
+    },
     sizeChange(val) {
       this.page.currentPage = 1;
       this.page.pageSize = val;
@@ -248,46 +278,38 @@ export default {
       this.pageData = this.queryData.slice(start, end);
     },
     armbChange(row) {
-      if (Number(row.amount - row.appliedInvoiceAmount - row.appliedInvoiceAmountStl - row.uninvoicedAmount) > 0) {
+      if (Number(row.amount - row.reconciliationAmount) > 0) {
         if (Number(row.currentAmountCNY) < 0) {
-          row.currentAmountCNY = 0;
-          return this.$message.error("本次对账金额不能为负数");
+          return this.$message.error("本次金额不能输入负数");
         }
-        if (Number(row.currentAmountCNY) > Number(row.amount - row.appliedInvoiceAmount - row.appliedInvoiceAmountStl - row.uninvoicedAmount)) {
-          row.currentAmountCNY = 0;
-          return this.$message.error("本次对账金额不能大于未对账金额");
+        if (Number(row.currentAmountCNY) > Number(row.amount - row.reconciliationAmount)) {
+          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmount));
         }
       }
-      if (Number(row.amount - row.appliedInvoiceAmount - row.appliedInvoiceAmountStl - row.uninvoicedAmount) < 0) {
-        if (Number(row.currentAmountCNY) > 0) {
-          row.currentAmountCNY = Number(row.amount - row.appliedInvoiceAmount - row.appliedInvoiceAmountStl - row.uninvoicedAmount);
-          return this.$message.error("本次对账金额不能为非负数");
+      if (Number(row.amount - row.reconciliationAmount) < 0) {
+        if (row.currentAmountCNY >= 0) {
+          return this.$message.error("本次金额不能输入非负数");
         }
-        if (Number(row.currentAmountCNY) < Number(row.amount - row.appliedInvoiceAmount - row.appliedInvoiceAmountStl - row.uninvoicedAmount)) {
-          row.currentAmountCNY = Number(row.amount - row.appliedInvoiceAmount - row.appliedInvoiceAmountStl - row.uninvoicedAmount);
-          return this.$message.error("本次对账金额不能大于未对账金额");
+        if (Number(row.currentAmountCNY) < Number(row.amount - row.reconciliationAmount)) {
+          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmount));
         }
       }
     },
     ausdChange(row) {
-      if (Number(row.amount - row.appliedInvoiceAmount - row.appliedInvoiceAmountStl - row.uninvoicedAmount) > 0) {
+      if (Number(row.amount - row.reconciliationAmount) > 0) {
         if (Number(row.currentAmountUSD) < 0) {
-          row.currentAmountUSD = 0;
-          return this.$message.error("本次对账金额不能为负数");
+          return this.$message.error("本次金额不能输入负数");
         }
-        if (Number(row.currentAmountUSD) > Number(row.amount - row.appliedInvoiceAmount - row.appliedInvoiceAmountStl - row.uninvoicedAmount)) {
-          row.currentAmountUSD = 0;
-          return this.$message.error("本次对账金额不能大于未对账金额");
+        if (Number(row.currentAmountUSD) > Number(row.amount - row.reconciliationAmount)) {
+          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmount));
         }
       }
-      if (Number(row.amount - row.appliedInvoiceAmount - row.appliedInvoiceAmountStl - row.uninvoicedAmount) < 0) {
-        if (Number(row.currentAmountUSD) > 0) {
-          row.currentAmountUSD = Number(row.amount - row.appliedInvoiceAmount - row.appliedInvoiceAmountStl - row.uninvoicedAmount);
-          return this.$message.error("本次对账金额不能为非负数");
+      if (Number(row.amount - row.reconciliationAmount) < 0) {
+        if (row.currentAmountUSD >= 0) {
+          return this.$message.error("本次金额不能输入非负数");
         }
-        if (Number(row.currentAmountUSD) < Number(row.amount - row.appliedInvoiceAmount - row.appliedInvoiceAmountStl - row.uninvoicedAmount)) {
-          row.currentAmountUSD = Number(row.amount - row.appliedInvoiceAmount - row.appliedInvoiceAmountStl - row.uninvoicedAmount);
-          return this.$message.error("本次对账金额不能大于未对账金额");
+        if (Number(row.currentAmountUSD) < Number(row.amount - row.reconciliationAmount)) {
+          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmount));
         }
       }
     },

src/views/iosBasicData/fininvoicesApplyfor/assembly/fininvoicesitems2.vue

@@ -160,6 +160,12 @@ export default {
             overHidden: true
           },
           {
+            label: "账单编号",
+            prop: "accBillNo",
+            width: 120,
+            overHidden: true
+          },
+          {
             label: "MB/L NO",
             prop: "mblno",
             width: 100,
@@ -190,6 +196,18 @@ export default {
             overHidden: true
           },
           {
+            label: "已签收CNY",
+            prop: "reconciliationAmount",
+            width: 100,
+            overHidden: true
+          },
+          {
+            label: "已签收USD",
+            prop: "reconciliationAmountUsd",
+            width: 100,
+            overHidden: true
+          },
+          {
             label: "JOB NO",
             prop: "billNo",
             width: 100,
@@ -214,12 +232,6 @@ export default {
             overHidden: true
           },
           {
-            label: "账单编号",
-            prop: "accBillNo",
-            width: 120,
-            overHidden: true
-          },
-          {
             label: "账单金额",
             prop: "amount",
             width: 120,
@@ -262,18 +274,6 @@ export default {
             overHidden: true
           },
           {
-            label: "已签收CNY",
-            prop: "reconciliationAmount",
-            width: 100,
-            overHidden: true
-          },
-          {
-            label: "已签收USD",
-            prop: "reconciliationAmountUsd",
-            width: 100,
-            overHidden: true
-          },
-          {
             label: "备注",
             prop: "remarks",
             width: 120,
@@ -315,47 +315,47 @@ export default {
       const end = start + this.page.pageSize;
       this.pageData = this.tableData.slice(start, end);
     },
-    armbChange(row) {
-      if (Number(row.amount - row.appliedInvoiceAmount - row.appliedInvoiceAmountStl - row.uninvoicedAmount) > 0) {
-        if (Number(row.currentAmountCNY) < 0) {
-          row.currentAmountCNY = 0;
-          return this.$message.error("本次对账金额不能为负数");
+       armbChange(row) {
+       if (Number(row.amount - row.reconciliationAmount) > 0) {
+        if (Number(row.currentStlAmountRMB) < 0) {
+          row.currentStlAmountRMB = 0;
+          return this.$message.error("本次金额不能输入负数");
         }
-        if (Number(row.currentAmountCNY) > Number(row.amount - row.appliedInvoiceAmount - row.appliedInvoiceAmountStl - row.uninvoicedAmount)) {
-          row.currentAmountCNY = 0;
-          return this.$message.error("本次对账金额不能大于未对账金额");
+        if (Number(row.currentStlAmountRMB) > Number(row.amount - row.reconciliationAmount)) {
+          row.currentStlAmountRMB = 0;
+          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmount));
         }
       }
-      if (Number(row.amount - row.appliedInvoiceAmount - row.appliedInvoiceAmountStl - row.uninvoicedAmount) < 0) {
-        if (Number(row.currentAmountCNY) > 0) {
-          row.currentAmountCNY = Number(row.amount - row.appliedInvoiceAmount - row.appliedInvoiceAmountStl - row.uninvoicedAmount);
-          return this.$message.error("本次对账金额不能为非负数");
+      if (Number(row.amount - row.reconciliationAmount) < 0) {
+        if (row.currentStlAmountRMB >= 0) {
+          row.currentStlAmountRMB = Number(row.amount - row.reconciliationAmount);
+          return this.$message.error("本次金额不能输入非负数");
         }
-        if (Number(row.currentAmountCNY) < Number(row.amount - row.appliedInvoiceAmount - row.appliedInvoiceAmountStl - row.uninvoicedAmount)) {
-          row.currentAmountCNY = Number(row.amount - row.appliedInvoiceAmount - row.appliedInvoiceAmountStl - row.uninvoicedAmount);
-          return this.$message.error("本次对账金额不能大于未对账金额");
+        if (Number(row.currentStlAmountRMB) < Number(row.amount - row.reconciliationAmount)) {
+          row.currentStlAmountRMB = Number(row.amount - row.reconciliationAmount);
+          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmount));
         }
       }
     },
     ausdChange(row) {
-      if (Number(row.amount - row.appliedInvoiceAmount - row.appliedInvoiceAmountStl - row.uninvoicedAmount) > 0) {
-        if (Number(row.currentAmountUSD) < 0) {
-          row.currentAmountUSD = 0;
-          return this.$message.error("本次对账金额不能为负数");
+            if (Number(row.amount - row.reconciliationAmount) > 0) {
+        if (Number(row.currentStlAmountUSD) < 0) {
+          row.currentStlAmountUSD = 0;
+          return this.$message.error("本次金额不能输入负数");
         }
-        if (Number(row.currentAmountUSD) > Number(row.amount - row.appliedInvoiceAmount - row.appliedInvoiceAmountStl - row.uninvoicedAmount)) {
-          row.currentAmountUSD = 0;
-          return this.$message.error("本次对账金额不能大于未对账金额");
+        if (Number(row.currentStlAmountUSD) > Number(row.amount - row.reconciliationAmount)) {
+          row.currentStlAmountUSD = 0;
+          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmount));
         }
       }
-      if (Number(row.amount - row.appliedInvoiceAmount - row.appliedInvoiceAmountStl - row.uninvoicedAmount) < 0) {
-        if (Number(row.currentAmountUSD) > 0) {
-          row.currentAmountUSD = Number(row.amount - row.appliedInvoiceAmount - row.appliedInvoiceAmountStl - row.uninvoicedAmount);
-          return this.$message.error("本次对账金额不能为非负数");
+      if (Number(row.amount - row.reconciliationAmount) < 0) {
+        if (row.currentStlAmountUSD >= 0) {
+          row.currentStlAmountUSD = Number(row.amount - row.reconciliationAmount);
+          return this.$message.error("本次金额不能输入非负数");
         }
-        if (Number(row.currentAmountUSD) < Number(row.amount - row.appliedInvoiceAmount - row.appliedInvoiceAmountStl - row.uninvoicedAmount)) {
-          row.currentAmountUSD = Number(row.amount - row.appliedInvoiceAmount - row.appliedInvoiceAmountStl - row.uninvoicedAmount);
-          return this.$message.error("本次对账金额不能大于未对账金额");
+        if (Number(row.currentStlAmountUSD) < Number(row.amount - row.reconciliationAmount)) {
+          row.currentStlAmountUSD = Number(row.amount - row.reconciliationAmount);
+          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmount));
         }
       }
     },

src/views/iosBasicData/fininvoicesApplyfor/fininvoicesDetails.vue

@@ -900,6 +900,44 @@ export default {
   },
   data() {
     return {
+      rlaData: [],
+      rlaOption: {
+        header: false,
+        menu: false,
+        align: "center",
+        column: [
+          {
+            label: "来源单号",
+            prop: "srcNo",
+            width: "200",
+            overHidden: true
+          },
+          {
+            label: "来源类型",
+            prop: "srcType",
+            width: "80",
+            overHidden: true
+          },
+          {
+            label: "签收金额",
+            prop: "signedAmount",
+            width: "100",
+            overHidden: true
+          },
+          {
+            label: "签收人",
+            prop: "consigneeName",
+            width: "100",
+            overHidden: true
+          },
+          {
+            label: "签收时间",
+            prop: "signingTime",
+            width: "120",
+            overHidden: true
+          }
+        ]
+      },
       paramForm: {},
       activeName: "1",
       options: [
@@ -1106,6 +1144,11 @@ export default {
       if (this.addData.length == 0) {
         return this.$message.error("请选择明细");
       }
+      for (let item of this.addData) {
+        if (item.currentAmountCNY == 0 && item.currentAmountUSD == 0) {
+          return this.$message.error("账单编号:" + item.accBillNo + "的发票数据不允许选定");
+        }
+      }
       this.editCustomer("选定行");
     },
     lastPage() {
@@ -1566,26 +1609,26 @@ export default {
       //   return this.$message.error("请申请收费!");
       // }
       // getListAllDetail({ srcId: this.form.id }).then(res => {
-        // if (res.data.data.length == 0) {
-        //   return this.$message.error("请在指示维护费用");
-        // }
-        // for (let item of res.data.data) {
-        //   if (item.status == 0) {
-        //     return this.$message.error("请在指示维护未收款数据");
-        //   }
-        // }
+      // if (res.data.data.length == 0) {
+      //   return this.$message.error("请在指示维护费用");
+      // }
+      // for (let item of res.data.data) {
+      //   if (item.status == 0) {
+      //     return this.$message.error("请在指示维护未收款数据");
+      //   }
+      // }
       // });
       this.$confirm("确定进行发票申请操作?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.editCustomer(type);
         })
-          .then(() => {
-            this.editCustomer(type);
-          })
-          .finally(() => {
-            this.saveLoading = false;
-          });
+        .finally(() => {
+          this.saveLoading = false;
+        });
     },
     newbillFun() {
       if (this.statusType) {
@@ -2290,4 +2333,7 @@ export default {
   flex: 3;
   //padding-bottom: 40px;
 }
+::v-deep .el-form-item__error {
+  display: none;
+}
 </style>

src/views/iosBasicData/fininvoicesOutput/assembly/cashierItem.vue

@@ -0,0 +1,488 @@
+<template>
+  <div>
+    <el-dialog title="指示" :visible.sync="dialogVisible" append-to-body width="60%" :before-close="handleClose">
+      <el-tag type="success" style="margin-right: 10px;">剩余收费(RMB){{ Number(form.amountDr - form.actualAmountDr).toFixed(2) }}</el-tag>
+      <el-tag type="info" style="margin-right: 10px;">剩余收费(USD){{ Number(form.amountDrUsd - form.actualAmountDrUsd).toFixed(2) }}</el-tag>
+      <el-tag type="warning" style="margin-right: 10px;">剩余付费(RMB){{ Number(form.amountCr - form.actualAmountCr).toFixed(2) }}</el-tag>
+      <el-tag type="danger">剩余付费(USD){{ Number(form.amountCrUsd - form.actualAmountCrUsd).toFixed(2) }}</el-tag>
+      <avue-crud
+        v-if="dialogVisible"
+        :option="option"
+        :table-loading="loading"
+        :data="data"
+        ref="crud"
+        id="out-table"
+        :header-cell-class-name="headerClassName"
+        @on-load="onLoad"
+      >
+        <template slot="indexHeader" slot-scope="{ row }">
+          <el-button
+            type="primary"
+            size="small"
+            icon="el-icon-plus"
+            circle
+            @click="addRow"
+          ></el-button>
+        </template>
+        <template slot="index" slot-scope="{ row, index }">
+          <span>{{ index + 1 }}</span>
+        </template>
+        <template slot="status" slot-scope="{ row }">
+          <span v-if="row.status == 0">{{ row.dc == "D" ? "未收款" : "未支付" }}</span>
+          <span v-if="row.status == 1">{{ row.dc == "D" ? "已收款" : "已支付" }}</span>
+          <span v-if="row.status == 2">{{ row.dc == "D" ? "部分收款" : "部分支付" }}</span>
+        </template>
+        <template slot="curCode" slot-scope="{ row }">
+          <dic-select
+            v-if="row.$cellEdit"
+            :key="row.dc"
+            v-model="row.curCode"
+            placeholder="币别"
+            label="code"
+            :url="'/blade-los/bcurrency/getExrate?type=2&date=' + form.invoiceDate + ' 00:00:00' + '&dc=' + row.dc"
+            :filterable="true"
+            @selectChange="rowDicChange('curCode', $event, row)"
+          ></dic-select>
+          <span v-else>{{ row.curCode }}</span>
+        </template>
+        <template slot="exrate" slot-scope="{ row }">
+          <el-input-number
+            v-if="row.$cellEdit"
+            style="width: 100%;"
+            v-model="row.exrate"
+            @change="calculateChange(row)"
+            label="请输入汇率"
+            size="small"
+            :controls="false"
+          ></el-input-number>
+          <span v-else>{{ row.exrate }}</span>
+        </template>
+        <template slot="amount" slot-scope="{ row }">
+          <el-input-number
+            v-if="row.$cellEdit"
+            style="width: 100%;"
+            v-model="row.amount"
+            @change="calculateChange(row)"
+            label="请输入金额"
+            size="small"
+            :controls="false"
+          ></el-input-number>
+          <span v-else>{{ row.amount }}</span>
+        </template>
+        <template slot="dc" slot-scope="{ row }">
+          <el-select v-if="row.$cellEdit" v-model="row.dc" placeholder="请选择" size="small" @change="dcChange(row)">
+            <el-option v-for="item in dcOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option>
+          </el-select>
+          <span v-else>{{ row.dc == "D" ? "收" : "付" }}</span>
+        </template>
+        <template slot="taxRate" slot-scope="{ row }">
+          <el-input-number
+            v-if="row.$cellEdit"
+            style="width: 100%;"
+            v-model="row.taxRate"
+            @change="calculateChange(row)"
+            label="请输入税率"
+            size="small"
+            :controls="false"
+            :min="0"
+          ></el-input-number>
+          <span v-else>{{ row.taxRate }}</span>
+        </template>
+        <template slot="menu" slot-scope="{ row, index }">
+          <el-button type="text" size="small" @click="rowEdit(row)" :disabled="row.status == 1">{{
+            row.$cellEdit ? "保存" : "编辑"
+          }}</el-button>
+          <el-button type="text" size="small" @click="rowDel(row, index)" :disabled="row.status == 1">删除</el-button>
+        </template>
+      </avue-crud>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false" size="mini">取 消</el-button>
+        <el-button v-if="form.cashierStatus == 0" size="mini" type="success" @click="allClick('申请出纳')">收费申请</el-button>
+        <el-button v-if="form.cashierStatus == 1" size="mini" type="danger" @click="allClick('撤销申请出纳')"
+          >撤销收费申请</el-button
+        >
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { MktSlotQuotation, quotationImportBatch } from "@/api/iosBasicData/bills";
+import dicSelect from "@/components/dicSelect/main";
+import { getListAllDetail, submit, remove, applyCashier2, revokeCashier2 } from "@/api/iosBasicData/cashier.js";
+import { bcurrencyGetExrate } from "@/api/iosBasicData/rateManagement";
+export default {
+  props: {
+    disabled: {
+      type: Boolean,
+      default: false
+    }
+  },
+  components: { dicSelect },
+  data() {
+    return {
+      form: {},
+      data: [],
+      options: [
+        {
+          value: 0,
+          label: "不含税"
+        },
+        {
+          value: 1,
+          label: "含税"
+        }
+      ],
+      dcOptions: [
+        {
+          value: "D",
+          label: "收"
+        },
+        {
+          value: "C",
+          label: "付"
+        }
+      ],
+      dialogVisible: false,
+      loading: false,
+      option: {
+        height: 500,
+        calcHeight: 30,
+        border: true,
+        // index: true,
+        addBtn: false,
+        viewBtn: false,
+        delBtn: false,
+        editBtn: false,
+        // menu: false,
+        menuWidth: 100,
+        header: false,
+        align: "center",
+        column: [
+          {
+            label: "index",
+            prop: "index",
+            width: "55",
+            headerslot: true
+          },
+          {
+            label: "状态",
+            prop: "status",
+            width: "60",
+            overHidden: true
+          },
+          {
+            label: "收/付",
+            prop: "dc",
+            width: "90",
+            overHidden: true
+          },
+          {
+            label: "币别",
+            prop: "curCode",
+            width: "100",
+            overHidden: true
+          },
+          {
+            label: "汇率",
+            prop: "exrate",
+            width: "70",
+            overHidden: true
+          },
+          {
+            label: "金额",
+            prop: "amount",
+            width: "100",
+            overHidden: true
+          },
+          {
+            label: "转汇后金额",
+            prop: "amountLoc",
+            width: "100",
+            overHidden: true
+          },
+          {
+            label: "税率(%)",
+            prop: "taxRate",
+            width: "80",
+            overHidden: true
+          },
+          {
+            label: "净额",
+            prop: "amountNet",
+            width: "100",
+            overHidden: true
+          },
+          {
+            label: "税额",
+            prop: "amountTax",
+            width: "80",
+            overHidden: true
+          },
+          {
+            label: "出纳人",
+            prop: "cashierName",
+            width: "100",
+            overHidden: true
+          },
+          {
+            label: "出纳时间",
+            prop: "cashierTime",
+            width: "100",
+            overHidden: true
+          },
+          {
+            label: "创建人",
+            prop: "createUserName",
+            width: "100",
+            overHidden: true
+          },
+          {
+            label: "创建时间",
+            prop: "createTime",
+            width: "100",
+            overHidden: true
+          },
+          {
+            label: "备注",
+            prop: "remarks",
+            cell:true,
+            width: 120,
+            overHidden: true
+          }
+        ]
+      }
+    };
+  },
+  async created() {
+    // this.option = await this.getColumnData(this.getColumnName(309.6), this.optionBack);
+  },
+  methods: {
+    rowEdit(row) {
+      if (row.$cellEdit) {
+        if (!row.curCode) {
+          return this.$message.error("币别不能为空");
+        }
+        if (!row.exrate) {
+          return this.$message.error("汇率不能为空");
+        }
+        if (!row.amount || row.amount == 0 || row.amount < 0) {
+          return this.$message.error("金额不能为非正数");
+        }
+        if (row.dc == "D" && row.curCode == "CNY") {
+          if (Number(row.amount) > Number(this.form.amountDr - this.form.actualAmountDr)) {
+            return this.$message.error("金额不能超过剩余出纳收费(RMB):" + Number(this.form.amountDr - this.form.actualAmountDr));
+          }
+        }
+        if (row.dc == "D" && row.curCode == "USD") {
+          if (Number(row.amount) > Number(this.form.amountDrUsd - this.form.actualAmountDrUsd)) {
+            return this.$message.error("金额不能超过剩余出纳收费(USD):" + Number(this.form.amountDrUsd - this.form.actualAmountDrUsd));
+          }
+        }
+        if (row.dc == "C" && row.curCode == "CNY") {
+          if (Number(row.amount) > Number(this.form.amountCr - this.form.actualAmountCr)) {
+            return this.$message.error("金额不能超过剩余出纳付费(RMB):" + Number(this.form.amountCr - this.form.actualAmountCr));
+          }
+        }
+        if (row.dc == "C" && row.curCode == "USD") {
+          if (Number(row.amount) > Number(this.form.amountCrUsd - this.form.actualAmountCrUsd)) {
+            return this.$message.error("金额不能超过剩余出纳付费(USD):" + Number(this.form.amountCrUsd - this.form.actualAmountCrUsd));
+          }
+        }
+        submit(row).then(res => {
+          this.$set(row, "$cellEdit", false);
+          this.$message({
+            type: "success",
+            message: "保存成功!"
+          });
+
+          for (let [key, value] of Object.entries(res.data.data)) {
+            this.$set(row, key, value);
+          }
+        });
+      } else {
+        this.$set(row, "$cellEdit", true);
+      }
+    },
+    allClick(name) {
+      if (name == "申请出纳") {
+        for (let item of this.data) {
+          if (!item.id || item.$cellEdit) {
+            return this.$message.error("请保存数据");
+          }
+        }
+        this.$confirm("是否申请收费?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          const loading = this.$loading({
+            lock: true,
+            text: "加载中",
+            spinner: "el-icon-loading",
+            background: "rgba(255,255,255,0.7)"
+          });
+          applyCashier2({ id: this.form.id })
+            .then(res => {
+              this.$emit("update");
+            })
+            .finally(() => {
+              loading.close();
+            });
+        });
+      }
+      if (name == "撤销申请出纳") {
+        for (let item of this.data) {
+          if (!item.id || item.$cellEdit) {
+            return this.$message.error("请保存数据");
+          }
+          if (item.status == 1) {
+            return this.$message.error("数据已收款,不允许撤销申请收费");
+          }
+        }
+        this.$confirm("是否撤销申请收费?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          const loading = this.$loading({
+            lock: true,
+            text: "加载中",
+            spinner: "el-icon-loading",
+            background: "rgba(255,255,255,0.7)"
+          });
+          revokeCashier2({ id: this.form.id })
+            .then(res => {
+              this.$emit("update");
+            })
+            .finally(() => {
+              loading.close();
+            });
+        });
+      }
+    },
+    rowDel(row, index) {
+      if (row.id) {
+        this.$confirm("确定删除数据?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          remove({ ids: row.id }).then(res => {
+            this.$message({
+              type: "success",
+              message: "删除成功!"
+            });
+            this.data.splice(index, 1);
+          });
+        });
+      } else {
+        this.data.splice(index, 1);
+      }
+    },
+    calculateChange(row) {
+      row.amountLoc = Number(Number(row.amount ? row.amount : 0) * Number(row.exrate ? row.exrate : 0)).toFixed(2);
+      row.amountTax = Number(Number(row.amountLoc ? row.amountLoc : 0) * Number(row.taxRate ? row.taxRate / 100 : 0)).toFixed(2);
+      row.amountNet = Number(Number(row.amountLoc ? row.amountLoc : 0) - Number(row.amountTax ? row.amountTax : 0)).toFixed(2);
+    },
+    dcChange(row) {
+      row.curCode = null;
+      row.exrate = null;
+      this.calculateChange(row);
+    },
+    rowDicChange(name, row, el) {
+      if (name == "curCode") {
+        if (row) {
+          el.exrate = row.exrate;
+          if (el.dc == "D" && el.curCode == "CNY") {
+            el.amount = Number(this.form.amountDr - this.form.actualAmountDr).toFixed(2);
+          }
+          if (el.dc == "D" && el.curCode == "USD") {
+            el.amount = Number(this.form.amountDrUsd - this.form.actualAmountDrUsd).toFixed(2);
+          }
+          if (el.dc == "C" && el.curCode == "CNY") {
+            el.amount = Number(this.form.amountCr - this.form.actualAmountCr).toFixed(2);
+          }
+          if (el.dc == "C" && el.curCode == "USD") {
+            el.amount = Number(this.form.amountCrUsd - this.form.actualAmountCrUsd).toFixed(2);
+          }
+          this.calculateChange(el);
+        } else {
+          el.exrate = null;
+          this.calculateChange(el);
+        }
+      }
+    },
+    addRow() {
+      this.data.push({ $cellEdit: true, srcId: this.form.id, dc: this.form.dc, taxRate: 0 });
+    },
+    openDialog(row) {
+      this.dialogVisible = true;
+      this.form = row;
+      let obj = {
+        srcId: row.id
+      };
+      this.loading = true;
+      getListAllDetail(obj)
+        .then(res => {
+          this.data = res.data.data;
+        })
+        .finally(() => {
+          this.loading = false;
+        });
+    },
+    //自定义列保存
+    async saveColumn(ref, option, optionBack, code) {
+      /**
+       * 已定义全局方法，直接使用，saveColumnData保存列数据方法,参数传值(表格名称，当前表格的option数据)
+       * 已定义全局方法，直接使用，getColumnName方法用来获取枚举值，参数根据自己定义的code值获取中文名
+       * 一定要执行异步操作，要等接口成功返回，才能执行下一行代码
+       */
+      const inSave = await this.saveColumnData(this.getColumnName(code), this[option]);
+      if (inSave) {
+        this.$message.success("保存成功");
+        //关闭窗口
+        this.$refs[ref].$refs.dialogColumn.columnBox = false;
+        this.searchReset();
+      }
+    },
+    //自定义列重置
+    async resetColumn(ref, option, optionBack, code) {
+      this[option] = this[optionBack];
+      const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
+      if (inSave) {
+        this.$message.success("重置成功");
+        this.$refs[ref].$refs.dialogColumn.columnBox = false;
+      }
+    },
+
+    // 更改表格颜色
+    headerClassName(tab) {
+      //颜色间隔
+      let back = "";
+      if (tab.columnIndex >= 0 && tab.column.level === 1) {
+        if (tab.columnIndex % 2 === 0) {
+          back = "back-one";
+        } else if (tab.columnIndex % 2 === 1) {
+          back = "back-two";
+        }
+      }
+      return back;
+    }
+  }
+};
+</script>
+
+<style scoped>
+::v-deep#out-table .back-one {
+  background: #ecf5ff !important;
+  text-align: center;
+  padding: 4px 0;
+}
+
+::v-deep#out-table .back-two {
+  background: #ecf5ff !important;
+  text-align: center;
+  padding: 4px 0;
+}
+</style>

src/views/iosBasicData/fininvoicesOutput/fininvoicesDetails.vue

@@ -7,6 +7,7 @@
         <el-button v-if="form.id && pageIds.length" type="text" @click="nextPage">下一票</el-button>
       </div>
       <div class="add-customer-btn">
+        <el-button v-if="form.status == 3" size="small" type="success" @click="allClick('指示')">指示</el-button>
         <el-button type="success" size="small" :disabled="!form.id" plain @click="newbillFun">新建发票 </el-button>
         <el-button
           size="small"
@@ -852,6 +853,7 @@
         </avue-crud>
       </div>
     </el-dialog>
+    <cashier-item ref="cashier" @update="updateCashier"></cashier-item>
   </div>
 </template>
 
@@ -884,13 +886,15 @@ import { getCurrentDate } from "@/util/date";
 import dicSelect from "@/components/dicSelect/main";
 import { finstlbillslistAccBillByCorp } from "@/api/iosBasicData/finstlbills";
 import { getMonthDate, getYearDate } from "@/util/date";
+import cashierItem from "./assembly/cashierItem.vue";
 export default {
   components: {
     SearchQuery,
     fininvoicesitems,
     fininvoiceitemdetail,
     dicSelect,
-    queryFininvoicesitems
+    queryFininvoicesitems,
+    cashierItem
   },
   data() {
     return {
@@ -1105,10 +1109,23 @@ export default {
         });
       }
     },
+    allClick(name) {
+      if (name == "指示") {
+        this.$refs.cashier.openDialog(this.form);
+      }
+    },
+    updateCashier() {
+      this.fininvoicesDetailfun(this.form.id, "updateCashier");
+    },
     SelectedRows() {
       if (this.addData.length == 0) {
         return this.$message.error("请选择明细");
       }
+      for (let item of this.addData) {
+        if (item.currentAmountCNY == 0 && item.currentAmountUSD == 0) {
+          return this.$message.error("账单编号:" + item.accBillNo + "的发票数据不允许选定");
+        }
+      }
       this.editCustomer("选定行");
     },
     lastPage() {
@@ -1924,6 +1941,9 @@ export default {
             }
             return item;
           });
+          if (type == "updateCashier") {
+            this.$refs.cashier.openDialog(this.form);
+          }
           if (type == "选定行") {
             this.finstlbillslistAccBillV1fun();
           }
@@ -2106,4 +2126,7 @@ export default {
   flex: 3;
   //padding-bottom: 40px;
 }
+::v-deep .el-form-item__error {
+  display: none;
+}
 </style>

src/views/iosBasicData/finstlbills/assembly/finstlbillsitems.vue

@@ -52,6 +52,18 @@
         <span v-if="row.dc == 'D'">{{ row.stlAmountDrUSD }}</span>
         <span v-if="row.dc == 'C'">{{ row.stlAmountCrUSD }}</span>
       </template>
+      <template slot="reconciliationAmount" slot-scope="{ row }">
+        <el-popover trigger="click">
+          <avue-crud :data="rlaData" :option="rlaOption"></avue-crud>
+          <span style="color: #409EFF;cursor: pointer" slot="reference" @click="viewRLA(row)">{{ row.reconciliationAmount }}</span>
+        </el-popover>
+      </template>
+      <template slot="reconciliationAmountUsd" slot-scope="{ row }">
+        <el-popover trigger="click">
+          <avue-crud :data="rlaData" :option="rlaOption"></avue-crud>
+          <span style="color: #409EFF;cursor: pointer" slot="reference" @click="viewRLA(row)">{{ row.reconciliationAmountUsd }}</span>
+        </el-popover>
+      </template>
       <template slot="remarkss" slot-scope="{ row }">
         <el-input style="width: 100%;" v-model="row.remarkss" v-if="brfalse" size="mini" autocomplete="off" clearable placeholder="请输入 备注">
         </el-input>
@@ -66,7 +78,7 @@ import { getWorkDicts } from "@/api/system/dictbiz";
 import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
 import costDetails from "../assembly/costDetails.vue";
 import { getRateList } from "@/api/iosBasicData/rateManagement";
-import { feecenterSelectByAccNoList } from "@/api/iosBasicData/finstlbills";
+import { feecenterSelectByAccNoList, getListAll } from "@/api/iosBasicData/finstlbills";
 
 export default {
   components: { SearchQuery, costDetails },
@@ -94,6 +106,44 @@ export default {
   },
   data() {
     return {
+      rlaData: [],
+      rlaOption: {
+        header: false,
+        menu: false,
+        align: "center",
+        column: [
+          {
+            label: "来源单号",
+            prop: "srcNo",
+            width: "200",
+            overHidden: true
+          },
+          {
+            label: "来源类型",
+            prop: "srcType",
+            width: "80",
+            overHidden: true
+          },
+          {
+            label: "签收金额",
+            prop: "signedAmount",
+            width: "100",
+            overHidden: true
+          },
+          {
+            label: "签收人",
+            prop: "consigneeName",
+            width: "100",
+            overHidden: true
+          },
+          {
+            label: "签收时间",
+            prop: "signingTime",
+            width: "120",
+            overHidden: true
+          }
+        ]
+      },
       ifInvoiceData: [], // 是否数据
       invoicelosDara: [], // 发票
       curCodeData: [], // 币种
@@ -145,18 +195,30 @@ export default {
             overHidden: true
           },
           {
-            label: "本次签收CNY",
+            label: "本次CNY",
             prop: "currentStlAmountRMB",
             width: 100,
             overHidden: true
           },
           {
-            label: "本次签收USD",
+            label: "本次USD",
             prop: "currentStlAmountUSD",
             width: 100,
             overHidden: true
           },
           {
+            label: "已签收CNY",
+            prop: "reconciliationAmount",
+            width: 100,
+            overHidden: true
+          },
+          {
+            label: "已签收USD",
+            prop: "reconciliationAmountUsd",
+            width: 100,
+            overHidden: true
+          },
+          {
             label: "币种",
             prop: "currentStlCurCode",
             width: 60,
@@ -319,18 +381,6 @@ export default {
             overHidden: true
           },
           {
-            label: "已签收CNY",
-            prop: "reconciliationAmount",
-            width: 100,
-            overHidden: true
-          },
-          {
-            label: "已签收USD",
-            prop: "reconciliationAmountUsd",
-            width: 100,
-            overHidden: true
-          },
-          {
             label: "已结算CNY",
             prop: "stlAmountDr",
             width: 90,
@@ -377,6 +427,12 @@ export default {
     this.invoicelosWorkDictsfun();
   },
   methods: {
+    viewRLA(row) {
+      this.rlaData = [];
+      getListAll({ billId: row.accBillId }).then(res => {
+        this.rlaData = res.data.data;
+      });
+    },
     sizeChange(val) {
       this.page.currentPage = 1;
       this.page.pageSize = val;
@@ -395,44 +451,36 @@ export default {
     armbChange(row) {
       if (Number(row.amount - row.reconciliationAmount) > 0) {
         if (Number(row.currentStlAmountRMB) < 0) {
-          row.currentStlAmountRMB = 0;
-          return this.$message.error("本次签收金额不能输入负数");
+          return this.$message.error("本次金额不能输入负数");
         }
         if (Number(row.currentStlAmountRMB) > Number(row.amount - row.reconciliationAmount)) {
-          row.currentStlAmountRMB = 0;
-          return this.$message.error("本次签收金额不能超过未对账金额");
+          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmount));
         }
       }
       if (Number(row.amount - row.reconciliationAmount) < 0) {
         if (row.currentStlAmountRMB >= 0) {
-          row.currentStlAmountRMB = Number(row.amount - row.reconciliationAmount);
-          return this.$message.error("本次签收金额不能输入非负数");
+          return this.$message.error("本次金额不能输入非负数");
         }
         if (Number(row.currentStlAmountRMB) < Number(row.amount - row.reconciliationAmount)) {
-          row.currentStlAmountRMB = Number(row.amount - row.reconciliationAmount);
-          return this.$message.error("本次签收金额不能超过未对账金额");
+          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmount));
         }
       }
     },
     ausdChange(row) {
       if (Number(row.amount - row.reconciliationAmount) > 0) {
         if (Number(row.currentStlAmountUSD) < 0) {
-          row.currentStlAmountUSD = 0;
-          return this.$message.error("本次签收金额不能输入负数");
+          return this.$message.error("本次金额不能输入负数");
         }
         if (Number(row.currentStlAmountUSD) > Number(row.amount - row.reconciliationAmount)) {
-          row.currentStlAmountUSD = 0;
-          return this.$message.error("本次签收金额不能超过未对账金额");
+          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmount));
         }
       }
       if (Number(row.amount - row.reconciliationAmount) < 0) {
         if (row.currentStlAmountUSD >= 0) {
-          row.currentStlAmountUSD = Number(row.amount - row.reconciliationAmount);
-          return this.$message.error("本次签收金额不能输入非负数");
+          return this.$message.error("本次金额不能输入非负数");
         }
         if (Number(row.currentStlAmountUSD) < Number(row.amount - row.reconciliationAmount)) {
-          row.currentStlAmountUSD = Number(row.amount - row.reconciliationAmount);
-          return this.$message.error("本次签收金额不能超过未对账金额");
+          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmount));
         }
       }
     },

src/views/iosBasicData/finstlbills/assembly/finstlbillsitems2.vue

@@ -229,18 +229,30 @@ export default {
             overHidden: true
           },
           {
-            label: "本次签收CNY",
+            label: "本次CNY",
             prop: "currentStlAmountRMB",
             width: 100,
             overHidden: true
           },
           {
-            label: "本次签收USD",
+            label: "本次USD",
             prop: "currentStlAmountUSD",
             width: 100,
             overHidden: true
           },
           {
+            label: "已签收CNY",
+            prop: "reconciliationAmount",
+            width: 100,
+            overHidden: true
+          },
+          {
+            label: "已签收USD",
+            prop: "reconciliationAmountUsd",
+            width: 100,
+            overHidden: true
+          },
+          {
             label: "币种",
             prop: "currentStlCurCode",
             width: 60,
@@ -368,18 +380,6 @@ export default {
             width: 100,
             overHidden: true
           },
-          {
-            label: "已签收CNY",
-            prop: "reconciliationAmount",
-            width: 100,
-            overHidden: true
-          },
-          {
-            label: "已签收USD",
-            prop: "reconciliationAmountUsd",
-            width: 100,
-            overHidden: true
-          },
           // {
           //     label: "费用名称",
           //     prop: "feeCnName",
@@ -417,7 +417,7 @@ export default {
   },
   methods: {
     viewRLA(row) {
-       this.rlaData =[]
+      this.rlaData = [];
       getListAll({ billId: row.accBillId }).then(res => {
         this.rlaData = res.data.data;
       });
@@ -440,44 +440,36 @@ export default {
     armbChange(row) {
       if (Number(row.amount - row.reconciliationAmount) > 0) {
         if (Number(row.currentStlAmountRMB) < 0) {
-          row.currentStlAmountRMB = 0;
-          return this.$message.error("本次签收金额不能输入负数");
+          return this.$message.error("本次金额不能输入负数");
         }
         if (Number(row.currentStlAmountRMB) > Number(row.amount - row.reconciliationAmount)) {
-          row.currentStlAmountRMB = 0;
-          return this.$message.error("本次签收金额不能超过未对账金额");
+          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmount));
         }
       }
       if (Number(row.amount - row.reconciliationAmount) < 0) {
         if (row.currentStlAmountRMB >= 0) {
-          row.currentStlAmountRMB = Number(row.amount - row.reconciliationAmount);
-          return this.$message.error("本次签收金额不能输入非负数");
+          return this.$message.error("本次金额不能输入非负数");
         }
         if (Number(row.currentStlAmountRMB) < Number(row.amount - row.reconciliationAmount)) {
-          row.currentStlAmountRMB = Number(row.amount - row.reconciliationAmount);
-          return this.$message.error("本次签收金额不能超过未对账金额");
+          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmount));
         }
       }
     },
     ausdChange(row) {
       if (Number(row.amount - row.reconciliationAmount) > 0) {
         if (Number(row.currentStlAmountUSD) < 0) {
-          row.currentStlAmountUSD = 0;
-          return this.$message.error("本次签收金额不能输入负数");
+          return this.$message.error("本次金额不能输入负数");
         }
         if (Number(row.currentStlAmountUSD) > Number(row.amount - row.reconciliationAmount)) {
-          row.currentStlAmountUSD = 0;
-          return this.$message.error("本次签收金额不能超过未对账金额");
+          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmount));
         }
       }
       if (Number(row.amount - row.reconciliationAmount) < 0) {
         if (row.currentStlAmountUSD >= 0) {
-          row.currentStlAmountUSD = Number(row.amount - row.reconciliationAmount);
-          return this.$message.error("本次签收金额不能输入非负数");
+          return this.$message.error("本次金额不能输入非负数");
         }
         if (Number(row.currentStlAmountUSD) < Number(row.amount - row.reconciliationAmount)) {
-          row.currentStlAmountUSD = Number(row.amount - row.reconciliationAmount);
-          return this.$message.error("本次签收金额不能超过未对账金额");
+          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmount));
         }
       }
     },

src/views/iosBasicData/finstlbills/finstlbillsDetails.vue

@@ -1332,7 +1332,7 @@ export default {
     },
     // 检索
     retrievalfun() {
-      this.activeName='1'
+      this.activeName = "1";
       // 判断是否有对账单位
       if (!this.form.corpId && (this.form.businessNo || this.form.accountNo || this.form.hblno || this.form.mblno)) {
         console.log("新接口");
@@ -1750,6 +1750,18 @@ export default {
         return this.$message.warning("请选择要删除的数据");
       }
       for (let item of this.handleSelectionData) {
+        if (item.isSignfor == 1) {
+          this.$message.error("已签收数据，不允许删除");
+          return;
+        }
+      }
+      for (let item of this.handleSelectionData) {
+        if (item.isChecked == 1) {
+          this.$message.error("已对账数据，不允许删除");
+          return;
+        }
+      }
+      for (let item of this.handleSelectionData) {
         if (item.isInvoice == 3) {
           this.$message.error("已不开发票，请重新选择");
           return;
@@ -1788,9 +1800,12 @@ export default {
     },
     // 确认选定行
     allCell() {
-      for(let item of this.addData){
-        if(item.currentStlAmountRMB == 0 && item.currentStlAmountUSD == 0){
-          return  this.$message.error("账单编号:"+item.accBillNo+"的对账数据不允许选定");
+      if (this.addData.length == 0) {
+        return this.$message.error("请选择明细");
+      }
+      for (let item of this.addData) {
+        if (item.currentStlAmountRMB == 0 && item.currentStlAmountUSD == 0) {
+          return this.$message.error("账单编号:" + item.accBillNo + "的对账数据不允许选定");
         }
       }
       this.editCustomer("query");

src/views/iosBasicData/writeOff/assembly/finstlbillsitems.vue

@@ -27,7 +27,7 @@
           placeholder="请输入 本次签收CNY"
           size="mini"
           style="width: 100%;"
-          :disabled="row.currentStlCurCode != 'CNY'"
+          :disabled="row.currentStlCurCode != 'CNY'|| (row.currentStlAmountRMB == 0 && row.currentStlAmountUSD == 0)"
         ></el-input-number>
         <span v-else>{{ row.currentStlAmountRMB }}</span>
       </tempalte>
@@ -40,7 +40,7 @@
           placeholder="请输入 本次签收USD"
           size="mini"
           style="width: 100%;"
-          :disabled="row.currentStlCurCode != 'USD'"
+          :disabled="row.currentStlCurCode != 'USD'|| (row.currentStlAmountRMB == 0 && row.currentStlAmountUSD == 0)"
         ></el-input-number>
         <span v-else>{{ row.currentStlAmountUSD }}</span>
       </tempalte>
@@ -395,44 +395,36 @@ export default {
     armbChange(row) {
       if (Number(row.amount - row.reconciliationAmount) > 0) {
         if (Number(row.currentStlAmountRMB) < 0) {
-          row.currentStlAmountRMB = 0;
-          return this.$message.error("本次签收金额不能输入负数");
+          return this.$message.error("本次金额不能输入负数");
         }
         if (Number(row.currentStlAmountRMB) > Number(row.amount - row.reconciliationAmount)) {
-          row.currentStlAmountRMB = 0;
-          return this.$message.error("本次签收金额不能超过未对账金额");
+          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmount));
         }
       }
       if (Number(row.amount - row.reconciliationAmount) < 0) {
         if (row.currentStlAmountRMB >= 0) {
-          row.currentStlAmountRMB = Number(row.amount - row.reconciliationAmount);
-          return this.$message.error("本次签收金额不能输入非负数");
+          return this.$message.error("本次金额不能输入非负数");
         }
         if (Number(row.currentStlAmountRMB) < Number(row.amount - row.reconciliationAmount)) {
-          row.currentStlAmountRMB = Number(row.amount - row.reconciliationAmount);
-          return this.$message.error("本次签收金额不能超过未对账金额");
+          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmount));
         }
       }
     },
     ausdChange(row) {
       if (Number(row.amount - row.reconciliationAmount) > 0) {
         if (Number(row.currentStlAmountUSD) < 0) {
-          row.currentStlAmountUSD = 0;
-          return this.$message.error("本次签收金额不能输入负数");
+          return this.$message.error("本次金额不能输入负数");
         }
         if (Number(row.currentStlAmountUSD) > Number(row.amount - row.reconciliationAmount)) {
-          row.currentStlAmountUSD = 0;
-          return this.$message.error("本次签收金额不能超过未对账金额");
+          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmount));
         }
       }
       if (Number(row.amount - row.reconciliationAmount) < 0) {
         if (row.currentStlAmountUSD >= 0) {
-          row.currentStlAmountUSD = Number(row.amount - row.reconciliationAmount);
-          return this.$message.error("本次签收金额不能输入非负数");
+          return this.$message.error("本次金额不能输入非负数");
         }
         if (Number(row.currentStlAmountUSD) < Number(row.amount - row.reconciliationAmount)) {
-          row.currentStlAmountUSD = Number(row.amount - row.reconciliationAmount);
-          return this.$message.error("本次签收金额不能超过未对账金额");
+          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmount));
         }
       }
     },

src/views/iosBasicData/writeOff/assembly/finstlbillsitems2.vue

@@ -27,7 +27,7 @@
           placeholder="请输入 本次签收CNY"
           size="mini"
           style="width: 100%;"
-          :disabled="row.currentStlCurCode != 'CNY' || row.isSignfor == 1||form.advancePaymentRecordList.length"
+          :disabled="row.currentStlCurCode != 'CNY' || row.isSignfor == 1 || form.advancePaymentRecordList.length"
         ></el-input-number>
         <span v-else>{{ row.currentStlAmountRMB }}</span>
       </tempalte>
@@ -40,7 +40,7 @@
           placeholder="请输入 本次签收USD"
           size="mini"
           style="width: 100%;"
-          :disabled="row.currentStlCurCode != 'USD' || row.isSignfor == 1||form.advancePaymentRecordList.length"
+          :disabled="row.currentStlCurCode != 'USD' || row.isSignfor == 1 || form.advancePaymentRecordList.length"
         ></el-input-number>
         <span v-else>{{ row.currentStlAmountUSD }}</span>
       </tempalte>
@@ -396,44 +396,36 @@ export default {
     armbChange(row) {
       if (Number(row.amount - row.reconciliationAmount) > 0) {
         if (Number(row.currentStlAmountRMB) < 0) {
-          row.currentStlAmountRMB = 0;
-          return this.$message.error("本次签收金额不能输入负数");
+          return this.$message.error("本次金额不能输入负数");
         }
         if (Number(row.currentStlAmountRMB) > Number(row.amount - row.reconciliationAmount)) {
-          row.currentStlAmountRMB = 0;
-          return this.$message.error("本次签收金额不能超过未对账金额");
+          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmount));
         }
       }
       if (Number(row.amount - row.reconciliationAmount) < 0) {
         if (row.currentStlAmountRMB >= 0) {
-          row.currentStlAmountRMB = Number(row.amount - row.reconciliationAmount);
-          return this.$message.error("本次签收金额不能输入非负数");
+          return this.$message.error("本次金额不能输入非负数");
         }
         if (Number(row.currentStlAmountRMB) < Number(row.amount - row.reconciliationAmount)) {
-          row.currentStlAmountRMB = Number(row.amount - row.reconciliationAmount);
-          return this.$message.error("本次签收金额不能超过未对账金额");
+          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmount));
         }
       }
     },
     ausdChange(row) {
       if (Number(row.amount - row.reconciliationAmount) > 0) {
         if (Number(row.currentStlAmountUSD) < 0) {
-          row.currentStlAmountUSD = 0;
-          return this.$message.error("本次签收金额不能输入负数");
+          return this.$message.error("本次金额不能输入负数");
         }
         if (Number(row.currentStlAmountUSD) > Number(row.amount - row.reconciliationAmount)) {
-          row.currentStlAmountUSD = 0;
-          return this.$message.error("本次签收金额不能超过未对账金额");
+          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmount));
         }
       }
       if (Number(row.amount - row.reconciliationAmount) < 0) {
         if (row.currentStlAmountUSD >= 0) {
-          row.currentStlAmountUSD = Number(row.amount - row.reconciliationAmount);
-          return this.$message.error("本次签收金额不能输入非负数");
+          return this.$message.error("本次金额不能输入非负数");
         }
         if (Number(row.currentStlAmountUSD) < Number(row.amount - row.reconciliationAmount)) {
-          row.currentStlAmountUSD = Number(row.amount - row.reconciliationAmount);
-          return this.$message.error("本次签收金额不能超过未对账金额");
+          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmount));
         }
       }
     },
@@ -616,7 +608,7 @@ export default {
       }
       return rowName; //也可以再加上其他类名 如果有需求的话
     },
-       // 收付展示不一样的颜色
+    // 收付展示不一样的颜色
     cellStyle({ row, rowIndex, columnIndex }) {
       let rowStyle = "";
       if (row.dc == "D") {