From 17600f41d7c3f6c28cc5393dbb4d3d7e82eccad6 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期四, 25 八月 2022 09:54:47 +0800
Subject: [PATCH] conflict
---
src/views/goalManagement/performanceAppraisal/index.vue | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/src/views/goalManagement/performanceAppraisal/index.vue b/src/views/goalManagement/performanceAppraisal/index.vue
index 0f3e9de..53838f6 100644
--- a/src/views/goalManagement/performanceAppraisal/index.vue
+++ b/src/views/goalManagement/performanceAppraisal/index.vue
@@ -21,16 +21,17 @@
<div class="btns">
<div>
<el-button size="default" type="primary" :icon="Plus" @click="openD('新建')">新建</el-button>
- <!-- <el-button size="default" :disabled="warning" type="warning" plain :icon="EditPen">修改</el-button> -->
+ <el-button size="default" :disabled="warning" type="warning" plain :icon="EditPen"
+ @click="openD('修改', deletAll[0])">修改</el-button>
<el-button size="default" :disabled="danger" type="danger" plain :icon="Delete" @click="onDeleteAll">删除</el-button>
</div>
</div>
<el-table ref="multipleTableRef" :data="tableData" style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column type="selection" align="center" width="55" />
<el-table-column type="expand">
- <template #default>
+ <template #default="scope">
<div class="tableC">
- <el-table :data="tableData.currentExamineDtoList" style="width: 100%">
+ <el-table :data="scope.row.currentExamineDtoList" style="width: 100%">
<el-table-column align="center" prop="itemDetail" label="考核项目" />
<el-table-column align="center" prop="content" label="考核内容" />
<el-table-column align="center" prop="number" label="考核分数" />
@@ -91,9 +92,9 @@
<el-table ref="multipleTableRef" :data="tableDatas" style="width: 100%" @selection-change="handleSelectionChanges">
<el-table-column type="selection" align="center" width="55" />
<el-table-column type="expand">
- <template #default>
+ <template #default="scope">
<div class="tableC">
- <el-table :data="tableDatas.examineItemList" style="width: 100%">
+ <el-table :data="scope.row.examineItemList" style="width: 100%">
<el-table-column align="center" prop="itemType" label="类型" />
<el-table-column align="center" prop="itemDetail" label="考核项目" />
<el-table-column align="center" prop="content" label="考核内容" />
@@ -141,8 +142,9 @@
import DailogAq from './component/DailogAq.vue';
import DailogKh from './component/DailogKh.vue';
import { ref, toRefs, reactive, onMounted, defineComponent } from 'vue';
-import { ElMessageBox, ElMessage, ElButton, ElInput, TabsPaneContext, FormInstance } from 'element-plus';
+import { ElMessageBox, ElMessage, ElButton, ElInput, FormInstance } from 'element-plus';
import { Plus, Delete, Upload, Download, Refresh, View, EditPen } from '@element-plus/icons-vue';
+import type { TabsPaneContext } from 'element-plus'
import { goalManagementApi } from '/@/api/goalManagement';
export default defineComponent({
components: { ElButton, ElInput, DailogAq, DailogKh },
@@ -158,6 +160,7 @@
// 重置
const resetForm = () => {
ruleForm.searchParams.examineDepartmentId = '';
+ listApi()
};
const listApi = () => {
goalManagementApi()
@@ -283,8 +286,9 @@
};
// 切换
const activeName = ref('1');
- const handleClick = (val: any) => {
- if (val == '1') {
+ const handleClick = (val: TabsPaneContext) => {
+ console.log(val)
+ if (val.props.name == '1') {
listApi();
}else{
listApis();
@@ -300,11 +304,12 @@
});
// 重置
const resetForms = () => {
- ruleForm.searchParams.examineDepartmentId = '';
+ ruleForms.searchParams.title = '';
+ listApis()
};
const listApis = () => {
goalManagementApi()
- .getexamineTemplateList(ruleForm)
+ .getexamineTemplateList(ruleForms)
.then((res) => {
if (res.data.code == 200) {
tableDatas.value = res.data.data;
--
Gitblit v1.9.2