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/DailogAdd.vue | 66 ++++++++++++++++++++-------------
1 files changed, 40 insertions(+), 26 deletions(-)
diff --git a/src/views/goalManagement/safetyAssessment/component/DailogAdd.vue b/src/views/goalManagement/safetyAssessment/component/DailogAdd.vue
index 0eddb52..355ce95 100644
--- a/src/views/goalManagement/safetyAssessment/component/DailogAdd.vue
+++ b/src/views/goalManagement/safetyAssessment/component/DailogAdd.vue
@@ -5,19 +5,20 @@
<el-row>
<el-col :span="11">
<el-form-item label="责任部门" prop="dutyDepartmentId" size="default">
- <el-tree-select v-model="form.dutyDepartmentId" check-strictly="true" :data="data" class="w100" :props="propse" placeholder="请选择" />
+ <el-tree-select v-model="form.dutyDepartmentId" check-strictly="true" @current-change="dutyName" :data="data" class="w100" :props="propse" placeholder="请选择" />
</el-form-item>
</el-col>
<el-col :span="11" :offset="2">
- <el-form-item label="考核指标" prop="value" size="default">
- <el-input v-model.number="form.value" />
+ <el-form-item label="考核指标" prop="examineValue" size="default">
+ <el-input v-model.number="form.examineValue" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="制定人部门" prop="makerDepartmentId" size="default">
- <el-tree-select v-model="form.makerDepartmentId" :data="data" check-strictly="true" class="w100" :props="propse" placeholder="请选择" />
+ <el-tree-select v-model="form.makerDepartmentId" :data="data" check-strictly="true"
+ @current-change="makerDepartmentName" class="w100" :props="propse" placeholder="请选择" />
</el-form-item>
</el-col>
<el-col :span="11" :offset="2">
@@ -28,29 +29,30 @@
</el-row>
<el-row>
<el-col :span="11">
- <el-form-item label="上报值" prop="commitPersonName" size="default">
- <el-input v-model="form.commitPersonName">
+ <el-form-item label="上报值" prop="uploadValue" size="default">
+ <el-input v-model="form.uploadValue">
<!-- <template #append> <el-button :icon="Search" @click="openUser" /> </template>-->
</el-input>
</el-form-item>
</el-col>
<el-col :span="11" :offset="2">
- <el-form-item label="上报时间" prop="makeDate" size="default">
- <el-date-picker v-model="form.makeDate" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="请选择" style="width: 100%" />
+ <el-form-item label="上报时间" prop="uploadDate" size="default">
+ <el-date-picker v-model="form.uploadDate" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="请选择" style="width: 100%" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
- <el-form-item label="考核结果" prop="commitPersonName" size="default">
- <el-input v-model="form.commitPersonName">
- <!-- <template #append> <el-button :icon="Search" @click="openUser" /> </template>-->
- </el-input>
+ <el-form-item label="考核结果" prop="examineResult" size="default">
+ <el-select v-model="form.examineResult" placeholder="请选择" style="width: 100%">
+ <el-option label="合格" :value="1" />
+ <el-option label="不合格" :value="2" />
+ </el-select>
</el-form-item>
</el-col>
<el-col :span="11" :offset="2">
- <el-form-item label="考核人" prop="commitPersonName" size="default">
- <el-input v-model="form.commitPersonName">
+ <el-form-item label="考核人" prop="examinePersonName" size="default">
+ <el-input v-model="form.examinePersonName">
<template #append> <el-button :icon="Search" @click="openUser" /> </template>
</el-input>
</el-form-item>
@@ -58,8 +60,8 @@
</el-row>
<el-row>
<el-col :span="11">
- <el-form-item label="考核时间" prop="commitPersonName" size="default">
- <el-date-picker v-model="form.makeDate" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="请选择" style="width: 100%" />
+ <el-form-item label="考核时间" prop="examineDate" size="default">
+ <el-date-picker v-model="form.examineDate" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="请选择" style="width: 100%" />
</el-form-item>
</el-col>
<el-col :span="11" :offset="2"></el-col>
@@ -67,7 +69,7 @@
</el-form>
<template #footer>
<span class="dialog-footer">
-
+
<el-button @click="resetForm(ruleFormRef)" size="default">关闭</el-button>
<el-button type="primary" @click="submitForm(ruleFormRef)" size="default">确定</el-button>
</span>
@@ -87,12 +89,15 @@
setup(props, { emit }) {
const ruleFormRef = ref<FormInstance>()
const form = ref({
- dutyDepartmentId: '', ////责任部门/外键
- makerDepartmentId: '', ////制定人部门/外键
- commitPersonId: '', ////上报人/外键
- commitPersonName: '',
- value: '', ////考核指标值
- makeDate: '', ////制定日期
+ "dutyDepartmentId": '', ////责任部门id/外键
+ "examineDate": '', ////考核时间
+ "examinePersonId": '', ////考核人ID/外键
+ "examineResult": '', ////考核结果 1:合格 2：不合格
+ "examineValue": '', ////考核指标
+ "makeDate": '', ////制定日期
+ "makerDepartmentId": '', ////制定部门/外键
+ "uploadDate": '', ////上报时间
+ "uploadValue": "", ////上报值
});
//部门
const department = () => {
@@ -158,7 +163,7 @@
trigger: 'blur',
},
],
- value: [
+ examineValue: [
{
required: true,
message: '考核指标值不能为空',
@@ -179,6 +184,13 @@
],
commitPersonName: [],
});
+ const dutyName=(data:any)=>{
+ form.value.dutyDepartmentName=data.depName
+ }
+ const makerDepartmentName=(data:any)=>{
+ form.value.makerDepartmentName=data.depName
+ }
+
const submitForm = async (formEl: FormInstance | undefined) => {
if (!formEl) return;
await formEl.validate((valid, fields) => {
@@ -214,8 +226,8 @@
const data = ref();
const onUser = (e: any) => {
console.log(e)
- form.value.commitPersonId = e.uid;
- form.value.commitPersonName = e.realName;
+ form.value.examinePersonId = e.uid;
+ form.value.examinePersonName = e.realName;
};
return {
disabled,
@@ -238,6 +250,8 @@
rules,
submitForm,
resetForm,
+ dutyName,
+ makerDepartmentName
};
},
});
--
Gitblit v1.9.2