From 0b25ddd8815f90a3f16c7900c624823298c7c0b0 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: Fri, 08 Sep 2023 15:44:17 +0800
Subject: [PATCH] 修改
---
.env.development | 4 ++--
src/views/main/index.vue | 12 ++++++++----
src/views/form.vue | 32 +++++++++++++++++++++++++++-----
src/views/components/formDialog.vue | 5 +----
4 files changed, 38 insertions(+), 15 deletions(-)
diff --git a/.env.development b/.env.development
index 2f8a728..858e956 100644
--- a/.env.development
+++ b/.env.development
@@ -5,8 +5,8 @@
ENV = 'development'
# 规财安评管理系统/开发环境
-VUE_APP_BASE_API = 'http://192.168.0.70:8080'
-#VUE_APP_BASE_API = 'http://106.15.95.149:7006'
+#VUE_APP_BASE_API = 'http://192.168.0.70:8080'
+VUE_APP_BASE_API = 'http://106.15.95.149:7006'
# 路由懒加载F
VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/src/views/components/formDialog.vue b/src/views/components/formDialog.vue
index 89a2a73..0c64ef5 100644
--- a/src/views/components/formDialog.vue
+++ b/src/views/components/formDialog.vue
@@ -462,10 +462,7 @@
idCard: [{ required: true, message: '请填写身份证号', trigger: 'blur' }],
dutyStatus: [{ required: true, message: '请选择在岗情况', trigger: 'blur' }],
companyName: [{ required: true, message: '请填写单位全称', trigger: 'blur' }],
- degree: [{ required: true, message: '请填写最高学历', trigger: 'blur' }],
- supportDirectionSafety: [{ required: true, message: '请选择支撑方向', trigger: 'blur' }],
- supportDirectionPrevention: [{ required: true, message: '请选择支撑方向', trigger: 'blur' }],
- supportDirectionEmergency: [{ required: true, message: '请选择支撑方向', trigger: 'blur' }]
+ degree: [{ required: true, message: '请填写最高学历', trigger: 'blur' }]
},
electronicPhoto: [],
resumePhoto: [],
diff --git a/src/views/form.vue b/src/views/form.vue
index 44ec689..da77340 100644
--- a/src/views/form.vue
+++ b/src/views/form.vue
@@ -235,6 +235,9 @@
<el-form-item label="工作简历">
<el-upload
action="#"
+ multiple
+ :limit="20"
+ :on-exceed="overLimit"
:auto-upload="false"
accept="image/*,.pdf"
:file-list="resumeList"
@@ -253,6 +256,9 @@
<el-form-item label="发明、著作、学术论文情况（何时、何地出版或发表）">
<el-upload
action=""
+ multiple
+ :limit="20"
+ :on-exceed="overLimit"
:auto-upload="false"
accept="image/*,.pdf"
list-type="picture-card"
@@ -271,6 +277,9 @@
<el-form-item label="受过何种奖励">
<el-upload
action=""
+ multiple
+ :limit="20"
+ :on-exceed="overLimit"
:auto-upload="false"
accept="image/*,.pdf"
list-type="picture-card"
@@ -289,6 +298,9 @@
<el-form-item label="应急管理相关工作主要业绩及研究成果">
<el-upload
action=""
+ multiple
+ :limit="20"
+ :on-exceed="overLimit"
:auto-upload="false"
accept="image/*,.pdf"
list-type="picture-card"
@@ -307,6 +319,9 @@
<el-form-item label="专家本人意见">
<el-upload
action=""
+ multiple
+ :limit="20"
+ :on-exceed="overLimit"
:auto-upload="false"
accept="image/*,.pdf"
list-type="picture-card"
@@ -325,6 +340,9 @@
<el-form-item label="推荐单位意见">
<el-upload
action=""
+ multiple
+ :limit="20"
+ :on-exceed="overLimit"
:auto-upload="false"
accept="image/*,.pdf"
list-type="picture-card"
@@ -471,10 +489,7 @@
idCard: [{ required: true, validator: verifyId, trigger: 'blur' }],
dutyStatus: [{ required: true, message: '请选择在岗情况', trigger: 'blur' }],
companyName: [{ required: true, message: '请填写单位全称', trigger: 'blur' }],
- degree: [{ required: true, message: '请填写最高学历', trigger: 'blur' }],
- supportDirectionSafety: [{ required: true, message: '请选择支撑方向', trigger: 'blur' }],
- supportDirectionPrevention: [{ required: true, message: '请选择支撑方向', trigger: 'blur' }],
- supportDirectionEmergency: [{ required: true, message: '请选择支撑方向', trigger: 'blur' }]
+ degree: [{ required: true, message: '请填写最高学历', trigger: 'blur' }]
},
};
},
@@ -587,6 +602,13 @@
console.log(file, fileList);
},
async submit(){
+ if(this.form.supportDirectionSafety.length == 0 && this.form.supportDirectionPrevention.length == 0 && this.form.supportDirectionEmergency.length == 0){
+ this.$message({
+ type:'warning',
+ message: '请至少选择一种支撑方向'
+ })
+ return
+ }
this.$refs["ruleForm"].validate(async(valid) =>{
if(valid) {
await this.submitUpload()
@@ -598,12 +620,12 @@
data.smallClassify = data.profession[1]
delete data.profession
const res= await addExpertInfo(data)
- console.log(res,'res')
if(res.code == 200){
this.$message({
type:'success',
message: res.msg
})
+ this.$emit('closeDialog')
this.$refs.ruleForm.resetFields()
this.fileList = []
this.resumeList = []
diff --git a/src/views/main/index.vue b/src/views/main/index.vue
index 1956d99..3fcfa1a 100644
--- a/src/views/main/index.vue
+++ b/src/views/main/index.vue
@@ -98,13 +98,13 @@
<pagination
v-show="total>0"
:total="total"
- :page.sync="queryParams.pageIndex"
+ :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<form-dialog ref="formDialog"></form-dialog>
<el-dialog title="新增信息" :visible.sync="addForm" width="75%" append-to-body>
- <form-fill ref="formFill"></form-fill>
+ <form-fill ref="formFill" @closeDialog="closeAdd()"></form-fill>
</el-dialog>
</div>
</template>
@@ -128,7 +128,7 @@
expertTypes: [],
expertList: [],
queryParams: {
- pageIndex: 1,
+ pageNum: 1,
pageSize: 10,
bigClassify: null,
smallClassify: null,
@@ -205,7 +205,7 @@
return null;
},
handleQuery() {
- this.queryParams.pageIndex = 1
+ this.queryParams.pageNum = 1
if(this.classiFy.length>0){
this.queryParams.bigClassify = this.classiFy[0]
this.queryParams.smallClassify = this.classiFy[1]
@@ -247,6 +247,10 @@
this.$refs.formFill.changeSource(2)
},1000)
},
+ closeAdd(){
+ this.addForm = false
+ this.getList()
+ },
/** 修改按钮操作 */
handleUpdate(row) {
getInfo(row.expertId).then((res)=>{
--
Gitblit v1.9.2