From 514a9cc10622d996c3cfe1f3a2e955d52e7fc0c3 Mon Sep 17 00:00:00 2001
From: zhouwenxuan <1175765986@qq.com>
Date: 星期五, 23 二月 2024 15:55:36 +0800
Subject: [PATCH] bug修改
---
src/views/safetyReview/projectManage/components/evaluatePlan.vue | 26 +++++++++++++-------------
src/views/safetyReview/projectManage/components/projectArchive.vue | 7 +++++--
src/views/safetyReview/userManage/expertUsers/components/projectDialog.vue | 2 +-
src/views/safetyReview/projectManage/index.vue | 2 +-
4 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/src/views/safetyReview/projectManage/components/evaluatePlan.vue b/src/views/safetyReview/projectManage/components/evaluatePlan.vue
index 2e37f72..3c5427f 100644
--- a/src/views/safetyReview/projectManage/components/evaluatePlan.vue
+++ b/src/views/safetyReview/projectManage/components/evaluatePlan.vue
@@ -48,8 +48,8 @@
</el-row>
<el-table :data="state.formData.estimateSchedules" :border="true" style="margin: 20px 0">
<el-table-column label="序号" width="60" align="center" type="index"></el-table-column>
- <el-table-column label="评价日程安排" prop="name" header-align="center" :show-overflow-tooltip="true"/>
- <el-table-column label="开始时间" header-align="center" class-name="small-padding fixed-width">
+ <el-table-column label="评价日程安排" prop="name" align="center" :show-overflow-tooltip="true"/>
+ <el-table-column label="开始时间" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-date-picker
style="width: 100%"
@@ -61,7 +61,7 @@
/>
</template>
</el-table-column>
- <el-table-column label="结束时间" header-align="center" class-name="small-padding fixed-width">
+ <el-table-column label="结束时间" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-date-picker
style="width: 100%"
@@ -86,21 +86,21 @@
</el-row>
<el-table :data="state.planPersons" :border="true" style="margin: 20px 0">
<el-table-column label="序号" width="60" align="center" type="index"></el-table-column>
- <el-table-column label="评价组成员" prop="person.name" header-align="center" :show-overflow-tooltip="true"/>
- <el-table-column label="专业能力/资格证书" prop="person.certificateNo" header-align="center" :show-overflow-tooltip="true">
+ <el-table-column label="评价组成员" prop="person.name" align="center" :show-overflow-tooltip="true"/>
+ <el-table-column label="专业能力/资格证书" prop="person.certificateNo" align="center" :show-overflow-tooltip="true">
<template #default="scope">
{{ getCertNo(scope.row) }}
</template>
</el-table-column>
<!-- <el-table-column label="专业能力" header-align="center" :show-overflow-tooltip="true"></el-table-column>-->
- <el-table-column label="承担工作" prop="work" header-align="center" class-name="small-padding fixed-width"></el-table-column>
- <el-table-column label="承诺后期前往现场勘验" prop="laterPromise" header-align="center" class-name="small-padding fixed-width">
+ <el-table-column label="承担工作" prop="work" align="center" class-name="small-padding fixed-width"></el-table-column>
+ <el-table-column label="承诺后期前往现场勘验" prop="laterPromise" align="center" class-name="small-padding fixed-width">
<template #default="scope">
{{(scope.row.laterPromise==1 || scope.row.laterPromise==true)?'是':'否'}}
</template>
</el-table-column>
- <el-table-column label="未到现场勘验原因" prop="reason" header-align="center" class-name="small-padding fixed-width"></el-table-column>
- <el-table-column label="操作" header-align="center" class-name="small-padding fixed-width">
+ <el-table-column label="未到现场勘验原因" prop="reason" align="center" class-name="small-padding fixed-width"></el-table-column>
+ <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-button link @click="openWorksDialog('edit',scope.row)">修改</el-button>
<el-button link type="danger" @click="delMember(scope.row)">删除</el-button>
@@ -119,18 +119,18 @@
</el-row>
<el-table :data="state.devices" :border="true" style="margin: 20px 0">
<el-table-column label="序号" width="60" align="center" type="index"></el-table-column>
- <el-table-column label="设备名称" prop="deviceName" header-align="center" class-name="small-padding fixed-width"/>
- <el-table-column label="开始时间" prop="startDate" header-align="center" class-name="small-padding fixed-width">
+ <el-table-column label="设备名称" prop="deviceName" align="center" class-name="small-padding fixed-width"/>
+ <el-table-column label="开始时间" prop="startDate" align="center" class-name="small-padding fixed-width">
<template #default="scope">
{{scope.row.startDate.substring(0,10)}}
</template>
</el-table-column>
- <el-table-column label="结束时间" prop="endDate" header-align="center" class-name="small-padding fixed-width">
+ <el-table-column label="结束时间" prop="endDate" align="center" class-name="small-padding fixed-width">
<template #default="scope">
{{scope.row.endDate.substring(0,10)}}
</template>
</el-table-column>
- <el-table-column label="操作" header-align="center" class-name="small-padding fixed-width">
+ <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-button link @click="openDeviceDialog('edit',scope.row)">修改</el-button>
<el-button link type="danger" @click="delDeviceItem(scope.row)">删除</el-button>
diff --git a/src/views/safetyReview/projectManage/components/projectArchive.vue b/src/views/safetyReview/projectManage/components/projectArchive.vue
index b21bdf6..18e88a6 100644
--- a/src/views/safetyReview/projectManage/components/projectArchive.vue
+++ b/src/views/safetyReview/projectManage/components/projectArchive.vue
@@ -53,7 +53,7 @@
</el-table>
<el-row :gutter="30">
<el-col :span="6">
- <el-form-item prop="contractSignDate" label="合同签订日期">
+ <el-form-item label="合同签订日期">
<el-date-picker
style="width: 100%"
v-model="state.formData.contractSignDate"
@@ -134,7 +134,6 @@
],
rules: {
contractSignDate: [{required: true, message: '请选择合同签订日期', trigger: 'blur'}],
- actualContractMoney: [{required: true, message: '请输入项目合同额', trigger: 'blur'}]
},
fileList: [],
uploadUrl: import.meta.env.VITE_APP_BASE_API + '/manage/accessory-file/uploadFile',
@@ -199,6 +198,10 @@
ElMessage.warning("当前用户暂无权限");
return;
}
+ if(state.actualContract.actualContractMoney == '') {
+ ElMessage.warning("请输入项目合同额");
+ return;
+ }
console.log(state.uploadList,'state.uploadList')
const file = state.uploadList.map(item => {
return{
diff --git a/src/views/safetyReview/projectManage/index.vue b/src/views/safetyReview/projectManage/index.vue
index 7cc3172..ae959cb 100644
--- a/src/views/safetyReview/projectManage/index.vue
+++ b/src/views/safetyReview/projectManage/index.vue
@@ -316,7 +316,7 @@
...item,
process: item.reportProgress <= 4 ? 1 : item.reportProgress > 4 && item.reportProgress <= 6 ? 2 : item.reportProgress > 6 && item.reportProgress <= 9 ? 3 : item.reportProgress > 9 && item.reportProgress <= 11 ? 4 : 5,
leaderName: item.leader ? item.leader.name : '',
- area: item.district ? item.province + '/' + item.city + '/' + item.district : item.city?item.province + '/' + item.city:item.province ,
+ area: item.district ? item.province + '/' + item.city + '/' + item.district : item.city != item.province ? item.province + '/' + item.city: item.province ,
filingDate: item.filingDate ? conversionDays(item.filingDate,item.createTime) : conversionDays('',item.createTime),
contractMoney: item.contract ? item.contract.contractMoney : '',
actualContractMoney: item.contract ? item.contract.actualContractMoney : '',
diff --git a/src/views/safetyReview/userManage/expertUsers/components/projectDialog.vue b/src/views/safetyReview/userManage/expertUsers/components/projectDialog.vue
index 4d99800..3637bbd 100644
--- a/src/views/safetyReview/userManage/expertUsers/components/projectDialog.vue
+++ b/src/views/safetyReview/userManage/expertUsers/components/projectDialog.vue
@@ -125,7 +125,7 @@
...item,
process: item.reportProgress <=4 ? 1 : item.reportProgress >4 && item.reportProgress <=6 ? 2 : item.reportProgress >6 && item.reportProgress <=9 ? 3 :item.reportProgress >9 && item.reportProgress <=11 ? 4:5,
leaderName: item.leader ? item.leader.name : '',
- area: item.district ? item.province + '/' + item.city + '/' + item.district : item.city?item.province + '/' + item.city:item.province ,
+ area: item.district ? item.province + '/' + item.city + '/' + item.district : item.city != item.province ? 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 : '',
--
Gitblit v1.9.2