更新党员发展页面完成65%

src/components/RocPdfFileUpload/index.vue

@@ -3,14 +3,14 @@
  * @Author: Rockery
  * @Date: 2021-12-20 09:16:41
  * @LastEditors: Rockery
- * @LastEditTime: 2021-12-22 18:06:06
+ * @LastEditTime: 2021-12-23 15:23:31
  * @FilePath: \party_construct_web\src\components\RocPdfFileUpload\index.vue
  * @Copyright: Copyright (c) 2016~2021 Rockery(1113269755@qq.com)
 -->
 
 <template>
   <div class="rocpdffileupload">
-    <div class="rocpdffileupload-attachment">
+    <div class="rocpdffileupload-attachment" v-loading="removeLoading">
       <el-upload
         ref="rocPdfFileUploadRef"
         :limit="1"
@@ -32,7 +32,7 @@
         </div>
       </el-upload>
       <div
-        v-if="isUploadSuccess"
+        v-show="isUploadSuccess"
         class="fl rocpdffileupload-attachment-addr"
         @click="handleRocPdfFileUploadUrlClick"
       >
@@ -41,12 +41,17 @@
         <div>{{ this.successResp.name }}</div>
       </div>
       <el-button
-        v-if="isSelect && !isUploadSuccess"
+        v-show="isSelect && !isUploadSuccess"
         type="primary"
         size="small"
         @click="submitRocPdfFileUploadClick"
       >上传文件</el-button>
-      <el-button v-if="isSelect" type="info" size="small" @click="removeRocPdfFileUploadClick">移除文件</el-button>
+      <el-button
+        v-show="isSelect"
+        type="info"
+        size="small"
+        @click="removeRocPdfFileUploadClick"
+      >移除文件</el-button>
     </div>
 
     <roc-vue-pdf-dialog
@@ -101,7 +106,9 @@ export default {
       successUrl: '',
       // PDF文件上传成功数据对象
       successResp: {},
-      pdfDialogVisible: false
+      pdfDialogVisible: false,
+      removeLoading: false,
+      setTimeoutTimer: null
     };
   },
   computed: {
@@ -122,6 +129,9 @@ export default {
       return '文件';
     },
   },
