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

src/components/PartyMemberDetails/index.vue

@@ -3,7 +3,7 @@
  * @Author: Rockery
  * @Date: 2022-01-04 10:37:17
  * @LastEditors: Rockery
- * @LastEditTime: 2022-01-21 10:50:48
+ * @LastEditTime: 2022-02-18 16:53:44
  * @FilePath: \party_construct_web\src\components\PartyMemberDetails\index.vue
  * @Copyright: Copyright (c) 2016~2021 Rockery(1113269755@qq.com)
 -->
@@ -250,19 +250,19 @@
                                                 <div
                                                   class="step-item-right-container_content"
                                                   :style="(stepItemRightItem.stepItemColAlignment === 'right') ? 'text-align: right;' : ''"
-                                                >{{ stepItemRightItem.stepItemColLable }}{{ parseTime(viewFullPartyInfoObj[stepItemRightItem.stepItemColProp], '{y}年{m}月{d}日') || '待更新' }}</div>
+                                                >{{ stepItemRightItem.stepItemColLable }}{{ parseTime(viewFullPartyInfoObj[stepItemRightItem.stepItemColProp], '{y}年{m}月{d}日') || ((viewFullPartyInfoObj.isOld === 1) ? '待补充' : '待更新') }}</div>
                                               </template>
                                               <template
                                                 v-else-if="stepItemRightItem.stepItemColPropType === 'RADIORESULT'"
                                               >
                                                 <div
                                                   class="step-item-right-container_content"
-                                                >{{ stepItemRightItem.stepItemColLable }}{{ (viewFullPartyInfoObj[stepItemRightItem.stepItemColProp] === 0 )? '未通过' : ((viewFullPartyInfoObj[stepItemRightItem.stepItemColProp] === 1) ? '通过' : '待更新')}}</div>
+                                                >{{ stepItemRightItem.stepItemColLable }}{{ (viewFullPartyInfoObj[stepItemRightItem.stepItemColProp] === 0 )? '未通过' : ((viewFullPartyInfoObj[stepItemRightItem.stepItemColProp] === 1) ? '通过' : ((viewFullPartyInfoObj.isOld === 1) ? '待补充' : '待更新'))}}</div>
                                               </template>
                                               <template v-else>
                                                 <div
                                                   class="step-item-right-container_content"
-                                                >{{ stepItemRightItem.stepItemColLable }}{{ viewFullPartyInfoObj[stepItemRightItem.stepItemColProp] || '待更新' }}</div>
+                                                >{{ stepItemRightItem.stepItemColLable }}{{ viewFullPartyInfoObj[stepItemRightItem.stepItemColProp] || ((viewFullPartyInfoObj.isOld === 1) ? '待补充' : '待更新') }}</div>
                                               </template>
                                             </template>
 
@@ -292,7 +292,9 @@
                                                   <div
                                                     class="viewpdffile-label"
                                                   >{{ stepItemRightItem.stepItemColLable }}</div>
-                                                  <div class="step-item-right-container_content">待更新</div>
+                                                  <div
+                                                    class="step-item-right-container_content"
+                                                  >{{ ((viewFullPartyInfoObj.isOld === 1) ? '待补充' : '待更新') }}</div>
                                                 </div>
                                               </template>
                                             </template>
@@ -312,7 +314,7 @@
                                                     <el-col :span="12">
                                                       <div
                                                         class="step-item-right-container_content"
-                                                      >{{ '思想汇报递交时间' + (thoughtRecordIndex + 1) + '：' }}{{ parseTime(thoughtRecordItem.submitTime, '{y}年{m}月{d}日') || '待更新' }}</div>
+                                                      >{{ '思想汇报递交时间' + (thoughtRecordIndex + 1) + '：' }}{{ parseTime(thoughtRecordItem.submitTime, '{y}年{m}月{d}日') || ((viewFullPartyInfoObj.isOld === 1) ? '待补充' : '待更新') }}</div>
                                                     </el-col>
                                                     <el-col :span="12">
                                                       <template v-if="thoughtRecordItem.filePath">
