From 4d8db47ca6e8ad9986fa80f7b5819646ea494d98 Mon Sep 17 00:00:00 2001
From: Admin <978517621@qq.com>
Date: 星期五, 30 九月 2022 09:58:21 +0800
Subject: [PATCH] Default Changelist
---
src/views/specialWorkSystem/workTicket/workApply/components/broken.vue | 265 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 238 insertions(+), 27 deletions(-)
diff --git a/src/views/specialWorkSystem/workTicket/workApply/components/broken.vue b/src/views/specialWorkSystem/workTicket/workApply/components/broken.vue
index 0187f0a..7c7e821 100644
--- a/src/views/specialWorkSystem/workTicket/workApply/components/broken.vue
+++ b/src/views/specialWorkSystem/workTicket/workApply/components/broken.vue
@@ -52,6 +52,16 @@
</el-form-item>
</el-col>
</el-row>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="危害辨识" prop="hazardIdentification">
+ <el-input
+ v-model="form.hazardIdentification"
+ placeholder="请输入危害辨识"
+ />
+ </el-form-item>
+ </el-col>
+ </el-row>
<el-divider border-style="dashed"/>
<el-row>
<el-col :span="12">
@@ -107,8 +117,43 @@
</el-form-item>
</el-col>
</el-row>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="选择关联物资">
+ <el-button type="primary" @click="getMaList">选择物资标准</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>
<div class="applyBtn">
<el-button type="primary" size="large" plain @click="submitForm(ruleFormRef)">发起申请</el-button>
</div>
@@ -132,6 +177,7 @@
import axios from 'axios';
interface stateType {
+ equipmentDialog: boolean,
form: Object,
csDepList: Array<any>,
fileList: Array<file>,
@@ -140,7 +186,9 @@
dialogImageUrl: string | null,
imgLimit: number,
casProps: {},
- casProps2: {}
+ casProps2: {},
+ isOverSize: boolean,
+ materialList: Array<any>
}
interface file {
url: string;
@@ -153,12 +201,14 @@
const userInfo = useUserInfo()
const { userInfos } = storeToRefs(userInfo);
const state = reactive<stateType>({
+ equipmentDialog: false,
form: {
operatorUids: [],
workType: 5,
workLevel: 0,
workContent: '',
workLocation: '',
+ hazardIdentification: '',
workDetail:{
operationDepId: null,
bcReason: '',
@@ -166,10 +216,13 @@
bcPath: [],
involvedDepIds: []
},
+ wmAddReqDTOList: [],
workTimeLine: [],
expStartTime: '',
expEndTime: ''
},
+ materialList: [],
+ isOverSize: false,
fileList: [],
imgLimit: 3,
uploadUrl: '',
@@ -222,6 +275,7 @@
workType: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
workContent: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
workLocation: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
+ hazardIdentification: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
workTimeLine: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
"workDetail.operationDepId": [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
"workDetail.bcReason": [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
@@ -229,10 +283,53 @@
"workDetail.bcPath": [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
"workDetail.involvedDepIds": [{ 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 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))
@@ -253,6 +350,7 @@
message: res.data.msg
});
}
+ state.materialList = []
} else {
console.log('error submit!', fields)
}
@@ -269,10 +367,20 @@
};
const getUploadUrl = async (rawFile: any) => {
- const res = await workApplyApi().getUploadUrl(rawFile.name);
- state.form.workDetail.bcPath.push(res.data.data.fileName)
- state.uploadUrl = res.data.data.uploadUrl;
- console.log(res.data.data.fileName,'name')
+ const fileSize = rawFile.size / 1024 < 500 ? '1' : '0'
+ if(fileSize === '0'){
+ ElMessage({
+ type: 'warning',
+ message: '文件大小不能超过500k。'
+ });
+ state.isOverSize = true
+ return false
+ }else{
+ const res = await workApplyApi().getUploadUrl(rawFile.name);
+ state.form.workDetail.bcPath.push(res.data.data.fileName)
+ state.uploadUrl = res.data.data.uploadUrl;
+ console.log(res.data.data.fileName,'name')
+ }
};
const upload = async (params: any) => {
@@ -296,39 +404,51 @@
const beforeRemove = (file: {}, fileList: []) => {
const result = new Promise((resolve, reject) => {
- ElMessageBox.confirm('此操作将删除该图片, 是否继续?', '提示', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
- type: 'warning'
- })
- .then(() => {
- // console.log(state.workDetail.bcPath,'path')
- const list = JSON.parse(JSON.stringify(state.form.workDetail.bcPath))
- fileList.map((item,index)=>{
- if(item.uid === file.uid){
- fileList.splice(index,1)
- state.form.workDetail.bcPath.splice(index,1)
- deletePic(list[index])
- }
+ if(!state.isOverSize){
+ ElMessageBox.confirm('此操作将删除该图片, 是否继续?', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ })
+ .then(() => {
+ // console.log(state.workDetail.bcPath,'path')
+ const list = JSON.parse(JSON.stringify(state.form.workDetail.bcPath))
+ fileList.map((item,index)=>{
+ if(item.uid === file.uid){
+ fileList.splice(index,1)
+ state.form.workDetail.bcPath.splice(index,1)
+ deletePic(false,list[index])
+ }
+ })
+ // 请求删除接口
})
- // 请求删除接口
- })
- .catch(() => {
- reject(false);
- });
+ .catch(() => {
+ reject(false);
+ });
+ }else{
+ const list = JSON.parse(JSON.stringify(state.form.workDetail.bcPath))
+ fileList.map((item,index)=>{
+ if(item.uid === file.uid){
+ fileList.splice(index,1)
+ state.form.workDetail.bcPath.splice(index,1)
+ deletePic(true,list[index])
+ }
+ })
+ state.isOverSize = false
+ }
});
return result;
};
// 删除图片接口
- const deletePic = async(fileName)=>{
+ const deletePic = async(isOverSize:boolean,fileName:string)=>{
console.log(fileName,'fileName')
const res = await workApplyApi().deleteFile({fileName: fileName})
if (res.data.code === '200') {
ElMessage({
- type: 'success',
- message: '删除成功！'
+ type: isOverSize ? 'error' : 'success',
+ message: isOverSize ? '上传失败':'删除成功！'
});
} else {
ElMessage({
@@ -345,6 +465,93 @@
});
}
+ // 确认物资标准
+ const getMaList = async() =>{
+ if(state.materialList.length == 0){
+ const data = {workType: 5,workLevel: null}
+ const res = await workApplyApi().getMaterial(data)
+ if (res.data.code === '200') {
+ 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: 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) => {
Session.set('projectId',value)
@@ -356,6 +563,10 @@
Search,
ruleFormRef,
applyRules,
+ toZero,
+ getMaList,
+ conFirmDevices,
+ closeMaterial,
handlePreview,
getUploadUrl,
beforeRemove,
--
Gitblit v1.9.2