From e9d325fc941e90ef50115c03f245ccf693868be8 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Wed, 9 Jul 2025 17:32:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E7=9A=84?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=E5=90=8C=E6=AD=A5=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/a14.png | Bin 0 -> 2269 bytes src/components/Table/src/BasicTable.vue | 4 +- .../ConfigServiceDirective.api.ts | 3 + .../ConfigServiceDirective.api.ts | 14 ++ .../ConfigServiceDirective.data.ts | 138 +++++++++++ .../ConfigServiceDirectiveList.vue | 221 ++++++++++++++++++ .../ConfigServiceDirectiveListModal.vue | 63 +++++ .../synchronization/directive/syncList.vue | 214 +++++++++++++++++ .../directive/syncStep/SyncStepList.vue | 77 ++++++ .../directive/syncStep/SyncStepListModal.vue | 63 +++++ 10 files changed, 795 insertions(+), 2 deletions(-) create mode 100644 src/assets/images/a14.png create mode 100644 src/views/synchronization/directive/serviceDirective/ConfigServiceDirective.api.ts create mode 100644 src/views/synchronization/directive/serviceDirective/ConfigServiceDirective.data.ts create mode 100644 src/views/synchronization/directive/serviceDirective/ConfigServiceDirectiveList.vue create mode 100644 src/views/synchronization/directive/serviceDirective/ConfigServiceDirectiveListModal.vue create mode 100644 src/views/synchronization/directive/syncList.vue create mode 100644 src/views/synchronization/directive/syncStep/SyncStepList.vue create mode 100644 src/views/synchronization/directive/syncStep/SyncStepListModal.vue diff --git a/src/assets/images/a14.png b/src/assets/images/a14.png new file mode 100644 index 0000000000000000000000000000000000000000..5d6499c8e33d2b386ba578d1ef3ce3ffc0b27608 GIT binary patch literal 2269 zcma)82~-p38Vx9mpt4l#0|CbX8lhw+A?rw>kOaX3B1FJasv$EW5t0eXC}Deml_Drb z>T-e#)D=rB55xsTUU z>4!{2R3lP2To5oFk67`@G8|XIAefw-OilKpV(NI1#^rKBhz`=}o&>^ElcL1MT2H0M zWkx}OY9wm83YTL_z@R9O!#3eOGU4|1F%+sdvP#W#s)(e4TCobGQ6a;zW`H3f{~M}M zyg_U5aP%*~Zxz;vQdB4yj%u(?Y6($1smn|#MDiw%YLhx~>YRuKL=#a3s>C&fE!tEd z70g$oVjNS8Ff4H<>tQks$22lb1<)B(Hb9AzD-kSNv)mv)O+W==9OaRT^fNsnmM5Jp zqS0WQ7YuPdAPx*cuc09rBA2H89m@8E7$S%ZdwIcL^#6hq^+&|G`2PWigup>c4K7wn z&>#ViOqim|A@MI^8kQ!B(o;pK)_0aeO)!v!It8#Gb1d^3s!s4)dFRXAAw7Ki?HI+w#_(U@Kk z!{CrhX9RHkghIYBfY0<}_>rf%$XgsvbLs!c1qm~t;d=hj47N-V7mbB&j zuR>SIw06M8W~*TTjt}qjDca1J)^9^j6yzN@ze~T_{H+VC;Hop?Ji=A~Tm7GG=pDA&~AN zJ!CzQ6K$NT>uY$hsA^AWW$LTrTI~^A=Qy8O)0(Q9qdy5~rJvo|P*K^p^F&^f(I_9u zc8$2;c&?@?c!A`pjb-p!mM*V)g`J(cM`B9u5Iw%~DhxaHuRk2Ce-LHlXAd-OD}2Tz zEphoF{3~^D!q#1s{9kPnMn-&kw#Q{3_FA`LmLL0x`*EX|EdB=Hv3H%unwjaRZ&xsT z(rt?<79jZ*p=+z0R&~ zA3e4#@-_+8CI7BuDWZfm!u3|x*cLOt9{=*S^0W!_U&p)`u(^R33#v*o=X|^poP+D@ zPEfy38_TeOHIB$?GCjC+hb_ObsO(wckyE3(s7Z34iEq&OPv(!i`lZ$fJZxoY9pZ5- z!J>&qLD!^H`Qp##HGd#Xl6w5)?{1nywS*%Agj){TUjdE#`EL49_J3F zZe{t8&1;m$uCj_NR@`!l_142NOZTr?@mxpA_jLf9zpL^P-c^)7l9}g6CI+_*tG@Mr zdf=V;e|)q2m{GJ|$ERm5?Md+FP|xiiRNmS(l)X!Tx!V3`%lSiAE6+>1%B;-N*X2ds zaD1$9Qnapf$}h6byks_M#8o9%ao-ueH>}$q-~2M&q-1^B6N=r*jw9Kw^+ZNl&mE-vBv0`|SSvsYX(+aveie+cF-`rJUp^ie~nYt60BUXdOWjfXKJR2apB@U4DYWOd)mENNV_ANbN7IS z&(Gx>XUnYz@GlbNzP+mkBUd@ZRg7LgXv|+0=c=RRE{2*!lfYN8F01O=f6LoucksuZ zj!TPty07nos9wMJOyG`^ zZ7tdP7u$MLj{%o8@Buj) defHttp.get({ url: Api.list, params }); +export const departList = (params) => defHttp.get({ url: Api.departList, params }); /** * 删除单个 diff --git a/src/views/synchronization/directive/serviceDirective/ConfigServiceDirective.api.ts b/src/views/synchronization/directive/serviceDirective/ConfigServiceDirective.api.ts new file mode 100644 index 0000000..f768be0 --- /dev/null +++ b/src/views/synchronization/directive/serviceDirective/ConfigServiceDirective.api.ts @@ -0,0 +1,14 @@ +import { defHttp } from '/@/utils/http/axios'; +import { useMessage } from "/@/hooks/web/useMessage"; + +const { createConfirm } = useMessage(); + +enum Api { + list = '/services/serviceDirective/configServiceDirective/list', +} + +/** + * 列表接口 + * @param params + */ +export const list = (params) => defHttp.get({ url: Api.list, params }); \ No newline at end of file diff --git a/src/views/synchronization/directive/serviceDirective/ConfigServiceDirective.data.ts b/src/views/synchronization/directive/serviceDirective/ConfigServiceDirective.data.ts new file mode 100644 index 0000000..ce862f7 --- /dev/null +++ b/src/views/synchronization/directive/serviceDirective/ConfigServiceDirective.data.ts @@ -0,0 +1,138 @@ +import { BasicColumn } from '/@/components/Table'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '分类标签', + align: 'center', + dataIndex: 'instructionTagId_dictText', + width: 100, + customCell: (record, index, column) => { + if (record.instructionRowSpan != null) { + return { rowSpan: record.instructionRowSpan }; + } + }, + }, + { + title: '服务类别', + align: 'center', + dataIndex: 'categoryId_dictText', + customCell: (record, index, column) => { + if (record.categoryRowSpan != null) { + return { rowSpan: record.categoryRowSpan }; + } + }, + }, + { + title: '服务类型', + align: 'center', + dataIndex: 'typeId_dictText', + 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, + defaultHidden: true, + // format(text, record, index) { + // if (!!text) { + // return text.map((item) => item.tagName).join('、'); + // } else { + // return '-'; + // } + // }, + }, + { + title: '情绪标签', + align: 'center', + dataIndex: 'emotionTagList', + width: 150, + ellipsis: false, + defaultHidden: true, + // format(text, record, index) { + // if (!!text) { + // return text.map((item) => item.tagName).join('、'); + // } else { + // return '-'; + // } + // }, + }, + { + title: '收费价格', + align: 'center', + dataIndex: 'tollPrice', + width: 100, + defaultHidden: true, + }, + { + title: '提成价格', + align: 'center', + dataIndex: 'comPrice', + defaultHidden: true, + }, + { + title: '医保报销', + align: 'center', + dataIndex: 'izReimbursement_dictText', + width: 100, + defaultHidden: true, + }, + { + title: '机构优惠', + align: 'center', + dataIndex: 'izPreferential_dictText', + width: 100, + defaultHidden: true, + }, + { + title: '周期类型', + align: 'center', + dataIndex: 'cycleType_dictText', + }, + { + title: '服务时长（分钟）', + align: 'center', + dataIndex: 'serviceDuration', + width: 135, + }, + { + title: '是否启用', + align: 'center', + dataIndex: 'izEnabled_dictText', + width: 100, + }, +]; + +// 高级查询数据 +export const superQuerySchema = { + categoryId: { title: '服务类别', order: 0, view: 'list', type: 'string', dictCode: '' }, + typeId: { title: '服务类型', order: 1, view: 'list', type: 'string', dictCode: '' }, + instructionTagId: { title: '分类标签', order: 2, view: 'list', type: 'string', dictCode: 'instruction_tag' }, + directiveName: { title: '服务指令', order: 3, view: 'text', type: 'string' }, + tollPrice: { title: '收费价格', order: 4, view: 'number', type: 'number' }, + comPrice: { title: '提成价格', order: 5, view: 'number', type: 'number' }, + izReimbursement: { title: '医保报销', order: 6, view: 'radio', type: 'string', dictCode: '' }, + izPreferential: { title: '机构优惠', order: 7, view: 'radio', type: 'string', dictCode: '' }, + chargingFrequency: { title: '收费频次', order: 8, view: 'list', type: 'string', dictCode: '' }, + cycleType: { title: '周期类型', order: 9, view: 'list', type: 'string', dictCode: '' }, + sort: { title: '排序', order: 10, view: 'number', type: 'number' }, + serviceContent: { title: '服务说明', order: 11, view: 'textarea', type: 'string' }, + serviceDuration: { title: '服务时长（分钟）', order: 12, view: 'text', type: 'string' }, + izEnabled: { title: '是否启用', order: 13, view: 'radio', type: 'string', dictCode: '' }, + createBy: { title: '创建人', order: 14, view: 'text', type: 'string' }, + createTime: { title: '创建日期', order: 15, view: 'datetime', type: 'string' }, + updateBy: { title: '更新人', order: 16, view: 'text', type: 'string' }, + updateTime: { title: '更新日期', order: 17, view: 'datetime', type: 'string' }, + mp3File: { title: '语音文件', order: 18, view: 'file', type: 'string' }, + mp4File: { title: '视频文件', order: 19, view: 'file', type: 'string' }, +}; diff --git a/src/views/synchronization/directive/serviceDirective/ConfigServiceDirectiveList.vue b/src/views/synchronization/directive/serviceDirective/ConfigServiceDirectiveList.vue new file mode 100644 index 0000000..f366403 --- /dev/null +++ b/src/views/synchronization/directive/serviceDirective/ConfigServiceDirectiveList.vue @@ -0,0 +1,221 @@ + + + + + diff --git a/src/views/synchronization/directive/serviceDirective/ConfigServiceDirectiveListModal.vue b/src/views/synchronization/directive/serviceDirective/ConfigServiceDirectiveListModal.vue new file mode 100644 index 0000000..73b821f --- /dev/null +++ b/src/views/synchronization/directive/serviceDirective/ConfigServiceDirectiveListModal.vue @@ -0,0 +1,63 @@ + + + + + + diff --git a/src/views/synchronization/directive/syncList.vue b/src/views/synchronization/directive/syncList.vue new file mode 100644 index 0000000..20fb398 --- /dev/null +++ b/src/views/synchronization/directive/syncList.vue @@ -0,0 +1,214 @@ + + + + + \ No newline at end of file diff --git a/src/views/synchronization/directive/syncStep/SyncStepList.vue b/src/views/synchronization/directive/syncStep/SyncStepList.vue new file mode 100644 index 0000000..c4a96b3 --- /dev/null +++ b/src/views/synchronization/directive/syncStep/SyncStepList.vue @@ -0,0 +1,77 @@ + + + + + diff --git a/src/views/synchronization/directive/syncStep/SyncStepListModal.vue b/src/views/synchronization/directive/syncStep/SyncStepListModal.vue new file mode 100644 index 0000000..f83325c --- /dev/null +++ b/src/views/synchronization/directive/syncStep/SyncStepListModal.vue @@ -0,0 +1,63 @@ + + + + + + From 4b88a29ab36a6d01d19e990b0ee8e8fbfa1f7250 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Fri, 11 Jul 2025 08:37:28 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E6=9E=84=E5=BB=BA=E5=B7=A5=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/orgapplyinfo/OrgApplyInfo.data.ts | 5 + .../components/OrgApplyInfoForm.vue | 278 ++++++++++-------- .../components/OrgUpContractForm.vue | 28 +- 3 files changed, 175 insertions(+), 136 deletions(-) diff --git a/src/views/admin/orgapplyinfo/OrgApplyInfo.data.ts b/src/views/admin/orgapplyinfo/OrgApplyInfo.data.ts index 3113376..a3794e9 100644 --- a/src/views/admin/orgapplyinfo/OrgApplyInfo.data.ts +++ b/src/views/admin/orgapplyinfo/OrgApplyInfo.data.ts @@ -40,6 +40,11 @@ export const columns: BasicColumn[] = [ align: 'center', dataIndex: 'status_dictText', }, + { + title: '工单状态', + align: 'center', + dataIndex: 'workOrderStatus_dictText', + }, ]; // 高级查询数据 diff --git a/src/views/admin/orgapplyinfo/components/OrgApplyInfoForm.vue b/src/views/admin/orgapplyinfo/components/OrgApplyInfoForm.vue index 6a317d8..14736cc 100644 --- a/src/views/admin/orgapplyinfo/components/OrgApplyInfoForm.vue +++ b/src/views/admin/orgapplyinfo/components/OrgApplyInfoForm.vue @@ -4,96 +4,11 @@ @@ -213,6 +228,7 @@ import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue' import TencentMap from '/@/components/TencentMap/TencentMap.vue'; import JImageUpload from '/@/components/Form/src/jeecg/components/JImageUpload.vue'; import JUpload from '/@/components/Form/src/jeecg/components/JUpload/JUpload.vue'; +import { t } from '/@/hooks/web/useI18n'; const cityViewValue = ref('') const props = defineProps({ @@ -266,8 +282,16 @@ const formData = reactive>({ orgDistrict_dictText: '', franchiseTime: null, contract:null, + replyContent: '', + replyFile: '', + replyTime: '', + handleBy: '', + workOrderStatus: '', + workOrderStatus_dictText: '', + }); -const tempNullVal = ref('') +const tempNullVal = ref(''); +const sfsh = ref('0'); const { createMessage } = useMessage(); const labelCol = ref({ xs: { span: 24 }, sm: { span: 5 } }); const wrapperCol = ref({ xs: { span: 24 }, sm: { span: 17 } }); @@ -275,7 +299,6 @@ const confirmLoading = ref(false); //表单验证 const validatorRules = reactive({ status: [{ required: true, message: '请选择审批结果!' },], - contract: [{ required: true, message: '请上传加盟合同!' },], content: [ { validator: async (_rule, value) => { @@ -321,6 +344,7 @@ function edit(record) { tmpData[key] = record[key] } }) + var lsbl = tmpData.status; if (tmpData.status != '2' && tmpData.status != '3') { tmpData.status = null } @@ -329,6 +353,11 @@ function edit(record) { + (!!record.orgDistrict_dictText ? record.orgDistrict_dictText : '') //赋值 Object.assign(formData, tmpData); + if(lsbl == '1'){ + sfsh.value = '1' + }else{ + sfsh.value = '0' + } }); } @@ -366,6 +395,9 @@ async function submitForm() { } } } + if(model.status == '2'){ + model.buildStatus = '3' + } await saveOrUpdate(model, isUpdate.value) .then((res) => { if (res.success) { diff --git a/src/views/admin/orgapplyinfo/components/OrgUpContractForm.vue b/src/views/admin/orgapplyinfo/components/OrgUpContractForm.vue index 86ca329..68d4bff 100644 --- a/src/views/admin/orgapplyinfo/components/OrgUpContractForm.vue +++ b/src/views/admin/orgapplyinfo/components/OrgUpContractForm.vue @@ -10,42 +10,42 @@ - + {{formData.comName}} - - - - - - + {{cityViewValue}} - + {{formData.orgLeader}} - + {{formData.orgLeaderPhone}} - + {{formData.orgPropertyType}} - + {{formData.orgBuildingArea}}㎡ + + + + + {{formData.orgAddress}} @@ -57,8 +57,9 @@ - + +
说明：请上传pdf文件，并且只能上传一份文件
 { emit('ok');