Compare commits

..

No commits in common. "a2e32fac928a92567e1f6cd7a4f15843ca239e8a" and "393b302379f677f9aa7dbd147dda39b011b6f7ad" have entirely different histories.

2 changed files with 7 additions and 42 deletions

View File

@ -144,9 +144,9 @@
</template>
<template v-if="column.dataIndex === 'mp4File'">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
<template v-else>
<a-button type="primary" @click="openVideoModal(text)">播放视频</a-button>
</template>
<video controls v-else style="width: 100%; max-width: 400px; height: 200px;">
<source :src="getFileAccessHttpUrl(text)">
</video>
</template>
</template>
</BasicTable>
@ -177,15 +177,6 @@
</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>
@ -418,22 +409,6 @@ 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>

View File

@ -36,15 +36,13 @@
<!-- <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%"
precision="4" />
<a-input-number v-model:value="formData.tollPrice" placeholder="请输入收费价格" style="width: 100%" />
</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%"
precision="4" />
<a-input-number v-model:value="formData.comPrice" placeholder="请输入提成价格" style="width: 100%" />
</a-form-item>
</a-col>
<a-col :span="12">
@ -234,8 +232,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,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: '请输入正确的金额!' },],
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: '请输入正确的金额!' },],
izReimbursement: [{ required: true, message: '请选择是否参与医保报销!' },],
izPreferential: [{ required: true, message: '请选择是否参与机构优惠!' },],
// chargingFrequency: [{ required: true, message: '!' },],
@ -348,14 +346,6 @@ async function submitForm() {
}
}
}
//
if (model.tollPrice <= model.comPrice) {
createMessage.warning('提成价格不能高于收费价格!');
confirmLoading.value = false;
retrun;
}
await saveOrUpdate(model, isUpdate.value)
.then((res) => {
if (res.success) {