From 7ea86593caaa40c5f1cc4b235e332699da61cd7e Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Tue, 19 Mar 2024 16:17:58 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E6=A0=87=E5=87=86=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=EF=BC=8C=E4=BC=9A?=
 =?UTF-8?q?=E5=91=98=E7=BB=9F=E8=AE=A1=E9=A5=BC=E5=9B=BE=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E5=8A=A0=E5=AF=BC=E5=87=BA=EF=BC=8C=E6=A0=87=E5=8D=8F=E4=BC=9A?=
 =?UTF-8?q?=E5=91=98=E6=88=90=E5=91=98=E7=BB=B4=E6=8A=A4=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E7=94=9F=E6=95=88=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E5=92=8C=E5=A4=B1=E6=95=88=E6=97=A5=E6=9C=9F=E3=80=81?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=8B=E8=BD=BD=E6=A8=A1=E6=9D=BF=E5=92=8C?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SafeguardStardsMemberList.vue             | 62 +++++++++++--------
 .../memberManage/StardsMemberStatistics.vue   |  4 +-
 .../memberManage/StardsStandardStatistics.vue | 39 ++++++++++++
 .../modules/StardsMemberStatisticsModal.vue   | 17 ++---
 4 files changed, 86 insertions(+), 36 deletions(-)

diff --git a/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue b/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue
index b6903f3..8cb37ac 100644
--- a/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue
+++ b/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue
@@ -70,28 +70,28 @@
               ></j-dict-select-tag>
             </a-form-item>
           </a-col>
-<!--          <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
-<!--            <a-form-item label="生效日期">-->
-<!--              <a-range-picker-->
-<!--                style="width: 100%"-->
-<!--                v-model="queryParam.estimatedArrivalDate"-->
-<!--                format="YYYY-MM-DD"-->
-<!--                :placeholder="['开始时间', '结束时间']"-->
-<!--                @change="onDateChange"-->
-<!--              />-->
-<!--            </a-form-item>-->
-<!--          </a-col>-->
-<!--          <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
-<!--            <a-form-item label="失效日期">-->
-<!--              <a-range-picker-->
-<!--                style="width: 100%"-->
-<!--                v-model="queryParam.estimatedArrivalDate"-->
-<!--                format="YYYY-MM-DD"-->
-<!--                :placeholder="['开始时间', '结束时间']"-->
-<!--                @change="onDateChange"-->
-<!--              />-->
-<!--            </a-form-item>-->
-<!--          </a-col>-->
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="生效日期">
+              <a-month-picker
+                style="width: 100%"
+                v-model="queryParam.effectiveDate"
+                format="YYYY-MM"
+                value-format="YYYY-MM"
+                placeholder="请选择生效日期"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="失效日期">
+              <a-month-picker
+                style="width: 100%"
+                v-model="queryParam.invalidationDate"
+                format="YYYY-MM"
+                value-format="YYYY-MM"
+                placeholder="请选择失效日期"
+              />
+            </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" v-has="'safeguardStardsMember:search'">查询</a-button>
@@ -115,10 +115,11 @@
       </a-button>
       <a-button type="danger" icon="delete" @click="batchDel">批量删除</a-button>
       <a-button type="primary" icon="copy" @click="handleMemberBatchCopy">批量复制</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-button type="primary" icon="download" @click="downTemplate('标协会员成员导入模板')">下载模板</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>
     </div>
 
     <!-- table区域-begin -->
@@ -234,6 +235,11 @@ export default {
     MemberEquityModal,
     MemberCopyModal
   },
+  computed: {
+    importExcelUrl: function () {
+      return `${ window._CONFIG['domianURL'] }/${ this.url.importExcelUrl }`
+    }
+  },
   data() {
     return {
       ProjectTypeEnums,
@@ -366,7 +372,9 @@ export default {
         list: '/member/tbMemberProjectSubitem/page',
         exportXlsUrl: '/member/tbMemberProjectSubitem/exportXls',
         delete: '/member/tbMemberProjectSubitem/delete',
-        deleteBatch: '/member/tbMemberProjectSubitem/deleteBatch'
+        deleteBatch: '/member/tbMemberProjectSubitem/deleteBatch',
+        downTemplateUrl: '',
+        importExcelUrl: ''
       }
     }
   },
