diff --git a/src/components/promptDialog/index.vue b/src/components/promptDialog/index.vue index 8caa5d8..bcb4e65 100644 --- a/src/components/promptDialog/index.vue +++ b/src/components/promptDialog/index.vue @@ -6,19 +6,21 @@ :before-close="handleClose" append-to-body> {{ subTitle }} -
- -
-
-
{{ index + 1 }}:{{ - item - }} +
+
+ +
+
+
{{ index + 1 }}:{{ + item + }} +
取 消 - 驳回 - 确 定 + 驳 回 + 通 过 @@ -33,11 +35,18 @@ const classEnum = { largeXX: '146px', largeXXL: '186px', } +const btnTypes = { + 0: 'warning', + 1: 'danger' +} export default { name: "promptDialog", data() { return { + btnTypes, input: '', + status: 0, + btnType: '' } }, props: { @@ -63,6 +72,7 @@ export default { visible(val) { if (val) { this.input = '' + this.status = 0 } } }, @@ -72,7 +82,11 @@ export default { this.$emit('onClose') }, handleCancel() { - this.$emit('onCancel', this.input) + if (this.status) { + this.$emit('onCancel', this.input) + } else { + this.status = 1 + } }, handleConfirm() { this.$emit('onConfirm', this.input) diff --git a/src/views/manage/cuser/serve/Dialog/pushService.vue b/src/views/manage/cuser/serve/Dialog/pushService.vue index 042818a..705913f 100644 --- a/src/views/manage/cuser/serve/Dialog/pushService.vue +++ b/src/views/manage/cuser/serve/Dialog/pushService.vue @@ -117,6 +117,19 @@ let leftUserOptions = { }, { label: '姓别', prop: 'aac004', + type: 'select', + dicUrl: "/api/jobslink-api/system/dict-biz/tadict?code=AAC004", + props: { + label: "dictValue", + value: "dictKey", + }, + rules: [ + { + required: true, + message: "请输入性别", + trigger: "blur", + }, + ], }, { label: '身份证', prop: 'idNumber', @@ -127,9 +140,35 @@ let leftUserOptions = { }, { label: "民族", prop: "aac005", + type: 'select', + dicUrl: "/api/jobslink-api/system/dict-biz/tadict?code=AAC005", + props: { + label: "dictValue", + value: "dictKey", + }, + rules: [ + { + required: true, + message: "请输入民族", + trigger: "blur", + }, + ], }, { label: "户口性质", prop: "aac009", + type: 'select', + dicUrl: "/api/jobslink-api/system/dict-biz/tadict?code=AAC009", + props: { + label: "dictValue", + value: "dictKey", + }, + rules: [ + { + required: true, + message: "请输入户口性质", + trigger: "blur", + }, + ], }, { label: "户口所在地", prop: "aac010", @@ -137,6 +176,19 @@ let leftUserOptions = { }, { label: "文化程度", prop: "aac011", + type: 'select', + dicUrl: "/api/jobslink-api/system/dict-biz/tadict?code=AAC011", + props: { + label: "dictValue", + value: "dictKey", + }, + rules: [ + { + required: true, + message: "请输入文化程度", + trigger: "blur", + }, + ], }, { label: '个人标签', prop: 'labelsBase', diff --git a/src/views/manage/cuser/talents/index.vue b/src/views/manage/cuser/talents/index.vue index 6cc598e..4e7954d 100644 --- a/src/views/manage/cuser/talents/index.vue +++ b/src/views/manage/cuser/talents/index.vue @@ -300,7 +300,7 @@ export default { dicUrl: "/api/jobslink-api/system/dict-biz/tadict?code=AAC004", props: { label: "dictValue", - value: "dictValue", + value: "dictKey", }, rules: [ { @@ -340,10 +340,10 @@ export default { prop: "aac005", type: 'select', dicUrl: "/api/jobslink-api/system/dict-biz/tadict?code=AAC005", - props: { - label: "dictValue", - value: "dictValue", - }, + // props: { + // label: "dictValue", + // value: "dictValue", + // }, props: { label: "dictValue", value: "dictKey", @@ -364,7 +364,7 @@ export default { dicUrl: "/api/jobslink-api/system/dict-biz/tadict?code=AAC009", props: { label: "dictValue", - value: "dictValue", + value: "dictKey", }, rules: [ { @@ -391,7 +391,7 @@ export default { dicUrl: "/api/jobslink-api/system/dict-biz/tadict?code=AAC011", props: { label: "dictValue", - value: "dictValue", + value: "dictKey", }, rules: [ { diff --git a/src/views/manage/station/inviteCode.vue b/src/views/manage/station/inviteCode.vue index 982c514..dc6e48d 100644 --- a/src/views/manage/station/inviteCode.vue +++ b/src/views/manage/station/inviteCode.vue @@ -1,33 +1,33 @@
+ v-for="item in enterpriseList" + :key="item.id" + :label="item.comname" + :value="item.id"> @@ -87,6 +87,20 @@
+