diff --git a/project/pingchang/apps/AppRecruitPartyMembers/AppRecruitPartyMembers.vue b/project/pingchang/apps/AppRecruitPartyMembers/AppRecruitPartyMembers.vue
index a5e0651c..29e420df 100644
--- a/project/pingchang/apps/AppRecruitPartyMembers/AppRecruitPartyMembers.vue
+++ b/project/pingchang/apps/AppRecruitPartyMembers/AppRecruitPartyMembers.vue
@@ -25,7 +25,7 @@ export default {
},
data() {
return {
- selected: {}
+ selected: {},
}
},
computed: {
diff --git a/project/pingchang/apps/AppRecruitPartyMembers/components/Add.vue b/project/pingchang/apps/AppRecruitPartyMembers/components/Add.vue
index db1160d8..0eb4dba9 100644
--- a/project/pingchang/apps/AppRecruitPartyMembers/components/Add.vue
+++ b/project/pingchang/apps/AppRecruitPartyMembers/components/Add.vue
@@ -1,8 +1,8 @@
-
+
-
+
@@ -96,7 +88,7 @@
style="width: 100%"
placeholder="选择日期"
format="yyyy-MM-dd"
- value-format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd HH:mm:ss"
>
@@ -148,13 +140,6 @@
-
-
-
-
-
-
-
@@ -184,28 +169,6 @@
>
-
@@ -213,446 +176,309 @@
-
+
-
+
-
+
-
+
最多上传9个附件,单个文件最大10MB
支持.zip、.rar、.doc、.docx、.xls、.ppt、.pptx、.pdf、.txt、.jpg、.png格式
- 建议上传《入学积极分子培养教育考察登记簿》、《中共预备学员考察登记簿》
+ 建议上传《入党积极分子培养教育考察登记簿》、《中共预备党员考察登记簿》
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 添加入党介绍人/培养人
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 添加入学介绍人/培养人
-
-
-
-
-
-
-
-
-
-
-
- 编辑
-
- 删除
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ >
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -669,11 +495,10 @@
import {mapState} from "vuex";
export default {
name: "Add",
-
props: {
instance: Function,
dict: Object,
- selected: Object
+ selected: Object,
},
computed: {
...mapState(["user"]),
@@ -682,173 +507,127 @@ export default {
},
},
data() {
- const validatorPhone = function (rule, value, callback) {
- if (value === "") {
- callback(new Error("请输入手机号"));
- } else if (!/^1\d{10}$/.test(value)) {
- callback(new Error("手机号格式错误"));
- } else {
- callback();
- }
- };
return {
- info: {},
- validatorPhone: validatorPhone,
form: {
- name: "",
- partyOrgId: "",
- idNumber: "",
- sex: "",
- fileId: "",
- birthday: "",
- age: "",
- nation: "",
- partyOrgName: "",
- birthplaceAreaId: "",
- householdAreaId: "",
- householdAddress: "",
- phone: "",
- currentAreaId: "",
- currentAddress: "",
- partyStatus: "",
- partyType: "",
- joinPartyTime: "",
- turnPositiveTime: "",
- joinPartyIntroducer: "",
- partyPosition: "",
- partyStartDate: "",
- partyWork: "",
- flowStatus: "",
- flowOrgId: "",
- flowTime: "",
- disciplinaryInfoList: [],
- starList: [],
- workInfoList: [],
- outFlow: "",
- lossTime: "",
- inTime: "",
- education: "",
- isOutstandingParty: "0"
+ name: '',
+ idNumber: '',
+ developStatus: '',
+ sex: '',
+ birthday: '',
+ age: '',
+ nation: '',
+ birthplaceAreaId: '',
+ householdAreaId: '',
+ householdAddress: '',
+ avatarUrl: '',
+ phone: '',
+ currentAreaId: '',
+ currentAddress: '',
+ joinLeagueMemberTime: '',
+ education: '',
+ position: '',
+ rewardRemark: '',
+ punishmentRemark: '',
+ resume: '',
+ fileList: [],
+ applyJoinPartyTime: '',
+ applyJoinPartyWay: '',
+ activistTime: '',
+ activistAccordingRemark: '',
+ activistEducationRemark: '',
+ introducerList: [],
+ determineTime: '',
+ determinePoliticsRemark: '',
+ determineSocialRemark: '',
+ determineRealityRemark: '',
+ determineKnowledgeRemark: '',
+ determineComprehensiveRemark: '',
+ determinePartyInnerRemark: '',
+ determineChatRemark: '',
+ determineBranchRemark: '',
+ acceptTime: '',
+ acceptAddress: '',
+ acceptBranchMeetingOpinion: '',
+ acceptEducationRemark: '',
+ acceptBranchMeetingOpinion: '',
+ acceptInvestigateRemark: '',
+ acceptBranchRemark: '',
+ becomePartyTime: '',
+ becomePartyEducationRemark: '',
+ becomePartyInvestigateRemark: '',
+ becomePartyGroupRemark: '',
+ becomePartyBranchRemark: '',
},
- isShowStarForm: false,
- isShowJobForm: false,
- jobForm: {
- date: [],
- company: "",
- position: "",
+ rules: {
+ name: [{ required: true, message: '请输入姓名', trigger: 'change' }],
+ idNumber: [{ required: true, message: '请输入身份证号', trigger: 'change' }],
+ developStatus: [{ required: true, message: '请选择发展状态', trigger: 'change' }],
+ phone: [{ required: true, message: '请输入联系方式', trigger: 'change' }],
+ applyJoinPartyTime: [{ required: true, message: '请选择申请入党时间', trigger: 'change' }],
+ activistTime: [{ required: true, message: '请选择确定为入党积极分子时间', trigger: 'change' }],
+ determineTime: [{ required: true, message: '请选择确定为发展对象时间', trigger: 'change' }],
+ acceptTime: [{ required: true, message: '请选择吸收入党时间', trigger: 'change' }],
+ becomePartyTime: [{ required: true, message: '请选择转正时间', trigger: 'change' }],
},
- jobId: "",
- starForm: {
- starTime: "",
- level: 1,
- },
- disciplinaryId: "",
- isShowDisciplinaryForm: false,
- disciplinaryForm: {
- starTime: "",
- disciplinaryInfo: "",
- result: "",
- },
- starId: "",
- activeName: "五星党员",
- textlist: ["一星党员", "二星党员", "三星党员", "四星党员", "五星党员"],
- colConfigs1: [
- {
- prop: "starTime",
- label: "姓名",
- align: "center",
- formart: (v) => (v ? v.split(" ")[0] : "-"),
- },
- {
- prop: "starTime",
- label: "职位",
- align: "center",
- formart: (v) => (v ? v.split(" ")[0] : "-"),
- },
- ],
- colConfigs2: [
- {slot: "date"},
- {prop: "company", label: "单位", align: "center"},
+ isShowIntroducer: false,
+ introducerInfo: {position: '', name: ''},
+ colConfigs: [
+ {prop: "name", label: "姓名", align: "center"},
{prop: "position", label: "职务", align: "center"},
- ],
- colConfigs3: [
- {
- prop: "starTime",
- label: "时间",
- align: "center",
- formart: (v) => (v ? v.split(" ")[0] : "-"),
- },
- {prop: "disciplinaryInfo", label: "违纪原因", align: "center"},
- {prop: "result", label: "处理结果", align: "center"},
+ {slot: "options"},
],
};
},
created() {
- this.dict.load(
- "partyStatus",
- "education",
- "flowStatus",
- "auditStatus",
- "partyType",
- "partyPosition",
- "sex",
- "nation"
- );
- if (this.isEdit) {
- this.getInfo()
- } else {
- this.initOrg();
- }
-
+ this.dict.load("education", "sex", "nation", "developStatus").then(() => {
+ if (this.isEdit) {
+ this.getInfo()
+ }
+ })
+ console.log(this.$route.query.partyOrgId)
},
methods: {
- flowStatusChange() {
- this.form.flowOrgId = ''
- this.form.flowTime = ''
- this.form.outFlow = ''
- this.form.inTime = ''
- this.form.lossTime = ''
- },
- initOrg() {
- let {id: partyOrgId, name: partyOrgName} = this.selected
- this.form.partyOrgId = partyOrgId;
- this.form.partyOrgName = partyOrgName;
- },
- remove(index, key) {
- this.$confirm("确定删除该数据？").then(() => {
- this.form[key].splice(index, 1);
- });
- },
- getInfo() {
- let {id} = this.$route.query;
- id && this.instance.post(`/app/appparty/detail`, null, {
- params: {id},
- }).then((res) => {
- if (res?.data) {
- this.form = res.data
+ confirm() {
+ this.$refs.form.validate((valid) => {
+ if (valid) {
+ this.form.partyOrgId = this.$route.query.partyOrgId
+ this.instance.post(`/app/apppartydevelop/addOrUpdate`, {...this.form}).then((res) => {
+ if (res.code == 0) {
+ this.$message.success(this.isEdit ? "编辑成功" : "添加成功");
+ setTimeout(() => {
+ this.cancel(true);
+ }, 600);
+ }
+ });
}
});
},
- editStar(query, index) {
- this.starForm = JSON.parse(JSON.stringify(query));
- this.starId = index;
- this.isShowStarForm = true;
+ cancel() {
+ this.$router.push({});
},
- editJob(query, index) {
- this.jobForm = JSON.parse(JSON.stringify(query));
- this.jobId = index;
- this.isShowJobForm = true;
+ addIntroducer() {
+ this.isShowIntroducer = true
+ this.introducerInfo = {position: '', name: ''}
},
- editDisciplinary(query, index) {
- this.disciplinaryForm = JSON.parse(JSON.stringify(query));
- this.disciplinaryId = index;
- this.isShowDisciplinaryForm = true;
+ onClose() {
+ this.isShowIntroducer = false
},
- idChange(val) {
- let info = this.idCardNoUtil.getIdCardInfo(val)
- this.form.sex = info.sex || "";
- this.form.birthday = info.birthday || "";
- this.form.age = this.$calcAge(val) || "";
+ onConfirm() {
+ this.$refs.introducerForm.validate((valid) => {
+ if (valid) {
+ this.introducerInfo.developPartyId = this.form.id
+ this.form.introducerList.push(this.introducerInfo)
+ this.isShowIntroducer = false
+ }
+ });
+ },
+ remove(index) {
+ console.log(index)
+ this.$confirm("确定删除该数据？").then(() => {
+ this.form.introducerList.splice(index, 1)
+ });
+ // this.form.introducerList.splice(index, 1)
+ // this.$forceUpdate()
},
checkName(val) {
for (let i in this.form) {
@@ -864,102 +643,21 @@ export default {
}
this.form.avatarUrl = val.photo;
},
- onJobForm() {
- this.$refs.jobForm.validate((valid) => {
- if (valid) {
- let info = JSON.parse(JSON.stringify({
- ...this.jobForm,
- starTime: this.jobForm.date[0],
- endTime: this.jobForm.date[1],
- }))
- if (this.jobId !== "") {
- this.form.workInfoList.splice(this.jobId, 1, info)
- } else {
- this.form.workInfoList.push(info)
- }
- this.isShowJobForm = false;
+ getInfo() {
+ let {id} = this.$route.query;
+ id && this.instance.post(`/app/apppartydevelop/queryDetailById`, null, {params: {id},}).then((res) => {
+ if (res?.data) {
+ this.form = res.data
}
});
},
- onStarForm() {
- this.$refs.starForm.validate((valid) => {
- if (valid) {
- let info = JSON.parse(JSON.stringify(this.starForm))
- if (this.starId !== "") {
- this.form.starList.splice(this.starId, 1, info)
- } else {
- this.form.starList.push(info)
- }
- this.isShowStarForm = false;
- }
- });
+ idChange(val) {
+ let info = this.idCardNoUtil.getIdCardInfo(val)
+ this.form.sex = info.sex || "";
+ this.form.birthday = info.birthday + ' 00:00:00' || "";
+ this.form.age = this.$calcAge(val) || "";
},
- onDisciplinarForm() {
- this.$refs.disciplinaryForm.validate((valid) => {
- if (valid) {
- let info = JSON.parse(JSON.stringify(this.disciplinaryForm))
- if (this.disciplinaryId !== "") {
- this.form.disciplinaryInfoList.splice(this.disciplinaryId, 1, info)
- } else {
- this.form.disciplinaryInfoList.push(info)
- }
- this.isShowDisciplinaryForm = false;
- }
- });
- },
- onClose() {
- this.starId = "";
- this.jobId = "";
- this.disciplinaryId = "";
- this.starForm.level = 0;
- this.starForm.id = "";
- this.starForm.starTime = "";
- this.jobForm.date = [];
- this.jobForm.company = "";
- this.jobForm.id = "";
- this.jobForm.position = "";
- this.disciplinaryForm.starTime = "";
- this.disciplinaryForm.id = "";
- this.disciplinaryForm.disciplinaryInfo = "";
- this.disciplinaryForm.result = "";
- },
- addForm(type) {
- if (type === "五星党员") {
- this.isShowStarForm = true;
- } else if (type === "工作信息") {
- this.isShowJobForm = true;
- } else {
- this.isShowDisciplinaryForm = true;
- }
- },
- confirm() {
- this.$refs.form.validate((valid) => {
- if (valid) {
- this.instance.post(`/app/appparty/addOrUpdate`, {
- ...this.form
- })
- .then((res) => {
- if (res.code == 0) {
- this.$message.success(this.isEdit ? "编辑成功" : "添加成功");
- setTimeout(() => {
- this.cancel(true);
- }, 600);
- }
- });
- }
- });
- },
- cancel() {
- this.$router.push({});
- },
- handlePartyOrgSelect(e) {
- let {isLeaf, name, id} = e?.[0] || {};
- if (isLeaf == 1) {
- this.form.partyOrgName = name;
- this.form.partyOrgId = id;
- }
- },
- },
+ }
};
@@ -1000,9 +698,5 @@ export default {
::v-deep .ai-form .el-form-item .el-form-item__content {
margin-left: 174px!important;
}
- ::v-deep .ai-form .el-form-item,
- ::v-deep .el-form-item {
- margin-bottom: 8px!important;
- }
}
diff --git a/project/pingchang/apps/AppRecruitPartyMembers/components/Detail.vue b/project/pingchang/apps/AppRecruitPartyMembers/components/Detail.vue
index 302d7ded..b0ab342b 100644
--- a/project/pingchang/apps/AppRecruitPartyMembers/components/Detail.vue
+++ b/project/pingchang/apps/AppRecruitPartyMembers/components/Detail.vue
@@ -2,7 +2,7 @@
{{ info.age }}
- {{ info.age }}
+ {{ dict.getLabel('developStatus', info.developStatus)}}
@@ -52,11 +52,11 @@
- {{ info.name }}
+ {{ info.phone }}
@@ -64,91 +64,92 @@
- {{ info.name }}
- {{ info.name }}
- {{ info.name }}
-
-
-
+ {{ info.joinLeagueMemberTime }}
+ {{ dict.getLabel('education', info.education) }}
+ {{ info.position }}
+
+
+
-
-
+
- {{ info.name }}
+ {{ info.applyJoinPartyTime }}
-
+
+
- {{ info.name }}
-
-
+ {{ info.activistTime }}
+
+
-
+
-
+
- {{ info.name }}
-
-
-
-
-
-
-
-
+ {{ info.determineTime }}
+
+
+
+
+
+
+
+
-
+
- {{ info.name }}
-
-
-
-
-
-
+ {{ info.acceptTime }}
+
+
+
+
+
+
-
+
- {{ info.name }}
-
-
-
-
+ {{ info.becomePartyTime }}
+
+
+
+
@@ -172,59 +173,11 @@ export default {
data() {
return {
info: {},
- isShowStarForm: false,
- isShowJobForm: false,
- jobForm: {
- date: [],
- company: "",
- position: "",
- },
- jobId: "",
- starForm: {
- starTime: "",
- level: 1,
- },
- disciplinaryId: "",
- isShowDisciplinaryForm: false,
- disciplinaryForm: {
- starTime: "",
- disciplinaryInfo: "",
- result: "",
- },
- starId: "",
- activeName: "五星党员",
- textlist: ["一星党员", "二星党员", "三星党员", "四星党员", "五星党员"],
- colConfigs1: [
- {
- prop: "starTime",
- label: "姓名",
- align: "center",
- formart: (v) => (v ? v.split(" ")[0] : "-"),
- },
- {
- prop: "starTime",
- label: "职位",
- align: "center",
- formart: (v) => (v ? v.split(" ")[0] : "-"),
- },
-
+ colConfigs: [
+ {prop: "name", label: "姓名", align: "center"},
+ {prop: "position", label: "职务", align: "center"},
],
- colConfigs2: [
- { slot: "date" },
- { prop: "company", label: "单位", align: "center" },
- { prop: "position", label: "职务", align: "center" },
- ],
- colConfigs3: [
- {
- prop: "starTime",
- label: "时间",
- align: "center",
- formart: (v) => (v ? v.split(" ")[0] : "-"),
- },
- { prop: "disciplinaryInfo", label: "违纪原因", align: "center" },
- { prop: "result", label: "处理结果", align: "center" },
- ],
- };
+ }
},
computed: {
@@ -232,150 +185,24 @@ export default {
},
created() {
- this.getInfo();
+ this.dict.load("education", "sex", "nation", "developStatus").then(() => {
+ this.getInfo()
+ })
},
methods: {
getInfo() {
let { id } = this.$route.query;
- id &&
- this.instance
- .post(`/app/appparty/detail`, null, {
- params: { id },
- })
- .then((res) => {
- if (res?.data) {
- this.info = res.data;
- if (this.info.birthday) {
- this.info.birthday = this.info.birthday.substring(0, 10);
- }
- }
- });
- },
- remove(id, apiUrl) {
- this.$confirm("确定删除该数据？").then(() => {
- this.instance.post(`${apiUrl}?ids=${id}`).then((res) => {
- if (res.code == 0) {
- this.getInfo();
- this.$message.success("删除成功！");
+ id && this.instance.post(`/app/apppartydevelop/queryDetailById`, null, { params: { id },}).then((res) => {
+ if (res?.data) {
+ this.info = res.data;
+ if (this.info.birthday) {
+ this.info.birthday = this.info.birthday.substring(0, 10);
}
- });
- });
- },
- editJob(query) {
- this.jobForm = {
- ...query,
- date: [query.starTime, query.endTime],
- };
- this.jobId = query.id;
-
- this.isShowJobForm = true;
- },
- editStar(query) {
- this.starForm = {
- ...query,
- };
- this.starId = query.id;
-
- this.isShowStarForm = true;
- },
-
- editDisciplinary(query) {
- this.disciplinaryForm = {
- ...query,
- };
- this.disciplinaryId = query.id;
-
- this.isShowDisciplinaryForm = true;
- },
-
- onDisciplinarForm() {
- this.$refs.disciplinaryForm.validate((valid) => {
- if (valid) {
- this.instance
- .post(`/app/apppartydisciplinaryinfo/addOrUpdate`, {
- ...this.disciplinaryForm,
- partyId: this.params.id,
- })
- .then((res) => {
- if (res.code == 0) {
- this.isShowDisciplinaryForm = false;
- this.getInfo();
- this.$message.success(this.jobId ? "编辑成功" : "新增成功");
- }
- });
}
});
},
- onJobForm() {
- this.$refs.jobForm.validate((valid) => {
- if (valid) {
- this.instance
- .post(`/app/apppartyworkinfo/addOrUpdate`, {
- ...this.jobForm,
- starTime: this.jobForm.date[0],
- endTime: this.jobForm.date[1],
- partyId: this.params.id,
- })
- .then((res) => {
- if (res.code == 0) {
- this.isShowJobForm = false;
- this.getInfo();
- this.$message.success(this.jobId ? "编辑成功" : "新增成功");
- }
- });
- }
- });
- },
-
- onStarForm() {
- this.$refs.starForm.validate((valid) => {
- if (valid) {
- this.instance
- .post(`/app/apppartyfivestar/addOrUpdate`, {
- ...this.starForm,
- idNumber: this.info.idNumber,
- partyId: this.params.id,
- })
- .then((res) => {
- if (res.code == 0) {
- this.isShowStarForm = false;
- this.getInfo();
- this.$message.success(this.starId ? "编辑成功" : "新增成功");
- }
- });
- }
- });
- },
-
- onClose() {
- this.starId = "";
- this.jobId = "";
- this.disciplinaryId = "";
- this.starForm.level = 0;
- this.starForm.id = "";
- this.starForm.starTime = "";
- this.jobForm.date = [];
- this.jobForm.company = "";
- this.jobForm.id = "";
- this.jobForm.position = "";
- this.disciplinaryForm.starTime = "";
- this.disciplinaryForm.id = "";
- this.disciplinaryForm.disciplinaryInfo = "";
- this.disciplinaryForm.result = "";
- },
-
- addForm(type) {
- if (type === "五星党员") {
- this.isShowStarForm = true;
- } else if (type === "工作信息") {
- this.isShowJobForm = true;
- } else {
- this.isShowDisciplinaryForm = true;
- }
- },
-
cancel() {
this.$router.push({});
},
diff --git a/project/pingchang/apps/AppRecruitPartyMembers/components/List.vue b/project/pingchang/apps/AppRecruitPartyMembers/components/List.vue
index 8ead6764..7f0a9b9a 100644
--- a/project/pingchang/apps/AppRecruitPartyMembers/components/List.vue
+++ b/project/pingchang/apps/AppRecruitPartyMembers/components/List.vue
@@ -24,41 +24,7 @@
-
-
+
添加
- 删除
+ 删除