From 075f67891eaaf576cfe68f7d2aebc0861cd700f0 Mon Sep 17 00:00:00 2001
From: "1378012178@qq.com" <1378012178@qq.com>
Date: Tue, 3 Mar 2026 10:57:10 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9C=8D=E5=8A=A1=E5=B1=9E=E6=80=A7=EF=BC=88?=
 =?UTF-8?q?=E5=AE=9A=E6=97=B6=E3=80=81=E8=AE=A1=E6=97=B6=EF=BC=89=202?=
 =?UTF-8?q?=E3=80=81=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?/=E6=96=B0=E5=A2=9E/=E7=BC=96=E8=BE=91=E5=B0=86=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E6=8C=87=E4=BB=A4=E5=9B=BE=E6=A0=87=E3=80=81=E7=84=A6?=
 =?UTF-8?q?=E7=82=B9=E6=8C=87=E4=BB=A4=E5=9B=BE=E6=A0=87=E6=8C=AA=E5=88=B0?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=E6=8F=8F=E8=BF=B0=E5=89=8D?=
 =?UTF-8?q?=203=E3=80=81=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E5=9B=9E=E6=98=BE=E6=9C=8D=E5=8A=A1=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=EF=BC=9B=E8=AF=A6=E6=83=85=E3=80=81=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=9B=9E=E6=98=BE=E6=9C=8D=E5=8A=A1=E5=B1=9E=E6=80=A7=204?=
 =?UTF-8?q?=E3=80=81=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E3=80=81=E7=BC=96=E8=BE=91=E6=97=B6=EF=BC=8C=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E7=9A=84=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=86=85=E5=AE=B9=E5=AD=98=E5=82=A8=205?=
 =?UTF-8?q?=E3=80=81=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=E5=BA=93=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=9C=8D=E5=8A=A1=E5=B1=9E=E6=80=A7=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ConfigServiceDirective.data.ts            |  5 ++
 .../components/ConfigServiceDirective.data.ts |  5 ++
 .../components/ConfigServiceDirectiveForm.vue | 65 ++++++++++++++-----
 .../components/DirectiveRadioCom.vue          |  3 +-
 4 files changed, 61 insertions(+), 17 deletions(-)

diff --git a/src/views/services/serviceDirective/ConfigServiceDirective.data.ts b/src/views/services/serviceDirective/ConfigServiceDirective.data.ts
index aa25681..1323f25 100644
--- a/src/views/services/serviceDirective/ConfigServiceDirective.data.ts
+++ b/src/views/services/serviceDirective/ConfigServiceDirective.data.ts
@@ -39,6 +39,11 @@ export const columns: BasicColumn[] = [
     align: 'center',
     dataIndex: 'directiveName',
   },
+  {
+    title: '服务属性',
+    align: 'center',
+    dataIndex: 'serviceAttribute_dictText',
+  },
   // {
   //   title: '体型标签',
   //   align: 'center',
diff --git a/src/views/services/serviceDirective/components/ConfigServiceDirective.data.ts b/src/views/services/serviceDirective/components/ConfigServiceDirective.data.ts
index 0ff1834..e0904c8 100644
--- a/src/views/services/serviceDirective/components/ConfigServiceDirective.data.ts
+++ b/src/views/services/serviceDirective/components/ConfigServiceDirective.data.ts
@@ -38,6 +38,11 @@ export const columns: BasicColumn[] = [
     align: 'center',
     dataIndex: 'directiveName',
   },
+  {
+    title: '服务属性',
+    align: 'center',
+    dataIndex: 'serviceAttribute_dictText',
+  },
   // {
   //   title: '体型标签',
   //   align: 'center',
diff --git a/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue b/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue
index efc2b64..a2396fa 100644
--- a/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue
+++ b/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue
@@ -72,10 +72,10 @@
                 </a-form-item>
               </a-col>
               <a-col :span="12">
-                <a-form-item label="服务时长" v-bind="validateInfos.serviceDuration"
-                  id="ConfigServiceDirectiveForm-serviceDuration" name="serviceDuration">
-                  <a-input-number v-model:value="formData.serviceDuration" :min="0" :max="55" :step="5" addon-after="分钟"
-                    placeholder="请输入服务时长（分钟）" allow-clear @keydown="onDurationKeydown" :disabled="disabled" />
+                <a-form-item label="服务属性" v-bind="validateInfos.serviceAttribute"
+                  id="ConfigServiceDirectiveForm-serviceAttribute" name="serviceAttribute">
+                  <j-dict-select-tag v-model:value="formData.serviceAttribute" dictCode="service_attribute"
+                    placeholder="请选择服务属性" allow-clear :disabled="disabled" />
                 </a-form-item>
               </a-col>
               <a-col :span="12">
