From 43591631cf8ce8d5a85b8cf9821170a124961f8c Mon Sep 17 00:00:00 2001
From: baoyu <102349094+Bytq@users.noreply.github.com>
Date: Fri, 29 Mar 2024 19:21:25 +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=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/detailModal.vue                | 88 ++++++++++++-------
 .../index.vue                                 | 42 ++++++++-
 2 files changed, 93 insertions(+), 37 deletions(-)

diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/detailModal.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/detailModal.vue
index d1ceff652..00c12fcc2 100644
--- a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/detailModal.vue
+++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/detailModal.vue
@@ -1,16 +1,16 @@
 <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 style="padding-bottom: 80px">
+    <el-form ref="addFormRef" style="padding-bottom: 80px" :model="StandardApplyForEO" class="label-input-form detail-modal-form">
+      <el-row class="formLine">
         <el-col :span="12">
           <el-form-item label="申请单位" label-width="100px" class="add-form-item">
             <div class="content">{{ StandardApplyForEO.applyForUnitName ? StandardApplyForEO.applyForUnitName : '--' }}</div>
@@ -21,6 +21,9 @@
             <div class="content">{{ StandardApplyForEO.applyForUserName ? StandardApplyForEO.applyForUserName : '--' }}</div>
           </el-form-item>
         </el-col>
+      </el-row>
+
+      <el-row class="formLine">
         <el-col :span="12">
           <el-form-item label="类型" label-width="100px" class="add-form-item">
             <div class="content">{{ StandardApplyForEO.typeShow ? StandardApplyForEO.typeShow : '--' }}</div>
@@ -28,19 +31,25 @@
         </el-col>
         <el-col :span="12">
           <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">
-            <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">
-            <div class="content">{{ StandardApplyForEO.standNumShow ? StandardApplyForEO.standNumShow : '--' }}</div>
+            <div>{{ StandardApplyForEO.standTypeShow ? StandardApplyForEO.standTypeShow : '--' }}</div>
           </el-form-item>
         </el-col>
+      </el-row>
+
+      <el-row class="formLine">
+          <el-col :span="12">
+            <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">
+              <div class="content">{{ StandardApplyForEO.standNumShow ? StandardApplyForEO.standNumShow : '--' }}</div>
+            </el-form-item>
+          </el-col>
+      </el-row>
+
+      <el-row class="formLine">
         <el-col :span="12">
           <el-form-item label="标准年份" label-width="100px" class="add-form-item">
             <div class="content">{{ StandardApplyForEO.standYear ? StandardApplyForEO.standYear : '--' }}</div>
@@ -51,11 +60,17 @@
             <div class="content">{{ StandardApplyForEO.requiredTime ? StandardApplyForEO.requiredTime : '--' }}</div>
           </el-form-item>
         </el-col>
+      </el-row>
+
+      <el-row class="formLine">
         <el-col :span="24">
           <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-row>
+
+      <el-row class="formLine">
         <el-col :span="12">
           <el-form-item label="原语言" label-width="100px" class="add-form-item">
             <div class="content">{{ StandardApplyForEO.sourceLanguage ? StandardApplyForEO.sourceLanguage : '--' }}</div>
@@ -66,24 +81,30 @@
             <div class="content">{{ StandardApplyForEO.targetLanguage ? StandardApplyForEO.targetLanguage : '--' }}</div>
           </el-form-item>
         </el-col>
+      </el-row>
+
+      <el-row class="formLine">
         <el-col :span="24">
           <el-form-item label="理由" label-width="100px" class="add-form-item reasonContent">
             <div class="contentLine">{{ StandardApplyForEO.reason ? StandardApplyForEO.reason : '--' }}</div>
           </el-form-item>
         </el-col>
-        <el-col :span="12" v-show="StandardApplyForEO.status !== 'pendingApproval' && StandardApplyForEO.status !== 'Staging'">
+      </el-row>
+
+      <el-row>
+        <el-col v-show="StandardApplyForEO.status !== 'pendingApproval' && StandardApplyForEO.status !== 'Staging'" :span="12" class="formLine">
           <el-form-item label="审批人" label-width="100px" class="add-form-item">
             <div class="content">{{ StandardApplyForEO.approveUserName ? StandardApplyForEO.approveUserName : '--' }}</div>
           </el-form-item>
         </el-col>
-        <el-col :span="12" v-show="StandardApplyForEO.status !== 'pendingApproval' && StandardApplyForEO.status !== 'Staging'">
+        <el-col v-show="StandardApplyForEO.status !== 'pendingApproval' && StandardApplyForEO.status !== 'Staging'" :span="12" class="formLine">
           <el-form-item label="审批时间" label-width="100px" class="add-form-item">
-            <div class="content">{{ StandardApplyForEO.approveTime ? StandardApplyForEO.approveTime : '--'  }}</div>
+            <div class="content">{{ StandardApplyForEO.approveTime ? StandardApplyForEO.approveTime : '--' }}</div>
           </el-form-item>
         </el-col>
