From c64c8f43ec1a3d88feb1f915fd488040b6358e7d Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: 星期二, 09 八月 2022 19:04:12 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqtOut
---
src/views/goalManagement/performanceAppraisal/index.vue | 59 ++++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 42 insertions(+), 17 deletions(-)
diff --git a/src/views/goalManagement/performanceAppraisal/index.vue b/src/views/goalManagement/performanceAppraisal/index.vue
index cfe1191..a1c9637 100644
--- a/src/views/goalManagement/performanceAppraisal/index.vue
+++ b/src/views/goalManagement/performanceAppraisal/index.vue
@@ -7,10 +7,7 @@
<el-row>
<el-col :span="4">
<el-form-item size="default">
- <el-select v-model="ruleForm.searchParams.examineDepartmentId" style="width: 100%" placeholder="请选择考核部门">
- <el-option label="Zone one" value="shanghai" />
- <el-option label="Zone two" value="beijing" />
- </el-select>
+ <el-tree-select v-model="ruleForm.searchParams.examineDepartmentId" :data="data" check-strictly="true" class="w100" :props="propse" placeholder="请选择" />
</el-form-item>
</el-col>
<el-col :span="4">
@@ -41,10 +38,10 @@
</div>
</template>
</el-table-column>
- <el-table-column property="examineDate" align="center" label="考核日期" sortable />
- <el-table-column property="beExaminedDepartmentId" align="center" label="考核部门" sortable />
+ <el-table-column property="examineDate" align="center" :formatter="timeDate" label="考核日期" sortable />
+ <el-table-column property="examineDepartmentName" align="center" label="考核部门" sortable />
<el-table-column property="examinePersonId" label="考核人" align="center" sortable show-overflow-tooltip />
- <el-table-column property="beExaminedDepartmentId" label="被考核部门" align="center" sortable show-overflow-tooltip />
+ <el-table-column property="beExaminedDepartmentName" label="被考核部门" align="center" sortable show-overflow-tooltip />
<el-table-column property="examineTotalNumber" label="总分" align="center" sortable show-overflow-tooltip />
<el-table-column property="numberDetailJson.number" label="考核结果" align="center" sortable show-overflow-tooltip />
<el-table-column property="extraFile" label="附件" align="center" sortable show-overflow-tooltip />
@@ -110,7 +107,7 @@
<el-table-column property="applyRange" align="center" label="适用范围" sortable />
<el-table-column property="setPersonId" label="设定人" align="center" sortable show-overflow-tooltip />
<el-table-column property="setPersonDepartmentId" label="设定人部门" align="center" sortable show-overflow-tooltip />
- <el-table-column property="createTime" label="设定日期" align="center" sortable show-overflow-tooltip />
+ <el-table-column property="setTimem" label="设定日期" align="center" :formatter="timeDate" sortable show-overflow-tooltip />
<el-table-column property="templateCode" label="模板分类编码" align="center" sortable show-overflow-tooltip />
<el-table-column property="acceptanceNumber" label="合格分数" align="center" sortable show-overflow-tooltip />
<el-table-column label="操作" align="center" width="250px">
@@ -135,11 +132,12 @@
</el-tab-pane>
</el-tabs>
</div>
- <DailogAq ref="ShowAdd" @navAddorUpdata="onAddorUpdata"></DailogAq>
- <DailogKh ref="ShowAdds" @navAddorUpdata="onAddorUpdatas"></DailogKh>
+ <DailogAq ref="openAdd" @navAddorUpdata="onAddorUpdata"></DailogAq>
+ <DailogKh ref="openAdds" @navAddorUpdata="onAddorUpdatas"></DailogKh>
</div>
</template>
<script lang="ts">
+import {timeDate} from '/@/assets/index.ts'
import DailogAq from './component/DailogAq.vue';
import DailogKh from './component/DailogKh.vue';
import { ref, toRefs, reactive, onMounted, defineComponent } from 'vue';
@@ -151,7 +149,7 @@
setup() {
// 搜索条件 安全考核管理
const ruleForm = reactive({
- pageSize: 2,
+ pageSize: 10,
pageIndex: 1,
searchParams: {
examineDepartmentId: '',
@@ -204,6 +202,8 @@
};
// 删除
const onDelete = (id: number) => {
+ let arr=[]
+ arr.push(id)
ElMessageBox.confirm('确定删除所选项吗?', 'Warning', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@@ -211,7 +211,7 @@
})
.then(() => {
goalManagementApi()
- .getexamineMngDelete(id)
+ .getexamineMngDelete(arr)
.then((res) => {
if (res.data.code == 200) {
ElMessage({
@@ -241,7 +241,7 @@
for (let i = 0; i < valId.length; i++) {
arr.push(valId[i].id);
}
- deletAll.value = arr.toString();
+ deletAll.value = arr
if (val.length == 1) {
warning.value = false;
danger.value = false;
@@ -318,6 +318,7 @@
};
onMounted(() => {
listApis();
+ department()
});
const onAddorUpdatas = () => {
listApis();
@@ -344,6 +345,8 @@
};
// 删除
const onDeletes = (id: number) => {
+ let arr=[]
+ arr.push(id)
ElMessageBox.confirm('确定删除所选项吗?', 'Warning', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@@ -351,14 +354,14 @@
})
.then(() => {
goalManagementApi()
- .getexamineTemplateDelete(id)
+ .getexamineTemplateDelete(arr)
.then((res) => {
if (res.data.code == 200) {
ElMessage({
message: res.data.msg,
type: 'success',
});
- listApi();
+ listApis();
} else {
ElMessage.error(res.data.msg);
}
@@ -381,7 +384,7 @@
for (let i = 0; i < valId.length; i++) {
arr.push(valId[i].id);
}
- deletAlls.value = arr.toString();
+ deletAlls.value = arr;
if (val.length == 1) {
warnings.value = false;
dangers.value = false;
@@ -408,7 +411,7 @@
message: res.data.msg,
type: 'success',
});
- listApi();
+ listApis();
} else {
ElMessage.error(res.data.msg);
}
@@ -421,7 +424,29 @@
// });
});
};
+ //部门树
+ const department = () => {
+ goalManagementApi()
+ .getTreedepartment()
+ .then((res) => {
+ if (res.data.code == 200) {
+ data.value = res.data.data;
+ } else {
+ ElMessage.error(res.data.msg);
+ }
+ });
+ };
+ const propse = {
+ label: 'depName',
+ children: 'children',
+ value: 'depId',
+ };
+ const data = ref();
return {
+ timeDate,
+ department,
+ propse,
+ data,
activeName,
ruleForm,
resetForm,
--
Gitblit v1.9.2