From 6b82f973f6d53ba79a36c54e31558cd537f26251 Mon Sep 17 00:00:00 2001
From: "1378012178@qq.com" <1378012178@qq.com>
Date: Wed, 19 Mar 2025 16:53:19 +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=E6=96=B0=E5=A2=9E=E8=AF=AD=E9=9F=B3=E3=80=81?=
 =?UTF-8?q?=E8=A7=86=E9=A2=91=E6=96=87=E4=BB=B6=E6=92=AD=E6=94=BE=E3=80=81?=
 =?UTF-8?q?=E9=A2=84=E8=A7=88=202=E3=80=81=E5=AD=97=E6=AE=B5=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ConfigServiceDirective.data.ts            |  20 +--
 .../ConfigServiceDirectiveList.vue            | 141 ++++++++++--------
 .../components/ConfigServiceDirectiveForm.vue |  99 ++++++++----
 .../ConfigServiceDirectiveModal.vue           |   2 +-
 4 files changed, 156 insertions(+), 106 deletions(-)

diff --git a/src/views/config/serviceDirective/ConfigServiceDirective.data.ts b/src/views/config/serviceDirective/ConfigServiceDirective.data.ts
index 0140b46..8a389d2 100644
--- a/src/views/config/serviceDirective/ConfigServiceDirective.data.ts
+++ b/src/views/config/serviceDirective/ConfigServiceDirective.data.ts
@@ -97,16 +97,16 @@ export const columns: BasicColumn[] = [
     dataIndex: 'izEnabled_dictText',
     width: 100,
   },
-  // {
-  //   title: '语音文件',
-  //   align: "center",
-  //   dataIndex: 'mp3File',
-  // },
-  // {
-  //   title: '视频文件',
-  //   align: "center",
-  //   dataIndex: 'mp4File',
-  // },
+  {
+    title: '语音文件',
+    align: "center",
+    dataIndex: 'mp3File',
+  },
+  {
+    title: '视频文件',
+    align: "center",
+    dataIndex: 'mp4File',
+  },
   // {
   //   title: '创建人',
   //   align: "center",
diff --git a/src/views/config/serviceDirective/ConfigServiceDirectiveList.vue b/src/views/config/serviceDirective/ConfigServiceDirectiveList.vue
index fc931d2..ac023a6 100644
--- a/src/views/config/serviceDirective/ConfigServiceDirectiveList.vue
+++ b/src/views/config/serviceDirective/ConfigServiceDirectiveList.vue
@@ -21,21 +21,21 @@
                 :ignoreDisabled="true" allowClear />
             </a-form-item>
           </a-col>
-          <template v-if="toggleSearchStatus">
-            <a-col :lg="6">
-              <a-form-item name="instructionTagId">
-                <template #label><span title="指令标签">指令标签</span></template>
-                <j-dict-select-tag v-model:value="queryParam.instructionTagId" dictCode="instruction_tag"
-                  :ignoreDisabled="true" placeholder="请选择指令标签" allowClear />
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6">
-              <a-form-item name="directiveName">
-                <template #label><span title="服务指令">服务指令</span></template>
-                <JInput v-model:value="queryParam.directiveName" placeholder="请输入服务指令名称" allowClear />
-              </a-form-item>
-            </a-col>
-            <!-- <a-col :lg="6">
+          <!-- <template v-if="toggleSearchStatus"> -->
+          <a-col :lg="6">
+            <a-form-item name="directiveName">
+              <template #label><span title="服务指令">服务指令</span></template>
+              <JInput v-model:value="queryParam.directiveName" placeholder="请输入服务指令名称" allowClear />
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6">
+            <a-form-item name="instructionTagId">
+              <template #label><span title="分类标签">分类标签</span></template>
+              <j-dict-select-tag v-model:value="queryParam.instructionTagId" dictCode="instruction_tag"
+                :ignoreDisabled="true" placeholder="请选分类标签" allowClear />
+            </a-form-item>
+          </a-col>
+          <!-- <a-col :lg="6">
               <a-form-item name="tollPrice">
                 <template #label><span title="收费价格">收费价格</span></template>
                 <JRangeNumber v-model:value="queryParam.tollPrice" class="query-group-cust"></JRangeNumber>
