From 22bf644b3fc85763be3ad0c5e348d2bee38e2444 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期三, 22 三月 2023 17:07:48 +0800
Subject: [PATCH] Default Changelist
---
src/views/specialWorkSystem/workTicket/zysq/components/fire.vue | 54 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 33 insertions(+), 21 deletions(-)
diff --git a/src/views/specialWorkSystem/workTicket/zysq/components/fire.vue b/src/views/specialWorkSystem/workTicket/zysq/components/fire.vue
index b31069e..6b61d64 100644
--- a/src/views/specialWorkSystem/workTicket/zysq/components/fire.vue
+++ b/src/views/specialWorkSystem/workTicket/zysq/components/fire.vue
@@ -74,6 +74,20 @@
</el-form-item>
</el-col>
</el-row>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="关联视频设备" prop="cameraIds">
+ <el-select v-model="form.cameraIds" multiple>
+ <el-option
+ v-for="item in deviceList"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id"
+ />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
<el-divider border-style="dashed"/>
<el-row>
<el-col :span="12">
@@ -137,8 +151,8 @@
components: {
materialDialog: defineAsyncComponent(() => import('/@/views/specialWorkSystem/workTicket/zysq/components/materialDialog.vue')),
},
- props:['workerList'],
- setup() {
+ props:['workerList','deviceList'],
+ setup(props: any, context: any) {
const userInfo = useUserInfo()
const { userInfos } = storeToRefs(userInfo);
const state = reactive<stateType>({
@@ -149,13 +163,14 @@
workLevel: null,
workContent: '',
workLocation: '',
- maId: null,
+ maBaseId: null,
hazardIdentification: '',
+ cameraIds: [],
workDetail:{
hotMethod: '',
otherSpecialWork: []
},
- wmAddReqDTOList: [],
+ receiveUids: [],
workTimeLine: [],
expStartTime: '',
expEndTime: ''
@@ -218,6 +233,7 @@
workContent: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
workLocation: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
hazardIdentification: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
+ cameraIds: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
workTimeLine: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
"workDetail.hotMethod": [{ required: true, message: '该内容不能为空', trigger: 'blur' }]
});
@@ -232,28 +248,24 @@
// }
// }
const openMaList = ()=>{
- if(state.form.workLevel == null){
+ if(state.form.workLevel == null || state.form.operatorUids == []){
ElMessage({
type: 'warning',
- message: '请先选择作业等级再获取相应物资配置'
+ message: '请先选择作业人和作业等级再获取相应物资配置'
});
}else{
- material.value.equipmentDialog = true
+ if(material.value.receiveUids.length==0){
+ material.value.receiveUids = state.form.operatorUids
+ }
material.value.getMaList(state.form.workType,state.form.workLevel)
+ material.value.workerList = props.workerList
}
}
- const conFirmMaterials = (addList: Array<any>,chosenId: number) =>{
- state.form.maId = null
- state.form.wmAddReqDTOList = []
- if(addList.length > 0){
- for(let i in addList){
- if(addList[i].depId != null && addList[i].useCount != null){
- state.form.wmAddReqDTOList.push(addList[i])
- }
- }
- }
- // state.form.wmAddReqDTOList = addList
- state.form.maId = chosenId
+ const conFirmMaterials = (receiveUids: Array<number>,chosenId: number) =>{
+ state.form.maBaseId = null
+ state.form.receiveUids = []
+ state.form.receiveUids = receiveUids
+ state.form.maBaseId = chosenId
}
const submitForm = async (formEl: FormInstance | undefined) => {
if (!formEl) return
@@ -283,8 +295,8 @@
message: res.data.msg
});
}
- state.form.maId = null
- state.form.wmAddReqDTOList = []
+ material.value.maBaseId = null
+ material.value.receiveUids = []
} else {
console.log('error submit!', fields)
}
--
Gitblit v1.9.2