diff --git a/src/views/tenant/main/serve/Dialog/pushService2.vue b/src/views/tenant/main/serve/Dialog/pushService2.vue index dbf1e47..c8b52c5 100644 --- a/src/views/tenant/main/serve/Dialog/pushService2.vue +++ b/src/views/tenant/main/serve/Dialog/pushService2.vue @@ -174,7 +174,8 @@ export default { get() { let name = this.selectInfo ? this.selectInfo.name : null; if (name) name = name.trim() - if (['潜在就业困难人员', '潜在登记失业人员', "潜在的就业困难退出人员"].some(item => item === name)) { + console.log(name) + if (['潜在就业困难人员','潜在就业见习申请人员', '潜在登记失业人员', "潜在的就业困难退出人员"].some(item => item === name)) { return true } return false @@ -183,10 +184,10 @@ export default { }, methods: { async informationPush() { - let resData = await getMsgContent() + let resData = await getMsgContent({serveId: this.rowData.id}) if (resData.status === 200 && resData.data.code === 200) { const data = resData.data - this.$confirm(data.msg, { + this.$confirm(data.data, { confirmButtonText: "确定", cancelButtonText: "取消", type: "warning" diff --git a/src/views/tenant/main/serve/index.vue b/src/views/tenant/main/serve/index.vue index 0eb3227..440687b 100644 --- a/src/views/tenant/main/serve/index.vue +++ b/src/views/tenant/main/serve/index.vue @@ -397,8 +397,8 @@ export default { height: '100', column: [ { - label: "所属机构", - prop: "deptId", + label: "服务机构", + prop: "companyName", type: "tree", multiple: false, dicData: this.depTree, @@ -450,6 +450,19 @@ export default { label: '常驻地址', prop: 'residentAddress', }, + { + label: "是否本级", + prop: "isCurrentLevel", + dicData: [ + { value: 0, label: "是" }, + { value: 1, label: "否" }, + ], + type: 'select', + search: true, + hide: true, + searchLabelWidth: 100, + searchSpan: 8, + }, { label: "毕业年份", width: 100,