From 14127feb4f9a74cfadb4e373974189683c44fc64 Mon Sep 17 00:00:00 2001
From: baoyu <102349094+Bytq@users.noreply.github.com>
Date: Fri, 29 Mar 2024 13:23:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86/=E8=AF=91=E6=96=87=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=20=E5=9B=9E=E6=98=BE/=E6=89=B9=E9=87=8F=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/detailModal.vue                |  6 ++---
 ...dardTranslationAcquisitionRequestModal.vue |  2 +-
 .../index.vue                                 | 23 ++++++++++++++++++-
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/detailModal.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/detailModal.vue
index 091d0b1f8..cdf49d3f1 100644
--- a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/detailModal.vue
+++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/detailModal.vue
@@ -71,17 +71,17 @@
             <div class="content">{{ StandardApplyForEO.reason ? StandardApplyForEO.reason : '--' }}</div>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="12" v-show="StandardApplyForEO.status !== 'pendingApproval' && StandardApplyForEO.status !== 'Staging'">
           <el-form-item label="审批人" label-width="100px" class="add-form-item">
             <div class="content">{{ StandardApplyForEO.applyForUserName ? StandardApplyForEO.applyForUserName : '--' }}</div>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="12" v-show="StandardApplyForEO.status !== 'pendingApproval' && StandardApplyForEO.status !== 'Staging'">
           <el-form-item label="审批时间" label-width="100px" class="add-form-item">
             <div class="content">{{ StandardApplyForEO.approveTime ? StandardApplyForEO.approveTime : '--'  }}</div>
           </el-form-item>
         </el-col>
-        <el-col :span="24">
+        <el-col :span="24" v-show="StandardApplyForEO.status !== 'pendingApproval' && StandardApplyForEO.status !== 'Staging'">
           <el-form-item label="驳回理由" label-width="100px" class="add-form-item">
             <div class="content">{{ StandardApplyForEO.refuseCause ? StandardApplyForEO.refuseCause : '--'  }}</div>
           </el-form-item>
diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/standardTranslationAcquisitionRequestModal.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/standardTranslationAcquisitionRequestModal.vue
index bbf5c1ea4..6227e70da 100644
--- a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/standardTranslationAcquisitionRequestModal.vue
+++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/standardTranslationAcquisitionRequestModal.vue
@@ -171,7 +171,7 @@ export default {
       this.$emit('updateIndexList')
     },
     toView (item) {
-      this.$refs.addModalRef.showModal(item)
+      this.$refs.detailModalRef.showModal(item)
     },
     edit (item) {
       this.$refs.addModalRef.showModal(item)
diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue
index ead6c0169..fbb5632af 100644
--- a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue
+++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue
@@ -204,6 +204,7 @@ export default {
   data () {
     return {
       tableLoading: false,
+      selectedTag: true,
       total: 0,
       StandardApplyForEOPage: {
         page: 1,
@@ -254,7 +255,7 @@ export default {
   methods: {
     ResubmitOrWithdraw (id, status) {
       const query = {
-        status: status,
+        status: status ? status : '',
         ids: id
       }
       this.$http.postData('/lawss/standardApplyFor/batchUpdateStatus', query, { _this: this }, res => {
@@ -351,6 +352,14 @@ export default {
         })
         return
       }
+      if (!this.selectedTag) {
+        this.$message({
+          message: '只能选择待审批的数据，请重新选择',
+          type: 'warning',
+          offset: 20
+        })
+        return
+      }
       const ids = id.join(',')
       this.$confirm('确定通过？', '提示', {
         confirmButtonText: '确定',
@@ -381,6 +390,14 @@ export default {
         })
         return
       }
+      if (!this.selectedTag) {
+        this.$message({
+          message: '只能选择待审批的数据，请重新选择',
+          type: 'warning',
+          offset: 20
+        })
+        return
+      }
       const ids = id.join(',')
       this.$prompt('请输入驳回原因', '提示', {
         confirmButtonText: '确定',
@@ -466,6 +483,10 @@ export default {
       const ids = []
       value.forEach(item => {
         ids.push(item.id)
+        this.selectedTag = true
+        if (item.status !== 'pendingApproval') {
+          this.selectedTag = false
+        }
       })
       this.selectedList = [ ...ids ]
     }