Merge branch 'master' of http://47.115.223.229:8888/yangjun/hldy_vue

1、金额字段改为保留4位小数
2、增加提成价格不能大于等于收费价格验证
3、隐藏价格、医保报销等字段
4、列表页隐藏相应字段、视频改为点击按钮播放

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>

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) {