Prechádzať zdrojové kódy

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

Rockery 3 rokov pred
rodič
commit
a90c098140
1 zmenil súbory, kde vykonal 813 pridanie a 39 odobranie
  1. 813 39
      src/components/UpdatePartyDevelop/index.vue

+ 813 - 39
src/components/UpdatePartyDevelop/index.vue

@@ -3,7 +3,7 @@
  * @Author: Rockery
  * @Date: 2021-12-15 17:54:05
  * @LastEditors: Rockery
- * @LastEditTime: 2021-12-16 18:06:40
+ * @LastEditTime: 2021-12-17 18:15:28
  * @FilePath: \party_construct_web\src\components\UpdatePartyDevelop\index.vue
  * @Copyright: Copyright (c) 2016~2021 Rockery(1113269755@qq.com)
 -->
@@ -348,7 +348,7 @@
                     <el-col :span="24">
                       <div class="roc-tabpane-head">
                         <div class="tabpane-head-left">
-                          <div>一</div>
+                          <div class="tabpane-head-left-title">一</div>
                         </div>
                         <div class="tabpane-head-right">申请入党</div>
                       </div>
@@ -369,12 +369,509 @@
                                   <el-col :span="24">
                                     <div class="step-item-right-title">入党申请书</div>
                                     <div class="step-item-right-form">
-                                      <el-row :gutter="10">
+                                      <el-row :gutter="20">
                                         <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
                                           <el-form-item
                                             label="递交入党申请书时间:"
                                             prop="dateOfBirth"
                                             label-width="141px"
