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

src/components/RocPdfFileUpload/index.vue

@@ -3,7 +3,7 @@
  * @Author: Rockery
  * @Date: 2021-12-20 09:16:41
  * @LastEditors: Rockery
- * @LastEditTime: 2021-12-20 15:29:05
+ * @LastEditTime: 2021-12-22 18:06:06
  * @FilePath: \party_construct_web\src\components\RocPdfFileUpload\index.vue
  * @Copyright: Copyright (c) 2016~2021 Rockery(1113269755@qq.com)
 -->
@@ -37,7 +37,8 @@
         @click="handleRocPdfFileUploadUrlClick"
       >
         <div>文件上传成功地址：</div>
-        <div>{{ successUrl }}</div>
+        <!-- <a :href="successUrl" target="_blank">{{ successUrl }}</a> -->
+        <div>{{ this.successResp.name }}</div>
       </div>
       <el-button
         v-if="isSelect && !isUploadSuccess"
@@ -47,29 +48,41 @@
       >上传文件</el-button>
       <el-button v-if="isSelect" type="info" size="small" @click="removeRocPdfFileUploadClick">移除文件</el-button>
     </div>
+
+    <roc-vue-pdf-dialog
+      v-if="pdfDialogVisible"
+      :visible.sync="pdfDialogVisible"
+      :pdfUrl="this.successResp.successUrl"
+    ></roc-vue-pdf-dialog>
   </div>
 </template>
 
 <script>