@@ -341,7 +343,7 @@
                                                           >{{ stepItemRightItem.stepItemColLable }}</div>
                                                           <div
                                                             class="step-item-right-container_content"
-                                                          >待更新</div>
+                                                          >{{ ((viewFullPartyInfoObj.isOld === 1) ? '待补充' : '待更新') }}</div>
                                                         </div>
                                                       </template>
                                                     </el-col>

src/components/UpdatePartyDevelop/index.vue

@@ -3,7 +3,7 @@
  * @Author: Rockery
  * @Date: 2021-12-15 17:54:05
  * @LastEditors: Rockery
- * @LastEditTime: 2022-02-18 16:07:50
+ * @LastEditTime: 2022-02-18 16:39:57
  * @FilePath: \party_construct_web\src\components\UpdatePartyDevelop\index.vue
  * @Copyright: Copyright (c) 2016~2021 Rockery(1113269755@qq.com)
 -->
@@ -3782,7 +3782,7 @@ export default {
                   // 判断当前流程属于第几步
                   progressInfoReq.step = this.getProgressNum(name, reqData, progressInfoReq);
 
-                  if (progressInfoReq.step === 0) { // 不存在流程步骤信息
+                  if (this.currentIsOld !== 1 && progressInfoReq.step === 0) { // 不存在流程步骤信息
                     this.msgSuccess("保存成功！");
                     this.$emit("page-close", 'LIST');
                     this.formObj = {
@@ -3791,13 +3791,15 @@ export default {
                         thoughtReportRecordList: []
                       }
                     };
-
-                    // 获取详情信息
-                    // this.getViewDetailFullPartyMember(this.currentMemberId);
-                  } else if (progressInfoReq.step === -1) {
+                  } else if (this.currentIsOld !== 1 && progressInfoReq.step === -1) {
                     this.msgError('不存在的流程步骤！');
                   } else { // 其他流程步骤
 
+                    // 直接录入正式党员信息，设定步骤节点为27
+                    if (this.currentIsOld === 1) {
+                      progressInfoReq.step = 27;
+                    }
+
                     // 流程对象参数
                     progressInfoReq = {
                       ...progressInfoReq,
@@ -3890,7 +3892,7 @@ export default {
                   // 变更操作模式
                   this.currentOperateType = 'EDIT';
 
-                  if (progressInfoReq.step === 0) { // 不存在流程步骤信息
+                  if (this.currentIsOld !== 1 && progressInfoReq.step === 0) { // 不存在流程步骤信息
                     this.msgSuccess("保存成功！");
                     this.$emit("page-close", 'LIST');
                     this.formObj = {
@@ -3899,9 +3901,15 @@ export default {
                         thoughtReportRecordList: []
                       }
                     };
-                  } else if (progressInfoReq.step === -1) {
+                  } else if (this.currentIsOld !== 1 && progressInfoReq.step === -1) {
                     this.msgError('不存在的流程步骤！');
                   } else { // 其他流程步骤
+
+                    // 直接录入正式党员信息，设定步骤节点为27
+                    if (this.currentIsOld === 1) {
+                      progressInfoReq.step = 27;
+                    }
+
                     // 流程对象参数
                     progressInfoReq = {
                       ...progressInfoReq,

src/views/PartyBuildingMgr/FullPartyMember/FullPartyMemberIndex.vue

@@ -3,7 +3,7 @@
  * @Author: Rockery
  * @Date: 2021-12-10 10:39:07
  * @LastEditors: Rockery
- * @LastEditTime: 2022-02-18 16:14:45
+ * @LastEditTime: 2022-02-18 16:50:08
  * @FilePath: \party_construct_web\src\views\PartyBuildingMgr\FullPartyMember\FullPartyMemberIndex.vue
  * @Copyright: Copyright (c) 2016~2021 Rockery(1113269755@qq.com)
 -->
@@ -144,7 +144,7 @@
                               <div class="shield-content-label">入党时间</div>
                               <div
                                 class="shield-content-datetime"
-                              >{{ parseTime(item.addPartyTime, '{y}年{m}月{d}日') || ' - 年 - 月 - 日' }}</div>
+                              >{{ parseTime(item.addPartyTime, '{y}年{m}月{d}日') || ((item.isOld === 1) ? '待补充' : '待更新') }}</div>
                               <el-button
                                 v-hasPermi="['partybuildingmgr:fullpartymember:view']"
                                 type="rocwhiteplainbtn"
@@ -197,12 +197,12 @@
                     :show-overflow-tooltip="true"
                   >
                     <template slot-scope="scope">
-                      <span>{{ scope.row.sex || '—' }}</span>
+                      <span>{{ scope.row.sex || ((scope.row.isOld === 1) ? '待补充' : '待更新') }}</span>
                     </template>
                   </el-table-column>
                   <el-table-column label="党龄" align="center" :show-overflow-tooltip="true">
                     <template slot-scope="scope">
-                      <span>{{ getPartyStanding(parseTime(scope.row.applyAddPartyTime, '{y}-{m}-{d}'), parseTime(scope.row.addPartyTime, '{y}-{m}-{d}')) }}</span>
+                      <span>{{ getPartyStanding(parseTime(scope.row.applyAddPartyTime, '{y}-{m}-{d}'), parseTime(scope.row.addPartyTime, '{y}-{m}-{d}'), scope.row.isOld) }}</span>
                     </template>
                   </el-table-column>
                   <el-table-column
@@ -211,7 +211,7 @@
                     :show-overflow-tooltip="true"
                   >
                     <template slot-scope="scope">
-                      <span>{{ scope.row.addPartyIntroducer || '—' }}</span>
+                      <span>{{ scope.row.addPartyIntroducer || ((scope.row.isOld === 1) ? '待补充' : '待更新') }}</span>
                     </template>
                   </el-table-column>
                   <el-table-column
@@ -221,7 +221,7 @@
                     :show-overflow-tooltip="true"
                   >
                     <template slot-scope="scope">
-                      <span>{{ parseTime(scope.row.applyAddPartyTime, '{y}-{m}-{d}') || '—' }}</span>
+                      <span>{{ parseTime(scope.row.applyAddPartyTime, '{y}-{m}-{d}') || ((scope.row.isOld === 1) ? '待补充' : '待更新') }}</span>
                     </template>
                   </el-table-column>
                   <el-table-column
@@ -231,7 +231,7 @@
                     :show-overflow-tooltip="true"
                   >
                     <template slot-scope="scope">
-                      <span>{{ parseTime(scope.row.addPartyTime, '{y}-{m}-{d}') || '—' }}</span>
+                      <span>{{ parseTime(scope.row.addPartyTime, '{y}-{m}-{d}') || ((scope.row.isOld === 1) ? '待补充' : '待更新') }}</span>
                     </template>
                   </el-table-column>
                   <el-table-column
@@ -675,10 +675,10 @@ export default {
      * @applyAddPartyDate [String] 出生日期，格式为"1990-01-01"
      * @addPartyDate [String] 指定日期，格式为"1990-01-01"
      */
-    getPartyStanding(applyAddPartyDate, addPartyDate) {
+    getPartyStanding(applyAddPartyDate, addPartyDate, isOld) {
       // 不存在数据
       if (!applyAddPartyDate || !addPartyDate) {
-        return '—';
+        return (isOld === 1) ? '待补充' : '待更新';
       }
 
       // 初始化数据
@@ -723,7 +723,7 @@ export default {
           return ageDiff; // 月之差大于等于0
         }
 
-        return '—'; // 返回— 表示出生日期输入错误或晚于今天
+        return (isOld === 1) ? '待补充' : '待更新'; // 返回— 表示出生日期输入错误或晚于今天
       }
     }
   }