From 9f150cd0352779ed2711f0e584c127361ca5b532 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 15 一月 2026 13:43:02 +0800
Subject: [PATCH] fix：获取负责人信息接口新增部门ID参数
---
src/views/CNAS/personnel/personnelInfo/tabs/reward-punishment-record.vue | 67 +++++++++++++++++++++------------
1 files changed, 42 insertions(+), 25 deletions(-)
diff --git a/src/views/CNAS/personnel/personnelInfo/tabs/reward-punishment-record.vue b/src/views/CNAS/personnel/personnelInfo/tabs/reward-punishment-record.vue
index c51ea52..408cbde 100644
--- a/src/views/CNAS/personnel/personnelInfo/tabs/reward-punishment-record.vue
+++ b/src/views/CNAS/personnel/personnelInfo/tabs/reward-punishment-record.vue
@@ -1,33 +1,33 @@
<!-- 濂栨儵璁板綍 -->
<template>
<div>
- <div class="view">
- <div style="display: flex;justify-content: space-between;">
- <el-form :model="search" ref="page" size="small" :inline="true">
- <el-form-item label="濮撳悕">
- <el-input v-model="search.userName" clearable placeholder="璇疯緭鍏ュ叧閿瓧" size="small"
- style="width: 20vh;"></el-input>
- </el-form-item>
- <el-form-item label="濂栨儵鏃ユ湡">
- <el-date-picker v-model="search.searchTimeList" :picker-options="pickerOptions" align="right" clearable
- end-placeholder="缁撴潫鏃ユ湡" format="yyyy-MM-dd" range-separator="鑷�" size="small" start-placeholder="寮�濮嬫棩鏈�"
- style="width: 100%" type="daterange" unlink-panels value-format="yyyy-MM-dd 00:00:00">
- </el-date-picker>
- </el-form-item>
- <el-form-item>
- <el-button size="small" type="primary" @click="getPersonnelTraining(departId)">鏌ヨ</el-button>
- </el-form-item>
- </el-form>
- <div>
- <el-button :loading="outLoading" size="small" type="primary" @click="handleDown">瀵煎嚭</el-button>
- <el-button size="small" type="primary" @click="addRow">鏂板</el-button>
+ <div style="display: flex;justify-content: space-between">
+ <div style="display: flex;">
+ <div style="margin-bottom: 18px;margin-right: 10px;display: flex;align-items: center;line-height: 32px;">
+ <span style="width: 48px;font-size: 14px;font-weight: 700;color: #606266;">濮撳悕</span>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="search.userName"
+ @keyup.enter.native="getPersonnelTraining(departId)"></el-input>
</div>
+ <div style="margin-bottom: 18px;margin-right: 10px;display: flex;align-items: center;line-height: 32px;">
+ <span style="width: 88px;font-size: 14px;font-weight: 700;color: #606266;">濂栨儵鏃ユ湡</span>
+ <el-date-picker v-model="search.searchTimeList" :picker-options="pickerOptions" align="right" clearable
+ @change="getPersonnelTraining(departId)" end-placeholder="缁撴潫鏃ユ湡" format="yyyy-MM-dd" range-separator="鑷�"
+ size="small" start-placeholder="寮�濮嬫棩鏈�" style="width: 100%" type="daterange" unlink-panels
+ value-format="yyyy-MM-dd 00:00:00">
+ </el-date-picker>
+ </div>
+ <div style="line-height: 30px;">
+ <el-button size="mini" type="primary" @click="getPersonnelTraining(departId)">鏌ヨ</el-button>
+ </div>
+ </div>
+ <div style="line-height: 30px;">
+ <el-button :loading="outLoading" size="small" type="primary" @click="handleDown">瀵煎嚭</el-button>
+ <el-button size="small" type="primary" @click="addRow">鏂板</el-button>
</div>
</div>
<div class="table">
<el-table :data="tableData" v-loading="tableLoading"
- :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
- height="66.5vh" style="width: 100%">
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border height="66.5vh" style="width: 100%">
<el-table-column label="搴忓彿" type="index" width="120">
<template v-slot="scope">
<span>{{ (search.current - 1) * search.size + scope.$index + 1 }}</span>
@@ -200,6 +200,7 @@
},
mounted() {
this.getPersonnelTraining(this.departId);
+ this.getUserList();
},
methods: {
handleSizeChange(val) {
@@ -233,7 +234,9 @@
this.dialogVisible = true
if (!this.isDepartment) {
this.form.userId = this.departId
- this.selectUserChange(this.form.userId)
+ if (this.responsibleOptions.length > 0) {
+ this.selectUserChange(this.form.userId)
+ }
}
},
handleDown() {
@@ -254,9 +257,13 @@
},
// 鑾峰彇璐熻矗浜轰俊鎭帴鍙�
getUserList() {
- selectUserCondition().then(res => {
+ const params = {
+ type: 2,
+ departmentId: this.isDepartment ? this.departId : null
+ };
+ return selectUserCondition(params).then(res => {
if (res.code == 200) {
- this.responsibleOptions = res.data
+ this.responsibleOptions = res.data;
}
});
},
@@ -315,7 +322,17 @@
this.form = {}
this.$refs['form'].resetFields()
}
+ },
+ responsibleOptions(val) {
+ if (this.form.userId && val.length > 0) {
+ this.selectUserChange(this.form.userId)
+ }
}
}
};
</script>
+<style scoped>
+.dateTime>>>.el-form-item__content {
+ width: 260px;
+}
+</style>
--
Gitblit v1.9.3