From 700ba895d31a11f02fc88bd7eb03ccb1bbf98690 Mon Sep 17 00:00:00 2001
From: baoyu <102349094+Bytq@users.noreply.github.com>
Date: Fri, 29 Mar 2024 11:26:14 +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=E6=9F=A5=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/addModal.vue                   | 15 +--
 .../components/detailModal.vue                | 99 +++++++++++--------
 .../index.vue                                 | 16 ++-
 3 files changed, 78 insertions(+), 52 deletions(-)

diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/addModal.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/addModal.vue
index c97f16d36..10aad8617 100644
--- a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/addModal.vue
+++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/addModal.vue
@@ -1,6 +1,6 @@
 <template>
   <el-drawer
-    title="新增标准/译文获取申请"
+    title="新增标准/译文获取申请123"
     :visible.sync="visible"
     :direction="direction"
     :append-to-body="true"
@@ -13,12 +13,12 @@
       <el-row>
         <el-col :span="12">
           <el-form-item label="申请单位" prop="applyForUnitName" label-width="100px" class="add-form-item">
-            <el-input disabled v-model="StandardApplyForEO.applyForUnitName" readonly clearable />
+            <el-input  v-model="StandardApplyForEO.applyForUnitName" readonly clearable />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="申请人" prop="applyForUserName" label-width="100px" class="add-form-item">
-            <el-input disabled v-model="StandardApplyForEO.applyForUserName" readonly clearable />
+            <el-input  v-model="StandardApplyForEO.applyForUserName" readonly clearable />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -192,10 +192,10 @@ export default {
       this.$nextTick(() => {
         this.$refs.addFormRef.clearValidate()
         this.getDicTypeListCode()
-        this.selectStandType(this.StandardApplyForEO.standType)
+        this.selectStandType(this.StandardApplyForEO.standType, 'callBack')
       })
     },
