From 558831af0d86a9db70cbe4d1d8d14bbc4c3d12cf Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期一, 05 九月 2022 09:52:56 +0800
Subject: [PATCH] 合并
---
src/views/specialWorkSystem/workFlow/approveRule/components/approveItemDialog.vue | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/views/specialWorkSystem/workFlow/approveRule/components/approveItemDialog.vue b/src/views/specialWorkSystem/workFlow/approveRule/components/approveItemDialog.vue
index 6f92adb..918f6af 100644
--- a/src/views/specialWorkSystem/workFlow/approveRule/components/approveItemDialog.vue
+++ b/src/views/specialWorkSystem/workFlow/approveRule/components/approveItemDialog.vue
@@ -20,7 +20,7 @@
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
- <el-col v-if="approveItemForm.type === 2 || approveItemForm.type === 3" :span="24" style="margin-bottom: 24px">
+ <el-col v-if="(approveItemForm.type === 2 || approveItemForm.type === 3) && personType !== 3" :span="24" style="margin-bottom: 24px">
<el-form-item label="措施名称" prop="measureId">
<el-select v-model="approveItemForm.measureId" placeholder="请选择措施" class="input-add" clearable filterable>
<el-option v-for="item in actionList" :key="item.id" :value="item.id" :label="item.context"></el-option>
@@ -44,12 +44,8 @@
</template>
<script lang="ts">
-import { reactive, toRefs, ref, onMounted, nextTick } from 'vue';
+import { reactive, toRefs, ref, nextTick } from 'vue';
import { ElMessage } from 'element-plus/es';
-import { userApi } from '/@/api/systemManage/user';
-import { safetyActionApi } from '/@/api/specialWorkSystem/safetyAction';
-import approveRule from '/@/views/specialWorkSystem/workFlow/approveRule/index.vue';
-import { approveBasicApi } from '/@/api/specialWorkSystem/approveBasic/index';
interface dataState {
title: string;
activeName: string;
@@ -61,6 +57,7 @@
smTypeList: Array<type>;
standardList: [];
order: number | null;
+ personType: number | null;
}
interface step {
itemName: string | null;
@@ -102,7 +99,8 @@
{ id: 2, name: '措施' }
],
standardList: [],
- order: null
+ order: null,
+ personType: null,
});
const showApproveItemDialog = (type: string, value: {}, index: number, approveLevelForm: { type: number }, standardList: [], actionList: []) => {
@@ -111,12 +109,13 @@
data.actionList = actionList;
data.order = index;
if (approveLevelForm.type === 3) {
+ data.personType = 3
data.typeList = [
{ id: 1, name: '数值' },
- { id: 2, name: '选项' },
{ id: 3, name: '填空' }
];
} else {
+ data.personType = 2
data.typeList = [
{ id: 2, name: '选项' },
{ id: 3, name: '填空' }
--
Gitblit v1.9.2