提交财务

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -260,6 +260,7 @@
               @saveColumn="saveColumn('goods')"
               @resetColumn="resetColumn"
               :summary-method="summaryMethod"
+              :cell-style="goodsRowClassName"
               :table-loading="goodsLoading"
               :key="index"
           >
@@ -3521,6 +3522,13 @@ export default {
         this.$set(this.form, 'corpTel', null)
       }
     },
+    // 商品表格加色
+    goodsRowClassName({row, column, rowIndex, columnIndex}) {
+      if (Number(row.orderQuantity) > Number(row.storageQuantity) && column.property == 'storageQuantity') {
+        return "color: #fff;background:#a4cf57"
+      }
+      return '';
+    },
     // 合计计算
     summaryMethod({ columns, data }) {
       const sums = [];

src/views/financialManagement/paymentSettle/configuration/detailsPage.json

@@ -62,6 +62,13 @@
       "index": 7
     },
     {
+      "label": "结算金额",
+      "prop": "settlementAmount",
+      "overHidden": true,
+      "width": 150,
+      "index": 7
+    },
+    {
       "label": "本次金额",
       "prop": "thisAmount",
       "overHidden": true,

src/views/financialManagement/paymentSettle/paymentSettleDetailsPage.vue

@@ -496,7 +496,7 @@ export default {
         item.accId = item.id;
         item.srcOrderno = item.accSysNo
         item.billNo = item.srcBillNo
-        item.thisAmount = item.amount
+        item.thisAmount = (Number(item.amount) - Number(item.settlementAmount))
         delete item.id;
 
         this.$refs.crud.rowCellAdd(item);

src/views/financialManagement/receiptSettle/configuration/detailsPage.json

@@ -62,6 +62,13 @@
       "index": 7
     },
     {
+      "label": "结算金额",
+      "prop": "settlementAmount",
+      "overHidden": true,
+      "width": 150,
+      "index": 7
+    },
+    {
       "label": "本次金额",
       "prop": "thisAmount",
       "overHidden": true,

src/views/financialManagement/receiptSettle/receiptSettleDetailsPage.vue

@@ -576,7 +576,7 @@
           item.accId = item.id;
           item.srcOrderno  = item.accSysNo
           item.billNo  = item.srcBillNo
-          item.thisAmount = item.amount
+          item.thisAmount = (Number(item.amount) - Number(item.settlementAmount))
           delete item.id;
           this.$refs.crud.rowCellAdd(item);
         })