From 32025887cb0e13634d800330bb33e3533fd3f70d Mon Sep 17 00:00:00 2001
From: zhouwenxuan <1175765986@qq.com>
Date: 星期四, 22 二月 2024 17:01:12 +0800
Subject: [PATCH] bug修改
---
src/views/safetyReview/userManage/expertUsers/components/expertDialog.vue | 9 ++++++---
src/views/safetyReview/projectManage/components/innerReview.vue | 2 +-
src/views/safetyReview/projectManage/components/techLeaderReview.vue | 4 ++--
src/views/safetyReview/projectManage/components/projectArchive.vue | 4 ++--
src/views/safetyReview/projectManage/components/siteCheckRcd.vue | 2 +-
src/views/safetyReview/projectManage/components/evaluateTaskNotice.vue | 2 +-
src/views/safetyReview/userManage/expertUsers/components/projectDialog.vue | 10 ++++++++--
src/views/safetyReview/projectManage/components/rateConclusion.vue | 8 ++++----
src/views/safetyReview/projectManage/index.vue | 5 +++--
9 files changed, 28 insertions(+), 18 deletions(-)
diff --git a/src/views/safetyReview/projectManage/components/evaluateTaskNotice.vue b/src/views/safetyReview/projectManage/components/evaluateTaskNotice.vue
index df6b87e..4ce3651 100644
--- a/src/views/safetyReview/projectManage/components/evaluateTaskNotice.vue
+++ b/src/views/safetyReview/projectManage/components/evaluateTaskNotice.vue
@@ -103,7 +103,7 @@
transmitDate: ''
},
rules: {
- "leader.name": [{required: true, message: '请选择项目负责人', trigger: 'blur'}],
+ "leader.name": [{required: true, message: '请选择项目负责人', trigger: 'change'}],
linkMan: [{required: true, message: '请输入联系人', trigger: 'blur'}],
linkPhone: [{required: true, message: '请输入联系电话', trigger: 'blur'}],
transmitDate: [{required: true, message: '请选择任务下达时间', trigger: 'blur'}]
diff --git a/src/views/safetyReview/projectManage/components/innerReview.vue b/src/views/safetyReview/projectManage/components/innerReview.vue
index 665241d..74226d4 100644
--- a/src/views/safetyReview/projectManage/components/innerReview.vue
+++ b/src/views/safetyReview/projectManage/components/innerReview.vue
@@ -28,7 +28,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="内部审核确认日期">
+ <el-form-item label="内部审核确认日期" prop="affirmDate">
<el-date-picker
style="width: 100%"
v-model="state.formData.affirmDate"
diff --git a/src/views/safetyReview/projectManage/components/projectArchive.vue b/src/views/safetyReview/projectManage/components/projectArchive.vue
index 90be6e4..b21bdf6 100644
--- a/src/views/safetyReview/projectManage/components/projectArchive.vue
+++ b/src/views/safetyReview/projectManage/components/projectArchive.vue
@@ -65,7 +65,7 @@
</el-form-item>
</el-col>
<el-col :span="18">
- <el-form-item prop="contractMoney">
+ <el-form-item prop="actualContractMoney">
<template #label>
项目合同额<span style="font-size: 13px;color: red;font-weight: normal;display: inline-block;margin-left: 6px">预估合同金额，归档阶段可以进行修改。仅支持数字，单位万元，小数点后最多两位，数值范围（0.01-999.99）</span>
</template>
@@ -222,7 +222,7 @@
}catch (e) {}
if(isOk){
- ElMessage.warning("请完善原因说明或上传附件！");
+ ElMessage.warning("请上传附件或完善原因说明！");
return;
}
const { ...data} = JSON.parse(JSON.stringify(state.formData))
diff --git a/src/views/safetyReview/projectManage/components/rateConclusion.vue b/src/views/safetyReview/projectManage/components/rateConclusion.vue
index 7e925a7..94f2f8c 100644
--- a/src/views/safetyReview/projectManage/components/rateConclusion.vue
+++ b/src/views/safetyReview/projectManage/components/rateConclusion.vue
@@ -176,10 +176,10 @@
if(res.code === 200){
getProcessFiles()
console.log("if",state.fileList)
- ElMessage({
- type: 'success',
- message: '文件上传成功'
- })
+ // ElMessage({
+ // type: 'success',
+ // message: '文件上传成功'
+ // })
}else {
ElMessage({
type: 'warning',
diff --git a/src/views/safetyReview/projectManage/components/siteCheckRcd.vue b/src/views/safetyReview/projectManage/components/siteCheckRcd.vue
index 9f7626f..cc1b345 100644
--- a/src/views/safetyReview/projectManage/components/siteCheckRcd.vue
+++ b/src/views/safetyReview/projectManage/components/siteCheckRcd.vue
@@ -166,7 +166,7 @@
planPersons: [],
rules: {
investigationDate: [{required: true, message: '请选择现场勘验时间', trigger: 'blur'}],
- location: [{required: true, message: '请选择现场勘验位置', trigger: 'blur'}],
+ location: [{required: true, message: '请选择现场勘验位置', trigger: 'change'}],
isSafetyCheck: [{required: true, message: '请选择是否编制现场安全检查表', trigger: 'blur'}],
recordData: [{required: true, message: '请填写现场勘验记录', trigger: 'blur'}],
assAccessoryFiles: [{required: true, validator: checkSafetyFiles, trigger: 'blur'}],
diff --git a/src/views/safetyReview/projectManage/components/techLeaderReview.vue b/src/views/safetyReview/projectManage/components/techLeaderReview.vue
index abe23da..86cdaec 100644
--- a/src/views/safetyReview/projectManage/components/techLeaderReview.vue
+++ b/src/views/safetyReview/projectManage/components/techLeaderReview.vue
@@ -28,7 +28,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="确认日期">
+ <el-form-item label="确认日期" prop="affirmDate">
<el-date-picker
style="width: 100%"
v-model="state.formData.affirmDate"
@@ -106,7 +106,7 @@
suggestions: ''
},
rules: {
- "assessor.name": [{required: true, message: '请选择技术负责人', trigger: 'blur'}],
+ "assessor.name": [{required: true, message: '请选择技术负责人', trigger: 'change'}],
auditDate: [{required: true, message: '请选择审核日期', trigger: 'blur'}],
affirmDate: [{required: true, message: '请选择确认日期', trigger: 'blur'}]
},
diff --git a/src/views/safetyReview/projectManage/index.vue b/src/views/safetyReview/projectManage/index.vue
index 45470fb..7cc3172 100644
--- a/src/views/safetyReview/projectManage/index.vue
+++ b/src/views/safetyReview/projectManage/index.vue
@@ -111,7 +111,7 @@
<el-table-column label="缺失要件" align="center" width="150">
<template #default="scope">
<div style="cursor:pointer;color: #3b82f6;" >
- <span v-if="scope.row.process === 5" @click="goMenu('toTwelve',scope.row)">{{scope.row.materialCnt}}</span>
+ <span v-if="scope.row.process === 5" @click="goMenu('toTwelve',scope.row)">{{scope.row.missingMaterialCnt}}</span>
<span v-else></span>
</div>
</template>
@@ -320,7 +320,8 @@
filingDate: item.filingDate ? conversionDays(item.filingDate,item.createTime) : conversionDays('',item.createTime),
contractMoney: item.contract ? item.contract.contractMoney : '',
actualContractMoney: item.contract ? item.contract.actualContractMoney : '',
- activeConfirm: item.personRecognition ? item.personRecognition.recognitionCnt + '/' + item.personRecognition.personCnt: ''
+ activeConfirm: item.personRecognition ? item.personRecognition.recognitionCnt + '/' + item.personRecognition.personCnt: '',
+ missingMaterialCnt: 3-item.materialCnt
}
})
total.value = res.data.total
diff --git a/src/views/safetyReview/userManage/expertUsers/components/expertDialog.vue b/src/views/safetyReview/userManage/expertUsers/components/expertDialog.vue
index cf629b9..06ab7a9 100644
--- a/src/views/safetyReview/userManage/expertUsers/components/expertDialog.vue
+++ b/src/views/safetyReview/userManage/expertUsers/components/expertDialog.vue
@@ -371,12 +371,15 @@
const isAgency = ref(false);
onMounted(()=>{
- getAgency()
+
const userInfo = JSON.parse(Cookies.get('userInfo'))
- state.agencyName = userInfo.agentName;
- state.form.agencyId = userInfo.agentId;
+
if(userInfo.identity === 1){
+ state.agencyName = userInfo.agentName;
+ state.form.agencyId = userInfo.agentId;
isAgency.value = true;
+ }else {
+ getAgency()
}
console.log("userinfo",userInfo)
})
diff --git a/src/views/safetyReview/userManage/expertUsers/components/projectDialog.vue b/src/views/safetyReview/userManage/expertUsers/components/projectDialog.vue
index 8042f9f..4d99800 100644
--- a/src/views/safetyReview/userManage/expertUsers/components/projectDialog.vue
+++ b/src/views/safetyReview/userManage/expertUsers/components/projectDialog.vue
@@ -52,7 +52,7 @@
<el-table-column label="缺失要件" prop="" align="center" width="150">
<template #default="scope">
<div style="cursor:pointer;color: #3b82f6;" >
- <span v-if="scope.row.process === 5" @click="goMenu('toTwelve',scope.row)">{{scope.row.materialCnt}}</span>
+ <span v-if="scope.row.process === 5" @click="goMenu('toTwelve',scope.row)">{{scope.row.missingMaterialCnt}}</span>
<span v-else></span>
</div>
</template>
@@ -93,6 +93,7 @@
<script setup>
import {reactive, ref} from "vue";
import {getProjectList} from "@/api/projectManage/project";
+import {ElMessage} from "element-plus";
const loading = ref(false);
const dataList = ref([]);
const tableRef = ref(null);
@@ -127,7 +128,8 @@
area: item.district ? item.province + '/' + item.city + '/' + item.district : item.city?item.province + '/' + item.city:item.province ,
filingDate: item.filingDate ? item.filingDate : conversionDays(item.createTime),
contractMoney: item.contract ? item.contract.contractMoney : '',
- actualContractMoney: item.contract ? item.contract.actualContractMoney : ''
+ actualContractMoney: item.contract ? item.contract.actualContractMoney : '',
+ missingMaterialCnt: 3-item.materialCnt
}
})
console.log(dataList.value,'dataList.value')
@@ -155,6 +157,10 @@
}
const goMenu = (toPath,val) => {
console.log("val",val)
+ if(toPath ==='toThirteen' && val.personRecognition && val.personRecognition. recognitionCnt === 0){
+ ElMessage.warning('未进行签字确认，无法查看！')
+ return;
+ }
toProcess('edit',val,toPath);
}
const conversionDays = (createTime) => {
--
Gitblit v1.9.2