From 3c5ca2f8ce690f2c8808548e5ce5f69da296de10 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期三, 17 八月 2022 09:12:33 +0800
Subject: [PATCH] lct
---
src/views/specialWorkSystem/workFlow/approveBasic/components/approveBasicDialog.vue | 73 ++++++++++++++++++++++--------------
1 files changed, 45 insertions(+), 28 deletions(-)
diff --git a/src/views/specialWorkSystem/workFlow/approveBasic/components/approveBasicDialog.vue b/src/views/specialWorkSystem/workFlow/approveBasic/components/approveBasicDialog.vue
index 9127f73..1f29501 100644
--- a/src/views/specialWorkSystem/workFlow/approveBasic/components/approveBasicDialog.vue
+++ b/src/views/specialWorkSystem/workFlow/approveBasic/components/approveBasicDialog.vue
@@ -17,9 +17,9 @@
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
<el-form-item label="最大值" prop="maxVal">
- <el-input v-model="approveBasicForm.maxVal" type="number" class="input-add" placeholder="请根据需求选择">
+ <el-input :disabled="!disabled" v-model="approveBasicForm.maxVal" type="number" class="input-add" placeholder="请根据需求选择">
<template #prepend>
- <el-select v-model="approveBasicForm.maxValMatchPattern" placeholder="请根据需求选择" style="width: 115px">
+ <el-select :disabled="!disabled" v-model="approveBasicForm.maxValMatchPattern" placeholder="请根据需求选择" style="width: 115px">
<el-option v-for="item in typeTwoList" :key="item.id" :value="item.id" :label="item.name"> </el-option>
</el-select>
</template>
@@ -28,9 +28,9 @@
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
<el-form-item label="最小值" prop="minVal">
- <el-input v-model="approveBasicForm.minVal" type="number" class="input-add" placeholder="请根据需求选择">
+ <el-input :disabled="!disabled" v-model="approveBasicForm.minVal" type="number" class="input-add" placeholder="请根据需求选择">
<template #prepend>
- <el-select v-model="approveBasicForm.minValMatchPattern" placeholder="请根据需求选择" style="width: 115px">
+ <el-select :disabled="!disabled" v-model="approveBasicForm.minValMatchPattern" placeholder="请根据需求选择" style="width: 115px">
<el-option v-for="item in typeList" :key="item.id" :value="item.id" :label="item.name"> </el-option>
</el-select>
</template>
@@ -39,27 +39,27 @@
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
<el-form-item label="描述" prop="info">
- <el-input class="input-add" :rows="3" v-model.trim="approveBasicForm.info" type="textarea" placeholder="请输入描述" ></el-input>
+ <el-input class="input-add" :rows="3" :disabled="!disabled" v-model.trim="approveBasicForm.info" type="textarea" placeholder="请输入描述"></el-input>
</el-form-item>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20" v-show="personTime">
- <el-form-item label="创建人" prop="location">
- <el-input class="input-add" :disabled="!disabled" v-model.trim="approveBasicForm.createByUserName"></el-input>
+ <el-form-item label="创建人" prop="createUname">
+ <el-input class="input-add" :disabled="!disabled" v-model.trim="approveBasicForm.createUname"></el-input>
</el-form-item>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20" v-show="personTime">
- <el-form-item label="创建时间" prop="location">
+ <el-form-item label="创建时间" prop="gmtCreate">
<el-input class="input-add" :disabled="!disabled" v-model.trim="approveBasicForm.gmtCreate"></el-input>
</el-form-item>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20" v-show="personTime">
- <el-form-item label="最后修改人" prop="location">
- <el-input class="input-add" :disabled="!disabled" v-model.trim="approveBasicForm.lastEditUserName"></el-input>
+ <el-form-item label="最后修改人" prop="modifiedUname">
+ <el-input class="input-add" :disabled="!disabled" v-model.trim="approveBasicForm.modifiedUname"></el-input>
</el-form-item>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20" v-show="personTime">
- <el-form-item label="最后修改时间" prop="location">
- <el-input class="input-add" :disabled="!disabled" v-model.trim="approveBasicForm.gmtModitify"></el-input>
+ <el-form-item label="最后修改时间" prop="gmtModified">
+ <el-input class="input-add" :disabled="!disabled" v-model.trim="approveBasicForm.gmtModified"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -80,13 +80,14 @@
disabled: Boolean;
personTime: Boolean;
approveBasicForm: {
- ruleStandType: null|number,
- minVal: null|number,
- minValMatchPattern: null,
- maxVal: null|number,
- maxValMatchPattern: null|number,
- title:null| string,
- info:null| string,
+ ruleStandId: null | number;
+ ruleStandType: null | number;
+ minVal: null | number;
+ minValMatchPattern: null;
+ maxVal: null | number;
+ maxValMatchPattern: null | number;
+ title: null | string;
+ info: null | string;
};
title: string;
departmentList: [];
@@ -96,9 +97,20 @@
approveBasicFormRules: {};
}
interface levelListState {
- id:number,
- name:string
+ id: number;
+ name: string;
}
+interface approveBasicForm {
+ ruleStandId: null | number;
+ ruleStandType: null | number;
+ minVal: null | number;
+ minValMatchPattern: null;
+ maxVal: null | number;
+ maxValMatchPattern: null | number;
+ title: null | string;
+ info: null | string;
+}
+
import { reactive, toRefs, ref } from 'vue';
import { approveBasicApi } from '/@/api/specialWorkSystem/approveBasic';
import { ElMessage } from 'element-plus';
@@ -119,26 +131,27 @@
{ id: 4, name: '硫化氢浓度' },
{ id: 5, name: '温度' },
{ id: 6, name: '压力' },
- { id: 7, name: '震动' },
+ { id: 7, name: '震动' }
],
- typeList:[
+ typeList: [
{ id: 1, name: '大于' },
{ id: 2, name: '等于' },
- { id: 4, name: '大于等于' },
+ { id: 4, name: '大于等于' }
],
- typeTwoList:[
+ typeTwoList: [
{ id: 3, name: '小于' },
{ id: 2, name: '等于' },
- { id: 5, name: '小于等于' },
+ { id: 5, name: '小于等于' }
],
approveBasicForm: {
+ ruleStandId: null,
ruleStandType: null,
minVal: null,
minValMatchPattern: null,
maxVal: null,
maxValMatchPattern: null,
title: null,
- info: null,
+ info: null
},
approveBasicFormRules: {
ruleStandType: [{ required: true, message: '请选择标准类型', trigger: 'change' }],
@@ -161,13 +174,14 @@
state.personTime = false;
state.title = '新增审批标准';
state.approveBasicForm = {
+ ruleStandId: null,
ruleStandType: null,
minVal: null,
minValMatchPattern: null,
maxVal: null,
maxValMatchPattern: null,
title: null,
- info: null,
+ info: null
};
} else if (type === '查看') {
state.disabled = false;
@@ -179,6 +193,9 @@
state.personTime = false;
state.title = '修改审批标准';
state.approveBasicForm = JSON.parse(JSON.stringify(value));
+ // for (let i in state.approveBasicForm) {
+ // state.approveBasicForm[i] = approveBasicForm[i];
+ // }
}
};
--
Gitblit v1.9.2