@@ -85,6 +85,13 @@
                     :max="99999.99" :precision="2" @keydown="onPriceKeydown" :disabled="disabled" />
                 </a-form-item>
               </a-col>
+              <a-col :span="12">
+                <a-form-item label="服务时长" v-bind="validateInfos.serviceDuration"
+                  id="ConfigServiceDirectiveForm-serviceDuration" name="serviceDuration">
+                  <a-input-number v-model:value="formData.serviceDuration" :min="0" :max="55" :step="5" addon-after="分钟"
+                    placeholder="请输入服务时长（分钟）" allow-clear @keydown="onDurationKeydown" :disabled="disabled" />
+                </a-form-item>
+              </a-col>
               <!-- <a-col :span="12">
                 <a-form-item label="指令类型" v-bind="validateInfos.cycleType" id="ConfigServiceDirectiveForm-cycleType"
                   name="cycleType">
@@ -92,13 +99,13 @@
                     placeholder="请选择指令类型" allowClear @upDictCode="upCycleTypeDictCode" :disabled="!!formData.id" />
                 </a-form-item>
               </a-col> -->
-              <a-col :span="12">
+              <!-- <a-col :span="12">
                 <a-form-item label="超时时长" v-bind="validateInfos.timeoutDuration"
                   id="ConfigServiceDirectiveForm-timeoutDuration" name="timeoutDuration">
                   <a-input-number v-model:value="formData.timeoutDuration" :min="0" :max="55" :step="5" addon-after="分钟"
                     placeholder="请输入超时时长（分钟）" allow-clear @keydown="onDurationKeydown" :disabled="disabled" />
                 </a-form-item>
-              </a-col>
+              </a-col> -->
               <a-col :span="12">
                 <a-form-item label="提成价格(元)" v-bind="validateInfos.comPrice" id="ConfigServiceDirectiveForm-comPrice"
                   name="comPrice">
@@ -113,12 +120,34 @@
                     placeholder="请选择是否启用"  allowClear :disabled="disabled" />
                 </a-form-item>
               </a-col>
+              <a-col :span="12">
+                <a-form-item label="默认指令图标" v-bind="validateInfos.immediateFile" id="ElderTagForm-immediateFile"
+                  name="immediateFile">
+                  <JImageUploadToOpe v-if="opeType == 'dmlook'" :fileMax="1"
+                    :value="opeMediaAddress + formData.immediateFile">
+                  </JImageUploadToOpe>
+                  <JImageUploadToOpe v-else :toOpe="true" :bizPath="formComputedData.mediaFileSavePath" :fileMax="1"
+                    v-model:value="formData.immediateFile" :disabled="disabled">
+                  </JImageUploadToOpe>
+                </a-form-item>
+              </a-col>
+              <a-col :span="12">
+                <a-form-item label="焦点指令图标" v-bind="validateInfos.immediateFileFocus"
+                  id="ElderTagForm-immediateFileFocus" name="immediateFileFocus">
+                  <JImageUploadToOpe v-if="opeType == 'dmlook'" :fileMax="1"
+                    :value="opeMediaAddress + formData.immediateFileFocus">
+                  </JImageUploadToOpe>
+                  <JImageUploadToOpe v-else :toOpe="true" :bizPath="formComputedData.mediaFileSavePath" :fileMax="1"
+                    v-model:value="formData.immediateFileFocus" :disabled="disabled">
+                  </JImageUploadToOpe>
+                </a-form-item>
+              </a-col>
               <a-col :span="24">
-                <a-form-item label="服务指令描述" v-bind="validateInfos.serviceContent" id="ConfigServiceDirectiveForm-serviceContent" :labelCol="labelCol2" :wrapperCol="wrapperCol2" 
+                <a-form-item label="服务指令描述" v-bind="validateInfos.serviceContent"
+                  id="ConfigServiceDirectiveForm-serviceContent" :labelCol="labelCol2" :wrapperCol="wrapperCol2"
                   name="serviceContent">
-                <a-textarea v-model:value="formData.serviceContent" placeholder="请输入服务指令描述" :maxlength="200"
-                        :rows="3" :autosize="{ minRows: 3 }" :showCount="true"
-                        :disabled="disabled || (!isMain && !!formData.id)" />
+                  <a-textarea v-model:value="formData.serviceContent" placeholder="请输入服务指令描述" :maxlength="200" :rows="3"
+                    :autosize="{ minRows: 3 }" :showCount="true" :disabled="disabled || (!isMain && !!formData.id)" />
                 </a-form-item>
               </a-col>
             </a-row>
