From 8edf0fc193df875b6e05d77be428e9134438857b Mon Sep 17 00:00:00 2001
From: Admin <978517621@qq.com>
Date: Tue, 16 Aug 2022 19:32:54 +0800
Subject: [PATCH] Default Changelist
---
src/views/goalManagement/safetyAssessment/component/Dailog.vue | 144 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 103 insertions(+), 41 deletions(-)
diff --git a/src/views/goalManagement/safetyAssessment/component/Dailog.vue b/src/views/goalManagement/safetyAssessment/component/Dailog.vue
index 3032820..6112761 100644
--- a/src/views/goalManagement/safetyAssessment/component/Dailog.vue
+++ b/src/views/goalManagement/safetyAssessment/component/Dailog.vue
@@ -1,5 +1,5 @@
<template>
- <el-dialog v-model="dialogVisible" :fullscreen="full" title="目标考核" width="70%" draggable>
+ <el-dialog v-model="dialogVisible" :fullscreen="full" title="目标考核" width="70%" draggable @close="closeDialog">
<el-button @click="toggleFullscreen" size="small" class="pot" :icon="FullScreen"></el-button>
<el-form :model="form" label-width="120px">
<el-row>
@@ -34,27 +34,38 @@
<el-button type="primary" size="default" @click="daiAdd('新增')" :disabled="disabled">新增</el-button>
</el-tab-pane>
</el-tabs>
- <el-table :data="tableData" style="width: 100%">
+ <el-table :data="formUp.examineList" style="width: 100%">
<el-table-column align="center" type="index" label="序号" width="70" />
- <el-table-column align="center" prop="date" label="责任部门" />
- <el-table-column align="center" prop="name" label="考核指标" />
- <el-table-column align="center" prop="address" label="制定部门" />
- <el-table-column align="center" prop="address" label="制定日期" />
- <el-table-column align="center" prop="address" label="上报值" />
- <el-table-column align="center" prop="address" label="上报时间" />
- <el-table-column align="center" prop="address" label="考核结果" />
- <el-table-column align="center" prop="address" label="考核人" />
- <el-table-column align="center" prop="address" label="考核时间" />
+ <el-table-column align="center" prop="dutyDepartmentName" label="责任部门" />
+ <el-table-column align="center" prop="examineValue" label="考核指标" />
+ <el-table-column align="center" prop="makerDepartmentName" label="制定部门" />
+ <el-table-column align="center" prop="makeDate" label="制定日期" />
+ <el-table-column align="center" prop="uploadValue" label="上报值" />
+ <el-table-column align="center" prop="uploadDate" label="上报时间" />
+ <el-table-column align="center" prop="examineResult" label="考核结果" >
+ <template #default="scope">
+ <div v-if="scope.row.examineResult==1">
+ 合格
+ </div>
+ <div v-if="scope.row.examineResult==2">
+ 不合格
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" prop="examinePersonName" label="考核人" />
+ <el-table-column align="center" prop="examineDate" label="考核时间" />
<el-table-column align="center" label="操作">
<template #default="scope">
- <el-button link type="primary" @click="daiAdd('修改', scope.row)">查看</el-button>
+ <el-button link type="primary" @click="daiAdd('查看', scope.row)">查看</el-button>
+ <el-button link type="primary" @click="daiAdd('修改', scope.row)">修改</el-button>
+ <el-button link type="primary" @click="Delete(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
<template #footer>
<span class="dialog-footer">
- <el-button @click="dialogVisible = false" size="default">关闭</el-button>
- <el-button type="primary" @click="dialogVisible = false" size="default">确定</el-button>
+ <el-button @click="closeDialog" size="default">关闭</el-button>
+ <el-button type="primary" @click="submitForm" size="default">确定</el-button>
</span>
</template>
</el-dialog>
@@ -84,15 +95,62 @@
disabled.value = title == '查看' ? true : false;
if (title == '查看' || title == '修改') {
goalManagementApi()
- .getTargetMngDetail(id)
+ .gettargetExamineDetail(id)
.then((res) => {
if (res.data.code == 200) {
form.value = res.data.data;
+ formUp.examineList = res.data.data.examineList
} else {
ElMessage.error(res.data.msg);
}
});
}
+ };
+ const closeDialog = () => {
+ form.value = {}
+ formUp.examineList = []
+ dialogVisible.value = false
+ };
+ const submitForm = () => {
+ // formUp.delTargetDivideDetails = arr.value.toString();
+ // formUp.targetId = form.value.id;
+ dialogVisible.value = false;
+ for(let i=0;i<formUp.examineList.length;i++){
+ delete formUp.examineList[i].dutyDepartmentName
+ delete formUp.examineList[i].makerDepartmentName
+ }
+ formUp.id = form.value.id
+ formUp.delIds = arr.value.toString();
+ goalManagementApi()
+ .gettargetExamineAddOrUpdate(formUp)
+ .then((res) => {
+ if (res.data.code == 200) {
+ ElMessage({
+ message: res.data.msg,
+ type: 'success',
+ });
+ emit('addList');
+ } else {
+ ElMessage.error(res.data.msg);
+ }
+ });
+ form.value = {
+ qName: '',
+ indexNum: '',
+ year: '',
+ value: '',
+ examineList: [],
+ };
+ tableData.value = [];
+ formUp.targetId = '';
+ formUp.delTargetDivideDetails = '';
+ formUp.examineList = [];
+ };
+ const arr = ref([]);
+ // 删除
+ const Delete = (data: any) => {
+ formUp.examineList.splice(form.value.examineList.indexOf(data), 1);
+ arr.value.push(data.id);
};
const onNumber = (e: object) => {
form.value = e;
@@ -107,29 +165,30 @@
Shows.value.openDailog(targetType.value);
};
- // 新增弹窗
- const index=ref<any>()
- const Show = ref();
- const daiAdd = (title: string, data: any) => {
- // index.value = formUp.targetDivideDetailList.indexOf(data);
- Show.value.openDailog(title, data);
- };
- const formUp = reactive({
- targetId: '', //关联的目标指标/外键
- delTargetDivideDetails: '', //要删除的目标指标分解ID,多个用逗号隔开
- // targetDivideDetailList: [], //目标指标分解列表
- });
+ // 新增弹窗
+ const index=ref<any>()
+ const Show = ref();
+ const daiAdd = (title: string, data: any) => {
+ index.value = formUp.examineList.indexOf(data);
+ Show.value.openDailog(title, data);
+ };
+ const formUp = reactive({
+ targetId: '', //关联的目标指标/外键
+ delTargetDivideDetails: '', //要删除的目标指标分解ID,多个用逗号隔开
+ examineList: [], //目标指标分解列表
+ });
- const add = (val: any) => {
- const item = deepClone(val)
- if(index.value==-1){
- formUp.targetDivideDetailList.push(item);
- }else{
- formUp.targetDivideDetailList[index.value] = item;
- }
+ const add = (val: any) => {
+ const item = deepClone(val)
+ if(index.value==-1){
- // let obj=JSON.parse(JSON.stringify(form.value))
- };
+ formUp.examineList.push(item);
+ }else{
+ formUp.examineList[index.value] = item;
+ }
+ console.log(formUp)
+ // let obj=JSON.parse(JSON.stringify(form.value))
+ };
//全屏
const full = ref(false);
@@ -156,11 +215,14 @@
full,
toggleFullscreen,
FullScreen,
- daiAdd,
- index,
- Show,
- formUp,
- add,
+ daiAdd,
+ index,
+ Show,
+ formUp,
+ add,
+ closeDialog,
+ submitForm,
+ Delete
};
},
});
--
Gitblit v1.9.2