+                                          >
+                                            <el-date-picker
+                                              v-model="formObj.formModel.dateOfBirth"
+                                              type="date"
+                                              clearable
+                                              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="dateOfBirth"
+                                            label-width="96px"
+                                          >
+                                            <el-upload
+                                              ref="descFileMaterialsUploadRef"
+                                              :limit="1"
+                                              accept=".pdf"
+                                              :auto-upload="false"
+                                              :show-file-list="true"
+                                              :action="descFileMaterialsUpload.url"
+                                              :headers="descFileMaterialsUpload.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="descFileMaterialsUpload.isUploadSuccess"
+                                              class="fl formitem-attachment-addr"
+                                              @click="handleDescFileMaterialsUploadUrlClick"
+                                            >
+                                              <div>文件上传成功地址:</div>
+                                              <div>{{ formObj.formModel.bannerUrl }}</div>
+                                            </div>
+                                            <el-button
+                                              v-if="descFileMaterialsUpload.isSelect && !descFileMaterialsUpload.isUploadSuccess"
+                                              type="primary"
+                                              size="small"
+                                              @click="submitDescFileMaterialsUpload"
+                                            >上传文件</el-button>
+                                            <el-button
+                                              v-if="descFileMaterialsUpload.isSelect"
+                                              type="info"
+                                              size="small"
+                                              @click="removeDescFileMaterialsUpload"
+                                            >移除文件</el-button>
+                                          </el-form-item>
+                                        </el-col>
+                                      </el-row>
+                                    </div>
+                                  </el-col>
+                                </el-row>
+                              </div>
+                            </div>
+                          </el-col>
+                          <el-col :span="24">
+                            <div
+                              :class="innerWidth > 1200 ? 'roc-tabpane-step-first_default': 'roc-tabpane-step-first_nodefault'"
+                            ></div>
+                          </el-col>
+                          <!-- 2 党组织派人与入党申请人谈话的记录 -->
+                          <el-col :span="24">
+                            <!-- 步骤1 -->
+                            <div class="roc-tabpane-step-item">
+                              <div class="step-item-left">2</div>
+                              <div class="step-item-right">
+                                <el-row>
+                                  <el-col :span="24">
+                                    <div class="step-item-right-title">党组织派人与入党申请人谈话的记录</div>
+                                    <div class="step-item-right-form">
+                                      <el-row :gutter="20">
+                                        <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
+                                          <el-form-item
+                                            label="组织派人谈话时间:"
+                                            prop="dateOfBirth"
+                                            label-width="126px"
+                                          >
+                                            <el-date-picker
+                                              v-model="formObj.formModel.dateOfBirth"
+                                              type="date"
+                                              clearable
+                                              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="dateOfBirth"
+                                            label-width="96px"
+                                          >
+                                            <el-upload
+                                              ref="descFileMaterialsUploadRef"
+                                              :limit="1"
+                                              accept=".pdf"
+                                              :auto-upload="false"
+                                              :show-file-list="true"
+                                              :action="descFileMaterialsUpload.url"
+                                              :headers="descFileMaterialsUpload.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="descFileMaterialsUpload.isUploadSuccess"
+                                              class="fl formitem-attachment-addr"
+                                              @click="handleDescFileMaterialsUploadUrlClick"
+                                            >
+                                              <div>文件上传成功地址:</div>
+                                              <div>{{ formObj.formModel.bannerUrl }}</div>
+                                            </div>
+                                            <el-button
+                                              v-if="descFileMaterialsUpload.isSelect && !descFileMaterialsUpload.isUploadSuccess"
+                                              type="primary"
+                                              size="small"
+                                              @click="submitDescFileMaterialsUpload"
+                                            >上传文件</el-button>
+                                            <el-button
+                                              v-if="descFileMaterialsUpload.isSelect"
+                                              type="info"
+                                              size="small"
+                                              @click="removeDescFileMaterialsUpload"
+                                            >移除文件</el-button>
+                                          </el-form-item>
+                                        </el-col>
+                                      </el-row>
+                                    </div>
+                                  </el-col>
+                                </el-row>
+                              </div>
+                            </div>
+                          </el-col>
+                          <el-col :span="24">
+                            <div
+                              :class="innerWidth > 1200 ? 'roc-tabpane-step-second_default': 'roc-tabpane-step-second_nodefault'"
+                            ></div>
+                          </el-col>
+                          <!-- 3 身份证或户口本复印件 -->
+                          <el-col :span="24">
+                            <!-- 步骤1 -->
+                            <div class="roc-tabpane-step-item">
+                              <div class="step-item-left">3</div>
+                              <div class="step-item-right">
+                                <el-row>
+                                  <el-col :span="24">
+                                    <div class="step-item-right-title">身份证或户口本复印件</div>
+                                    <div class="step-item-right-form">
+                                      <el-row :gutter="20">
+                                        <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
+                                          <el-form-item
+                                            label="身份证或户口本:"
+                                            prop="dateOfBirth"
+                                            label-width="116px"
+                                          >
+                                            <el-upload
+                                              ref="descFileMaterialsUploadRef"
+                                              :limit="1"
+                                              accept=".pdf"
+                                              :auto-upload="false"
+                                              :show-file-list="true"
+                                              :action="descFileMaterialsUpload.url"
+                                              :headers="descFileMaterialsUpload.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="descFileMaterialsUpload.isUploadSuccess"
+                                              class="fl formitem-attachment-addr"
+                                              @click="handleDescFileMaterialsUploadUrlClick"
+                                            >
+                                              <div>文件上传成功地址:</div>
+                                              <div>{{ formObj.formModel.bannerUrl }}</div>
+                                            </div>
+                                            <el-button
+                                              v-if="descFileMaterialsUpload.isSelect && !descFileMaterialsUpload.isUploadSuccess"
+                                              type="primary"
+                                              size="small"
+                                              @click="submitDescFileMaterialsUpload"
+                                            >上传文件</el-button>
+                                            <el-button
+                                              v-if="descFileMaterialsUpload.isSelect"
+                                              type="info"
+                                              size="small"
+                                              @click="removeDescFileMaterialsUpload"
+                                            >移除文件</el-button>
+                                          </el-form-item>
+                                        </el-col>
+                                      </el-row>
+                                    </div>
+                                  </el-col>
+                                </el-row>
+                              </div>
+                            </div>
+                          </el-col>
+                          <el-col :span="24">
+                            <div class="roc-tabpane-step-third_default"></div>
+                          </el-col>
+                        </el-row>
+                      </div>
+                    </el-col>
+                  </el-row>
+                </div>
+              </el-tab-pane>
+              <el-tab-pane label="二、入党积极分子的确定和考察" name="POSITIVE">
+                <div class="roc-tabpane">
+                  <el-row>
+                    <el-col :span="24">
+                      <div class="roc-tabpane-head">
+                        <div class="tabpane-head-left">
+                          <div class="tabpane-head-left-title">二</div>
+                        </div>
+                        <div class="tabpane-head-right">入党积极分子的确定和培养</div>
+                      </div>
+                    </el-col>
+                    <el-col :span="24">
+                      <div class="roc-tabpane-line"></div>
+                    </el-col>
+                    <el-col :span="24">
+                      <div class="roc-tabpane-step">
+                        <el-row>
+                          <!-- 4 党员(群团组织)推荐入党积极分子登记表 -->
+                          <el-col :span="24">
+                            <!-- 步骤1 -->
+                            <div class="roc-tabpane-step-item">
+                              <div class="step-item-left">4</div>
+                              <div class="step-item-right">
+                                <el-row>
+                                  <el-col :span="24">
+                                    <div class="step-item-right-title">党员(群团组织)推荐入党积极分子登记表</div>
+                                    <div class="step-item-right-form">
+                                      <el-row :gutter="20">
+                                        <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
+                                          <el-form-item
+                                            label="推荐人:"
+                                            prop="dateOfBirth"
+                                            label-width="65px"
+                                            class="step-form-item"
+                                          >
+                                            <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="dateOfBirth"
+                                            label-width="96px"
+                                            class="step-form-item"
+                                          >
+                                            <el-upload
+                                              ref="descFileMaterialsUploadRef"
+                                              :limit="1"
+                                              accept=".pdf"
+                                              :auto-upload="false"
+                                              :show-file-list="true"
+                                              :action="descFileMaterialsUpload.url"
+                                              :headers="descFileMaterialsUpload.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="descFileMaterialsUpload.isUploadSuccess"
+                                              class="fl formitem-attachment-addr"
+                                              @click="handleDescFileMaterialsUploadUrlClick"
+                                            >
+                                              <div>文件上传成功地址:</div>
+                                              <div>{{ formObj.formModel.bannerUrl }}</div>
+                                            </div>
+                                            <el-button
+                                              v-if="descFileMaterialsUpload.isSelect && !descFileMaterialsUpload.isUploadSuccess"
+                                              type="primary"
+                                              size="small"
+                                              @click="submitDescFileMaterialsUpload"
+                                            >上传文件</el-button>
+                                            <el-button
+                                              v-if="descFileMaterialsUpload.isSelect"
+                                              type="info"
+                                              size="small"
+                                              @click="removeDescFileMaterialsUpload"
+                                            >移除文件</el-button>
+                                          </el-form-item>
+                                        </el-col>
+                                        <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
+                                          <el-form-item
+                                            label="推荐入党积极分子时间:"
+                                            prop="dateOfBirth"
+                                            label-width="161px"
+                                            class="step-form-item"
+                                          >
+                                            <el-date-picker
+                                              v-model="formObj.formModel.dateOfBirth"
+                                              type="date"
+                                              clearable
+                                              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="dateOfBirth"
+                                            label-width="171px"
+                                            class="step-form-item"
+                                          >
+                                            <el-upload
+                                              ref="descFileMaterialsUploadRef"
+                                              :limit="1"
+                                              accept=".pdf"
+                                              :auto-upload="false"
+                                              :show-file-list="true"
+                                              :action="descFileMaterialsUpload.url"
+                                              :headers="descFileMaterialsUpload.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="descFileMaterialsUpload.isUploadSuccess"
+                                              class="fl formitem-attachment-addr"
+                                              @click="handleDescFileMaterialsUploadUrlClick"
+                                            >
+                                              <div>文件上传成功地址:</div>
+                                              <div>{{ formObj.formModel.bannerUrl }}</div>
+                                            </div>
+                                            <el-button
+                                              v-if="descFileMaterialsUpload.isSelect && !descFileMaterialsUpload.isUploadSuccess"
+                                              type="primary"
+                                              size="small"
+                                              @click="submitDescFileMaterialsUpload"
+                                            >上传文件</el-button>
+                                            <el-button
+                                              v-if="descFileMaterialsUpload.isSelect"
+                                              type="info"
+                                              size="small"
+                                              @click="removeDescFileMaterialsUpload"
+                                            >移除文件</el-button>
+                                          </el-form-item>
+                                        </el-col>
+                                      </el-row>
+                                    </div>
+                                  </el-col>
+                                </el-row>
+                              </div>
+                            </div>
+                          </el-col>
+                          <el-col :span="24">
+                            <div
+                              :class="innerWidth > 1200 ? 'roc-tabpane-step-fourth_default': 'roc-tabpane-step-fourth_nodefault'"
+                            ></div>
+                          </el-col>
+                          <!-- 5 确定为入党积极分子的支委会会议记录、备案请示和批复 -->
+                          <el-col :span="24">
+                            <!-- 步骤1 -->
+                            <div class="roc-tabpane-step-item">
+                              <div class="step-item-left">5</div>
+                              <div class="step-item-right">
+                                <el-row>
+                                  <el-col :span="24">
+                                    <div class="step-item-right-title">确定为入党积极分子的支委会会议记录、备案请示和批复</div>
+                                    <div class="step-item-right-form">
+                                      <el-row :gutter="20">
+                                        <el-col :span="24">
+                                          <el-form-item
+                                            label="会议结果:"
+                                            prop="dateOfBirth"
+                                            label-width="76px"
+                                            class="step-form-item"
+                                          >
+                                            <el-radio-group v-model="formObj.formModel.radio">
+                                              <el-radio :label="3">通过</el-radio>
+                                              <el-radio :label="6">未通过</el-radio>
+                                            </el-radio-group>
+                                          </el-form-item>
+                                        </el-col>
+                                        <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
+                                          <el-form-item
+                                            label="支委会会议时间:"
+                                            prop="dateOfBirth"
+                                            label-width="126px"
+                                            class="step-form-item"
+                                          >
+                                            <el-date-picker
+                                              v-model="formObj.formModel.dateOfBirth"
+                                              type="date"
+                                              clearable
+                                              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="dateOfBirth"
+                                            label-width="256px"
+                                            class="step-form-item"
+                                          >
+                                            <el-upload
+                                              ref="descFileMaterialsUploadRef"
+                                              :limit="1"
+                                              accept=".pdf"
+                                              :auto-upload="false"
+                                              :show-file-list="true"
+                                              :action="descFileMaterialsUpload.url"
+                                              :headers="descFileMaterialsUpload.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="descFileMaterialsUpload.isUploadSuccess"
+                                              class="fl formitem-attachment-addr"
+                                              @click="handleDescFileMaterialsUploadUrlClick"
+                                            >
+                                              <div>文件上传成功地址:</div>
+                                              <div>{{ formObj.formModel.bannerUrl }}</div>
+                                            </div>
+                                            <el-button
+                                              v-if="descFileMaterialsUpload.isSelect && !descFileMaterialsUpload.isUploadSuccess"
+                                              type="primary"
+                                              size="small"
+                                              @click="submitDescFileMaterialsUpload"
+                                            >上传文件</el-button>
+                                            <el-button
+                                              v-if="descFileMaterialsUpload.isSelect"
+                                              type="info"
+                                              size="small"
+                                              @click="removeDescFileMaterialsUpload"
+                                            >移除文件</el-button>
+                                          </el-form-item>
+                                        </el-col>
+                                        <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
+                                          <el-form-item
+                                            label="递交备案请示时间:"
+                                            prop="dateOfBirth"
+                                            label-width="126px"
                                             class="step-form-item"
                                           >
                                             <el-date-picker
