diff --git a/src/views/services/directivePackage/DirectivePackageList.vue b/src/views/services/directivePackage/DirectivePackageList.vue index 221b37b..dfc6c04 100644 --- a/src/views/services/directivePackage/DirectivePackageList.vue +++ b/src/views/services/directivePackage/DirectivePackageList.vue @@ -42,12 +42,18 @@ + + + {{ getHHMM(directive.startTimeStr) }} + ~ + {{ getHHMM(directive.endTimeStr) }} + + @@ -83,6 +89,7 @@ import DirectivePackageModal from './components/DirectivePackageModal.vue' import { list, queryById, deleteOne } from './DirectivePackage.api' import { Pagination } from 'ant-design-vue'; import { defHttp } from '/@/utils/http/axios'; +import dayjs from "dayjs"; const registerModal = ref(); const searchForm = ref({}) @@ -107,6 +114,15 @@ function handleChangeIzEnabled(record){ searchQuery() }); } + +function getHHMM(value){ + if(value){ +return dayjs(value).format('HH:mm') + }else{ + return '未配置' + } + +} /** * 搜索 */ @@ -231,7 +247,7 @@ onMounted(() => { .cardDivClass:hover{ padding: 5px;background-color: #f4fcff;border-radius: 8px;height: 180px; box-shadow: - 0 0 0 2px #d3d3d3, /* 描边 */ + 0 0 0 1px #59bffe, /* 描边 */ 0 4px 8px rgba(0, 0, 0, 0.1); /* 阴影 */ transform: translate(-2px , -2px); /* 轻微上浮效果 */ } diff --git a/src/views/services/directivePackage/components/ConfigServiceDirective.api.ts b/src/views/services/directivePackage/components/ConfigServiceDirective.api.ts index 6f651d6..7cfc516 100644 --- a/src/views/services/directivePackage/components/ConfigServiceDirective.api.ts +++ b/src/views/services/directivePackage/components/ConfigServiceDirective.api.ts @@ -4,13 +4,13 @@ import { useMessage } from "/@/hooks/web/useMessage"; const { createConfirm } = useMessage(); enum Api { - list = '/services/serviceDirective/configServiceDirective/list', - save='/services/serviceDirective/configServiceDirective/add', - edit='/services/serviceDirective/configServiceDirective/edit', - deleteOne = '/services/serviceDirective/configServiceDirective/delete', - deleteBatch = '/services/serviceDirective/configServiceDirective/deleteBatch', - importExcel = '/services/serviceDirective/configServiceDirective/importExcel', - exportXls = '/services/serviceDirective/configServiceDirective/exportXls', + list = '/services/serviceDirective/list', + save='/services/serviceDirective/add', + edit='/services/serviceDirective/edit', + deleteOne = '/services/serviceDirective/delete', + deleteBatch = '/services/serviceDirective/deleteBatch', + importExcel = '/services/serviceDirective/importExcel', + exportXls = '/services/serviceDirective/exportXls', } /** diff --git a/src/views/services/directivePackage/components/ConfigServiceDirective.data.ts b/src/views/services/directivePackage/components/ConfigServiceDirective.data.ts index e91e5ae..2f47a8e 100644 --- a/src/views/services/directivePackage/components/ConfigServiceDirective.data.ts +++ b/src/views/services/directivePackage/components/ConfigServiceDirective.data.ts @@ -65,7 +65,7 @@ export const selectedColumns: BasicColumn[] = [ { title: '分类标签', align: 'center', - dataIndex: 'instructionTagId', + dataIndex: 'instructionTagName', }, { title: '服务类别', diff --git a/src/views/services/directivePackage/components/ConfigServiceDirectiveList.vue b/src/views/services/directivePackage/components/ConfigServiceDirectiveList.vue index 478abc1..76ba106 100644 --- a/src/views/services/directivePackage/components/ConfigServiceDirectiveList.vue +++ b/src/views/services/directivePackage/components/ConfigServiceDirectiveList.vue @@ -5,7 +5,15 @@ - + + + + + + + - + - + - + 查询 @@ -51,15 +59,14 @@ - @@ -44,6 +47,7 @@ import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectT import { getValueType } from '/@/utils'; import { saveOrUpdate } from '../DirectivePackage.api'; import { Form } from 'ant-design-vue'; +import dayjs from "dayjs"; import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue'; const props = defineProps({ formDisabled: { type: Boolean, default: false }, @@ -59,15 +63,20 @@ const formData = reactive>({ description: '', sort: 99, izEnabled: '0', + startTimeStr: '', + endTimeStr: '', + instructionTagId: '', }); const { createMessage } = useMessage(); - const labelCol = ref({ xs: { span: 24 }, sm: { span: 8 } }); + const labelCol = ref({ xs: { span: 24 }, sm: { span: 6 } }); const wrapperCol = ref({ xs: { span: 24 }, sm: { span: 16 } }); + const labelCol2 = ref({ xs: { span: 24 }, sm: { span: 2 } }); + const wrapperCol2 = ref({ xs: { span: 24 }, sm: { span: 21 } }); const confirmLoading = ref(false); //表单验证 const validatorRules = reactive({ - packageName: [{ required: true, message: '请输入服务指令包名称!' },], - sort: [{ required: true, message: '请输入排序!' }, { pattern: /^\d+$/, message: '请输入整数!' },], + // packageName: [{ required: true, message: '请输入服务指令包名称!' },], + // sort: [{ required: true, message: '请输入排序!' }, { pattern: /^\d+$/, message: '请输入整数!' },], }); const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false }); @@ -103,8 +112,17 @@ function edit(record) { tmpData[key] = record[key] } }) + console.log("🚀 ~ nextTick ~ tmpData:", tmpData) //赋值 Object.assign(formData, tmpData); + + if(formData.startTimeStr){ + formData.startTimeStr = dayjs(formData.startTimeStr,"YYYY-MM-DD hh:mm:ss") + } + if(formData.endTimeStr){ + formData.endTimeStr = dayjs(formData.endTimeStr,"YYYY-MM-DD hh:mm:ss") + } + console.log("🚀 ~ nextTick ~ formData:", formData) }); } @@ -145,18 +163,43 @@ async function submitForm(directives) { if (directives.length > 0) { model.directives = directives } - await saveOrUpdate(model, isUpdate.value) - .then((res) => { - if (res.success) { - createMessage.success(res.message); - emit('ok'); - } else { - createMessage.warning(res.message); - } - }) - .finally(() => { + if(!model.packageName){ + createMessage.warning('请填写服务指令包名称'); + confirmLoading.value = false; + return; + } + if(!model.startTimeStr){ + createMessage.warning('请选择开始时间'); + confirmLoading.value = false; + return; + } + if(!model.endTimeStr){ + createMessage.warning('请选择结束时间'); + confirmLoading.value = false; + return; + } + var directivesList = model.directives; + if(directivesList.length == 0){ + createMessage.warning('请选择服务指令'); confirmLoading.value = false; - }); + return; + }else{ + model.instructionTagId = directivesList[0].instructionTagId; + } + console.log('model', model); + // confirmLoading.value = false; + await saveOrUpdate(model, isUpdate.value) + .then((res) => { + if (res.success) { + createMessage.success(res.message); + emit('ok'); + } else { + createMessage.warning(res.message); + } + }) + .finally(() => { + confirmLoading.value = false; + }); } diff --git a/src/views/services/directivePackage/components/DirectivePackageModal.vue b/src/views/services/directivePackage/components/DirectivePackageModal.vue index 8b9c1ae..267c59b 100644 --- a/src/views/services/directivePackage/components/DirectivePackageModal.vue +++ b/src/views/services/directivePackage/components/DirectivePackageModal.vue @@ -5,27 +5,27 @@ - + - + - 引用 + 引用服务指令包 - 新增 + 选择服务指令 - -
+ +
- - 分类 + + {{directive.instructionTagName||directive.instructionTagId_dictText}} @@ -38,36 +38,41 @@
-
+
+ +
- - {{ directive.directiveName }} + + {{ directive.directiveName }} - - + + - + - + @@ -76,29 +81,29 @@
- + -
+
医保
-
+
{{directive.izReimbursement=='1'?'报销':'不报销'}}
- + -
+
优惠
-
+
{{directive.izPreferential=='1'?'参与':'不参与'}}
@@ -126,7 +131,8 @@ -