+import { getToken } from '@/utils/auth';
 
 export default {
-  name: "Rocpdffileupload",
+  name: 'Rocpdffileupload',
+  components: {
+    'roc-vue-pdf-dialog': () => import('@/components/RocVuePdfDialog')
+  },
   props: {
     // 值
     value: {
       type: String,
-      default: ""
+      default: ''
     },
     // PDF文件上传地址
     uploadUrl: {
       type: String,
-      default: ''
+      default: `${process.env.VUE_APP_FILE_UPLOAD_API}`
     },
     // 请求头对象
     uploadHeaders: {
       type: Object,
       default: () => {
-        return {};
+        return {
+          Authorization: 'Bearer ' + getToken()
+        };
       }
     },
     // 上传文件标题
@@ -82,14 +95,13 @@ export default {
     return {
       // 是否选择PDF文件
       isSelect: false,
-      // 是否等待上传PDF文件
-      isOnProgress: false,
       // 是否上传PDF文件成功
       isUploadSuccess: false,
       // PDF文件上传成功数据对象
       successUrl: '',
       // PDF文件上传成功数据对象
-      successResp: {}
+      successResp: {},
+      pdfDialogVisible: false
     };
   },
   computed: {
@@ -110,19 +122,9 @@ export default {
       return '文件';
     },
   },
-  created() {
-    this.initData();
-  },
-  mounted() {
-  },
   methods: {
     /**
-    * 初始化数据
-    */
-    async initData() {
-    },
-    /**
-     * 相关材料PDF文件上传预处理
+     * PDF文件上传预处理
      */
     handleRocPdfFileUploadBeforeUpload(file) {
       if (file.type.indexOf('application/pdf') === -1) {
@@ -132,7 +134,7 @@ export default {
       }
     },
     /**
-     * 相关材料PDF文件上传成功处理
+     * PDF文件上传成功处理
      */
     handleRocPdfFileUploadOnsuccess(response, file, fileList) {
       // 校验封面图片是否上传成功
@@ -144,24 +146,23 @@ export default {
         return;
       }
 
+      let successUrl = `${window.origin}${process.env.VUE_APP_FILE_VIEW_API}${response?.data?.url}`;
+
       // 绑定封面图片数据
-      this.successUrl = response?.data?.url;
+      this.successUrl = successUrl;
 
       // PDF文件上传成功数据对象
-      this.successResp = response?.data;
-      this.$emit("input", response?.data?.url);
-      this.isUploadSuccess = true;
+      this.successResp = {
+        ...response?.data,
+        successUrl: successUrl
+      };
 
-      // 判断是否继续操作
-      if (this.isOnProgress) {
-        this.isOnProgress = false;
-        this.$emit("wait-upload-success", this.successResp);
-      } else {
-        this.$alert(`PDF${this.fileTitle}上传成功！`, '上传结果', { dangerouslyUseHTMLString: true });
-      }
+      this.$emit('input', response?.data?.url);
+      this.isUploadSuccess = true;
+      this.$alert(`PDF${this.fileTitle}上传成功！`, '上传结果', { dangerouslyUseHTMLString: true });
     },
     /**
-     * 相关材料PDF文件状态改变
+     * PDF文件状态改变
      */
     handleRocPdfFileUploadOnchange(file, fileList) {
       if (file.status === 'ready') {
@@ -173,20 +174,27 @@ export default {
         }
         this.isSelect = true;
         this.isUploadSuccess = false;
+        this.$emit('input', 'ROCPDFUPLOADSELECT');
+      } else if (file.status === 'success') {
+        this.isUploadSuccess = true;
+      } else {
+        this.isUploadSuccess = false;
+        this.isSelect = false;
+        this.$emit('input', 'ROCPDFUPLOADSELECT');
       }
     },
     /**
-     * 相关材料PDF文件列表移除文件时的钩子
+     * PDF文件列表移除文件时的钩子
      */
     handleRocPdfFileUploadOnRemove(file, fileList) {
       this.successResp = {};
       this.successUrl = '';
       this.isUploadSuccess = false;
       this.isSelect = false;
-      this.$emit("input", "");
+      this.$emit('input', '');
     },
     /**
-     * 相关材料PDF文件超出个数限制时的钩子
+     * PDF文件超出个数限制时的钩子
      */
     handleRocPdfFileUploadOnExceed(files, fileList) {
       this.msgWarning(`只允许上传单个PDF${this.fileTitle}`);
@@ -215,13 +223,13 @@ export default {
       this.$refs.rocPdfFileUploadRef.clearFiles();
       this.isUploadSuccess = false;
       this.isSelect = false;
-      this.$emit("input", "");
+      this.$emit('input', '');
     },
     /**
      * PDF文件地址单击事件
      */
     handleRocPdfFileUploadUrlClick() {
-      this.$emit("pdf-url-incident", this.successResp);
+      this.pdfDialogVisible = true;
     }
   }
 }

src/components/RocVuePdfDialog/index.vue

@@ -3,7 +3,7 @@
  * @Author: Rockery
  * @Date: 2021-12-13 17:40:22
  * @LastEditors: Rockery
- * @LastEditTime: 2021-12-15 15:51:25
+ * @LastEditTime: 2021-12-22 17:16:01
  * @FilePath: \party_construct_web\src\components\RocVuePdfDialog\index.vue
  * @Copyright: Copyright (c) 2016~2021 Rockery(1113269755@qq.com)
 -->
@@ -12,29 +12,44 @@
   <div class="rocvuepdfdialog">
     <el-dialog
       title="PDF文件预览"
-      :visible.sync="visible"
+      :visible.sync="currentVisible"
       width="60%"
       append-to-body
-      destroy-on-close
+      :destroy-on-close="true"
       class="rocvuepdfdialog-dialog"
       @close="handleCloseDialogClick"
     >
-      <el-button-group>
-        <el-button type="primary" icon="el-icon-arrow-left" size="mini" @click="prePage">上一页</el-button>
-        <el-button type="primary" size="mini" @click="nextPage">
-          下一页
-          <i class="el-icon-arrow-right el-icon--right"></i>
-        </el-button>
-      </el-button-group>
-      <div class="rocvuepdfdialog-dialog-page">当前页码：{{ pageNum }} / 总页码：{{ numPages }}</div>
-      <vue-pdf
-        ref="vuePdfRef"
-        :src="pdfUrl || '/file-api/statics/2021/12/13/6085efe9-74e1-4444-b47a-5c3533ec6901.pdf'"
-        :page="pageNum"
-        class="rocvuepdfdialog-dialog-pdfcontent"
-        @progress="loadedRatio = $event"
-        @num-pages="numPages = $event"
-      ></vue-pdf>
+      <div v-loading="loadedRatio !== 1">
+        <el-button-group>
+          <el-button size="mini" @click="handleHomePage">首 页</el-button>
+          <el-button type="primary" icon="el-icon-arrow-left" size="mini" @click="handlePrePage">上一页</el-button>
+          <el-button type="primary" size="mini" @click="handleNextPage">
+            下一页
+            <i class="el-icon-arrow-right el-icon--right"></i>
+          </el-button>
+          <el-button size="mini" @click="handleLastPage">尾 页</el-button>
+        </el-button-group>
+        <div class="rocvuepdfdialog-dialog-page">当前页码：{{ pageNum }} / 总页码：{{ numPages }}</div>
+        <div
+          v-show="loadedRatio === 1"
+          ref="rocVuePdfContainerRef"
+          class="rocvuepdfdialog-dialog-container"
+        >
+          <vue-pdf
+            :src="pdfUrl"
+            ref="vuePdfRef"
+            :page="pageNum"
+            @num-pages="numPages = $event"
+            @progress="loadedRatio = $event"
+            @page-loaded="pageNum = $event"
+            @loaded="loadPdfHandler"
+            @link-clicked="pageNum = $event"
+          ></vue-pdf>
+        </div>
+        <template v-if="loadedRatio !== 1">
+          <div class="rocvuepdfdialog-dialog-nodata">文件预览失败</div>
+        </template>
+      </div>
       <div slot="footer" class="dialog-footer">
         <el-button @click="handleCloseDialogClick">关 闭</el-button>
       </div>
@@ -64,47 +79,73 @@ export default {
   },
   data() {
     return {
-      numPages: null, // pdf 总页数
+      numPages: 0, // pdf 总页数
       pageNum: 1,
       loadedRatio: 0, // 当前页面的加载进度，范围是0-1 ，等于1的时候代表当前页已经完全加载完成了
     };
   },
-  mounted() {
-    this.getNumPages()
+  computed: {
+    currentVisible: {
+      get() {
+        return this.visible;
+      },
+      set(val) {
+        this.$emit('update:visible', val);
+      }
+    }
   },
   methods: {
+    /**
+     * pdf加载时
+     */
+    loadPdfHandler(e) {
+      // 加载的时候先加载第一页
+      this.pageNum = 1;
+    },
+    /**
+     * 首页按钮事件
+     */
+    handleHomePage() {
+      this.pageNum = 1;
+      this.toTop();
+    },
     /**
      * 上一页按钮事件
      */
-    prePage() {
+    handlePrePage() {
       let page = this.pageNum;
       page = page > 1 ? page - 1 : this.numPages;
       this.pageNum = page;
+      this.toTop();
     },
     /**
      * 下一页按钮事件
      */
-    nextPage() {
+    handleNextPage() {
       let page = this.pageNum;
       page = page < this.numPages ? page + 1 : 1;
       this.pageNum = page;
+      this.toTop();
     },
     /**
-     * 计算pdf页码总数
+     * 尾页按钮事件
      */
-    getNumPages() {
-      let loadingTask = vuePdf.createLoadingTask(this.pdfUrl);
-      loadingTask.promise.then(pdf => {
-        this.numPages = pdf.numPages;
-      }).catch(err => {
-        console.error('pdf 加载失败', err);
-      });
+    handleLastPage() {
+      this.pageNum = this.numPages;
+      this.toTop();
     },
     /**
      * 对话框关闭事件
     */
     handleCloseDialogClick() {
-      this.$emit("close", false);
+      // this.$emit("close", false);
+      this.currentVisible = false;
+    },
+    /**
+     * 页面回到顶部
+    */
+    toTop() {
+      this.$refs.rocVuePdfContainerRef && (this.$refs.rocVuePdfContainerRef.scrollTop = 0);
     }
   }
 }
@@ -128,6 +169,24 @@ export default {
       margin: 10px 0;
       color: #409eff;
     }
+
+    &-container {
+      position: relative;
+      overflow: auto;
+      width: 100%;
+      height: 550px;
+      border: 1px solid #d9d9d9;
+    }
+
+    &-nodata {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      height: 200px;
+      font-size: 22px;
+      color: #747474;
+      opacity: 0.8;
+    }
   }
 }
 </style>

src/components/RocVuePdfPage/index.vue

@@ -3,7 +3,7 @@
  * @Author: Rockery
  * @Date: 2021-12-13 17:40:22
  * @LastEditors: Rockery
- * @LastEditTime: 2021-12-15 17:42:25
+ * @LastEditTime: 2021-12-22 16:59:19
  * @FilePath: \party_construct_web\src\components\RocVuePdfPage\index.vue
  * @Copyright: Copyright (c) 2016~2021 Rockery(1113269755@qq.com)
 -->
@@ -23,11 +23,12 @@
         <div class="rocvuepdfpage-line"></div>
       </el-col>
       <el-col :span="24">
-        <div v-loading="isLoading">
+        <div v-loading="loadedRatio != 1">
           <el-row>
             <el-col :span="24">
               <div class="rocvuepdfpage-btngroup">
                 <el-button-group>
+                  <el-button size="mini" @click="handleHomePage">首 页</el-button>
                   <el-button
                     type="primary"
                     icon="el-icon-arrow-left"
@@ -38,6 +39,7 @@
                     下一页
                     <i class="el-icon-arrow-right el-icon--right"></i>
                   </el-button>
+                  <el-button size="mini" @click="handleLastPage">尾 页</el-button>
                 </el-button-group>
               </div>
             </el-col>
@@ -46,16 +48,19 @@
             </el-col>
 
             <el-col :span="24">
-              <template v-if="isLoadingSuccess">
+              <div class="rocvuepdfpage-container" v-show="loadedRatio === 1">
                 <vue-pdf
+                  :src="pdfUrl"
                   ref="vuePdfRef"
-                  :src="pdfUrl || '/file-api/statics/2021/12/13/6085efe9-74e1-4444-b47a-5c3533ec6901.pdf'"
                   :page="pageNum"
-                  @progress="loadedRatio = $event"
                   @num-pages="numPages = $event"
+                  @progress="loadedRatio = $event"
+                  @page-loaded="pageNum = $event"
+                  @loaded="loadPdfHandler"
+                  @link-clicked="pageNum = $event"
                 ></vue-pdf>
-              </template>
-              <template v-else>
+              </div>
+              <template v-if="loadedRatio !== 1">
                 <div class="rocvuepdfpage-nodata">文件预览失败</div>
               </template>
             </el-col>
@@ -75,6 +80,7 @@
 
 <script>
 import vuePdf from 'vue-pdf';
+import CMapReaderFactory from 'vue-pdf/src/CMapReaderFactory.js';
 
 export default {
   name: 'Rocvuepdfpage',
@@ -92,15 +98,28 @@ export default {
     return {
       numPages: null, // pdf 总页数
       pageNum: 1,
-      loadedRatio: 0, // 当前页面的加载进度，范围是0-1 ，等于1的时候代表当前页已经完全加载完成了
-      isLoading: true,
-      isLoadingSuccess: true
+      loadedRatio: 0 // 当前页面的加载进度，范围是0-1 ，等于1的时候代表当前页已经完全加载完成了
     };
   },
-  mounted() {
-    this.getNumPages()
+  computed: {
+    currentPdfUrl() {
+      return vuePdf.createLoadingTask({ url: this.pdfUrl, CMapReaderFactory });
+    }
   },
   methods: {
+    /**
+     * pdf加载时
+     */
+    loadPdfHandler(e) {
+      // 加载的时候先加载第一页
+      this.pageNum = 1;
+    },
+    /**
+     * 首页按钮事件
+     */
+    handleHomePage() {
+      this.pageNum = 1;
+    },
     /**
      * 上一页按钮事件
      */
@@ -118,19 +137,10 @@ export default {
       this.pageNum = page;
     },
     /**
-     * 计算pdf页码总数
+     * 尾页按钮事件
      */
-    getNumPages() {
-      let loadingTask = vuePdf.createLoadingTask(this.pdfUrl);
-      loadingTask.promise.then(pdf => {
-        this.numPages = pdf.numPages;
-        this.isLoading = false;
-        this.isLoadingSuccess = true;
-      }).catch(err => {
-        console.error('PDF文件预览失败！');
-        this.isLoading = false;
-        this.isLoadingSuccess = false;
-      });
+    handleLastPage() {
+      this.pageNum = this.numPages;
     },
     /**
      * 对话框关闭事件
@@ -189,6 +199,13 @@ export default {
     color: #409eff;
   }
 
+  &-container {
+    position: relative;
+    overflow: auto;
+    width: 100%;
+    height: 650px;
+  }
+
   &-nodata {
     display: flex;
     justify-content: center;

src/components/UpdatePartyDevelop/index.vue

@@ -3,7 +3,7 @@
  * @Author: Rockery
  * @Date: 2021-12-15 17:54:05
  * @LastEditors: Rockery
- * @LastEditTime: 2021-12-21 18:14:11
+ * @LastEditTime: 2021-12-22 18:29:34
  * @FilePath: \party_construct_web\src\components\UpdatePartyDevelop\index.vue
  * @Copyright: Copyright (c) 2016~2021 Rockery(1113269755@qq.com)
 -->
@@ -27,6 +27,7 @@
     >
       <div class="updatepartydevelop-basic">
         <el-row>
+          <!-- 个人基本情况 -->
           <el-col :span="24">
             <div class="updatepartydevelop-title">
               <div>
@@ -43,11 +44,14 @@
           </el-col>
           <el-col :span="24">
             <el-row>
+              <!-- 姓名 -->
               <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
                 <el-form-item label="姓名：" prop="name">
                   <el-input v-model="formObj.formModel.name" placeholder="请输入姓名" clearable />
                 </el-form-item>
               </el-col>
+
+              <!-- 性别 -->
               <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
                 <el-form-item label="性别：" prop="sex">
                   <el-select
@@ -66,27 +70,34 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+
+              <!-- 民族 -->
               <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
                 <el-form-item label="民族：" prop="nation">
                   <el-input v-model="formObj.formModel.nation" placeholder="请输入民族" clearable />
                 </el-form-item>
               </el-col>
+
+              <!-- 出生年月 -->
               <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
                 <el-form-item label="出生年月：" prop="birthday">
                   <el-date-picker
                     v-model="formObj.formModel.birthday"
                     type="date"
                     clearable
+                    format="yyyy年MM月dd日"
                     value-format="yyyy-MM-dd"
                     style="width: 100%;"
                     placeholder="请选择出生年月"
                   ></el-date-picker>
                 </el-form-item>
               </el-col>
+
+              <!-- 籍贯 -->
               <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
                 <el-form-item label="籍贯：" prop="place">
                   <area-cascader
-                    type="all"
+                    type="text"
                     v-model="formObj.formModel.place"
                     :level="0"
                     :data="areaDataObj.pca"
@@ -95,65 +106,83 @@
                   ></area-cascader>
                 </el-form-item>
               </el-col>
+
+              <!-- 学历 -->
               <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
-                <el-form-item label="学历：" prop="sex">
+                <el-form-item label="学历：" prop="education">
                   <el-select
-                    v-model="formObj.formModel.sex"
+                    v-model="formObj.formModel.education"
                     placeholder="请选择学历"
                     clearable
                     size="small"
                     style="width: 100%;"
                   >
                     <el-option
-                      v-for="sexOption in sexOptions"
-                      :key="sexOption.dictValue"
-                      :label="sexOption.dictLabel"
-                      :value="sexOption.dictValue"
+                      v-for="educationOption in educationOptions"
+                      :key="educationOption.dictValue"
+                      :label="educationOption.dictLabel"
+                      :value="educationOption.dictValue"
                     />
                   </el-select>
                 </el-form-item>
               </el-col>
+
+              <!-- 入团时间 -->
               <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
-                <el-form-item label="入团时间：" prop="dateOfBirth">
+                <el-form-item label="入团时间：" prop="addTeamTime">
                   <el-date-picker
-                    v-model="formObj.formModel.dateOfBirth"
+                    v-model="formObj.formModel.addTeamTime"
                     type="date"
                     clearable
+                    format="yyyy年MM月dd日"
                     value-format="yyyy-MM-dd"
                     style="width: 100%;"
                     placeholder="请选择入团时间"
                   ></el-date-picker>
                 </el-form-item>
               </el-col>
+
+              <!-- 单位、职务或职务 -->
               <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
-                <el-form-item label="单位、职务或职务：" prop="nation">
-                  <el-input v-model="formObj.formModel.nation" placeholder="请输入单位、职务或职务" clearable />
+                <el-form-item label="单位、职务或职务：" prop="workJob">
+                  <el-input
+                    v-model="formObj.formModel.workJob"
+                    placeholder="请输入单位、职务或职务"
+                    clearable
+                  />
                 </el-form-item>
               </el-col>
+
+              <!-- 参加工作时间 -->
               <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
-                <el-form-item label="参加工作时间：" prop="dateOfBirth">
+                <el-form-item label="参加工作时间：" prop="workTime">
                   <el-date-picker
-                    v-model="formObj.formModel.dateOfBirth"
+                    v-model="formObj.formModel.workTime"
                     type="date"
                     clearable
+                    format="yyyy年MM月dd日"
                     value-format="yyyy-MM-dd"
                     style="width: 100%;"
                     placeholder="请选择参加工作时间"
                   ></el-date-picker>
                 </el-form-item>
               </el-col>
+
+              <!-- 居民身份证号码 -->
               <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
-                <el-form-item label="居民身份证号码：" prop="nation">
-                  <el-input v-model="formObj.formModel.nation" placeholder="请输入居民身份证号码" clearable />
+                <el-form-item label="居民身份证号码：" prop="cardNo">
+                  <el-input v-model="formObj.formModel.cardNo" placeholder="请输入居民身份证号码" clearable />
                 </el-form-item>
               </el-col>
+
+              <!-- 现居地 -->
               <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
-                <el-form-item label="现居地：" prop="selected2">
+                <el-form-item label="现居地：" prop="addressList">
                   <el-row>
                     <el-col :span="12">
                       <area-cascader
-                        type="all"
-                        v-model="formObj.formModel.selected2"
+                        type="text"
+                        v-model="formObj.formModel.addressList"
                         :level="1"
                         :data="areaDataObj.pcaa"
                         separator="-"
@@ -162,7 +191,7 @@
                     </el-col>
                     <el-col :span="12">
                       <el-input
-                        v-model="formObj.formModel.nation"
+                        v-model="formObj.formModel.detailedAddress"
                         placeholder="请输入详细街道地址"
                         clearable
                       />
@@ -170,41 +199,43 @@
                   </el-row>
                 </el-form-item>
               </el-col>
+
+              <!-- 本人简历（包括学历） -->
               <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
                 <el-form-item label="本人简历（包括学历）：" prop="resume">
                   <roc-pdf-file-upload
                     key="ROCPDFFILEUPLOADMYRESUMEKEY"
                     v-model="formObj.formModel.resume"
                     upload-file-title="本人简历（包括学历"
-                    :upload-url="baseApiUrl + '/file/upload'"
-                    :upload-headers="{ Authorization: 'Bearer ' + getToken() }"
                   ></roc-pdf-file-upload>
                 </el-form-item>
               </el-col>
+
+              <!-- 其他情况 -->
               <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
                 <el-form-item label="其他情况：" prop="other">
                   <roc-pdf-file-upload
                     key="ROCPDFFILEUPLOADOTHERKEY"
                     v-model="formObj.formModel.other"
                     upload-file-title="其他情况"
-                    :upload-url="baseApiUrl + '/file/upload'"
-                    :upload-headers="{ Authorization: 'Bearer ' + getToken() }"
                   ></roc-pdf-file-upload>
                 </el-form-item>
               </el-col>
+
+              <!-- 两寸正面免冠照片 -->
               <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
                 <el-form-item label="两寸正面免冠照片：" prop="personPhoto" class="formitem-attachment">
                   <roc-pdf-file-upload
                     key="ROCPDFFILEUPLOADPERSONPHOTOKEY"
                     v-model="formObj.formModel.personPhoto"
                     upload-file-title="两寸正面免冠照片"
-                    :upload-url="baseApiUrl + '/file/upload'"
-                    :upload-headers="{ Authorization: 'Bearer ' + getToken() }"
                   ></roc-pdf-file-upload>
                 </el-form-item>
               </el-col>
+
+              <!-- 备注 -->
               <el-col :span="24">
-                <el-form-item label="备注：" prop="nation">
+                <el-form-item label="备注：" prop="remark">
                   <el-input
                     type="textarea"
                     clearable
@@ -212,7 +243,7 @@
                     show-word-limit
                     :autosize="{ minRows: 6}"
                     placeholder="请输入内容"
-                    v-model="formObj.formModel.nation"
+                    v-model="formObj.formModel.remark"
                   />
                 </el-form-item>
               </el-col>
@@ -274,11 +305,11 @@
                                         <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
                                           <el-form-item
                                             label="递交入党申请书时间："
-                                            prop="dateOfBirth"
+                                            prop="submitAddPartyPageTime"
                                             label-width="141px"
                                           >
                                             <el-date-picker
-                                              v-model="formObj.formModel.dateOfBirth"
+                                              v-model="formObj.formModel.submitAddPartyPageTime"
                                               type="date"
                                               clearable
                                               value-format="yyyy-MM-dd"
@@ -297,8 +328,6 @@
                                               key="ROCPDFFILEUPLOADAPPLICATIONKEY"
                                               v-model="formObj.formModel.application"
                                               upload-file-title="入党申请书"
-                                              :upload-url="baseApiUrl + '/file/upload'"
-                                              :upload-headers="{ Authorization: 'Bearer ' + getToken() }"
                                             ></roc-pdf-file-upload>
                                           </el-form-item>
                                         </el-col>
@@ -312,7 +341,7 @@
                           <el-col :span="24">
                             <div
                               class="roc-tabpane-step-tail"
-                              :style="{height: ((innerWidth > 1200) ? '64px' : '122px'), marginTop: ((innerWidth > 1200) ? '-64px' : '-122px')}"
+                              :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'))}"
                             ></div>
                           </el-col>
 
@@ -352,8 +381,6 @@
                                               key="ROCPDFFILEUPLOADCHATHISTORYKEY"
                                               v-model="formObj.formModel.chatHistory"
                                               upload-file-title="谈话记录"
-                                              :upload-url="baseApiUrl + '/file/upload'"
-                                              :upload-headers="{ Authorization: 'Bearer ' + getToken() }"
                                             ></roc-pdf-file-upload>
                                           </el-form-item>
                                         </el-col>
@@ -391,8 +418,6 @@
                                               key="ROCPDFFILEUPLOADIDENTITYINFOKEY"
                                               v-model="formObj.formModel.identityInfo"
                                               upload-file-title="身份证或户口本"
-                                              :upload-url="baseApiUrl + '/file/upload'"
-                                              :upload-headers="{ Authorization: 'Bearer ' + getToken() }"
                                             ></roc-pdf-file-upload>
                                           </el-form-item>
                                         </el-col>
@@ -467,8 +492,6 @@
                                               key="ROCPDFFILEUPLOADACTIVISTSCHATHISTORYKEY"
                                               v-model="formObj.formModel.activistsChatHistory"
                                               upload-file-title="谈话记录"
-                                              :upload-url="baseApiUrl + '/file/upload'"
-                                              :upload-headers="{ Authorization: 'Bearer ' + getToken() }"
                                             ></roc-pdf-file-upload>
                                           </el-form-item>
                                         </el-col>
@@ -500,8 +523,6 @@
                                               key="ROCPDFFILEUPLOADACTIVISTSREGISTKEY"
                                               v-model="formObj.formModel.activistsRegist"
                                               upload-file-title="推荐入党积极分子登记表"
-                                              :upload-url="baseApiUrl + '/file/upload'"
-                                              :upload-headers="{ Authorization: 'Bearer ' + getToken() }"
                                             ></roc-pdf-file-upload>
                                           </el-form-item>
                                         </el-col>
@@ -570,8 +591,6 @@
                                               key="ROCPDFFILEUPLOADIDENTIFYPARTYACTIVISTSKEY"
                                               v-model="formObj.formModel.identifyPartyActivists"
                                               upload-file-title="确定为入党积极分子的支委会会议记录"
-                                              :upload-url="baseApiUrl + '/file/upload'"
-                                              :upload-headers="{ Authorization: 'Bearer ' + getToken() }"
                                             ></roc-pdf-file-upload>
                                           </el-form-item>
                                         </el-col>
@@ -603,8 +622,6 @@
                                               key="ROCPDFFILEUPLOADACTIVISTSREQUESTRECORDKEY"
                                               v-model="formObj.formModel.activistsRequestRecord"
                                               upload-file-title="确定为入党积极分子的备案请示"
-                                              :upload-url="baseApiUrl + '/file/upload'"
-                                              :upload-headers="{ Authorization: 'Bearer ' + getToken() }"
                                             ></roc-pdf-file-upload>
                                           </el-form-item>
                                         </el-col>
@@ -649,8 +666,6 @@
                                               key="ROCPDFFILEUPLOADACTIVISTSAPPROVALKEY"
                                               v-model="formObj.formModel.activistsApproval"
                                               upload-file-title="确定为入党积极分子的批复"
-                                              :upload-url="baseApiUrl + '/file/upload'"
-                                              :upload-headers="{ Authorization: 'Bearer ' + getToken() }"
                                             ></roc-pdf-file-upload>
                                           </el-form-item>
                                         </el-col>
@@ -706,8 +721,6 @@
                                               key="ROCPDFFILEUPLOADTRAINACTIVISTSREGISTKEY"
                                               v-model="formObj.formModel.trainActivistsRegist"
                                               upload-file-title="培养教育考察登记表"
-                                              :upload-url="baseApiUrl + '/file/upload'"
-                                              :upload-headers="{ Authorization: 'Bearer ' + getToken() }"
                                             ></roc-pdf-file-upload>
                                           </el-form-item>
                                         </el-col>
@@ -763,8 +776,6 @@
                                               key="ROCPDFFILEUPLOADCERTIFICATEOFCOMPLETIONKEY"
                                               v-model="formObj.formModel.certificateOfCompletion"
                                               upload-file-title="结业证书"
-                                              :upload-url="baseApiUrl + '/file/upload'"
-                                              :upload-headers="{ Authorization: 'Bearer ' + getToken() }"
                                             ></roc-pdf-file-upload>
                                           </el-form-item>
                                         </el-col>
@@ -796,8 +807,6 @@
                                               key="ROCPDFFILEUPLOADIDEOLOGICALREPORT1KEY"
                                               v-model="formObj.formModel.ideologicalReport1"
                                               upload-file-title="思想汇报1"
-                                              :upload-url="baseApiUrl + '/file/upload'"
-                                              :upload-headers="{ Authorization: 'Bearer ' + getToken() }"
                                             ></roc-pdf-file-upload>
                                           </el-form-item>
                                         </el-col>
@@ -873,8 +882,6 @@
                                               key="ROCPDFFILEUPLOADHEAROPINIONRECORDKEY"
                                               v-model="formObj.formModel.hearOpinionRecord"
                                               upload-file-title="听取意见记录"
-                                              :upload-url="baseApiUrl + '/file/upload'"
-                                              :upload-headers="{ Authorization: 'Bearer ' + getToken() }"
                                             ></roc-pdf-file-upload>
                                           </el-form-item>
                                         </el-col>
@@ -945,8 +952,6 @@
                                               key="ROCPDFFILEUPLOADDETDEVTARRECORDKEY"
                                               v-model="formObj.formModel.detDevTarRecord"
                                               upload-file-title="支委会会议记录"
-                                              :upload-url="baseApiUrl + '/file/upload'"
-                                              :upload-headers="{ Authorization: 'Bearer ' + getToken() }"
                                             ></roc-pdf-file-upload>
                                           </el-form-item>
                                         </el-col>
@@ -1002,8 +1007,6 @@
                                               key="ROCPDFFILEUPLOADPUBLICDEVTARRECORDKEY"
                                               v-model="formObj.formModel.publicDevTarRecord"
                                               upload-file-title="公示材料"
-                                              :upload-url="baseApiUrl + '/file/upload'"
-                                              :upload-headers="{ Authorization: 'Bearer ' + getToken() }"
                                             ></roc-pdf-file-upload>
                                           </el-form-item>
                                         </el-col>
@@ -1035,8 +1038,6 @@
                                               key="ROCPDFFILEUPLOADDEVTARFILINGREQUESTRECORDKEY"
                                               v-model="formObj.formModel.devTarFilingRequestRecord"
                                               upload-file-title="备案请示"
-                                              :upload-url="baseApiUrl + '/file/upload'"
-                                              :upload-headers="{ Authorization: 'Bearer ' + getToken() }"
                                             ></roc-pdf-file-upload>
                                           </el-form-item>
                                         </el-col>
@@ -1083,8 +1084,6 @@
                                               key="ROCPDFFILEUPLOADDEVTARFILINGAPPROVALRECORDKEY"
                                               v-model="formObj.formModel.devTarFilingApprovalRecord"
                                               upload-file-title="备案批复"
-                                              :upload-url="baseApiUrl + '/file/upload'"
-                                              :upload-headers="{ Authorization: 'Bearer ' + getToken() }"
                                             ></roc-pdf-file-upload>
                                           </el-form-item>
                                         </el-col>
@@ -1140,8 +1139,6 @@
                                               key="ROCPDFFILEUPLOADPOLITICALTRIALREPORTKEY"
                                               v-model="formObj.formModel.politicalTrialReport"
                                               upload-file-title="综合性政审报告"
-                                              :upload-url="baseApiUrl + '/file/upload'"
-                                              :upload-headers="{ Authorization: 'Bearer ' + getToken() }"
                                             ></roc-pdf-file-upload>
                                           </el-form-item>
                                         </el-col>
@@ -1171,8 +1168,6 @@
                                               key="ROCPDFFILEUPLOADPOLITICALTRIALRECORDKEY"
                                               v-model="formObj.formModel.politicalTrialRecord"
                                               upload-file-title="相关材料"
-                                              :upload-url="baseApiUrl + '/file/upload'"
-                                              :upload-headers="{ Authorization: 'Bearer ' + getToken() }"
                                             ></roc-pdf-file-upload>
                                           </el-form-item>
                                         </el-col>
@@ -1228,8 +1223,6 @@
                                               key="ROCPDFFILEUPLOADDETDEVTARGRADRECORDKEY"
                                               v-model="formObj.formModel.detDevTarGradRecord"
                                               upload-file-title="结业证书"
-                                              :upload-url="baseApiUrl + '/file/upload'"
-                                              :upload-headers="{ Authorization: 'Bearer ' + getToken() }"
                                             ></roc-pdf-file-upload>
                                           </el-form-item>
                                         </el-col>
@@ -1271,7 +1264,6 @@
                     <el-col :span="24">
                       <div class="roc-tabpane-step">
                         <el-row>
-
                           <!-- 13 支委会拟接收预备党员审查会议记录和上报的预审请示 -->
                           <el-col :span="24">
                             <div class="roc-tabpane-step-item">
@@ -1325,8 +1317,6 @@
                                               key="ROCPDFFILEUPLOADDEVPARTYPRETRIALREVMEETRECORDKEY"
                                               v-model="formObj.formModel.devPartyPreTrialRevMeetRecord"
                                               upload-file-title="审查会议记录"
-                                              :upload-url="baseApiUrl + '/file/upload'"
-                                              :upload-headers="{ Authorization: 'Bearer ' + getToken() }"
                                             ></roc-pdf-file-upload>
                                           </el-form-item>
                                         </el-col>
@@ -1358,8 +1348,6 @@
                                               key="ROCPDFFILEUPLOADSUBMITDEVPARTYPRETRIALRECORDKEY"
                                               v-model="formObj.formModel.submitDevPartyPreTrialRecord"
                                               upload-file-title="预审请示"
-                                              :upload-url="baseApiUrl + '/file/upload'"
-                                              :upload-headers="{ Authorization: 'Bearer ' + getToken() }"
                                             ></roc-pdf-file-upload>
                                           </el-form-item>
                                         </el-col>
@@ -1430,8 +1418,6 @@
                                               key="ROCPDFFILEUPLOADDEVPARTYPRETRIALAPPROVALRECORDKEY"
                                               v-model="formObj.formModel.devPartyPreTrialApprovalRecord"
                                               upload-file-title="基层党委预审会议记录"
-                                              :upload-url="baseApiUrl + '/file/upload'"
-                                              :upload-headers="{ Authorization: 'Bearer ' + getToken() }"
                                             ></roc-pdf-file-upload>
                                           </el-form-item>
                                         </el-col>
@@ -1487,8 +1473,6 @@
                                               key="ROCPDFFILEUPLOADSOLICITOPINIONSRECORDKEY"
                                               v-model="formObj.formModel.solicitOpinionsRecord"
                                               upload-file-title="征求意见情况的材料"
-                                              :upload-url="baseApiUrl + '/file/upload'"
-                                              :upload-headers="{ Authorization: 'Bearer ' + getToken() }"
                                             ></roc-pdf-file-upload>
                                           </el-form-item>
                                         </el-col>
@@ -1505,7 +1489,7 @@
                               :style="{height: ((innerWidth > 1200) ? '52px' : '98px'), marginTop: ((innerWidth > 1200) ? '-52px' : '-98px')}"
                             ></div>
                           </el-col>
-                          
+
                           <!-- 16 《中国共产党入党志愿书》 -->
                           <el-col :span="24">
                             <div class="roc-tabpane-step-item">
@@ -1544,8 +1528,6 @@
                                               key="ROCPDFFILEUPLOADVOLUNTEERRECORDKEY"
                                               v-model="formObj.formModel.volunteerRecord"
                                               upload-file-title="《中国共产党入党志愿书》"
-                                              :upload-url="baseApiUrl + '/file/upload'"
-                                              :upload-headers="{ Authorization: 'Bearer ' + getToken() }"
                                             ></roc-pdf-file-upload>
                                           </el-form-item>
                                         </el-col>
@@ -1758,8 +1740,6 @@
                                               key="ROCPDFFILEUPLOADBRANCHASSEMBLYRECORDKEY"
                                               v-model="formObj.formModel.branchAssemblyRecord"
                                               upload-file-title="支部大会的会议记录"
-                                              :upload-url="baseApiUrl + '/file/upload'"
-                                              :upload-headers="{ Authorization: 'Bearer ' + getToken() }"
                                             ></roc-pdf-file-upload>
                                           </el-form-item>
                                         </el-col>
@@ -1818,8 +1798,6 @@
                                               key="ROCPDFFILEUPLOADCOMMUNISTPREPMEMBERRECORDKEY"
                                               v-model="formObj.formModel.communistPrepMemberRecord"
                                               upload-file-title="审批请示材料"
-                                              :upload-url="baseApiUrl + '/file/upload'"
-                                              :upload-headers="{ Authorization: 'Bearer ' + getToken() }"
                                             ></roc-pdf-file-upload>
                                           </el-form-item>
                                         </el-col>
@@ -1895,8 +1873,6 @@
                                               key="ROCPDFFILEUPLOADPREPPARTYAPPROVALMEETRECORDKEY"
                                               v-model="formObj.formModel.prepPartyApprovalMeetRecord"
                                               upload-file-title="基层党委审批会议记录、会议纪要"
-                                              :upload-url="baseApiUrl + '/file/upload'"
-                                              :upload-headers="{ Authorization: 'Bearer ' + getToken() }"
                                             ></roc-pdf-file-upload>
                                           </el-form-item>
                                         </el-col>
@@ -1932,8 +1908,6 @@
                                               key="ROCPDFFILEUPLOADPREPPARTYAPPROVALRECORDKEY"
                                               v-model="formObj.formModel.prepPartyApprovalRecord"
                                               upload-file-title="批复材料"
-                                              :upload-url="baseApiUrl + '/file/upload'"
-                                              :upload-headers="{ Authorization: 'Bearer ' + getToken() }"
                                             ></roc-pdf-file-upload>
                                           </el-form-item>
                                         </el-col>
@@ -2054,8 +2028,6 @@
                                               key="ROCPDFFILEUPLOADPREPPARTYEDUREGISTRECORDKEY"
                                               v-model="formObj.formModel.prepPartyEduRegistRecord"
                                               upload-file-title="《预备党员培养考察教育登记表》"
-                                              :upload-url="baseApiUrl + '/file/upload'"
-                                              :upload-headers="{ Authorization: 'Bearer ' + getToken() }"
                                             ></roc-pdf-file-upload>
                                           </el-form-item>
                                         </el-col>
@@ -2111,8 +2083,6 @@
                                               key="ROCPDFFILEUPLOADREGULARAPPLICATIONRECORDKEY"
                                               v-model="formObj.formModel.regularApplicationRecord"
                                               upload-file-title="转正申请书："
-                                              :upload-url="baseApiUrl + '/file/upload'"
-                                              :upload-headers="{ Authorization: 'Bearer ' + getToken() }"
                                             ></roc-pdf-file-upload>
                                           </el-form-item>
                                         </el-col>
@@ -2200,8 +2170,6 @@
                                               key="ROCPDFFILEUPLOADPREPPARTYPUBLICOPINIONRECORDKEY"
                                               v-model="formObj.formModel.prepPartyPublicOpinionRecord"
                                               upload-file-title="征求意见的谈话记录"
-                                              :upload-url="baseApiUrl + '/file/upload'"
-                                              :upload-headers="{ Authorization: 'Bearer ' + getToken() }"
                                             ></roc-pdf-file-upload>
                                           </el-form-item>
                                         </el-col>
@@ -2260,8 +2228,6 @@
                                               key="ROCPDFFILEUPLOADPARTYMEETINGRECORDKEY"
                                               v-model="formObj.formModel.partyMeetingRecord"
                                               upload-file-title="支部大会的会议记录"
-                                              :upload-url="baseApiUrl + '/file/upload'"
-                                              :upload-headers="{ Authorization: 'Bearer ' + getToken() }"
                                             ></roc-pdf-file-upload>
                                           </el-form-item>
                                         </el-col>
@@ -2297,8 +2263,6 @@
                                               key="ROCPDFFILEUPLOADPARTYPUBLICITYRECORDKEY"
                                               v-model="formObj.formModel.partyPublicityRecord"
                                               upload-file-title="公示材料"
-                                              :upload-url="baseApiUrl + '/file/upload'"
-                                              :upload-headers="{ Authorization: 'Bearer ' + getToken() }"
                                             ></roc-pdf-file-upload>
                                           </el-form-item>
                                         </el-col>
@@ -2357,8 +2321,6 @@
                                               key="ROCPDFFILEUPLOADPARTYAPPROVERECORDKEY"
                                               v-model="formObj.formModel.partyApproveRecord"
                                               upload-file-title="审批请示材料"
-                                              :upload-url="baseApiUrl + '/file/upload'"
-                                              :upload-headers="{ Authorization: 'Bearer ' + getToken() }"
                                             ></roc-pdf-file-upload>
                                           </el-form-item>
                                         </el-col>
@@ -2434,8 +2396,6 @@
                                               key="ROCPDFFILEUPLOADPARTYGRASSROOTSMEETRECORDKEY"
                                               v-model="formObj.formModel.partyGrassrootsMeetRecord"
                                               upload-file-title="基层党委审批会议记录、会议纪要"
-                                              :upload-url="baseApiUrl + '/file/upload'"
-                                              :upload-headers="{ Authorization: 'Bearer ' + getToken() }"
                                             ></roc-pdf-file-upload>
                                           </el-form-item>
                                         </el-col>
@@ -2471,8 +2431,6 @@
                                               key="ROCPDFFILEUPLOADPARTYGRASSROOTSAPPROVERECORDKEY"
                                               v-model="formObj.formModel.partyGrassrootsApproveRecord"
                                               upload-file-title="批复材料"
-                                              :upload-url="baseApiUrl + '/file/upload'"
-                                              :upload-headers="{ Authorization: 'Bearer ' + getToken() }"
                                             ></roc-pdf-file-upload>
                                           </el-form-item>
                                         </el-col>
@@ -2560,8 +2518,27 @@ export default {
     return {
       // 性别选项列表
       sexOptions: [],
+      // 学历选项列表
+      educationOptions: [],
       formObj: {
         formModel: {
+          name: undefined, // 姓名
+          sex: undefined, // 性别
+          nation: undefined, // 民族
+          birthday: undefined, // 出生年月
+          place: undefined, // 籍贯
+          education: undefined, // 学历
+          addTeamTime: undefined, // 入团时间
+          workJob: undefined, // 单位、职务或职务
+          workTime: undefined, // 参加工作时间
+          cardNo: undefined, // 居民身份证号码
+          address: undefined, // 现居地
+          addressList: [], // 现居地数组
+          detailedAddress: undefined, // 详细街道地址
+          resume: undefined, // 本人简历（包括学历）
+          other: undefined, // 其他情况
+          personPhoto: undefined, // 两寸正面免冠照片
+          remark: undefined, // 备注
           checkList: [],
           selected: []
         },
@@ -2685,7 +2662,8 @@ export default {
      * 页面确定按钮事件
      */
     handlePageSubmitClick() {
-      this.$emit("page-submit", 'LIST');
+      console.log('this.formObj.formModel===', this.formObj.formModel);
+      // this.$emit("page-submit", 'LIST');
     },
     /**
      * 页面取消按钮事件
@@ -2699,6 +2677,41 @@ export default {
         }
       };
       this.$emit("page-close", 'LIST');
+    },
+    /**
+     * 获取上传是否成功
+     */
+    getRocPdfUploadSuccess(param) {
+      if (!param) {
+        return 0;
+      }
+
+      if (param === 'ROCPDFUPLOADSELECT') {
+        return 60;
+      }
+
+      return 115;
+    },
+    /**
+     * 获取节点纵向线的高度
+     * @innerWidth [String] 页面当前可视宽度
+     * @stepitemObj [Object] 当前节点文件上传字段
+     * @defaultValueObj [Object] {defaultHeight, noDefaultHeight,defaultMarginTop, noDefaultMarginTop}
+     */
+    getNodeTabpaneStepTailStyle(innerWidth, stepitemObj, defaultValueObj) {
+      // 默认
+      if (innerWidth > 1200) {
+        return {
+          height: '64px',
+          marginTop: '-64px'
+        };
+      }
+
+      // 非默认
+      return {
+        height: '122px',
+        marginTop: '-122px'
+      };
     }
   }
 }

src/views/PartyBuildingMgr/FullPartyMember/FullPartyMemberIndex.vue

@@ -3,7 +3,7 @@
  * @Author: Rockery
  * @Date: 2021-12-10 10:39:07
  * @LastEditors: Rockery
- * @LastEditTime: 2021-12-20 16:02:38
+ * @LastEditTime: 2021-12-22 17:49:16
  * @FilePath: \party_construct_web\src\views\PartyBuildingMgr\FullPartyMember\FullPartyMemberIndex.vue
  * @Copyright: Copyright (c) 2016~2021 Rockery(1113269755@qq.com)
 -->
@@ -250,6 +250,8 @@
       :visible.sync="orgRelationChangeObj.open"
       width="700px"
       append-to-body
+      :destroy-on-close="true"
+      :close-on-click-modal="false"
       class="orgrelationchange-dialog"
     >
       <el-form
@@ -297,49 +299,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="相关材料：" prop="phone" class="formitem-attachment">
-              <el-upload
-                ref="relatedMaterialsUploadRef"
-                :limit="1"
-                accept=".pdf"
-                :auto-upload="false"
-                :show-file-list="true"
-                :action="relatedMaterialsUpload.url"
-                :headers="relatedMaterialsUpload.headers"
-                :before-upload="handleBeforeUpload"
-                :on-success="handleUploadOnsuccess"
-                :on-change="handleUploadOnchange"
-                :on-remove="handleUploadOnRemove"
-                :on-exceed="handleUploadOnExceed"
-                class="formitem-attachment-fileupload"
-              >
-                <div class="formitem-attachment-fileupload-content">
-                  <i class="el-icon-plus" />
-                  上传文件，格式：PDF
-                </div>
-              </el-upload>
-              <div
-                v-if="relatedMaterialsUpload.isUploadSuccess"
-                class="fl formitem-attachment-addr"
-                @click="handleRelatedMaterialsUploadUrlClick"
-              >
-                <div>文件上传成功地址：</div>
-                <div>{{ orgRelationChangeObj.form.bannerUrl }}</div>
-              </div>
-              <el-button
-                v-if="relatedMaterialsUpload.isSelect && !relatedMaterialsUpload.isUploadSuccess"
-                type="primary"
-                size="small"
-                class="fl"
-                @click="submitRelatedMaterialsUpload"
-              >上传文件</el-button>
-              <el-button
-                v-if="relatedMaterialsUpload.isSelect"
-                type="info"
-                size="small"
-                class="fl"
-                @click="removeRelatedMaterialsUpload"
-              >移除文件</el-button>
+            <el-form-item label="相关材料：" prop="attachment">
+              <roc-pdf-file-upload
+                key="ROCPDFFILEUPLOADFULLPARTYMEMBERATTACHMENTKEY"
+                v-model="orgRelationChangeObj.form.attachment"
+                upload-file-title="相关材料"
+              ></roc-pdf-file-upload>
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -356,17 +321,10 @@
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="orgRelationChangeSubmitForm">确 定</el-button>
-        <el-button @click="orgRelationChangeCancelClick">取 消</el-button>
+        <el-button type="rocpartyprimarybtn" @click="orgRelationChangeSubmitForm">确 定</el-button>
+        <el-button type="rocpartyprimaryplainbtn" @click="orgRelationChangeCancelClick">取 消</el-button>
       </div>
     </el-dialog>
-
-    <roc-vue-pdf-dialog
-      v-if="pdfDialogVisible"
-      :visible.sync="pdfDialogVisible"
-      pdfUrl="/file-api/statics/2021/12/13/6085efe9-74e1-4444-b47a-5c3533ec6901.pdf"
-      @close="handlePdfCloseClick"
-    ></roc-vue-pdf-dialog>
   </div>
 </template>
 
@@ -381,7 +339,7 @@ import {
 export default {
   name: "Fullpartymember",
   components: {
-    'roc-vue-pdf-dialog': () => import('@/components/RocVuePdfDialog'),
+    'roc-pdf-file-upload': () => import('@/components/RocPdfFileUpload'),
     'update-party-develop': () => import('@/components/UpdatePartyDevelop')
   },
   data() {
@@ -412,15 +370,7 @@ export default {
 
         }
       },
-      orgRelationChangeTypeOptions: [],
-      relatedMaterialsUpload: {
-        isSelect: false,
-        isUploadSuccess: false,
-        isOnProgress: false,
-        url: `${this.baseApiUrl}/file/upload`,
-        headers: { Authorization: 'Bearer ' + this.getToken() }
-      },
-      pdfDialogVisible: false
+      orgRelationChangeTypeOptions: []
     };
   },
   created() {
@@ -497,8 +447,15 @@ export default {
     /**
      * 转入按钮事件
      */
-    handleTransferInClick() {
+    async handleTransferInClick() {
+      // 初始化数据
+      this.orgRelationChangeObj.form = {};
+      this.resetForm("orgRelationChangeFormRef");
 
+      await this.getSubOptions();
+
+      // 显示对话框
+      this.orgRelationChangeObj.open = true;
     },
     /**
      * 立即处理按钮事件
@@ -517,141 +474,22 @@ export default {
      */
     async handleOrgRelationChangeClick() {
       await this.getSubOptions();
-
-      this.relatedMaterialsUpload = {
-        ...this.relatedMaterialsUpload,
-        isSelect: false,
-        isUploadSuccess: false
-      };
       this.orgRelationChangeObj.open = true;
     },
     /**
      * 组织关系变更对话框确定按钮事件
      */
     orgRelationChangeSubmitForm() {
+      console.log('orgRelationChangeSubmitForm===', this.orgRelationChangeObj.form);
     },
     /**
      * 组织关系变更对话框取消按钮事件
      */
     orgRelationChangeCancelClick() {
       this.orgRelationChangeObj.open = false;
-      this.relatedMaterialsUpload = {
-        ...this.relatedMaterialsUpload,
-        isSelect: false,
-        isUploadSuccess: false,
-        isOnProgress: false
-      };
       this.orgRelationChangeObj.form = {};
       this.resetForm("orgRelationChangeFormRef");
     },
-    /**
-     * 相关材料PDF文件上传url点击事件
-     */
-    handleRelatedMaterialsUploadUrlClick() {
-      this.pdfDialogVisible = true;
-    },
-    /**
-     * 相关材料PDF文件上传预处理
-     */
-    handleBeforeUpload(file) {
-      if (file.type.indexOf('application/pdf') === -1) {
-        this.$refs.relatedMaterialsUploadRef.clearFiles();
-        this.msgError('文件格式错误，请上传类型格式为PDF的文件！');
-        return;
-      }
-    },
-    /**
-     * 相关材料PDF文件上传成功处理
-     */
-    handleUploadOnsuccess(response, file, fileList) {
-      // 校验封面图片是否上传成功
-      if (response.code !== 200) {
-        this.$refs.relatedMaterialsUploadRef?.clearFiles?.();
-        this.relatedMaterialsUpload.isSelect = false;
-        this.relatedMaterialsUpload.isUploadSuccess = false;
-        this.msgError('上传PDF文件失败，请重新选择PDF文件上传！');
-        return;
-      }
-
-      // 绑定封面图片数据
-      this.orgRelationChangeObj.form.bannerUrl = response?.data?.url;
-      this.relatedMaterialsUpload.isUploadSuccess = true;
-
-      // 判断是否继续操作
-      if (this.relatedMaterialsUpload.isOnProgress) {
-        this.relatedMaterialsUpload.isOnProgress = false;
-        this.$confirm(`封面图片上传成功，是否继续${(this.operationTypeByForm === 'SAVE') ? '保存' : ((this.operationTypeByForm === 'RELEASE') ? '发布' : '预览')}数据操作？`, '提示', {
-          confirmButtonText: '确定 ',
-          cancelButtonText: '取消 ',
-          type: 'info'
-        }).then(() => {
-          this.handleBannerSubmitAddEditClick(this.operationTypeByForm);
-        }).catch(() => {
-          this.msgInfo('取消了继续保存数据操作！');
-        });
-      } else {
-        this.$alert('上传成功！', '上传结果', { dangerouslyUseHTMLString: true });
-      }
-    },
-    /**
-     * 相关材料PDF文件状态改变
-     */
-    handleUploadOnchange(file, fileList) {
-      if (file.status === 'ready') {
-        if (((file.raw || {}).type || '').indexOf('application/pdf') === -1) {
-          this.$refs.relatedMaterialsUploadRef.clearFiles();
-          this.relatedMaterialsUpload.isSelect = false;
-          this.msgError('文件格式错误，请上传类型格式为PDF的文件！');
-          return;
-        }
-        this.relatedMaterialsUpload.isSelect = true;
-        this.relatedMaterialsUpload.isUploadSuccess = false;
-      }
-    },
-    /**
-     * 提交上传相关材料PDF文件
-     */
-    submitRelatedMaterialsUpload() {
-      if (!this.relatedMaterialsUpload.isSelect) { return; }
-      this.$confirm('确定上传操作吗？', '提示', {
-        confirmButtonText: '确定 ',
-        cancelButtonText: '取消 ',
-        type: 'info'
-      }).then(() => {
-        this.$refs.relatedMaterialsUploadRef?.submit?.();
-      }).catch(() => {
-        this.msgInfo('您已取消上传操作！');
-      });
-    },
-    /**
-     * 移除选择相关材料PDF文件
-     */
-    removeRelatedMaterialsUpload() {
-      this.orgRelationChangeObj.form.bannerUrl = '';
-      this.$refs.relatedMaterialsUploadRef.clearFiles();
-      this.relatedMaterialsUpload.isUploadSuccess = false;
-      this.relatedMaterialsUpload.isSelect = false;
-    },
-    /**
-     * 相关材料PDF文件列表移除文件时的钩子
-     */
-    handleUploadOnRemove(file, fileList) {
-      this.orgRelationChangeObj.form.bannerUrl = '';
-      this.relatedMaterialsUpload.isUploadSuccess = false;
-      this.relatedMaterialsUpload.isSelect = false;
-    },
-    /**
-     * 相关材料PDF文件超出个数限制时的钩子
-     */
-    handleUploadOnExceed(files, fileList) {
-      this.msgWarning(`只允许上传单个相关材料PDF文件`);
-    },
-    /**
-     * PDF文件预览对话框关闭事件
-     */
-    handlePdfCloseClick(visible = false) {
-      this.pdfDialogVisible = visible;
-    },
     /**
      * 新增页面保存按钮事件
      */

vue.config.js

@@ -41,11 +41,11 @@ module.exports = {
           ['^' + process.env.VUE_APP_BASE_API]: ''
         }
       },
-      [process.env.VUE_APP_FILE_API]: {
+      [process.env.VUE_APP_FILE_VIEW_API]: {
         target: `http://172.16.90.8:9300`,
         changeOrigin: true,
         pathRewrite: {
-          ['^' + process.env.VUE_APP_FILE_API]: ''
+          ['^' + process.env.VUE_APP_FILE_VIEW_API]: ''
         }
       }
     },