diff --git a/src/views/onlineDeclaration/declareAddContent/index.vue b/src/views/onlineDeclaration/declareAddContent/index.vue index bdbbc5b..954cfc0 100644 --- a/src/views/onlineDeclaration/declareAddContent/index.vue +++ b/src/views/onlineDeclaration/declareAddContent/index.vue @@ -1165,8 +1165,9 @@ - - + + + diff --git a/src/views/onlineDeclaration/declareDetailContent/index.vue b/src/views/onlineDeclaration/declareDetailContent/index.vue index a3a245b..df9b79b 100644 --- a/src/views/onlineDeclaration/declareDetailContent/index.vue +++ b/src/views/onlineDeclaration/declareDetailContent/index.vue @@ -1663,8 +1663,9 @@ - - + + +
diff --git a/src/views/onlineDeclaration/enterpriseDirectory/index.vue b/src/views/onlineDeclaration/enterpriseDirectory/index.vue index 0c4a2e7..7192ef5 100644 --- a/src/views/onlineDeclaration/enterpriseDirectory/index.vue +++ b/src/views/onlineDeclaration/enterpriseDirectory/index.vue @@ -624,6 +624,7 @@ export default { // return item.responsibilityUnit == valid // }) this.templateList = [] + this.form.templateId = "" allList({responsibilityUnit:Number(valid),projectClassify:Number(this.projectId)}).then(res=>{ // console.log(res); this.templateList = res.data || [] @@ -640,6 +641,7 @@ export default { // return item.responsibilityUnit == valId // }) this.templateList = [] + this.form.templateId = "" allList({responsibilityUnit:Number(this.unitId),projectClassify:Number(valId)}).then(res=>{ // console.log(res); this.templateList = res.data || [] diff --git a/src/views/onlineDeclaration/pendingReview/index.vue b/src/views/onlineDeclaration/pendingReview/index.vue index 520ab49..f1a87a9 100644 --- a/src/views/onlineDeclaration/pendingReview/index.vue +++ b/src/views/onlineDeclaration/pendingReview/index.vue @@ -114,16 +114,16 @@ @@ -253,7 +253,7 @@ export default { { required: true, message: "请选择审批状态", trigger: "blur" } ], approvalOpinions: [ - { required: true, message: "名录维护方式不能为空", trigger: "blur" } + { required: true, message: "请输入审批意见", trigger: "blur" } ], }, fileList: [], diff --git a/src/views/onlineDeclaration/records/index.vue b/src/views/onlineDeclaration/records/index.vue index 3e6435a..f3f82d7 100644 --- a/src/views/onlineDeclaration/records/index.vue +++ b/src/views/onlineDeclaration/records/index.vue @@ -85,9 +85,9 @@ 初审 复审 - 上级评审 + 终审 - 评审通过 + 终审通过 @@ -210,16 +210,16 @@ @@ -253,7 +253,7 @@ size="mini" type="text" @click="handleUp(scope.row)" - v-if="userType == '01'&& (scope.row.status !== 0 || scope.row.status !== 8)" + v-if="userType == '01'&& (scope.row.status !== 0 && scope.row.status !== 8)" >上传附件 - - + +
diff --git a/src/views/project/index.vue b/src/views/project/index.vue index 570798a..520b558 100644 --- a/src/views/project/index.vue +++ b/src/views/project/index.vue @@ -77,31 +77,31 @@

- 上级评审中 + 终审中

评审通过

-

+

- 复审-拒绝 + 复审不通过

- 初审-拒绝 + 初审不通过

- + 终审不通过 +

- 退回修改 + 初审驳回

diff --git a/src/views/project/projectInfo/components/projectProgress/index.vue b/src/views/project/projectInfo/components/projectProgress/index.vue index eca2995..dbf4947 100644 --- a/src/views/project/projectInfo/components/projectProgress/index.vue +++ b/src/views/project/projectInfo/components/projectProgress/index.vue @@ -61,7 +61,7 @@
- +