diff --git a/src/views/services/directivePackage/components/ConfigServiceDirectiveForm.vue b/src/views/services/directivePackage/components/ConfigServiceDirectiveForm.vue index 169425b..e53a75a 100644 --- a/src/views/services/directivePackage/components/ConfigServiceDirectiveForm.vue +++ b/src/views/services/directivePackage/components/ConfigServiceDirectiveForm.vue @@ -37,14 +37,14 @@ + precision="2" /> + precision="2" /> @@ -319,7 +319,7 @@ async function submitForm() { } //提成价格不能高于收费价格 - if (model.tollPrice <= model.comPrice) { + if (model.tollPrice < model.comPrice) { createMessage.warning('提成价格不能高于收费价格！'); confirmLoading.value = false; retrun; diff --git a/src/views/services/instructiontag/components/InstructionTagForm.vue b/src/views/services/instructiontag/components/InstructionTagForm.vue index 4eef26d..e2d0c66 100644 --- a/src/views/services/instructiontag/components/InstructionTagForm.vue +++ b/src/views/services/instructiontag/components/InstructionTagForm.vue @@ -8,7 +8,8 @@ - + diff --git a/src/views/services/serviceCategory/components/ConfigServiceCategoryForm.vue b/src/views/services/serviceCategory/components/ConfigServiceCategoryForm.vue index abd9d26..2c16156 100644 --- a/src/views/services/serviceCategory/components/ConfigServiceCategoryForm.vue +++ b/src/views/services/serviceCategory/components/ConfigServiceCategoryForm.vue @@ -16,7 +16,7 @@ - diff --git a/src/views/services/serviceDirective/ConfigServiceDirective.data.ts b/src/views/services/serviceDirective/ConfigServiceDirective.data.ts index 2df3097..9677605 100644 --- a/src/views/services/serviceDirective/ConfigServiceDirective.data.ts +++ b/src/views/services/serviceDirective/ConfigServiceDirective.data.ts @@ -70,12 +70,13 @@ export const columns: BasicColumn[] = [ title: '收费价格', align: 'center', dataIndex: 'tollPrice', - width: 100, + width: 95, }, { title: '提成价格', align: 'center', dataIndex: 'comPrice', + width: 95, }, { title: '医保报销', diff --git a/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue b/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue index 10b1cdb..05c6c8a 100644 --- a/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue +++ b/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue @@ -41,7 +41,7 @@ @@ -49,7 +49,7 @@ @@ -337,7 +337,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ pageSizeOptions: ['10', '20', '50', '100'], }, actionColumn: { - width: 200, + width: 70, fixed: 'right', }, beforeFetch: async (params) => { diff --git a/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue b/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue index 0e40379..2bc8f5a 100644 --- a/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue +++ b/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue @@ -5,7 +5,7 @@ - + @@ -39,15 +39,15 @@ - + - + @@ -83,14 +83,16 @@ - - + - + - + @@ -189,14 +191,31 @@ import { Form } from 'ant-design-vue'; import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue'; import { getFileAccessHttpUrl } from '/@/utils/common/compUtils'; +const onPriceKeydown = (e: KeyboardEvent) => { + const key = e.key; + // 放行控制键 + if (['Backspace', 'Delete', 'ArrowLeft', 'ArrowRight', 'Tab'].includes(key)) return; + // 只能输数字和点 + if (!/[\d.]/.test(key)) { + e.preventDefault(); + return; + } + const input = e.target as HTMLInputElement; + const { value, selectionStart: s, selectionEnd: t } = input; + const next = value.slice(0, s!) + key + value.slice(t!); + // 整数最多5位，小数最多2位 + if (!/^\d{0,5}(?:\.\d{0,2})?$/.test(next)) { + e.preventDefault(); + } +}; const props = defineProps({ formDisabled: { type: Boolean, default: false }, formData: { type: Object, default: () => ({}) }, formBpm: { type: Boolean, default: true }, mainOrgCode: '', }); -const bodyTagDictCode = ref(`nu_config_body_tag,tag_name,id,del_flag = 0 order by sort asc`) -const emotionTagDictCode = ref(`nu_config_emotion_tag,tag_name,id,del_flag = 0 order by sort asc`) +const bodyTagDictCode = ref(`nu_config_body_tag,tag_name,id,del_flag = 0 and iz_enabled = 0 order by sort asc`) +const emotionTagDictCode = ref(`nu_config_emotion_tag,tag_name,id,del_flag = 0 and iz_enabled = 0 order by sort asc`) const formRef = ref(); const useForm = Form.useForm; const emit = defineEmits(['register', 'ok']); @@ -272,6 +291,7 @@ const validatorRules = reactive({ ], izEnabled: [{ required: true, message: '请选择是否启用!' },], }); + const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false }); // 表单禁用 const disabled = computed(() => { @@ -411,19 +431,25 @@ const showMedia = ref(true) * 编辑 * isEditMedia_是否为编辑指令资源 （隐藏业务字段） */ -function edit(record, isEditMedia_ = false, showMedia_ = true) { - // if (!!record.bodyTags) { - // // 将逗号分隔的字符串转换为 'id1','id2','id3' 格式 - // const bodyTagIds = record.bodyTags.split(',').map(id => `'${id}'`).join(','); - // bodyTagDictCode.value = `nu_config_body_tag,tag_name,id,del_flag = 0` + " and id in (" + bodyTagIds + ")" + ` order by sort asc`; - // } - // console.log("🌊 ~ edit ~ bodyTagDictCode.value:", bodyTagDictCode.value) - // if (!!record.emotionTags) { - // // 将逗号分隔的字符串转换为 'id1','id2','id3' 格式 - // const emotionTagIds = record.emotionTags.split(',').map(id => `'${id}'`).join(','); - // emotionTagDictCode.value = `nu_config_emotion_tag,tag_name,id,del_flag = 0` + " and id in (" + emotionTagIds + ")" + ` order by sort asc`; - // } - +function edit(record, isEditMedia_ = false, showMedia_ = true, showExistTags = true) { + if (!!record.bodyTags && showExistTags) { + // 将逗号分隔的字符串转换为 "id = 'id1' or id = 'id2'" 格式 + const bodyTagConditions = record.bodyTags.split(',') + .map(id => `id = '${id}'`) + .join(' or '); + bodyTagDictCode.value = `nu_config_body_tag,tag_name,id,del_flag = 0 and iz_enabled = 0 ` + + (bodyTagConditions ? ` and (${bodyTagConditions})` : '') + + ` order by sort asc`; + } + if (!!record.emotionTags && showExistTags) { + // 将逗号分隔的字符串转换为 "id = 'id1' or id = 'id2'" 格式 + const emotionTagConditions = record.emotionTags.split(',') + .map(id => `id = '${id}'`) + .join(' or '); + emotionTagDictCode.value = `nu_config_emotion_tag,tag_name,id,del_flag = 0 and iz_enabled = 0 ` + + (emotionTagConditions ? ` and (${emotionTagConditions})` : '') + + ` order by sort asc`; + } needWatch.value = false showMedia.value = showMedia_ setTimeout(() => { @@ -485,7 +511,7 @@ async function submitForm() { } //提成价格不能高于收费价格 - if (model.comPrice != 0 && model.tollPrice <= model.comPrice) { + if (model.comPrice != 0 && model.tollPrice < model.comPrice) { createMessage.warning('提成价格不能高于收费价格！'); confirmLoading.value = false; return diff --git a/src/views/services/serviceDirective/components/ConfigServiceDirectiveModal.vue b/src/views/services/serviceDirective/components/ConfigServiceDirectiveModal.vue index 9e953fe..e8ec0ef 100644 --- a/src/views/services/serviceDirective/components/ConfigServiceDirectiveModal.vue +++ b/src/views/services/serviceDirective/components/ConfigServiceDirectiveModal.vue @@ -31,15 +31,15 @@ - - - + @@ -48,7 +48,7 @@ 关闭 镜像 - --> +