-        <el-col :span="24" v-show="StandardApplyForEO.status !== 'pendingApproval' && StandardApplyForEO.status !== 'Staging' && StandardApplyForEO.status !== 'pass'">
+        <el-col v-show="StandardApplyForEO.status !== 'pendingApproval' && StandardApplyForEO.status !== 'Staging' && StandardApplyForEO.status !== 'pass'" :span="24" class="formLine">
           <el-form-item label="驳回原因" label-width="100px" class="add-form-item">
-            <div class="contentLine">{{ StandardApplyForEO.refuseCause ? StandardApplyForEO.refuseCause : '--'  }}</div>
+            <div class="contentLine">{{ StandardApplyForEO.refuseCause ? StandardApplyForEO.refuseCause : '--' }}</div>
           </el-form-item>
         </el-col>
       </el-row>
@@ -99,7 +120,7 @@
 <script>
 export default {
   name: 'AddModal',
-  data() {
+  data () {
     return {
       visible: false,
       showLoading: false,
@@ -108,10 +129,10 @@ export default {
     }
   },
   methods: {
-    handleClose() {
+    handleClose () {
       this.visible = false
     },
-    showModal(item) {
+    showModal (item) {
       this.visible = true
       this.$nextTick(() => {
         this.StandardApplyForEO = []
@@ -143,12 +164,13 @@ export default {
 .content{
   display: flex;
   align-items: center;
-  height: 50px;
+  min-height: 50px;
   overflow: auto;
 }
-.contentLine{
-  display: flex;
-  align-items: center;
-  min-height: 50px;
+.add-form-item{
+  border-bottom: none;
+}
+.formLine{
+  border-bottom: 1px dashed #e5e5e5
 }
 </style>
diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue
index f70e3621e..1dd264734 100644
--- a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue
+++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue
@@ -26,7 +26,7 @@
             clearable
             placeholder="请选择申请单位"
             readonly
-            @click.native="choiceZRBM('dep', '选择责任部门', StandardApplyForEOPage.applyForUnitIds)"
+            @click.native="choiceZRBM('dep', '选择申请单位', StandardApplyForEOPage.applyForUnitIds)"
           />
         </el-form-item>
         <el-form-item class="el-form-item search-item" label="申请人">
@@ -143,8 +143,8 @@
         <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.buttonFlag ==='Audit'" v-btn-permission="'3bc041e58bcb4b0510bcc1aad0b9ce89'" class="table-operate-btn" @click="batchPass([scope.row.id])">通过</div>
-            <div v-show="scope.row.buttonFlag ==='Audit'" v-btn-permission="'92adace8c9a703b3b2472f684808db98'" class="table-operate-btn" @click="batchOverrule([scope.row.id])">驳回</div>
+            <div v-show="scope.row.status ==='pendingApproval'" v-btn-permission="'3bc041e58bcb4b0510bcc1aad0b9ce89'" class="table-operate-btn" @click="batchPass([scope.row.id])">通过</div>
+            <div v-show="scope.row.status ==='pendingApproval'" v-btn-permission="'92adace8c9a703b3b2472f684808db98'" class="table-operate-btn" @click="batchOverrule([scope.row.id])">驳回</div>
             <div
               v-if="account === scope.row.createBy"
               v-show="scope.row.status ==='pendingApproval'"
@@ -172,6 +172,15 @@
             >
               重新提交
             </div>
+            <div
+              v-if="account === scope.row.createBy"
+              v-show="scope.row.buttonFlag  && (scope.row.status === 'refuse' || scope.row.status === 'draft')"
+              v-btn-permission="'a55384a8a4ba4cbb0ab5a1155faa44f5'"
+              class="table-operate-btn"
+              @click="batchDelete (scope.row.id)"
+            >
+              删除
+            </div>
           </template>
         </el-table-column>
       </el-table>
@@ -240,7 +249,8 @@ export default {
       url: {
         getList: '/lawss/standardApplyFor/queryByPage',
         updateState: '/lawss/standardApplyFor/batchUpdateStatus',
-        exportData: '/lawss/standardApplyFor/exportStandardApplyForEOExcel'
+        exportData: '/lawss/standardApplyFor/exportStandardApplyForEOExcel',
+        deleteUrl: '/lawss/standardApplyFor/batchUpdateValidFlag',
       },
       typeList: [],
       applicantUnitList: [],
@@ -280,6 +290,30 @@ export default {
     this.getDicTypeListCode()
   },
   methods: {
+    batchDelete (id) {
+      let ids = ''
+      let tipsText = ''
+      if (id) {
+        ids = id
+        tipsText = '确认删除这条数据？'
+      }
+      this.$confirm(tipsText, '提示', {
+        confirmButtonText: '确定',
+        confirmButtonClass: 'common-button-primary',
+        cancelButtonText: '取消',
+        type: 'warning',
+        roundButton: false
+      }).then(() => {
+        this.$http.postData(this.url.deleteUrl, { ids: ids }, { _this: this }, res => {
+          if (res.ok) {
+            this.$message.success('操作成功')
+            this.getList()
+          }else{
+            this.$message.warning(res.message)
+          }
+        })
+      })
+    },
     drawerCheckDep (data) {
       let idList = ''
       let nameList = ''