From 7a267fc8e5bc6bbe1d770c1aebb50bbed5461e22 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 07 二月 2025 17:45:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/projectEngineering/projectLibrary/projectDetails.vue | 57 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 49 insertions(+), 8 deletions(-)
diff --git a/src/views/projectEngineering/projectLibrary/projectDetails.vue b/src/views/projectEngineering/projectLibrary/projectDetails.vue
index 1dc8685..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,22 +30,45 @@
:isShow="isShow"
class="full-width custom-height"
/>
- <div v-if="!disabled" class="button-container">
+ <div v-hasRole="['auditor']" v-if="audit" class="button-container">
<el-button
- v-if="componentName.name == 'BasicInfo'"
class="save-button"
type="primary"
- @click="submit(0)"
+ @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
+ class="save-button"
+ type="primary"
+ @click="saveProject(0)"
>鑽夌</el-button
>
<!-- <el-button class="save-button" type="primary" @click="submit(1)"-->
<!-- >淇濆瓨</el-button>-->
- <el-button class="save-button" type="primary" @click="saveProject"
+ <el-button class="save-button" type="primary" @click="saveProject(1)"
>淇濆瓨</el-button>
<el-button class="reset-button" @click="reset">閲嶇疆</el-button>
<!-- <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;
},
@@ -131,12 +172,10 @@
},
handleClick(tabTarget) {
this.componentName = this.TABS_DATA[tabTarget.index].componentName;
- console.log(this.projectForm);
},
changeTable(index) {
this.componentName = this.TABS_DATA[index].componentName;
this.currentTab = this.TABS_DATA[index].value;
-
},
submit(usedStatus) {
this.$refs.childRef.submit(usedStatus);
@@ -144,9 +183,10 @@
reset() {
this.$refs.childRef.reset();
},
- saveProject() {
+ 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