|
|
@@ -3,21 +3,13 @@
|
|
|
* @Author: Rockery
|
|
|
* @Date: 2021-12-15 17:54:05
|
|
|
* @LastEditors: Rockery
|
|
|
- * @LastEditTime: 2021-12-27 17:55:03
|
|
|
+ * @LastEditTime: 2021-12-28 18:02:27
|
|
|
* @FilePath: \party_construct_web\src\components\UpdatePartyDevelop\index.vue
|
|
|
* @Copyright: Copyright (c) 2016~2021 Rockery(1113269755@qq.com)
|
|
|
-->
|
|
|
|
|
|
<template>
|
|
|
<div class="updatepartydevelop">
|
|
|
- <div class="updatepartydevelop-head">
|
|
|
- <div class="updatepartydevelop-head-title">
|
|
|
- <div>
|
|
|
- <img :src="require('@/assets/logo/home-main-title-logo.png')" @error="imgViewerOnerror" />
|
|
|
- </div>
|
|
|
- <div>正式党员管理</div>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
<el-form
|
|
|
ref="updatePartyDevelopFormRef"
|
|
|
:model="formObj.formModel"
|
|
|
@@ -95,10 +87,10 @@
|
|
|
|
|
|
<!-- 籍贯 -->
|
|
|
<el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
|
|
|
- <el-form-item label="籍贯：" prop="place">
|
|
|
+ <el-form-item label="籍贯：" prop="placeList">
|
|
|
<area-cascader
|
|
|
type="text"
|
|
|
- v-model="formObj.formModel.place"
|
|
|
+ v-model="formObj.formModel.placeList"
|
|
|
:level="0"
|
|
|
:data="areaDataObj.pca"
|
|
|
separator="-"
|
|
|
@@ -312,6 +304,7 @@
|
|
|
v-model="formObj.formModel.submitAddPartyPageTime"
|
|
|
type="date"
|
|
|
clearable
|
|
|
+ format="yyyy年MM月dd日"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
style="width: 100%;"
|
|
|
placeholder="请选择入团时间"
|
|
|
@@ -365,6 +358,7 @@
|
|
|
v-model="formObj.formModel.partyArrangeTalkTime"
|
|
|
type="date"
|
|
|
clearable
|
|
|
+ format="yyyy年MM月dd日"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
style="width: 100%;"
|
|
|
placeholder="请选择组织派人谈话时间"
|
|
|
@@ -496,6 +490,7 @@
|
|
|
v-model="formObj.formModel.referreTime"
|
|
|
type="date"
|
|
|
clearable
|
|
|
+ format="yyyy年MM月dd日"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
style="width: 100%;"
|
|
|
placeholder="请选择入团时间"
|
|
|
@@ -566,6 +561,7 @@
|
|
|
v-model="formObj.formModel.branchPartyMeetingTime"
|
|
|
type="date"
|
|
|
clearable
|
|
|
+ format="yyyy年MM月dd日"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
style="width: 100%;"
|
|
|
placeholder="请选择组织派人谈话时间"
|
|
|
@@ -597,6 +593,7 @@
|
|
|
v-model="formObj.formModel.submitRecordRequestTime"
|
|
|
type="date"
|
|
|
clearable
|
|
|
+ format="yyyy年MM月dd日"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
style="width: 100%;"
|
|
|
placeholder="请选择组织派人谈话时间"
|
|
|
@@ -641,6 +638,7 @@
|
|
|
v-model="formObj.formModel.replyTime"
|
|
|
type="date"
|
|
|
clearable
|
|
|
+ format="yyyy年MM月dd日"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
style="width: 100%;"
|
|
|
placeholder="请选择获得批复的时间"
|
|
|
@@ -697,6 +695,7 @@
|
|
|
v-model="formObj.formModel.confirmActiveMemberTime"
|
|
|
type="date"
|
|
|
clearable
|
|
|
+ format="yyyy年MM月dd日"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
style="width: 100%;"
|
|
|
placeholder="请选择确定为积极分子的时间"
|
|
|
@@ -755,6 +754,7 @@
|
|
|
v-model="formObj.formModel.courseCompletionTime"
|
|
|
type="date"
|
|
|
clearable
|
|
|
+ format="yyyy年MM月dd日"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
style="width: 100%;"
|
|
|
placeholder="请选择确定为积极分子的时间"
|
|
|
@@ -778,70 +778,48 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
|
|
|
- <!-- 择思想汇报 thoughtReportRecord -->
|
|
|
- <template
|
|
|
- v-for="(item, index) in formObj.formModel.thoughtReportRecord"
|
|
|
+ <!-- 思想汇报 thoughtReportRecord -->
|
|
|
+
|
|
|
+ <el-col
|
|
|
+ v-for="(item, index) in formObj.formModel.thoughtReportRecordList"
|
|
|
+ :key="'THOUGHTREPORTRECORD_' + index"
|
|
|
+ :span="24"
|
|
|
>
|
|
|
- <el-col
|
|
|
- :key="'THOUGHTREPORTRECORD_' + index"
|
|
|
- :span="24"
|
|
|
- >
|
|
|
- <el-row :gutter="20">
|
|
|
- <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
|
|
|
- <el-form-item
|
|
|
- label="思想汇报递交时间1："
|
|
|
- prop="submitTime"
|
|
|
- label-width="136px"
|
|
|
- class="step-form-item"
|
|
|
- >
|
|
|
- <el-date-picker
|
|
|
- v-model="item['submitTime']"
|
|
|
- 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="filePath"
|
|
|
- label-width="86px"
|
|
|
- class="step-form-item"
|
|
|
- >
|
|
|
- <roc-pdf-file-upload
|
|
|
- :key="'ROCPDFFILEUPLOADIDEOLOGICALREPORT1KEY_' + index"
|
|
|
- v-model="item['filePath']"
|
|
|
- upload-file-title="思想汇报"
|
|
|
- ></roc-pdf-file-upload>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- </el-row>
|
|
|
- </el-col>
|
|
|
- <!-- <el-col
|
|
|
- :key="'FILEPATH_' + index"
|
|
|
- :xs="24"
|
|
|
- :sm="24"
|
|
|
- :md="24"
|
|
|
- :lg="12"
|
|
|
- :xl="12"
|
|
|
- >
|
|
|
- <el-form-item
|
|
|
- label="思想汇报1："
|
|
|
- prop="filePath"
|
|
|
- label-width="86px"
|
|
|
- class="step-form-item"
|
|
|
- >
|
|
|
- <roc-pdf-file-upload
|
|
|
- :key="'ROCPDFFILEUPLOADIDEOLOGICALREPORT1KEY_' + index"
|
|
|
- v-model="item['filePath']"
|
|
|
- upload-file-title="思想汇报"
|
|
|
- ></roc-pdf-file-upload>
|
|
|
- </el-form-item>
|
|
|
- </el-col>-->
|
|
|
- </template>
|
|
|
+ <el-row :gutter="20">
|
|
|
+ <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
|
|
|
+ <el-form-item
|
|
|
+ :label="'思想汇报递交时间' + (index + 1) + '：'"
|
|
|
+ prop="submitTime"
|
|
|
+ label-width="156px"
|
|
|
+ class="step-form-item"
|
|
|
+ >
|
|
|
+ <el-date-picker
|
|
|
+ v-model="item['submitTime']"
|
|
|
+ type="date"
|
|
|
+ clearable
|
|
|
+ format="yyyy年MM月dd日"
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
+ style="width: 100%;"
|
|
|
+ :placeholder="'请选择思想汇报递交时间' + (index + 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="'思想汇报' + (index + 1) + '：'"
|
|
|
+ prop="filePath"
|
|
|
+ label-width="106px"
|
|
|
+ class="step-form-item"
|
|
|
+ >
|
|
|
+ <roc-pdf-file-upload
|
|
|
+ :key="'ROCPDFFILEUPLOADIDEOLOGICALREPORT1KEY_' + index"
|
|
|
+ v-model="item['filePath']"
|
|
|
+ :upload-file-title="'思想汇报' + (index + 1)"
|
|
|
+ ></roc-pdf-file-upload>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ </el-col>
|
|
|
<el-col :span="24">
|
|
|
<el-form-item label-width="0px" class="step-form-item">
|
|
|
<div
|
|
|
@@ -863,7 +841,7 @@
|
|
|
<el-col :span="24">
|
|
|
<div
|
|
|
class="roc-tabpane-step-tail"
|
|
|
- :style="getNodeTabpaneStepTailStyle(innerWidth, [formObj.formModel.certificateOfCompletion, formObj.formModel.ideologicalReport1], {defaultHeight: 128, noDefaultHeight: 222,defaultMarginTop: 110, noDefaultMarginTop: 202})"
|
|
|
+ :style="getNodeTabpaneStepTailStyle(innerWidth, [formObj.formModel.certificateOfCompletion], {defaultHeight: 116 + formObj.formModel.thoughtReportRecordList.length * 57, noDefaultHeight: 162 + formObj.formModel.thoughtReportRecordList.length * 103,defaultMarginTop: 96 + formObj.formModel.thoughtReportRecordList.length * 57, noDefaultMarginTop: 142 + formObj.formModel.thoughtReportRecordList.length * 103}, '7', formObj.formModel.thoughtReportRecordList)"
|
|
|
></div>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
@@ -910,6 +888,7 @@
|
|
|
v-model="formObj.formModel.listenToTime"
|
|
|
type="date"
|
|
|
clearable
|
|
|
+ format="yyyy年MM月dd日"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
style="width: 100%;"
|
|
|
placeholder="请选择听取意见时间"
|
|
|
@@ -984,6 +963,7 @@
|
|
|
v-model="formObj.formModel.branchPartyMeetingTime1"
|
|
|
type="date"
|
|
|
clearable
|
|
|
+ format="yyyy年MM月dd日"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
style="width: 100%;"
|
|
|
placeholder="请选择支委会会议时间"
|
|
|
@@ -1034,17 +1014,20 @@
|
|
|
<el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
|
|
|
<el-form-item
|
|
|
label="公示时间："
|
|
|
- prop="publicTime"
|
|
|
+ prop="publicTimeRange"
|
|
|
label-width="76px"
|
|
|
class="step-form-item"
|
|
|
>
|
|
|
<el-date-picker
|
|
|
- v-model="formObj.formModel.publicTime"
|
|
|
- type="date"
|
|
|
+ v-model="formObj.formModel.publicTimeRange"
|
|
|
+ type="daterange"
|
|
|
clearable
|
|
|
+ format="yyyy年MM月dd日"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
style="width: 100%;"
|
|
|
- placeholder="请选择公示时间"
|
|
|
+ range-separator="至"
|
|
|
+ start-placeholder="开始日期"
|
|
|
+ end-placeholder="结束日期"
|
|
|
></el-date-picker>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -1077,6 +1060,7 @@
|
|
|
v-model="formObj.formModel.recordsRequestTime"
|
|
|
type="date"
|
|
|
clearable
|
|
|
+ format="yyyy年MM月dd日"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
style="width: 100%;"
|
|
|
placeholder="请选择备案请示时间"
|
|
|
@@ -1129,6 +1113,7 @@
|
|
|
v-model="formObj.formModel.recordsReplyTime"
|
|
|
type="date"
|
|
|
clearable
|
|
|
+ format="yyyy年MM月dd日"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
style="width: 100%;"
|
|
|
placeholder="请选择备案批复时间"
|
|
|
@@ -1187,6 +1172,7 @@
|
|
|
v-model="formObj.formModel.syntheticalPoliticalTime"
|
|
|
type="date"
|
|
|
clearable
|
|
|
+ format="yyyy年MM月dd日"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
style="width: 100%;"
|
|
|
placeholder="请选择综合性政审时间"
|
|
|
@@ -1278,6 +1264,7 @@
|
|
|
v-model="formObj.formModel.courseCompletionTime1"
|
|
|
type="date"
|
|
|
clearable
|
|
|
+ format="yyyy年MM月dd日"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
style="width: 100%;"
|
|
|
placeholder="请选择结业时间"
|
|
|
@@ -1375,6 +1362,7 @@
|
|
|
v-model="formObj.formModel.checkMeetingTime"
|
|
|
type="date"
|
|
|
clearable
|
|
|
+ format="yyyy年MM月dd日"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
style="width: 100%;"
|
|
|
placeholder="请选择审查会议时间"
|
|
|
@@ -1410,6 +1398,7 @@
|
|
|
v-model="formObj.formModel.reportRequestTime"
|
|
|
type="date"
|
|
|
clearable
|
|
|
+ format="yyyy年MM月dd日"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
style="width: 100%;"
|
|
|
placeholder="请选择上报预审请示时间"
|
|
|
@@ -1485,6 +1474,7 @@
|
|
|
v-model="formObj.formModel.basicReadyCheckMeetingTime"
|
|
|
type="date"
|
|
|
clearable
|
|
|
+ format="yyyy年MM月dd日"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
style="width: 100%;"
|
|
|
placeholder="请选择基层党委预审会议时间"
|
|
|
@@ -1543,6 +1533,7 @@
|
|
|
v-model="formObj.formModel.consultationTime"
|
|
|
type="date"
|
|
|
clearable
|
|
|
+ format="yyyy年MM月dd日"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
style="width: 100%;"
|
|
|
placeholder="请选择征求意见时间"
|
|
|
@@ -1601,6 +1592,7 @@
|
|
|
v-model="formObj.formModel.submitVolunteerBookTime"
|
|
|
type="date"
|
|
|
clearable
|
|
|
+ format="yyyy年MM月dd日"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
style="width: 100%;"
|
|
|
placeholder="请选择递交志愿书时间"
|
|
|
@@ -1636,6 +1628,7 @@
|
|
|
v-model="formObj.formModel.branchPartyAcceptReadyMemberTime"
|
|
|
type="date"
|
|
|
clearable
|
|
|
+ format="yyyy年MM月dd日"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
style="width: 100%;"
|
|
|
placeholder="请选择支委会接收预备党员的时间"
|
|
|
@@ -1655,6 +1648,7 @@
|
|
|
v-model="formObj.formModel.aboutReadyMemberCheckIdeaTime"
|
|
|
type="date"
|
|
|
clearable
|
|
|
+ format="yyyy年MM月dd日"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
style="width: 100%;"
|
|
|
placeholder="请选择关于预备党员基层党委审批意见的时间"
|
|
|
@@ -1666,17 +1660,20 @@
|
|
|
<el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
|
|
|
<el-form-item
|
|
|
label="预备期："
|
|
|
- prop="readyDeadline"
|
|
|
+ prop="readyDeadlineRange"
|
|
|
label-width="56px"
|
|
|
class="step-form-item"
|
|
|
>
|
|
|
<el-date-picker
|
|
|
- v-model="formObj.formModel.readyDeadline"
|
|
|
- type="date"
|
|
|
+ v-model="formObj.formModel.readyDeadlineRange"
|
|
|
+ type="daterange"
|
|
|
clearable
|
|
|
+ format="yyyy年MM月dd日"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
style="width: 100%;"
|
|
|
- placeholder="请选择预备期"
|
|
|
+ range-separator="至"
|
|
|
+ start-placeholder="请选择开始预备期"
|
|
|
+ end-placeholder="请选择结束预备期"
|
|
|
></el-date-picker>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -1693,6 +1690,7 @@
|
|
|
v-model="formObj.formModel.branchPartyConfirmTime"
|
|
|
type="date"
|
|
|
clearable
|
|
|
+ format="yyyy年MM月dd日"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
style="width: 100%;"
|
|
|
placeholder="请选择支委会转正的时间"
|
|
|
@@ -1714,6 +1712,7 @@
|
|
|
v-model="formObj.formModel.confirmBasicPartyCheckIdeaTime"
|
|
|
type="date"
|
|
|
clearable
|
|
|
+ format="yyyy年MM月dd日"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
style="width: 100%;"
|
|
|
placeholder="请选择转正基层党委审批意见的时间"
|
|
|
@@ -1755,6 +1754,7 @@
|
|
|
v-model="formObj.formModel.postponeConfirmMemberParthCheckIdeaTime"
|
|
|
type="date"
|
|
|
clearable
|
|
|
+ format="yyyy年MM月dd日"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
style="width: 100%;"
|
|
|
placeholder="请选择延期转正基层党委审批意见的时间"
|
|
|
@@ -1822,6 +1822,7 @@
|
|
|
v-model="formObj.formModel.branchPartyBigMeetingTime"
|
|
|
type="date"
|
|
|
clearable
|
|
|
+ format="yyyy年MM月dd日"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
style="width: 100%;"
|
|
|
placeholder="请选择支部大会的会议时间"
|
|
|
@@ -1880,6 +1881,7 @@
|
|
|
v-model="formObj.formModel.checkRequestTime"
|
|
|
type="date"
|
|
|
clearable
|
|
|
+ format="yyyy年MM月dd日"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
style="width: 100%;"
|
|
|
placeholder="请选择审批请示时间"
|
|
|
@@ -1955,6 +1957,7 @@
|
|
|
v-model="formObj.formModel.basicPartyCheckMeetingTime"
|
|
|
type="date"
|
|
|
clearable
|
|
|
+ format="yyyy年MM月dd日"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
style="width: 100%;"
|
|
|
placeholder="请选择基层党委审批会议时间"
|
|
|
@@ -1990,6 +1993,7 @@
|
|
|
v-model="formObj.formModel.replyTime1"
|
|
|
type="date"
|
|
|
clearable
|
|
|
+ format="yyyy年MM月dd日"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
style="width: 100%;"
|
|
|
placeholder="请选择批复时间"
|
|
|
@@ -2100,21 +2104,24 @@
|
|
|
<div class="step-item-right-title">《预备党员培养考察教育登记表》</div>
|
|
|
<div class="step-item-right-form">
|
|
|
<el-row :gutter="20">
|
|
|
- <!-- 预备期 -->
|
|
|
+ <!-- 预备期 readyDeadline1 -->
|
|
|
<el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
|
|
|
<el-form-item
|
|
|
label="预备期："
|
|
|
- prop="readyDeadline1"
|
|
|
+ prop="readyDeadline1Range"
|
|
|
label-width="60px"
|
|
|
class="step-form-item"
|
|
|
>
|
|
|
<el-date-picker
|
|
|
- v-model="formObj.formModel.readyDeadline1"
|
|
|
- type="date"
|
|
|
+ v-model="formObj.formModel.readyDeadline1Range"
|
|
|
+ type="daterange"
|
|
|
clearable
|
|
|
+ format="yyyy年MM月dd日"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
style="width: 100%;"
|
|
|
- placeholder="请选择预备期"
|
|
|
+ range-separator="至"
|
|
|
+ start-placeholder="请选择开始预备期"
|
|
|
+ end-placeholder="请选择结束预备期"
|
|
|
></el-date-picker>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -2170,6 +2177,7 @@
|
|
|
v-model="formObj.formModel.submitConfirmBookTime"
|
|
|
type="date"
|
|
|
clearable
|
|
|
+ format="yyyy年MM月dd日"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
style="width: 100%;"
|
|
|
placeholder="请选择转正申请书递交时间"
|
|
|
@@ -2257,6 +2265,7 @@
|
|
|
v-model="formObj.formModel.consultationTime1"
|
|
|
type="date"
|
|
|
clearable
|
|
|
+ format="yyyy年MM月dd日"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
style="width: 100%;"
|
|
|
placeholder="请选择征求意见时间"
|
|
|
@@ -2315,6 +2324,7 @@
|
|
|
v-model="formObj.formModel.branchPartyBigMeetingTime1"
|
|
|
type="date"
|
|
|
clearable
|
|
|
+ format="yyyy年MM月dd日"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
style="width: 100%;"
|
|
|
placeholder="请选择支部大会的会议时间"
|
|
|
@@ -2338,21 +2348,24 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
|
|
|
- <!-- 公示时间 -->
|
|
|
+ <!-- 公示时间 publicTime1 -->
|
|
|
<el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
|
|
|
<el-form-item
|
|
|
label="公示时间："
|
|
|
- prop="publicTime1"
|
|
|
+ prop="publicTime1Range"
|
|
|
label-width="116px"
|
|
|
class="step-form-item"
|
|
|
>
|
|
|
<el-date-picker
|
|
|
- v-model="formObj.formModel.publicTime1"
|
|
|
- type="date"
|
|
|
+ v-model="formObj.formModel.publicTime1Range"
|
|
|
+ type="daterange"
|
|
|
clearable
|
|
|
+ format="yyyy年MM月dd日"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
style="width: 100%;"
|
|
|
- placeholder="请选择公示时间"
|
|
|
+ range-separator="至"
|
|
|
+ start-placeholder="请选择开始公示时间"
|
|
|
+ end-placeholder="请选择结束公示时间"
|
|
|
></el-date-picker>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -2408,6 +2421,7 @@
|
|
|
v-model="formObj.formModel.checkRequestTime1"
|
|
|
type="date"
|
|
|
clearable
|
|
|
+ format="yyyy年MM月dd日"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
style="width: 100%;"
|
|
|
placeholder="请选择审批请示递交时间"
|
|
|
@@ -2483,6 +2497,7 @@
|
|
|
v-model="formObj.formModel.basicPartyCheckMeetingTime1"
|
|
|
type="date"
|
|
|
clearable
|
|
|
+ format="yyyy年MM月dd日"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
style="width: 100%;"
|
|
|
placeholder="请选择基层党委审批会议时间"
|
|
|
@@ -2518,6 +2533,7 @@
|
|
|
v-model="formObj.formModel.replyTime2"
|
|
|
type="date"
|
|
|
clearable
|
|
|
+ format="yyyy年MM月dd日"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
style="width: 100%;"
|
|
|
placeholder="请选择批复时间"
|
|
|
@@ -2597,13 +2613,19 @@
|
|
|
<el-button
|
|
|
type="rocpartyprimaryplainbtn"
|
|
|
icon="el-icon-circle-close"
|
|
|
+ class="mr20"
|
|
|
@click="handlePageCloseClick"
|
|
|
>取 消</el-button>
|
|
|
- <el-button
|
|
|
- type="rocpartyprimarybtn"
|
|
|
- icon="el-icon-circle-check"
|
|
|
- @click="handlePageSubmitClick"
|
|
|
- >保 存</el-button>
|
|
|
+ <el-popover placement="top" trigger="hover" title="温馨提示" width="100">
|
|
|
+ <p>已填内容保存以后不能再修改！</p>
|
|
|
+ <el-button
|
|
|
+ slot="reference"
|
|
|
+ :disabled="!formObj.formModel.name"
|
|
|
+ type="rocpartyprimarybtn"
|
|
|
+ icon="el-icon-circle-check"
|
|
|
+ @click="handlePageSubmitClick"
|
|
|
+ >保 存</el-button>
|
|
|
+ </el-popover>
|
|
|
</div>
|
|
|
</div>
|
|
|
</template>
|
|
|
@@ -2621,6 +2643,17 @@ export default {
|
|
|
'roc-pdf-file-upload': () => import('@/components/RocPdfFileUpload'),
|
|
|
'roc-img-file-upload': () => import('@/components/RocImgFileUpload')
|
|
|
},
|
|
|
+ props: {
|
|
|
+ operateType: {
|
|
|
+ type: String,
|
|
|
+ required: true,
|
|
|
+ default: 'ADD'
|
|
|
+ },
|
|
|
+ id: {
|
|
|
+ type: [String, Number],
|
|
|
+ default: null
|
|
|
+ }
|
|
|
+ },
|
|
|
data() {
|
|
|
return {
|
|
|
// 性别选项列表
|
|
|
@@ -2629,35 +2662,26 @@ export default {
|
|
|
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, // 备注
|
|
|
- thoughtReportRecord: [
|
|
|
+ thoughtReportRecordList: [
|
|
|
{
|
|
|
submitTime: null,
|
|
|
filePath: null
|
|
|
}
|
|
|
- ],
|
|
|
- checkList: [],
|
|
|
- selected: []
|
|
|
+ ]
|
|
|
},
|
|
|
formRules: {
|
|
|
name: [
|
|
|
{ required: true, message: "姓名不能为空", trigger: "blur" }
|
|
|
+ ],
|
|
|
+ cardNo: [
|
|
|
+ {
|
|
|
+ pattern: /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/,
|
|
|
+ message: "请输入正确居民身份证号码",
|
|
|
+ trigger: "blur"
|
|
|
+ }
|
|
|
+ ],
|
|
|
+ submitAddPartyPageTime: [
|
|
|
+ { validator: this.validateSubmitAddPartyPageTime, trigger: 'change' }
|
|
|
]
|
|
|
}
|
|
|
},
|
|
|
@@ -2670,23 +2694,32 @@ export default {
|
|
|
};
|
|
|
},
|
|
|
watch: {
|
|
|
- timelineList: {
|
|
|
- handler(val, oldval) {
|
|
|
- this.setMaxScrollLeft();
|
|
|
- if (!oldval && val) {
|
|
|
- if (this.positionId != null) {
|
|
|
- return this.positionById(this.positionId);
|
|
|
- }
|
|
|
- if (this.positionIndex != null) {
|
|
|
- this.positionByIndex(this.positionIndex);
|
|
|
- }
|
|
|
- }
|
|
|
- }, deep: true
|
|
|
- },
|
|
|
innerWidth: {
|
|
|
immediate: true,
|
|
|
- handler(newValue) {
|
|
|
- }
|
|
|
+ handler(newValue) { }
|
|
|
+ },
|
|
|
+ // 第6步 确定为积极分子的时间
|
|
|
+ 'formObj.formModel.confirmActiveMemberTime'(newValue, oldValue) {
|
|
|
+ (newValue !== this.formObj.formModel.branchPartyMeetingTime) && this.$alert('第6步确定为积极分子的时间与第5步支委会会议时间不相同！', '温馨提示', { type: 'warning' });
|
|
|
+ },
|
|
|
+ // 第17步 支部大会的会议时间
|
|
|
+ 'formObj.formModel.branchPartyBigMeetingTime'(newValue, oldValue) {
|
|
|
+ (newValue !== this.formObj.formModel.branchPartyAcceptReadyMemberTime) && this.$alert('第17步支部大会的会议时间与第16步支委会接收预备党员的时间不相同！', '温馨提示', { type: 'warning' });
|
|
|
+ },
|
|
|
+ // 第19步 基层党委审批会议时间
|
|
|
+ 'formObj.formModel.basicPartyCheckMeetingTime'(newValue, oldValue) {
|
|
|
+ (newValue !== this.formObj.formModel.branchPartyAcceptReadyMemberTime) && this.$alert('第19步基层党委审批会议时间与第16步关于预备党员基层党委审批意见的时间不相同！', '温馨提示', { type: 'warning' });
|
|
|
+ },
|
|
|
+ // 第21步 预备期
|
|
|
+ 'formObj.formModel.readyDeadline1Range'(newValue, oldValue) {
|
|
|
+ let comparedArr = this.formObj.formModel.readyDeadlineRange;
|
|
|
+ let newValueStr = (newValue && newValue.length === 2) ? newValue.join(',') : '';
|
|
|
+ let comparedStr = (comparedArr && comparedArr.length === 2) ? comparedArr.join(',') : '';
|
|
|
+ (newValueStr != comparedStr) && this.$alert('第21步预备期与第16步预备期的时间不相同！', '温馨提示', { type: 'warning' });
|
|
|
+ },
|
|
|
+ // 第27步 基层党委审批会议时间
|
|
|
+ 'formObj.formModel.basicPartyCheckMeetingTime1'(newValue, oldValue) {
|
|
|
+ (newValue != this.formObj.formModel.confirmBasicPartyCheckIdeaTime) && this.$alert('第27步基层党委审批会议时间与第16步转正基层党委审批意见的时间不相同！', '温馨提示', { type: 'warning' });
|
|
|
}
|
|
|
},
|
|
|
created() {
|
|
|
@@ -2773,16 +2806,20 @@ export default {
|
|
|
* 转为正式党员点击事件
|
|
|
*/
|
|
|
handleBecomeFullPartyMemberClick() {
|
|
|
-
|
|
|
+ this.$confirm('是否确认转为正式党员?', "警告", {
|
|
|
+ confirmButtonText: "确定",
|
|
|
+ cancelButtonText: "取消",
|
|
|
+ type: "warning"
|
|
|
+ }).then(() => {
|
|
|
+ this.msgSuccess('转为正式党员成功！');
|
|
|
+ }).catch(() => { });
|
|
|
},
|
|
|
/**
|
|
|
* 页面添加思想汇报按钮事件
|
|
|
*/
|
|
|
handleAddThoughtReportClick() {
|
|
|
- if (!this.formObj.formModel.thoughtReportRecord) {
|
|
|
- this.formObj.formModel.thoughtReportRecord = [];
|
|
|
- }
|
|
|
- this.formObj.formModel.thoughtReportRecord.push({
|
|
|
+ (!this.formObj.formModel.thoughtReportRecordList) && (this.formObj.formModel.thoughtReportRecordList = []);
|
|
|
+ this.formObj.formModel.thoughtReportRecordList.push({
|
|
|
submitTime: null,
|
|
|
filePath: null
|
|
|
});
|
|
|
@@ -2791,21 +2828,69 @@ export default {
|
|
|
* 页面确定按钮事件
|
|
|
*/
|
|
|
handlePageSubmitClick() {
|
|
|
- console.log('this.formObj.formModel===', this.formObj.formModel);
|
|
|
- // this.$emit("page-submit", 'LIST');
|
|
|
+ this.$refs["updatePartyDevelopFormRef"].validate(valid => {
|
|
|
+ if (valid) {
|
|
|
+ this.$confirm('已填内容保存以后不能再修改，是否确认保存?', "警告", {
|
|
|
+ confirmButtonText: "确定",
|
|
|
+ cancelButtonText: "取消",
|
|
|
+ type: "warning"
|
|
|
+ }).then(() => {
|
|
|
+ // this.$emit("page-submit", 'LIST');
|
|
|
+ const { placeList, addressList, detailedAddress, thoughtReportRecordList, publicTimeRange, readyDeadlineRange, readyDeadline1Range, publicTime1Range, ...reqData } = this.formObj.formModel;
|
|
|
+
|
|
|
+ // 籍贯数据
|
|
|
+ (placeList?.length > 0) && (reqData.place = placeList.join(','));
|
|
|
+
|
|
|
+ // 现居地数据
|
|
|
+ (addressList?.length > 0) && (reqData.address = addressList.join(','));
|
|
|
+ detailedAddress && (reqData.address += detailedAddress);
|
|
|
+
|
|
|
+ // 第7步 思想汇报数据
|
|
|
+ let thoughtReportRecord = [];
|
|
|
+ for (let i = 0; i < thoughtReportRecordList?.length; i++) {
|
|
|
+ if (thoughtReportRecordList[i].submitTime && thoughtReportRecordList[i].filePath) {
|
|
|
+ thoughtReportRecord.push(thoughtReportRecordList[i]);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ (thoughtReportRecord?.length > 0) && (reqData.thoughtReportRecord = thoughtReportRecord);
|
|
|
+
|
|
|
+ // 第10步 公示时间数据
|
|
|
+ (publicTimeRange?.length === 2) && (reqData.publicTime = publicTimeRange.join('~'));
|
|
|
+
|
|
|
+ // 第16步 预备期数据
|
|
|
+ (readyDeadlineRange?.length === 2) && (reqData.readyDeadline = readyDeadlineRange.join('~'));
|
|
|
+
|
|
|
+ // 第21步 预备期数据
|
|
|
+ (readyDeadline1Range?.length === 2) && (reqData.readyDeadline1 = readyDeadline1Range.join('~'));
|
|
|
+
|
|
|
+ // 第25步 公示时间数据
|
|
|
+ (publicTime1Range?.length === 2) && (reqData.publicTime1 = publicTime1Range.join('~'));
|
|
|
+
|
|
|
+ console.log('handlePageSubmitClick===', reqData);
|
|
|
+ }).catch(() => { });
|
|
|
+ } else {
|
|
|
+ this.msgError('存在数据配置错误，请修改后再保存！');
|
|
|
+ }
|
|
|
+ });
|
|
|
},
|
|
|
/**
|
|
|
* 页面取消按钮事件
|
|
|
*/
|
|
|
handlePageCloseClick() {
|
|
|
- this.formObj = {
|
|
|
- ...this.formObj,
|
|
|
- formModel: {
|
|
|
- checkList: [],
|
|
|
- selected: []
|
|
|
- }
|
|
|
- };
|
|
|
- this.$emit("page-close", 'LIST');
|
|
|
+ this.$confirm('是否确认当前操作?', "警告", {
|
|
|
+ confirmButtonText: "确定",
|
|
|
+ cancelButtonText: "取消",
|
|
|
+ type: "warning"
|
|
|
+ }).then(() => {
|
|
|
+ this.formObj = {
|
|
|
+ ...this.formObj,
|
|
|
+ formModel: {
|
|
|
+ checkList: [],
|
|
|
+ selected: []
|
|
|
+ }
|
|
|
+ };
|
|
|
+ this.$emit("page-close", 'LIST');
|
|
|
+ }).catch(() => { });
|
|
|
},
|
|
|
/**
|
|
|
* 获取节点纵向线的高度
|
|
|
@@ -2813,7 +2898,7 @@ export default {
|
|
|
* @stepitemObj [Array] 当前节点文件上传字段
|
|
|
* @defaultValueObj [Object] {defaultHeight, noDefaultHeight,defaultMarginTop, noDefaultMarginTop}
|
|
|
*/
|
|
|
- getNodeTabpaneStepTailStyle(innerWidth, stepitemObj, defaultValueObj, baseNum) {
|
|
|
+ getNodeTabpaneStepTailStyle(innerWidth, stepitemObj, defaultValueObj, baseNum, list) {
|
|
|
let notEnableBase = 60;
|
|
|
let enableBase = 115;
|
|
|
let incrementBase = 0;
|
|
|
@@ -2833,6 +2918,27 @@ export default {
|
|
|
incrementBase += baseNum;
|
|
|
}
|
|
|
|
|
|
+ if (baseNum === '7' && list.length > 0) {
|
|
|
+ let [listEnableFlag, listNotEnableFlag] = [0, 0];
|
|
|
+ for (let baseItem of list) {
|
|
|
+ if (!baseItem.filePath) {
|
|
|
+ continue;
|
|
|
+ } else if (baseItem.filePath === 'ROCPDFUPLOADSELECT') {
|
|
|
+ notEnableFlag += 1;
|
|
|
+ listNotEnableFlag += 1;
|
|
|
+ } else {
|
|
|
+ enableFlag += 1;
|
|
|
+ listEnableFlag += 1;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ if ((notEnableFlag + enableFlag) === 0) {
|
|
|
+ incrementBase = 0;
|
|
|
+ } else {
|
|
|
+ incrementBase += notEnableFlag + enableFlag;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
if (baseNum === '19' && (enableFlag + notEnableFlag) === 2) {
|
|
|
incrementBase += 2;
|
|
|
}
|
|
|
@@ -2850,6 +2956,117 @@ export default {
|
|
|
height: `${defaultValueObj['noDefaultHeight'] + notEnableFlag * notEnableBase + enableFlag * enableBase + incrementBase}px`,
|
|
|
marginTop: `-${defaultValueObj['noDefaultMarginTop'] + notEnableFlag * notEnableBase + enableFlag * enableBase + incrementBase}px`
|
|
|
};
|
|
|
+ },
|
|
|
+ /**
|
|
|
+ * 根据出生日期和当前日期计算年龄
|
|
|
+ * @strBirthday [String] 出生日期，格式为"1990-01-01"
|
|
|
+ */
|
|
|
+ getAgeByBirthdayNowDate(strBirthday) {
|
|
|
+ // 初始化数据
|
|
|
+ const [strBirthdayArr, nowDate] = [strBirthday.split("-"), new Date()];
|
|
|
+
|
|
|
+ // 出生日期数据
|
|
|
+ const [birthYear, birthMonth, birthDay] = strBirthdayArr;
|
|
|
+
|
|
|
+ // 当前日期数据
|
|
|
+ const [nowYear, nowMonth, nowDay] = [nowDate.getFullYear(), nowDate.getMonth() + 1, nowDate.getDate()];
|
|
|
+
|
|
|
+ if (nowYear == birthYear) {
|
|
|
+ return 0; // 同年 则为0岁
|
|
|
+ } else {
|
|
|
+ // 年之差
|
|
|
+ const ageDiff = nowYear - birthYear;
|
|
|
+
|
|
|
+ if (ageDiff > 0) {
|
|
|
+
|
|
|
+ // 月份相等
|
|
|
+ if (nowMonth == birthMonth) {
|
|
|
+
|
|
|
+ // 日之差
|
|
|
+ const dayDiff = nowDay - birthDay;
|
|
|
+
|
|
|
+ // 日之差小于0
|
|
|
+ if (dayDiff < 0) {
|
|
|
+ return ageDiff - 1;
|
|
|
+ }
|
|
|
+
|
|
|
+ return ageDiff; // 日之差大于等于0
|
|
|
+ }
|
|
|
+
|
|
|
+ // 月之差
|
|
|
+ const monthDiff = nowMonth - birthMonth;
|
|
|
+
|
|
|
+ // 月之差小于0
|
|
|
+ if (monthDiff < 0) {
|
|
|
+ return ageDiff - 1;
|
|
|
+ }
|
|
|
+
|
|
|
+ return ageDiff; // 月之差大于等于0
|
|
|
+ }
|
|
|
+
|
|
|
+ return -1;// 返回-1 表示出生日期输入错误或晚于今天
|
|
|
+ }
|
|
|
+ },
|
|
|
+ /**
|
|
|
+ * 校验递交入党申请书时间
|
|
|
+ */
|
|
|
+ validateSubmitAddPartyPageTime(rule, value, callback) {
|
|
|
+ if (value && this.getAgeByBirthdaySpecifyDate(this.formObj.formModel.birthday, value) < 18) {
|
|
|
+ callback(new Error('入党申请书递交时必需年满18岁!'));
|
|
|
+ } else {
|
|
|
+ callback();
|
|
|
+ }
|
|
|
+ },
|
|
|
+ /**
|
|
|
+ * 根据出生日期和指定日期计算年龄
|
|
|
+ * @strBirthday [String] 出生日期，格式为"1990-01-01"
|
|
|
+ * @strSpecifyDate [String] 指定日期，格式为"1990-01-01"
|
|
|
+ */
|
|
|
+ getAgeByBirthdaySpecifyDate(strBirthday, strSpecifyDate) {
|
|
|
+ // 初始化数据
|
|
|
+ const [strBirthdayArr, strSpecifyDateArr] = [strBirthday.split("-"), strSpecifyDate.split("-")];
|
|
|
+
|
|
|
+ // 出生日期数据
|
|
|
+ const [birthYear, birthMonth, birthDay] = strBirthdayArr;
|
|
|
+
|
|
|
+ // 指定日期数据
|
|
|
+ const [specifyYear, specifyMonth, specifyDay] = strSpecifyDateArr;
|
|
|
+
|
|
|
+ if (specifyYear == birthYear) {
|
|
|
+ return 0; // 同年 则为0岁
|
|
|
+ } else {
|
|
|
+ // 年之差
|
|
|
+ const ageDiff = specifyYear - birthYear;
|
|
|
+
|
|
|
+ if (ageDiff > 0) {
|
|
|
+
|
|
|
+ // 月份相等
|
|
|
+ if (specifyMonth == birthMonth) {
|
|
|
+
|
|
|
+ // 日之差
|
|
|
+ const dayDiff = specifyDay - birthDay;
|
|
|
+
|
|
|
+ // 日之差小于0
|
|
|
+ if (dayDiff < 0) {
|
|
|
+ return ageDiff - 1;
|
|
|
+ }
|
|
|
+
|
|
|
+ return ageDiff; // 日之差大于等于0
|
|
|
+ }
|
|
|
+
|
|
|
+ // 月之差
|
|
|
+ const monthDiff = specifyMonth - birthMonth;
|
|
|
+
|
|
|
+ // 月之差小于0
|
|
|
+ if (monthDiff < 0) {
|
|
|
+ return ageDiff - 1;
|
|
|
+ }
|
|
|
+
|
|
|
+ return ageDiff; // 月之差大于等于0
|
|
|
+ }
|
|
|
+
|
|
|
+ return -1;// 返回-1 表示出生日期输入错误或晚于今天
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
Rockery