From 400d3b103007735e630bc54036316f35cc4454aa Mon Sep 17 00:00:00 2001
From: yxq <y1530857136@qq.com>
Date: Tue, 30 Jan 2024 12:12:33 +0800
Subject: [PATCH] =?UTF-8?q?web=20=E6=88=91=E7=9A=84=E5=B7=A5=E8=B5=84?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=B1=95=E7=A4=BA=E4=B8=80=E4=B8=AA=E6=9C=89?=
 =?UTF-8?q?=E5=B7=A5=E8=B5=84=E7=9A=84=E6=9C=88=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/Gz_Amounts/MyAmount.cshtml                 | 12 ++++++++++++
 .../pages/PersonnelManagement/MyAmount/list.vue      |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Gz_Amounts/MyAmount.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Gz_Amounts/MyAmount.cshtml
index 5454639c2..a0d6225d4 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Gz_Amounts/MyAmount.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Gz_Amounts/MyAmount.cshtml	
@@ -20,6 +20,7 @@
                 <el-date-picker size="small"
                                 v-model="time"
                                 type="monthrange"
+                                :clearable="false"
                                 start-placeholder="开始日期"
                                 end-placeholder="结束日期"
                                 value-format="yyyy-MM-dd">
@@ -149,6 +150,17 @@
             methods: {
                 async init() {
                     window.getTableData = this.importCallback
+
+                    let getParams = {
+                        pagination: JSON.stringify({
+                            rows: this.pageSize, page: this.currentPage, sidx: '', sord: "DESC",
+                        }),
+                        queryJson: JSON.stringify(this.query)
+                    }
+                    let result = await this.NetRequest('/PersonnelManagement/Gz_Amounts/GetPageListMyCurrCol', $.param(getParams), 'get')
+                    let yearMonth = result.year + '-' + (result.month.length == '1' ? '0' + result.month : result.month)
+                    this.time = [yearMonth + '-' + '01', yearMonth + '-' + '01']
+
                     this.getTableData()
                 },
                 NetRequest(url, data, method = "POST") {
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MyAmount/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MyAmount/list.vue
index 440132fb2..fb7b2ebed 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MyAmount/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MyAmount/list.vue	
@@ -43,7 +43,7 @@
 		/>
         <!-- 重置查询条件按钮 --> 
         <view class="padding-tb"> 
-          <l-button @click="reset" line="orange" class="block" block>重置查询条件</l-button> 
+          <!-- <l-button @click="reset" line="orange" class="block" block>重置查询条件</l-button> -->
         </view> 
       </view> 
     </scroll-view>