From 6ca4914a18d1b1561e537674292cf9374791de7c Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期二, 20 十二月 2022 17:23:40 +0800
Subject: [PATCH] Default Changelist
---
src/views/specialWorkSystem/workTicket/zysq/components/height.vue | 38 +++++++++++++++++---------------------
1 files changed, 17 insertions(+), 21 deletions(-)
diff --git a/src/views/specialWorkSystem/workTicket/zysq/components/height.vue b/src/views/specialWorkSystem/workTicket/zysq/components/height.vue
index eed8f97..0fcee6b 100644
--- a/src/views/specialWorkSystem/workTicket/zysq/components/height.vue
+++ b/src/views/specialWorkSystem/workTicket/zysq/components/height.vue
@@ -131,7 +131,7 @@
</template>
<script lang="ts">
- import { toRefs, reactive, defineComponent, ref, defineAsyncComponent } from 'vue';
+import {toRefs, reactive, defineComponent, ref, defineAsyncComponent} from 'vue';
import { storeToRefs } from 'pinia';
import { initBackEndControlRoutes } from '/@/router/backEnd';
import {useUserInfo} from "/@/stores/userInfo";
@@ -157,7 +157,7 @@
materialDialog: defineAsyncComponent(() => import('/@/views/specialWorkSystem/workTicket/zysq/components/materialDialog.vue')),
},
props:['workerList','departList'],
- setup() {
+ setup(props: any, context: any) {
const userInfo = useUserInfo()
const { userInfos } = storeToRefs(userInfo);
const state = reactive<stateType>({
@@ -169,13 +169,13 @@
workContent: '',
workLocation: '',
hazardIdentification: '',
- maId: null,
+ maBaseId: null,
workDetail:{
operationDepId: '',
operationHeight: null,
otherSpecialWork: []
},
- wmAddReqDTOList: [],
+ receiveUids: [],
workTimeLine: [],
expStartTime: '',
expEndTime: ''
@@ -297,28 +297,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) => {
@@ -342,8 +338,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