[update] 标准统计加查询条件，会员统计饼图详情加导出，标协会员成员维护增加查询条件生效日期和失效日期、增加下载模板和导入按钮

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: ''
       }
     }
   },

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)
     },
   }
 }

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"

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>