正式党员管理模块增加“新增”和“编辑”录入数据功能

src/components/UpdatePartyDevelop/index.vue

@@ -3,7 +3,7 @@
  * @Author: Rockery
  * @Date: 2021-12-15 17:54:05
  * @LastEditors: Rockery
- * @LastEditTime: 2022-02-11 10:34:45
+ * @LastEditTime: 2022-02-18 16:07:50
  * @FilePath: \party_construct_web\src\components\UpdatePartyDevelop\index.vue
  * @Copyright: Copyright (c) 2016~2021 Rockery(1113269755@qq.com)
 -->
@@ -13,7 +13,7 @@
     <el-form
       ref="updatePartyDevelopFormRef"
       :model="formObj.formModel"
-      :rules="formObj.formRules"
+      :rules="(currentIsOld === 1) ? formObj.specialFormRules :formObj.formRules"
       label-width="170px"
       class="situationdesc-addpage-form"
     >
@@ -998,7 +998,7 @@
                                               >
                                                 <el-date-picker
                                                   v-model="item['submitTime']"
-                                                  :disabled="disabledSubmitTime(index,'submitTime')"
+                                                  :disabled="((currentOperateType === 'EDIT') && disabledSubmitTime(index,'submitTime')) || getEleIsDisabled(disabledDataObj['submitTime'])"
                                                   type="date"
                                                   clearable
                                                   format="yyyy年MM月dd日"
@@ -3108,33 +3108,35 @@
               </el-tab-pane>
 
               <!-- 检查与提交 -->
-              <el-tab-pane label="检查与提交" name="DIDNOTPASS">
-                <div class="roc-tabpane">
-                  <el-row>
-                    <el-col :span="24">
-                      <div class="roc-tabpane-head">
-                        <div class="tabpane-head-left">
-                          <div class="tabpane-head-left-title">OK</div>
+              <template v-if="currentIsOld !== 1">
+                <el-tab-pane label="检查与提交" name="DIDNOTPASS">
+                  <div class="roc-tabpane">
+                    <el-row>
+                      <el-col :span="24">
+                        <div class="roc-tabpane-head">
+                          <div class="tabpane-head-left">
+                            <div class="tabpane-head-left-title">OK</div>
+                          </div>
+                          <div class="tabpane-head-right">成为正式党员</div>
                         </div>
-                        <div class="tabpane-head-right">成为正式党员</div>
-                      </div>
-                    </el-col>
-                    <el-col :span="24">
-                      <div class="roc-tabpane-didnotpass-btngroup">
-                        <el-button
-                          type="rocpartyprimaryplainbtn"
-                          @click="handleCheckProcessDataIntegrityClick"
-                        >检查过程与资料完整性</el-button>
-                        <el-button
-                          :disabled="getEleIsDisabled(disabledDataObj['becomeFullPartyMemberBtn'])"
-                          type="rocpartyprimarybtn"
-                          @click="handleBecomeFullPartyMemberClick"
-                        >转为正式党员</el-button>
-                      </div>
-                    </el-col>
-                  </el-row>
-                </div>
-              </el-tab-pane>
+                      </el-col>
+                      <el-col :span="24">
+                        <div class="roc-tabpane-didnotpass-btngroup">
+                          <el-button
+                            type="rocpartyprimaryplainbtn"
+                            @click="handleCheckProcessDataIntegrityClick"
+                          >检查过程与资料完整性</el-button>
+                          <el-button
+                            :disabled="getEleIsDisabled(disabledDataObj['becomeFullPartyMemberBtn'])"
+                            type="rocpartyprimarybtn"
+                            @click="handleBecomeFullPartyMemberClick"
+                          >转为正式党员</el-button>
+                        </div>
+                      </el-col>
+                    </el-row>
+                  </div>
+                </el-tab-pane>
+              </template>
             </el-tabs>
           </el-col>
         </el-row>
@@ -3151,7 +3153,7 @@
         <p>已填内容保存以后不能再修改，不符合要求的数据不保存！</p>
         <el-button
           slot="reference"
-          :disabled="(!formObj.formModel.name) || (!formObj.formModel.submitAddPartyPageTime) ||(!formObj.formModel.addPartyPageFile)"
+          :disabled="(currentIsOld === 1) ? (!formObj.formModel.name) : ((!formObj.formModel.name) || (!formObj.formModel.submitAddPartyPageTime) ||(!formObj.formModel.addPartyPageFile))"
           type="rocpartyprimarybtn"
           icon="el-icon-circle-check"
           @click="handlePageSubmitClick"