@@ -383,15 +880,95 @@
                                               clearable
                                               value-format="yyyy-MM-dd"
                                               style="width: 100%;"
-                                              placeholder="请选择入团时间"
+                                              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="入党申请书:"
+                                            label="确定为入党积极分子的备案请示:"
                                             prop="dateOfBirth"
-                                            label-width="96px"
+                                            label-width="216px"
+                                            class="step-form-item"
+                                          >
+                                            <el-upload
+                                              ref="descFileMaterialsUploadRef"
+                                              :limit="1"
+                                              accept=".pdf"
+                                              :auto-upload="false"
+                                              :show-file-list="true"
+                                              :action="descFileMaterialsUpload.url"
+                                              :headers="descFileMaterialsUpload.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="descFileMaterialsUpload.isUploadSuccess"
+                                              class="fl formitem-attachment-addr"
+                                              @click="handleDescFileMaterialsUploadUrlClick"
+                                            >
+                                              <div>文件上传成功地址:</div>
+                                              <div>{{ formObj.formModel.bannerUrl }}</div>
+                                            </div>
+                                            <el-button
+                                              v-if="descFileMaterialsUpload.isSelect && !descFileMaterialsUpload.isUploadSuccess"
+                                              type="primary"
+                                              size="small"
+                                              @click="submitDescFileMaterialsUpload"
+                                            >上传文件</el-button>
+                                            <el-button
+                                              v-if="descFileMaterialsUpload.isSelect"
+                                              type="info"
+                                              size="small"
+                                              @click="removeDescFileMaterialsUpload"
+                                            >移除文件</el-button>
+                                          </el-form-item>
+                                        </el-col>
+                                        <el-col :span="24">
+                                          <el-form-item
+                                            label="批复结果:"
+                                            prop="dateOfBirth"
+                                            label-width="76px"
+                                            class="step-form-item"
+                                          >
+                                            <el-radio-group v-model="formObj.formModel.radio">
+                                              <el-radio :label="3">通过</el-radio>
+                                              <el-radio :label="6">未通过</el-radio>
+                                            </el-radio-group>
+                                          </el-form-item>
+                                        </el-col>
+                                        <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
+                                          <el-form-item
+                                            label="获得批复的时间:"
+                                            prop="dateOfBirth"
+                                            label-width="126px"
+                                            class="step-form-item"
+                                          >
+                                            <el-date-picker
+                                              v-model="formObj.formModel.dateOfBirth"
+                                              type="date"
+                                              clearable
+                                              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="dateOfBirth"
+                                            label-width="186px"
+                                            class="step-form-item"
                                           >
                                             <el-upload
                                               ref="descFileMaterialsUploadRef"
