From cfc25b4f5e612590598cd7049f09e849f963bb0e Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Thu, 30 May 2024 23:23:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=AF=B9=E8=B4=A6=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=AC=A0=E6=AC=BE=E7=9A=84=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/views/report/CustomerAccount.vue | 17 ++++++++++++++++-
 jshERP-web/src/views/report/VendorAccount.vue   | 17 ++++++++++++++++-
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/jshERP-web/src/views/report/CustomerAccount.vue b/jshERP-web/src/views/report/CustomerAccount.vue
index a029d4c4..df1a8bad 100644
--- a/jshERP-web/src/views/report/CustomerAccount.vue
+++ b/jshERP-web/src/views/report/CustomerAccount.vue
@@ -28,11 +28,15 @@
                   />
                 </a-form-item>
               </a-col>
-              <a-col :md="4" :sm="24">
+              <a-col :md="6" :sm="24">
                 <span class="table-page-search-submitButtons">
                   <a-button type="primary" @click="searchQuery">查询</a-button>
                   <a-button style="margin-left: 8px" v-print="'#reportPrint'" icon="printer">打印</a-button>
                   <a-button style="margin-left: 8px" @click="exportExcel" icon="download">导出</a-button>
+                  <a @click="handleToggleSearch" style="margin-left: 8px">
+                    {{ toggleSearchStatus ? '收起' : '展开' }}
+                    <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+                  </a>
                 </span>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -40,6 +44,16 @@
                   {{firstTotal}} {{lastTotal}}
                 </a-form-item>
               </a-col>
+              <template v-if="toggleSearchStatus">
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="欠款情况" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-select 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>
+              </template>
             </a-row>
           </a-form>
         </div>
@@ -120,6 +134,7 @@
         queryParam: {
           supplierType: "客户",
           organId: '',
+          hasDebt: '1',
           beginTime: getPrevMonthFormatDate(3),
           endTime: getFormatDate(),
           createTimeRange: [moment(getPrevMonthFormatDate(3)), moment(getFormatDate())],
diff --git a/jshERP-web/src/views/report/VendorAccount.vue b/jshERP-web/src/views/report/VendorAccount.vue
index b12f4645..ea156f42 100644
--- a/jshERP-web/src/views/report/VendorAccount.vue
+++ b/jshERP-web/src/views/report/VendorAccount.vue
@@ -28,11 +28,15 @@
                   />
                 </a-form-item>
               </a-col>
-              <a-col :md="4" :sm="24">
+              <a-col :md="6" :sm="24">
                 <span class="table-page-search-submitButtons">
                   <a-button type="primary" @click="searchQuery">查询</a-button>
                   <a-button style="margin-left: 8px" v-print="'#reportPrint'" icon="printer">打印</a-button>
                   <a-button style="margin-left: 8px" @click="exportExcel" icon="download">导出</a-button>
+                  <a @click="handleToggleSearch" style="margin-left: 8px">
+                    {{ toggleSearchStatus ? '收起' : '展开' }}
+                    <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+                  </a>
                 </span>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -40,6 +44,16 @@
                   {{firstTotal}} {{lastTotal}}
                 </a-form-item>
               </a-col>
+              <template v-if="toggleSearchStatus">
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="欠款情况" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-select 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>
+              </template>
             </a-row>
           </a-form>
         </div>
@@ -120,6 +134,7 @@
         queryParam: {
           supplierType: "供应商",
           organId: '',
+          hasDebt: '1',
           beginTime: getPrevMonthFormatDate(3),
           endTime: getFormatDate(),
           createTimeRange: [moment(getPrevMonthFormatDate(3)), moment(getFormatDate())],