From 024732276c1cf484febea2fadacb2eed6be14742 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: 星期五, 06 十二月 2024 08:59:42 +0800
Subject: [PATCH] 修改审批单
---
src/views/safetyReview/projectManage/components/basicInfo.vue | 6 +++---
src/views/safetyReview/projectManage/components/chooseExpert.vue | 4 ++++
public/example.docx | 0
src/views/safetyReview/projectManage/components/projectApproval.vue | 3 ++-
4 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/public/example.docx b/public/example.docx
index 2a656ef..6489450 100644
--- a/public/example.docx
+++ b/public/example.docx
Binary files differ
diff --git a/src/views/safetyReview/projectManage/components/basicInfo.vue b/src/views/safetyReview/projectManage/components/basicInfo.vue
index a6818c1..d986e98 100644
--- a/src/views/safetyReview/projectManage/components/basicInfo.vue
+++ b/src/views/safetyReview/projectManage/components/basicInfo.vue
@@ -10,13 +10,13 @@
<el-form ref="formRef" :model="state.formData" :rules="state.rules" class="register-form" label-position="top">
<el-row :gutter="24">
<el-col :span="12">
- <el-form-item prop="projectName" label="项目名称（事由）">
+ <el-form-item prop="projectName" label="出差事由">
<el-input
maxlength="100"
show-word-limit
v-model.trim="state.formData.projectName"
size="large"
- placeholder="请输入项目名称（事由）"
+ placeholder="请输入出差事由"
>
</el-input>
</el-form-item>
@@ -143,7 +143,7 @@
}
],
rules: {
- projectName: [{ required: true, message: "项目名称（事由）不能为空", trigger: "blur" }],
+ projectName: [{ required: true, message: "出差事由不能为空", trigger: "blur" }],
projectDateStart: [{ required: true, message: "项目预计时间不能为空", trigger: "change" }],
projectAddress: [{ required: true, message: "目的地及相关企业名称等不能为空", trigger: "blur" }],
// deptUserName: [{ required: true, message: "处室人人员及职务不能为空", trigger: "blur" }],
diff --git a/src/views/safetyReview/projectManage/components/chooseExpert.vue b/src/views/safetyReview/projectManage/components/chooseExpert.vue
index 17d3b67..84ef22d 100644
--- a/src/views/safetyReview/projectManage/components/chooseExpert.vue
+++ b/src/views/safetyReview/projectManage/components/chooseExpert.vue
@@ -301,6 +301,10 @@
state.formData.delData.push(item.id)
}
})
+ if(queryParams.value.domain == undefined || (queryParams.value.domain && queryParams.value.domain.length == 0)){
+ ElMessage.warning('专业领域不能为空')
+ return
+ }
if(queryParams.value.num =='' || queryParams.value.num == undefined){
ElMessage.warning('拟选用人数不能为空')
return
diff --git a/src/views/safetyReview/projectManage/components/projectApproval.vue b/src/views/safetyReview/projectManage/components/projectApproval.vue
index 4614ed8..026dadf 100644
--- a/src/views/safetyReview/projectManage/components/projectApproval.vue
+++ b/src/views/safetyReview/projectManage/components/projectApproval.vue
@@ -3,7 +3,7 @@
<el-form :model="state.dataForm" ref="dataForm" :inline="true" style="margin-top: 10px" label-width="180px" >
<el-row :gutter="24">
<el-col :span="12">
- <el-form-item label="项目名称（事由）:">
+ <el-form-item label="出差事由:">
<span>{{state.dataForm.projectName}}</span>
</el-form-item>
</el-col>
@@ -411,6 +411,7 @@
}
})
data.expertNum = data.tableData.length
+ data.isInside = '是'
console.log('dataList',state.dataList,data.expertNum)
try {
generateWordDocument(templatePath, data, '专家选用审批单.docx');
--
Gitblit v1.9.2