From 3d50e49525e10273ac130a09a5cd4dfe1217fe2a Mon Sep 17 00:00:00 2001
From: dshclm <3321914460@qq.com>
Date: Tue, 4 Jun 2024 11:18:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AllTypeFile/update.vue       | 26 ++++++++++++++++++---
 src/views/contributionAward/aduit/index.vue | 10 +++++++-
 src/views/contributionAward/apply/index.vue | 12 +++++++++-
 src/views/contributionAward/score/index.vue | 17 +++++++++++---
 src/views/principalAward/aduit/index.vue    | 12 +++++++---
 src/views/principalAward/apply/index.vue    | 12 +++++++++-
 src/views/principalAward/score/index.vue    | 17 +++++++++++---
 src/views/reward/aduit/index.vue            | 10 +++++++-
 src/views/reward/apply/index.vue            | 12 +++++++++-
 src/views/reward/score/index.vue            | 17 +++++++++++---
 src/views/teacherAward/aduit/index.vue      | 10 +++++++-
 src/views/teacherAward/apply/index.vue      | 12 +++++++++-
 src/views/teacherAward/score/index.vue      | 16 ++++++++++---
 src/views/trainAward/aduit/index.vue        | 10 +++++++-
 src/views/trainAward/apply/index.vue        | 12 +++++++++-
 src/views/trainAward/score/index.vue        | 17 +++++++++++---
 16 files changed, 192 insertions(+), 30 deletions(-)

diff --git a/src/components/AllTypeFile/update.vue b/src/components/AllTypeFile/update.vue
index 73b84ca..e0227ef 100644
--- a/src/components/AllTypeFile/update.vue
+++ b/src/components/AllTypeFile/update.vue
@@ -26,7 +26,7 @@
           <el-table-column v-if="isShowUploadButton">
 
           </el-table-column>
-          <el-table-column label="审核状态" align="center" >
+          <el-table-column label="审核状态" v-if="modalType !=='score'" align="center" >
             <template slot-scope="scope" class="button-cell" >
               <el-tag v-if="scope.row.state === 1" type="success">通过</el-tag>
               <el-tag v-else-if="scope.row.state === 2" type="warning">不通过</el-tag>
@@ -40,6 +40,9 @@
               <el-button size="small" type="text" icon="el-icon-close" @click="filePassMethod(scope.row,'nopass')" v-if="templateType==='aduit'">不通过</el-button>
               <el-button size="small" type="text" icon="el-icon-delete" @click="deleteHandle(scope.row.fileId,scope)" v-if="templateType==='apply'">删除</el-button>
             </template>
+            <template slot-scope="scope" v-else-if="isShowButton && templateType ==='applyView'">
+              <el-button size="small" type="text" icon="el-icon-download" @click="downloadFile(scope.row.fileId,scope.row.name)">下载</el-button>
+            </template>
           </el-table-column>
         </el-table>
       </template>
@@ -61,10 +64,18 @@
         </el-upload>
       </template>
     </el-table-column>
-    <el-table-column label="状态" prop="status">
+    <el-table-column label="状态" v-if="modalType === 'aduit' && dialogType!=='view'" prop="status">
+      <template v-slot:default="scope">
+        <el-tag v-if="scope.row.childrenList.length === 0" type="warning">未审核</el-tag>
+        <el-tag v-else-if="checkAllUploaded(scope.row.childrenList)" type="success">已审核</el-tag>
+        <el-tag v-else type="warning">未审核</el-tag>
+      </template>
+    </el-table-column>
+    <el-table-column label="状态" v-if="modalType === 'apply'" prop="status">
       <template v-slot:default="scope">
         <el-tag v-if="scope.row.childrenList.length === 0" type="warning">未上传</el-tag>
-        <el-tag v-else type="success">已上传</el-tag>
+        <el-tag v-else-if="checkAllUploaded(scope.row.childrenList)" type="success">已上传</el-tag>
+        <el-tag v-else type="warning">已上传</el-tag>
       </template>
     </el-table-column>
     <el-table-column label="操作">
