党员发展管理模块增加“全部”页签相关功能

src/views/PartyBuildingMgr/FullPartyMember/FullPartyMemberIndex.vue

@@ -3,7 +3,7 @@
  * @Author: Rockery
  * @Date: 2021-12-10 10:39:07
  * @LastEditors: Rockery
- * @LastEditTime: 2022-02-18 15:44:36
+ * @LastEditTime: 2022-02-18 16:14:45
  * @FilePath: \party_construct_web\src\views\PartyBuildingMgr\FullPartyMember\FullPartyMemberIndex.vue
  * @Copyright: Copyright (c) 2016~2021 Rockery(1113269755@qq.com)
 -->
@@ -583,6 +583,7 @@ export default {
      */
     handleEditClick(row) {
       if (!row.id) return;
+      this.isOld = row.isOld;
       this.pageType = 'ADD';
       this.operateType = 'EDIT';
       this.updateType = 'EDIT';

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

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

src/views/PartyBuildingMgr/PartyMemberDevelop/PartyMemberDevelopIndex.vue

@@ -3,7 +3,7 @@
  * @Author: Rockery
  * @Date: 2021-12-10 10:37:47
  * @LastEditors: Rockery
- * @LastEditTime: 2022-02-17 16:49:20
+ * @LastEditTime: 2022-02-18 11:41:59
  * @FilePath: \party_construct_web\src\views\PartyBuildingMgr\PartyMemberDevelop\PartyMemberDevelopIndex.vue
  * @Copyright: Copyright (c) 2016~2021 Rockery(1113269755@qq.com)
 -->
@@ -26,6 +26,7 @@
           </el-col>
           <el-col :span="24">
             <el-tabs v-model="tabsModel" class="develop-main-tabs" @tab-click="handleTabsClick">
+              <el-tab-pane label="全部" name="0"></el-tab-pane>
               <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>
@@ -61,7 +62,7 @@
                       <el-option
                         v-for="minTypeOption in minTypeOptions"
                         :key="minTypeOption.value"
-                        :label="minTypeOption.label"
+                        :label="minTypeOption.value ? minTypeOption.value + '、' + minTypeOption.label : minTypeOption.label"
                         :value="minTypeOption.value"
                       />
                     </el-select>
@@ -80,7 +81,23 @@
                     @click="resetQueryClick"
                   >重置</el-button>
                 </el-form-item>
-                <template v-if="tabsModel === '1'">
+                <template v-if="['0'].includes(tabsModel)">
+                  <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-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-if="['1'].includes(tabsModel)">
                   <el-form-item class="fr" style="margin-right: 0;">
                     <el-button
                       v-hasPermi="['partybuildingmgr:partymemberdevelop:add']"
@@ -90,7 +107,7 @@
                     >新增</el-button>
                   </el-form-item>
                 </template>
-                <template v-else-if="tabsModel === '5'">
+                <template v-else-if="['5'].includes(tabsModel)">
                   <el-form-item class="fr" style="margin-right: 0;">
                     <el-button
                       v-hasPermi="['partybuildingmgr:partymemberdevelop:transferin']"
@@ -248,8 +265,7 @@ import {
   listPartyMemberDevelop
 } from "@/api/PartyBuildingMgr/PartyMemberDevelop";
 import {
-  delFullPartyMember,
-  reactivateFullPartyMember
+  delFullPartyMember
 } from "@/api/PartyBuildingMgr/FullPartyMember";
 
 export default {
@@ -266,13 +282,13 @@ export default {
       loading: true,
       // 显示搜索条件
       showSearch: true,
-      tabsModel: '1',
+      tabsModel: '0',
       // 待更新节点选项列表
       minTypeOptions: [],
       total: 10,
       queryParams: {
         name: undefined,
-        maxType: '1',
+        maxType: '0',
         minType: undefined,
         pageNum: 1,
         pageSize: 10,
@@ -321,7 +337,7 @@ export default {
      * 标签页点击事件
      */
     handleTabsClick(targetName) {
-      (targetName.name !== '7') && (this.minTypeOptions = this.minTypeOptionObj[targetName.name]);
+      (!['7'].includes(targetName.name)) && (this.minTypeOptions = this.minTypeOptionObj[targetName.name]);
       this.queryParams = {
         name: undefined,
         maxType: targetName.name,
@@ -351,6 +367,7 @@ export default {
      * 新增按钮事件
      */
     handleAddClick() {
+      this.currentRow = {};
       this.pageType = 'ADD';
       this.operateType = 'ADD';
       this.updateType = 'ADD';
@@ -359,6 +376,7 @@ export default {
      * 预备党员转入按钮事件
      */
     handleTransferInClick() {
+      this.currentRow = {};
       this.pageType = 'ADD';
       this.operateType = 'ADD';
       this.updateType = 'TRANSFERIN';