From 566262c5e6343667b69906109b7f7bafcfa46b77 Mon Sep 17 00:00:00 2001
From: "1378012178@qq.com" <1378012178@qq.com>
Date: Fri, 21 Mar 2025 10:45:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=EF=BC=9A?=
 =?UTF-8?q?=201=E3=80=81=E9=87=91=E9=A2=9D=E5=AD=97=E6=AE=B5=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E4=BF=9D=E7=95=994=E4=BD=8D=E5=B0=8F=E6=95=B0=202?=
 =?UTF-8?q?=E3=80=81=E5=A2=9E=E5=8A=A0=E6=8F=90=E6=88=90=E4=BB=B7=E6=A0=BC?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E5=A4=A7=E4=BA=8E=E7=AD=89=E4=BA=8E=E6=94=B6?=
 =?UTF-8?q?=E8=B4=B9=E4=BB=B7=E6=A0=BC=E9=AA=8C=E8=AF=81=203=E3=80=81?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E4=BB=B7=E6=A0=BC=E3=80=81=E5=8C=BB=E4=BF=9D?=
 =?UTF-8?q?=E6=8A=A5=E9=94=80=E7=AD=89=E5=AD=97=E6=AE=B5=204=E3=80=81?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9A=90=E8=97=8F=E7=9B=B8=E5=BA=94?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E3=80=81=E8=A7=86=E9=A2=91=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=8C=89=E9=92=AE=E6=92=AD=E6=94=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ConfigServiceDirectiveList.vue            | 31 +++++++++++++++++--
 .../components/ConfigServiceDirectiveForm.vue | 18 ++++++++---
 2 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/src/views/config/serviceDirective/ConfigServiceDirectiveList.vue b/src/views/config/serviceDirective/ConfigServiceDirectiveList.vue
index df0e4cf..abd2742 100644
--- a/src/views/config/serviceDirective/ConfigServiceDirectiveList.vue
+++ b/src/views/config/serviceDirective/ConfigServiceDirectiveList.vue
@@ -144,9 +144,9 @@
         </template>
         <template v-if="column.dataIndex === 'mp4File'">
           <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <video controls v-else style="width: 100%; max-width: 400px; height: 200px;">
-            <source :src="getFileAccessHttpUrl(text)">
-          </video>
+          <template v-else>
+            <a-button type="primary" @click="openVideoModal(text)">播放视频</a-button>
+          </template>
         </template>
       </template>
     </BasicTable>
@@ -177,6 +177,15 @@
     </template>
     <DirectiveTagList v-if="tagOpen"></DirectiveTagList>
   </a-drawer>
+
+  <!-- 视频播放 -->
+  <a-modal v-model:visible="showVideoModal" title="视频播放" :footer="null" @cancel="closeVideoModal"
+    :bodyStyle="{ padding: '0', maxHeight: '80vh', overflow: 'auto' }">
+    <video controls style="width: 100%; max-height: 70vh; display: block; margin: 0 auto;">
+      <source :src="videoUrl">
+      您的浏览器不支持视频播放。
+    </video>
+  </a-modal>
 </template>
 
 <script lang="ts" name="serviceDirective-configServiceDirective" setup>
@@ -409,6 +418,22 @@ function onTypeClose() {
 function onTagClose() {
   tagOpen.value = false
 }
+
+
+const showVideoModal = ref(false); // 控制模态框显示
+const videoUrl = ref(''); // 视频 URL
+
+// 打开视频模态框
+const openVideoModal = (url) => {
+  videoUrl.value = getFileAccessHttpUrl(url);
+  showVideoModal.value = true;
+};
+
+// 关闭视频模态框
+const closeVideoModal = () => {
+  showVideoModal.value = false;
+  videoUrl.value = '';
+};
 </script>
 
 <style lang="less" scoped>
diff --git a/src/views/config/serviceDirective/components/ConfigServiceDirectiveForm.vue b/src/views/config/serviceDirective/components/ConfigServiceDirectiveForm.vue
index a0d34b3..f4b0389 100644
--- a/src/views/config/serviceDirective/components/ConfigServiceDirectiveForm.vue
+++ b/src/views/config/serviceDirective/components/ConfigServiceDirectiveForm.vue
@@ -36,13 +36,15 @@
             <!-- <a-col :span="12">
               <a-form-item label="收费价格(元)" v-bind="validateInfos.tollPrice" id="ConfigServiceDirectiveForm-tollPrice"
                 name="tollPrice">
-                <a-input-number v-model:value="formData.tollPrice" placeholder="请输入收费价格" style="width: 100%" />
+                <a-input-number v-model:value="formData.tollPrice" placeholder="请输入收费价格" style="width: 100%"
+                  precision="4" />
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="提成价格(元)" v-bind="validateInfos.comPrice" id="ConfigServiceDirectiveForm-comPrice"
                 name="comPrice">
-                <a-input-number v-model:value="formData.comPrice" placeholder="请输入提成价格" style="width: 100%" />
+                <a-input-number v-model:value="formData.comPrice" placeholder="请输入提成价格" style="width: 100%"
+                  precision="4" />
               </a-form-item>
             </a-col>
             <a-col :span="12">
@@ -232,8 +234,8 @@ const validatorRules = reactive({
   typeId: [{ required: true, message: '请选择服务类型!' },],
   instructionTagId: [{ required: true, message: '请选择分类标签!' },],
   directiveName: [{ required: true, message: '请输入服务指令名称!' },],
-  tollPrice: [{ required: true, message: '请输入收费价格!' }, { pattern: /^(([0-9]*)|([0]\.\d{0,2}|[1-9][0-9]*\.\d{0,2}))$/, message: '请输入正确的金额!' },],
-  comPrice: [{ required: false }, { pattern: /^(([0-9]*)|([0]\.\d{0,2}|[1-9][0-9]*\.\d{0,2}))$/, message: '请输入正确的金额!' },],
+  tollPrice: [{ required: true, message: '请输入收费价格!' }, { pattern: /^(([0-9]*)|([0]\.\d{0,4}|[1-9][0-9]*\.\d{0,4}))$/, message: '请输入正确的金额!' },],
+  comPrice: [{ required: false }, { pattern: /^(([0-9]*)|([0]\.\d{0,4}|[1-9][0-9]*\.\d{0,4}))$/, message: '请输入正确的金额!' },],
   izReimbursement: [{ required: true, message: '请选择是否参与医保报销!' },],
   izPreferential: [{ required: true, message: '请选择是否参与机构优惠!' },],
   // chargingFrequency: [{ required: true, message: '请选择收费频次!' },],
@@ -346,6 +348,14 @@ async function submitForm() {
       }
     }
   }
+
+  //提成价格不能高于收费价格
+  if (model.tollPrice <= model.comPrice) {
+    createMessage.warning('提成价格不能高于收费价格！');
+    confirmLoading.value = false;
+    retrun;
+  }
+
   await saveOrUpdate(model, isUpdate.value)
     .then((res) => {
       if (res.success) {