From 30ab8896a28a1d6c51ece478c522ad3a3e7314da Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Wed, 26 Oct 2022 17:22:15 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E6=94=B6?=
 =?UTF-8?q?=E8=B4=B9=E9=80=9A=E7=9F=A5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/router.config.js                   |  25 ++-
 .../ApprovalDocumentNumberList.vue            | 180 ++++++++++++++++++
 .../modules/CombinationPaymentModal.vue       |  14 +-
 .../feehandle/FeeHandle.vue                   |  57 +++++-
 4 files changed, 263 insertions(+), 13 deletions(-)
 create mode 100644 src/views/standardsAssociation/ApprovalDocumentNumberList.vue

diff --git a/src/config/router.config.js b/src/config/router.config.js
index ca77bba..9e7b114 100644
--- a/src/config/router.config.js
+++ b/src/config/router.config.js
@@ -164,7 +164,8 @@ export const routerData = [
         name: 'standardsAssociation-BasicInfo',
         path: '/standardsAssociation/BasicInfo',
         route: '1'
-      }, {
+      },
+      {
         component: 'standardsAssociation/MemberManagement',
         id: 'standardsMemberManagement4-2',
         meta: {
@@ -176,7 +177,8 @@ export const routerData = [
         name: 'standardsAssociation-MemberManagement',
         path: '/standardsAssociation/MemberManagement',
         route: '1'
-      }, {
+      },
+      {
         component: 'standardsAssociation/Council',
         id: 'standardsCouncil4-5',
         meta: {
@@ -201,7 +203,8 @@ export const routerData = [
         name: 'standardsAssociation-StandardPublicizingImplementation',
         path: '/standardsAssociation/StandardPublicizingImplementation',
         route: '1'
-      }, {
+      },
+      {
         component: 'standardsAssociation/InfoCommunicationMeeting',
         id: 'standardsInfoCommunicationMeeting4-7',
         meta: {
@@ -213,7 +216,8 @@ export const routerData = [
         name: 'standardsAssociation-InfoCommunicationMeeting',
         path: '/standardsAssociation/InfoCommunicationMeeting',
         route: '1'
-      }, {
+      },
+      {
         component: 'standardsAssociation/TrainingMeeting',
         id: 'standardsTrainingMeeting4-8',
         meta: {
@@ -335,6 +339,19 @@ export const routerData = [
         name: 'member-vinCertificate-Authorization',
         path: '/standardsAssociation/vinCertificate/Authorization',
         route: '1'
+      },
+      {
+        component: 'standardsAssociation/ApprovalDocumentNumberList',
+        id: 'standardsAuthorization4-4',
+        meta: {
+          keepAlive: false,
+          internalOrExternal: false,
+          componentName: 'ApprovalDocumentNumberList',
+          title: '收费通知'
+        },
+        name: 'member-standardsAssociation-approvalDocumentNumberList',
+        path: '/standardsAssociation/approvalDocumentNumberList',
+        route: '1'
       }
 
     ]
diff --git a/src/views/standardsAssociation/ApprovalDocumentNumberList.vue b/src/views/standardsAssociation/ApprovalDocumentNumberList.vue
new file mode 100644
index 0000000..b825771
--- /dev/null
+++ b/src/views/standardsAssociation/ApprovalDocumentNumberList.vue
@@ -0,0 +1,180 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="时间（年）" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <!--              <a-input placeholder="请输入时间（年）" v-model="queryParam.dateYear"></a-input>-->
+              <j-year-date style="width: 100%" placeholder="请选择时间（年）" v-model="queryParam.dateYear"></j-year-date>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus" v-has="'approvalDocumentNumber:add'">新增</a-button>
+      <a-button @click="batchDel" style="background:#ff4d4f;" type="danger" icon="delete" v-has="'approvalDocumentNumber:deleteBatch'">删除</a-button>
+      <!--      <a-button type="primary" icon="download" @click="handleExportXls('批复文号表')">导出</a-button>-->
+      <!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+      <!--        <a-button type="primary" icon="import">导入</a-button>-->
+      <!--      </a-upload>-->
+      <!--      <a-dropdown v-if="selectedRowKeys.length > 0">-->
+      <!--        <a-menu slot="overlay">-->
+      <!--          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>-->
+      <!--        </a-menu>-->
+      <!--        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>-->
+      <!--      </a-dropdown>-->
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <a-table
+        ref="table"
+        size="middle"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <!--          <a-button-->
+          <!--            v-else-->
+          <!--            :ghost="true"-->
+          <!--            type="primary"-->
+          <!--            icon="download"-->
+          <!--            size="small"-->
+          <!--            @click="uploadFile(record.chargeNoticeFileId)">-->
+          <!--            下载-->
+          <!--          </a-button>-->
+          <j-ellipsis @click.native="uploadFile(record.chargeNoticeFileId)" style="color:#219AFF;cursor: pointer" :value="text" :length="10"/>
+        </template>
+
+        <span slot="action" class="action-span-cell" slot-scope="text, record">
+          <a @click="handleEdit(record)" v-has="'approvalDocumentNumber:edit'">编辑</a>
+          <a @click="handleDelete(record.id)" v-has="'approvalDocumentNumber:delete'">删除</a>
+        </span>
+
+      </a-table>
+    </div>
+
+  </a-card>
+</template>
+
+<script>
+import JYearDate from '@comp/jero/JYearDate'
+import JEllipsis from '@comp/jero/JEllipsis'
+import {StandardListMixin} from '@/mixins/StandardListMixin'
+import {JeroListMixin} from '@/mixins/JeroListMixin'
+import {getAction,getFileAccessHttpUrl} from '@api/memberManage'
+import '@/assets/less/TableExpand.less'
+
+export default {
+  name: 'ApprovalDocumentNumberList',
+  mixins:[StandardListMixin,JeroListMixin],
+  components:{
+    JYearDate,
+    JEllipsis
+  },
+  data() {
+    return {
+      getAction,
+      getFileAccessHttpUrl,
+      // 表头
+      columns: [
+        {
+          title: '序号',
+          dataIndex: '',
+          key: 'rowIndex',
+          width: 60,
+          align: 'center',
+          customRender: function (t, r, index) {
+            return parseInt(index) + 1
+          }
+        },
+        {
+          title: '批复文号',
+          align: 'center',
+          dataIndex: 'approvalDocumentNumber'
+        },
+        {
+          title: '时间（年）',
+          align: 'center',
+          dataIndex: 'dateYear',
+          customRender: function (text) {
+            return text + '年'
+          }
+        },
+        {
+          title: '收费通知单',
+          align: 'center',
+          dataIndex: 'chargeNoticeName',
+          scopedSlots: {customRender: 'fileSlot'}
+        },
+        // {
+        //   title: '操作',
+        //   dataIndex: 'action',
+        //   align: 'center',
+        //   // fixed:"right",
+        //   width: 147,
+        //   scopedSlots: {customRender: 'action'}
+        // }
+      ],
+      labelCol: {
+        xs: {span: 24},
+        sm: {span: 5}
+      },
+      wrapperCol: {
+        xs: {span: 24},
+        sm: {span: 10}
+      },
+      url: {
+        list: '/approvalDocumentNumber/approvalDocumentNumber/list',
+      },
+
+    }
+  },
+  methods:{
+    /* 文件下载 */
+    uploadFile(text) {
+      if (!text) {
+        this.$message.warning('未知的文件')
+        return
+      }
+      if (text.indexOf(',') > 0) {
+        text = text.substring(0, text.indexOf(','))
+      }
+      const url = this.getFileAccessHttpUrl(text)
+      window.open(url,'_self')
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+@import '~@assets/less/common.less';
+
+</style>
\ No newline at end of file
diff --git a/src/views/standardsAssociation/PaymentInfo/modules/CombinationPaymentModal.vue b/src/views/standardsAssociation/PaymentInfo/modules/CombinationPaymentModal.vue
index 393c18f..66b8160 100644
--- a/src/views/standardsAssociation/PaymentInfo/modules/CombinationPaymentModal.vue
+++ b/src/views/standardsAssociation/PaymentInfo/modules/CombinationPaymentModal.vue
@@ -11,7 +11,11 @@
     <a-spin :spinning="confirmLoading">
       <!--收款账户信息 begin-->
       <template>
-        <a-divider orientation="left">收款账户信息</a-divider>
+        <a-divider orientation="left">收款账户信息  <span
+          class="charge-notice"
+          @click="downChargeNotice(newestNoticeInfo.chargeNoticeFileId)">{{
+            newestNoticeInfo.chargeNoticeName
+          }}</span></a-divider>
         <a-row class="show-row">
           <a-col :span="12">
             <a-form-item label="账户名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -55,12 +59,6 @@
         <!--缴费 方式 费用类型begin -->
         <a-divider orientation="left">
           缴费信息
-          <span
-            v-if="isMember === 'member'"
-            class="charge-notice"
-            @click="downChargeNotice(newestNoticeInfo.chargeNoticeFileId)">{{
-              newestNoticeInfo.chargeNoticeName
-            }}</span>
         </a-divider>
         <a-row>
           <a-col :span="12">
@@ -1227,7 +1225,7 @@ export default {
         text = text.substring(0, text.indexOf(','))
       }
       const url = getFileAccessHttpUrl(text)
-      window.open(url, '_self')
+      window.open(url, )
     },
     /*
     * 查找最新的缴费通知单
diff --git a/src/views/standardsAssociation/feehandle/FeeHandle.vue b/src/views/standardsAssociation/feehandle/FeeHandle.vue
index cb2cb15..e79c4fc 100644
--- a/src/views/standardsAssociation/feehandle/FeeHandle.vue
+++ b/src/views/standardsAssociation/feehandle/FeeHandle.vue
@@ -8,6 +8,12 @@
         证书缴费
       </a-radio>
     </a-radio-group>
+    <div
+      class="charge-notice"
+      @click="handlePreview"
+    >{{
+        newestNoticeInfo.chargeNoticeName
+      }}</div>
     <!--    会员缴费 begin -->
     <member-info v-if="menuValue === 1"></member-info>
     <!--    会员缴费 end -->
@@ -23,6 +29,10 @@
 // import PaymentInfoList from '@views/member/paymentInfo/PaymentInfoList'
 import CertificateInfo from '@views/standardsAssociation/PaymentInfo/CertificateInfo'
 import MemberInfo from '@views/standardsAssociation/PaymentInfo/MemberInfo'
+import {downNewestNotice} from '@api/standardsAssociationApi'
+import {ACCESS_TOKEN} from '@/store/mutation-types'
+import Vue from  'vue'
+// import {previewPdf} from "@api/standardsAssociationApi";
 
 export default {
   name: 'FeeHandle',
@@ -33,14 +43,48 @@ export default {
   data() {
     return {
       menuValue: 1,
+      newestNoticeInfo:{},
       radioStyle: {
         display: 'block',
         height: '30px',
-        lineHeight: '30px'
+        lineHeight: '30px',
+
       }
     }
   },
+  created() {
+    this.getNewestNotice()
+  },
   methods: {
+    handlePreview() {
+      const file = {
+        id:this.newestNoticeInfo.chargeNoticeFileId,
+        name:this.newestNoticeInfo.chargeNoticeName
+      }
+      // eslint-disable-next-line no-unreachable
+      if (file ) {
+        const fileFullUrl = `${window._CONFIG['domianWebSocketURL']}/sys/common/download/${file.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.name}`
+        let url = `${window._CONFIG['onlinePreviewDomainURL']}?url=${encodeURIComponent(fileFullUrl)}`
+        console.log(url)
+        console.log(fileFullUrl)
+        // let url = `${window._CONFIG['onlinePreviewDomainURL']}?url=${encodeURIComponent(fileFullUrl)}`
+        window.open(url)
+      }
+    },
+    getFileUrl(fileId) {
+      return `${window._CONFIG['domianURL']}/sys/common/download/${fileId}`
+    },
+    /**
+    * 查找最新的缴费通知单
+    * */
+    getNewestNotice() {
+      this.newestNoticeInfo = {}
+      downNewestNotice().then(res => {
+        if (res.success) {
+          this.newestNoticeInfo = Object.assign({}, res.result)
+        }
+      })
+    },
     /**
      * 更换菜单
      * */
@@ -56,5 +100,16 @@ export default {
 </script>
 
 <style scoped lang="less">
+.charge-notice {
+  display: inline-block;
+  color: #219AFF;
+  cursor: pointer;
+  font-size: 14px;
+  padding: 20px;
+
+  position: absolute;
+  right: 0;
+  top: 0;
+}
 
 </style>