会员项目调整

src/views/incomePayments/memberManage/MemberProjectList.vue

@@ -20,7 +20,7 @@
             <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>
+              <a-button @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
             </span>
             </a-col>
           </a-row>
@@ -30,7 +30,7 @@
 
       <!-- 操作按钮区域 -->
       <div class="table-operator">
-        <a-button @click="handleAdd" type="primary" icon="plus">添加</a-button>
+        <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
         <a-button type="primary" icon="download" @click="handleExportXls('会员项目')">导出</a-button>
         <a-button type="danger" icon="delete" @click="batchDel">批量删除</a-button>
         <!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"-->

src/views/incomePayments/memberManage/SafeguardMemberList.vue

@@ -1,36 +1,39 @@
 <template>
+<div>
+  <page-header-title :is-level-one="false" :level-two-title="currentInfo.projectName"></page-header-title>
   <a-card :bordered="false">
     <!-- 会员项目基本信息-->
-    <section class="project-base-info-title">
-      <span @click="handleReback" class="back"><a-icon type="left"/></span>
-      <h2 class="title">会员项目信息</h2>
-    </section>
-    <div class="line"></div>
     <div class="project-base-info">
+      <div class="part-title">
+        <div class="part-title-text">会员项目信息</div>
+      </div>
       <section class="project-base-info-content">
         <a-row :gutter="24">
-          <a-col :xl="6" :lg="4" :md="4" :sm="8">
+          <a-col :xxl="8" :xl="12"  :sm="24">
             <label>会员项目:</label><span>{{ currentInfo.projectName }}</span>
           </a-col>
-          <a-col :xl="4" :lg="4" :md="4" :sm="8">
+          <a-col :xxl="8" :xl="12"  :sm="24">
             <label>负责人:</label><span>{{ currentInfo.directorName }}</span>
           </a-col>
-          <a-col :xl="5" :lg="4" :md="4" :sm="8">
+          <a-col :xxl="8" :xl="12"  :sm="24">
             <label>收费标准:</label><span>{{ currentInfo.chargeStandard }}</span>
           </a-col>
-          <a-col :xl="4" :lg="4" :md="4" :sm="8">
+          <a-col :xxl="8" :xl="12"  :sm="24">
             <label>收费通知号:</label><span>{{ currentInfo.chargeNoticeNo }}</span>
           </a-col>
-          <a-col :xl="5" :lg="4" :md="4" :sm="8">
+          <a-col :xxl="8" :xl="12"  :sm="24">
             <label>收费通知:</label><span class="primary-color">{{ currentInfo.fileName }}</span>
           </a-col>
-          <a-col :xl="8" :lg="8" :md="8" :sm="24">
+          <a-col :xxl="8" :xl="12"  :sm="24">
             <label>备注:</label><span>{{ currentInfo.remark }}</span>
           </a-col>
         </a-row>
       </section>
     </div>
     <!-- 查询区域 -->
+    <div class="part-title">
+      <div class="part-title-text">会员单位信息</div>
+    </div>
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
@@ -47,7 +50,7 @@
           <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>
+              <a-button  @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
             </span>
           </a-col>
         </a-row>
@@ -57,7 +60,7 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">添加</a-button>
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
                 @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
@@ -72,17 +75,17 @@
     <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">
+        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="text" slot-scope="text">
           <j-ellipsis v-if="text" :value="text" :length="20"></j-ellipsis>
@@ -111,6 +114,7 @@
     <!--项目详情模态框-->
     <project-detail-modal ref="projectDetail"></project-detail-modal>
   </a-card>
+</div>
 </template>
 
 <script>
@@ -121,7 +125,7 @@ import SafeguardMemberModal from '@views/incomePayments/memberManage/modules/Saf
 import ProjectDetailModal from '@comp/ProjectDetailModal'
 import StatusSlot from '@comp/tools/StatusSlot'
 import PageHeaderTitle from '@comp/layouts/PageHeaderTitle'
-import IconImg from '@/assets/imgs/icon/icon_company_management.png'
+
 
 import {getAction} from '@api/manage'
 import {getFileInfo} from '@api/api'
@@ -139,7 +143,6 @@ export default {
   data() {
     return {
       description: '会员项目成员维护页面',
-      IconImg,
       columns: [
         {
           title: '序号',
@@ -243,12 +246,6 @@ export default {
     openDetail(record) {
       this.$refs.projectDetail.open(record)
     },
-    /*
-    *  返回上级
-    * */
-    handleReback() {
-      this.$router.go(-1)
-    },
     loadData(arg) {
       if (!this.url.list) {
         this.$message.error('请设置url.list属性!')

src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue

@@ -1,4 +1,6 @@
 <template>
+<div>
+  <page-header-title :is-level-one="false" :level-two-title="$route.query.projectName"></page-header-title>
   <a-card :bordered="false">
     <!-- 查询区域 -->
     <div class="table-page-search-wrapper">
@@ -18,14 +20,13 @@
               class="table-page-search-submitButtons"
             >
               <a-button type="primary" @click="searchQuery" icon="search"
-                >查询</a-button
+              >查询</a-button
               >
               <a-button
-                type="primary"
                 @click="searchReset"
                 icon="reload"
                 style="margin-left: 8px"
-                >重置</a-button
+              >重置</a-button
               >
             </span>
           </a-col>
@@ -41,7 +42,7 @@
         type="primary"
         icon="download"
         @click="handleExportXls('标协会员')"
-        >导出</a-button
+      >导出</a-button
       >
       <!--      <a-button type="danger" icon="delete" @click="batchDel">批量删除</a-button>-->
       <!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"-->
@@ -99,6 +100,7 @@
     </div>
     <project-detail-modal ref="projectDetail"></project-detail-modal>
   </a-card>
+</div>
 </template>
 
 <script>
@@ -107,6 +109,7 @@ import { JeroListMixin } from '@/mixins/JeroListMixin'
 import ProjectDetailModal from '@comp/ProjectDetailModal'
 import '@/assets/less/TableExpand.less'
 import StatusSlot from '@comp/tools/StatusSlot'
+import PageHeaderTitle from '@comp/layouts/PageHeaderTitle'
 
 export default {
   name: 'SafeguardStardsMemberList',
@@ -114,6 +117,7 @@ export default {
   components: {
     ProjectDetailModal,
     StatusSlot,
+    PageHeaderTitle
   },
   data() {
     return {

src/views/incomePayments/memberManage/StardsMemberProjectList.vue

@@ -14,7 +14,7 @@
             <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>
+              <a-button @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
             </span>
             </a-col>
           </a-row>
@@ -116,7 +116,8 @@ export default {
       this.$router.push({
         path: '/incomePayments/memberManage/SafeguardStardsMemberList',
         query: {
-          id:record.id
+          id:record.id,
+          projectName:record.projectName
         }
       })
     }

src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue

@@ -315,7 +315,7 @@ export default {
 
       // 如果没有id 就是新增 新增需要将上级的项目收费通知与文件回显
       let flag = Object.prototype.hasOwnProperty.call(record, 'id')
-      if (flag) {
+      if (!flag) {
         // 加定时器是因为第一次赋值不成功
         this.timer = setTimeout(() => {
           this.form.setFieldsValue({