@@ -444,25 +1021,25 @@
                           </el-col>
                           <el-col :span="24">
                             <div
-                              :class="innerWidth > 1200 ? 'roc-tabpane-step-first_default': 'roc-tabpane-step-first_nodefault'"
+                              :class="innerWidth > 1200 ? 'roc-tabpane-step-fifth_default': 'roc-tabpane-step-fifth_nodefault'"
                             ></div>
                           </el-col>
-                          <!-- 2 党组织派人与入党申请人谈话的记录 -->
+                          <!-- 6 《入党积极分子、发展对象培养教育考察登记表》 -->
                           <el-col :span="24">
                             <!-- 步骤1 -->
                             <div class="roc-tabpane-step-item">
-                              <div class="step-item-left">2</div>
+                              <div class="step-item-left">6</div>
                               <div class="step-item-right">
                                 <el-row>
                                   <el-col :span="24">
-                                    <div class="step-item-right-title">党组织派人与入党申请人谈话的记录</div>
+                                    <div class="step-item-right-title">《入党积极分子、发展对象培养教育考察登记表》</div>
                                     <div class="step-item-right-form">
-                                      <el-row :gutter="10">
+                                      <el-row :gutter="20">
                                         <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
                                           <el-form-item
-                                            label="组织派人谈话时间:"
+                                            label="确定为积极分子的时间:"
                                             prop="dateOfBirth"
