From 20b0ce2db27b64a60de60aee05dedd448099e330 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期一, 08 七月 2024 10:12:16 +0800
Subject: [PATCH] xiugai

---
 src/views/newSpecialWorkSystem/workTicket/zysq/components/power.vue |  109 +++++++++++++++++++++++++++++++-----------------------
 1 files changed, 63 insertions(+), 46 deletions(-)

diff --git a/src/views/newSpecialWorkSystem/workTicket/zysq/components/power.vue b/src/views/newSpecialWorkSystem/workTicket/zysq/components/power.vue
index ddadf29..e5d46c7 100644
--- a/src/views/newSpecialWorkSystem/workTicket/zysq/components/power.vue
+++ b/src/views/newSpecialWorkSystem/workTicket/zysq/components/power.vue
@@ -65,7 +65,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="用电人" prop="workDetail.electricityUids">
-            <el-select v-model="form.workDetail.electricityUids" multiple clearable>
+            <el-select v-model="form.workDetail.electricityUids" filterable multiple clearable>
               <el-option
                   v-for="item in lists.workerList"
                   :key="item.uid"
@@ -76,27 +76,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-        <el-row>
-          <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 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>
-			<el-row>
-        <el-col :span="12">
-          <el-form-item label="作业单位" prop="workDepId">
-            <el-cascader style="width: 100%" v-model="form.workDepId" :props="depProps" :options="lists.departList" :show-all-levels="false"/>
-          </el-form-item>
-        </el-col>
+      <el-row>
         <el-col :span="12">
           <el-form-item label="作业负责人" prop="headUids">
             <el-select v-model="form.headUids" multiple filterable @change="getStartEndIds" clearable>
@@ -107,7 +87,27 @@
                   :value="item.uid"
               />
             </el-select>
-<!--            <el-cascader style="width: 100%" v-model="form.headUids" :options="lists.workerList" :props="casProps" @change="getStartEndIds" filterable :show-all-levels="false"/>-->
+            <!--            <el-cascader style="width: 100%" v-model="form.headUids" :options="lists.workerList" :props="casProps" @change="getStartEndIds" filterable :show-all-levels="false"/>-->
+          </el-form-item>
+        </el-col>
+      </el-row>
+			<el-row>
+        <el-col :span="12">
+          <el-form-item label="作业单位" prop="workDepIds">
+            <el-cascader style="width: 100%" v-model="form.workDepIds" :props="depProps" @change="getWorkerList" :options="lists.departList" :show-all-levels="false"/>
+          </el-form-item>
+        </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 zyList"
+                  :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>
@@ -145,20 +145,20 @@
       <el-row>
         <el-col :span="12">
           <el-form-item label="监护人" prop="guardianUids">
-<!--            <el-select v-model="form.guardianUids" multiple filterable @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" multiple filterable 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">
           <el-form-item label="绑定执法仪" prop="cameraIds">
-            <el-select v-model="form.cameraIds" multiple clearable>
+            <el-select v-model="form.cameraIds" multiple filterable clearable>
               <el-option
                   v-for="item in lists.deviceList"
                   :key="item.id"
@@ -209,12 +209,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">
@@ -284,7 +286,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>
@@ -353,7 +355,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" plain v-throttle @click="submitForm(ruleFormRef)">提交申报</el-button>
 		</div>
     <work-select ref="workSelectRef" @refreshWorks="getSelected()"></work-select>
 	</div>
@@ -374,6 +376,7 @@
 	interface stateType {
 		form: Object,
 		equipmentDialog: boolean,
+    zyList: []
     props1:{},
     depProps:{},
     casProps:{}
@@ -394,6 +397,7 @@
         tabLoading: false,
 				equipmentDialog: false,
         safetyMeasureBasicList: [],
+        zyList: [],
 				form: {
           workType: 7,
           workLevel: 0,
@@ -406,10 +410,10 @@
           headUids: [],
           analystUids: [],
           guardianUids: [],
-          workDepId: null,
+          workDepIds: [],
           workContent: '',
           workLocation: '',
-          riskIdentification: '',
+          riskIdentification: [],
           involveOtherWork: [],
           safetyMeasureUids: [],
           approvalDepBasicList: [],
@@ -433,6 +437,7 @@
           expandTrigger: 'hover',
           label: 'depName',
           value: 'depId',
+          multiple: true,
           checkStrictly: true,
           emitPath: false
         },
@@ -564,7 +569,7 @@
         workContent: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
 				workLocation: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
         operatorUids: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
-        workDepId: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
+        workDepIds: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
         headUids: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
         analystUids: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
         guardianUids: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
@@ -584,10 +589,19 @@
       const workSelectRef = ref()
 			// 页面载入时执行方法
 			onMounted(() => {
+        state.zyList = props.lists.spList.opList
         getBasicData()
       });
       const openWorkSelect = ()=>{
         workSelectRef.value.openDialog(state.form.involveOtherWork)
+      }
+      const getWorkerList = (val)=>{
+        const filteredList = props.lists.spList.opList.filter(i => state.form.workDepIds.includes(i.depId));
+        if(filteredList && filteredList.length>0){
+          state.zyList = filteredList
+        }else{
+          state.zyList = props.lists.spList.opList
+        }
       }
       const getSelected = ()=>{
         state.form.involveOtherWork = workSelectRef.value.selected
@@ -718,11 +732,12 @@
             //   state.form.involveOtherWork = state.form.involveOtherWork.join(',')
             // }
             state.form.workDetail.electricityUids = state.form.workDetail.electricityUids.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.analystUids = transformArr(data.analystUids)
-            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)
@@ -744,6 +759,7 @@
               });
               // state.form.involveOtherWork = state.form.involveOtherWork.split(',')
               state.form.workDetail.electricityUids = state.form.workDetail.electricityUids.split(',')
+              state.form.riskIdentification = state.form.riskIdentification.split(',')
             }
           } else {
             console.log('error submit!', fields)
@@ -794,6 +810,7 @@
 			return {
 				renderMenu,
         getBasicData,
+        getWorkerList,
         getStartEndIds,
         getSafetyIds,
         isFirstRow,

--
Gitblit v1.9.2