From 0203ef4d930ba7a56996debad9d14c9528390fba Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期四, 25 八月 2022 10:17:36 +0800
Subject: [PATCH] 合并
---
src/views/goalManagement/targetSettings/component/dailogAdd.vue | 80 +++++++++++++++++++++++++++++++++-------
1 files changed, 66 insertions(+), 14 deletions(-)
diff --git a/src/views/goalManagement/targetSettings/component/dailogAdd.vue b/src/views/goalManagement/targetSettings/component/dailogAdd.vue
index 9b384ac..8ab66ca 100644
--- a/src/views/goalManagement/targetSettings/component/dailogAdd.vue
+++ b/src/views/goalManagement/targetSettings/component/dailogAdd.vue
@@ -4,13 +4,13 @@
<el-form :model="form" :disabled="disabled" ref="ruleFormRef" :rules="rules" label-width="120px">
<el-row>
<el-col :span="11">
- <el-form-item label="安全目标指标" prop="qName" size="default">
- <el-input v-model="form.qName" placeholder="请填写安全目标指标" />
+ <el-form-item label="安全目标项" prop="qName" size="default">
+ <el-input v-model="form.qName" placeholder="请填写安全目标项" />
</el-form-item>
</el-col>
<el-col :span="11" :offset="2">
- <el-form-item label="目标指标编号" prop="indexNum" size="default">
- <el-input v-model="form.indexNum" placeholder="请填写目标指标编号" />
+ <el-form-item label="目标编号" prop="indexNum" size="default">
+ <el-input v-model="form.indexNum" placeholder="请填写目标编号" />
</el-form-item>
</el-col>
</el-row>
@@ -22,7 +22,15 @@
</el-col>
<el-col :span="11" :offset="2">
<el-form-item label="指标值" prop="value" size="default">
- <el-input v-model.number="form.value" placeholder="请填写指标值" />
+ <el-input v-model.number="form.value" placeholder="请填写指标值">
+ <template #prepend>
+ <el-select v-model="form.valueSign " placeholder="请选择" style="width: 115px">
+ <el-option label="大于" :value="1" />
+ <el-option label="等于" :value="2" />
+ <el-option label="小于" :value="3" />
+ </el-select>
+ </template>
+ </el-input>
</el-form-item>
</el-col>
</el-row>
@@ -48,6 +56,22 @@
/>
</el-form-item>
</el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="11">
+ <el-form-item label="目标制定部门" size="default" prop="">
+ <el-tree-select
+ v-model="form.makerDepartmentId"
+ :data="data"
+ @current-change="makerName"
+ check-strictly="true"
+ class="w100"
+ :props="propse"
+ placeholder="请选择"
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="11" :offset="2"> </el-col>
</el-row>
<el-form-item label="备注信息" prop="memo">
<el-input v-model="form.memo" size="default" type="textarea" />
@@ -83,14 +107,17 @@
completeDate: '', ////完成期限
divideStatus: '2', ////分解状态 1:已分解 2:未分解
value: '', ////指标值
+ makerDepartmentId: '',
+ valueSign:""
});
const titles = ref();
const disabled = ref(false);
- const titleT=ref()
+ const titleT = ref();
// 打开弹窗
const openDialog = (title: string, value: any, id: number) => {
+ department();
Shows.value = true;
- titleT.value=title
+ titleT.value = title;
titles.value = `${title}目标设定`;
form.value.targetType = value;
disabled.value = title == '查看' ? true : false;
@@ -115,7 +142,7 @@
const h = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':';
const m = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes();
const s = date.getSeconds(); // 秒
- const dateString = Y + M + D + h + m +`:${s}`;
+ const dateString = Y + M + D + h + m + `:${s}`;
// console.log('dateString', dateString); // > dateString 2021-07-06 14:23
return dateString;
};
@@ -132,14 +159,14 @@
qName: [
{
required: true,
- message: '安全目标指标不能为空',
+ message: '安全目标项不能为空',
trigger: 'change',
},
],
indexNum: [
{
required: true,
- message: '目标指标编号不能为空',
+ message: '目标编号不能为空',
trigger: 'change',
},
],
@@ -157,7 +184,7 @@
trigger: 'change',
},
{
- type:"number",
+ type: 'number',
message: '指标值只能为数字类型',
trigger: 'change',
},
@@ -171,8 +198,8 @@
if (!formEl) return;
await formEl.validate((valid, fields) => {
if (valid) {
- if(titleT.value=='新建'){
- delete form.value.id
+ if (titleT.value == '新建') {
+ delete form.value.id;
}
Shows.value = false;
goalManagementApi()
@@ -204,7 +231,32 @@
const handleClose = (formEl: FormInstance | undefined) => {
formEl.resetFields();
};
+ //部门
+ 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();
+ const makerName = (data: any) => {
+ form.value.makerDepartmentName = data.depName;
+ };
return {
+ department,
+ propse,
+ data,
+ makerName,
timeC,
openDialog,
handleClose,
@@ -229,4 +281,4 @@
.el-row {
padding: 0 0 20px 0;
}
-</style>
+</style>
\ No newline at end of file
--
Gitblit v1.9.2