党员发展管理功能

src/api/PartyBuildingMgr/FullPartyMember.js

@@ -12,8 +12,8 @@ export function listFullPartyMember(query) {
   });
 }
 
-// 新增
-export function addFullPartyMember(data) {
+// 新增基本信息
+export function addFullPartyMemberBasicInfo(data) {
   return request({
     url: '/town/partymember',
     method: 'post',
@@ -21,6 +21,15 @@ export function addFullPartyMember(data) {
   });
 }
 
+// 新增流程信息
+export function addFullPartyMemberProgressInfo(data) {
+  return request({
+    url: '/town/partymemberflowlog/saveProgress',
+    method: 'post',
+    data: data
+  });
+}
+
 // 修改用户
 export function updateFullPartyMember(data) {
   return request({
@@ -30,7 +39,7 @@ export function updateFullPartyMember(data) {
   });
 }
 
-// 查询详细
+// 查询基本信息
 export function viewFullPartyMember(id) {
   return request({
     url: '/town/partymember/' + praseStrEmpty(id),
@@ -38,6 +47,15 @@ export function viewFullPartyMember(id) {
   });
 }
 
+// 查询详细信息
+export function viewDetailFullPartyMember(query) {
+  return request({
+    url: '/town/partymember/detail',
+    method: 'get',
+    params: query
+  });
+}
+
 // 删除
 export function delFullPartyMember(ids) {
   return request({

src/api/PartyBuildingMgr/PartyMemberDevelop.js

@@ -0,0 +1,14 @@
+import request from '@/utils/request';
+import { praseStrEmpty } from "@/utils/ruoyi";
+
+/**
+ * 查询列表
+ */
+export function listPartyMemberDevelop(query) {
+  return request({
+    url: '/town/partymember/progressList',
+    method: 'get',
+    params: query
+  });
+}
+

src/components/RocPdfFileUpload/index.vue

@@ -3,7 +3,7 @@
  * @Author: Rockery
  * @Date: 2021-12-20 09:16:41
  * @LastEditors: Rockery
- * @LastEditTime: 2021-12-28 17:37:04
+ * @LastEditTime: 2021-12-31 14:09:07
  * @FilePath: \party_construct_web\src\components\RocPdfFileUpload\index.vue
  * @Copyright: Copyright (c) 2016~2021 Rockery(1113269755@qq.com)
 -->
@@ -13,6 +13,7 @@
     <div class="rocpdffileupload-attachment" v-loading="removeLoading">
       <el-upload
         ref="rocPdfFileUploadRef"
+        :disabled="disabled"
         :limit="1"
         accept=".pdf"
         :auto-upload="true"
@@ -24,6 +25,7 @@
         :on-change="handleRocPdfFileUploadOnchange"
         :on-remove="handleRocPdfFileUploadOnRemove"
         :on-exceed="handleRocPdfFileUploadOnExceed"
+        :class="{'is-disabled':disabled}"
         class="rocpdffileupload-attachment-fileupload"
       >
         <div class="rocpdffileupload-attachment-fileupload-content">
@@ -52,7 +54,7 @@
     <roc-vue-pdf-dialog
       v-if="pdfDialogVisible"
       :visible.sync="pdfDialogVisible"
-      :pdfUrl="this.successResp.successUrl"
+      :pdfUrl="successResp.successUrl"
     ></roc-vue-pdf-dialog>
   </div>
 </template>
@@ -90,6 +92,11 @@ export default {
       type: String,
       default: ''
     },
+    // 是否禁用
+    isDisabled: {
+      type: Boolean,
+      default: false
+    }
   },
   data() {
     return {
@@ -123,6 +130,10 @@ export default {
 
       return '文件';
     },
+    // 是否禁用
+    disabled() {
+      return this.isDisabled;
+    }
   },
   destroyed() {
     this.setTimeoutTimer && clearTimeout(this.setTimeoutTimer);
@@ -164,7 +175,7 @@ export default {
 
       this.$emit('input', response?.data?.url);
       this.isUploadSuccess = true;
-      this.$alert(`PDF${this.fileTitle}上传成功！`, '上传结果', { dangerouslyUseHTMLString: true });
+      this.$alert(`PDF${this.fileTitle}上传成功！`, '上传结果', { dangerouslyUseHTMLString: true, type: 'success' });
     },
     /**
      * PDF文件状态改变
@@ -255,12 +266,12 @@ export default {
   .rocpdffileupload-attachment {
     &-fileupload {
       .el-upload {
+        position: relative;
+        overflow: hidden;
         width: 100%;
         border: 1px dashed #d9d9d9;
         border-radius: 6px;
         cursor: pointer;
-        position: relative;
-        overflow: hidden;
 
         &:hover {
           border-color: #409eff;
@@ -281,6 +292,26 @@ export default {
         color: #8c939d;
         text-align: center;
       }
+
+      &.is-disabled {
+        .el-upload {
+          position: relative;
+          overflow: hidden;
+          width: 100%;
+          background-color: #f5f7fa;
+          border: 1px dashed #dfe4ed;
+          border-radius: 6px;
+          cursor: not-allowed;
+
+          &:hover {
+            border-color: #dfe4ed;
+          }
+
+          .rocpdffileupload-attachment-fileupload-content {
+            color: #c0c4cc;
+          }
+        }
+      }
     }
 
     &-addr {

src/components/UpdatePartyDevelop/scss/UpdatePartyDevelop.scss

@@ -85,9 +85,15 @@
           background-color: #de0010;
         }
 
-        .el-tabs__item.is-active {
-          color: #de0010;
-          background: #f9e9ea;
+        .el-tabs__item{
+          &:hover{
+            color: #de0010;
+          }
+
+          &.is-active {
+            color: #de0010;
+            background: #f9e9ea;
+          }
         }
       }
     }
@@ -109,11 +115,11 @@
           justify-content: center;
           width: 94px;
           height: 94px;
-          border: 4px solid #979797;
+          border: 4px solid #de0010;
           border-radius: 50%;
 
           &.is-active {
-            border: 4px solid #de0010;
+            border: 4px solid #979797;
           }
 
           &-title {
@@ -122,7 +128,7 @@
             justify-content: center;
             width: 78px;
             height: 78px;
-            background: #979797;
+            background: #de0010;
             border-radius: 50%;
             font-size: 30px;
             font-weight: 800;
@@ -131,7 +137,7 @@
             letter-spacing: 1px;
 
             &.is-active {
-              background: #de0010;
+              background: #979797;
             }
           }
         }
@@ -150,10 +156,10 @@
         margin-left: 46px;
         width: 2px;
         height: 46px;
-        border: 2px solid #979797;
+        border: 2px solid #de0010;
 
         &.is-active {
-          border: 2px solid #de0010;
+          border: 2px solid #979797;
         }
       }
 
@@ -171,17 +177,17 @@
             margin-left: 16px;
             width: 62px;
             height: 62px;
-            border: 2px solid #979797;
+            color: #de0010;
+            border: 2px solid #de0010;
             border-radius: 50%;
             font-size: 36px;
             font-weight: 400;
-            color: #979797;
             line-height: 50px;
             letter-spacing: 1px;
 
             &.is-active {
-              border: 2px solid #de0010;
-              color: #de0010;
+              color: #979797;
+              border: 2px solid #979797;
             }
           }
 
@@ -232,6 +238,24 @@
                 font-weight: 400;
                 color: #c3c3c3;
                 cursor: pointer;
+                
+                &:hover{
+                  border: 1px solid #de0010;
+                  color: #de0010;
+                }
+              }
+
+              &-noaddthoughtreport {
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                width: 100%;
+                height: 33px;
+                border: 1px solid #dadada;
+                font-size: 16px;
+                font-weight: 400;
+                color: #c3c3c3;
+                cursor: not-allowed;
               }
             }
           }
@@ -241,10 +265,10 @@
           position: absolute;
           margin-left: 46px;
           width: 2px;
-          border: 2px solid #979797;
+          border: 2px solid #de0010;
 
           &.is-active {
-            border: 2px solid #de0010;
+            border: 2px solid #979797;
           }
         }
       }

src/views/PartyBuildingMgr/PartyMemberDevelop/JsonData/MinTypeOptionObj.js

@@ -0,0 +1,149 @@
+/**
+ * 所有节点数据
+*/
+module.exports = {
+  '1': [
+    {
+      value: '',
+      label: '所有待更新节点'
+    },
+    {
+      value: '1',
+      label: '入党申请书'
+    },
+    {
+      value: '2',
+      label: '党组织派人与入党申请人谈话的记录'
+    },
+    {
+      value: '3',
+      label: '身份证或户口本复印件'
+    }
+  ],
+  '2': [
+    {
+      value: '',
+      label: '所有待更新节点'
+    },
+    {
+      value: '4',
+      label: '党员（群团组织）推荐入党积极分子登记表'
+    },
+    {
+      value: '5',
+      label: '确定为入党积极分子的支委会会议记录、备案请示和批复'
+    },
+    {
+      value: '6',
+      label: '《入党积极分子、发展对象培养教育考察登记表》'
+    },
+    {
+      value: '7',
+      label: '入党积极分子思想汇报与参加短期集中培训的结业证书'
+    }
+  ],
+  '3': [
+    {
+      value: '',
+      label: '所有待更新节点'
+    },
+    {
+      value: '8',
+      label: '讨论确定发展对象前听取意见记录'
+    },
+    {
+      value: '9',
+      label: '确定为发展对象的支委会会议记录'
+    },
+    {
+      value: '10',
+      label: '确定为发展对象相关公示材料及备案请示、报告、批复'
+    },
+    {
+      value: '11',
+      label: '综合性政审报告和相关材料'
+    },
+    {
+      value: '12',
+      label: '发展对象参加短期集中培训的结业证书'
+    }
+  ],
+  '4': [
+    {
+      value: '',
+      label: '所有待更新节点'
+    },
+    {
+      value: '13',
+      label: '支委会拟接收预备党员审查会议记录和上报的预审请示'
+    },
+    {
+      value: '14',
+      label: '基层党委预审会议记录及预审批复'
+    },
+    {
+      value: '15',
+      label: '发展党员工作有关工作部门征求意见情况'
+    },
+    {
+      value: '16',
+      label: '《中国共产党入党志愿书》'
+    }
+  ],
+  '5': [
+    {
+      value: '',
+      label: '所有待更新节点'
+    },
+    {
+      value: '17',
+      label: '支部大会接收为中共预备党员的会议记录和票决结果'
+    },
+    {
+      value: '18',
+      label: '接收为中共预备党员审批请示'
+    },
+    {
+      value: '19',
+      label: '基层党委审批会议记录、会议纪要和批复'
+    },
+    {
+      value: '20',
+      label: '向上级党委组织部门的备案报告和批复'
+    }
+  ],
+  '6': [
+    {
+      value: '',
+      label: '所有待更新节点'
+    },
+    {
+      value: '21',
+      label: '《预备党员培养考察教育登记表》'
+    },
+    {
+      value: '22',
+      label: '转正申请书'
+    },
+    {
+      value: '23',
+      label: '预备期思想汇报'
+    },
+    {
+      value: '24',
+      label: '预备党员转正征求党内外群众意见谈话记录'
+    },
+    {
+      value: '25',
+      label: '转为正式党员的支部大会会议记录、票决结果及公示情况'
+    },
+    {
+      value: '26',
+      label: '转为中共正式党员审批请示'
+    },
+    {
+      value: '27',
+      label: '基层党委审批会议记录、会议纪要和批复'
+    }
+  ]
+};

src/views/PartyBuildingMgr/PartyMemberDevelop/JsonData/NodeDataObj.js

@@ -0,0 +1,32 @@
+/**
+ * 所有节点数据
+*/
+module.exports = {
+  '1': '入党申请书',
+  '2': '党组织派人与入党申请人谈话的记录',
+  '3': '身份证或户口本复印件',
+  '4': '党员（群团组织）推荐入党积极分子登记表',
+  '5': '确定为入党积极分子的支委会会议记录、备案请示和批复',
+  '6': '《入党积极分子、发展对象培养教育考察登记表》',
+  '7': '入党积极分子思想汇报与参加短期集中培训的结业证书',
+  '8': '讨论确定发展对象前听取意见记录',
+  '9': '确定为发展对象的支委会会议记录',
+  '10': '确定为发展对象相关公示材料及备案请示、报告、批复',
+  '11': '综合性政审报告和相关材料',
+  '12': '发展对象参加短期集中培训的结业证书',
+  '13': '支委会拟接收预备党员审查会议记录和上报的预审请示',
+  '14': '基层党委预审会议记录及预审批复',
+  '15': '发展党员工作有关工作部门征求意见情况',
+  '16': '《中国共产党入党志愿书》',
+  '17': '支部大会接收为中共预备党员的会议记录和票决结果',
+  '18': '接收为中共预备党员审批请示',
+  '19': '基层党委审批会议记录、会议纪要和批复',
+  '20': '向上级党委组织部门的备案报告和批复',
+  '21': '《预备党员培养考察教育登记表》',
+  '22': '转正申请书',
+  '23': '预备期思想汇报',
+  '24': '预备党员转正征求党内外群众意见谈话记录',
+  '25': '转为正式党员的支部大会会议记录、票决结果及公示情况',
+  '26': '转为中共正式党员审批请示',
+  '27': '基层党委审批会议记录、会议纪要和批复'
+};

src/views/PartyBuildingMgr/PartyMemberDevelop/PartyMemberDevelopIndex.vue

@@ -3,190 +3,260 @@
  * @Author: Rockery
  * @Date: 2021-12-10 10:37:47
  * @LastEditors: Rockery
- * @LastEditTime: 2021-12-10 17:25:59
+ * @LastEditTime: 2022-01-04 18:10:14
  * @FilePath: \party_construct_web\src\views\PartyBuildingMgr\PartyMemberDevelop\PartyMemberDevelopIndex.vue
  * @Copyright: Copyright (c) 2016~2021 Rockery(1113269755@qq.com)
 -->
 
 <template>
   <div class="app-container partymemberdevelop">
-    <div class="develop-main">
-      <el-row :gutter="10">
-        <el-col :span="24">
-          <div class="develop-main-title">
-            <div>
-              <img
-                :src="require('@/assets/logo/home-main-title-logo.png')"
-                @error="imgViewerOnerror"
-              />
+    <template v-if="pageType == 'LIST'">
+      <div class="develop-main">
+        <el-row :gutter="10">
+          <el-col :span="24">
+            <div class="develop-main-title">
+              <div>
+                <img
+                  :src="require('@/assets/logo/home-main-title-logo.png')"
+                  @error="imgViewerOnerror"
+                />
+              </div>
+              <div>党员发展管理</div>
             </div>
-            <div>党员发展管理</div>
-          </div>
-        </el-col>
-        <el-col :span="24">
-          <el-tabs v-model="tabsModel" class="develop-main-tabs" @tab-click="handleTabsClick">
-            <el-tab-pane label="一、申请入党" name="APPLY"></el-tab-pane>
-            <el-tab-pane label="二、入党积极分子的确定和考察" name="POSITIVE"></el-tab-pane>
-            <el-tab-pane label="三、发展对象的确定和考察" name="DEVELOP"></el-tab-pane>
-            <el-tab-pane label="四、发展党员的预审" name="PRETRIAL"></el-tab-pane>
-            <el-tab-pane label="五、预备党员的接收" name="TAKEOVER"></el-tab-pane>
-            <el-tab-pane label="六、预备党员的考察和转正" name="TURNPOSITIVE"></el-tab-pane>
-            <el-tab-pane label="未通过" name="DIDNOTPASS"></el-tab-pane>
-          </el-tabs>
-        </el-col>
+          </el-col>
+          <el-col :span="24">
+            <el-tabs v-model="tabsModel" class="develop-main-tabs" @tab-click="handleTabsClick">
+              <el-tab-pane label="一、申请入党" name="1"></el-tab-pane>
+              <el-tab-pane label="二、入党积极分子的确定和考察" name="2"></el-tab-pane>
+              <el-tab-pane label="三、发展对象的确定和考察" name="3"></el-tab-pane>
+              <el-tab-pane label="四、发展党员的预审" name="4"></el-tab-pane>
+              <el-tab-pane label="五、预备党员的接收" name="5"></el-tab-pane>
+              <el-tab-pane label="六、预备党员的考察和转正" name="6"></el-tab-pane>
+              <el-tab-pane label="未通过" name="7"></el-tab-pane>
+            </el-tabs>
+          </el-col>
 
-        <div v-loading="loading">
-          <el-col :span="24" class="mt10">
-            <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
-              <el-form-item prop="name">
-                <el-input
-                  v-model="queryParams.name"
-                  placeholder="请输入姓名"
-                  clearable
-                  size="small"
-                  style="width: 100%;"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-              <template v-if="tabsModel !== 'DIDNOTPASS'">
-                <el-form-item prop="status">
-                  <el-select
-                    v-model="queryParams.status"
-                    placeholder="请选择待更新节点"
+          <div>
+            <el-col :span="24" class="mt10">
+              <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
+                <el-form-item prop="name">
+                  <el-input
+                    v-model="queryParams.name"
+                    placeholder="请输入姓名"
                     clearable
                     size="small"
                     style="width: 100%;"
-                  >
-                    <el-option
-                      v-for="dict in statusOptions"
-                      :key="dict.dictValue"
-                      :label="dict.dictLabel"
-                      :value="dict.dictValue"
-                    />
-                  </el-select>
+                    @keyup.enter.native="handleQuery"
+                  />
                 </el-form-item>
-              </template>
-              <el-form-item>
-                <el-button
-                  v-hasPermi="['partybuildingmgr:partymemberdevelop:query']"
-                  type="primary"
-                  icon="el-icon-search"
-                  @click="handleQueryClick"
-                >搜索</el-button>
-                <el-button
-                  v-hasPermi="['partybuildingmgr:partymemberdevelop:reset']"
-                  icon="el-icon-refresh"
-                  @click="resetQueryClick"
-                >重置</el-button>
-              </el-form-item>
-              <template v-if="tabsModel === 'APPLY'">
-                <el-form-item class="fr" style="margin-right: 0;">
+                <template v-if="tabsModel !== '7'">
+                  <el-form-item prop="minType">
+                    <el-select
+                      v-model="queryParams.minType"
+                      placeholder="请选择待更新节点"
+                      clearable
+                      size="small"
+                      style="width: 100%;"
+                    >
+                      <el-option
+                        v-for="minTypeOption in minTypeOptions"
+                        :key="minTypeOption.value"
+                        :label="minTypeOption.label"
+                        :value="minTypeOption.value"
+                      />
+                    </el-select>
+                  </el-form-item>
+                </template>
+                <el-form-item>
                   <el-button
-                    v-hasPermi="['partybuildingmgr:partymemberdevelop:add']"
-                    type="rocpartyprimarybtn"
-                    icon="el-icon-plus"
-                    @click="handleAddClick"
-                  >新增</el-button>
-                </el-form-item>
-              </template>
-              <template v-else-if="tabsModel === 'TAKEOVER'">
-                <el-form-item class="fr" style="margin-right: 0;">
+                    v-hasPermi="['partybuildingmgr:partymemberdevelop:query']"
+                    type="primary"
+                    icon="el-icon-search"
+                    @click="handleQueryClick"
+                  >搜索</el-button>
                   <el-button
-                    v-hasPermi="['partybuildingmgr:partymemberdevelop:transferin']"
-                    type="rocpartyprimaryplainbtn"
-                    icon="el-icon-circle-plus-outline"
-                    @click="handleTransferInClick"
-                  >预备党员转入</el-button>
+                    v-hasPermi="['partybuildingmgr:partymemberdevelop:reset']"
+                    icon="el-icon-refresh"
+                    @click="resetQueryClick"
+                  >重置</el-button>
                 </el-form-item>
-              </template>
-              <template v-else></template>
-            </el-form>
-          </el-col>
-          <el-col :span="24">
-            <el-table
-              :data="list"
-              stripe
-              border
-              :header-cell-style="{'text-align':'center'}"
-              header-row-class-name="develop-table_header-row"
-              class="develop-main-table"
-              style="width: 100%;"
-            >
-              <el-table-column label="姓名" prop="name" :show-overflow-tooltip="true" />
-              <el-table-column label="当前待更新节点" prop="name" :show-overflow-tooltip="true" />
-              <el-table-column
-                label="递交入党申请时间"
-                align="center"
-                prop="name"
-                :show-overflow-tooltip="true"
-              />
-              <el-table-column label="备注" prop="name" :show-overflow-tooltip="true" />
-              <el-table-column
-                label="操作"
-                align="center"
-                fixed="right"
-                width="200"
-                class-name="small-padding fixed-width"
-              >
-                <template slot-scope="scope">
-                  <el-button
-                    v-if="tabsModel === 'DIDNOTPASS'"
-                    v-hasPermi="['partybuildingmgr:partymemberdevelop:reactivate']"
-                    size="mini"
-                    type="text"
-                    icon="el-icon-check"
-                    style="color: #de0010;"
-                    @click="handleReactivateClick(scope.row)"
-                  >重新激活</el-button>
-                  <el-button
-                    v-hasPermi="['partybuildingmgr:partymemberdevelop:edit']"
-                    size="mini"
-                    type="text"
-                    icon="el-icon-edit"
-                    style="color: #67c23a;"
-                    @click="handleUpdateClick(scope.row)"
-                  >更新</el-button>
-                  <el-button
-                    v-hasPermi="['partybuildingmgr:partymemberdevelop:view']"
-                    size="mini"
-                    type="text"
-                    icon="el-icon-view"
-                    style="color: #909399;"
-                    @click="handleViewClick(scope.row)"
-                  >详情</el-button>
+                <template v-if="tabsModel === '1'">
+                  <el-form-item class="fr" style="margin-right: 0;">
+                    <el-button
+                      v-hasPermi="['partybuildingmgr:partymemberdevelop:add']"
+                      type="rocpartyprimarybtn"
+                      icon="el-icon-plus"
+                      @click="handleAddClick"
+                    >新增</el-button>
+                  </el-form-item>
                 </template>
-              </el-table-column>
-            </el-table>
-          </el-col>
-          <el-col :span="24">
-            <pagination
-              v-show="total>0"
-              :total="total"
-              :page.sync="queryParams.pageNum"
-              :limit.sync="queryParams.pageSize"
-              @pagination="initData"
-            />
-          </el-col>
+                <template v-else-if="tabsModel === 'TAKEOVER'">
+                  <el-form-item class="fr" style="margin-right: 0;">
+                    <el-button
+                      v-hasPermi="['partybuildingmgr:partymemberdevelop:transferin']"
+                      type="rocpartyprimaryplainbtn"
+                      icon="el-icon-circle-plus-outline"
+                      @click="handleTransferInClick"
+                    >预备党员转入</el-button>
+                  </el-form-item>
+                </template>
+                <template v-else></template>
+              </el-form>
+            </el-col>
+            <el-col :span="24">
+              <el-table
+                v-loading="loading"
+                :data="list"
+                stripe
+                border
+                :header-cell-style="{'text-align':'center'}"
+                header-row-class-name="develop-table_header-row"
+                class="develop-main-table"
+                style="width: 100%;"
+              >
+                <el-table-column label="姓名" prop="name" :show-overflow-tooltip="true" />
+                <el-table-column label="当前待更新节点" prop="flowStatus" :show-overflow-tooltip="true">
+                  <template slot-scope="scope">
+                    <span>{{ nodeDataObj[scope.row.flowStatus] || '-' }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  label="递交入党申请时间"
+                  align="center"
+                  prop="applyAddPartyTime"
+                  :show-overflow-tooltip="true"
+                >
+                  <template slot-scope="scope">
+                    <span>{{ parseTime(scope.row.applyAddPartyTime, '{y}-{m}-{d}') || '-' }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column label="备注" prop="remark" :show-overflow-tooltip="true" />
+                <el-table-column
+                  label="操作"
+                  align="center"
+                  fixed="right"
+                  width="200"
+                  class-name="small-padding fixed-width"
+                >
+                  <template slot-scope="scope">
+                    <el-button
+                      v-if="tabsModel === 'DIDNOTPASS'"
+                      v-hasPermi="['partybuildingmgr:partymemberdevelop:reactivate']"
+                      size="mini"
+                      type="text"
+                      icon="el-icon-check"
+                      style="color: #de0010;"
+                      @click="handleReactivateClick(scope.row)"
+                    >重新激活</el-button>
+                    <el-button
+                      v-hasPermi="['partybuildingmgr:partymemberdevelop:edit']"
+                      size="mini"
+                      type="text"
+                      icon="el-icon-edit"
+                      style="color: #67c23a;"
+                      @click="handleUpdateClick(scope.row)"
+                    >更新</el-button>
+                    <el-button
+                      v-hasPermi="['partybuildingmgr:partymemberdevelop:view']"
+                      size="mini"
+                      type="text"
+                      icon="el-icon-view"
+                      style="color: #909399;"
+                      @click="handleViewClick(scope.row)"
+                    >详情</el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-col>
+            <el-col :span="24">
+              <pagination
+                v-show="total>0"
+                :total="total"
+                :page.sync="queryParams.pageNum"
+                :limit.sync="queryParams.pageSize"
+                @pagination="initData"
+              />
+            </el-col>
+          </div>
+        </el-row>
+      </div>
+    </template>
+    <template v-else-if="pageType == 'ADD'">
+      <div class="partymemberdevelop-addpage">
+        <div class="partymemberdevelop-addpage-head">
+          <div class="partymemberdevelop-addpage-head-title">
+            <div>
+              <img
+                :src="require('@/assets/logo/home-main-title-logo.png')"
+                @error="imgViewerOnerror"
+              />
+            </div>
+            <div>党员发展管理</div>
+          </div>
         </div>
-      </el-row>
-    </div>
+        <update-party-develop
+          :operate-type.sync="operateType"
+          @page-submit="handleAddPageSubmitClick"
+          @page-close="handleAddPageCloseClick"
+        />
+      </div>
+    </template>
+    <template v-else-if="pageType == 'VIEW'">
+      <div class="partymemberdevelop-addpage">
+        <div class="partymemberdevelop-addpage-head">
+          <div class="partymemberdevelop-addpage-head-title">
+            <div>
+              <img
+                :src="require('@/assets/logo/home-main-title-logo.png')"
+                @error="imgViewerOnerror"
+              />
+            </div>
+            <div>党员发展管理</div>
+          </div>
+        </div>
+        <party-member-details
+          :operate-type.sync="operateType"
+          @page-submit="handleAddPageSubmitClick"
+          @page-close="handleAddPageCloseClick"
+        />
+      </div>
+    </template>
+    <template v-else>
+      <div>&nbsp;</div>
+    </template>
   </div>
 </template>
 
 <script>
+import MinTypeOptionObj from './JsonData/MinTypeOptionObj';
+import NodeDataObj from './JsonData/NodeDataObj';
+import {
+  listPartyMemberDevelop
+} from "@/api/PartyBuildingMgr/PartyMemberDevelop";
+
 export default {
   name: "Partymemberdevelop",
+  components: {
+    'update-party-develop': () => import('@/components/UpdatePartyDevelop'),
+    'party-member-details': () => import('@/components/PartyMemberDetails')
+  },
   data() {
     return {
+      // 页面类型
+      pageType: 'LIST',
       // 遮罩层
       loading: true,
       // 显示搜索条件
       showSearch: true,
-      tabsModel: 'APPLY',
-      statusOptions: [],
+      tabsModel: '1',
+      // 待更新节点选项列表
+      minTypeOptions: [],
       total: 10,
       queryParams: {
-        pageNum: 0,
+        name: undefined,
+        maxType: '1',
+        minType: undefined,
+        pageNum: 1,
         pageSize: 10
       },
       list: [
@@ -196,10 +266,14 @@ export default {
         {
           name: '李四'
         }
-      ]
+      ],
+      operateType: 'ADD',
+      minTypeOptionObj: { ...MinTypeOptionObj },
+      nodeDataObj: { ...NodeDataObj }
     };
   },
   created() {
+    this.minTypeOptions = this.minTypeOptionObj[this.tabsModel];
     this.initData();
   },
   methods: {
@@ -209,24 +283,40 @@ export default {
     },
     /** 获取表格数据 */
     getList() {
-      this.loading = false;
+      this.loading = true;
+      listPartyMemberDevelop(this.queryParams).then(
+        response => {
+          this.list = response.rows || [];
+          this.total = response.total ?? 20;
+          this.loading = false;
+        }
+      );
     },
     /** 标签页点击事件 */
     handleTabsClick(targetName) {
-      console.log('targetName==', targetName.name);
+      (targetName.name !== '7') && (this.minTypeOptions = this.minTypeOptionObj[targetName.name]);
+      this.queryParams = {
+        name: undefined,
+        maxType: targetName.name,
+        minType: undefined,
+        pageNum: 1,
+        pageSize: 10
+      };
       this.getList();
     },
     /** 搜索按钮事件 */
     handleQueryClick() {
-
+      this.queryParams.pageNum = 1;
+      this.initData();
     },
     /** 重置按钮事件 */
     resetQueryClick() {
-
+      this.resetForm("queryForm");
+      this.handleQueryClick();
     },
     /** 新增按钮事件 */
     handleAddClick() {
-
+      this.pageType = 'ADD';
     },
     /** 预备党员转入按钮事件 */
     handleTransferInClick() {
@@ -238,11 +328,26 @@ export default {
     },
     /** 更新按钮事件 */
     handleUpdateClick(row) {
-
+      this.pageType = 'ADD';
+      this.operateType = 'EDIT';
     },
     /** 详情按钮事件 */
     handleViewClick(row) {
-
+      this.pageType = 'VIEW';
+    },
+    /**
+     * 新增页面保存按钮事件
+     */
+    handleAddPageSubmitClick(param) {
+      this.pageType = param;
+      this.initData();
+    },
+    /**
+     * 新增页面取消按钮事件
+     */
+    handleAddPageCloseClick(param) {
+      this.pageType = param;
+      this.initData();
     }
   }
 };
@@ -324,5 +429,45 @@ export default {
       }
     }
   }
+
+  &-addpage {
+    &-head {
+      margin-bottom: 20px;
+      width: 100%;
+      padding: 15px 20px;
+      background: url("../../../assets/images/home-head-img.png"), #ffffff;
+      background-size: 67px 67px, cover;
+      background-position: right 5px bottom 0px, center;
+      background-repeat: no-repeat, no-repeat;
+      border-radius: 10px;
+
+      &-title {
+        display: flex;
+        align-items: center;
+
+        div {
+          &:first-child {
+            height: 37px;
+            line-height: 37px;
+          }
+
+          &:last-child {
+            margin-left: 15px;
+            height: 37px;
+            font-size: 26px;
+            font-weight: 400;
+            color: #4f4f4f;
+            line-height: 37px;
+            letter-spacing: 1px;
+          }
+
+          img {
+            width: 34px;
+            height: 34px;
+          }
+        }
+      }
+    }
+  }
 }
 </style>