From 0e4720b3f2552d3701987ff7f68c765fabad66ee Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Wed, 16 Jul 2025 08:31:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/jeecg/components/JDictSelectTag.vue | 3 - .../ConfigServiceDirective.api.ts | 32 +- .../ConfigServiceDirective.data.ts | 158 +++++++++ .../ConfigServiceDirectiveList.vue | 17 +- .../components/ConfigServiceDirectiveForm.vue | 87 ++++- .../ConfigServiceDirectiveModal.vue | 48 ++- .../components/ServiceDirectiveAuditList.vue | 299 ++++++++++++++++++ 7 files changed, 605 insertions(+), 39 deletions(-) create mode 100644 src/views/services/serviceDirective/components/ServiceDirectiveAuditList.vue diff --git a/src/components/Form/src/jeecg/components/JDictSelectTag.vue b/src/components/Form/src/jeecg/components/JDictSelectTag.vue index 0066e73..b499df4 100644 --- a/src/components/Form/src/jeecg/components/JDictSelectTag.vue +++ b/src/components/Form/src/jeecg/components/JDictSelectTag.vue @@ -149,7 +149,6 @@ export default defineComponent({ function handleChange(e) { const { mode } = unref(getBindValue); let changeValue: any; - let changeLabel: any; // 兼容多选模式 //update-begin---author:wangshuai ---date:20230216 for:[QQYUN-4290]公文发文:选择机关代字报错,是因为值改变触发了change事件三次,导致数据发生改变------------ @@ -165,13 +164,11 @@ export default defineComponent({ } } else { changeValue = e?.target?.value ?? e; - // changeLabel = dictOptions.value.filter(d => d.value == changeValue)[0].label } state.value = changeValue; //update-begin---author:wangshuai ---date:20230403 for:【issues/4507】JDictSelectTag组件使用时,浏览器给出警告提示:Expected Function, got Array------------ emit('update:value', changeValue) - // emit('upLabel', changeLabel) //update-end---author:wangshuai ---date:20230403 for:【issues/4507】JDictSelectTag组件使用时,浏览器给出警告提示:Expected Function, got Array述------------ //update-end---author:wangshuai ---date:20230216 for:[QQYUN-4290]公文发文:选择机关代字报错,是因为值改变触发了change事件三次,导致数据发生改变------------ diff --git a/src/views/services/serviceDirective/ConfigServiceDirective.api.ts b/src/views/services/serviceDirective/ConfigServiceDirective.api.ts index b42e202..4bcc0fd 100644 --- a/src/views/services/serviceDirective/ConfigServiceDirective.api.ts +++ b/src/views/services/serviceDirective/ConfigServiceDirective.api.ts @@ -1,19 +1,19 @@ import { defHttp } from '/@/utils/http/axios'; -import { useMessage } from "/@/hooks/web/useMessage"; +import { useMessage } from '/@/hooks/web/useMessage'; const { createConfirm } = useMessage(); enum Api { list = '/services/serviceDirective/list', - save='/services/serviceDirective/add', - edit='/services/serviceDirective/edit', + save = '/services/serviceDirective/add', + edit = '/services/serviceDirective/edit', + audit = '/services/serviceDirective/audit', deleteOne = '/services/serviceDirective/delete', deleteBatch = '/services/serviceDirective/deleteBatch', importExcel = '/services/serviceDirective/importExcel', exportXls = '/services/serviceDirective/exportXls', async = '/services/serviceDirective/async', departList = '/sys/sysDepart/list', - } /** @@ -39,11 +39,11 @@ export const departList = (params) => defHttp.get({ url: Api.departList, params * @param params * @param handleSuccess */ -export const deleteOne = (params,handleSuccess) => { - return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { +export const deleteOne = (params, handleSuccess) => { + return defHttp.delete({ url: Api.deleteOne, params }, { joinParamsToUrl: true }).then(() => { handleSuccess(); }); -} +}; /** * 批量删除 @@ -58,12 +58,12 @@ export const batchDelete = (params, handleSuccess) => { okText: '确认', cancelText: '取消', onOk: () => { - return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + return defHttp.delete({ url: Api.deleteBatch, data: params }, { joinParamsToUrl: true }).then(() => { handleSuccess(); }); - } + }, }); -} +}; /** * 保存或者更新 @@ -73,7 +73,15 @@ export const batchDelete = (params, handleSuccess) => { export const saveOrUpdate = (params, isUpdate) => { let url = isUpdate ? Api.edit : Api.save; return defHttp.post({ url: url, params }, { isTransformResponse: false }); -} +}; + +/** + * 审批 + * @param params + */ +export const audit = (params) => { + return defHttp.post({ url: Api.audit, params }); +}; /** * 同步数据 @@ -81,4 +89,4 @@ export const saveOrUpdate = (params, isUpdate) => { */ export const asyncFunc = (params) => { return defHttp.post({ url: Api.async, params }, { isTransformResponse: false }); -} \ No newline at end of file +}; diff --git a/src/views/services/serviceDirective/ConfigServiceDirective.data.ts b/src/views/services/serviceDirective/ConfigServiceDirective.data.ts index 61ae651..496fe7d 100644 --- a/src/views/services/serviceDirective/ConfigServiceDirective.data.ts +++ b/src/views/services/serviceDirective/ConfigServiceDirective.data.ts @@ -100,6 +100,164 @@ export const columns: BasicColumn[] = [ dataIndex: 'serviceDuration', width: 135, }, + { + title: '指令状态', + align: 'center', + dataIndex: 'status_dictText', + width: 100, + }, + { + title: '是否启用', + align: 'center', + dataIndex: 'izEnabled_dictText', + width: 100, + }, + { + title: '服务指令图片', + align: 'center', + dataIndex: 'previewFile', + customRender: render.renderImage, + }, + { + title: '服务指令描述', + align: 'center', + dataIndex: 'serviceContent', + width: 200, + }, + { + title: '指令音频文件', + align: 'center', + dataIndex: 'mp3File', + width: 120, + }, + { + title: '指令视频文件', + align: 'center', + dataIndex: 'mp4File', + width: 120, + }, + { + title: '即时指令图标', + align: 'center', + dataIndex: 'immediateFile', + customRender: render.renderImage, + }, +]; + +//列表数据 +export const auditColumns: BasicColumn[] = [ + { + title: '机构名称', + align: 'center', + dataIndex: 'sysOrgCode_dictText', + width: 200, + }, + { + title: '分类标签', + align: 'center', + dataIndex: 'instructionTagId_dictText', + ellipsis: false, + customCell: (record, index, column) => { + if (record.instructionRowSpan != null) { + return { rowSpan: record.instructionRowSpan }; + } + }, + }, + { + title: '服务类别', + align: 'center', + dataIndex: 'categoryId_dictText', + ellipsis: false, + customCell: (record, index, column) => { + if (record.categoryRowSpan != null) { + return { rowSpan: record.categoryRowSpan }; + } + }, + }, + { + title: '服务类型', + align: 'center', + dataIndex: 'typeId_dictText', + ellipsis: false, + customCell: (record, index, column) => { + if (record.typeRowSpan != null) { + return { rowSpan: record.typeRowSpan }; + } + }, + }, + { + title: '服务指令', + align: 'center', + dataIndex: 'directiveName', + }, + { + title: '体型标签', + align: 'center', + dataIndex: 'bodyTagList', + width: 150, + ellipsis: false, + // format(text, record, index) { + // if (!!text) { + // return text.map((item) => item.tagName).join('、'); + // } else { + // return '-'; + // } + // }, + }, + { + title: '情绪标签', + align: 'center', + dataIndex: 'emotionTagList', + width: 150, + ellipsis: false, + // format(text, record, index) { + // if (!!text) { + // return text.map((item) => item.tagName).join('、'); + // } else { + // return '-'; + // } + // }, + }, + { + title: '收费价格', + align: 'center', + dataIndex: 'tollPrice', + width: 100, + }, + { + title: '提成价格', + align: 'center', + dataIndex: 'comPrice', + }, + { + title: '医保报销', + align: 'center', + dataIndex: 'izReimbursement_dictText', + width: 100, + }, + { + title: '机构优惠', + align: 'center', + dataIndex: 'izPreferential_dictText', + width: 100, + }, + { + title: '周期类型', + align: 'center', + dataIndex: 'cycleType_dictText', + }, + { + title: '服务时长(分钟)', + align: 'center', + dataIndex: 'serviceDuration', + width: 135, + }, + { + title: '指令状态', + align: 'center', + dataIndex: 'status_dictText', + width: 100, + }, { title: '是否启用', align: 'center', diff --git a/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue b/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue index 938a933..4b69359 100644 --- a/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue +++ b/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue @@ -85,6 +85,8 @@ preIcon="tabler:settings">配置情绪标签 新增服务指令 + 审核列表