From 0be61e3b97aea1e8f608426c21aa4b71d72d9051 Mon Sep 17 00:00:00 2001
From: baoyu <102349094+Bytq@users.noreply.github.com>
Date: Thu, 28 Mar 2024 17:34:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86/=E8=AF=91=E6=96=87=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E7=94=B3=E8=AF=B7=20=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/exportDialog.vue               |  3 +-
 .../index.vue                                 | 42 +++++++++++++++----
 2 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/exportDialog.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/exportDialog.vue
index 2de2c53e0..c96204a9a 100644
--- a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/exportDialog.vue
+++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/exportDialog.vue
@@ -31,7 +31,8 @@ export default {
       this.exportModelFlag = false
     },
     submit () {
-      this.$emit('exportName', this.exportName)
+      this.$emit('exportData', this.exportName)
+      this.exportModelFlag = false
     }
   }
 }
diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue
index 24464c14d..7bd6c5704 100644
--- a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue
+++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue
@@ -20,7 +20,20 @@
           </el-select>
         </el-form-item>
         <el-form-item class="el-form-item search-item" label="申请单位">
-          <el-select v-model="StandardApplyForEOPage.applyForUnitIds" clearable placeholder="请选择申请单位" />
+          <el-select
+            v-model="StandardApplyForEOPage.applyForUnitIds"
+            :placeholder="'请选择申请单位'"
+            clearable
+          >
+            <el-option
+              v-for="opt in applicantUnitList"
+              :key="opt.value"
+              :value="opt.value === undefined ? '' :opt.value"
+              :label="opt.label"
+            >
+              {{ opt.label }}
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item class="el-form-item search-item" label="申请人">
           <el-select v-model="StandardApplyForEOPage.applyForUserIds" clearable placeholder="请选择申请人" />
@@ -118,7 +131,7 @@
           prop="standNum"
         >
           <template slot-scope="scope">
-            {{ scope.row.standLb }}{{ scope.row.standName }}{{ scope.row.standYear}}
+            {{ scope.row.standLb }}{{ scope.row.standName }}{{ scope.row.standYear }}
           </template>
         </el-table-column>
         <el-table-column
@@ -165,6 +178,8 @@
             <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>
           </template>
         </el-table-column>
       </el-table>
@@ -178,7 +193,7 @@
     </div>
     <standardsAndTranslationModal ref="standardsAndTranslationModalRef" @updateIndexList="getList" />
     <detailModal ref="detailModalRef" />
-    <exportDialog ref="exportDialogRef" />
+    <exportDialog ref="exportDialogRef" @exportData="exportData" />
   </div>
 </template>
 
@@ -206,9 +221,11 @@ export default {
       selectedList: [],
       url: {
         getList: '/lawss/standardApplyFor/queryByPage',
-        updateState: '/lawss/standardApplyFor/batchUpdateStatus'
+        updateState: '/lawss/standardApplyFor/batchUpdateStatus',
+        exportData: '/lawss/standardApplyFor/exportStandardApplyForEOExcel'
       },
       typeList: [],
+      applicantUnitList: [],
       statusList: [
         {
           label: '通过',
@@ -243,6 +260,7 @@ export default {
         _this: this
       }, res => {
         this.typeList = res.data.BZJYWTYPE // 标准类别
+        this.applicantUnitList = res.data.QCDW// 申请单位
       }, e => {
       })
     },
@@ -276,8 +294,6 @@ export default {
         this.tableLoading = false
       })
     },
-
-    // 需要调整
     batchPass (id) {
       if (id.length === 0) {
         this.$message({
@@ -338,9 +354,19 @@ export default {
         this.$refs.selections.clearSelection()
       })
     },
-
-    exportName (name) {
+    exportData (name) {
+      let params = {
+        ...this.StandardApplyForEOPage,
+        exportFileName: name,
+        ids: this.selectedList.length > 0 ? this.selectedList.join(',') : ''
+      }
+      let url = '/api/lawss/standardApplyFor/exportStandardApplyForEOExcel?'
+      for (let key in params) {
+        url += `${key}=${params[key]}&`
+      }
+      window.open(url.slice(0, -1))
     },
+
     exportList () {
       this.$refs.exportDialogRef.openModel()
     },