From 9673c181dd7b3882cbde386422ffb9a2b1949693 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期一, 25 三月 2024 10:02:42 +0800
Subject: [PATCH] Default Changelist
---
src/views/newSpecialWorkSystem/workTicket/zysq/components/height.vue | 62 ++++++++++++++++--------------
1 files changed, 33 insertions(+), 29 deletions(-)
diff --git a/src/views/newSpecialWorkSystem/workTicket/zysq/components/height.vue b/src/views/newSpecialWorkSystem/workTicket/zysq/components/height.vue
index e8815a0..4b51329 100644
--- a/src/views/newSpecialWorkSystem/workTicket/zysq/components/height.vue
+++ b/src/views/newSpecialWorkSystem/workTicket/zysq/components/height.vue
@@ -55,15 +55,15 @@
</el-col>
<el-col :span="12">
<el-form-item label="作业人" prop="operatorUids">
-<!-- <el-select v-model="form.operatorUids" filterable multiple clearable>-->
-<!-- <el-option-->
-<!-- v-for="item in spList.opList"-->
-<!-- :key="item.uid"-->
-<!-- :label="item.realName"-->
-<!-- :value="item.uid"-->
-<!-- />-->
-<!-- </el-select>-->
- <el-cascader style="width: 100%" v-model="form.operatorUids" :options="lists.spList.opList" :props="cas2Props" @change="singleSelect($event,'作业人')" filterable :show-all-levels="false"/>
+ <el-select v-model="form.operatorUids" filterable multiple clearable>
+ <el-option
+ v-for="item in lists.spList.opList"
+ :key="item.uid"
+ :label="item.realName"
+ :value="item.uid"
+ />
+ </el-select>
+<!-- <el-cascader style="width: 100%" v-model="form.operatorUids" :options="lists.spList.opList" :props="cas2Props" @change="singleSelect($event,'作业人')" filterable :show-all-levels="false"/>-->
</el-form-item>
</el-col>
</el-row>
@@ -90,15 +90,15 @@
<el-row>
<el-col :span="12">
<el-form-item label="监护人" prop="guardianUids">
-<!-- <el-select v-model="form.guardianUids" filterable multiple @change="getSafetyIds" clearable>-->
-<!-- <el-option-->
-<!-- v-for="item in lists.spList.jhList"-->
-<!-- :key="item.uid"-->
-<!-- :label="item.realName"-->
-<!-- :value="item.uid"-->
-<!-- />-->
-<!-- </el-select>-->
- <el-cascader style="width: 100%" v-model="form.guardianUids" :options="lists.spList.jhList" :props="cas3Props" filterable @change="singleSelect($event,'监护人')" :show-all-levels="false"/>
+ <el-select v-model="form.guardianUids" filterable multiple clearable>
+ <el-option
+ v-for="item in lists.spList.jhList"
+ :key="item.uid"
+ :label="item.realName"
+ :value="item.uid"
+ />
+ </el-select>
+<!-- <el-cascader style="width: 100%" v-model="form.guardianUids" :options="lists.spList.jhList" :props="cas3Props" filterable @change="singleSelect($event,'监护人')" :show-all-levels="false"/>-->
</el-form-item>
</el-col>
<el-col :span="12" class="valueSelect">
@@ -159,12 +159,14 @@
<el-row>
<el-col :span="12">
<el-form-item label="风险辨识" prop="riskIdentification">
- <el-input
- v-model="form.riskIdentification"
- :autosize="{ minRows: 1 }"
- type="textarea"
- placeholder="请输入风险辨识"
- />
+ <el-select v-model="form.riskIdentification" multiple clearable>
+ <el-option
+ v-for="item in lists.riskList"
+ :key="item.id"
+ :label="item.content"
+ :value="item.content"
+ />
+ </el-select>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -204,7 +206,7 @@
<el-table-column prop="content" label="审批签字项目" align="center"/>
<el-table-column prop="approvalType" label="是否必签" align="center">
<template #default="scope">
- <el-form-item label="" prop="acceptUid">
+ <el-form-item label="" prop="acceptUid" label-width="0">
<el-radio-group v-model="scope.row.approvalType">
<el-radio :label="0">所有必签</el-radio>
<el-radio :label="1">任一</el-radio>
@@ -273,7 +275,7 @@
</div>
</el-form>
<div class="applyBtn">
- <el-button type="primary" size="large" plain @click="submitForm(ruleFormRef)">提交申报</el-button>
+ <el-button type="primary" size="large" v-throttle plain @click="submitForm(ruleFormRef)">提交申报</el-button>
</div>
<work-select ref="workSelectRef" @refreshWorks="getSelected()"></work-select>
</div>
@@ -329,7 +331,7 @@
workDepId: null,
workContent: '',
workLocation: '',
- riskIdentification: '',
+ riskIdentification: [],
involveOtherWork: [],
safetyMeasureUids: [],
approvalDepBasicList: [],
@@ -648,10 +650,11 @@
// if(Array.isArray(state.form.involveOtherWork)){
// state.form.involveOtherWork = state.form.involveOtherWork.join(',')
// }
+ state.form.riskIdentification = state.form.riskIdentification.join(',')
const {depIdList,...data} = state.form
- data.operatorUids = transformArr(data.operatorUids)
+ data.operatorUids = transform2Arr(data.operatorUids)
data.headUids = transform2Arr(data.headUids)
- data.guardianUids = transformArr(data.guardianUids)
+ data.guardianUids = transform2Arr(data.guardianUids)
data.safetyMeasureUids = transform2Arr(data.safetyMeasureUids)
data.startOrEndUids = transform2Arr(data.startOrEndUids)
data.acceptUid = transform2Obj(data.acceptUid)
@@ -672,6 +675,7 @@
message: res.data.msg
});
// state.form.involveOtherWork = state.form.involveOtherWork.split(',')
+ state.form.riskIdentification = state.form.riskIdentification.split(',')
}
} else {
console.log('error submit!', fields)
--
Gitblit v1.9.2