From 5612bbd431d10589a06c7ed3584de2cad1b5ea0a Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: Thu, 18 Jun 2026 16:24:31 +0800
Subject: [PATCH] 中科大支线—订单入库
---
src/views/hazardousChemicals/subscribeApplyManage/subscribe/components/editDialog.vue | 150 +++++++++++++++++++++++++++++++++-----------------
1 files changed, 99 insertions(+), 51 deletions(-)
diff --git a/src/views/hazardousChemicals/subscribeApplyManage/subscribe/components/editDialog.vue b/src/views/hazardousChemicals/subscribeApplyManage/subscribe/components/editDialog.vue
index 0ec353e..0c55b9f 100644
--- a/src/views/hazardousChemicals/subscribeApplyManage/subscribe/components/editDialog.vue
+++ b/src/views/hazardousChemicals/subscribeApplyManage/subscribe/components/editDialog.vue
@@ -3,7 +3,7 @@
<el-dialog
v-model="dialogVisible"
:title="title"
- width="800px"
+ width="850px"
:before-close="handleClose"
:close-on-press-escape="false"
:close-on-click-modal="false"
@@ -11,19 +11,38 @@
<el-form :model="state.form" size="default" ref="busRef" :rules="state.formRules" label-width="150px" >
<el-form-item required label= "危化品列表" >
<div style="display: flex;width: 100%;margin-top: 5px">
- <el-table :data="state.form.hazardousTargets" :border="true">
+ <el-table :data="state.form.subscribeHazmats" :border="true">
<el-table-column type="index" label="序号" width="80" align="center"></el-table-column>
- <el-table-column label="危化品名称" align="center" >
+ <el-table-column label="危化品名称" align="center" width="200" >
<template #default="{row,$index}">
- <el-form-item :prop="'hazardousTargets.' + '[' + $index + ']' + '.name'" :rules="state.formRules.name">
- <el-input :disabled="title === '查看'" type="textarea" v-model="row.name" placeholder="请输入危化品名称"></el-input>
+ <el-form-item :prop="'subscribeHazmats.' + '[' + $index + ']' + '.hazmatName'" :rules="state.formRules.hazmatName">
+ <el-select
+ clearable
+ v-model="row.hazmatName"
+ filterable
+ remote
+ @change="selectValueHazmat(row.hazmatName,$index)"
+ reserve-keyword
+ placeholder="请输入危化品名称"
+ remote-show-suffix
+ :remote-method="getHazmaList"
+ style="width: 100%"
+ >
+ <el-option
+ v-for="item in state.hazmatList"
+ :key="item.id"
+ :label="item.name"
+ :value="item.name"
+ />
+ </el-select>
+<!-- <el-input type="textarea" :rows="1" v-model="row.hazmatName" placeholder="请输入危化品名称"></el-input>-->
</el-form-item>
</template>
</el-table-column>
<el-table-column label="数量" align="center" >
<template #default="{row,$index}">
- <el-form-item :prop="'hazardousTargets.' + '[' + $index + ']' + '.num'" :rules="state.formRules.num">
- <el-input :disabled="title === '查看'" v-model="row.num" @input="row.num = row.num.replace(/[^0-9]/g,'')" placeholder="请输入数量"></el-input>
+ <el-form-item :prop="'subscribeHazmats.' + '[' + $index + ']' + '.hazmatCount'" :rules="state.formRules.hazmatCount">
+ <el-input v-model="row.hazmatCount" @input="row.hazmatCount = row.hazmatCount.replace(/[^0-9]/g,'')" placeholder="请输入数量"></el-input>
</el-form-item>
</template>
</el-table-column>
@@ -41,10 +60,10 @@
>新增</el-button>
</div>
</el-form-item>
- <el-form-item label="审批人:" prop="userId" >
+ <el-form-item label="审批人:" prop="checkId" >
<el-select
clearable
- v-model="state.userName"
+ v-model="state.form.checkName"
filterable
remote
@change="selectValue"
@@ -62,19 +81,19 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="申购文件：">
- <el-upload accept=".doc,.docx,.xls,.xlsx" v-if="title!=='查看'" :action="state.uploadUrl" :headers="state.header" method="post" :on-success="(res, uploadFile)=>handleAvatarSuccess(res, uploadFile)" :on-exceed="showTip" :limit='state.fileLimit' v-model:file-list="state.fileList" :before-upload="picSize" :on-remove="(file)=>handleRemove(file)" >
+ <el-form-item label="申购文件：" prop="filePath">
+ <el-upload accept=".doc,.docx,.xls,.xlsx,.pdf" v-if="title!=='查看'" :action="state.uploadUrl" :headers="state.header" method="post" :on-success="(res, uploadFile)=>handleAvatarSuccess(res, uploadFile)" :on-exceed="showTip" :limit='state.fileLimit' v-model:file-list="state.fileList" :before-upload="picSize" :on-remove="(file)=>handleRemove(file)" >
<el-button type="primary">点击上传</el-button>
<template #tip>
- <div class="el-upload__tip">支持上传.doc、.docx、.xls、.xlsx格式文档，尺寸小于50M，最多可上传1张</div>
+ <div class="el-upload__tip">支持上传.doc、.docx、.pdf、.xls、.xlsx格式文档，尺寸小于50M，最多可上传1个</div>
</template>
</el-upload>
<div v-else>
<el-link v-if="state.form.fileName" style="" type="primary" @click="openFile(state.form.filePath)">{{state.form.fileName}}</el-link>
</div>
</el-form-item>
- <el-form-item label="审批意见：" v-if="title === '查看' && state.form.state == 2" style="width: 70%">
- <el-input v-model="state.form.regest" type="textarea" :rows="2"></el-input>
+ <el-form-item label="审批意见：" v-if="title === '查看' && state.form.status == 2" style="width: 70%">
+ <el-input v-model="state.form.opinion" type="textarea" :rows="5"></el-input>
</el-form-item>
</el-form>
<template #footer v-if="title !=='查看'">
@@ -94,6 +113,8 @@
import {getUser} from "@/api/hazardousChemicals/user";
import {getToken} from "@/utils/auth";
import {renderAsync} from "docx-preview";
+import {addSubscribe, editSubscribe} from "@/api/hazardousChemicals/subscribeApply";
+import {getBasicList} from "@/api/hazardousChemicals/basicInfo";
const dialogVisible = ref(false);
const title = ref("");
@@ -103,22 +124,21 @@
const state = reactive({
form: {
id: '',
- creditCode: '',
- name: '',
- major: '',
- phone: '',
- code: '',
- hazardousTargets:[],
+ checkId: null,
+ checkName:'',
+ filePath: '',
+ fileName: '',
+ subscribeHazmats:[],
},
formRules:{
- creditCode: [{ required: true, message: '请输入企业信用代码', trigger: 'blur' }],
- major:[{ required: true, message: '请输入负责人', trigger: 'blur' }],
- type: [{ required: true, message: '请选择企业类型', trigger: 'blur' }],
- name: [{ required: true, message: '', trigger: 'blur' }],
- num: [{ required: true, message: '', trigger: 'blur' }],
+ checkId: [{ required: true, message: '请选择审核人', trigger: 'blur' }],
+ filePath:[{ required: true, message: '请上传文件', trigger: 'blur' }],
+ hazmatName: [{ required: true, message: '', trigger: 'blur' }],
+ hazmatCount: [{ required: true, message: '', trigger: 'blur' }],
},
peopleList:[],
+ hazmatList:[],
fileList:[],
uploadUrl: import.meta.env.VITE_APP_BASE_API + '/system/common/uploadFile',
header: {
@@ -130,9 +150,17 @@
const openDialog = async (type, value) => {
await getPeopleList("")
+ await getHazmaList("")
title.value = type === 'add' ? '申购申请' : type ==='edit' ? '申购编辑' : '查看' ;
- if(type === 'edit') {
+ if(type === 'edit' || type === 'view') {
state.form = JSON.parse(JSON.stringify(value));
+ if(state.form.filePath) {
+ const obj = {
+ url: value.filePath,
+ name: value.fileName
+ }
+ state.fileList = [obj]
+ }
}
dialogVisible.value = true;
}
@@ -140,14 +168,13 @@
const onSubmit = async () => {
const valid = await busRef.value.validate();
if(valid){
- if(title.value === '新增'){
+ if(title.value === '申购申请'){
const {id, ...data} = JSON.parse(JSON.stringify(state.form))
- data.code = data.code.toUpperCase()
- const res = await addCompany(data)
+ const res = await addSubscribe(data)
if(res.code === 200){
ElMessage({
type: 'success',
- message: '新增成功'
+ message: '申请成功'
});
}else{
ElMessage.warning(res.message)
@@ -156,10 +183,9 @@
busRef.value.clearValidate();
reset();
dialogVisible.value = false;
- }else if(title.value === '编辑'){
+ }else if(title.value === '申购编辑'){
const {...data} = JSON.parse(JSON.stringify(state.form))
- data.code = data.code.toUpperCase()
- const res = await editCompany(data)
+ const res = await editSubscribe(data)
if(res.code === 200){
ElMessage({
type: 'success',
@@ -185,39 +211,32 @@
const reset = () => {
state.form = {
id: '',
- creditCode: '',
- name: '',
- major: '',
- phone: '',
- code: ''
+ checkId: null,
+ filePath: '',
+ fileName: '',
+ subscribeHazmats:[],
}
-}
-const requiredDurationEventMetering =(value) =>{
- let dat =
- ("" + value)
- .replace(/[^\d^\.]+/g, "")
- .replace(/^0+(\d)/, "$1")
- .replace(/^\./, "0.")
- .match(/^\d*(\.?\d{0,2})/g)[0] || "";
- return dat
+ state.fileList = []
}
const addObject = () => {
- state.form.hazardousTargets.push({name:'',num:null})
+ state.form.subscribeHazmats.push({hazmatName:'',hazmatCount:null})
}
const handleDelete = (val) => {
- state.form.hazardousTargets = state.form.hazardousTargets.filter(item=> item != val)
+ state.form.subscribeHazmats = state.form.subscribeHazmats.filter(item=> item != val)
}
const selectValue = (val) => {
if(!val){
- state.form.userId = null
+ state.form.checkId = null
}
state.peopleList.forEach(item => {
if(item.name === val){
- state.form.userId = item.id
+ state.form.checkId = item.id
+ state.form.checkName = item.name
}
})
}
+
const getPeopleList = async (val)=>{
let queryParams = {}
if(val != ""){
@@ -237,6 +256,35 @@
ElMessage.warning(res.message)
}
}
+const selectValueHazmat = (val,index) => {
+ if(!val){
+ state.form.subscribeHazmats.forEach((item, i) => i === index && (item.basicId = null));
+ }
+ const match = state.hazmatList.find(item => item.name === val);
+ if (match) {
+ state.form.subscribeHazmats[index].basicId = match.id;
+ state.form.subscribeHazmats[index].hazmatName = match.name;
+ }
+}
+const getHazmaList = async (val)=>{
+ let queryParams = {}
+ if(val != ""){
+ queryParams = {
+ name: val
+ }
+ }else {
+ queryParams = {
+ pageNum: 1,
+ pageSize: 10
+ }
+ }
+ const res = await getBasicList(queryParams)
+ if(res.code == 200){
+ state.hazmatList = res.data.list
+ }else{
+ ElMessage.warning(res.message)
+ }
+}
const handleAvatarSuccess = (res, uploadFile) => {
if(res.code == 200){
state.form.fileName = res.data.originName
--
Gitblit v1.9.2