From e5454b769d44a34af423bf87ac8a740bf8c20341 Mon Sep 17 00:00:00 2001 From: Crunchy <3114200645@qq.com> Date: 星期二, 29 四月 2025 13:25:29 +0800 Subject: [PATCH] Merge branch 'dev' into dev_tides --- src/views/CNAS/resourceDemand/facilitiesEnvironment/component/Personnel-management.vue | 48 +++++++++++++++++++++--------------------------- 1 files changed, 21 insertions(+), 27 deletions(-) diff --git a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/Personnel-management.vue b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/Personnel-management.vue index 3c32a22..bfa51b8 100644 --- a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/Personnel-management.vue +++ b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/Personnel-management.vue @@ -1,35 +1,30 @@ <template> - <div class="capacity-scope"> + <div> <div class="search"> <div> <el-form :model="searchForm" ref="searchForm" size="small" :inline="true"> <el-form-item label="鏃ユ湡" prop="registerDate"> - <el-date-picker v-model="searchForm.registerDate" - clearable - format="yyyy-MM-dd" - placeholder="閫夋嫨鏃ユ湡" - size="small" - style="width: 100%" - type="date" - value-format="yyyy-MM-dd"> + <el-date-picker v-model="searchForm.registerDate" clearable format="yyyy-MM-dd" placeholder="閫夋嫨鏃ユ湡" + @change="searchList" size="small" style="width: 100%" type="date" value-format="yyyy-MM-dd"> </el-date-picker> </el-form-item> <el-form-item> - <el-button type="primary" icon="el-icon-search" size="mini" @click="searchList">鏌� 璇�</el-button> - <el-button icon="el-icon-refresh" size="mini" @click="resetSearchForm">閲� 缃�</el-button> + <el-button type="primary" size="mini" @click="searchList">鏌ヨ</el-button> + <el-button size="mini" @click="resetSearchForm">閲嶇疆</el-button> </el-form-item> </el-form> </div> <div> - <el-button size="medium" @click="handleDown">瀵� 鍑�</el-button> - <el-button size="medium" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button> + <el-button size="small" @click="handleDown">瀵� 鍑�</el-button> + <el-button size="small" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button> </div> </div> <div class="table"> <lims-table :tableData="tableData" :column="tableColumn" :height="'calc(100vh - 250px)'" @pagination="pagination" - :page="page" :tableLoading="tableLoading"></lims-table> + :page="page" :tableLoading="tableLoading"></lims-table> </div> - <personnel-management-dia v-if="threeWastesDia" ref="threeWastesDia" @closeThreeWastesDia="closeThreeWastesDia"></personnel-management-dia> + <personnel-management-dia v-if="threeWastesDia" ref="threeWastesDia" + @closeThreeWastesDia="closeThreeWastesDia"></personnel-management-dia> </div> </template> @@ -46,7 +41,7 @@ export default { name: 'Personnel-management', // import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢� - components: { limsTable, PersonnelManagementDia}, + components: { limsTable, PersonnelManagementDia }, data() { // 杩欓噷瀛樻斁鏁版嵁 return { @@ -135,14 +130,14 @@ // 鏂规硶闆嗗悎 methods: { // 鏌ヨ鍒楄〃 - searchList () { + searchList() { this.tableLoading = true pageForeignRegister({ ...this.page, ...this.searchForm }).then(res => { this.tableLoading = false - if (res.code === 200){ + if (res.code === 200) { this.tableData = res.data.records this.page.total = res.data.total } @@ -153,16 +148,16 @@ }) }, // 鍒犻櫎 - delPlan (row) { + delPlan(row) { this.$confirm('姝ゆ搷浣滃皢姘镐箙鍒犻櫎璇ユ暟鎹�, 鏄惁缁х画?', '鎻愮ず', { confirmButtonText: '纭畾', cancelButtonText: '鍙栨秷', type: 'warning' }).then(() => { this.tableLoading = true - delForeignRegister({registerId:row.registerId}).then(res =>{ + delForeignRegister({ registerId: row.registerId }).then(res => { this.tableLoading = false - if (res.code === 200){ + if (res.code === 200) { this.$message.success('鍒犻櫎鎴愬姛') this.searchList() } @@ -178,26 +173,25 @@ }); }, // 鏂板锛岀紪杈戯紝鎵瑰噯寮规 - openFormDia (type, row) { + openFormDia(type, row) { this.threeWastesDia = true this.$nextTick(() => { this.$refs.threeWastesDia.openDia(type, row) }) }, // 瀵煎嚭 - handleDown () { + handleDown() { exportForeignRegister(this.searchForm).then(res => { - const blob = new Blob([res],{ type: 'application/msword' }); + const blob = new Blob([res], { type: 'application/msword' }); this.$download.saveAs(blob, '澶栨潵浜哄憳鐧昏.docx') - this.$message.success('瀵煎嚭鎴愬姛') }) }, - closeThreeWastesDia () { + closeThreeWastesDia() { this.threeWastesDia = false this.searchList() }, // 閲嶇疆鏌ヨ鏉′欢 - resetSearchForm () { + resetSearchForm() { this.searchForm.registerDate = ''; this.searchList() }, -- Gitblit v1.9.3