@@ -47,52 +47,52 @@
                 <JRangeNumber v-model:value="queryParam.comPrice" class="query-group-cust"></JRangeNumber>
               </a-form-item>
             </a-col> -->
-            <a-col :lg="6">
-              <a-form-item name="izReimbursement">
-                <template #label><span title="医保报销">医保报销</span></template>
-                <j-dict-select-tag type='list' v-model:value="queryParam.izReimbursement" dictCode="med_ins_reimb"
-                  :ignoreDisabled="true" placeholder="请选择医保报销" allowClear />
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6">
-              <a-form-item name="izPreferential">
-                <template #label><span title="机构优惠">机构优惠</span></template>
-                <j-dict-select-tag type='list' v-model:value="queryParam.izPreferential"
-                  dictCode="institutional_discount" :ignoreDisabled="true" placeholder="请选择机构优惠" allowClear />
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6">
-              <a-form-item name="chargingFrequency">
-                <template #label><span title="收费频次">收费频次</span></template>
-                <j-dict-select-tag type="list" v-model:value="queryParam.chargingFrequency" dictCode="billing_frequency" :ignoreDisabled="true"
-                  placeholder="请选择收费频次" allowClear />
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6">
-              <a-form-item name="cycleType">
-                <template #label><span title="周期类型">周期类型</span></template>
-                <j-dict-select-tag type="list" v-model:value="queryParam.cycleType" dictCode="period_type" :ignoreDisabled="true"
-                  placeholder="请选择周期类型" allowClear />
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6">
-              <a-form-item name="izEnabled">
-                <template #label><span title="是否启用">是否启用</span></template>
-                <j-dict-select-tag type='list' v-model:value="queryParam.izEnabled" dictCode="iz_enabled" :ignoreDisabled="true"
-                  placeholder="请选择是否启用" allowClear />
-              </a-form-item>
-            </a-col>
-          </template>
+          <a-col :lg="6">
+            <a-form-item name="izReimbursement">
+              <template #label><span title="医保报销">医保报销</span></template>
+              <j-dict-select-tag type='list' v-model:value="queryParam.izReimbursement" dictCode="med_ins_reimb"
+                :ignoreDisabled="true" placeholder="请选择医保报销" allowClear />
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6">
+            <a-form-item name="izPreferential">
+              <template #label><span title="机构优惠">机构优惠</span></template>
+              <j-dict-select-tag type='list' v-model:value="queryParam.izPreferential" dictCode="institutional_discount"
+                :ignoreDisabled="true" placeholder="请选择机构优惠" allowClear />
+            </a-form-item>
+          </a-col>
+          <!-- <a-col :lg="6">
+            <a-form-item name="chargingFrequency">
+              <template #label><span title="收费频次">收费频次</span></template>
+              <j-dict-select-tag type="list" v-model:value="queryParam.chargingFrequency" dictCode="billing_frequency"
+                :ignoreDisabled="true" placeholder="请选择收费频次" allowClear />
+            </a-form-item>
+          </a-col> -->
+          <!-- <a-col :lg="6">
+            <a-form-item name="cycleType">
+              <template #label><span title="周期类型">周期类型</span></template>
+              <j-dict-select-tag type="list" v-model:value="queryParam.cycleType" dictCode="period_type"
+                :ignoreDisabled="true" placeholder="请选择周期类型" allowClear />
+            </a-form-item>
+          </a-col> -->
+          <a-col :lg="6">
+            <a-form-item name="izEnabled">
+              <template #label><span title="是否启用">是否启用</span></template>
+              <j-dict-select-tag type='list' v-model:value="queryParam.izEnabled" dictCode="iz_enabled"
+                :ignoreDisabled="true" placeholder="请选择是否启用" allowClear />
+            </a-form-item>
+          </a-col>
+          <!-- </template> -->
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
               <a-col :lg="6">
                 <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
                 <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset"
                   style="margin-left: 8px">重置</a-button>
-                <a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
+                <!-- <a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
                   {{ toggleSearchStatus ? '收起' : '展开' }}
                   <Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
