From fd4e9298fc7c4f1e9fe0dde225c4eb50e6204d72 Mon Sep 17 00:00:00 2001 From: Apcallover <1503963513@qq.com> Date: Mon, 3 Nov 2025 16:53:20 +0800 Subject: [PATCH] =?UTF-8?q?flat=EF=BC=9A=E6=B7=BB=E5=8A=A0=E8=AF=86?= =?UTF-8?q?=E5=88=AB=E5=8E=9F=E5=9B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 4 ++ src/api/tenant/serve.js | 16 ++++++ .../tenant/main/serve/Dialog/pushService2.vue | 40 ++++++++++++-- src/views/tenant/main/serve/index.vue | 55 +++++++++++++++++-- vue.config.js | 4 +- 5 files changed, 108 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index fc37131..7639ccb 100644 --- a/package.json +++ b/package.json @@ -60,5 +60,9 @@ "vue-cli-service lint", "git add" ] + }, + "volta": { + "node": "14.21.3", + "npm": "6.14.18" } } diff --git a/src/api/tenant/serve.js b/src/api/tenant/serve.js index a3d9199..fff15a2 100644 --- a/src/api/tenant/serve.js +++ b/src/api/tenant/serve.js @@ -311,3 +311,19 @@ export const phoneUpdate = (params) => { params }); }; + +export const getMsgContent = (params) => { + return request({ + url: "/api/jobslink-api/serve/getMsgContent", + method: "get", + params + }); +}; + +export const pushMsg = (params) => { + return request({ + url: "/api/jobslink-api/serve/push/msg", + method: "POST", + data: params + }); +}; diff --git a/src/views/tenant/main/serve/Dialog/pushService2.vue b/src/views/tenant/main/serve/Dialog/pushService2.vue index 5fc630e..d7b6d62 100644 --- a/src/views/tenant/main/serve/Dialog/pushService2.vue +++ b/src/views/tenant/main/serve/Dialog/pushService2.vue @@ -10,9 +10,14 @@ @input="searchInputChange" v-model="searchInput" clearable> - - {{ pushState ? '推送中...' : rightTabs ? '推送岗位' : '推送政策' }} - +
+ + 推送信息 + + + {{ pushState ? '推送中...' : rightTabs ? '推送岗位' : '推送政策' }} + +
{ + if (type === 'confirm') { + pushMsg({ + serveUserId: this.phoneItem.serveUserId, + id: this.phoneItem.id + }).then((res) => { + this.$message.success('推送成功'); + }).cache(() => { + this.$message.error('推送失败'); + }) + } + }) + } else { + this.$message.error('获取模板失败'); + } + }, changeTabs(type) { this.rightDataList = [] this.rightTabs = type diff --git a/src/views/tenant/main/serve/index.vue b/src/views/tenant/main/serve/index.vue index cd2258e..df9b509 100644 --- a/src/views/tenant/main/serve/index.vue +++ b/src/views/tenant/main/serve/index.vue @@ -223,6 +223,7 @@ @@ -234,7 +235,8 @@ title="回访" append-to-body :visible.sync="phoneDialogVisible" - width="30%" + width="40%" + :rules="rules" :before-close="handlePhoneClose"> @@ -245,11 +247,25 @@ {{ phone }} - - + + + + + + 是 + 否 + + + + + 是 + 否 + + 个人基础信息修改 + 取 消 确 定 @@ -318,10 +334,20 @@ export default { phoneList: [], phoneForm: { phone: '', - list: [] + list: [], + isServe: 0, + isTrain: 0, }, phoneItem: null, depTree: [], + rules: { + isServe: [ + {required: true, message: '请选择是否服务', trigger: 'change'} + ], + isTrain: [ + {required: true, message: '请选择是否培训', trigger: 'change'} + ], + }, logOption: { editBtn: false, delBtn: true, @@ -534,6 +560,11 @@ export default { searchLabelWidth: 100, searchSpan: 8, }, + { + label: "识别原因", + prop: "labelsBase", + width: 100, + } ] } }, @@ -715,6 +746,12 @@ export default { // this.logOption.editBtn = false // } // }, + handleBasicUpdate() { + window.open('http://10.160.7.100:8000/jyback/template/general.html#/generalPage?_modulePartId_=1000076072', '_blank'); + }, + handelJobIntention() { + this.$message({type: "info", message: "功能未配置"}); + }, async getDept() { let params = { tenantId: '000000' @@ -728,6 +765,7 @@ export default { selectPushUserService(row) { this.selectPushService().then(() => { this.$nextTick(() => { + this.phoneItem = row this.$refs.pushRef.upDateUser(row) this.$refs.pushRef.refLeftSearch(row.name) }) @@ -737,7 +775,7 @@ export default { let _this = this let phone = '' if (this.phoneForm.list.length) phone = this.phoneForm.list[0]; - if (/^1[3-9]{1}\d{9}/.test(this.phoneForm.phone)) phone = this.phoneForm.phone; + // if (/^1[3-9]{1}\d{9}/.test(this.phoneForm.phone)) phone = this.phoneForm.phone; if (phone) { this.$confirm(`手机号为:${phone}`, { confirmButtonText: "确定", @@ -748,6 +786,9 @@ export default { idNumber: _this.phoneItem.idNumber, phone, serveId: this.selectInfo.id, + serveUserId: this.phoneItem.serveUserId, + isServe: this.phoneForm.isServe, + isTrain: this.phoneForm.isTrain } let resData = await phoneUpdate(params) if (resData.data.code === 200) { @@ -763,6 +804,8 @@ export default { this.phoneDialogVisible = false this.phoneForm.phone = '' this.phoneForm.list = [] + this.phoneForm.isServe = 0 + this.phoneForm.isTrain = 0 }, async phoneDataList(item) { let params = { @@ -773,6 +816,8 @@ export default { this.phoneList = resData.data.data this.phoneItem = item this.phoneDialogVisible = true + this.phoneForm.isServe = item.isServe + this.phoneForm.isTrain = item.isTrain } else { this.$message.error("用户数据异常!"); } diff --git a/vue.config.js b/vue.config.js index 5002c0d..4f99925 100644 --- a/vue.config.js +++ b/vue.config.js @@ -27,8 +27,8 @@ module.exports = { port: 1888, proxy: { "/api": { - // target: 'http://192.168.1.115:8000', - target: 'http://10.165.0.173:8000', + target: 'http://192.168.3.11:8000', + // target: 'http://10.165.0.173:8000', ws: true, changeOrigin: true, pathRewrite: {