From 25ac1283aaf3a2eb794f89d74bac36480b9270ff Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 07 二月 2025 17:43:10 +0800
Subject: [PATCH] 项目审核
---
src/views/projectEngineering/projectLibrary/index.vue | 14 +++++--
src/views/projectEngineering/projectLibrary/component/BasicInfo.vue | 1
package.json | 2
src/views/projectEngineering/projectLibrary/list.js | 1
src/views/projectEngineering/projectLibrary/projectDetails.vue | 47 ++++++++++++++++++++++-
5 files changed, 57 insertions(+), 8 deletions(-)
diff --git a/package.json b/package.json
index 4d00bf2..91a2679 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
"url": "https://gitee.com/y_project/RuoYi-Vue.git"
},
"dependencies": {
- "@antv/g6": "^4.8.21",
+ "@antv/g6": "^4.8.24",
"@riophae/vue-treeselect": "0.4.0",
"axios": "0.28.1",
"bpmn-js": "^11.1.0",
diff --git a/src/views/projectEngineering/projectLibrary/component/BasicInfo.vue b/src/views/projectEngineering/projectLibrary/component/BasicInfo.vue
index 5eff774..b282b3e 100644
--- a/src/views/projectEngineering/projectLibrary/component/BasicInfo.vue
+++ b/src/views/projectEngineering/projectLibrary/component/BasicInfo.vue
@@ -384,6 +384,7 @@
yearInvestAmount: '',
competentDepartmentList: [],
managementCentralizationList: [],
+ remark: ''
},
subclass: '',
largeCategory: '',
diff --git a/src/views/projectEngineering/projectLibrary/index.vue b/src/views/projectEngineering/projectLibrary/index.vue
index a5e95d3..8979528 100644
--- a/src/views/projectEngineering/projectLibrary/index.vue
+++ b/src/views/projectEngineering/projectLibrary/index.vue
@@ -236,12 +236,16 @@
<template v-if="item.slotName === 'planStartTime'">
{{ scope.row.planStartTime ? scope.row.planStartTime.split('-')[0] + '骞�' : '' }}
</template>
+ <!-- usedStatus鎻掓Ы -->
+ <template v-if="item.slotName === 'usedStatus'">
+ <dict-tag :options="dict.type.sys_used_status" :value="scope.row.usedStatus"/>
+ </template>
</template>
<!-- 榛樿鏄剧ず -->
<span v-else>{{ scope.row[item.id] }}</span>
</template>
</el-table-column>
-
+ <el-table-column v-if="this.$route.query.projectCategory==6" label="瀹℃牳澶囨敞" width="140" align="center" prop="remark"/>
<!-- 鎿嶄綔鍒� -->
<el-table-column label="鎿嶄綔" width="140" align="center">
<template slot-scope="scope">
@@ -254,6 +258,7 @@
</el-button>
<el-button
v-if="isReserve"
+ v-hasRole="['user']"
size="medium"
type="text"
icon="el-icon-edit"
@@ -299,7 +304,7 @@
export default {
dicts: ['sys_administrative_divisions', 'sys_investment_type', 'sys_project_phases',
'sys_funding_type', 'sys_association_status', 'sys_project_status', 'sys_project_code',
- 'sys_project_tags', 'sys_key_categories', 'sys_project_type'],
+ 'sys_project_tags', 'sys_key_categories', 'sys_project_type','sys_used_status'],
name: "ProjectInfo",
components: {
FileDialog
@@ -374,7 +379,7 @@
created() {
this.queryParams.importanceType = this.$route.query.importanceType;
const projectCategory = this.$route.query.projectCategory;
- if (!projectCategory || projectCategory === '1') {
+ if (!projectCategory || projectCategory === '1' || projectCategory === '6') {
this.isReserve = true;
}
if (projectCategory) {
@@ -401,7 +406,8 @@
},
handleDetail(row) {
this.removeStore();
- this.$router.push({path: '/projectEngineering/project/ProjectDetails', query: {projectId: row.id,disabled: 'true' }});
+ const audit = this.$route.query.projectCategory==='6'? 1:0
+ this.$router.push({path: '/projectEngineering/project/ProjectDetails', query: {projectId: row.id,disabled: 'true',audit: audit }});
},
// 鏂板椤甸潰
add() {
diff --git a/src/views/projectEngineering/projectLibrary/list.js b/src/views/projectEngineering/projectLibrary/list.js
index bbc8e98..1be2c8d 100644
--- a/src/views/projectEngineering/projectLibrary/list.js
+++ b/src/views/projectEngineering/projectLibrary/list.js
@@ -10,6 +10,7 @@
{id: 'planStartTime', label: '椤圭洰骞翠唤', slotName: 'planStartTime', visible: true},
{id: 'projectStatus', label: '椤圭洰鐘舵��', slotName: 'projectStatus', visible: true},
{id: 'investType', label: '鎶曡祫绫诲埆', slotName: 'investType', visible: true},
+ {id: 'usedStatus', label: '浣跨敤鐘舵��', slotName: 'usedStatus', visible: true},
{id: 'content', label: '寤鸿鍐呭', visible: false},
{id: 'fundType', label: '璧勯噾绫诲瀷', visible: false},
{id: 'projectContactPerson', label: '椤圭洰鑱旂郴浜�', visible: false},
diff --git a/src/views/projectEngineering/projectLibrary/projectDetails.vue b/src/views/projectEngineering/projectLibrary/projectDetails.vue
index 9332ed8..8ae8fd4 100644
--- a/src/views/projectEngineering/projectLibrary/projectDetails.vue
+++ b/src/views/projectEngineering/projectLibrary/projectDetails.vue
@@ -1,4 +1,5 @@
<template>
+ <div>
<el-card class="card-container">
<div class="flex-container mb-4">
<el-tabs v-model="currentTab" @tab-click="handleClick" v-show="isShow">
@@ -29,9 +30,20 @@
:isShow="isShow"
class="full-width custom-height"
/>
+ <div v-hasRole="['auditor']" v-if="audit" class="button-container">
+ <el-button
+ class="save-button"
+ type="primary"
+ @click="saveProject(2)"
+ >閫氳繃</el-button>
+ <el-button
+ class="save-button"
+ type="danger"
+ @click="showDialog"
+ >椹冲洖</el-button>
+ </div>
<div v-if="!disabled" class="button-container">
<el-button
- v-if="componentName.name == 'BasicInfo'"
class="save-button"
type="primary"
@click="saveProject(0)"
@@ -45,6 +57,18 @@
<!-- <el-button v-else class="cancel-button" @click="cancel">鍙栨秷</el-button> -->
</div>
</el-card>
+ <el-dialog :visible.sync="remarkShow" width="1000px" title="椹冲洖淇℃伅" append-to-body>
+ <el-form ref="form" label-width="80px">
+ <el-form-item label="椹冲洖鍘熷洜">
+ <el-input type="textarea" v-model="remark"></el-input>
+ </el-form-item>
+ </el-form>
+ <div slot="footer" class="dialog-footer">
+ <el-button @click="cancelAuditing">鍙� 娑�</el-button>
+ <el-button type="primary" @click="submitAuditing">纭� 瀹�</el-button>
+ </div>
+ </el-dialog>
+</div>
</template>
<script>
@@ -63,6 +87,9 @@
isShow: false,
currentTab: "椤圭洰绠＄悊鍩虹淇℃伅",
disabled: false,
+ remarkShow: false,
+ audit: false,
+ remark: '',
projectForm: {},
componentName: BasicInfo,
projectId: null,
@@ -102,6 +129,20 @@
};
},
methods: {
+ showDialog(){
+ this.remark = null;
+ this.remarkShow = true;
+ },
+ cancelAuditing(){
+ this.remark = null;
+ this.remarkShow = false;
+ },
+ submitAuditing(){
+ this.projectForm.projectInfoForm.remark = this.remark
+ this.saveProject(3)
+ this.remark = null
+ this.remarkShow = false;
+ },
updateIsShow(newValue) {
this.isShow = newValue;
},
@@ -135,7 +176,6 @@
changeTable(index) {
this.componentName = this.TABS_DATA[index].componentName;
this.currentTab = this.TABS_DATA[index].value;
-
},
submit(usedStatus) {
this.$refs.childRef.submit(usedStatus);
@@ -146,7 +186,7 @@
saveProject(num) {
this.projectForm.projectInfoForm.usedStatus = num;
editProject(this.projectForm).then((res) => {
- this.$message.success("淇濆瓨鎴愬姛");
+ this.$message.success("鎿嶄綔鎴愬姛");
})
this.$router.push('/projectEngineering/project/projectLibrary')
}
@@ -155,6 +195,7 @@
if (this.$route.query.disabled) {
this.disabled = true;
}
+ this.audit = this.$route.query.audit == 1;
},
};
</script>
--
Gitblit v1.8.0