-                </a>
+                </a> -->
               </a-col>
             </span>
           </a-col>
@@ -100,7 +100,7 @@
       </a-form>
     </div>
     <!--引用表格-->
-    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+    <BasicTable @register="registerTable">
       <!--插槽:table标题-->
       <template #tableTitle>
         <a-button type="primary" v-auth="'serviceDirective:config_service_directive:add'" @click="handleCategory"
@@ -115,7 +115,7 @@
           preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
         <j-upload-button type="primary" v-auth="'serviceDirective:config_service_directive:importExcel'"
           preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button> -->
-        <a-dropdown v-if="selectedRowKeys.length > 0">
+        <!-- <a-dropdown v-if="selectedRowKeys.length > 0">
           <template #overlay>
             <a-menu>
               <a-menu-item key="1" @click="batchHandleDelete">
@@ -124,10 +124,10 @@
               </a-menu-item>
             </a-menu>
           </template>
-          <a-button v-auth="'serviceDirective:config_service_directive:deleteBatch'">批量操作
-            <Icon icon="mdi:chevron-down"></Icon>
-          </a-button>
-        </a-dropdown>
+  <a-button v-auth="'serviceDirective:config_service_directive:deleteBatch'">批量操作
+    <Icon icon="mdi:chevron-down"></Icon>
+  </a-button>
+  </a-dropdown> -->
         <!-- 高级查询 -->
         <!-- <super-query :config="superQueryConfig" @search="handleSuperQuery" /> -->
       </template>
@@ -137,16 +137,16 @@
       </template>
       <template v-slot:bodyCell="{ column, record, index, text }">
         <template v-if="column.dataIndex === 'mp3File'">
-          <!--文件字段回显插槽-->
           <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small"
-            @click="downloadFile(text)">下载</a-button>
+          <audio controls v-else style="width: 100%; max-width: 300px; height: 40px;">
+            <source :src="getFileAccessHttpUrl(text)">
+          </audio>
         </template>
         <template v-if="column.dataIndex === 'mp4File'">
-          <!--文件字段回显插槽-->
           <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small"
-            @click="downloadFile(text)">下载</a-button>
+          <video controls v-else style="width: 100%; max-width: 400px; height: 200px;">
+            <source :src="getFileAccessHttpUrl(text)">
+          </video>
         </template>
       </template>
     </BasicTable>
@@ -195,6 +195,7 @@ import { cloneDeep } from "lodash-es";
 import ConfigServiceCategoryList from '../serviceCategory/ConfigServiceCategoryList.vue';
 import ConfigServiceTypeList from '../serviceType/ConfigServiceTypeList.vue';
 import DirectiveTagList from '../directiveTag/DirectiveTagList.vue';
+import { getFileAccessHttpUrl } from '/@/utils/common/compUtils';
 
 const formRef = ref();
 const queryParam = reactive<any>({});
@@ -209,6 +210,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
     columns,
     canResize: false,
     useSearchForm: false,
+    showIndexColumn: true,
     actionColumn: {
       width: 160,
       fixed: 'right',
@@ -439,4 +441,13 @@ function onTagClose() {
     width: 100%;
   }
 }
+
+audio::-webkit-media-controls-timeline {
+  display: none;
+}
+
+audio::-webkit-media-controls-current-time-display,
+audio::-webkit-media-controls-time-remaining-display {
+  display: none;
+}
 </style>
diff --git a/src/views/config/serviceDirective/components/ConfigServiceDirectiveForm.vue b/src/views/config/serviceDirective/components/ConfigServiceDirectiveForm.vue
index 8b98d5c..8d8cbdf 100644
--- a/src/views/config/serviceDirective/components/ConfigServiceDirectiveForm.vue
+++ b/src/views/config/serviceDirective/components/ConfigServiceDirectiveForm.vue
@@ -16,9 +16,8 @@
             <a-col :span="12">
               <a-form-item label="服务类型" v-bind="validateInfos.typeId" id="ConfigServiceDirectiveForm-typeId"
                 name="typeId">