-                                            label-width="126px"
+                                            label-width="156px"
                                             class="step-form-item"
                                           >
                                             <el-date-picker
@@ -471,15 +1048,16 @@
                                               clearable
                                               value-format="yyyy-MM-dd"
                                               style="width: 100%;"
-                                              placeholder="请选择组织派人谈话时间"
+                                              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="谈话记录:"
+                                            label="培养教育考察登记表:"
                                             prop="dateOfBirth"
-                                            label-width="96px"
+                                            label-width="146px"
+                                            class="step-form-item"
                                           >
                                             <el-upload
                                               ref="descFileMaterialsUploadRef"
@@ -532,25 +1110,109 @@
                           </el-col>
                           <el-col :span="24">
                             <div
-                              :class="innerWidth > 1200 ? 'roc-tabpane-step-second_default': 'roc-tabpane-step-second_nodefault'"
+                              :class="innerWidth > 1200 ? 'roc-tabpane-step-sixth_default': 'roc-tabpane-step-sixth_nodefault'"
                             ></div>
                           </el-col>
-                          <!-- 3 身份证或户口本复印件 -->
+                          <!-- 7 入党积极分子思想汇报与参加短期集中培训的结业证书 -->
                           <el-col :span="24">
                             <!-- 步骤1 -->
                             <div class="roc-tabpane-step-item">
-                              <div class="step-item-left">3</div>
+                              <div class="step-item-left">7</div>
                               <div class="step-item-right">
                                 <el-row>
                                   <el-col :span="24">
