From 50d33c74675a9d9eee957a685d9e55b77974f6f9 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期五, 06 一月 2023 16:44:06 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqt
---
src/views/specialWorkSystem/workTicket/zysq/components/space.vue | 218 ++++++++++--------------------------------------------
1 files changed, 42 insertions(+), 176 deletions(-)
diff --git a/src/views/specialWorkSystem/workTicket/zysq/components/space.vue b/src/views/specialWorkSystem/workTicket/zysq/components/space.vue
index 5bc5bba..a474192 100644
--- a/src/views/specialWorkSystem/workTicket/zysq/components/space.vue
+++ b/src/views/specialWorkSystem/workTicket/zysq/components/space.vue
@@ -110,40 +110,13 @@
<el-row>
<el-col :span="12">
<el-form-item label="选择关联物资">
- <el-button type="primary" @click="getMaList">选择物资标准</el-button>
+ <el-button type="primary" @click="openMaList">选择物资标准</el-button>
</el-form-item>
</el-col>
</el-row>
</div>
</el-form>
- <el-dialog v-model="equipmentDialog" title="关联物资标准" width="40%" center @close="closeMaterial">
- <el-tabs tab-position="left" class="demo-tabs" type="border-card">
- <el-tab-pane v-for="(item,index) in materialList" :label="item.materialTypeName" :key="index">
- <div style="margin-bottom: 20px">
- <el-form label-width="150px" label-position="top">
- <div v-if="item.mustList.length>0" style="width: 100%;border-bottom: 1px solid #ccc;padding-bottom: 6px;margin-bottom: 10px;font-weight: bolder">必选</div>
- <el-form-item v-if="item.mustList.length>0" class="tab-i" v-for="(i,x) in item.mustList" :key="x" :label="item.mustList[x].materialName + '：'" prop="defaultVal" :rules="[{ type: 'defaultVal', required: true, message: '该内容不能为空', trigger: 'blur'}]">
- <el-input size="default" type="number" v-model="item.mustList[x].value" @change="(val)=>toZero(val,index,'mustList',x)" placeholder="请输入配置数量，空值默认为0">
- <template #append>{{'库存：' + item.mustList[x].stock}}</template>
- </el-input>
- </el-form-item>
- <div v-if="item.unList.length>0" style="width: 100%;border-bottom: 1px solid #ccc;padding-bottom: 6px;margin-bottom: 10px;font-weight: bolder">其他</div>
- <el-form-item v-if="item.unList.length>0" class="tab-i" v-for="(i,x) in item.unList" :key="x" :label="item.unList[x].materialName + '：'">
- <el-input size="default" type="number" v-model="item.unList[x].value" @change="(val)=>toZero(val,index,'unList',x)" placeholder="请输入配置数量，空值默认为0">
- <template #append>{{'库存：' + item.unList[x].stock}}</template>
- </el-input>
- </el-form-item>
- </el-form>
- </div>
- </el-tab-pane>
- </el-tabs>
- <template #footer>
- <span class="dialog-footer">
- <el-button @click="equipmentDialog = false" size="default">取消</el-button>
- <el-button type="primary" @click="conFirmDevices" size="default">确认</el-button>
- </span>
- </template>
- </el-dialog>
+ <material-dialog ref="material" @conFirmMaterials="conFirmMaterials"></material-dialog>
<div class="applyBtn">
<el-button type="primary" size="large" plain @click="submitForm(ruleFormRef)">发起申请</el-button>
</div>
@@ -152,7 +125,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";
@@ -162,31 +135,31 @@
import type { FormInstance, FormRules } from 'element-plus'
import { workApplyApi } from '/@/api/specialWorkSystem/workApply';
-
interface stateType {
form: Object,
csDepList: Array<any>,
otherWorkList: Array<any>,
casProps: {},
- equipmentDialog: boolean,
- materialList: Array<any>
+ equipmentDialog: boolean
}
export default defineComponent({
name: 'spaceForm',
- components: {},
+ components: {
+ 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>({
equipmentDialog: false,
- materialList: [],
form: {
operatorUids: [],
workType: 2,
workLevel: 0,
workContent: '',
workLocation: '',
+ maBaseId: null,
hazardIdentification: '',
workDetail:{
csDepId: null,
@@ -194,7 +167,7 @@
csOriginalName: '',
otherSpecialWork: []
},
- wmAddReqDTOList: [],
+ receiveUids: [],
workTimeLine: [],
expStartTime: '',
expEndTime: ''
@@ -268,6 +241,7 @@
}
]
});
+ const material = ref()
const ruleFormRef = ref<FormInstance>()
const applyRules = reactive<FormRules>({
operatorUids: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
@@ -281,52 +255,37 @@
"workDetail.csOriginalName": [{ required: true, message: '该内容不能为空', trigger: 'blur' }]
});
- const toZero = (value: string | number,index: number,name: string,x:number) =>{
- if(!value){
- state.materialList[index][name][x].value = 0
- }
- }
+ // const toZero = (value: string | number,index: number,name: string,x:number) =>{
+ // if(!value){
+ // state.materialList[index][name][x].value = 0
+ // }
+ // }
+
+ const openMaList = ()=>{
+ if(state.form.operatorUids == []){
+ ElMessage({
+ type: 'warning',
+ message: '请先选择作业人再获取相应物资配置'
+ });
+ }else{
+ 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 = (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
await formEl.validate(async (valid, fields) => {
if (valid) {
- for(let i in state.materialList){
- for(let j in state.materialList[i].mustList){
- if(state.materialList[i].mustList[j].value>state.materialList[i].mustList[j].stock){
- ElMessage({
- type: 'warning',
- message: '部分物资库存不足，请重新配置数量。'
- });
- return
- }
- }
- for(let j in state.materialList[i].unList){
- if(state.materialList[i].unList[j].value>state.materialList[i].unList[j].stock){
- ElMessage({
- type: 'warning',
- message: '部分物资库存不足，请重新配置数量。'
- });
- return
- }
- }
- state.materialList[i].mustList = state.materialList[i].mustList.map((item:any)=>{
- const obj = {
- defaultVal: item.value,
- id: item.id
- }
- return {...obj}
- })
- state.materialList[i].unList = state.materialList[i].unList.map((item:any)=>{
- const obj = {
- defaultVal: item.value,
- id: item.id
- }
- return {...obj}
- })
- state.materialList[i].postList = [...state.materialList[i].mustList,...state.materialList[i].unList]
- state.form.wmAddReqDTOList = [...state.form.wmAddReqDTOList,...state.materialList[i].postList]
- }
state.form.expStartTime = JSON.parse(JSON.stringify(state.form.workTimeLine))[0]
state.form.expEndTime = JSON.parse(JSON.stringify(state.form.workTimeLine))[1]
let { workTimeLine, ...data } = JSON.parse(JSON.stringify(state.form))
@@ -345,106 +304,14 @@
message: res.data.msg
});
}
- state.materialList = []
+ material.value.maBaseId = null
+ material.value.receiveUids = []
} else {
console.log('error submit!', fields)
}
})
}
- // 确认物资标准
- const getMaList = async() =>{
- if(state.materialList.length == 0){
- const data = {workType: 2,workLevel: null}
- const res = await workApplyApi().getMaterial(data)
- if (res.data.code === '200') {
- if(res.data.data.materialTypeList && res.data.data.materialTypeList!=null&&res.data.data.materialTypeList.length>0){
- state.materialList = JSON.parse(JSON.stringify(res.data.data.materialTypeList))
- for(let i in state.materialList){
- state.materialList[i].mustList = []
- state.materialList[i].unList = []
- state.materialList[i].mdList = state.materialList[i].mdList?.map((item:any) => {
- if(item.configurationLevel == 0){
- state.materialList[i].mustList.push(item)
- return
- }else{
- state.materialList[i].unList.push(item)
- return
- }
- })
- state.materialList[i].mustList = state.materialList[i].mustList.map((item:any)=>{
- const obj = {
- value: item.defaultVal,
- materialName: item.materialName,
- configurationLevel: item.configurationLevel,
- id: item.id,
- stock: item.stock
- }
- return {...obj}
- })
- state.materialList[i].unList = state.materialList[i].unList.map((item:any)=>{
- const obj = {
- value: item.defaultVal,
- materialName: item.materialName,
- configurationLevel: item.configurationLevel,
- id: item.id,
- stock: item.stock
- }
- return {...obj}
- })
- }
- state.equipmentDialog = true
- }else{
- ElMessage({
- type: 'warning',
- message: '暂时查询不到物资标准信息'
- });
- }
- } else {
- ElMessage({
- type: 'warning',
- message: res.data.msg
- });
- }
- }else{
- state.materialList = state.materialList
- state.equipmentDialog = true
- }
- }
- const conFirmDevices = ()=>{
- for(let i in state.materialList){
- for(let j in state.materialList[i].mustList){
- if(state.materialList[i].mustList[j].value>state.materialList[i].mustList[j].stock){
- ElMessage({
- type: 'warning',
- message: '部分物资库存不足，请重新配置数量。'
- });
- return
- }
- }
- for(let j in state.materialList[i].unList){
- if(state.materialList[i].unList[j].value>state.materialList[i].unList[j].stock){
- ElMessage({
- type: 'warning',
- message: '部分物资库存不足，请重新配置数量。'
- });
- return
- }
- }
-
- }
- ElMessageBox.confirm('是否确认物资及数量配置？')
- .then(() => {
- state.equipmentDialog = false
- })
- .catch(() => {
- // catch error
- })
- }
-
- const closeMaterial = ()=>{
-
- }
// 折线图
const renderMenu = async (value: string) => {
@@ -457,10 +324,9 @@
Search,
ruleFormRef,
applyRules,
- toZero,
- getMaList,
- conFirmDevices,
- closeMaterial,
+ material,
+ openMaList,
+ conFirmMaterials,
submitForm,
...toRefs(state),
};
--
Gitblit v1.9.2