From d82ba593e2a7dd346404752cfae880c990c245c1 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Tue, 1 Apr 2025 09:35:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=EF=BC=9A?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A2=84=E8=A7=88=E5=9B=BE=E7=89=87=E3=80=81?= =?UTF-8?q?=E5=8D=B3=E6=97=B6=E6=8C=87=E4=BB=A4=E5=9B=BE=E7=89=87=E9=A1=B9?= =?UTF-8?q?=20=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=E5=8C=85=EF=BC=9A?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../directivePackage/DirectivePackageList.vue | 28 +++++----- .../components/DirectivePackageModal.vue | 53 +++++++++++++------ .../ConfigServiceDirective.data.ts | 30 +++++++---- .../components/ConfigServiceDirectiveForm.vue | 22 ++++++-- 4 files changed, 91 insertions(+), 42 deletions(-) diff --git a/src/views/services/directivePackage/DirectivePackageList.vue b/src/views/services/directivePackage/DirectivePackageList.vue index d3bf860..9309a96 100644 --- a/src/views/services/directivePackage/DirectivePackageList.vue +++ b/src/views/services/directivePackage/DirectivePackageList.vue @@ -24,19 +24,21 @@ -
- -
{{ directive.description }}
-
{{ directive.createTime }} - {{ directive.createBy }}
-
- 编辑 - - 删除 - -
- -
+ + + +
{{ directive.description }}
+
{{ directive.createTime }} - {{ directive.createBy }}
+ + + + + diff --git a/src/views/services/directivePackage/components/DirectivePackageModal.vue b/src/views/services/directivePackage/components/DirectivePackageModal.vue index e031972..b238c26 100644 --- a/src/views/services/directivePackage/components/DirectivePackageModal.vue +++ b/src/views/services/directivePackage/components/DirectivePackageModal.vue @@ -11,21 +11,29 @@ -
- - -
- {{ directive.directiveName + handleTags('（', directive, '）') }} -
- 移除 -
-
- -
+ + +
+ + + + + {{ directive.directiveName + handleTags('（', directive, '）') }} + + + + + +
+
分类标签：{{ filterDictTextByCache('instruction_tag', derectiveInfo.instructionTagId) }}
@@ -113,7 +121,7 @@ function handleTags(prefix, directive_, suffix) { let str = directive_.tagList.map(item => item.tagName).join('、 '); return prefix + str + suffix } else { - return ' - ' + return '' } } @@ -264,10 +272,21 @@ defineExpose({ diff --git a/src/views/services/serviceDirective/ConfigServiceDirective.data.ts b/src/views/services/serviceDirective/ConfigServiceDirective.data.ts index 51f8acb..52c1da6 100644 --- a/src/views/services/serviceDirective/ConfigServiceDirective.data.ts +++ b/src/views/services/serviceDirective/ConfigServiceDirective.data.ts @@ -45,13 +45,13 @@ export const columns: BasicColumn[] = [ title: '指令标签', align: 'center', dataIndex: 'tagList', - width:150, + width: 150, ellipsis: false, format(text, record, index) { - if(!!text){ - return text.map(item => item.tagName).join('、'); - }else{ - return '-' + if (!!text) { + return text.map((item) => item.tagName).join('、'); + } else { + return '-'; } }, }, @@ -63,8 +63,8 @@ export const columns: BasicColumn[] = [ }, { title: '提成价格', - align: "center", - dataIndex: 'comPrice' + align: 'center', + dataIndex: 'comPrice', }, { title: '医保报销', @@ -113,12 +113,12 @@ export const columns: BasicColumn[] = [ }, { title: '语音文件', - align: "center", + align: 'center', dataIndex: 'mp3File', }, { title: '视频文件', - align: "center", + align: 'center', dataIndex: 'mp4File', }, // { @@ -143,6 +143,18 @@ export const columns: BasicColumn[] = [ // sorter: true, // dataIndex: 'updateTime' // }, + { + title: '预览图片', + align: 'center', + dataIndex: 'previewFile', + customRender: render.renderImage, + }, + { + title: '即时指令图片', + align: 'center', + dataIndex: 'immediateFile', + customRender: render.renderImage, + }, ]; // 高级查询数据 diff --git a/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue b/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue index ade8f00..51a44a2 100644 --- a/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue +++ b/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue @@ -136,17 +136,29 @@ --> + + + + + + + + + + + + - + - + @@ -186,11 +198,13 @@ import { useMessage } from '/@/hooks/web/useMessage'; import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue'; import { JCheckbox } from '/@/components/Form'; import JUpload from '/@/components/Form/src/jeecg/components/JUpload/JUpload.vue'; +import JImageUpload from '/@/components/Form/src/jeecg/components/JImageUpload.vue'; import { getValueType } from '/@/utils'; import { saveOrUpdate } from '../ConfigServiceDirective.api'; import { Form } from 'ant-design-vue'; import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue'; import { getFileAccessHttpUrl } from '/@/utils/common/compUtils'; + const props = defineProps({ formDisabled: { type: Boolean, default: false }, formData: { type: Object, default: () => ({}) }, @@ -221,6 +235,8 @@ const formData = reactive>({ updateTime: '', mp3File: '', mp4File: '', + previewFile: '', + immediateFile: '', }); const { createMessage } = useMessage(); const labelCol = ref({ xs: { span: 24 }, sm: { span: 6 } }); @@ -350,7 +366,7 @@ async function submitForm() { } //提成价格不能高于收费价格 - if (model.tollPrice <= model.comPrice) { + if (model.comPrice != 0 && model.tollPrice <= model.comPrice) { createMessage.warning('提成价格不能高于收费价格！'); confirmLoading.value = false; retrun;