-                                    <div class="step-item-right-title">身份证或户口本复印件</div>
+                                    <div class="step-item-right-title">入党积极分子思想汇报与参加短期集中培训的结业证书</div>
                                     <div class="step-item-right-form">
-                                      <el-row :gutter="10">
+                                      <el-row :gutter="20">
                                         <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
                                           <el-form-item
-                                            label="身份证或户口本:"
+                                            label="结业时间:"
                                             prop="dateOfBirth"
-                                            label-width="116px"
+                                            label-width="76px"
+                                            class="step-form-item"
+                                          >
+                                            <el-date-picker
+                                              v-model="formObj.formModel.dateOfBirth"
+                                              type="date"
+                                              clearable
+                                              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="dateOfBirth"
+                                            label-width="76px"
+                                            class="step-form-item"
+                                          >
+                                            <el-upload
+                                              ref="descFileMaterialsUploadRef"
+                                              :limit="1"
+                                              accept=".pdf"
+                                              :auto-upload="false"
+                                              :show-file-list="true"
+                                              :action="descFileMaterialsUpload.url"
+                                              :headers="descFileMaterialsUpload.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="descFileMaterialsUpload.isUploadSuccess"
+                                              class="fl formitem-attachment-addr"
+                                              @click="handleDescFileMaterialsUploadUrlClick"
+                                            >
+                                              <div>文件上传成功地址:</div>
+                                              <div>{{ formObj.formModel.bannerUrl }}</div>
+                                            </div>
+                                            <el-button
+                                              v-if="descFileMaterialsUpload.isSelect && !descFileMaterialsUpload.isUploadSuccess"
+                                              type="primary"
+                                              size="small"
+                                              @click="submitDescFileMaterialsUpload"
+                                            >上传文件</el-button>
+                                            <el-button
+                                              v-if="descFileMaterialsUpload.isSelect"
+                                              type="info"
+                                              size="small"
+                                              @click="removeDescFileMaterialsUpload"
+                                            >移除文件</el-button>
+                                          </el-form-item>
+                                        </el-col>
+                                        <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
+                                          <el-form-item
+                                            label="思想汇报递交时间1:"
+                                            prop="dateOfBirth"
+                                            label-width="136px"
+                                            class="step-form-item"
+                                          >
+                                            <el-date-picker
+                                              v-model="formObj.formModel.dateOfBirth"
+                                              type="date"
+                                              clearable
+                                              value-format="yyyy-MM-dd"
+                                              style="width: 100%;"
+                                              placeholder="请选择思想汇报递交时间1"
+                                            ></el-date-picker>
+                                          </el-form-item>
+                                        </el-col>
+                                        <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
+                                          <el-form-item
+                                            label="思想汇报1:"
+                                            prop="dateOfBirth"
+                                            label-width="86px"
+                                            class="step-form-item"
                                           >
                                             <el-upload
                                               ref="descFileMaterialsUploadRef"
@@ -602,9 +1264,7 @@
                             </div>
                           </el-col>
                           <el-col :span="24">
-                            <div
-                              class="roc-tabpane-step-second_default"
-                            ></div>
+                            <div class="roc-tabpane-step-third_default"></div>
                           </el-col>
                         </el-row>
                       </div>
@@ -612,7 +1272,6 @@
                   </el-row>
                 </div>
               </el-tab-pane>
-              <el-tab-pane label="二、入党积极分子的确定和考察" name="POSITIVE"></el-tab-pane>
               <el-tab-pane label="三、发展对象的确定和考察" name="DEVELOP"></el-tab-pane>
               <el-tab-pane label="四、发展党员的预审" name="PRETRIAL"></el-tab-pane>
               <el-tab-pane label="五、预备党员的接收" name="TAKEOVER"></el-tab-pane>