@@ -131,7 +160,8 @@
             <a-row style="padding: 0px 20px;">
               <a-col :span="24" v-show="directiveMediaBtnValue == 0">
                 <JImageUploadtz v-if="opeType == 'dmlook'"
-                  :value="!!formData.previewFile ? formData.previewFile : defaultPrePic" maxCount="1" :disabled="disabled" />
+                  :value="!!formData.previewFile ? formData.previewFile : defaultPrePic" maxCount="1"
+                  :disabled="disabled" />
                 <JImageUploadtz v-else v-model:value="formData.previewFile" maxCount="1" :toOpe="true"
                   :bizPath="formComputedData.mediaFileSavePath" />
               </a-col>
@@ -151,7 +181,7 @@
                 <JUploadMP4 v-else v-model:value="formData.mp4File" :toOpe="true"
                   :bizPath="formComputedData.mediaFileSavePath" maxCount="1" fileType="mp4" />
               </a-col>
-              <a-col :span="24" v-show="directiveMediaBtnValue == 3">
+              <!-- <a-col :span="24" v-show="directiveMediaBtnValue == 3">
                 <JImageUploadtz v-if="opeType == 'dmlook'"
                   :value="!!formData.immediateFile ? formData.immediateFile : defaultImmediatePic" maxCount="1" />
                 <JImageUploadtz v-else v-model:value="formData.immediateFile" :toOpe="true"
@@ -163,7 +193,7 @@
                   maxCount="1" />
                 <JImageUploadtz v-else v-model:value="formData.immediateFileFocus" :toOpe="true"
                   :bizPath="formComputedData.mediaFileSavePath" maxCount="1" />
-              </a-col>
+              </a-col> -->
             </a-row>
             <!-- <a-row style="padding: 20px;">
               <a-col :span="2">
@@ -211,10 +241,11 @@ import { QuestionCircleOutlined } from '@ant-design/icons-vue';
 import { DownOutlined } from '@ant-design/icons-vue';
 import { uploadUrl } from '/@/api/common/api';
 import { queryUpBizPrefix } from '/@/api/common/api'
+import JImageUploadToOpe from '/@/components/Form/src/jeecg/components/JImageUploadToOpe.vue';
 
-setInterval(()=>{
-console.log("🌊 ~ formData:", formData)
-},2000)
+setInterval(() => {
+  console.log("🌊 ~ formData:", formData)
+}, 2000)
 const opeMediaAddress = import.meta.env.VITE_OPE_MEDIA_ADDRESS
 const showDescription = ref(false);
 
@@ -299,6 +330,7 @@ const formData = reactive<Record<string, any>>({
   typeId: '',
   instructionTagId: '',
   directiveName: '',
+  serviceAttribute: '',
   tollPrice: 0,
   comPrice: 0,
   izReimbursement: 'N',
@@ -340,6 +372,7 @@ const validatorRules = reactive({
   typeId: [{ required: true, message: '请选择服务类型!' },],
   instructionTagId: [{ required: true, message: '请选择分类标签!' },],
   directiveName: [{ required: true, message: '请输入服务指令名称!' },],
+  serviceAttribute: [{ 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: '请输入正确的金额!' },],
   // izReimbursement: [{ required: true, message: '请选择是否参与医保报销!' },],
diff --git a/src/views/services/serviceDirective/components/DirectiveRadioCom.vue b/src/views/services/serviceDirective/components/DirectiveRadioCom.vue
index 006bd8d..d427187 100644
--- a/src/views/services/serviceDirective/components/DirectiveRadioCom.vue
+++ b/src/views/services/serviceDirective/components/DirectiveRadioCom.vue
@@ -24,7 +24,8 @@ const props = defineProps({
 
 const emit = defineEmits(['update:directiveMediaBtnValue', 'change'])
 
-const tabs = ['服务指令图片', '指令音频文件', '指令视频文件', '默认指令图标', '焦点指令图标']
+// const tabs = ['服务指令图片', '指令音频文件', '指令视频文件', '默认指令图标', '焦点指令图标']
+const tabs = ['服务指令图片', '指令音频文件', '指令视频文件']
 const activeTab = ref(props.directiveMediaBtnValue)
 
 watch(() => props.directiveMediaBtnValue, (newVal) => {