From 8efb289cc44f9fc50f9e04b67f6c95e2821178f5 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Mon, 17 Oct 2022 16:40:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B1=95=E5=85=9A=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppRecruitPartyMembers.vue                |    2 +-
 .../AppRecruitPartyMembers/components/Add.vue | 1042 ++++++-----------
 .../components/Detail.vue                     |  295 +----
 .../components/List.vue                       |   68 +-
 4 files changed, 444 insertions(+), 963 deletions(-)

diff --git a/project/pingchang/apps/AppRecruitPartyMembers/AppRecruitPartyMembers.vue b/project/pingchang/apps/AppRecruitPartyMembers/AppRecruitPartyMembers.vue
index a5e0651c..29e420df 100644
--- a/project/pingchang/apps/AppRecruitPartyMembers/AppRecruitPartyMembers.vue
+++ b/project/pingchang/apps/AppRecruitPartyMembers/AppRecruitPartyMembers.vue
@@ -25,7 +25,7 @@ export default {
   },
   data() {
     return {
-      selected: {}
+      selected: {},
     }
   },
   computed: {
diff --git a/project/pingchang/apps/AppRecruitPartyMembers/components/Add.vue b/project/pingchang/apps/AppRecruitPartyMembers/components/Add.vue
index db1160d8..0eb4dba9 100644
--- a/project/pingchang/apps/AppRecruitPartyMembers/components/Add.vue
+++ b/project/pingchang/apps/AppRecruitPartyMembers/components/Add.vue
@@ -1,8 +1,8 @@
 <template>
   <ai-detail class="party">
-    <ai-title slot="title" :title="isEdit ? '编辑党员' : '添加党员'" isShowBack isShowBottomBorder @onBackClick="cancel"/>
+    <ai-title slot="title" :title="isEdit ? '编辑发展党员' : '添加发展党员'" isShowBack isShowBottomBorder @onBackClick="cancel"/>
     <template slot="content">
-      <el-form ref="form" :model="form" label-width="160px" label-position="right">
+      <el-form ref="form" :model="form" :rules="rules" label-width="160px" label-position="right">
         <ai-card title="个人信息">
           <template #content>
             <el-alert
@@ -16,24 +16,16 @@
             <div class="ai-form">
               <div style="width: 50%">
                 <el-form-item
-                    label="姓名"
-                    style="width: 100%"
-                    prop="name"
-                    :rules="[
-                    {
-                      required: true,
-                      message: '请输入姓名',
-                      trigger: 'change',
-                    },
-                  ]"
+                  label="姓名"
+                  style="width: 100%"
+                  prop="name" 
                 >
                   <el-input
-                      size="small"
-                      :disabled="isEdit"
-                      :maxLength="15"
-                      placeholder="请输入姓名"
-                      v-model="form.name"
-                      
+                    size="small"
+                    :disabled="isEdit"
+                    :maxLength="15"
+                    placeholder="请输入姓名"
+                    v-model="form.name"
                   >
                     <template slot="append" v-if="!isEdit">
                       <ai-person-select
@@ -68,11 +60,11 @@
                   >
                   </el-input>
                 </el-form-item>
-                <el-form-item label="发展状态" prop="sex" style="width: 100%">
+                <el-form-item label="发展状态" prop="developStatus" style="width: 100%">
                   <ai-select
-                      v-model="form.sex"
+                      v-model="form.developStatus"
                       placeholder="请选择发展状态"
-                      :selectList="dict.getDict('sex')"
+                      :selectList="dict.getDict('developStatus')"
                   ></ai-select>
                 </el-form-item>
               </div>
@@ -96,7 +88,7 @@
                     style="width: 100%"
                     placeholder="选择日期"
                     format="yyyy-MM-dd"
-                    value-format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd HH:mm:ss"
                 >
                 </el-date-picker>
               </el-form-item>
@@ -148,13 +140,6 @@
             </div>
           </template>
         </ai-card>
-        <!--        <ai-card title="审核状态" v-if="isEdit">-->
-        <!--          <template #content>-->
-        <!--            <el-form-item label="审核状态" style="width: 100%">-->
-        <!--              <span :class="'audit-' + form.auditStatus" v-text="dict.getLabel('auditStatus', form.auditStatus)"/>-->
-        <!--            </el-form-item>-->
-        <!--          </template>-->
-        <!--        </ai-card>-->
         <ai-card title="联络信息">
           <div class="ai-form" slot="content">
             <el-form-item label="联系方式" prop="phone">
@@ -184,28 +169,6 @@
                 ></el-input>
               </template>
             </el-form-item>
-            <!-- <el-form-item
-                label="所属党组织"
-                prop="partyOrgId"
-                :rules="[
-                {
-                  required: true,
-                  message: '请选择所属党组织',
-                  trigger: 'change',
-                },
-              ]"
-            >
-              <el-input
-                  size="small"
-                  disabled
-                  placeholder="请选择所属党组织"
-                  v-model="form.partyOrgName"
-              >
-                <template slot="append">
-                  <ai-party :instance="instance" size="small" :value="form.partyOrgId" @origin="handlePartyOrgSelect"/>
-                </template>
-              </el-input>
-            </el-form-item> -->
           </div>
         </ai-card>
         <ai-card title="团籍信息">
@@ -213,446 +176,309 @@
             <el-form-item label="入团日期">
               <el-date-picker
                   size="small"
-                  v-model="form.joinPartyTime"
+                  v-model="form.joinLeagueMemberTime"
                   type="date"
                   placeholder="请选择入团日期"
                   style="width: 100%"
                   format="yyyy-MM-dd"
-                  :value-format="'yyyy-MM-dd'"
+                  value-format="yyyy-MM-dd HH:mm:ss"
               >
               </el-date-picker>
             </el-form-item>
             <el-form-item label="文化程度">
               <ai-select
-                v-model="form.partyStatus"
+                v-model="form.education"
                 placeholder="请选择文化程度"
-                :selectList="dict.getDict('partyStatus')"
+                :selectList="dict.getDict('education')"
               ></ai-select>
             </el-form-item>
             <el-form-item label="学位职称">
-              <ai-select
-                  v-model="form.partyType"
-                  placeholder="学位职称"
-                  :selectList="dict.getDict('partyType')"
-              ></ai-select>
+              <el-input
+                  size="small"
+                  v-model="form.position"
+                  placeholder="请输入..."
+                  clearabel
+                  :maxLength="20"
+              ></el-input>
             </el-form-item>
             <el-form-item label="奖励情况" style="width: 100%;">
-              <el-input type="textarea" v-model="form.personalProfile" clearable maxlength="500" show-word-limit
-                 rows="2" placeholder="请输入奖励情况"/>
+              <el-input type="textarea" v-model="form.rewardRemark" clearable maxlength="500" show-word-limit
+                 rows="2" placeholder="请输入..."/>
             </el-form-item>
             <el-form-item label="处分情况" style="width: 100%;">
-              <el-input type="textarea" v-model="form.personalProfile" clearable maxlength="500" show-word-limit
-                 rows="2" placeholder="请输入处分情况"/>
+              <el-input type="textarea" v-model="form.punishmentRemark" clearable maxlength="500" show-word-limit
+                 rows="2" placeholder="请输入..."/>
             </el-form-item>
             <el-form-item label="简历" style="width: 100%;">
-              <el-input type="textarea" v-model="form.personalProfile" clearable maxlength="500" show-word-limit
-                 rows="2" placeholder="请输入简历"/>
+              <el-input type="textarea" v-model="form.resume" clearable maxlength="500" show-word-limit
+                 rows="2" placeholder="请输入..."/>
             </el-form-item>
             <el-form-item label="附件" style="width: 100%;">
               <ai-uploader
                   :isShowTip="true"
                   :instance="instance"
-                  v-model="form.file"
+                  v-model="form.fileList"
                   fileType="file"
                   acceptType=".zip, .rar, .doc, .docx, .xls, .ppt, .pptx, .pdf, .txt, .jpg, .png"
                   :limit="9">
                 <template slot="tips">
                   最多上传9个附件,单个文件最大10MB<br/>
                   支持.zip、.rar、.doc、.docx、.xls、.ppt、.pptx、.pdf、.txt、.jpg、.png格式<br/>
-                  建议上传《入学积极分子培养教育考察登记簿》、《中共预备学员考察登记簿》<br/>
+                  建议上传《入党积极分子培养教育考察登记簿》、《中共预备党员考察登记簿》<br/>
                 </template>
               </ai-uploader>
             </el-form-item>
           </div>
         </ai-card>
-        <ai-card title="申请入学">
-          <template #content>
-            <el-form-item label="申请入学时间" prop="phone" required>
-              <el-date-picker
-                  size="small"
-                  v-model="form.joinPartyTime"
-                  type="date"
-                  placeholder="请选择申请入学时间"
-                  style="width: 100%"
-                  format="yyyy-MM-dd"
-                  :value-format="'yyyy-MM-dd'"
+
+        <template v-if="isEdit">
+          <ai-card title="申请入党">
+            <template #content>
+              <el-form-item label="申请入党时间" prop="applyJoinPartyTime">
+                <el-date-picker
+                    size="small"
+                    v-model="form.applyJoinPartyTime"
+                    type="date"
+                    placeholder="请选择申请入党时间"
+                    style="width: 100%"
+                    format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                >
+                </el-date-picker>
+              </el-form-item>
+              <el-form-item label="申请入党形式">
+                <el-input
+                    size="small"
+                    v-model="form.applyJoinPartyWay"
+                    placeholder="请输入..."
+                    clearabel
+                    :maxLength="11"
+                ></el-input>
+              </el-form-item>
+            </template>
+          </ai-card>
+          <ai-card title="入党积极分子的确定和教育培养" v-if="form.developStatus > 0">
+            <template #content>
+              <el-form-item label="确定为入党积极分子时间" prop="activistTime" >
+                <el-date-picker
+                    size="small"
+                    v-model="form.activistTime"
+                    type="date"
+                    placeholder="请选择确定为入党积极分子时间"
+                    style="width: 100%"
+                    format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                >
+                </el-date-picker>
+              </el-form-item>
+              <el-form-item label="确定为积极分子的根据和意见" style="width: 100%;">
+                <el-input type="textarea" v-model="form.activistAccordingRemark" clearable maxlength="500" show-word-limit
+                  rows="2" placeholder="请输入..."/>
+              </el-form-item>
+              <el-form-item label="培养教育情况及鉴定意见" style="width: 100%;">
+                <el-input type="textarea" v-model="form.activistEducationRemark" clearable maxlength="500" show-word-limit
+                  rows="2" placeholder="请输入..."/>
+              </el-form-item>
+
+            </template>
+          </ai-card>
+          <ai-card title="入党介绍人/培养人" v-if="form.developStatus > 0">
+            <template #right>
+              <el-button type="text" icon="iconfont iconAdd" @click="addIntroducer()">添加入党介绍人/培养人</el-button>
+            </template>
+            <template #content>
+              <ai-table
+                :border="true"
+                :tableData="form.introducerList"
+                :isShowPagination="false"
+                :col-configs="colConfigs"
+                :stripe="false"
+                @getList="() => {}"
               >
-              </el-date-picker>
-            </el-form-item>
-            <el-form-item label="申请入学形式">
-              <el-input
-                  size="small"
-                  v-model="form.phone"
-                  placeholder="请输入..."
-                  clearabel
-                  :maxLength="11"
-              ></el-input>
-            </el-form-item>
-
-          </template>
-        </ai-card>
-
-        <ai-card title="入学积极分子的确定和教育培养">
-          <template #content>
-            <el-form-item label="确定为入学积极分子时间" prop="phone" required >
-              <el-date-picker
-                  size="small"
-                  v-model="form.joinPartyTime"
-                  type="date"
-                  placeholder="请选择确定为入学积极分子时间"
-                  style="width: 100%"
-                  format="yyyy-MM-dd"
-                  :value-format="'yyyy-MM-dd'"
-              >
-              </el-date-picker>
-            </el-form-item>
-            <el-form-item label="确定为积极分子的根据和意见" style="width: 100%;">
-              <el-input type="textarea" v-model="form.personalProfile" clearable maxlength="500" show-word-limit
-                 rows="2" placeholder="请输入确定为积极分子的根据和意见"/>
-            </el-form-item>
-            <el-form-item label="培养教育情况及鉴定意见" style="width: 100%;">
-              <el-input type="textarea" v-model="form.personalProfile" clearable maxlength="500" show-word-limit
-                 rows="2" placeholder="请输入培养教育情况及鉴定意见"/>
-            </el-form-item>
-
-          </template>
-        </ai-card>
-        <ai-card title="入学介绍人/培养人">
-          <template #right>
-            <el-button type="text" icon="iconfont iconAdd" @click="addForm(activeName)">添加入学介绍人/培养人</el-button>
-          </template>
-          <template #content>
-            <ai-table
-              :border="true"
-              :tableData="form.starList"
-              :isShowPagination="false"
-              :col-configs="colConfigs1"
-              :stripe="false"
-              @getList="() => {}"
-            >
-              <el-table-column label="职位" slot="level" align="center">
-                <template slot-scope="{ row }">
-                  <el-rate
-                      v-model="row.level"
-                      disabled
-                      show-text
-                      :texts="textlist"
-                  ></el-rate>
-                </template>
-              </el-table-column>
-              <el-table-column
+                <el-table-column
                   slot="options"
                   width="120px"
                   fixed="right"
                   label="操作"
                   align="center"
-              >
-                <template slot-scope="{ row, $index }">
-                  <div class="table-options">
-                    <el-button type="text" @click="editStar(row, $index)"
-                    >编辑
-                    </el-button
-                    >
-                    <el-button type="text" @click="remove($index, 'starList')"
-                    >删除
-                    </el-button
-                    >
-                  </div>
-                </template>
-              </el-table-column>
-            </ai-table>
-          </template>
-        </ai-card>
-        <ai-card title="发展对象的确定和考察">
-          <template #content>
-            <el-form-item label="确定为发展对象时间" prop="phone" required >
-              <el-date-picker
-                  size="small"
-                  v-model="form.joinPartyTime"
-                  type="date"
-                  placeholder="请选择确定为发展对象时间"
-                  style="width: 100%"
-                  format="yyyy-MM-dd"
-                  :value-format="'yyyy-MM-dd'"
-              >
-              </el-date-picker>
-            </el-form-item>
-            <el-form-item label="政治历史的考察及结论" style="width: 100%;">
-              <el-input type="textarea" v-model="form.personalProfile" clearable maxlength="500" show-word-limit
-                 rows="2" placeholder="请输入..."/>
-            </el-form-item>
-            <el-form-item label="社会关系考察及结论" style="width: 100%;">
-              <el-input type="textarea" v-model="form.personalProfile" clearable maxlength="500" show-word-limit
-                 rows="2" placeholder="请输入..."/>
-            </el-form-item>
-            <el-form-item label="现实考察及结论" style="width: 100%;">
-              <el-input type="textarea" v-model="form.personalProfile" clearable maxlength="500" show-word-limit
-                 rows="2" placeholder="请输入..."/>
-            </el-form-item>
-            <el-form-item label="学的基本知识考核及考试成绩" style="width: 100%;">
-              <el-input type="textarea" v-model="form.personalProfile" clearable maxlength="500" show-word-limit
-                 rows="2" placeholder="请输入..."/>
-            </el-form-item>
-            <el-form-item label="综合考察结论意见" style="width: 100%;">
-              <el-input type="textarea" v-model="form.personalProfile" clearable maxlength="500" show-word-limit
-                 rows="2" placeholder="请输入..."/>
-            </el-form-item>
-            <el-form-item label="学内讨论是否确定为发展对象的意见" style="width: 100%;">
-              <el-input type="textarea" v-model="form.personalProfile" clearable maxlength="500" show-word-limit
-                 rows="2" placeholder="请输入..."/>
-            </el-form-item>
-            <el-form-item label="确定为发展对象后的谈话记录" style="width: 100%;">
-              <el-input type="textarea" v-model="form.personalProfile" clearable maxlength="500" show-word-limit
-                 rows="2" placeholder="请输入..."/>
-            </el-form-item>
-            <el-form-item label="支委会研究意见" style="width: 100%;">
-              <el-input type="textarea" v-model="form.personalProfile" clearable maxlength="500" show-word-limit
-                 rows="2" placeholder="请输入..."/>
-            </el-form-item>
-          </template>
-        </ai-card>
-        <ai-card title="预备学员的接收">
-          <template #content>
-            <el-form-item label="吸收入学时间" prop="phone" required >
-              <el-date-picker
-                  size="small"
-                  v-model="form.joinPartyTime"
-                  type="date"
-                  placeholder="请选择吸收入学时间"
-                  style="width: 100%"
-                  format="yyyy-MM-dd"
-                  :value-format="'yyyy-MM-dd'"
-              >
-              </el-date-picker>
-            </el-form-item>
-            <el-form-item label="吸收入学地点">
-              <el-input
-                  size="small"
-                  v-model="form.phone"
-                  placeholder="请输入..."
-                  clearabel
-                  :maxLength="11"
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="吸收入学时支部大会上学员提的意见和要求及个人的态度" style="width: 100%;">
-              <el-input type="textarea" v-model="form.personalProfile" clearable maxlength="500" show-word-limit
-                 rows="2" placeholder="请输入..."/>
-            </el-form-item>
-            <el-form-item label="预备期间的教育情况" style="width: 100%;">
-              <el-input type="textarea" v-model="form.personalProfile" clearable maxlength="500" show-word-limit
-                 rows="2" placeholder="请输入..."/>
-            </el-form-item>
-            <el-form-item label="学小组对其转正的讨论意见" style="width: 100%;">
-              <el-input type="textarea" v-model="form.personalProfile" clearable maxlength="500" show-word-limit
-                 rows="2" placeholder="请输入..."/>
-            </el-form-item>
-            <el-form-item label="预备期间的考察情况" style="width: 100%;">
-              <el-input type="textarea" v-model="form.personalProfile" clearable maxlength="500" show-word-limit
-                 rows="2" placeholder="请输入..."/>
-            </el-form-item>
-            <el-form-item label="学支部对其转正的意见" style="width: 100%;">
-              <el-input type="textarea" v-model="form.personalProfile" clearable maxlength="500" show-word-limit
-                 rows="2" placeholder="请输入..."/>
-            </el-form-item>
-          </template>
-        </ai-card>
-        <ai-card title="预备学员的教育考察和转正">
-          <template #content>
-            <el-form-item label="转正时间" prop="phone" required >
-              <el-date-picker
-                  size="small"
-                  v-model="form.joinPartyTime"
-                  type="date"
-                  placeholder="请选择转正时间"
-                  style="width: 100%"
-                  format="yyyy-MM-dd"
-                  :value-format="'yyyy-MM-dd'"
-              >
-              </el-date-picker>
-            </el-form-item>
-            <el-form-item label="预备期间的教育情况" style="width: 100%;">
-              <el-input type="textarea" v-model="form.personalProfile" clearable maxlength="500" show-word-limit
-                 rows="2" placeholder="请输入..."/>
-            </el-form-item>
-            <el-form-item label="预备期间的考察情况" style="width: 100%;">
-              <el-input type="textarea" v-model="form.personalProfile" clearable maxlength="500" show-word-limit
-                 rows="2" placeholder="请输入..."/>
-            </el-form-item>
-            <el-form-item label="学小组对其转正的讨论意见" style="width: 100%;">
-              <el-input type="textarea" v-model="form.personalProfile" clearable maxlength="500" show-word-limit
-                 rows="2" placeholder="请输入..."/>
-            </el-form-item>
-            <el-form-item label="学支部对其转正的意见" style="width: 100%;">
-              <el-input type="textarea" v-model="form.personalProfile" clearable maxlength="500" show-word-limit
-                 rows="2" placeholder="请输入..."/>
-            </el-form-item>
-          </template>
-        </ai-card>
+                >
+                  <template slot-scope="{ row, $index }">
+                    <div class="table-options">
+                      <el-button type="text" @click="remove($index)">删除</el-button>
+                    </div>
+                  </template>
+                </el-table-column>
+              </ai-table>
+            </template>
+          </ai-card>
+          <ai-card title="发展对象的确定和考察" v-if="form.developStatus > 1">
+            <template #content>
+              <el-form-item label="确定为发展对象时间" prop="determineTime" >
+                <el-date-picker
+                    size="small"
+                    v-model="form.determineTime"
+                    type="date"
+                    placeholder="请选择确定为发展对象时间"
+                    style="width: 100%"
+                    format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                >
+                </el-date-picker>
+              </el-form-item>
+              <el-form-item label="政治历史的考察及结论" style="width: 100%;">
+                <el-input type="textarea" v-model="form.determinePoliticsRemark" clearable maxlength="500" show-word-limit
+                  rows="2" placeholder="请输入..."/>
+              </el-form-item>
+              <el-form-item label="社会关系考察及结论" style="width: 100%;">
+                <el-input type="textarea" v-model="form.determineSocialRemark" clearable maxlength="500" show-word-limit
+                  rows="2" placeholder="请输入..."/>
+              </el-form-item>
+              <el-form-item label="现实考察及结论" style="width: 100%;">
+                <el-input type="textarea" v-model="form.determineRealityRemark" clearable maxlength="500" show-word-limit
+                  rows="2" placeholder="请输入..."/>
+              </el-form-item>
+              <el-form-item label="党的基本知识考核及考试成绩" style="width: 100%;">
+                <el-input type="textarea" v-model="form.determineKnowledgeRemark" clearable maxlength="500" show-word-limit
+                  rows="2" placeholder="请输入..."/>
+              </el-form-item>
+              <el-form-item label="综合考察结论意见" style="width: 100%;">
+                <el-input type="textarea" v-model="form.determineComprehensiveRemark" clearable maxlength="500" show-word-limit
+                  rows="2" placeholder="请输入..."/>
+              </el-form-item>
+              <el-form-item label="党内讨论是否确定为发展对象的意见" style="width: 100%;">
+                <el-input type="textarea" v-model="form.determinePartyInnerRemark" clearable maxlength="500" show-word-limit
+                  rows="2" placeholder="请输入..."/>
+              </el-form-item>
+              <el-form-item label="确定为发展对象后的谈话记录" style="width: 100%;">
+                <el-input type="textarea" v-model="form.determineChatRemark" clearable maxlength="500" show-word-limit
+                  rows="2" placeholder="请输入..."/>
+              </el-form-item>
+              <el-form-item label="支委会研究意见" style="width: 100%;">
+                <el-input type="textarea" v-model="form.determineBranchRemark" clearable maxlength="500" show-word-limit
+                  rows="2" placeholder="请输入..."/>
+              </el-form-item>
+            </template>
+          </ai-card>
+          <ai-card title="预备党员的接收" v-if="form.developStatus > 2">
+            <template #content>
+              <el-form-item label="吸收入党时间" prop="acceptTime" >
+                <el-date-picker
+                    size="small"
+                    v-model="form.acceptTime"
+                    type="date"
+                    placeholder="请选择吸收入党时间"
+                    style="width: 100%"
+                    format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                >
+                </el-date-picker>
+              </el-form-item>
+              <el-form-item label="吸收入党地点">
+                <el-input
+                    size="small"
+                    v-model="form.acceptAddress"
+                    placeholder="请输入..."
+                    clearabel
+                    :maxLength="50"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="吸收入党时支部大会上党员提的意见和要求及个人的态度" style="width: 100%;">
+                <el-input type="textarea" v-model="form.acceptBranchMeetingOpinion" clearable maxlength="500" show-word-limit
+                  rows="2" placeholder="请输入..."/>
+              </el-form-item>
+              <el-form-item label="预备期间的教育情况" style="width: 100%;">
+                <el-input type="textarea" v-model="form.acceptEducationRemark" clearable maxlength="500" show-word-limit
+                  rows="2" placeholder="请输入..."/>
+              </el-form-item>
+              <el-form-item label="党小组对其转正的讨论意见" style="width: 100%;">
+                <el-input type="textarea" v-model="form.acceptPartyGroupRemark" clearable maxlength="500" show-word-limit
+                  rows="2" placeholder="请输入..."/>
+              </el-form-item>
+              <el-form-item label="预备期间的考察情况" style="width: 100%;">
+                <el-input type="textarea" v-model="form.acceptInvestigateRemark" clearable maxlength="500" show-word-limit
+                  rows="2" placeholder="请输入..."/>
+              </el-form-item>
+              <el-form-item label="党支部对其转正的意见" style="width: 100%;">
+                <el-input type="textarea" v-model="form.acceptBranchRemark" clearable maxlength="500" show-word-limit
+                  rows="2" placeholder="请输入..."/>
+              </el-form-item>
+            </template>
+          </ai-card>
+          <ai-card title="预备党员的教育考察和转正" v-if="form.developStatus == 4">
+            <template #content>
+              <el-form-item label="转正时间" prop="becomePartyTime" >
+                <el-date-picker
+                    size="small"
+                    v-model="form.becomePartyTime"
+                    type="date"
+                    placeholder="请选择转正时间"
+                    style="width: 100%"
+                    format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                >
+                </el-date-picker>
+              </el-form-item>
+              <el-form-item label="预备期间的教育情况" style="width: 100%;">
+                <el-input type="textarea" v-model="form.becomePartyEducationRemark" clearable maxlength="500" show-word-limit
+                  rows="2" placeholder="请输入..."/>
+              </el-form-item>
+              <el-form-item label="预备期间的考察情况" style="width: 100%;">
+                <el-input type="textarea" v-model="form.becomePartyInvestigateRemark" clearable maxlength="500" show-word-limit
+                  rows="2" placeholder="请输入..."/>
+              </el-form-item>
+              <el-form-item label="党小组对其转正的讨论意见" style="width: 100%;">
+                <el-input type="textarea" v-model="form.becomePartyGroupRemark" clearable maxlength="500" show-word-limit
+                  rows="2" placeholder="请输入..."/>
+              </el-form-item>
+              <el-form-item label="党支部对其转正的意见" style="width: 100%;">
+                <el-input type="textarea" v-model="form.becomePartyBranchRemark" clearable maxlength="500" show-word-limit
+                  rows="2" placeholder="请输入..."/>
+              </el-form-item>
+            </template>
+          </ai-card>
+        </template>
       </el-form>
       <ai-dialog
-          :visible.sync="isShowStarForm"
+          :visible.sync="isShowIntroducer"
           width="690px"
-          :title="starId ? '修改五星党员' : '添加五星党员'"
+          title="添加入党介绍人/培养人"
           @close="onClose"
-          @onConfirm="onStarForm"
+          @onConfirm="onConfirm"
       >
         <el-form
-            ref="starForm"
-            :model="starForm"
+            ref="introducerForm"
+            :model="introducerInfo"
             label-width="110px"
             label-position="right"
         >
           <el-form-item
-              label="评定时间"
-              prop="starTime"
+              label="姓名"
+              prop="name"
               :rules="[
-              { required: true, message: '请选择评定时间', trigger: 'change' },
-            ]"
-          >
-            <el-date-picker
-                size="small"
-                v-model="starForm.starTime"
-                type="month"
-                placeholder="请选择评定时间"
-                style="width: 230px"
-                format="yyyy-MM"
-                :value-format="'yyyy-MM-dd' + ' 00:00:00'"
-            >
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item
-              label="评定等级"
-              prop="level"
-              :rules="[
-              { required: true, message: '请选择评定等级', trigger: 'change' },
-            ]"
-          >
-            <el-rate
-                v-model="starForm.level"
-                show-text
-                :texts="textlist"
-                style="line-height: 2.5"
-            ></el-rate>
-          </el-form-item>
-        </el-form>
-      </ai-dialog>
-      <ai-dialog
-          :visible.sync="isShowJobForm"
-          width="690px"
-          :title="jobId ? '修改工作信息' : '添加工作信息'"
-          @close="onClose"
-          @onConfirm="onJobForm"
-      >
-        <el-form
-            ref="jobForm"
-            :model="jobForm"
-            label-width="110px"
-            label-position="right"
-        >
-          <el-form-item
-              label="工作时间"
-              prop="date"
-              :rules="[
-              { required: true, message: '请选择评定时间', trigger: 'change' },
-            ]"
-          >
-            <el-date-picker
-                size="small"
-                v-model="jobForm.date"
-                type="monthrange"
-                range-separator="至"
-                start-placeholder="开始月份"
-                end-placeholder="结束月份"
-                format="yyyy-MM"
-                :value-format="'yyyy-MM-dd' + ' 00:00:00'"
-            >
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item
-              label="单位"
-              prop="company"
-              :rules="[
-              { required: true, message: '请输入工作单位', trigger: 'blur' },
+              { required: true, message: '请输入姓名', trigger: 'change' },
             ]"
           >
             <el-input
                 size="small"
-                :maxLength="30"
-                v-model="jobForm.company"
-                placeholder="请输入工作单位"
+                v-model="introducerInfo.name"
+                placeholder="请输入..."
+                clearabel
+                :maxLength="20"
             ></el-input>
           </el-form-item>
           <el-form-item
-              label="职务"
+              label="职称"
               prop="position"
               :rules="[
-              { required: true, message: '请输入职务', trigger: 'blur' },
+              { required: true, message: '请输入职称', trigger: 'change' },
             ]"
           >
             <el-input
                 size="small"
-                :maxLength="30"
-                v-model="jobForm.position"
-                placeholder="请输入职务"
-            ></el-input>
-          </el-form-item>
-        </el-form>
-      </ai-dialog>
-      <ai-dialog
-          :visible.sync="isShowDisciplinaryForm"
-          width="690px"
-          :title="disciplinaryId ? '修改违纪信息' : '添加违纪信息'"
-          @close="onClose"
-          @onConfirm="onDisciplinarForm"
-      >
-        <el-form
-            ref="disciplinaryForm"
-            :model="disciplinaryForm"
-            label-width="110px"
-            label-position="right"
-        >
-          <el-form-item
-              label="时间"
-              prop="starTime"
-              :rules="[
-              { required: true, message: '请选择违纪时间', trigger: 'change' },
-            ]"
-          >
-            <el-date-picker
-                size="small"
-                v-model="disciplinaryForm.starTime"
-                type="month"
-                placeholder="请选择违纪时间"
-                style="width: 230px"
-                format="yyyy-MM"
-                :value-format="'yyyy-MM-dd' + ' 00:00:00'"
-            >
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item
-              label="违纪原因"
-              prop="disciplinaryInfo"
-              :rules="[
-              { required: true, message: '请输入违纪原因', trigger: 'blur' },
-            ]"
-          >
-            <el-input
-                size="small"
-                v-model="disciplinaryForm.disciplinaryInfo"
-                placeholder="请输入违纪原因"
-            ></el-input>
-          </el-form-item>
-          <el-form-item
-              label="处理结果"
-              prop="result"
-              :rules="[
-              { required: true, message: '请输入处理结果', trigger: 'blur' },
-            ]"
-          >
-            <el-input
-                size="small"
-                v-model="disciplinaryForm.result"
-                placeholder="请输入处理结果"
+                v-model="introducerInfo.position"
+                placeholder="请输入..."
+                clearabel
+                :maxLength="20"
             ></el-input>
           </el-form-item>
         </el-form>
@@ -669,11 +495,10 @@
 import {mapState} from "vuex";
 export default {
   name: "Add",
-
   props: {
     instance: Function,
     dict: Object,
-    selected: Object
+    selected: Object,
   },
   computed: {
      ...mapState(["user"]),
@@ -682,173 +507,127 @@ export default {
     },
   },
   data() {
-    const validatorPhone = function (rule, value, callback) {
-      if (value === "") {
-        callback(new Error("请输入手机号"));
-      } else if (!/^1\d{10}$/.test(value)) {
-        callback(new Error("手机号格式错误"));
-      } else {
-        callback();
-      }
-    };
     return {
-      info: {},
-      validatorPhone: validatorPhone,
       form: {
-        name: "",
-        partyOrgId: "",
-        idNumber: "",
-        sex: "",
-        fileId: "",
-        birthday: "",
-        age: "",
-        nation: "",
-        partyOrgName: "",
-        birthplaceAreaId: "",
-        householdAreaId: "",
-        householdAddress: "",
-        phone: "",
-        currentAreaId: "",
-        currentAddress: "",
-        partyStatus: "",
-        partyType: "",
-        joinPartyTime: "",
-        turnPositiveTime: "",
-        joinPartyIntroducer: "",
-        partyPosition: "",
-        partyStartDate: "",
-        partyWork: "",
-        flowStatus: "",
-        flowOrgId: "",
-        flowTime: "",
-        disciplinaryInfoList: [],
-        starList: [],
-        workInfoList: [],
-        outFlow: "",
-        lossTime: "",
-        inTime: "",
-        education: "",
-        isOutstandingParty: "0"
+        name: '',
+        idNumber: '',
+        developStatus: '',
+        sex: '',
+        birthday: '',
+        age: '',
+        nation: '',
+        birthplaceAreaId: '',
+        householdAreaId: '',
+        householdAddress: '',
+        avatarUrl: '',
+        phone: '',
+        currentAreaId: '',
+        currentAddress: '',
+        joinLeagueMemberTime: '',
+        education: '',
+        position: '',
+        rewardRemark: '',
+        punishmentRemark: '',
+        resume: '',
+        fileList: [],
+        applyJoinPartyTime: '',
+        applyJoinPartyWay: '',
+        activistTime: '',
+        activistAccordingRemark: '',
+        activistEducationRemark: '',
+        introducerList: [],
+        determineTime: '',
+        determinePoliticsRemark: '',
+        determineSocialRemark: '',
+        determineRealityRemark: '',
+        determineKnowledgeRemark: '',
+        determineComprehensiveRemark: '',
+        determinePartyInnerRemark: '',
+        determineChatRemark: '',
+        determineBranchRemark: '',
+        acceptTime: '',
+        acceptAddress: '',
+        acceptBranchMeetingOpinion: '',
+        acceptEducationRemark: '',
+        acceptBranchMeetingOpinion: '',
+        acceptInvestigateRemark: '',
+        acceptBranchRemark: '',
+        becomePartyTime: '',
+        becomePartyEducationRemark: '',
+        becomePartyInvestigateRemark: '',
+        becomePartyGroupRemark: '',
+        becomePartyBranchRemark: '',
       },
-      isShowStarForm: false,
-      isShowJobForm: false,
-      jobForm: {
-        date: [],
-        company: "",
-        position: "",
+      rules: {
+        name: [{ required: true, message: '请输入姓名', trigger: 'change' }],
+        idNumber: [{ required: true, message: '请输入身份证号', trigger: 'change' }],
+        developStatus: [{ required: true, message: '请选择发展状态', trigger: 'change' }],
+        phone: [{ required: true, message: '请输入联系方式', trigger: 'change' }],
+        applyJoinPartyTime: [{ required: true, message: '请选择申请入党时间', trigger: 'change' }],
+        activistTime: [{ required: true, message: '请选择确定为入党积极分子时间', trigger: 'change' }],
+        determineTime: [{ required: true, message: '请选择确定为发展对象时间', trigger: 'change' }],
+        acceptTime: [{ required: true, message: '请选择吸收入党时间', trigger: 'change' }],
+        becomePartyTime: [{ required: true, message: '请选择转正时间', trigger: 'change' }],
       },
-      jobId: "",
-      starForm: {
-        starTime: "",
-        level: 1,
-      },
-      disciplinaryId: "",
-      isShowDisciplinaryForm: false,
-      disciplinaryForm: {
-        starTime: "",
-        disciplinaryInfo: "",
-        result: "",
-      },
-      starId: "",
-      activeName: "五星党员",
-      textlist: ["一星党员", "二星党员", "三星党员", "四星党员", "五星党员"],
-      colConfigs1: [
-        {
-          prop: "starTime",
-          label: "姓名",
-          align: "center",
-          formart: (v) => (v ? v.split(" ")[0] : "-"),
-        },
-        {
-          prop: "starTime",
-          label: "职位",
-          align: "center",
-          formart: (v) => (v ? v.split(" ")[0] : "-"),
-        },
-      ],
-      colConfigs2: [
-        {slot: "date"},
-        {prop: "company", label: "单位", align: "center"},
+      isShowIntroducer: false,
+      introducerInfo: {position: '', name: ''},
+      colConfigs: [
+        {prop: "name", label: "姓名", align: "center"},
         {prop: "position", label: "职务", align: "center"},
-      ],
-      colConfigs3: [
-        {
-          prop: "starTime",
-          label: "时间",
-          align: "center",
-          formart: (v) => (v ? v.split(" ")[0] : "-"),
-        },
-        {prop: "disciplinaryInfo", label: "违纪原因", align: "center"},
-        {prop: "result", label: "处理结果", align: "center"},
+        {slot: "options"},
       ],
     };
   },
   created() {
-    this.dict.load(
-        "partyStatus",
-        "education",
-        "flowStatus",
-        "auditStatus",
-        "partyType",
-        "partyPosition",
-        "sex",
-        "nation"
-    );
-    if (this.isEdit) {
-      this.getInfo()
-    } else {
-      this.initOrg();
-    }
-
+    this.dict.load("education", "sex", "nation", "developStatus").then(() => {
+      if (this.isEdit) {
+        this.getInfo()
+      }
+    })
+    console.log(this.$route.query.partyOrgId)
   },
   methods: {
-    flowStatusChange() {
-      this.form.flowOrgId = ''
-      this.form.flowTime = ''
-      this.form.outFlow = ''
-      this.form.inTime = ''
-      this.form.lossTime = ''
-    },
-    initOrg() {
-      let {id: partyOrgId, name: partyOrgName} = this.selected
-      this.form.partyOrgId = partyOrgId;
-      this.form.partyOrgName = partyOrgName;
-    },
-    remove(index, key) {
-      this.$confirm("确定删除该数据？").then(() => {
-        this.form[key].splice(index, 1);
-      });
-    },
-    getInfo() {
-      let {id} = this.$route.query;
-      id && this.instance.post(`/app/appparty/detail`, null, {
-        params: {id},
-      }).then((res) => {
-        if (res?.data) {
-          this.form = res.data
+    confirm() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.form.partyOrgId = this.$route.query.partyOrgId
+          this.instance.post(`/app/apppartydevelop/addOrUpdate`, {...this.form}).then((res) => {
+            if (res.code == 0) {
+              this.$message.success(this.isEdit ? "编辑成功" : "添加成功");
+              setTimeout(() => {
+                this.cancel(true);
+              }, 600);
+            }
+          });
         }
       });
     },
-    editStar(query, index) {
-      this.starForm = JSON.parse(JSON.stringify(query));
-      this.starId = index;
-      this.isShowStarForm = true;
+    cancel() {
+      this.$router.push({});
     },
-    editJob(query, index) {
-      this.jobForm = JSON.parse(JSON.stringify(query));
-      this.jobId = index;
-      this.isShowJobForm = true;
+    addIntroducer() {
+      this.isShowIntroducer = true
+      this.introducerInfo = {position: '', name: ''}
     },
-    editDisciplinary(query, index) {
-      this.disciplinaryForm = JSON.parse(JSON.stringify(query));
-      this.disciplinaryId = index;
-      this.isShowDisciplinaryForm = true;
+    onClose() {
+      this.isShowIntroducer = false
     },
-    idChange(val) {
-      let info = this.idCardNoUtil.getIdCardInfo(val)
-      this.form.sex = info.sex || "";
-      this.form.birthday = info.birthday || "";
-      this.form.age = this.$calcAge(val) || "";
+    onConfirm() {
+      this.$refs.introducerForm.validate((valid) => {
+        if (valid) {
+          this.introducerInfo.developPartyId = this.form.id
+          this.form.introducerList.push(this.introducerInfo)
+          this.isShowIntroducer = false
+        }
+      });
+    },
+    remove(index) {
+      console.log(index)
+      this.$confirm("确定删除该数据？").then(() => {
+        this.form.introducerList.splice(index, 1)
+      });
+      // this.form.introducerList.splice(index, 1)
+      // this.$forceUpdate()
     },
     checkName(val) {
       for (let i in this.form) {
@@ -864,102 +643,21 @@ export default {
       }
       this.form.avatarUrl = val.photo;
     },
-    onJobForm() {
-      this.$refs.jobForm.validate((valid) => {
-        if (valid) {
-          let info = JSON.parse(JSON.stringify({
-            ...this.jobForm,
-            starTime: this.jobForm.date[0],
-            endTime: this.jobForm.date[1],
-          }))
-          if (this.jobId !== "") {
-            this.form.workInfoList.splice(this.jobId, 1, info)
-          } else {
-            this.form.workInfoList.push(info)
-          }
-          this.isShowJobForm = false;
+    getInfo() {
+      let {id} = this.$route.query;
+      id && this.instance.post(`/app/apppartydevelop/queryDetailById`, null, {params: {id},}).then((res) => {
+        if (res?.data) {
+          this.form = res.data
         }
       });
     },
-    onStarForm() {
-      this.$refs.starForm.validate((valid) => {
-        if (valid) {
-          let info = JSON.parse(JSON.stringify(this.starForm))
-          if (this.starId !== "") {
-            this.form.starList.splice(this.starId, 1, info)
-          } else {
-            this.form.starList.push(info)
-          }
-          this.isShowStarForm = false;
-        }
-      });
+    idChange(val) {
+      let info = this.idCardNoUtil.getIdCardInfo(val)
+      this.form.sex = info.sex || "";
+      this.form.birthday = info.birthday + ' 00:00:00' || "";
+      this.form.age = this.$calcAge(val) || "";
     },
-    onDisciplinarForm() {
-      this.$refs.disciplinaryForm.validate((valid) => {
-        if (valid) {
-          let info = JSON.parse(JSON.stringify(this.disciplinaryForm))
-          if (this.disciplinaryId !== "") {
-            this.form.disciplinaryInfoList.splice(this.disciplinaryId, 1, info)
-          } else {
-            this.form.disciplinaryInfoList.push(info)
-          }
-          this.isShowDisciplinaryForm = false;
-        }
-      });
-    },
-    onClose() {
-      this.starId = "";
-      this.jobId = "";
-      this.disciplinaryId = "";
-      this.starForm.level = 0;
-      this.starForm.id = "";
-      this.starForm.starTime = "";
-      this.jobForm.date = [];
-      this.jobForm.company = "";
-      this.jobForm.id = "";
-      this.jobForm.position = "";
-      this.disciplinaryForm.starTime = "";
-      this.disciplinaryForm.id = "";
-      this.disciplinaryForm.disciplinaryInfo = "";
-      this.disciplinaryForm.result = "";
-    },
-    addForm(type) {
-      if (type === "五星党员") {
-        this.isShowStarForm = true;
-      } else if (type === "工作信息") {
-        this.isShowJobForm = true;
-      } else {
-        this.isShowDisciplinaryForm = true;
-      }
-    },
-    confirm() {
-      this.$refs.form.validate((valid) => {
-        if (valid) {
-          this.instance.post(`/app/appparty/addOrUpdate`, {
-            ...this.form
-          })
-          .then((res) => {
-            if (res.code == 0) {
-              this.$message.success(this.isEdit ? "编辑成功" : "添加成功");
-              setTimeout(() => {
-                this.cancel(true);
-              }, 600);
-            }
-          });
-        }
-      });
-    },
-    cancel() {
-      this.$router.push({});
-    },
-    handlePartyOrgSelect(e) {
-      let {isLeaf, name, id} = e?.[0] || {};
-      if (isLeaf == 1) {
-        this.form.partyOrgName = name;
-        this.form.partyOrgId = id;
-      }
-    },
-  },
+  }
 };
 </script>
 
@@ -1000,9 +698,5 @@ export default {
   ::v-deep .ai-form .el-form-item .el-form-item__content {
     margin-left: 174px!important;
   }
-  ::v-deep .ai-form .el-form-item,
-  ::v-deep .el-form-item {
-    margin-bottom: 8px!important;
-  }
 }
 </style>
diff --git a/project/pingchang/apps/AppRecruitPartyMembers/components/Detail.vue b/project/pingchang/apps/AppRecruitPartyMembers/components/Detail.vue
index 302d7ded..b0ab342b 100644
--- a/project/pingchang/apps/AppRecruitPartyMembers/components/Detail.vue
+++ b/project/pingchang/apps/AppRecruitPartyMembers/components/Detail.vue
@@ -2,7 +2,7 @@
   <ai-detail class="party-detail">
     <template slot="title">
       <ai-title
-        title="党员信息详情"
+        title="发展党员信息详情"
         isShowBack
         isShowBottomBorder
         @onBackClick="cancel(true)"
@@ -35,7 +35,7 @@
                 :value="info.birthday"
               ></ai-info-item>
               <ai-info-item label="年龄">{{ info.age }}</ai-info-item>
-              <ai-info-item label="发展状态">{{ info.age }}</ai-info-item>
+              <ai-info-item label="发展状态">{{ dict.getLabel('developStatus', info.developStatus)}}</ai-info-item>
               <ai-info-item
                 label="籍贯"
                 isLine
@@ -44,7 +44,7 @@
               <ai-info-item
                 label="户籍地"
                 isLine
-                :value="info.householdAreaName"
+                :value="info.householdAddressName"
               ></ai-info-item>
             </ai-wrapper>
           </template>
@@ -52,11 +52,11 @@
         <ai-card title="联络信息">
           <template #content>
             <ai-wrapper label-width="150px">
-              <ai-info-item label="联系方式">{{ info.name }}</ai-info-item>
+              <ai-info-item label="联系方式">{{ info.phone }}</ai-info-item>
               <ai-info-item
                 label="现住址"
                 isLine
-                :value="info.householdAreaName"
+                :value="info.currentAddressName"
               ></ai-info-item>
             </ai-wrapper>
           </template>
@@ -64,91 +64,92 @@
         <ai-card title="团籍信息">
           <template #content>
             <ai-wrapper label-width="150px">
-              <ai-info-item label="入团日期">{{ info.name }}</ai-info-item>
-              <ai-info-item label="文化程度">{{ info.name }}</ai-info-item>
-              <ai-info-item label="学位职称">{{ info.name }}</ai-info-item>
-              <ai-info-item label="奖励情况" isLine :value="info.householdAreaName"></ai-info-item>
-              <ai-info-item label="处分情况" isLine :value="info.householdAreaName"></ai-info-item>
-              <ai-info-item label="简历" isLine :value="info.householdAreaName"></ai-info-item>
+              <ai-info-item label="入团日期">{{ info.joinLeagueMemberTime }}</ai-info-item>
+              <ai-info-item label="文化程度">{{ dict.getLabel('education', info.education) }}</ai-info-item>
+              <ai-info-item label="学位职称">{{ info.position }}</ai-info-item>
+              <ai-info-item label="奖励情况" isLine :value="info.rewardRemark"></ai-info-item>
+              <ai-info-item label="处分情况" isLine :value="info.punishmentRemark"></ai-info-item>
+              <ai-info-item label="简历" isLine :value="info.resume"></ai-info-item>
               <ai-info-item label="附件" isLine>
-                <ai-file-list v-if="info.files && info.files.length"
-                  :fileList="info.files"
+                <ai-file-list v-if="info.fileList && info.fileList.length"
+                  :fileList="info.fileList"
                   :fileOps="{ name: 'name', size: 'fileSizeStr' }"
                 ></ai-file-list>
               </ai-info-item>
             </ai-wrapper>
           </template>
         </ai-card>
-        <ai-card title="申请入学">
+        <ai-card title="申请入党">
           <template #content>
             <ai-wrapper label-width="150px">
-              <ai-info-item label="申请入学时间">{{ info.name }}</ai-info-item>
+              <ai-info-item label="申请入党时间">{{ info.applyJoinPartyTime }}</ai-info-item>
               <ai-info-item
-                label="申请入学形式"
+                label="申请入党形式"
                 isLine
-                :value="info.householdAreaName"
+                :value="info.applyJoinPartyWay"
               ></ai-info-item>
             </ai-wrapper>
           </template>
         </ai-card>
-        <ai-card title="入学积极分子的确定和教育培养">
+
+        <ai-card title="入党积极分子的确定和教育培养"  v-if="info.developStatus > 0">
           <template #content>
             <ai-wrapper label-width="150px">
-              <ai-info-item label="确定为入学积极分子时间" isLine>{{ info.name }}</ai-info-item>
-              <ai-info-item label="确定为积极分子的根据和意见" isLine :value="info.householdAreaName"></ai-info-item>
-              <ai-info-item label="培养教育情况及鉴定意见" isLine :value="info.householdAreaName"></ai-info-item>
+              <ai-info-item label="确定为入党积极分子时间" isLine>{{ info.activistTime }}</ai-info-item>
+              <ai-info-item label="确定为积极分子的根据和意见" isLine :value="info.activistAccordingRemark"></ai-info-item>
+              <ai-info-item label="培养教育情况及鉴定意见" isLine :value="info.activistEducationRemark"></ai-info-item>
             </ai-wrapper>
           </template>
         </ai-card>
-        <ai-card title="入学介绍人/培养人">
+        <ai-card title="入党介绍人/培养人"  v-if="info.developStatus > 0">
           <template #content>
             <ai-table
               :border="true"
-              :tableData="info.starList"
+              :tableData="info.introducerList"
               :isShowPagination="false"
-              :col-configs="colConfigs1"
+              :col-configs="colConfigs"
               :stripe="false"
               @getList="() => {}"
               >
             </ai-table>
           </template>
         </ai-card>
-        <ai-card title="发展对象的确定和考察">
+        <ai-card title="发展对象的确定和考察" v-if="info.developStatus > 1">
           <template #content>
             <ai-wrapper label-width="150px">
-              <ai-info-item label="确定为发展对象时间" isLine>{{ info.name }}</ai-info-item>
-              <ai-info-item label="政治历史的考察及结论" isLine :value="info.householdAreaName"></ai-info-item>
-              <ai-info-item label="社会关系考察及结论" isLine :value="info.householdAreaName"></ai-info-item>
-              <ai-info-item label="现实考察及结论" isLine :value="info.householdAreaName"></ai-info-item>
-              <ai-info-item label="学的基本知识考核及考试成绩" isLine :value="info.householdAreaName"></ai-info-item>
-              <ai-info-item label="综合考察结论意见" isLine :value="info.householdAreaName"></ai-info-item>
-              <ai-info-item label="学内讨论是否确定为发展对象的意见" isLine :value="info.householdAreaName"></ai-info-item>
-              <ai-info-item label="确定为发展对象后的谈话记录" isLine :value="info.householdAreaName"></ai-info-item>
-              <ai-info-item label="支委会研究意见" isLine :value="info.householdAreaName"></ai-info-item>
+              <ai-info-item label="确定为发展对象时间" isLine>{{ info.determineTime }}</ai-info-item>
+              <ai-info-item label="政治历史的考察及结论" isLine :value="info.determinePoliticsRemark"></ai-info-item>
+              <ai-info-item label="社会关系考察及结论" isLine :value="info.determineSocialRemark"></ai-info-item>
+              <ai-info-item label="现实考察及结论" isLine :value="info.determineRealityRemark"></ai-info-item>
+              <ai-info-item label="党的基本知识考核及考试成绩" isLine :value="info.determineKnowledgeRemark"></ai-info-item>
+              <ai-info-item label="综合考察结论意见" isLine :value="info.determineComprehensiveRemark"></ai-info-item>
+              <ai-info-item label="党内讨论是否确定为发展对象的意见" isLine :value="info.determinePartyInnerRemark"></ai-info-item>
+              <ai-info-item label="确定为发展对象后的谈话记录" isLine :value="info.determineChatRemark"></ai-info-item>
+              <ai-info-item label="支委会研究意见" isLine :value="info.determineBranchRemark"></ai-info-item>
             </ai-wrapper>
           </template>
         </ai-card>
-        <ai-card title="预备学员的接收">
+        <ai-card title="预备党员的接收" v-if="info.developStatus > 2">
           <template #content>
             <ai-wrapper label-width="150px">
-              <ai-info-item label="吸收入学时间" isLine>{{ info.name }}</ai-info-item>
-              <ai-info-item label="吸收入学地点" isLine :value="info.householdAreaName"></ai-info-item>
-              <ai-info-item label="吸收入学时支部大会上学员提的意见和要求及个人的态度" isLine :value="info.householdAreaName"></ai-info-item>
-              <ai-info-item label="预备期间的教育情况" isLine :value="info.householdAreaName"></ai-info-item>
-              <ai-info-item label="学小组对其转正的讨论意见" isLine :value="info.householdAreaName"></ai-info-item>
-              <ai-info-item label="预备期间的考察情况" isLine :value="info.householdAreaName"></ai-info-item>
-              <ai-info-item label="学支部对其转正的意见" isLine :value="info.householdAreaName"></ai-info-item>
+              <ai-info-item label="吸收入党时间" isLine>{{ info.acceptTime }}</ai-info-item>
+              <ai-info-item label="吸收入党地点" isLine :value="info.acceptAddress"></ai-info-item>
+              <ai-info-item label="吸收入党时支部大会上党员提的意见和要求及个人的态度" isLine :value="info.acceptBranchMeetingOpinion"></ai-info-item>
+              <ai-info-item label="预备期间的教育情况" isLine :value="info.acceptEducationRemark"></ai-info-item>
+              <ai-info-item label="党小组对其转正的讨论意见" isLine :value="info.acceptPartyGroupRemark"></ai-info-item>
+              <ai-info-item label="预备期间的考察情况" isLine :value="info.acceptInvestigateRemark"></ai-info-item>
+              <ai-info-item label="党支部对其转正的意见" isLine :value="info.acceptBranchRemark"></ai-info-item>
             </ai-wrapper>
           </template>
         </ai-card>
-        <ai-card title="预备学员的教育考察和转正">
+        <ai-card title="预备党员的教育考察和转正" v-if="info.developStatus == 4">
           <template #content>
             <ai-wrapper label-width="150px">
-              <ai-info-item label="转正时间" isLine>{{ info.name }}</ai-info-item>
-              <ai-info-item label="预备期间的教育情况" isLine :value="info.householdAreaName"></ai-info-item>
-              <ai-info-item label="预备期间的考察情况" isLine :value="info.householdAreaName"></ai-info-item>
-              <ai-info-item label="学小组对其转正的讨论意见" isLine :value="info.householdAreaName"></ai-info-item>
-              <ai-info-item label="学支部对其转正的意见" isLine :value="info.householdAreaName"></ai-info-item>
+              <ai-info-item label="转正时间" isLine>{{ info.becomePartyTime }}</ai-info-item>
+              <ai-info-item label="预备期间的教育情况" isLine :value="info.becomePartyEducationRemark"></ai-info-item>
+              <ai-info-item label="预备期间的考察情况" isLine :value="info.becomePartyInvestigateRemark"></ai-info-item>
+              <ai-info-item label="党小组对其转正的讨论意见" isLine :value="info.becomePartyGroupRemark"></ai-info-item>
+              <ai-info-item label="党支部对其转正的意见" isLine :value="info.becomePartyBranchRemark"></ai-info-item>
             </ai-wrapper>
           </template>
         </ai-card>
@@ -172,59 +173,11 @@ export default {
   data() {
     return {
       info: {},
-      isShowStarForm: false,
-      isShowJobForm: false,
-      jobForm: {
-        date: [],
-        company: "",
-        position: "",
-      },
-      jobId: "",
-      starForm: {
-        starTime: "",
-        level: 1,
-      },
-      disciplinaryId: "",
-      isShowDisciplinaryForm: false,
-      disciplinaryForm: {
-        starTime: "",
-        disciplinaryInfo: "",
-        result: "",
-      },
-      starId: "",
-      activeName: "五星党员",
-      textlist: ["一星党员", "二星党员", "三星党员", "四星党员", "五星党员"],
-      colConfigs1: [
-        {
-          prop: "starTime",
-          label: "姓名",
-          align: "center",
-          formart: (v) => (v ? v.split(" ")[0] : "-"),
-        },
-        {
-          prop: "starTime",
-          label: "职位",
-          align: "center",
-          formart: (v) => (v ? v.split(" ")[0] : "-"),
-        },
-        
+      colConfigs: [
+        {prop: "name", label: "姓名", align: "center"},
+        {prop: "position", label: "职务", align: "center"},
       ],
-      colConfigs2: [
-        { slot: "date" },
-        { prop: "company", label: "单位", align: "center" },
-        { prop: "position", label: "职务", align: "center" },
-      ],
-      colConfigs3: [
-        {
-          prop: "starTime",
-          label: "时间",
-          align: "center",
-          formart: (v) => (v ? v.split(" ")[0] : "-"),
-        },
-        { prop: "disciplinaryInfo", label: "违纪原因", align: "center" },
-        { prop: "result", label: "处理结果", align: "center" },
-      ],
-    };
+    }
   },
 
   computed: {
@@ -232,150 +185,24 @@ export default {
   },
 
   created() {
-    this.getInfo();
+    this.dict.load("education", "sex", "nation", "developStatus").then(() => {
+      this.getInfo()
+    })
   },
 
   methods: {
     getInfo() {
       let { id } = this.$route.query;
-      id &&
-        this.instance
-          .post(`/app/appparty/detail`, null, {
-            params: { id },
-          })
-          .then((res) => {
-            if (res?.data) {
-              this.info = res.data;
-              if (this.info.birthday) {
-                this.info.birthday = this.info.birthday.substring(0, 10);
-              }
-            }
-          });
-    },
-    remove(id, apiUrl) {
-      this.$confirm("确定删除该数据？").then(() => {
-        this.instance.post(`${apiUrl}?ids=${id}`).then((res) => {
-          if (res.code == 0) {
-            this.getInfo();
-            this.$message.success("删除成功！");
+      id && this.instance.post(`/app/apppartydevelop/queryDetailById`, null, { params: { id },}).then((res) => {
+        if (res?.data) {
+          this.info = res.data;
+          if (this.info.birthday) {
+            this.info.birthday = this.info.birthday.substring(0, 10);
           }
-        });
-      });
-    },
-    editJob(query) {
-      this.jobForm = {
-        ...query,
-        date: [query.starTime, query.endTime],
-      };
-      this.jobId = query.id;
-
-      this.isShowJobForm = true;
-    },
-    editStar(query) {
-      this.starForm = {
-        ...query,
-      };
-      this.starId = query.id;
-
-      this.isShowStarForm = true;
-    },
-
-    editDisciplinary(query) {
-      this.disciplinaryForm = {
-        ...query,
-      };
-      this.disciplinaryId = query.id;
-
-      this.isShowDisciplinaryForm = true;
-    },
-
-    onDisciplinarForm() {
-      this.$refs.disciplinaryForm.validate((valid) => {
-        if (valid) {
-          this.instance
-            .post(`/app/apppartydisciplinaryinfo/addOrUpdate`, {
-              ...this.disciplinaryForm,
-              partyId: this.params.id,
-            })
-            .then((res) => {
-              if (res.code == 0) {
-                this.isShowDisciplinaryForm = false;
-                this.getInfo();
-                this.$message.success(this.jobId ? "编辑成功" : "新增成功");
-              }
-            });
         }
       });
     },
 
-    onJobForm() {
-      this.$refs.jobForm.validate((valid) => {
-        if (valid) {
-          this.instance
-            .post(`/app/apppartyworkinfo/addOrUpdate`, {
-              ...this.jobForm,
-              starTime: this.jobForm.date[0],
-              endTime: this.jobForm.date[1],
-              partyId: this.params.id,
-            })
-            .then((res) => {
-              if (res.code == 0) {
-                this.isShowJobForm = false;
-                this.getInfo();
-                this.$message.success(this.jobId ? "编辑成功" : "新增成功");
-              }
-            });
-        }
-      });
-    },
-
-    onStarForm() {
-      this.$refs.starForm.validate((valid) => {
-        if (valid) {
-          this.instance
-            .post(`/app/apppartyfivestar/addOrUpdate`, {
-              ...this.starForm,
-              idNumber: this.info.idNumber,
-              partyId: this.params.id,
-            })
-            .then((res) => {
-              if (res.code == 0) {
-                this.isShowStarForm = false;
-                this.getInfo();
-                this.$message.success(this.starId ? "编辑成功" : "新增成功");
-              }
-            });
-        }
-      });
-    },
-
-    onClose() {
-      this.starId = "";
-      this.jobId = "";
-      this.disciplinaryId = "";
-      this.starForm.level = 0;
-      this.starForm.id = "";
-      this.starForm.starTime = "";
-      this.jobForm.date = [];
-      this.jobForm.company = "";
-      this.jobForm.id = "";
-      this.jobForm.position = "";
-      this.disciplinaryForm.starTime = "";
-      this.disciplinaryForm.id = "";
-      this.disciplinaryForm.disciplinaryInfo = "";
-      this.disciplinaryForm.result = "";
-    },
-
-    addForm(type) {
-      if (type === "五星党员") {
-        this.isShowStarForm = true;
-      } else if (type === "工作信息") {
-        this.isShowJobForm = true;
-      } else {
-        this.isShowDisciplinaryForm = true;
-      }
-    },
-
     cancel() {
       this.$router.push({});
     },
diff --git a/project/pingchang/apps/AppRecruitPartyMembers/components/List.vue b/project/pingchang/apps/AppRecruitPartyMembers/components/List.vue
index 8ead6764..7f0a9b9a 100644
--- a/project/pingchang/apps/AppRecruitPartyMembers/components/List.vue
+++ b/project/pingchang/apps/AppRecruitPartyMembers/components/List.vue
@@ -24,41 +24,7 @@
             <ai-range v-model="search.age" ref="resetagefoo" @change="search.current = 1, getList()"
               @closeVal="search.age = []"/>
           </ai-search>
-          <!-- <ai-select v-model="search.nation" placeholder="请选择民族" :selectList="dict.getDict('nation')"
-                     @change="search.current = 1, getList()"></ai-select>
-          <ai-select v-model="search.partyStatus" placeholder="请选择党籍状态" :selectList="dict.getDict('partyStatus')"
-                     @change="search.current = 1, getList()"></ai-select>
-          <ai-select v-model="search.flowStatus" placeholder="请选择流动状态" :selectList="dict.getDict('flowStatus')"
-                     @change="search.current = 1, getList()"></ai-select>
-          <ai-select v-model="search.education" placeholder="请选择文化程度" :selectList="dict.getDict('education')"
-                     @change="search.current = 1, getList()"></ai-select>
-          <ai-select v-model="search.partyPosition" placeholder="请选择党内职务" :selectList="dict.getDict('partyPosition')"
-                     @change="search.current = 1, getList()"></ai-select>
-          <ai-select v-model="search.disciplinary" placeholder="请选择违纪情况" :selectList="dict.getDict('disciplinary')"
-                     @change="search.current = 1, getList()"></ai-select>
-          <ai-search label="出生日期">
-            <el-date-picker
-                size="small"
-                v-model="search.birthStart"
-                type="date"
-                placeholder="开始日期"
-                format="yyyy-MM-dd"
-                style="width: 180px"
-                @change="search.current = 1, getList()"
-                clearable
-                :value-format="'yyyy-MM-dd'+' 00:00:00'"/>
-            <el-date-picker
-                size="small"
-                v-model="search.birthEnd"
-                type="date"
-                placeholder="结束日期"
-                format="yyyy-MM-dd"
-                style="width: 180px"
-                @change="search.current = 1, getList()"
-                clearable
-                :value-format="'yyyy-MM-dd'+' 23:59:59'"/>
-          </ai-search> -->
-          <ai-search label="入学时间">
+          <ai-search label="入党时间">
             <el-date-picker
                 size="small"
                 v-model="search.joinPartyStart"
@@ -96,7 +62,7 @@
       <ai-search-bar>
         <template #left>
           <el-button size="small" :disabled="!isShowAddBtn" type="primary" icon="iconfont iconAdd" @click="toAdd()">添加</el-button>
-          <el-button size="small" :disabled="!ids.length"  icon="iconfont iconDelete" @click="toAdd()">删除</el-button>
+          <el-button size="small" :disabled="!ids.length"  icon="iconfont iconDelete" @click="remove(ids)">删除</el-button>
         </template>
         <!-- <template #right>
           <ai-import :instance="instance" :dict="dict" type="appparty" name="发展党员" @success="getList()"></ai-import>
@@ -118,6 +84,7 @@
           <template slot-scope="{ row }">
             <div class="table-options">
               <el-button type="text" @click="toDetail(row.id)">详情</el-button>
+              <el-button type="text" @click="toAdd(row.id)">编辑</el-button>
               <el-button type="text" @click="remove(row.id)">删除</el-button>
 
               <!-- <el-button type="text" @click="toAdd(row.id)">编辑</el-button>
@@ -155,15 +122,6 @@ export default {
         con: '',
         age: [],
         sex: '',
-        nation: '',
-        partyStatus: '',
-        flowStatus: '',
-        education: '',
-        partyPosition: '',
-        birthStart: '',
-        birthEnd: '',
-        turnPositiveStart: '',
-        turnPositiveEnd: '',
         joinPartyStart: '',
         joinPartyEnd: ''
       },
@@ -175,8 +133,8 @@ export default {
         {prop: 'name', label: '姓名', align: 'center'},
         {prop: 'sex', label: '性别', align: 'center', dict: 'sex'},
         {prop: 'age', label: '年龄', align: 'center'},
-        {prop: 'joinPartyTime', label: '入学申请日期', align: 'center'},
-        {prop: 'flowStatus', label: '发展状态', align: 'center', dict: 'flowStatus'},
+        {prop: 'applyJoinPartyTime', label: '申请入党日期', align: 'center'},
+        {prop: 'developStatus', label: '发展状态', align: 'center', dict: 'developStatus'},
       ],
       tableData: [],
       ids: '',
@@ -199,8 +157,10 @@ export default {
     }
   },
   created() {
-    this.dict.load('disciplinary', 'partyType', 'sex', 'nation', 'education', 'partyStatus', 'partyPosition', 'flowStatus', 'auditStatus')
-    this.getList()
+    this.dict.load('sex', 'developStatus').then(() => {
+      this.getList()
+    })
+    
   },
   methods: {
     showNeighbourSetting(id) {
@@ -220,8 +180,8 @@ export default {
 
       this.loading = true
       partyOrgId = partyOrgId || this.selected.id
-      this.instance.post(`/app/appparty/list`, null, {
-        params: {partyOrgId, ...this.search, age: this.search.age?.join(',')}
+      this.instance.post(`/app/apppartydevelop/list`, null, {
+        params: {partyOrgId, ...this.search, ageStart: this.search.age[0] || '', ageEnd: this.search.age[1] || '',}
       }).then(res => {
         this.loading = false
         if (res?.data) {
@@ -234,7 +194,7 @@ export default {
     },
     removeAll() {
       if (!this.ids) {
-        return this.$message.error('请选择党员')
+        return this.$message.error('请选择发展党员')
       }
       this.remove(this.ids)
     },
@@ -247,7 +207,7 @@ export default {
     },
     remove(id) {
       this.$confirm('确定删除该数据？').then(() => {
-        this.instance.post(`/app/appparty/delete?ids=${id}`).then(res => {
+        this.instance.post(`/app/apppartydevelop/delete?ids=${id}`).then(res => {
           if (res.code == 0) {
             this.$message.success('删除成功！')
             this.getList()
@@ -259,7 +219,7 @@ export default {
       this.$router.push({query: {id}})
     },
     toAdd(id) {
-      this.$router.push({query: {id}, hash: "#add"})
+      this.$router.push({query: {id, partyOrgId: this.selected.id}, hash: "#add"})
     }
   }
 }