From b91be1b5fcf1f5e571d3126969e6c6bc785719f3 Mon Sep 17 00:00:00 2001
From: zhouwenxuan <1175765986@qq.com>
Date: 星期四, 01 二月 2024 13:41:26 +0800
Subject: [PATCH] bug修改
---
src/views/safetyReview/projectManage/components/confirmEndDialog.vue | 13 ++--
src/views/safetyReview/projectManage/components/evaluatePlan.vue | 7 ++
src/views/safetyReview/projectManage/components/confirmEnd.vue | 18 +++---
src/views/safetyReview/projectManage/components/projectArchive.vue | 14 ++--
src/views/safetyReview/projectManage/components/signConfirm.vue | 69 ++++++++++++-----------
src/views/safetyReview/projectManage/process.vue | 8 +-
src/views/safetyReview/projectManage/components/rateConclusion.vue | 23 +------
7 files changed, 71 insertions(+), 81 deletions(-)
diff --git a/src/views/safetyReview/projectManage/components/confirmEnd.vue b/src/views/safetyReview/projectManage/components/confirmEnd.vue
index fe50704..491f0b5 100644
--- a/src/views/safetyReview/projectManage/components/confirmEnd.vue
+++ b/src/views/safetyReview/projectManage/components/confirmEnd.vue
@@ -36,13 +36,13 @@
@current-change="handleCurrentChange"
/>
</div>
- <confirm-end-dialog ref="confirmRef" @getList="getList"></confirm-end-dialog>
+ <confirm-end-dialog ref="confirmRef" @getList="getList(props.projectId)"></confirm-end-dialog>
</div>
</template>
<script setup>
-import {defineEmits, onMounted, reactive, ref} from "vue";
+import {defineEmits, defineProps, onMounted, reactive, ref} from "vue";
import {ElMessage, ElMessageBox} from "element-plus";
import {addRecord, editRecord, getDetail} from "@/api/projectManage/contractMng";
import Cookies from "js-cookie";
@@ -54,6 +54,7 @@
const confirmRef = ref(null);
const emit = defineEmits(["getNextStatus"]);
+const props = defineProps(['projectId'])
const state = reactive({
formData: {},
queryParams: {
@@ -71,11 +72,10 @@
if(userInfo.identity === 0){
isAmin.value = true;
}
- if(Cookies.get('projectId')){
- state.formData.projectId = Cookies.get('projectId');
+ if(props.projectId){
+ state.formData.projectId = props.projectId;
getList(state.formData.projectId);
}
- // getList();
});
@@ -90,7 +90,7 @@
}
const riskOpen = async (type,val) => {
- await getList(val);
+ // await getList(val);
state.formData.projectId = val;
if(type === 'confirm') {
const res = await doConfirm({projectId: val});
@@ -115,11 +115,11 @@
const handleSizeChange = (val) => {
state.queryParams.pageNum = 1;
state.queryParams.pageSize = val
- getList()
+ getList(props.projectId)
}
const handleCurrentChange = (val) => {
state.queryParams.pageNum = val
- getList()
+ getList(props.projectId)
}
// 图片上传
@@ -203,7 +203,7 @@
const res = await delRecitification(val)
if(res.code == 200){
ElMessage.success('数据删除成功')
- getList()
+ getList(props.projectId)
}else{
ElMessage.warning(res.message)
}
diff --git a/src/views/safetyReview/projectManage/components/confirmEndDialog.vue b/src/views/safetyReview/projectManage/components/confirmEndDialog.vue
index 7be0ac4..cdb3bbc 100644
--- a/src/views/safetyReview/projectManage/components/confirmEndDialog.vue
+++ b/src/views/safetyReview/projectManage/components/confirmEndDialog.vue
@@ -13,15 +13,15 @@
v-model="state.form.rectifyTime"
type="date"
value-format="YYYY-MM-DD 00:00:00"
- placeholder="选择日期"
+ placeholder="请选择日期"
size="large"
/>
</el-form-item>
<el-form-item label="整改人:" prop="rectifyPerson">
- <el-input v-model="state.form.rectifyPerson" show-word-limit type="text" size="large"/>
+ <el-input v-model="state.form.rectifyPerson" show-word-limit type="text" size="large" placeholder="请输入整改人" />
</el-form-item>
<el-form-item label="整改说明:" prop="reason">
- <el-input v-model="state.form.reason" show-word-limit type="text" size="large"/>
+ <el-input v-model="state.form.reason" show-word-limit type="text" size="large" placeholder="请输入整改说明"/>
</el-form-item>
<el-form-item prop="fileList">
<el-upload accept=".pdf"
@@ -74,6 +74,7 @@
rectifyTime: [{ required: true, message: '请选择整改时间', trigger: 'blur' }],
rectifyPerson: [{ required: true, message: '请输入整改人', trigger: 'blur' }],
fileList: [{ required: true, message: '请上传附件', trigger: 'blur' }],
+ reason:[{ required: true, message: '请输入整改说明', trigger: 'blur' }],
},
imgLimit: 1,
uploadUrl: import.meta.env.VITE_APP_BASE_API + '/manage/accessory-file/uploadFile',
@@ -163,9 +164,8 @@
console.log("Add",data)
const res = await addRecitification(data);
if (res.code == 200) {
- dialogVisible.value = false;
ElMessage.success('保存成功')
- formRef.value.clearValidate();
+ handleClose();
emit('getList');
} else {
ElMessage.warning(res.message)
@@ -175,9 +175,8 @@
data.projectId = state.uploadData.projectId;
const res = await editRecitification(data);
if (res.code == 200) {
- dialogVisible.value = false;
ElMessage.success('编辑成功')
- formRef.value.clearValidate();
+ handleClose();
emit('getList');
} else {
ElMessage.warning(res.message)
diff --git a/src/views/safetyReview/projectManage/components/evaluatePlan.vue b/src/views/safetyReview/projectManage/components/evaluatePlan.vue
index 2f62a3d..c162cee 100644
--- a/src/views/safetyReview/projectManage/components/evaluatePlan.vue
+++ b/src/views/safetyReview/projectManage/components/evaluatePlan.vue
@@ -268,13 +268,18 @@
const expertsListRef = ref()
const worksRef = ref()
const deviceRef = ref()
-onMounted(() => {
+onMounted(async () => {
const userInfo = JSON.parse(Cookies.get('userInfo'))
if(userInfo.identity === 0){
isAmin.value = true
}
+ if(props.projectId){
+ await getWorksList(props.projectId)
+ await getDeviceList(props.projectId)
+ }
})
+
const riskOpen = async (type,val) => {
state.formData.projectId = val
state.projectId = val
diff --git a/src/views/safetyReview/projectManage/components/projectArchive.vue b/src/views/safetyReview/projectManage/components/projectArchive.vue
index 3bd145e..c151d06 100644
--- a/src/views/safetyReview/projectManage/components/projectArchive.vue
+++ b/src/views/safetyReview/projectManage/components/projectArchive.vue
@@ -94,7 +94,7 @@
</template>
<script setup>
-import {defineEmits, onMounted, reactive, ref} from "vue";
+import {defineEmits, defineProps, onMounted, reactive, ref} from "vue";
import {ElMessage} from "element-plus";
import {addRecord, editRecord, getDetail} from "@/api/projectManage/contractMng";
import Cookies from "js-cookie";
@@ -102,7 +102,7 @@
import axios from "axios";
import {delAccessoryFile, getAccessoryFile} from "@/api/projectManage/project";
import {addProcessMaterial, getProcessMaterialDetail, editProcessMaterial} from "@/api/projectManage/riskAnalysis";
-
+const props = defineProps(['projectId'])
const emit = defineEmits(["getNextStatus"]);
const state = reactive({
formData: {
@@ -148,18 +148,16 @@
const isAmin = ref(false)
const formRef = ref();
onMounted(async () => {
-
const userInfo = JSON.parse(Cookies.get('userInfo'))
if(userInfo.identity === 0){
isAmin.value = true;
}
- if(Cookies.get('projectId')){
- state.uploadData.projectId = Cookies.get('projectId');
- getRecord(state.uploadData.projectId);
+ if(props.projectId){
+ state.uploadData.projectId = props.projectId;
+ await getRecord(state.uploadData.projectId);
// const res = await getAccessoryFile({projectId: val,moduleType: 9});
// console.log('res',res)
}
-
});
const getRecord = async (val) =>{
@@ -192,7 +190,6 @@
}else {
ElMessage.warning(res.message)
}
- getRecord(val);
}
if(type === 'add' || type === 'clickEdit') {
const valid = await formRef.value.validate();
@@ -234,6 +231,7 @@
const res = await editProcessMaterial(params);
if (res.code == 200) {
ElMessage.success('变更成功')
+ projectType.value='edit';
formRef.value.clearValidate();
// emit('getNextStatus', data.project.id);
} else {
diff --git a/src/views/safetyReview/projectManage/components/rateConclusion.vue b/src/views/safetyReview/projectManage/components/rateConclusion.vue
index 24e7afa..7e925a7 100644
--- a/src/views/safetyReview/projectManage/components/rateConclusion.vue
+++ b/src/views/safetyReview/projectManage/components/rateConclusion.vue
@@ -49,7 +49,7 @@
</template>
<script setup>
-import {defineEmits, onMounted, reactive, ref} from "vue";
+import {defineEmits, defineProps, onMounted, reactive, ref} from "vue";
import {ElMessage, ElMessageBox} from "element-plus";
import {Search} from '@element-plus/icons-vue'
import {addRate, addRisk, editRate, editRisk, getRateDetail, getRiskDetail} from "@/api/projectManage/riskAnalysis"
@@ -60,7 +60,7 @@
import axios from "axios";
import {delFile, getFiles} from "@/api/projectManage/siteCheckRcd";
const emit = defineEmits(["getNextStatus"]);
-
+const prop = defineProps(['projectId'])
const state = reactive({
formData: {
isReviseManual: 0,
@@ -91,23 +91,10 @@
if(userInfo.identity === 0){
isAmin.value = true;
}
- if(Cookies.get('projectId')){
- const val = Cookies.get('projectId');
+ if(prop.projectId){
+ const val = prop.projectId;
state.uploadData.projectId = val;
getProcessFiles(val);
- // const res = getAccessoryFile({projectId: val,moduleType: 7});
- // if(res.code == 200){
- // if(res.data){
- // state.fileList = res.data.accessoryFiles.map(item => {
- // return {
- // ...item,
- // name: item.originName,
- // }
- // })
- // }else {
- // ElMessage.warning(res.message)
- // }
- // }
}
})
@@ -233,7 +220,7 @@
})
}
const getProcessFiles = async (id)=>{
- const res = await getFiles({projectId: id ? id : state.uploadData.projectId ,moduleType: 7})
+ const res = await getFiles({projectId: id ? id : prop.projectId ,moduleType: 7})
if(res.code == 200){
if(res.data && res.data.length>0){
state.fileList = res.data.map(i=>{
diff --git a/src/views/safetyReview/projectManage/components/signConfirm.vue b/src/views/safetyReview/projectManage/components/signConfirm.vue
index 18b5ff9..badcb05 100644
--- a/src/views/safetyReview/projectManage/components/signConfirm.vue
+++ b/src/views/safetyReview/projectManage/components/signConfirm.vue
@@ -65,7 +65,19 @@
</el-table-column>
<el-table-column label="承诺书" prop="socialSecurity" align="center" width="120">
<template #default="scope">
-<!-- <el-button link>承诺书</el-button>-->
+ <div class="demo-image__preview" v-if="scope.row.commitPic && scope.row.commitPic.length>0">
+ <el-image
+ style="width: 100px; height: 100px"
+ :src= "scope.row.commitPic[0]"
+ :zoom-rate="1.2"
+ :max-scale="7"
+ :min-scale="0.2"
+ :preview-src-list="scope.row.commitPic"
+ :initial-index="0"
+ fit="cover"
+ preview-teleported="true"
+ />
+ </div>
</template>
</el-table-column>
</el-table>
@@ -81,7 +93,7 @@
</template>
<script setup>
-import {defineEmits, onMounted, reactive, ref, toRefs} from "vue";
+import {defineEmits, defineProps, onMounted, reactive, ref, toRefs} from "vue";
import {ElMessage} from "element-plus";
import {Search} from '@element-plus/icons-vue'
import {
@@ -96,7 +108,7 @@
import Cookies from "js-cookie"
import {getDetail} from "@/api/projectManage/contractMng";
const emit = defineEmits(["getNextStatus"]);
-
+const props = defineProps(['projectId'])
const state = reactive({
loading: false,
queryParams: {
@@ -116,8 +128,8 @@
if(userInfo.identity === 0){
isAmin.value = true;
}
- if(Cookies.get('projectId')){
- getRecognition(Cookies.get('projectId'));
+ if(props.projectId){
+ getRecognition(props.projectId);
}
})
const getRecognition = async (val) =>{
@@ -128,6 +140,7 @@
...item,
facePic: item.faceRecord ? [import.meta.env.VITE_APP_BASE_API + '/' + item.faceRecord.facePath ] : [],
signPic: item.signPath ? [import.meta.env.VITE_APP_BASE_API + '/' + item.signPath] : [],
+ commitPic: item.insurancePath ? [import.meta.env.VITE_APP_BASE_API + '/' + item.insurancePath] : [],
planPerson: {
playRole: item.planPerson ? item.planPerson.playRole : '',
jobType: item.planPerson ? item.planPerson.jobType : '',
@@ -143,39 +156,29 @@
const riskOpen = async (type,val) => {
- if((type === 'detail' || type === 'edit') && !Cookies.get('projectId')){
- getRecognition(val);
- }
+ // if((type === 'detail' || type === 'edit') && !props.projectId){
+ // getRecognition(val);
+ // }
if(type === 'add' || type === 'clickEdit') {
- if (isAmin.value) {
- ElMessage.warning("当前用户暂无权限");
- return;
- }
- if(type === 'add'){
- const resCheck = await checkAll({projectId: val});
- if (resCheck.code == 200) {
- const res = await addFaceRecognition({projectId: val});
- if (res.code == 200) {
- ElMessage.success('保存成功')
- formRef.value.clearValidate();
- emit('getNextStatus', val);
- } else {
- ElMessage.warning(res.message)
- }
+ if (isAmin.value) {
+ ElMessage.warning("当前用户暂无权限");
+ return;
+ }
+ if(type === 'add'){
+ const resCheck = await checkAll({projectId: val});
+ if (resCheck.code == 200) {
+ const res = await addFaceRecognition({projectId: val});
+ if (res.code == 200) {
+ ElMessage.success('保存成功')
+ formRef.value.clearValidate();
+ emit('getNextStatus', val);
} else {
ElMessage.warning(res.message)
}
- }else if(type === 'clickEdit'){
- // const { ...data} = JSON.parse(JSON.stringify(state.formData))
- // const res = await editRisk(data);
- // if (res.code == 200) {
- // ElMessage.success('变更成功')
- // formRef.value.clearValidate();
- // // emit('getNextStatus', data.project.id);
- // } else {
- // ElMessage.warning(res.message)
- // }
+ } else {
+ ElMessage.warning(res.message)
}
+ }
}
}
diff --git a/src/views/safetyReview/projectManage/process.vue b/src/views/safetyReview/projectManage/process.vue
index b83175b..29c7c6e 100644
--- a/src/views/safetyReview/projectManage/process.vue
+++ b/src/views/safetyReview/projectManage/process.vue
@@ -49,9 +49,9 @@
<upload-review-rcd ref="uploadReviewRef" v-if="selectedObj.id === 9" @getNextStatus="getNextStatus" :projectId="projectId"></upload-review-rcd>
<rate-conclusion ref="rateConRef" v-if="selectedObj.id === 10" @getNextStatus="getNextStatus" :projectId="projectId"></rate-conclusion>
<process-ctrl-review ref="proCtrlRef" v-if="selectedObj.id === 11" @getNextStatus="getNextStatus" :projectId="projectId"></process-ctrl-review>
- <project-archive ref="proArchRef" v-if="selectedObj.id === 12" @getNextStatus="getNextStatus"></project-archive>
- <sign-confirm ref="signConfirmRef" v-if="selectedObj.id === 13" @getNextStatus="getNextStatus"></sign-confirm>
- <confirm-end ref="confirmEndRef" v-if="selectedObj.id === 14" @getNextStatus="getNextStatus"></confirm-end>
+ <project-archive ref="proArchRef" v-if="selectedObj.id === 12" @getNextStatus="getNextStatus" :projectId="projectId"></project-archive>
+ <sign-confirm ref="signConfirmRef" v-if="selectedObj.id === 13" @getNextStatus="getNextStatus" :projectId="projectId"></sign-confirm>
+ <confirm-end ref="confirmEndRef" v-if="selectedObj.id === 14" @getNextStatus="getNextStatus" :projectId="projectId"></confirm-end>
</div>
<div style="display: flex;align-items: center;justify-content: center;margin-bottom: -20px">
<el-button type="primary" v-if="selectedObj.id !== 1" style="width: 80px" @click="back">上一步</el-button>
@@ -495,8 +495,6 @@
selectedObj.value.status = 1;
nextObj.value.status = 2;
nextObj.value = val;
- Cookies.set('projectId',projectId.value);
- console.log("CookiesprojectId",Cookies.get('projectId'))
//跳转
}, 10)
}
--
Gitblit v1.9.2