-    selectStandType (value) {
+    selectStandType (value,tag) {
       if (value === '') {
         this.standLbList = []
       }
@@ -205,7 +205,10 @@ export default {
         if (res.ok) {
           this.$nextTick(() => {
             this.standLbList = res.data
-            this.$set(this.StandardApplyForEO, 'standLb', null)
+            if (tag !== 'callBack') {
+              console.log(1111)
+              this.$set(this.StandardApplyForEO, 'standLb', null)
+            }
             this.showLoading = false
           })
           return
diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/detailModal.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/detailModal.vue
index df9042a13..091d0b1f8 100644
--- a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/detailModal.vue
+++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/detailModal.vue
@@ -1,80 +1,97 @@
 <template>
   <el-drawer
-    title="新增标准/译文获取申请"
-    :visible.sync="visible"
-    :direction="direction"
-    :append-to-body="true"
-    :wrapper-closable="false"
-    :before-close="handleClose"
-    size="40%"
+      title="新增标准/译文获取申请"
+      :visible.sync="visible"
+      :direction="direction"
+      :append-to-body="true"
+      :wrapper-closable="false"
+      :before-close="handleClose"
+      size="40%"
   >
     <loading :loading="showLoading">加载中...</loading>
     <el-form ref="addFormRef" :model="StandardApplyForEO" class="label-input-form detail-modal-form">
-      <el-row>
+      <el-row style="padding-bottom: 80px">
         <el-col :span="12">
-          <el-form-item label="申请单位"  label-width="100px" class="add-form-item">
-            <span>{{StandardApplyForEO.applyForUnitName ? StandardApplyForEO.applyForUnitName : '--'}}</span>
+          <el-form-item label="申请单位" label-width="100px" class="add-form-item">
+            <div class="content">{{ StandardApplyForEO.applyForUnitName ? StandardApplyForEO.applyForUnitName : '--' }}</div>
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="申请人"  label-width="100px" class="add-form-item">
-            <span>{{StandardApplyForEO.applyForUserName ? StandardApplyForEO.applyForUserName : '--'}}</span>
+          <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-form-item label="类型"  label-width="100px" class="add-form-item">
-            <span>{{StandardApplyForEO.typeShow ? StandardApplyForEO.typeShow : '--'}}</span>
+          <el-form-item label="类型" label-width="100px" class="add-form-item">
+            <div class="content">{{ StandardApplyForEO.typeShow ? StandardApplyForEO.typeShow : '--' }}</div>
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="标准类型"  label-width="100px" class="add-form-item">
-            <span>{{StandardApplyForEO.standTypeShow ? StandardApplyForEO.standTypeShow : '--'}}</span>
+          <el-form-item label="标准类型" label-width="100px" class="add-form-item">
+            <div class="content">{{ StandardApplyForEO.standTypeShow ? StandardApplyForEO.standTypeShow : '--' }}</div>
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="标准类别"  label-width="100px" class="add-form-item">
-            <span>{{StandardApplyForEO.standLbShow ? StandardApplyForEO.standLbShow : '--'}}</span>
+          <el-form-item label="标准类别" label-width="100px" class="add-form-item">
+            <div class="content">{{ StandardApplyForEO.standLbShow ? StandardApplyForEO.standLbShow : '--' }}</div>
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="标准编号"  label-width="100px" class="add-form-item">
-            <span>{{StandardApplyForEO.standNum ? StandardApplyForEO.standNum : '--'}}</span>
+          <el-form-item label="标准编号" label-width="100px" class="add-form-item">
+            <div class="content">{{ StandardApplyForEO.standNum ? StandardApplyForEO.standNum : '--' }}</div>
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="标准年份"  label-width="100px" class="add-form-item">
-            <span>{{StandardApplyForEO.standYear ? StandardApplyForEO.standYear : '--'}}</span>
+          <el-form-item label="标准年份" label-width="100px" class="add-form-item">
+            <div class="content">{{ StandardApplyForEO.standYear ? StandardApplyForEO.standYear : '--' }}</div>
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="需求时间"  label-width="100px" class="add-form-item">
-            <span>{{StandardApplyForEO.requiredTime ? StandardApplyForEO.requiredTime : '--'}}</span>
+          <el-form-item label="需求时间" label-width="100px" class="add-form-item">
+            <div class="content">{{ StandardApplyForEO.requiredTime ? StandardApplyForEO.requiredTime : '--' }}</div>
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="标准名称"  label-width="100px" class="add-form-item">
-            <span>{{StandardApplyForEO.standName ? StandardApplyForEO.standName : '--'}}</span>
+          <el-form-item label="标准名称" label-width="100px" class="add-form-item">
+            <div class="content">{{ StandardApplyForEO.standName ? StandardApplyForEO.standName : '--' }}</div>
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="原语言"  label-width="100px" class="add-form-item">
-            <span>{{StandardApplyForEO.sourceLanguage ? StandardApplyForEO.sourceLanguage : '--'}}</span>
+          <el-form-item label="原语言" label-width="100px" class="add-form-item">
+            <div class="content">{{ StandardApplyForEO.sourceLanguage ? StandardApplyForEO.sourceLanguage : '--' }}</div>
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="目标语言"  label-width="100px" class="add-form-item">
-            <span>{{StandardApplyForEO.targetLanguage ? StandardApplyForEO.targetLanguage : '--'}}</span>
+          <el-form-item label="目标语言" label-width="100px" class="add-form-item">
+            <div class="content">{{ StandardApplyForEO.targetLanguage ? StandardApplyForEO.targetLanguage : '--' }}</div>
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="理由"  label-width="100px" class="add-form-item">
-            <span>{{StandardApplyForEO.reason ? StandardApplyForEO.reason : '--'}}</span>
+          <el-form-item label="理由" label-width="100px" class="add-form-item reasonContent">
+            <div class="content">{{ StandardApplyForEO.reason ? StandardApplyForEO.reason : '--' }}</div>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <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-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-form-item label="驳回理由" label-width="100px" class="add-form-item">
+            <div class="content">{{ StandardApplyForEO.refuseCause ? StandardApplyForEO.refuseCause : '--'  }}</div>
           </el-form-item>
         </el-col>
       </el-row>
     </el-form>
-    <div class="drawer-footer">
-      <el-button  class="common-button-default" @click="visible=false">关闭</el-button>
+    <div>
+      <div class="drawer-footer">
+        <el-button class="common-button-default" @click="visible=false">关闭</el-button>
+      </div>
     </div>
   </el-drawer>
 </template>
@@ -82,7 +99,7 @@
 <script>
 export default {
   name: 'AddModal',
-  data () {
+  data() {
     return {
       visible: false,
       showLoading: false,
@@ -91,10 +108,10 @@ export default {
     }
   },
   methods: {
-    handleClose () {
+    handleClose() {
       this.visible = false
     },
-    showModal (item) {
+    showModal(item) {
       this.visible = true
       this.$nextTick(() => {
         this.StandardApplyForEO = []
@@ -123,9 +140,9 @@ export default {
   background: #fff;
   z-index: 999;
 }
-.detail-modal-form {
-  /deep/ .el-form-item__content{
-    line-height: 50px;
-  }
+.content{
+  display: flex;
+  align-items: center;
+  min-height: 50px;
 }
 </style>
diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue
index f63c974d3..7ed4f6850 100644
--- a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue
+++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue
@@ -157,10 +157,10 @@
         <el-table-column label="操作" align="center" width="200" fixed="right">
           <template slot-scope="scope">
             <div class="table-operate-btn" @click="toView(scope.row)">查看</div>
-            <div v-show="scope.row.status==='pendingApproval'" class="table-operate-btn" @click="batchPass([scope.row.id])">通过</div>
-            <div v-show="scope.row.status==='pendingApproval'" class="table-operate-btn" @click="batchOverrule([scope.row.id])">驳回</div>
-            <div v-show="scope.row.status==='pendingApproval'" class="table-operate-btn" @click="batchOverrule([scope.row.id])">编辑</div>
-            <div v-show="scope.row.status==='pendingApproval'" class="table-operate-btn" @click="batchOverrule([scope.row.id])">重新提交</div>
+            <div v-show="scope.row.buttonFlag ==='Audit'" class="table-operate-btn" @click="batchPass([scope.row.id])">通过</div>
+            <div v-show="scope.row.buttonFlag ==='Audit'" class="table-operate-btn" @click="batchOverrule([scope.row.id])">驳回</div>
+            <div v-show="scope.row.buttonFlag ==='editOrDelete'" class="table-operate-btn" @click="edit(scope.row)">编辑</div>
+            <div v-show="scope.row.status==='refuse'" class="table-operate-btn" @click="batchOverrule([scope.row.id])">重新提交</div>
           </template>
         </el-table-column>
       </el-table>
@@ -174,6 +174,7 @@
     </div>
     <standardsAndTranslationModal ref="standardsAndTranslationModalRef" @updateIndexList="getList" />
     <detailModal ref="detailModalRef" />
+    <addModal ref="addModalRef" @updateList="getList"></addModal>
     <exportDialog ref="exportDialogRef" @exportData="exportName" />
     <Role-tree
       :is-title="drawerTitle"
@@ -187,6 +188,7 @@
 <script>
 import standardsAndTranslationModal from './components/standardTranslationAcquisitionRequestModal';
 import detailModal from './components/detailModal';
+import addModal from './components/addModal';
 import exportDialog from './components/exportDialog';
 import axios from '@/common/axiosV2'
 
@@ -195,7 +197,8 @@ export default {
   components: {
     standardsAndTranslationModal,
     detailModal,
-    exportDialog
+    exportDialog,
+    addModal
   },
   data () {
     return {
@@ -248,6 +251,9 @@ export default {
     this.getDicTypeListCode()
   },
   methods: {
+    edit (item) {
+      this.$refs.addModalRef.showModal(item)
+    },
     checkedRole (data) {
       let idList = ''
       let nameList = ''