@@ -956,6 +1615,7 @@ export default {
     .roc-tabpane {
       display: block;
       width: 100%;
+      min-height: 600px;
 
       &-head {
         display: flex;
@@ -969,22 +1629,30 @@ export default {
           justify-content: center;
           width: 94px;
           height: 94px;
-          border: 4px solid #de0010;
+          border: 4px solid #979797;
           border-radius: 50%;
 
-          div {
+          &.is-active {
+            border: 4px solid #de0010;
+          }
+
+          &-title {
             display: flex;
             align-items: center;
             justify-content: center;
             width: 78px;
             height: 78px;
-            background: #de0010;
+            background: #979797;
             border-radius: 50%;
             font-size: 30px;
             font-weight: 800;
             color: #ffffff;
             line-height: 42px;
             letter-spacing: 1px;
+
+            &.is-active {
+              background: #de0010;
+            }
           }
         }
         .tabpane-head-right {
@@ -1002,7 +1670,11 @@ export default {
         margin-left: 46px;
         width: 2px;
         height: 46px;
-        border: 2px solid #de0010;
+        border: 2px solid #979797;
+
+        &.is-active {
+          border: 2px solid #de0010;
+        }
       }
 
       &-step {
@@ -1019,13 +1691,18 @@ export default {
             margin-left: 16px;
             width: 62px;
             height: 62px;
-            border: 2px solid #de0010;
+            border: 2px solid #979797;
             border-radius: 50%;
             font-size: 36px;
             font-weight: 400;
-            color: #de0010;
+            color: #979797;
             line-height: 50px;
             letter-spacing: 1px;
+
+            &.is-active {
+              border: 2px solid #de0010;
+              color: #de0010;
+            }
           }
 
           .step-item-right {
@@ -1045,9 +1722,8 @@ export default {
 
             &-form {
               ::v-deep {
-                .step-form-item {
-                  .el-form-item__label {
-                  }
+                .el-form-item.step-form-item {
+                  margin-bottom: 10px;
                 }
 
                 .el-form-item__label {
@@ -1058,7 +1734,6 @@ export default {
             }
           }
         }
-
         &-first_default,
         &-second_default {
           position: absolute;
@@ -1066,7 +1741,11 @@ export default {
           margin-left: 46px;
           width: 2px;
           height: 64px;
-          border: 2px solid #de0010;
+          border: 2px solid #979797;
+
+          &.is-active {
+            border: 2px solid #de0010;
+          }
         }
 
         &-first_nodefault,
@@ -1076,7 +1755,102 @@ export default {
           margin-left: 46px;
           width: 2px;
           height: 122px;
-          border: 2px solid #de0010;
+          border: 2px solid #979797;
+
+          &.is-active {
+            border: 2px solid #de0010;
+          }
+        }
+
+        &-third_default {
+          position: absolute;
+          margin-top: -64px;
+          margin-left: 46px;
+          width: 2px;
+          height: 165px;
+          border: 2px solid #979797;
+
+          &.is-active {
+            border: 2px solid #de0010;
+          }
+        }
+
+        &-fourth_default {
+          position: absolute;
+          margin-top: -108px;
+          margin-left: 46px;
+          width: 2px;
+          height: 108px;
+          border: 2px solid #979797;
+
+          &.is-active {
+            border: 2px solid #de0010;
+          }
+        }
+
+        &-fourth_nodefault {
+          position: absolute;
+          margin-top: -200px;
+          margin-left: 46px;
+          width: 2px;
+          height: 200px;
+          border: 2px solid #979797;
+
+          &.is-active {
+            border: 2px solid #de0010;
+          }
+        }
+
+        &-fifth_default {
+          position: absolute;
+          margin-top: -257px;
+          margin-left: 46px;
+          width: 2px;
+          height: 257px;
+          border: 2px solid #979797;
+
+          &.is-active {
+            border: 2px solid #de0010;
+          }
+        }
+
+        &-fifth_nodefault {
+          position: absolute;
+          margin-top: -395px;
+          margin-left: 46px;
+          width: 2px;
+          height: 395px;
+          border: 2px solid #979797;
+
+          &.is-active {
+            border: 2px solid #de0010;
+          }
+        }
+
+        &-sixth_default {
+          position: absolute;
+          margin-top: -52px;
+          margin-left: 46px;
+          width: 2px;
+          height: 52px;
+          border: 2px solid #979797;
+
+          &.is-active {
+            border: 2px solid #de0010;
+          }
+        }
+
+        &-sixth_nodefault {
+          position: absolute;
+          margin-top: -97px;
+          margin-left: 46px;
+          width: 2px;
+          height: 97px;
+          border: 2px solid #979797;
+
+          &.is-active {
+            border: 2px solid #de0010;
+          }
         }
       }
     }