From 09df5a6c3d3b888cbe61252f1f02526521fee821 Mon Sep 17 00:00:00 2001
From: yxq <y1530857136@qq.com>
Date: Fri, 19 Jan 2024 15:16:09 +0800
Subject: [PATCH] =?UTF-8?q?web=E6=95=99=E5=B8=88=E5=B7=A5=E8=B5=84?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/Gz_Amounts/Index.cshtml             | 27 ++++++++++++++-----
 .../Learun.Application.Web.csproj             |  4 +++
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Gz_Amounts/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Gz_Amounts/Index.cshtml
index 0400f4363..95f8f4d3f 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Gz_Amounts/Index.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Gz_Amounts/Index.cshtml	
@@ -22,7 +22,7 @@
             </el-col>
             <el-col :span="4">
                 <el-date-picker size="small"
-                                v-model="query.time"
+                                v-model="time"
                                 type="daterange"
                                 start-placeholder="开始日期"
                                 end-placeholder="结束日期"
@@ -122,11 +122,11 @@
                           border
                           show-overflow-tooltip
                           height="500">
-                    @*<template v-for="item in fixedColumn">
+                    <template v-for="item in fixedColumn">
                         <el-table-column :prop="item.prop"
                                          :label="item.label">
                         </el-table-column>
-                    </template>*@
+                    </template>
                     <template v-for="item in trendsColumn">
                         <el-table-column :prop="item.prop"
                                          :label="item.label">
@@ -146,6 +146,7 @@
             data() {
                 return {
                     query: {},
+                    time:null,
                     tableData: [],
                     multipleSelection: [],
                     currentPage: 1,
@@ -240,6 +241,13 @@
                     location.reload()
                 },
                 async getTableData() {
+                    if (this.time) {
+                        this.query.time1 = this.time[0]
+                        this.query.time2 = this.time[1]
+                    } else if (this.query['time1']){
+                        delete this.query['time1']
+                        delete this.query['time2']
+                    }
                     let getParams = {
                         pagination: JSON.stringify({
                             rows: this.pageSize, page: this.currentPage, sidx: '', sord: "DESC",
@@ -389,11 +397,16 @@
                         this.$message.warning('请选择一条数据进行查看！')
                         return
                     }
-                    this.detailData = []
+                    this.detailData = JSON.parse(JSON.stringify(this.multipleSelection))
                     let result = await this.NetRequest('/PersonnelManagement/Gz_Amounts/GetDetail', $.param({ userNo: this.multipleSelection[0].UserNo, year: this.multipleSelection[0].Year, month: this.multipleSelection[0].Month }), 'get')
-                    debugger
-                    this.detailData = result;
-                    this.trendsColumn = [{ porp: 'Item2', label: 'Item1' }]
+                    if (result) {
+                        let obj = {}
+                        this.trendsColumn = result.map((e, i) => {
+                            obj['trends' + i] = e.Item2
+                            return { prop: 'trends' + i, label: e.Item1}
+                        })
+                        this.detailData[0] = { ...this.detailData[0], ...obj }
+                    }
                     this.dialogVisible1 = true
                 },
             }
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj
index 87e01214b..788ec2536 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj	
@@ -1977,6 +1977,8 @@
     <Content Include="Content\css\red.css" />
     <Content Include="Content\css\styletwo.css" />
     <Content Include="Content\css\swiper.min1.css" />
+    <Content Include="Content\elementui\element-ui%402.15.13.css" />
+    <Content Include="Content\elementui\element-ui%402.15.13.js" />
     <Content Include="Content\idcardreader\idcardreaderv1.js" />
     <Content Include="Content\idcardreader\npCertReader.dll" />
     <Content Include="Content\images\calendar.png" />
@@ -7946,6 +7948,8 @@
     <Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\ExcelImportPay.cshtml" />
     <Content Include="Content\excel\OrderDetail.xls" />
     <Content Include="Areas\PersonnelManagement\Views\Gz_Amounts\GzImport.cshtml" />
+    <Content Include="Content\elementui\fonts\element-icons.ttf" />
+    <Content Include="Content\elementui\fonts\element-icons.woff" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />