From b1b35b05cf87608665a8bfc9802488f425f8d2e9 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Mon, 17 Oct 2022 16:49:47 +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/components/Add.vue | 233 +++++++-----------
 1 file changed, 95 insertions(+), 138 deletions(-)

diff --git a/project/pingchang/apps/AppRecruitPartyMembers/components/Add.vue b/project/pingchang/apps/AppRecruitPartyMembers/components/Add.vue
index 2a8597ae..bd162b5c 100644
--- a/project/pingchang/apps/AppRecruitPartyMembers/components/Add.vue
+++ b/project/pingchang/apps/AppRecruitPartyMembers/components/Add.vue
@@ -21,12 +21,11 @@
                   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
@@ -188,9 +187,9 @@
             </el-form-item>
             <el-form-item label="文化程度">
               <ai-select
-                  v-model="form.partyStatus"
-                  placeholder="请选择文化程度"
-                  :selectList="dict.getDict('partyStatus')"
+                v-model="form.education"
+                placeholder="请选择文化程度"
+                :selectList="dict.getDict('education')"
               ></ai-select>
             </el-form-item>
             <el-form-item label="学位职称">
@@ -203,16 +202,16 @@
               ></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
@@ -280,201 +279,160 @@
                 <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="入学积极分子的确定和教育培养">
-            <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="入学介绍人/培养人">
+          <ai-card title="入党介绍人/培养人" v-if="form.developStatus > 0">
             <template #right>
-              <el-button type="text" icon="iconfont iconAdd" @click="addForm(activeName)">添加入学介绍人/培养人</el-button>
+              <el-button type="text" icon="iconfont iconAdd" @click="addIntroducer()">添加入党介绍人/培养人</el-button>
             </template>
             <template #content>
               <ai-table
-                  :border="true"
-                  :tableData="form.starList"
-                  :isShowPagination="false"
-                  :col-configs="colConfigs1"
-                  :stripe="false"
-                  @getList="() => {}"
+                :border="true"
+                :tableData="form.introducerList"
+                :isShowPagination="false"
+                :col-configs="colConfigs"
+                :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
-                    slot="options"
-                    width="120px"
-                    fixed="right"
-                    label="操作"
-                    align="center"
+                  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
-                      >
+                      <el-button type="text" @click="remove($index)">删除</el-button>
                     </div>
                   </template>
                 </el-table-column>
               </ai-table>
             </template>
           </ai-card>
-          <ai-card title="发展对象的确定和考察">
+          <ai-card title="发展对象的确定和考察" v-if="form.developStatus > 1">
             <template #content>
-              <el-form-item label="确定为发展对象时间" prop="phone" required>
+              <el-form-item label="确定为发展对象时间" prop="determineTime" >
                 <el-date-picker
                     size="small"
-                    v-model="form.joinPartyTime"
+                    v-model="form.determineTime"
                     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="政治历史的考察及结论" 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.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.personalProfile" clearable maxlength="500" show-word-limit
-                          rows="2" placeholder="请输入..."/>
+                <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.personalProfile" clearable maxlength="500" show-word-limit
-                          rows="2" placeholder="请输入..."/>
+                <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.personalProfile" clearable maxlength="500" show-word-limit
-                          rows="2" placeholder="请输入..."/>
+              <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.personalProfile" clearable maxlength="500" show-word-limit
-                          rows="2" placeholder="请输入..."/>
+                <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.personalProfile" clearable maxlength="500" show-word-limit
-                          rows="2" placeholder="请输入..."/>
+              <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.personalProfile" clearable maxlength="500" show-word-limit
-                          rows="2" placeholder="请输入..."/>
+                <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.personalProfile" clearable maxlength="500" show-word-limit
-                          rows="2" placeholder="请输入..."/>
+                <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="预备学员的接收">
+          <ai-card title="预备党员的接收" v-if="form.developStatus > 2">
             <template #content>
-              <el-form-item label="吸收入学时间" prop="phone" required>
+              <el-form-item label="吸收入党时间" prop="acceptTime" >
                 <el-date-picker
                     size="small"
-                    v-model="form.joinPartyTime"
+                    v-model="form.acceptTime"
                     type="date"
-                    placeholder="请选择吸收入学时间"
+                    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="吸收入学地点">
+              <el-form-item label="吸收入党地点">
                 <el-input
                     size="small"
-                    v-model="form.phone"
+                    v-model="form.acceptAddress"
                     placeholder="请输入..."
                     clearabel
-                    :maxLength="11"
+                    :maxLength="50"
                 ></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 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.personalProfile" clearable maxlength="500" show-word-limit
-                          rows="2" placeholder="请输入..."/>
+                <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.personalProfile" clearable maxlength="500" show-word-limit
-                          rows="2" placeholder="请输入..."/>
+              <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.personalProfile" clearable maxlength="500" show-word-limit
-                          rows="2" placeholder="请输入..."/>
+                <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.personalProfile" clearable maxlength="500" show-word-limit
-                          rows="2" placeholder="请输入..."/>
+              <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="预备学员的教育考察和转正">
+          <ai-card title="预备党员的教育考察和转正" v-if="form.developStatus == 4">
             <template #content>
-              <el-form-item label="转正时间" prop="phone" required>
+              <el-form-item label="转正时间" prop="becomePartyTime" >
                 <el-date-picker
                     size="small"
-                    v-model="form.joinPartyTime"
+                    v-model="form.becomePartyTime"
                     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="预备期间的教育情况" 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.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.personalProfile" clearable maxlength="500" show-word-limit
-                          rows="2" placeholder="请输入..."/>
+                <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.personalProfile" clearable maxlength="500" show-word-limit
-                          rows="2" placeholder="请输入..."/>
+              <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.personalProfile" clearable maxlength="500" show-word-limit
-                          rows="2" placeholder="请输入..."/>
+              <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>
@@ -535,8 +493,6 @@
 
 <script>
 import {mapState} from "vuex";
-import {ID} from "dvcp-ui/lib/js/utils";
-
 export default {
   name: "Add",
   props: {
@@ -545,7 +501,7 @@ export default {
     selected: Object,
   },
   computed: {
-    ...mapState(["user"]),
+     ...mapState(["user"]),
     isEdit() {
       return !!this.$route.query.id;
     },
@@ -617,7 +573,7 @@ export default {
       introducerInfo: {position: '', name: ''},
       colConfigs: [
         {prop: "name", label: "姓名", align: "center"},
-        {prop: "position", label: "职务", align: "center"},
+        {prop: "position", label: "姓名", align: "center"},
         {slot: "options"},
       ],
     };
@@ -665,11 +621,13 @@ export default {
         }
       });
     },
-    idChange(val) {
-      let info = new ID(val)
-      this.form.sex = info.sex || "";
-      this.form.birthday = info.birthday || "";
-      this.form.age = info.age || "";
+    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) {
@@ -737,9 +695,8 @@ export default {
   .audit-1 {
     color: #2ea222 !important;
   }
-
   ::v-deep .ai-form .el-form-item .el-form-item__content {
-    margin-left: 174px !important;
+    margin-left: 174px!important;
   }
 }
 </style>