diff --git a/src/views/incomePayments/memberManage/StardsMemberStatistics.vue b/src/views/incomePayments/memberManage/StardsMemberStatistics.vue
index 7ca1ac5..7979c98 100644
--- a/src/views/incomePayments/memberManage/StardsMemberStatistics.vue
+++ b/src/views/incomePayments/memberManage/StardsMemberStatistics.vue
@@ -250,9 +250,9 @@ export default {
       console.log(params)
       // 获取当前点击的饼状图的名字
       let queryData = {
-        memberNature: params.data.memberNature // 会员性质
+        memberNature: params.data.memberNature, // 会员性质
       }
-      this.$refs.stardsMemberStatisticsModal.show(queryData)
+      this.$refs.stardsMemberStatisticsModal.show(queryData, params.data.name)
     },
   }
 }
diff --git a/src/views/incomePayments/memberManage/StardsStandardStatistics.vue b/src/views/incomePayments/memberManage/StardsStandardStatistics.vue
index 24defe4..c8f157c 100644
--- a/src/views/incomePayments/memberManage/StardsStandardStatistics.vue
+++ b/src/views/incomePayments/memberManage/StardsStandardStatistics.vue
@@ -2,6 +2,45 @@
   <div>
     <page-header-title :img-for-icon="IconImg"></page-header-title>
     <a-card :bordered="false">
+      <!-- 查询区域 -->
+      <div class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="searchQuery">
+          <a-row :gutter="24">
+            <a-col :xxl="6" :xl="9"  :sm="24">
+              <a-form-item label="会议名称">
+                <a-input placeholder="请输入会议名称" v-model="queryParam.meetingName" :maxLength='50'></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :xxl="6" :xl="9"  :sm="24">
+              <a-form-item label="标准编号">
+                <a-input placeholder="请输入标准编号" v-model="queryParam.standardNo" :maxLength='50'></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :xxl="6" :xl="9"  :sm="24">
+              <a-form-item label="标准名称">
+                <a-input placeholder="请输入标准名称" v-model="queryParam.standardName" :maxLength='50'></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :xxl="6" :xl="9"  :sm="24">
+              <a-form-item label="标准类别">
+                <j-dict-select-tag dict-code="standard_type" placeholder="请选择标准类别" v-model="queryParam.standardType"/>
+              </a-form-item>
+            </a-col>
+            <a-col :xxl="6" :xl="9"  :sm="24">
+              <a-form-item label="制修订">
+                <j-dict-select-tag dict-code="preparation_and_revision" placeholder="请选择制修订" v-model="queryParam.preparationAndRevision"/>
+              </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 @click="searchReset" icon="reload" class="reset-button" style="margin-left: 8px">重置</a-button>
+            </span>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+      <!-- 查询区域-END -->
       <div>
         <a-table
           ref="table"
diff --git a/src/views/incomePayments/memberManage/modules/StardsMemberStatisticsModal.vue b/src/views/incomePayments/memberManage/modules/StardsMemberStatisticsModal.vue
index 9671fb0..5ca9afe 100644
--- a/src/views/incomePayments/memberManage/modules/StardsMemberStatisticsModal.vue
+++ b/src/views/incomePayments/memberManage/modules/StardsMemberStatisticsModal.vue
@@ -9,9 +9,9 @@
     @cancel="handleCancel"
     cancelText="关闭">
     <a-spin :spinning="confirmLoading">
-<!--      <div class="table-operator">-->
-<!--        <a-button type="primary" icon="export" @click="handleExportXls(seriesName + '应收账款')">导出</a-button>-->
-<!--      </div>-->
+      <div class="table-operator">
+        <a-button type="primary" icon="export" @click="handleExportXls(name + '详情')">导出</a-button>
+      </div>
       <a-table
         ref="table"
         size="middle"
@@ -186,16 +186,19 @@ export default {
       ],
       dataSource: [],
       url: {
-        list: '/statistics/member/pieChartPage'
+        list: '/statistics/member/pieChartPage',
+        exportXlsUrl: ''
       },
-      disableMixinCreated: true
+      disableMixinCreated: true,
+      name: ''
     }
   },
   methods: {
     formatMoney,
-    show (param) {
+    show (param, name) {
       this.filters = Object.assign({}, param)
       this.loadData(1)
+      this.name = name
       this.visible = true
     },
     handleCancel () {
@@ -206,5 +209,5 @@ export default {
 </script>
 
 <style scoped lang="less">
-
+@import '~@assets/less/common.less';
 </style>
\ No newline at end of file