+  destroyed() {
+    this.setTimeoutTimer && clearTimeout(this.setTimeoutTimer);
+  },
   methods: {
     /**
      * PDF文件上传预处理
@@ -165,6 +175,7 @@ export default {
      * PDF文件状态改变
      */
     handleRocPdfFileUploadOnchange(file, fileList) {
+      debugger;
       if (file.status === 'ready') {
         if (((file.raw || {}).type || '').indexOf('application/pdf') === -1) {
           this.$refs.rocPdfFileUploadRef.clearFiles();
@@ -187,11 +198,16 @@ export default {
      * PDF文件列表移除文件时的钩子
      */
     handleRocPdfFileUploadOnRemove(file, fileList) {
-      this.successResp = {};
-      this.successUrl = '';
-      this.isUploadSuccess = false;
-      this.isSelect = false;
-      this.$emit('input', '');
+      this.removeLoading = true;
+      this.setTimeoutTimer = setTimeout(() => {
+        this.successResp = {};
+        this.successUrl = '';
+        this.isUploadSuccess = false;
+        this.isSelect = false;
+        this.$emit('input', '');
+        this.setTimeoutTimer && clearTimeout(this.setTimeoutTimer);
+        this.removeLoading = false;
+      }, 900);
     },
     /**
      * PDF文件超出个数限制时的钩子
@@ -218,12 +234,17 @@ export default {
      * 移除选择相关材料PDF文件
      */
     removeRocPdfFileUploadClick() {
-      this.successResp = {};
-      this.successUrl = '';
+      this.removeLoading = true;
       this.$refs.rocPdfFileUploadRef.clearFiles();
-      this.isUploadSuccess = false;
-      this.isSelect = false;
-      this.$emit('input', '');
+      this.setTimeoutTimer = setTimeout(() => {
+        this.isSelect = false;
+        this.isUploadSuccess = false;
+        this.successResp = {};
+        this.successUrl = '';
+        this.$emit('input', '');
+        this.setTimeoutTimer && clearTimeout(this.setTimeoutTimer);
+        this.removeLoading = false;
+      }, 1000);
     },
     /**
      * PDF文件地址单击事件

src/components/UpdatePartyDevelop/index.vue

@@ -3,7 +3,7 @@
  * @Author: Rockery
  * @Date: 2021-12-15 17:54:05
  * @LastEditors: Rockery
- * @LastEditTime: 2021-12-22 18:29:34
+ * @LastEditTime: 2021-12-23 17:01:51
  * @FilePath: \party_construct_web\src\components\UpdatePartyDevelop\index.vue
  * @Copyright: Copyright (c) 2016~2021 Rockery(1113269755@qq.com)
 -->
@@ -321,12 +321,12 @@
                                         <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
                                           <el-form-item
                                             label="入党申请书："
-                                            prop="application"
+                                            prop="addPartyPageFile"
                                             label-width="96px"
                                           >
                                             <roc-pdf-file-upload
                                               key="ROCPDFFILEUPLOADAPPLICATIONKEY"
-                                              v-model="formObj.formModel.application"
+                                              v-model="formObj.formModel.addPartyPageFile"
                                               upload-file-title="入党申请书"
                                             ></roc-pdf-file-upload>
                                           </el-form-item>
@@ -341,7 +341,7 @@
                           <el-col :span="24">
                             <div
                               class="roc-tabpane-step-tail"
-                              :style="{height: ((innerWidth > 1200) ? ((getRocPdfUploadSuccess(formObj.formModel.application) + 64) + 'px') : ((getRocPdfUploadSuccess(formObj.formModel.application) + 122) + 'px')), marginTop: ((innerWidth > 1200) ? ('-'+ (getRocPdfUploadSuccess(formObj.formModel.application) + 64) + 'px') : ('-' + (getRocPdfUploadSuccess(formObj.formModel.application) + 122) + 'px'))}"
+                              :style="getNodeTabpaneStepTailStyle(innerWidth, [ formObj.formModel.addPartyPageFile ], {defaultHeight: 64, noDefaultHeight: 122,defaultMarginTop: 64, noDefaultMarginTop: 122})"
                             ></div>
                           </el-col>
 
@@ -358,11 +358,11 @@
                                         <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
                                           <el-form-item
                                             label="组织派人谈话时间："
-                                            prop="dateOfBirth"
+                                            prop="partyArrangeTalkTime"
                                             label-width="126px"
                                           >
                                             <el-date-picker
-                                              v-model="formObj.formModel.dateOfBirth"
+                                              v-model="formObj.formModel.partyArrangeTalkTime"
                                               type="date"
                                               clearable
                                               value-format="yyyy-MM-dd"
@@ -374,12 +374,12 @@
                                         <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
                                           <el-form-item
                                             label="谈话记录："
-                                            prop="chatHistory"
+                                            prop="talkPageFile"
                                             label-width="96px"
                                           >
                                             <roc-pdf-file-upload
                                               key="ROCPDFFILEUPLOADCHATHISTORYKEY"
-                                              v-model="formObj.formModel.chatHistory"
+                                              v-model="formObj.formModel.talkPageFile"
                                               upload-file-title="谈话记录"
                                             ></roc-pdf-file-upload>
                                           </el-form-item>
@@ -394,7 +394,7 @@
                           <el-col :span="24">
                             <div
                               class="roc-tabpane-step-tail"
-                              :style="{height: ((innerWidth > 1200) ? '64px' : '122px'), marginTop: ((innerWidth > 1200) ? '-64px' : '-122px')}"
+                              :style="getNodeTabpaneStepTailStyle(innerWidth, [ formObj.formModel.talkPageFile ], {defaultHeight: 64, noDefaultHeight: 122,defaultMarginTop: 64, noDefaultMarginTop: 122})"
                             ></div>
                           </el-col>
 
@@ -411,12 +411,12 @@
                                         <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
                                           <el-form-item
                                             label="身份证或户口本："
-                                            prop="identityInfo"
+                                            prop="cardOrRegisterBookFile"
                                             label-width="116px"
                                           >
                                             <roc-pdf-file-upload
                                               key="ROCPDFFILEUPLOADIDENTITYINFOKEY"
-                                              v-model="formObj.formModel.identityInfo"
+                                              v-model="formObj.formModel.cardOrRegisterBookFile"
                                               upload-file-title="身份证或户口本"
                                             ></roc-pdf-file-upload>
                                           </el-form-item>
@@ -431,7 +431,7 @@
                           <el-col :span="24">
                             <div
                               class="roc-tabpane-step-tail"
-                              :style="{height: ((innerWidth > 1200) ? '165px' : '165px'), marginTop: ((innerWidth > 1200) ? '-64px' : '-64px')}"
+                              :style="getNodeTabpaneStepTailStyle(innerWidth, [ formObj.formModel.cardOrRegisterBookFile ], {defaultHeight: 165, noDefaultHeight: 165,defaultMarginTop: 65, noDefaultMarginTop: 65})"
                             ></div>
                           </el-col>
                         </el-row>
@@ -536,7 +536,7 @@
                           <el-col :span="24">
                             <div
                               class="roc-tabpane-step-tail"
-                              :style="{height: ((innerWidth > 1200) ? '108px' : '200px'), marginTop: ((innerWidth > 1200) ? '-108px' : '-200px')}"
+                              :style="getNodeTabpaneStepTailStyle(innerWidth, [ formObj.formModel.activistsChatHistory, formObj.formModel.activistsRegist], {defaultHeight: 110, noDefaultHeight: 202,defaultMarginTop: 110, noDefaultMarginTop: 202})"
                             ></div>
                           </el-col>
 
@@ -679,7 +679,7 @@
                           <el-col :span="24">
                             <div
                               class="roc-tabpane-step-tail"
-                              :style="{height: ((innerWidth > 1200) ? '257px' : '395px'), marginTop: ((innerWidth > 1200) ? '-257px' : '-395px')}"
+                              :style="getNodeTabpaneStepTailStyle(innerWidth, [ formObj.formModel.identifyPartyActivists, formObj.formModel.activistsRequestRecord, formObj.formModel.activistsApproval], {defaultHeight: 259, noDefaultHeight: 397,defaultMarginTop: 259, noDefaultMarginTop: 397}, 2)"
                             ></div>
                           </el-col>
 
@@ -734,7 +734,7 @@
                           <el-col :span="24">
                             <div
                               class="roc-tabpane-step-tail"
-                              :style="{height: ((innerWidth > 1200) ? '52px' : '97px'), marginTop: ((innerWidth > 1200) ? '-52px' : '-97px')}"
+                              :style="getNodeTabpaneStepTailStyle(innerWidth, [ formObj.formModel.trainActivistsRegist], {defaultHeight: 52, noDefaultHeight: 98,defaultMarginTop: 52, noDefaultMarginTop: 98})"
                             ></div>
                           </el-col>
 
@@ -820,7 +820,7 @@
                           <el-col :span="24">
                             <div
                               class="roc-tabpane-step-tail"
-                              :style="{height: ((innerWidth > 1200) ? '128px' : '222px'), marginTop: ((innerWidth > 1200) ? '-110px' : '-202px')}"
+                              :style="getNodeTabpaneStepTailStyle(innerWidth, [formObj.formModel.certificateOfCompletion, formObj.formModel.ideologicalReport1], {defaultHeight: 128, noDefaultHeight: 222,defaultMarginTop: 110, noDefaultMarginTop: 202})"
                             ></div>
                           </el-col>
                         </el-row>
@@ -895,7 +895,7 @@
                           <el-col :span="24">
                             <div
                               class="roc-tabpane-step-tail"
-                              :style="{height: ((innerWidth > 1200) ? '64px' : '122px'), marginTop: ((innerWidth > 1200) ? '-64px' : '-122px')}"
+                              :style="getNodeTabpaneStepTailStyle(innerWidth, [formObj.formModel.hearOpinionRecord], {defaultHeight: 64, noDefaultHeight: 122,defaultMarginTop: 64, noDefaultMarginTop: 122})"
                             ></div>
                           </el-col>
 
@@ -965,7 +965,7 @@
                           <el-col :span="24">
                             <div
                               class="roc-tabpane-step-tail"
-                              :style="{height: ((innerWidth > 1200) ? '98px' : '144px'), marginTop: ((innerWidth > 1200) ? '-98px' : '-144px')}"
+                              :style="getNodeTabpaneStepTailStyle(innerWidth, [formObj.formModel.detDevTarRecord], {defaultHeight: 98, noDefaultHeight: 144,defaultMarginTop: 98, noDefaultMarginTop: 144})"
                             ></div>
                           </el-col>
 
@@ -1097,7 +1097,7 @@
                           <el-col :span="24">
                             <div
                               class="roc-tabpane-step-tail"
-                              :style="{height: ((innerWidth > 1200) ? '212px' : '350px'), marginTop: ((innerWidth > 1200) ? '-212px' : '-350px')}"
+                              :style="getNodeTabpaneStepTailStyle(innerWidth, [formObj.formModel.publicDevTarRecord, formObj.formModel.devTarFilingRequestRecord, formObj.formModel.devTarFilingApprovalRecord], {defaultHeight: 213, noDefaultHeight: 351,defaultMarginTop: 213, noDefaultMarginTop: 351}, 2)"
                             ></div>
                           </el-col>
 
@@ -1181,7 +1181,7 @@
                           <el-col :span="24">
                             <div
                               class="roc-tabpane-step-tail"
-                              :style="{height: ((innerWidth > 1200) ? '110px' : '202px'), marginTop: ((innerWidth > 1200) ? '-110px' : '-202px')}"
+                              :style="getNodeTabpaneStepTailStyle(innerWidth, [formObj.formModel.politicalTrialReport, formObj.formModel.politicalTrialRecord], {defaultHeight: 110, noDefaultHeight: 202,defaultMarginTop: 110, noDefaultMarginTop: 202})"
                             ></div>
                           </el-col>
 
@@ -1236,7 +1236,7 @@
                           <el-col :span="24">
                             <div
                               class="roc-tabpane-step-tail"
-                              :style="{height: ((innerWidth > 1200) ? '72px' : '118px'), marginTop: ((innerWidth > 1200) ? '-52px' : '-98px')}"
+                              :style="getNodeTabpaneStepTailStyle(innerWidth, [formObj.formModel.detDevTarGradRecord], {defaultHeight: 72, noDefaultHeight: 118,defaultMarginTop: 52, noDefaultMarginTop: 98})"
                             ></div>
                           </el-col>
                         </el-row>
@@ -1361,7 +1361,7 @@
                           <el-col :span="24">
                             <div
                               class="roc-tabpane-step-tail"
-                              :style="{height: ((innerWidth > 1200) ? '156px' : '248px'), marginTop: ((innerWidth > 1200) ? '-156px' : '-248px')}"
+                              :style="getNodeTabpaneStepTailStyle(innerWidth, [formObj.formModel.devPartyPreTrialRevMeetRecord, formObj.formModel.submitDevPartyPreTrialRecord], {defaultHeight: 156, noDefaultHeight: 248,defaultMarginTop: 156, noDefaultMarginTop: 248})"
                             ></div>
                           </el-col>
 
@@ -1431,7 +1431,7 @@
                           <el-col :span="24">
                             <div
                               class="roc-tabpane-step-tail"
-                              :style="{height: ((innerWidth > 1200) ? '98px' : '144px'), marginTop: ((innerWidth > 1200) ? '-98px' : '-144px')}"
+                              :style="getNodeTabpaneStepTailStyle(innerWidth, [formObj.formModel.devPartyPreTrialApprovalRecord], {defaultHeight: 98, noDefaultHeight: 144,defaultMarginTop: 98, noDefaultMarginTop: 144})"
                             ></div>
                           </el-col>
 
@@ -1486,7 +1486,7 @@
                           <el-col :span="24">
                             <div
                               class="roc-tabpane-step-tail"
-                              :style="{height: ((innerWidth > 1200) ? '52px' : '98px'), marginTop: ((innerWidth > 1200) ? '-52px' : '-98px')}"
+                              :style="getNodeTabpaneStepTailStyle(innerWidth, [formObj.formModel.solicitOpinionsRecord], {defaultHeight: 52, noDefaultHeight: 98,defaultMarginTop: 52, noDefaultMarginTop: 98})"
                             ></div>
                           </el-col>
 
@@ -1674,7 +1674,7 @@
                           <el-col :span="24">
                             <div
                               class="roc-tabpane-step-tail"
-                              :style="{height: ((innerWidth > 1200) ? '256px' : '440px'), marginTop: ((innerWidth > 1200) ? '-236px' : '-420px')}"
+                              :style="getNodeTabpaneStepTailStyle(innerWidth, [formObj.formModel.volunteerRecord], {defaultHeight: 256, noDefaultHeight: 440,defaultMarginTop: 236, noDefaultMarginTop: 420})"
                             ></div>
                           </el-col>
                         </el-row>
@@ -1753,7 +1753,7 @@
                           <el-col :span="24">
                             <div
                               class="roc-tabpane-step-tail"
-                              :style="{height: ((innerWidth > 1200) ? '52px' : '98px'), marginTop: ((innerWidth > 1200) ? '-52px' : '-98px')}"
+                              :style="getNodeTabpaneStepTailStyle(innerWidth, [formObj.formModel.branchAssemblyRecord], {defaultHeight: 52, noDefaultHeight: 98,defaultMarginTop: 52, noDefaultMarginTop: 98})"
                             ></div>
                           </el-col>
 
@@ -1811,7 +1811,7 @@
                           <el-col :span="24">
                             <div
                               class="roc-tabpane-step-tail"
-                              :style="{height: ((innerWidth > 1200) ? '52px' : '98px'), marginTop: ((innerWidth > 1200) ? '-52px' : '-98px')}"
+                              :style="getNodeTabpaneStepTailStyle(innerWidth, [formObj.formModel.communistPrepMemberRecord], {defaultHeight: 52, noDefaultHeight: 98,defaultMarginTop: 52, noDefaultMarginTop: 98})"
                             ></div>
                           </el-col>
 
@@ -1921,7 +1921,7 @@
                           <el-col :span="24">
                             <div
                               class="roc-tabpane-step-tail"
-                              :style="{height: ((innerWidth > 1200) ? '156px' : '248px'), marginTop: ((innerWidth > 1200) ? '-156px' : '-248px')}"
+                              :style="getNodeTabpaneStepTailStyle(innerWidth, [formObj.formModel.prepPartyApprovalMeetRecord, formObj.formModel.prepPartyApprovalRecord], {defaultHeight: 156, noDefaultHeight: 248,defaultMarginTop: 156, noDefaultMarginTop: 248}, '19')"
                             ></div>
                           </el-col>
 
@@ -1961,7 +1961,7 @@
                           <el-col :span="24">
                             <div
                               class="roc-tabpane-step-tail"
-                              :style="{height: ((innerWidth > 1200) ? '62px' : '62px'), marginTop: ((innerWidth > 1200) ? '-42px' : '-42px')}"
+                              :style="getNodeTabpaneStepTailStyle(innerWidth, [], {defaultHeight: 62, noDefaultHeight: 62,defaultMarginTop: 42, noDefaultMarginTop: 42})"
                             ></div>
                           </el-col>
                         </el-row>
@@ -2041,7 +2041,7 @@
                           <el-col :span="24">
                             <div
                               class="roc-tabpane-step-tail"
-                              :style="{height: ((innerWidth > 1200) ? '52px' : '98px'), marginTop: ((innerWidth > 1200) ? '-52px' : '-98px')}"
+                              :style="getNodeTabpaneStepTailStyle(innerWidth, [formObj.formModel.prepPartyEduRegistRecord], {defaultHeight: 52, noDefaultHeight: 98,defaultMarginTop: 52, noDefaultMarginTop: 98})"
                             ></div>
                           </el-col>
 
@@ -2679,38 +2679,47 @@ export default {
       this.$emit("page-close", 'LIST');
     },
     /**
-     * 获取上传是否成功
+     * 获取节点纵向线的高度
+     * @innerWidth [String] 页面当前可视宽度
+     * @stepitemObj [Array] 当前节点文件上传字段
+     * @defaultValueObj [Object] {defaultHeight, noDefaultHeight,defaultMarginTop, noDefaultMarginTop}
      */
-    getRocPdfUploadSuccess(param) {
-      if (!param) {
-        return 0;
+    getNodeTabpaneStepTailStyle(innerWidth, stepitemObj, defaultValueObj, baseNum) {
+      let notEnableBase = 60;
+      let enableBase = 115;
+      let incrementBase = 0;
+      // 处理数据
+      let [enableFlag, notEnableFlag] = [0, 0];
+      for (let field of stepitemObj) {
+        if (!field) {
+          continue;
+        } else if (field === 'ROCPDFUPLOADSELECT') {
+          notEnableFlag += 1;
+        } else {
+          enableFlag += 1;
+        }
       }
 
-      if (param === 'ROCPDFUPLOADSELECT') {
-        return 60;
+      if(baseNum && (enableFlag + notEnableFlag) === 3){
+        incrementBase += baseNum;
       }
 
-      return 115;
-    },
-    /**
-     * 获取节点纵向线的高度
-     * @innerWidth [String] 页面当前可视宽度
-     * @stepitemObj [Object] 当前节点文件上传字段
-     * @defaultValueObj [Object] {defaultHeight, noDefaultHeight,defaultMarginTop, noDefaultMarginTop}
-     */
-    getNodeTabpaneStepTailStyle(innerWidth, stepitemObj, defaultValueObj) {
+      if(baseNum === '19' && (enableFlag + notEnableFlag) === 2){
+        incrementBase += 2;
+      }
+      
       // 默认
       if (innerWidth > 1200) {
         return {
-          height: '64px',
-          marginTop: '-64px'
+          height: `${defaultValueObj['defaultHeight'] + notEnableFlag * notEnableBase + enableFlag * enableBase + incrementBase}px`,
+          marginTop: `-${defaultValueObj['defaultMarginTop'] + notEnableFlag * notEnableBase + enableFlag * enableBase + incrementBase}px`
         };
       }
 
       // 非默认
       return {
-        height: '122px',
-        marginTop: '-122px'
+        height: `${defaultValueObj['noDefaultHeight'] + notEnableFlag * notEnableBase + enableFlag * enableBase + incrementBase}px`,
+        marginTop: `-${defaultValueObj['noDefaultMarginTop'] + notEnableFlag * notEnableBase + enableFlag * enableBase + incrementBase}px`
       };
     }
   }