@@ -3264,6 +3266,11 @@ export default {
     id: {
       type: [String, Number],
       default: null
+    },
+    // 是否是直接录入正式党员信息，0：不是，1：是
+    isOld: {
+      type: Number,
+      default: 0
     }
   },
   data() {
@@ -3302,6 +3309,18 @@ export default {
           addPartyPageFile: [
             { required: true, message: "入党申请书不能为空", trigger: 'blur' }
           ]
+        },
+        specialFormRules: {
+          name: [
+            { required: true, message: "姓名不能为空", trigger: 'blur' }
+          ],
+          cardNo: [
+            {
+              pattern: /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/,
+              message: "请输入正确居民身份证号码",
+              trigger: 'blur'
+            }
+          ]
         }
       },
       // 数据保存以后的主键信息
@@ -3412,6 +3431,9 @@ export default {
     },
     currentId() {
       return this.id;
+    },
+    currentIsOld() {
+      return this.isOld;
     }
   },
   created() {
@@ -3656,267 +3678,275 @@ export default {
     handlePageSubmitClick(eventFlag) {
       this.$refs["updatePartyDevelopFormRef"].validate(valid => {
         if (valid) {
-          // this.$confirm('已填内容保存以后不能再修改，不符合要求的数据不保存，是否确认保存?', "警告", {
-          //   confirmButtonText: "确定",
-          //   cancelButtonText: "取消",
-          //   type: "warning"
-          // }).then(() => {
-
-          // 初始化数据
-          let [basicInfoReq, progressInfoReq] = [{}, {}];
-          const {
-            id,
-            name,
-            sex,
-            nation,
-            birthday,
-            placeList,
-            education,
-            addTeamTime,
-            workJob,
-            workTime,
-            cardNo,
-            addressList,
-            detailedAddress,
-            mobile,
-            resume,
-            other,
-            personPhoto,
-            remark,
-            thoughtReportRecordList,
-            publicTimeRange,
-            readyDeadlineRange,
-            readyDeadline1Range,
-            publicTime1Range,
-            ...reqData
-          } = this.formObj.formModel;
-
-          // 籍贯数据
-          (placeList?.length > 0) && (basicInfoReq.place = placeList.join(','));
-
-          // 现居地数据
-          (addressList?.length > 0) && (basicInfoReq.address = addressList.join(','));
-          detailedAddress && (basicInfoReq.address += `,${detailedAddress}`);
-
-          // 基本信息入参对象
-          basicInfoReq = {
-            name,
-            sex,
-            nation,
-            birthday,
-            education,
-            addTeamTime,
-            workJob,
-            workTime,
-            cardNo,
-            mobile,
-            resume,
-            other,
-            personPhoto,
-            remark,
-            ...basicInfoReq
-          };
+          this.$confirm('已填内容保存以后不能再修改，不符合要求的数据不保存，是否确认保存?', "警告", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          }).then(() => {
+
+            // 初始化数据
+            let [basicInfoReq, progressInfoReq] = [{}, {}];
+            const {
+              id,
+              name,
+              sex,
+              nation,
+              birthday,
+              placeList,
+              education,
+              addTeamTime,
+              workJob,
+              workTime,
+              cardNo,
+              addressList,
+              detailedAddress,
+              mobile,
+              resume,
+              other,
+              personPhoto,
+              remark,
+              thoughtReportRecordList,
+              publicTimeRange,
+              readyDeadlineRange,
+              readyDeadline1Range,
+              publicTime1Range,
+              ...reqData
+            } = this.formObj.formModel;
+
+            // 籍贯数据
+            (placeList?.length > 0) && (basicInfoReq.place = placeList.join(','));
+
+            // 现居地数据
+            (addressList?.length > 0) && (basicInfoReq.address = addressList.join(','));
+            detailedAddress && (basicInfoReq.address += `,${detailedAddress}`);
+
+            // 基本信息入参对象
+            basicInfoReq = {
+              name,
+              sex,
+              nation,
+              birthday,
+              education,
+              addTeamTime,
+              workJob,
+              workTime,
+              cardNo,
+              mobile,
+              resume,
+              other,
+              personPhoto,
+              remark,
+              isOld: this.currentIsOld,
+              ...basicInfoReq
+            };
 
-          // 移除basicInfoReq对象的属性没有值的元素
-          Object.keys(basicInfoReq).forEach(item => {
-            ((basicInfoReq[item] !== 0) && (!basicInfoReq[item] || JSON.stringify(basicInfoReq[item]) === '{}' || JSON.stringify(basicInfoReq[item]) === '[]')) && (delete basicInfoReq[item]);
-          });
+            // 直接录入正式党员信息
+            if (this.currentIsOld === 1) {
+              basicInfoReq.type = 4;
+            }
 
-          if (this.currentOperateType === 'EDIT') { // 编辑操作模式
-            basicInfoReq.id = this.currentMemberId;
+            // 移除basicInfoReq对象的属性没有值的元素
+            Object.keys(basicInfoReq).forEach(item => {
+              ((basicInfoReq[item] !== 0) && (!basicInfoReq[item] || JSON.stringify(basicInfoReq[item]) === '{}' || JSON.stringify(basicInfoReq[item]) === '[]')) && (delete basicInfoReq[item]);
+            });
+
+            if (this.currentOperateType === 'EDIT') { // 编辑操作模式
+              basicInfoReq.id = this.currentMemberId;
 
-            // 保存基本信息
-            updateFullPartyMemberBasicInfo(basicInfoReq).then((basicResp) => {
-              if (basicResp.code === 200) {
-                progressInfoReq.memberId = this.currentMemberId;
+              // 保存基本信息
+              updateFullPartyMemberBasicInfo(basicInfoReq).then((basicResp) => {
+                if (basicResp.code === 200) {
+                  progressInfoReq.memberId = this.currentMemberId;
 
-                // 第7步 思想汇报数据
-                let thoughtReportRecord = [];
-                for (let i = 0; i < thoughtReportRecordList?.length; i++) {
-                  if (thoughtReportRecordList[i].submitTime && thoughtReportRecordList[i].filePath) {
-                    thoughtReportRecord.push(thoughtReportRecordList[i]);
+                  // 第7步 思想汇报数据
+                  let thoughtReportRecord = [];
+                  for (let i = 0; i < thoughtReportRecordList?.length; i++) {
+                    if (thoughtReportRecordList[i].submitTime && thoughtReportRecordList[i].filePath) {
+                      thoughtReportRecord.push(thoughtReportRecordList[i]);
+                    }
                   }
-                }
-                (thoughtReportRecord?.length > 0) && (progressInfoReq.thoughtReportRecord = thoughtReportRecord);
+                  (thoughtReportRecord?.length > 0) && (progressInfoReq.thoughtReportRecord = thoughtReportRecord);
 
-                // 第10步 公示时间数据
-                (publicTimeRange?.length === 2) && (progressInfoReq.publicTime = publicTimeRange.join('~'));
+                  // 第10步 公示时间数据
+                  (publicTimeRange?.length === 2) && (progressInfoReq.publicTime = publicTimeRange.join('~'));
 
-                // 第16步 预备期数据
-                (readyDeadlineRange?.length === 2) && (progressInfoReq.readyDeadline = readyDeadlineRange.join('~'));
+                  // 第16步 预备期数据
+                  (readyDeadlineRange?.length === 2) && (progressInfoReq.readyDeadline = readyDeadlineRange.join('~'));
 
-                // 第21步 预备期数据
-                (readyDeadline1Range?.length === 2) && (progressInfoReq.readyDeadline1 = readyDeadline1Range.join('~'));
+                  // 第21步 预备期数据
+                  (readyDeadline1Range?.length === 2) && (progressInfoReq.readyDeadline1 = readyDeadline1Range.join('~'));
 
-                // 第25步 公示时间数据
-                (publicTime1Range?.length === 2) && (progressInfoReq.publicTime1 = publicTime1Range.join('~'));
+                  // 第25步 公示时间数据
+                  (publicTime1Range?.length === 2) && (progressInfoReq.publicTime1 = publicTime1Range.join('~'));
 
-                // 判断当前流程属于第几步
-                progressInfoReq.step = this.getProgressNum(name, reqData, progressInfoReq);
+                  // 判断当前流程属于第几步
+                  progressInfoReq.step = this.getProgressNum(name, reqData, progressInfoReq);
 
-                if (progressInfoReq.step === 0) { // 不存在流程步骤信息
-                  this.msgSuccess("保存成功！");
-                  this.$emit("page-close", 'LIST');
-                  this.formObj = {
-                    ...this.formObj,
-                    formModel: {
-                      thoughtReportRecordList: []
-                    }
-                  };
-
-                  // 获取详情信息
-                  // this.getViewDetailFullPartyMember(this.currentMemberId);
-                } else if (progressInfoReq.step === -1) {
-                  this.msgError('不存在的流程步骤！');
-                } else { // 其他流程步骤
-
-                  // 流程对象参数
-                  progressInfoReq = {
-                    ...progressInfoReq,
-                    ...this.getProgressInfoReqData({ ...reqData })
-                  };
-
-                  // 移除progressInfoReq对象的属性没有值的元素
-                  Object.keys(progressInfoReq).forEach(item => {
-                    ((progressInfoReq[item] !== 0) && (!progressInfoReq[item] || JSON.stringify(progressInfoReq[item]) === '{}' || JSON.stringify(progressInfoReq[item]) === '[]')) && (delete progressInfoReq[item]);
-                  });
-
-                  // 保存流程步骤信息
-                  addFullPartyMemberProgressInfo(progressInfoReq).then(async (progressResp) => {
-                    if (progressResp.code === 200) {
-
-                      if (this.currentUpdateType === 'REACTIVATE' && this.getReactivateFlag({ ...this.viewFullPartyInfoObj })) {
-                        await this.getReactivateFullPartyMember(progressInfoReq.memberId);
+                  if (progressInfoReq.step === 0) { // 不存在流程步骤信息
+                    this.msgSuccess("保存成功！");
+                    this.$emit("page-close", 'LIST');
+                    this.formObj = {
+                      ...this.formObj,
+                      formModel: {
+                        thoughtReportRecordList: []
                       }
-
-                      // 检查过程与资料完整性
-                      if (eventFlag === 'CHECKPROCESS') {
-                        checkProgressAndCompletion({ memberId: this.currentMemberId }).then((checkResp) => {
-                          if (checkResp.code === 200) {
-                            if (checkResp.data && checkResp.data.length > 0) {
-                              this.checkProcessDataIntegrityFail(checkResp.data);
-                            } else {
-                              this.checkProcessDataIntegritySuccess();
+                    };
+
+                    // 获取详情信息
+                    // this.getViewDetailFullPartyMember(this.currentMemberId);
+                  } else if (progressInfoReq.step === -1) {
+                    this.msgError('不存在的流程步骤！');
+                  } else { // 其他流程步骤
+
+                    // 流程对象参数
+                    progressInfoReq = {
+                      ...progressInfoReq,
+                      isOld: this.currentIsOld,
+                      ...this.getProgressInfoReqData({ ...reqData })
+                    };
+
+                    // 移除progressInfoReq对象的属性没有值的元素
+                    Object.keys(progressInfoReq).forEach(item => {
+                      ((progressInfoReq[item] !== 0) && (!progressInfoReq[item] || JSON.stringify(progressInfoReq[item]) === '{}' || JSON.stringify(progressInfoReq[item]) === '[]')) && (delete progressInfoReq[item]);
+                    });
+
+                    // 保存流程步骤信息
+                    addFullPartyMemberProgressInfo(progressInfoReq).then(async (progressResp) => {
+                      if (progressResp.code === 200) {
+
+                        if (this.currentUpdateType === 'REACTIVATE' && this.getReactivateFlag({ ...this.viewFullPartyInfoObj })) {
+                          await this.getReactivateFullPartyMember(progressInfoReq.memberId);
+                        }
+
+                        // 检查过程与资料完整性
+                        if (eventFlag === 'CHECKPROCESS') {
+                          checkProgressAndCompletion({ memberId: this.currentMemberId }).then((checkResp) => {
+                            if (checkResp.code === 200) {
+                              if (checkResp.data && checkResp.data.length > 0) {
+                                this.checkProcessDataIntegrityFail(checkResp.data);
+                              } else {
+                                this.checkProcessDataIntegritySuccess();
+                              }
+                            }
+                          });
+                        } else if (eventFlag === 'CHANGEOFFICIAL') {
+                          changeOfficialFullPartyMember({ memberId: this.currentMemberId }).then((changeResp) => {
+                            if (changeResp.code === 200) {
+                              this.msgSuccess('转为正式党员成功！');
+                            }
+                          });
+                        } else {
+                          this.msgSuccess("保存成功！");
+                          this.$emit("page-close", 'LIST');
+                          this.formObj = {
+                            ...this.formObj,
+                            formModel: {
+                              thoughtReportRecordList: []
                             }
-                          }
-                        });
-                      } else if (eventFlag === 'CHANGEOFFICIAL') {
-                        changeOfficialFullPartyMember({ memberId: this.currentMemberId }).then((changeResp) => {
-                          if (changeResp.code === 200) {
-                            this.msgSuccess('转为正式党员成功！');
-                          }
-                        });
-                      } else {
-                        this.msgSuccess("保存成功！");
-                        this.$emit("page-close", 'LIST');
-                        this.formObj = {
-                          ...this.formObj,
-                          formModel: {
-                            thoughtReportRecordList: []
-                          }
-                        };
+                          };
+                        }
                       }
-                    }
-                  });
-                }
-              }
-            });
-          } else { // 非编辑操作模式
-            // 保存基本信息
-            addFullPartyMemberBasicInfo(basicInfoReq).then((basicResp) => {
-              if (basicResp.code === 200) {
-                progressInfoReq.memberId = basicResp.data ?? undefined;
-                if (progressInfoReq.memberId === undefined && progressInfoReq.memberId === null) {
-                  this.msgSuccess("基本信息保存成功！");
-                  return;
+                    });
+                  }
                 }
+              });
+            } else { // 非编辑操作模式
+              // 保存基本信息
+              addFullPartyMemberBasicInfo(basicInfoReq).then((basicResp) => {
+                if (basicResp.code === 200) {
+                  progressInfoReq.memberId = basicResp.data ?? undefined;
+                  if (progressInfoReq.memberId === undefined && progressInfoReq.memberId === null) {
+                    this.msgSuccess("基本信息保存成功！");
+                    return;
+                  }
 
-                // 数据保存以后的主键信息
-                this.currentMemberId = progressInfoReq.memberId;
+                  // 数据保存以后的主键信息
+                  this.currentMemberId = progressInfoReq.memberId;
 
-                // 第7步 思想汇报数据
-                let thoughtReportRecord = [];
-                for (let i = 0; i < thoughtReportRecordList?.length; i++) {
-                  if (thoughtReportRecordList[i].submitTime && thoughtReportRecordList[i].filePath) {
-                    thoughtReportRecord.push(thoughtReportRecordList[i]);
+                  // 第7步 思想汇报数据
+                  let thoughtReportRecord = [];
+                  for (let i = 0; i < thoughtReportRecordList?.length; i++) {
+                    if (thoughtReportRecordList[i].submitTime && thoughtReportRecordList[i].filePath) {
+                      thoughtReportRecord.push(thoughtReportRecordList[i]);
+                    }
                   }
-                }
-                (thoughtReportRecord?.length > 0) && (progressInfoReq.thoughtReportRecord = thoughtReportRecord);
+                  (thoughtReportRecord?.length > 0) && (progressInfoReq.thoughtReportRecord = thoughtReportRecord);
 
-                // 第10步 公示时间数据
-                (publicTimeRange?.length === 2) && (progressInfoReq.publicTime = publicTimeRange.join('~'));
+                  // 第10步 公示时间数据
+                  (publicTimeRange?.length === 2) && (progressInfoReq.publicTime = publicTimeRange.join('~'));
 
-                // 第16步 预备期数据
-                (readyDeadlineRange?.length === 2) && (progressInfoReq.readyDeadline = readyDeadlineRange.join('~'));
+                  // 第16步 预备期数据
+                  (readyDeadlineRange?.length === 2) && (progressInfoReq.readyDeadline = readyDeadlineRange.join('~'));
 
-                // 第21步 预备期数据
-                (readyDeadline1Range?.length === 2) && (progressInfoReq.readyDeadline1 = readyDeadline1Range.join('~'));
+                  // 第21步 预备期数据
+                  (readyDeadline1Range?.length === 2) && (progressInfoReq.readyDeadline1 = readyDeadline1Range.join('~'));
 
-                // 第25步 公示时间数据
-                (publicTime1Range?.length === 2) && (progressInfoReq.publicTime1 = publicTime1Range.join('~'));
+                  // 第25步 公示时间数据
+                  (publicTime1Range?.length === 2) && (progressInfoReq.publicTime1 = publicTime1Range.join('~'));
 
-                // 判断当前流程属于第几步
-                progressInfoReq.step = this.getProgressNum(name, reqData, progressInfoReq);
+                  // 判断当前流程属于第几步
+                  progressInfoReq.step = this.getProgressNum(name, reqData, progressInfoReq);
 
-                // 变更操作模式
-                this.currentOperateType = 'EDIT';
+                  // 变更操作模式
+                  this.currentOperateType = 'EDIT';
 
-                if (progressInfoReq.step === 0) { // 不存在流程步骤信息
-                  this.msgSuccess("保存成功！");
-                  this.$emit("page-close", 'LIST');
-                  this.formObj = {
-                    ...this.formObj,
-                    formModel: {
-                      thoughtReportRecordList: []
-                    }
-                  };
-                } else if (progressInfoReq.step === -1) {
-                  this.msgError('不存在的流程步骤！');
-                } else { // 其他流程步骤
-                  // 流程对象参数
-                  progressInfoReq = {
-                    ...progressInfoReq,
-                    ...reqData
-                  };
-
-                  // 移除progressInfoReq对象的属性没有值的元素
-                  Object.keys(progressInfoReq).forEach(item => {
-                    ((progressInfoReq[item] !== 0) && (!progressInfoReq[item] || JSON.stringify(progressInfoReq[item]) === '{}' || JSON.stringify(progressInfoReq[item]) === '[]')) && (delete progressInfoReq[item]);
-                  });
-
-                  // 保存流程步骤信息
-                  addFullPartyMemberProgressInfo(progressInfoReq).then((progressResp) => {
-                    if (progressResp.code === 200) {
-
-                      // 检查过程与资料完整性
-                      if (eventFlag === 'CHECKPROCESS') {
-                        checkProgressAndCompletion({ memberId: this.currentMemberId }).then((checkResp) => {
-                          if (checkResp.code === 200) {
-                          }
-                        });
-                      } else if (eventFlag === 'CHANGEOFFICIAL') {
-                        changeOfficialFullPartyMember({ memberId: this.currentMemberId }).then((changeResp) => {
-                          if (changeResp.code === 200) {
-                            this.msgSuccess('转为正式党员成功！');
-                          }
-                        });
-                      } else {
-                        this.msgSuccess("保存成功！");
-                        this.$emit("page-close", 'LIST');
-                        this.formObj = {
-                          ...this.formObj,
-                          formModel: {
-                            thoughtReportRecordList: []
-                          }
-                        };
+                  if (progressInfoReq.step === 0) { // 不存在流程步骤信息
+                    this.msgSuccess("保存成功！");
+                    this.$emit("page-close", 'LIST');
+                    this.formObj = {
+                      ...this.formObj,
+                      formModel: {
+                        thoughtReportRecordList: []
                       }
-                    }
-                  });
+                    };
+                  } else if (progressInfoReq.step === -1) {
+                    this.msgError('不存在的流程步骤！');
+                  } else { // 其他流程步骤
+                    // 流程对象参数
+                    progressInfoReq = {
+                      ...progressInfoReq,
+                      isOld: this.currentIsOld,
+                      ...reqData
+                    };
+
+                    // 移除progressInfoReq对象的属性没有值的元素
+                    Object.keys(progressInfoReq).forEach(item => {
+                      ((progressInfoReq[item] !== 0) && (!progressInfoReq[item] || JSON.stringify(progressInfoReq[item]) === '{}' || JSON.stringify(progressInfoReq[item]) === '[]')) && (delete progressInfoReq[item]);
+                    });
+
+                    // 保存流程步骤信息
+                    addFullPartyMemberProgressInfo(progressInfoReq).then((progressResp) => {
+                      if (progressResp.code === 200) {
+
+                        // 检查过程与资料完整性
+                        if (eventFlag === 'CHECKPROCESS') {
+                          checkProgressAndCompletion({ memberId: this.currentMemberId }).then((checkResp) => {
+                            if (checkResp.code === 200) {
+                            }
+                          });
+                        } else if (eventFlag === 'CHANGEOFFICIAL') {
+                          changeOfficialFullPartyMember({ memberId: this.currentMemberId }).then((changeResp) => {
+                            if (changeResp.code === 200) {
+                              this.msgSuccess('转为正式党员成功！');
+                            }
+                          });
+                        } else {
+                          this.msgSuccess("保存成功！");
+                          this.$emit("page-close", 'LIST');
+                          this.formObj = {
+                            ...this.formObj,
+                            formModel: {
+                              thoughtReportRecordList: []
+                            }
+                          };
+                        }
+                      }
+                    });
+                  }
                 }
-              }
-            });
-          }
-          // }).catch(() => { });
+              });
+            }
+          }).catch(() => { });
         } else {
           this.msgError('填写的数据项有误，请先检查填写内容！');
         }
@@ -4367,6 +4397,11 @@ export default {
      * 获取当前元素是否禁用
      */
     getEleIsDisabled(param = []) {
+      // 是直接录入正式党员信息，直接不禁用
+      if (this.currentIsOld === 1) {
+        return false;
+      }
+
       // 参数不存在时禁用
       if (param.length <= 0) return true;
 
@@ -4575,7 +4610,7 @@ export default {
       }
 
       // 非编辑模式
-      return this.getEleIsDisabled(this.disabledDataObj['submitTime']);
+      return this.getEleIsDisabled(this.disabledDataObj[fieldStr]);
     },
     /**
      * 重新激活操作

src/utils/rockeryutil.js

@@ -3,13 +3,14 @@
  * @Author: Rockery
  * @Date: 2021-04-26 15:53:59
  * @LastEditors: Rockery
- * @LastEditTime: 2021-12-29 17:56:27
+ * @LastEditTime: 2022-02-18 16:09:52
  * @FilePath: \party_construct_web\src\utils\rockeryutil.js
  * @Copyright: Copyright (c) 2016~2021 Rockery(1113269755@qq.com)
  */
+import Vue from 'vue';
 import request from '@/utils/request';
 import { parseTime } from "@/utils/ruoyi";
-import { Message } from 'element-ui';
+import { Message, Loading } from 'element-ui';
 
 /**
  * @description: 开启遮护罩
@@ -50,7 +51,11 @@ export function handleCloseLoading(paramLoading) {
  */
 export function imgViewerOnerror(ele) {
   const img = ele.srcElement;
-  img.src = require('@/assets/images/empty_img.png');
+  if (img.getAttribute('data-index') === 'FULLPARTYMEMBER') {
+    img.src = require('@/assets/images/tentative-img.png');
+  } else {
+    img.src = require('@/assets/images/empty_img.png');
+  }
   img.onerror = null;
 }
 
@@ -104,7 +109,7 @@ export function regularDownloadPdfFile(pdfFileUrl, pdfFileName) {
           center: true
         });
       }
-    }).catch(() => {});
+    }).catch(() => { });
   } else {
     Message({
       message: "PDF文件地址不能为空！",

src/views/PartyBuildingMgr/FullPartyMember/FullPartyMemberIndex.vue

@@ -3,7 +3,7 @@
  * @Author: Rockery
  * @Date: 2021-12-10 10:39:07
  * @LastEditors: Rockery
- * @LastEditTime: 2022-02-11 10:30:22
+ * @LastEditTime: 2022-02-18 15:44:36
  * @FilePath: \party_construct_web\src\views\PartyBuildingMgr\FullPartyMember\FullPartyMemberIndex.vue
  * @Copyright: Copyright (c) 2016~2021 Rockery(1113269755@qq.com)
 -->
@@ -107,7 +107,14 @@
 
         <div class="app-container-main fullpartymember-main" :class="showSearch ? 'mt15' : ''">
           <el-row :gutter="10" class="mb8">
-            <el-col :span="1.5">&nbsp;</el-col>
+            <el-col :span="1.5">
+              <el-button
+                v-hasPermi="['partybuildingmgr:fullpartymember:add']"
+                type="rocpartyprimarybtn"
+                icon="el-icon-plus"
+                @click="handleAddClick"
+              >新增</el-button>
+            </el-col>
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
           </el-row>
           <el-row :gutter="10">
@@ -129,6 +136,7 @@
                           </div>
                           <img
                             :src="item.personPhoto ? (viewPdfFileUrlPrefix + item.personPhoto) : require('@/assets/images/tentative-img.png')"
+                            data-index="FULLPARTYMEMBER"
                             @error="imgViewerOnerror"
                           />
                           <div class="list-cell-shield">
@@ -140,14 +148,23 @@
                               <el-button
                                 v-hasPermi="['partybuildingmgr:fullpartymember:view']"
                                 type="rocwhiteplainbtn"
+                                icon="el-icon-view"
                                 style="width: 100%;"
                                 @click="handleViewClick(item)"
                               >查看资料</el-button>
+                              <el-button
+                                v-hasPermi="['partybuildingmgr:fullpartymember:edit']"
+                                type="rocwhiteplainbtn"
+                                icon="el-icon-edit"
+                                style="width: 100%;"
+                                class="shield-content-edit"
+                                @click="handleEditClick(item)"
+                              >编辑</el-button>
                               <div
                                 v-hasPermi="['partybuildingmgr:fullpartymember:reactivate']"
                                 class="shield-content-relation"
                                 @click="handleReactivateClick(item)"
-                              >组织关系变更</div>
+                              >组织关系变更&nbsp;&nbsp;&gt;</div>
                             </div>
                           </div>
                         </div>
@@ -221,7 +238,7 @@
                     label="操作"
                     align="center"
                     fixed="right"
-                    width="200"
+                    width="260"
                     class-name="small-padding fixed-width"
                   >
                     <template slot-scope="scope">
@@ -233,6 +250,14 @@
                         style="color: #909399;"
                         @click="handleViewClick(scope.row)"
                       >详情</el-button>
+                      <el-button
+                        v-hasPermi="['partybuildingmgr:fullpartymember:edit']"
+                        size="mini"
+                        type="text"
+                        icon="el-icon-edit"
+                        style="color: #67c23a;"
+                        @click="handleEditClick(scope.row)"
+                      >编辑</el-button>
                       <el-button
                         v-hasPermi="['partybuildingmgr:fullpartymember:reactivate']"
                         size="mini"
@@ -271,11 +296,14 @@
                 @error="imgViewerOnerror"
               />
             </div>
-            <div>正式党员管理</div>
+            <div>正式党员管理（{{ updateTypeObj[updateType] }}）</div>
           </div>
         </div>
         <update-party-develop
-          :operate-type="pageType"
+          :id="currentRow.id"
+          :is-old="isOld"
+          :operate-type.sync="operateType"
+          :update-type="updateType"
           @page-submit="handleAddPageSubmitClick"
           @page-close="handleAddPageCloseClick"
         />
@@ -467,7 +495,13 @@ export default {
         '3': '开除',
         '4': '去世',
         '5': '退休'
-      }
+      },
+      updateTypeObj: {
+        'ADD': '新增',
+        'EDIT': '编辑'
+      },
+      isOld: 1, // 是否是直接录入正式党员信息，0：不是，1：是
+      currentRow: {}
     };
   },
   created() {
@@ -534,6 +568,26 @@ export default {
       this.resetForm("queryForm");
       this.handleQueryClick();
     },
+    /**
+     * 新增按钮事件
+     */
+    handleAddClick() {
+      this.currentRow = {};
+      this.isOld = 1;
+      this.pageType = 'ADD';
+      this.operateType = 'ADD';
+      this.updateType = 'ADD';
+    },
+    /**
+     * 编辑按钮事件
+     */
+    handleEditClick(row) {
+      if (!row.id) return;
+      this.pageType = 'ADD';
+      this.operateType = 'EDIT';
+      this.updateType = 'EDIT';
+      this.currentRow = row;
+    },
     /**
      * 查看详情按钮事件
      */
@@ -846,18 +900,22 @@ export default {
                 }
 
                 .shield-content-datetime {
-                  margin: 20px 0 40px;
+                  margin: 15px 0 15px;
                   width: 100%;
                   font-weight: 400;
                   font-size: 18px;
                   color: #ffffff;
                 }
 
+                .shield-content-edit {
+                  margin: 10px 0 0;
+                }
+
                 .shield-content-relation {
                   display: flex;
                   justify-content: center;
                   align-items: center;
-                  margin-top: 20px;
+                  margin-top: 15px;
                   width: 100%;
                   font-weight: 400;
                   font-size: 14px;