From c62c6139020729b069f90dbddaf3197db0059882 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Thu, 17 Nov 2022 00:57:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=8D=95=E6=8D=AE=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=9C=89=E6=97=A0=E6=AC=A0=E6=AC=BE=E7=9A=84=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/views/bill/PurchaseInList.vue | 19 +++++++++++++++----
 jshERP-web/src/views/bill/SaleOutList.vue    | 19 +++++++++++++++----
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/jshERP-web/src/views/bill/PurchaseInList.vue b/jshERP-web/src/views/bill/PurchaseInList.vue
index 35625419..345265a0 100644
--- a/jshERP-web/src/views/bill/PurchaseInList.vue
+++ b/jshERP-web/src/views/bill/PurchaseInList.vue
@@ -81,6 +81,14 @@
                     </a-select>
                   </a-form-item>
                 </a-col>
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="有无欠款" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-select placeholder="选择有无欠款" v-model="queryParam.hasDebt">
+                      <a-select-option value="1">有欠款</a-select-option>
+                      <a-select-option value="0">无欠款</a-select-option>
+                    </a-select>
+                  </a-form-item>
+                </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="单据状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
                     <a-select placeholder="选择单据状态" v-model="queryParam.status">
@@ -142,6 +150,11 @@
                 <a>删除</a>
               </a-popconfirm>
             </span>
+            <template slot="customRenderDebt" slot-scope="value, record">
+              <span style="color:green" v-if="value>0 && record.hasFinancialFlag">{{value}}</span>
+              <span style="color:red" v-if="value>0 && !record.hasFinancialFlag">{{value}}</span>
+              <span v-if="value===0">{{value}}</span>
+            </template>
             <template slot="customRenderStatus" slot-scope="status">
               <a-tag v-if="status == '0'" color="red">未审核</a-tag>
               <a-tag v-if="status == '1'" color="green">已审核</a-tag>
@@ -186,6 +199,7 @@
           creator: "",
           linkNumber: "",
           accountId: "",
+          hasDebt: "",
           status: "",
           remark: ""
         },
@@ -238,10 +252,7 @@
           },
           { title: '付款', dataIndex: 'changeAmount',width:60},
           { title: '欠款', dataIndex: 'debt',width:60,
-            customRender:function (text,record,index) {
-              let debt = record.discountLastMoney + record.otherMoney - (record.deposit + record.changeAmount)
-              return debt? debt.toFixed(2):''
-            }
+            scopedSlots: { customRender: 'customRenderDebt' }
           },
           { title: '状态', dataIndex: 'status', width: 80, align: "center",
             scopedSlots: { customRender: 'customRenderStatus' }
diff --git a/jshERP-web/src/views/bill/SaleOutList.vue b/jshERP-web/src/views/bill/SaleOutList.vue
index e6e18e26..41633405 100644
--- a/jshERP-web/src/views/bill/SaleOutList.vue
+++ b/jshERP-web/src/views/bill/SaleOutList.vue
@@ -82,6 +82,14 @@
                     </a-select>
                   </a-form-item>
                 </a-col>
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="有无欠款" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-select placeholder="选择有无欠款" v-model="queryParam.hasDebt">
+                      <a-select-option value="1">有欠款</a-select-option>
+                      <a-select-option value="0">无欠款</a-select-option>
+                    </a-select>
+                  </a-form-item>
+                </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="单据状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
                     <a-select placeholder="选择单据状态" v-model="queryParam.status">
@@ -143,6 +151,11 @@
                 <a>删除</a>
               </a-popconfirm>
             </span>
+            <template slot="customRenderDebt" slot-scope="value, record">
+              <span style="color:green" v-if="value>0 && record.hasFinancialFlag">{{value}}</span>
+              <span style="color:red" v-if="value>0 && !record.hasFinancialFlag">{{value}}</span>
+              <span v-if="value===0">{{value}}</span>
+            </template>
             <template slot="customRenderStatus" slot-scope="status">
               <a-tag v-if="status == '0'" color="red">未审核</a-tag>
               <a-tag v-if="status == '1'" color="green">已审核</a-tag>
@@ -186,6 +199,7 @@
           creator: "",
           linkNumber: "",
           accountId: "",
+          hasDebt: "",
           status: "",
           remark: ""
         },
@@ -238,10 +252,7 @@
           },
           { title: '收款', dataIndex: 'changeAmount',width:60},
           { title: '欠款', dataIndex: 'debt',width:60,
-            customRender:function (text,record,index) {
-              let debt = record.discountLastMoney + record.otherMoney - (record.deposit + record.changeAmount)
-              return debt? debt.toFixed(2):''
-            }
+            scopedSlots: { customRender: 'customRenderDebt' }
           },
           { title: '状态', dataIndex: 'status', width: 80, align: "center",
             scopedSlots: { customRender: 'customRenderStatus' }