-                <j-dict-select-tag type="list" v-model:value="formData.typeId"
-                  :dictCode="`config_service_type,type_name,id,del_flag = 0 order by sort asc`" placeholder="请选择服务类型"
-                  allowClear />
+                <j-dict-select-tag type="list" v-model:value="formData.typeId" :dictCode="typeDictCode"
+                  placeholder="请选择服务类型" allowClear />
               </a-form-item>
             </a-col>
             <a-col :span="12">
@@ -60,13 +59,13 @@
                   dictCode="institutional_discount" allowClear />
               </a-form-item>
             </a-col>
-            <a-col :span="12">
+            <!-- <a-col :span="12">
               <a-form-item label="收费频次" v-bind="validateInfos.chargingFrequency"
                 id="ConfigServiceDirectiveForm-chargingFrequency" name="chargingFrequency">
                 <j-dict-select-tag type="list" v-model:value="formData.chargingFrequency" dictCode="billing_frequency"
                   placeholder="请选择收费频次" allowClear />
               </a-form-item>
-            </a-col>
+            </a-col> -->
             <a-col :span="12">
               <a-form-item label="周期类型" v-bind="validateInfos.cycleType" id="ConfigServiceDirectiveForm-cycleType"
                 name="cycleType">
@@ -83,25 +82,22 @@
             <a-col :span="12">
               <a-form-item label="服务说明" v-bind="validateInfos.serviceContent"
                 id="ConfigServiceDirectiveForm-serviceContent" name="serviceContent">
-                <a-textarea v-model:value="formData.serviceContent" :rows="1" placeholder="请输入服务说明" />
+                <a-textarea v-model:value="formData.serviceContent" :rows="2" placeholder="请输入服务说明" />
               </a-form-item>
             </a-col>
-            <a-col :span="12">
-              <a-form-item label="语音文件" v-bind="validateInfos.mp3File" id="ConfigServiceDirectiveForm-mp3File"
-                name="mp3File">
-                <j-upload v-model:value="formData.mp3File" accept="audio/*"></j-upload>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="视频文件" v-bind="validateInfos.mp4File" id="ConfigServiceDirectiveForm-mp4File"
-                name="mp4File">
-                <j-upload v-model:value="formData.mp4File" accept="video/*"></j-upload>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
+          </a-row>
+          <a-row>
+            <!-- <a-col :span="12">
               <a-form-item label="排序" v-bind="validateInfos.sort" id="ConfigServiceDirectiveForm-sort" name="sort">
                 <a-input-number v-model:value="formData.sort" placeholder="请输入排序" style="width: 100%" />
               </a-form-item>
+            </a-col> -->
+            <a-col :span="24">
+              <a-form-item label="指令标签" id="ConfigServiceDirectiveForm-typeId"
+                :labelCol="labelCol2" :wrapperCol="wrapperCol2" name="typeId">
+                <JCheckbox v-model:value="formData.tags"
+                  :dictCode="`config_directive_tag,tag_name,id,del_flag = 0 order by sort asc`" />
+              </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="是否启用" v-bind="validateInfos.izEnabled" id="ConfigServiceDirectiveForm-izEnabled"
@@ -110,14 +106,7 @@
                   placeholder="请选择是否启用"  allowClear />
               </a-form-item>
             </a-col>
-            <a-col :span="24">
-              <a-form-item label="指令标签" v-bind="validateInfos.typeId" id="ConfigServiceDirectiveForm-typeId" :labelCol="labelCol2" :wrapperCol="wrapperCol2"
-                name="typeId">
-                <JCheckbox v-model:value="formData.tags"
-                  :dictCode="`config_directive_tag,tag_name,id,del_flag = 0 order by sort asc`" />
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
+            <!-- <a-col :span="12">
               <a-form-item label="创建人" v-bind="validateInfos.createBy" id="ConfigServiceDirectiveForm-createBy"
                 name="createBy">
                 <a-input v-model:value="formData.createBy" placeholder="请输入创建人" disabled allow-clear></a-input>
@@ -142,6 +131,43 @@
                 <a-date-picker placeholder="请选择更新日期" v-model:value="formData.updateTime" showTime
                   value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" disabled allow-clear />
               </a-form-item>
