Merge branch '西昌分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 西昌分支

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Gz_Amounts/Index.cshtml

@@ -16,14 +16,13 @@
                 <el-input placeholder="请输入教职工编号/姓名进行查询" v-model="query.keyword" clearable size="small"></el-input>
             </el-col>
             <el-col :span="4">
-                <el-select v-model="query.value" clearable size="small" placeholder="请选择部门">
-                    <el-option label="123123" value="123"></el-option>
-                    <el-option label="456" value="222"></el-option>
+                <el-select v-model="query.department" filterable clearable size="small" placeholder="请选择部门">
+                    <el-option v-for="item in departmentOptions" :label="item.label" :value="item.value"></el-option>
                 </el-select>
             </el-col>
             <el-col :span="4">
                 <el-date-picker size="small"
-                                v-model="query.time"
+                                v-model="time"
                                 type="daterange"
                                 start-placeholder="开始日期"
                                 end-placeholder="结束日期"
@@ -123,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">
@@ -147,11 +146,13 @@
             data() {
                 return {
                     query: {},
+                    time:null,
                     tableData: [],
                     multipleSelection: [],
                     currentPage: 1,
                     pageSize: 30,
                     total: 0,
+                    departmentOptions:[],
                     //固定列
                     fixedColumn: [
                         { prop: 'DeptCode', label: '部门代码' },
@@ -188,7 +189,16 @@
                 this.init()
             },
             methods: {
-                init() {
+                async init() {
+                    await Promise.all([
+                        this.NetRequest('/LR_OrganizationModule/Department/GetTree?companyId=207fa1a9-160c-4943-a89b-8fa4db0547ce&parentId=0', null, 'get').then(res => {
+                            if (res) {
+                                this.departmentOptions = res.map(e => {
+                                    return {value:e.id,label:e.text}
+                                })
+                            }
+                        })
+                    ])
                     this.getTableData()
                 },
                 NetRequest(url, data, method = "POST") {
@@ -231,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",
@@ -380,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
                 },
             }

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" />