@@ -114,6 +125,12 @@ export default {
     isShowUploadButton:{
       type:Boolean,
     },
+    modalType: {
+      type:String,
+    },
+    view:{
+      type:Boolean,
+    }
   },
   data() {
     return {
@@ -126,6 +143,9 @@ export default {
     console.log(this.templateType)
   },
   methods:{
+    checkAllUploaded(childrenList) {
+      return childrenList.every(child => child.state === 1);
+    },
     filePassMethod(row,status){
       if (status === 'pass'){
         filePass(row.fileId,'1').then((res) => {
diff --git a/src/views/contributionAward/aduit/index.vue b/src/views/contributionAward/aduit/index.vue
index e144853..3944a18 100644
--- a/src/views/contributionAward/aduit/index.vue
+++ b/src/views/contributionAward/aduit/index.vue
@@ -64,6 +64,7 @@
                 :isShowButton="isShowButton"
                 :isShowUploadButton="isShowUploadButton"
                 :template-type="templateType"
+                :modal-type="modalType"
                 ref="childComponent"
               >
               </Update>
@@ -98,6 +99,7 @@ export default {
     return {
       templateType:'aduit',
       dialogType: 'edit',
+      modalType:'',
       isShowUploadButton:false,
       //列数据
       tableColumns: [
@@ -241,7 +243,10 @@ export default {
       this.editOpen = true;
       this.title = "查看申请";
       const applyId = row.applyId || this.ids
-      this.isShowButton = false
+      this.isShowButton = true
+      this.dialogType = 'view'
+      this.modalType = 'score'
+      this.templateType = 'applyView'
       getDetail(applyId).then(response => {
         this.form = response.data;
         console.log(this.form)
@@ -277,6 +282,9 @@ export default {
       this.isReadOnly = true
       this.isShowButton = true
       this.isShowUploadButton = false
+      this.dialogType = 'edit'
+      this.modalType = 'aduit'
+      this.templateType = 'aduit'
       const applyId = row.applyId || this.ids
       getDetail(applyId).then(response => {
         this.form.isReward = response.data.isReward;
diff --git a/src/views/contributionAward/apply/index.vue b/src/views/contributionAward/apply/index.vue
index 8cf1582..2ef740a 100644
--- a/src/views/contributionAward/apply/index.vue
+++ b/src/views/contributionAward/apply/index.vue
@@ -87,6 +87,8 @@
                 :isShowButton="isShowButton"
                 :isShowUploadButton="isShowUploadButton"
                 :template-type="templateType"
+                :dialog-type="dialogType"
+                :modal-type="modalType"
               >
               </Update>
             </el-form-item>
@@ -119,6 +121,7 @@
                 :isShowButton="isShowButton"
                 :isShowUploadButton="isShowUploadButton"
                 :template-type="templateType"
+                :modal-type="modalType"
                 ref="childComponent"
               >
               </Update>
@@ -152,6 +155,7 @@ export default {
     return {
       templateType:'apply',
       dialogType:'edit',
+      modalType:'',
       isShowUploadButton:false,
       //列数据
       tableColumns: [
@@ -312,7 +316,9 @@ export default {
       this.title = "查看申请";
       const applyId = row.applyId || this.ids
       this.isShowUploadButton = false
-      this.isShowButton = false
+      this.isShowButton = true
+      this.modalType = 'score'
+      this.templateType = 'applyView'
       getDetail(applyId).then(response => {
         this.form = response.data;
         console.log(this.form)
@@ -348,6 +354,8 @@ export default {
       this.isReadOnly = false
       this.isShowButton = true
       this.isShowUploadButton = true
+      this.modalType = 'apply'
+      this.templateType = 'apply'
       this.title = "添加申请";
       // if(this.noticeList.length === 0){
         getApplyId(this.applyParam).then(response => {
@@ -369,6 +377,8 @@ export default {
       this.isReadOnly = false
       this.isShowButton = true
       this.isShowUploadButton = true
+      this.modalType = 'apply'
+      this.templateType = 'apply'
       const applyId = row.applyId || this.ids
       getDetail(applyId).then(response => {
         this.form.isReward = response.data.isReward;
diff --git a/src/views/contributionAward/score/index.vue b/src/views/contributionAward/score/index.vue
index 7058078..2d82e64 100644
--- a/src/views/contributionAward/score/index.vue
+++ b/src/views/contributionAward/score/index.vue
@@ -67,6 +67,8 @@
                 :isShowButton="isShowButton"
                 :isShowUploadButton="isShowUploadButton"
                 :template-type="templateType"
+                :modal-type="'score'"
+                :view="view"
                 ref="childComponent"
               >
                 <template v-slot:tableSlot v-if="isView === false">
@@ -133,8 +135,9 @@ export default {
     return {
       scoreData:[],
       avgScore:null,
-      templateType:'aduit',
+      templateType:'score',
       dialogType: 'edit',
+      view:false,
       isShowUploadButton:false,
       //列数据
       tableColumns: [
@@ -147,7 +150,7 @@ export default {
       ],
       //操作列
       tableActions: [
-        {text: '查看', icon: 'el-icon-view', handler: this.handleView,},
+        {text: '查看', icon: 'el-icon-view', handler: this.handleView},
         {text: '评分', icon: 'el-icon-edit', handler: this.handleUpdate,},
       ],
       //文件上传配置项
@@ -215,6 +218,12 @@ export default {
           // 使用 splice 方法将评分项从数组中删除
           filterData.splice(ratingIndex, 1);
         }
+      }else{
+        let ratingIndex = filterData.findIndex(action => action.text === '查看');
+        if (ratingIndex !== -1) {
+          // 使用 splice 方法将评分项从数组中删除
+          filterData.splice(ratingIndex, 1);
+        }
       }
     })
     if (this.$route.path.includes('contributionAward') === true) {
@@ -294,9 +303,11 @@ export default {
       this.editOpen = true;
       this.title = "查看申请";
       const applyId = row.applyId || this.ids
-      this.isShowButton = false
+      this.isShowButton = true
       this.isReadOnly = true
       this.isView = false
+      this.view = true
+      this.templateType = 'applyView'
       getDetail(applyId).then(response => {
         this.form = response.data;
         console.log(this.form)
diff --git a/src/views/principalAward/aduit/index.vue b/src/views/principalAward/aduit/index.vue
index 08171ad..9018d35 100644
--- a/src/views/principalAward/aduit/index.vue
+++ b/src/views/principalAward/aduit/index.vue
@@ -64,6 +64,7 @@
                 :isShowButton="isShowButton"
                 :isShowUploadButton="isShowUploadButton"
                 :template-type="templateType"
+                :modal-type="modalType"
                 ref="childComponent"
               >
               </Update>
@@ -98,6 +99,7 @@ export default {
     return {
       templateType:'aduit',
       dialogType: 'edit',
+      modalType:'',
       isShowUploadButton:false,
       //列数据
       tableColumns: [
@@ -241,7 +243,10 @@ export default {
       this.editOpen = true;
       this.title = "查看申请";
       const applyId = row.applyId || this.ids
-      this.isShowButton = false
+      this.isShowButton = true
+      this.dialogType = 'view'
+      this.modalType = 'score'
+      this.templateType = 'applyView'
       getDetail(applyId).then(response => {
         this.form = response.data;
         this.editOpen = true;
@@ -274,8 +279,9 @@ export default {
       this.isView = true;
       this.applyId = row.applyId
       this.isReadOnly = true
-      this.isShowButton = true
-      this.isShowUploadButton = false
+      this.dialogType = 'edit'
+      this.modalType = 'aduit'
+      this.templateType = 'aduit'
       const applyId = row.applyId || this.ids
       getDetail(applyId).then(response => {
         this.form.isReward = response.data.isReward;
diff --git a/src/views/principalAward/apply/index.vue b/src/views/principalAward/apply/index.vue
index bd05e25..fd2bf5d 100644
--- a/src/views/principalAward/apply/index.vue
+++ b/src/views/principalAward/apply/index.vue
@@ -87,6 +87,8 @@
                 :isShowButton="isShowButton"
                 :isShowUploadButton="isShowUploadButton"
                 :template-type="templateType"
+                :dialog-type="dialogType"
+                :modal-type="modalType"
               >
               </Update>
             </el-form-item>
@@ -119,6 +121,7 @@
                 :isShowButton="isShowButton"
                 :isShowUploadButton="isShowUploadButton"
                 :template-type="templateType"
+                :modal-type="modalType"
                 ref="childComponent"
               >
               </Update>
@@ -152,6 +155,7 @@ export default {
     return {
       templateType:'apply',
       dialogType:'edit',
+      modalType:'',
       isShowUploadButton:false,
       //列数据
       tableColumns: [
@@ -312,7 +316,9 @@ export default {
       this.title = "查看申请";
       const applyId = row.applyId || this.ids
       this.isShowUploadButton = false
-      this.isShowButton = false
+      this.isShowButton = true
+      this.modalType = 'score'
+      this.templateType = 'applyView'
       getDetail(applyId).then(response => {
         this.form = response.data;
         console.log(this.form)
@@ -348,6 +354,8 @@ export default {
       this.isReadOnly = false
       this.isShowButton = true
       this.isShowUploadButton = true
+      this.modalType = 'apply'
+      this.templateType = 'apply'
       this.title = "添加申请";
       // if(this.noticeList.length === 0){
         getApplyId(this.applyParam).then(response => {
@@ -369,6 +377,8 @@ export default {
       this.isReadOnly = false
       this.isShowButton = true
       this.isShowUploadButton = true
+      this.modalType = 'apply'
+      this.templateType = 'apply'
       const applyId = row.applyId || this.ids
       getDetail(applyId).then(response => {
         this.form.isReward = response.data.isReward;
diff --git a/src/views/principalAward/score/index.vue b/src/views/principalAward/score/index.vue
index 8124171..e18f4eb 100644
--- a/src/views/principalAward/score/index.vue
+++ b/src/views/principalAward/score/index.vue
@@ -67,6 +67,8 @@
                 :isShowButton="isShowButton"
                 :isShowUploadButton="isShowUploadButton"
                 :template-type="templateType"
+                :modal-type="'score'"
+                :view="view"
                 ref="childComponent"
               >
                 <template v-slot:tableSlot v-if="isView === false">
@@ -133,8 +135,9 @@ export default {
     return {
       scoreData:[],
       avgScore:null,
-      templateType:'aduit',
+      templateType:'score',
       dialogType: 'edit',
+      view:false,
       isShowUploadButton:false,
       //列数据
       tableColumns: [
@@ -147,7 +150,7 @@ export default {
       ],
       //操作列
       tableActions: [
-        {text: '查看', icon: 'el-icon-view', handler: this.handleView,},
+        {text: '查看', icon: 'el-icon-view', handler: this.handleView},
         {text: '评分', icon: 'el-icon-edit', handler: this.handleUpdate,},
       ],
       //文件上传配置项
@@ -215,6 +218,12 @@ export default {
           // 使用 splice 方法将评分项从数组中删除
           filterData.splice(ratingIndex, 1);
         }
+      }else{
+        let ratingIndex = filterData.findIndex(action => action.text === '查看');
+        if (ratingIndex !== -1) {
+          // 使用 splice 方法将评分项从数组中删除
+          filterData.splice(ratingIndex, 1);
+        }
       }
     })
     if (this.$route.path.includes('principalAward') === true) {
@@ -294,9 +303,11 @@ export default {
       this.editOpen = true;
       this.title = "查看申请";
       const applyId = row.applyId || this.ids
-      this.isShowButton = false
+      this.isShowButton = true
       this.isReadOnly = true
       this.isView = false
+      this.view = true
+      this.templateType = 'applyView'
       getDetail(applyId).then(response => {
         this.form = response.data;
         console.log(this.form)
diff --git a/src/views/reward/aduit/index.vue b/src/views/reward/aduit/index.vue
index bf35632..efb74ec 100644
--- a/src/views/reward/aduit/index.vue
+++ b/src/views/reward/aduit/index.vue
@@ -64,6 +64,7 @@
                 :isShowButton="isShowButton"
                 :isShowUploadButton="isShowUploadButton"
                 :template-type="templateType"
+                :modal-type="modalType"
                 ref="childComponent"
               >
               </Update>
@@ -93,6 +94,7 @@ export default {
     return {
       templateType:'aduit',
       dialogType: 'edit',
+      modalType:'',
       isShowUploadButton:false,
       //列数据
       tableColumns: [
@@ -236,7 +238,10 @@ export default {
       this.editOpen = true;
       this.title = "查看申请";
       const applyId = row.applyId || this.ids
-      this.isShowButton = false
+      this.isShowButton = true
+      this.dialogType = 'view'
+      this.modalType = 'score'
+      this.templateType = 'applyView'
       getDetail(applyId).then(response => {
         this.form = response.data;
         console.log(this.form)
@@ -272,6 +277,9 @@ export default {
       this.isReadOnly = true
       this.isShowButton = true
       this.isShowUploadButton = false
+      this.dialogType = 'edit'
+      this.modalType = 'aduit'
+      this.templateType = 'aduit'
       const applyId = row.applyId || this.ids
       getDetail(applyId).then(response => {
         this.form.isReward = response.data.isReward;
diff --git a/src/views/reward/apply/index.vue b/src/views/reward/apply/index.vue
index 615df1e..d748317 100644
--- a/src/views/reward/apply/index.vue
+++ b/src/views/reward/apply/index.vue
@@ -87,6 +87,8 @@
                 :isShowButton="isShowButton"
                 :isShowUploadButton="isShowUploadButton"
                 :template-type="templateType"
+                :dialog-type="dialogType"
+                :modal-type="modalType"
               >
               </Update>
             </el-form-item>
@@ -119,6 +121,7 @@
                 :isShowButton="isShowButton"
                 :isShowUploadButton="isShowUploadButton"
                 :template-type="templateType"
+                :modal-type="modalType"
                 ref="childComponent"
               >
               </Update>
@@ -147,6 +150,7 @@ export default {
     return {
       templateType:'apply',
       dialogType:'edit',
+      modalType:'',
       isShowUploadButton:false,
       //列数据
       tableColumns: [
@@ -306,7 +310,9 @@ export default {
       this.title = "查看申请";
       const applyId = row.applyId || this.ids
       this.isShowUploadButton = false
-      this.isShowButton = false
+      this.isShowButton = true
+      this.modalType = 'score'
+      this.templateType = 'applyView'
       getDetail(applyId).then(response => {
         this.form = response.data;
         this.editOpen = true;
@@ -341,6 +347,8 @@ export default {
       this.isReadOnly = false
       this.isShowButton = true
       this.isShowUploadButton = true
+      this.modalType = 'apply'
+      this.templateType = 'apply'
       this.title = "添加申请";
       // if(this.noticeList.length === 0){
         getApplyId(this.applyParam).then(response => {
@@ -362,6 +370,8 @@ export default {
       this.isReadOnly = false
       this.isShowButton = true
       this.isShowUploadButton = true
+      this.modalType = 'apply'
+      this.templateType = 'apply'
       const applyId = row.applyId || this.ids
       getDetail(applyId).then(response => {
         this.form.isReward = response.data.isReward;
diff --git a/src/views/reward/score/index.vue b/src/views/reward/score/index.vue
index 2cb7527..5bb6a5a 100644
--- a/src/views/reward/score/index.vue
+++ b/src/views/reward/score/index.vue
@@ -67,6 +67,8 @@
                 :isShowButton="isShowButton"
                 :isShowUploadButton="isShowUploadButton"
                 :template-type="templateType"
+                :modal-type="'score'"
+                :view="view"
                 ref="childComponent"
               >
                 <template v-slot:tableSlot v-if="isView === false">
@@ -130,8 +132,9 @@ export default {
     return {
       scoreData:[],
       avgScore:null,
-      templateType:'aduit',
+      templateType:'score',
       dialogType: 'edit',
+      view:false,
       isShowUploadButton:false,
       //列数据
       tableColumns: [
@@ -144,7 +147,7 @@ export default {
       ],
       //操作列
       tableActions: [
-        {text: '查看', icon: 'el-icon-view', handler: this.handleView,},
+        {text: '查看', icon: 'el-icon-view', handler: this.handleView},
         {text: '评分', icon: 'el-icon-edit', handler: this.handleUpdate,},
       ],
       //文件上传配置项
@@ -212,6 +215,12 @@ export default {
           // 使用 splice 方法将评分项从数组中删除
           filterData.splice(ratingIndex, 1);
         }
+      }else{
+        let ratingIndex = filterData.findIndex(action => action.text === '查看');
+        if (ratingIndex !== -1) {
+          // 使用 splice 方法将评分项从数组中删除
+          filterData.splice(ratingIndex, 1);
+        }
       }
     })
     if (this.$route.path.includes('reward') === true) {
@@ -291,9 +300,11 @@ export default {
       this.editOpen = true;
       this.title = "查看申请";
       const applyId = row.applyId || this.ids
-      this.isShowButton = false
+      this.isShowButton = true
       this.isReadOnly = true
       this.isView = false
+      this.view = true
+      this.templateType = 'applyView'
       getDetail(applyId).then(response => {
         this.form = response.data;
         console.log(this.form)
diff --git a/src/views/teacherAward/aduit/index.vue b/src/views/teacherAward/aduit/index.vue
index e384aa2..53907b2 100644
--- a/src/views/teacherAward/aduit/index.vue
+++ b/src/views/teacherAward/aduit/index.vue
@@ -64,6 +64,7 @@
                 :isShowButton="isShowButton"
                 :isShowUploadButton="isShowUploadButton"
                 :template-type="templateType"
+                :modal-type="modalType"
                 ref="childComponent"
               >
               </Update>
@@ -98,6 +99,7 @@ export default {
     return {
       templateType:'aduit',
       dialogType: 'edit',
+      modalType:'',
       isShowUploadButton:false,
       //列数据
       tableColumns: [
@@ -241,7 +243,10 @@ export default {
       this.editOpen = true;
       this.title = "查看申请";
       const applyId = row.applyId || this.ids
-      this.isShowButton = false
+      this.isShowButton = true
+      this.dialogType = 'view'
+      this.modalType = 'score'
+      this.templateType = 'applyView'
       getDetail(applyId).then(response => {
         this.form = response.data;
         console.log(this.form)
@@ -277,6 +282,9 @@ export default {
       this.isReadOnly = true
       this.isShowButton = true
       this.isShowUploadButton = false
+      this.dialogType = 'edit'
+      this.modalType = 'aduit'
+      this.templateType = 'aduit'
       const applyId = row.applyId || this.ids
       getDetail(applyId).then(response => {
         this.form.isReward = response.data.isReward;
diff --git a/src/views/teacherAward/apply/index.vue b/src/views/teacherAward/apply/index.vue
index b0e9d2a..6a3d5c7 100644
--- a/src/views/teacherAward/apply/index.vue
+++ b/src/views/teacherAward/apply/index.vue
@@ -87,6 +87,8 @@
                 :isShowButton="isShowButton"
                 :isShowUploadButton="isShowUploadButton"
                 :template-type="templateType"
+                :dialog-type="dialogType"
+                :modal-type="modalType"
               >
               </Update>
             </el-form-item>
@@ -119,6 +121,7 @@
                 :isShowButton="isShowButton"
                 :isShowUploadButton="isShowUploadButton"
                 :template-type="templateType"
+                :modal-type="modalType"
                 ref="childComponent"
               >
               </Update>
@@ -152,6 +155,7 @@ export default {
     return {
       templateType:'apply',
       dialogType:'edit',
+      modalType:'',
       isShowUploadButton:false,
       //列数据
       tableColumns: [
@@ -312,7 +316,9 @@ export default {
       this.title = "查看申请";
       const applyId = row.applyId || this.ids
       this.isShowUploadButton = false
-      this.isShowButton = false
+      this.isShowButton = true
+      this.modalType = 'score'
+      this.templateType = 'applyView'
       getDetail(applyId).then(response => {
         this.form = response.data;
         console.log(this.form)
@@ -348,6 +354,8 @@ export default {
       this.isReadOnly = false
       this.isShowButton = true
       this.isShowUploadButton = true
+      this.modalType = 'apply'
+      this.templateType = 'apply'
       this.title = "添加申请";
       // if(this.noticeList.length === 0){
         getApplyId(this.applyParam).then(response => {
@@ -369,6 +377,8 @@ export default {
       this.isReadOnly = false
       this.isShowButton = true
       this.isShowUploadButton = true
+      this.modalType = 'apply'
+      this.templateType = 'apply'
       const applyId = row.applyId || this.ids
       getDetail(applyId).then(response => {
         this.form.isReward = response.data.isReward;
diff --git a/src/views/teacherAward/score/index.vue b/src/views/teacherAward/score/index.vue
index 0c0d4f2..ad5a615 100644
--- a/src/views/teacherAward/score/index.vue
+++ b/src/views/teacherAward/score/index.vue
@@ -67,6 +67,7 @@
                 :isShowButton="isShowButton"
                 :isShowUploadButton="isShowUploadButton"
                 :template-type="templateType"
+                :modal-type="'score'"
                 ref="childComponent"
               >
                 <template v-slot:tableSlot v-if="isView === false">
@@ -133,8 +134,9 @@ export default {
     return {
       scoreData:[],
       avgScore:null,
-      templateType:'aduit',
+      templateType:'score',
       dialogType: 'edit',
+      view:false,
       isShowUploadButton:false,
       //列数据
       tableColumns: [
@@ -147,7 +149,7 @@ export default {
       ],
       //操作列
       tableActions: [
-        {text: '查看', icon: 'el-icon-view', handler: this.handleView,},
+        {text: '查看', icon: 'el-icon-view', handler: this.handleView},
         {text: '评分', icon: 'el-icon-edit', handler: this.handleUpdate,},
       ],
       //文件上传配置项
@@ -215,6 +217,12 @@ export default {
           // 使用 splice 方法将评分项从数组中删除
           filterData.splice(ratingIndex, 1);
         }
+      }else{
+        let ratingIndex = filterData.findIndex(action => action.text === '查看');
+        if (ratingIndex !== -1) {
+          // 使用 splice 方法将评分项从数组中删除
+          filterData.splice(ratingIndex, 1);
+        }
       }
     })
     if (this.$route.path.includes('teacherAward') === true) {
@@ -294,9 +302,11 @@ export default {
       this.editOpen = true;
       this.title = "查看申请";
       const applyId = row.applyId || this.ids
-      this.isShowButton = false
+      this.isShowButton = true
       this.isReadOnly = true
       this.isView = false
+      this.view = true
+      this.templateType = 'applyView'
       getDetail(applyId).then(response => {
         this.form = response.data;
         console.log(this.form)
diff --git a/src/views/trainAward/aduit/index.vue b/src/views/trainAward/aduit/index.vue
index 8eaf30a..5e2db5d 100644
--- a/src/views/trainAward/aduit/index.vue
+++ b/src/views/trainAward/aduit/index.vue
@@ -64,6 +64,7 @@
                 :isShowButton="isShowButton"
                 :isShowUploadButton="isShowUploadButton"
                 :template-type="templateType"
+                :modal-type="modalType"
                 ref="childComponent"
               >
               </Update>
@@ -98,6 +99,7 @@ export default {
     return {
       templateType:'aduit',
       dialogType: 'edit',
+      modalType:'',
       isShowUploadButton:false,
       //列数据
       tableColumns: [
@@ -241,7 +243,10 @@ export default {
       this.editOpen = true;
       this.title = "查看申请";
       const applyId = row.applyId || this.ids
-      this.isShowButton = false
+      this.isShowButton = true
+      this.dialogType = 'view'
+      this.modalType = 'score'
+      this.templateType = 'applyView'
       getDetail(applyId).then(response => {
         this.form = response.data;
         console.log(this.form)
@@ -277,6 +282,9 @@ export default {
       this.isReadOnly = true
       this.isShowButton = true
       this.isShowUploadButton = false
+      this.dialogType = 'edit'
+      this.modalType = 'aduit'
+      this.templateType = 'aduit'
       const applyId = row.applyId || this.ids
       getDetail(applyId).then(response => {
         this.form.isReward = response.data.isReward;
diff --git a/src/views/trainAward/apply/index.vue b/src/views/trainAward/apply/index.vue
index 662f635..1e4517f 100644
--- a/src/views/trainAward/apply/index.vue
+++ b/src/views/trainAward/apply/index.vue
@@ -87,6 +87,8 @@
                 :isShowButton="isShowButton"
                 :isShowUploadButton="isShowUploadButton"
                 :template-type="templateType"
+                :dialog-type="dialogType"
+                :modal-type="modalType"
               >
               </Update>
             </el-form-item>
@@ -119,6 +121,7 @@
                 :isShowButton="isShowButton"
                 :isShowUploadButton="isShowUploadButton"
                 :template-type="templateType"
+                :modal-type="modalType"
                 ref="childComponent"
               >
               </Update>
@@ -152,6 +155,7 @@ export default {
     return {
       templateType:'apply',
       dialogType:'edit',
+      modalType:'',
       isShowUploadButton:false,
       //列数据
       tableColumns: [
@@ -312,7 +316,9 @@ export default {
       this.title = "查看申请";
       const applyId = row.applyId || this.ids
       this.isShowUploadButton = false
-      this.isShowButton = false
+      this.isShowButton = true
+      this.modalType = 'score'
+      this.templateType = 'applyView'
       getDetail(applyId).then(response => {
         this.form = response.data;
         console.log(this.form)
@@ -348,6 +354,8 @@ export default {
       this.isReadOnly = false
       this.isShowButton = true
       this.isShowUploadButton = true
+      this.modalType = 'apply'
+      this.templateType = 'apply'
       this.title = "添加申请";
       // if(this.noticeList.length === 0){
         getApplyId(this.applyParam).then(response => {
@@ -369,6 +377,8 @@ export default {
       this.isReadOnly = false
       this.isShowButton = true
       this.isShowUploadButton = true
+      this.modalType = 'apply'
+      this.templateType = 'apply'
       const applyId = row.applyId || this.ids
       getDetail(applyId).then(response => {
         this.form.isReward = response.data.isReward;
diff --git a/src/views/trainAward/score/index.vue b/src/views/trainAward/score/index.vue
index 3e20b5c..49d8d4b 100644
--- a/src/views/trainAward/score/index.vue
+++ b/src/views/trainAward/score/index.vue
@@ -67,6 +67,8 @@
                 :isShowButton="isShowButton"
                 :isShowUploadButton="isShowUploadButton"
                 :template-type="templateType"
+                :modal-type="'score'"
+                :view="view"
                 ref="childComponent"
               >
                 <template v-slot:tableSlot v-if="isView === false">
@@ -133,8 +135,9 @@ export default {
     return {
       scoreData:[],
       avgScore:null,
-      templateType:'aduit',
+      templateType:'score',
       dialogType: 'edit',
+      view:false,
       isShowUploadButton:false,
       //列数据
       tableColumns: [
@@ -147,7 +150,7 @@ export default {
       ],
       //操作列
       tableActions: [
-        {text: '查看', icon: 'el-icon-view', handler: this.handleView,},
+        {text: '查看', icon: 'el-icon-view', handler: this.handleView},
         {text: '评分', icon: 'el-icon-edit', handler: this.handleUpdate,},
       ],
       //文件上传配置项
@@ -215,6 +218,12 @@ export default {
           // 使用 splice 方法将评分项从数组中删除
           filterData.splice(ratingIndex, 1);
         }
+      }else{
+        let ratingIndex = filterData.findIndex(action => action.text === '查看');
+        if (ratingIndex !== -1) {
+          // 使用 splice 方法将评分项从数组中删除
+          filterData.splice(ratingIndex, 1);
+        }
       }
     })
     if (this.$route.path.includes('trainAward') === true) {
@@ -294,9 +303,11 @@ export default {
       this.editOpen = true;
       this.title = "查看申请";
       const applyId = row.applyId || this.ids
-      this.isShowButton = false
+      this.isShowButton = true
       this.isReadOnly = true
       this.isView = false
+      this.view = true
+      this.templateType = 'applyView'
       getDetail(applyId).then(response => {
         this.form = response.data;
         console.log(this.form)