+            </a-col> -->
+          </a-row>
+          <a-row>
+            <a-col :span="12">
+              <a-form-item label="语音文件" v-bind="validateInfos.mp3File" id="ConfigServiceDirectiveForm-mp3File"
+                name="mp3File">
+                <j-upload v-model:value="formData.mp3File" accept=".mp3" :maxCount="1"></j-upload>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="视频文件" v-bind="validateInfos.mp4File" id="ConfigServiceDirectiveForm-mp4File"
+                name="mp4File">
+                <j-upload v-model:value="formData.mp4File" accept=".mp4" :maxCount="1"></j-upload>
+              </a-form-item>
+            </a-col>
+          </a-row>
+        </a-form>
+      </template>
+    </JFormContainer>
+    <JFormContainer>
+      <template #detail>
+        <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol"
+          name="ConfigServiceDirectiveForm">
+          <a-row>
+            <a-col :span="12" v-if="!!formData.mp3File">
+              <a-form-item label="语音预览" id="ConfigServiceDirectiveForm-mp3File" name="mp3File">
+                <audio controls disabled="false">
+                  <source :src="getFileAccessHttpUrl(formData.mp3File)">
+                </audio>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12" v-if="!!formData.mp4File" :push="!!formData.mp3File ? 0 : 12">
+              <a-form-item label="视频预览" id="ConfigServiceDirectiveForm-mp4File" name="mp4File">
+                <video controls>
+                  <source :src="getFileAccessHttpUrl(formData.mp4File)">
+                </video>
+              </a-form-item>
             </a-col>
           </a-row>
         </a-form>
@@ -151,7 +177,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted } from 'vue';
+import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted, watch } from 'vue';
 import { defHttp } from '/@/utils/http/axios';
 import { useMessage } from '/@/hooks/web/useMessage';
 import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
@@ -161,6 +187,7 @@ 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: () => ({}) },
@@ -208,9 +235,9 @@ const validatorRules = reactive({
   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: '请选择收费频次!' },],
+  // chargingFrequency: [{ required: true, message: '请选择收费频次!' },],
   cycleType: [{ required: true, message: '请选择周期类型!' },],
-  sort: [{ required: true, message: '请输入排序!' }, { pattern: /^\d+$/, message: '请输入正整数!' },],
+  // sort: [{ required: true, message: '请输入排序!' }, { pattern: /^\d+$/, message: '请输入正整数!' },],
   serviceDuration: [{ required: true, message: '请输入服务时长（分钟）!' }, { pattern: /^\d+$/, message: '请输入正整数!' },],
   izEnabled: [{ required: true, message: '请选择是否启用!' },],
 });
@@ -226,7 +253,19 @@ const disabled = computed(() => {
   }
   return props.formDisabled;
 });
+const typeDictCode = ref('')
 
+watch(
+  () => formData.categoryId,
+  (newCategoryId) => {
+    if (!newCategoryId) {
+      formData.typeId = '';
+      typeDictCode.value = 'config_service_type,type_name,id,del_flag = 99 order by sort asc';
+    } else {
+      typeDictCode.value = `config_service_type,type_name,id,del_flag = 0 and category_id = '${newCategoryId}' order by sort asc`;
+    }
+  }
+);
 
 /**
  * 新增
diff --git a/src/views/config/serviceDirective/components/ConfigServiceDirectiveModal.vue b/src/views/config/serviceDirective/components/ConfigServiceDirectiveModal.vue
index 49f4c96..0aecc0f 100644
--- a/src/views/config/serviceDirective/components/ConfigServiceDirectiveModal.vue
+++ b/src/views/config/serviceDirective/components/ConfigServiceDirectiveModal.vue
@@ -1,6 +1,6 @@
 <template>
   <j-modal :title="title" width="70vw" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭" :maskClosable="false">
-    <ConfigServiceDirectiveForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></ConfigServiceDirectiveForm>
+    <ConfigServiceDirectiveForm ref="registerForm" v-if="visible" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></ConfigServiceDirectiveForm>
   </j-modal>
 </template>