diff --git a/src/assets/images/a14.png b/src/assets/images/a14.png new file mode 100644 index 0000000..5d6499c Binary files /dev/null and b/src/assets/images/a14.png differ diff --git a/src/components/Table/src/BasicTable.vue b/src/components/Table/src/BasicTable.vue index 12380db..4dd1dc8 100644 --- a/src/components/Table/src/BasicTable.vue +++ b/src/components/Table/src/BasicTable.vue @@ -501,10 +501,10 @@ padding: 10px; .ant-form { - padding: 12px 10px 6px 10px; + padding: 22px 10px 6px 10px; margin-bottom: 8px; background-color: @component-background; - border-radius: 2px; + border-radius: 8px; } } 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'); diff --git a/src/views/services/serviceDirective/ConfigServiceDirective.api.ts b/src/views/services/serviceDirective/ConfigServiceDirective.api.ts index 6f651d6..9afa076 100644 --- a/src/views/services/serviceDirective/ConfigServiceDirective.api.ts +++ b/src/views/services/serviceDirective/ConfigServiceDirective.api.ts @@ -11,6 +11,9 @@ enum Api { deleteBatch = '/services/serviceDirective/configServiceDirective/deleteBatch', importExcel = '/services/serviceDirective/configServiceDirective/importExcel', exportXls = '/services/serviceDirective/configServiceDirective/exportXls', + async = '/services/serviceDirective/configServiceDirective/async', + departList = '/sys/sysDepart/list', + } /** @@ -29,6 +32,7 @@ export const getImportUrl = Api.importExcel; * @param params */ export const list = (params) => defHttp.get({ url: Api.list, params }); +export const departList = (params) => defHttp.get({ url: Api.departList, params }); /** * 删除单个 @@ -70,3 +74,11 @@ export const saveOrUpdate = (params, isUpdate) => { let url = isUpdate ? Api.edit : Api.save; return defHttp.post({ url: url, params }, { isTransformResponse: false }); } + +/** + * 同步数据 + * @param params + */ +export const asyncFunc = (params) => { + return defHttp.post({ url: Api.async, params }, { isTransformResponse: false }); +} \ No newline at end of file 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 @@ + + + + + +