From 422d662300b8f69269e94dded1339111ad1783bc Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Wed, 28 Jan 2026 13:36:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../elder/canaddet/CanAddElderTagList.vue     |  2 +-
 src/views/elder/eldertag/ElderTagList.vue     |  4 +--
 .../eldertag/components/ElderTagModal.vue     |  2 +-
 .../ConfigSuppliersInfoList.vue               |  4 +--
 .../components/ConfigServiceDirectiveForm.vue | 34 ++++++++++++-------
 .../ConfigServiceDirectiveModal.vue           |  2 +-
 .../components/DirectiveRadioCom.vue          |  2 +-
 7 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/src/views/elder/canaddet/CanAddElderTagList.vue b/src/views/elder/canaddet/CanAddElderTagList.vue
index 17bf3b6..f1288c0 100644
--- a/src/views/elder/canaddet/CanAddElderTagList.vue
+++ b/src/views/elder/canaddet/CanAddElderTagList.vue
@@ -109,7 +109,7 @@ const labelCol = reactive({
   xs: 24,
   sm: 4,
   xl: 6,
-  xxl: 5
+  xxl: 6
 });
 const wrapperCol = reactive({
   xs: 24,
diff --git a/src/views/elder/eldertag/ElderTagList.vue b/src/views/elder/eldertag/ElderTagList.vue
index 7b47d00..358b003 100644
--- a/src/views/elder/eldertag/ElderTagList.vue
+++ b/src/views/elder/eldertag/ElderTagList.vue
@@ -83,7 +83,7 @@
     </a-drawer> -->
 
     <!-- 差异标签 -->
-    <a-drawer v-model:visible="newElderTagVisible" title="差异标签" width="85vw" :footer-style="{ textAlign: 'right' }"
+    <a-drawer v-model:visible="newElderTagVisible" title="差异标签" width="1200" :footer-style="{ textAlign: 'right' }"
       :bodyStyle="{ padding: '14px', height: '80vh', display: 'flex', flexDirection: 'column', overflow: 'auto' }"
       wrapClassName="org-list-modal" @cancel="handleCancelNewElderTag">
       <template #footer>
@@ -96,7 +96,7 @@
     </a-drawer>
 
     <!-- 差异比对 -->
-    <a-drawer title="差异比对" width="80vw" :open="compareListOpen" @close="onCompareListClose"
+    <a-drawer title="差异比对" width="1200" :open="compareListOpen" @close="onCompareListClose"
       :footer-style="{ textAlign: 'right' }" :bodyStyle="{ padding: '0px' }">
       <template #footer>
         <a-button type="primary" @click="onCompareListClose" style="margin-right: 10px;">关闭</a-button>
diff --git a/src/views/elder/eldertag/components/ElderTagModal.vue b/src/views/elder/eldertag/components/ElderTagModal.vue
index e5d7c17..0976887 100644
--- a/src/views/elder/eldertag/components/ElderTagModal.vue
+++ b/src/views/elder/eldertag/components/ElderTagModal.vue
@@ -1,5 +1,5 @@
 <template>
-  <a-drawer :title="title" width="50vw" v-model:visible="visible" :closable="true"
+  <a-drawer :title="title" width="800" v-model:visible="visible" :closable="true"
     :footer-style="{ textAlign: 'right' }" :bodyStyle="{ padding: '14px' }" @cancel="handleCancel">
     <template #footer>
       <a-button @click="handleCancel" style="margin-right: 8px;">关闭</a-button>
diff --git a/src/views/invoicing/configSuppliersInfo/ConfigSuppliersInfoList.vue b/src/views/invoicing/configSuppliersInfo/ConfigSuppliersInfoList.vue
index 2ac6787..bb86374 100644
--- a/src/views/invoicing/configSuppliersInfo/ConfigSuppliersInfoList.vue
+++ b/src/views/invoicing/configSuppliersInfo/ConfigSuppliersInfoList.vue
@@ -6,7 +6,7 @@
         <a-row :gutter="24">
           <a-col :lg="6">
             <a-form-item name="suppliersName">
-              <template #label><span title="供应商名称">供应商名</span></template>
+              <template #label><span title="供应商名称">供应商名称</span></template>
               <j-input placeholder="请输入供应商名称" v-model:value="queryParam.suppliersName" allow-clear></j-input>
             </a-form-item>
           </a-col>
@@ -99,7 +99,7 @@
     xs:24,
     sm:4,
     xl:6,
-    xxl:4
+    xxl:6
   });
   const wrapperCol = reactive({
     xs: 24,
diff --git a/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue b/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue
index 79fae7d..9685637 100644
--- a/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue
+++ b/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue
@@ -113,6 +113,14 @@
                     placeholder="请选择是否启用"  allowClear :disabled="disabled" />
                 </a-form-item>
               </a-col>
+              <a-col :span="24">
+                <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-form-item>
+              </a-col>
             </a-row>
             <a-row style="padding: 20px;">
               <a-col :span="6">
@@ -127,29 +135,29 @@
                 <JImageUploadtz v-else v-model:value="formData.previewFile" maxCount="1" :toOpe="true"
                   :bizPath="formComputedData.mediaFileSavePath" />
               </a-col>
-              <a-col :span="24" v-show="directiveMediaBtnValue == 1">
+              <!-- <a-col :span="24" v-show="directiveMediaBtnValue == 1">
                 <JImageUploadtz v-if="opeType == 'dmlook'"
                   :value="!!formData.previewFileSmall ? formData.previewFileSmall : defaultPreSmallPic" maxCount="1" />
                 <JImageUploadtz v-else v-model:value="formData.previewFileSmall" maxCount="1" :toOpe="true"
                   :bizPath="formComputedData.mediaFileSavePath" />
-              </a-col>
-              <a-col :span="24" v-show="directiveMediaBtnValue == 2">
+              </a-col> -->
+              <a-col :span="24" v-show="directiveMediaBtnValue == 1">
                 <JUploadMP3 v-if="opeType == 'dmlook'" :value="formData.mp3File" maxCount="1" />
                 <JUploadMP3 v-else v-model:value="formData.mp3File" :toOpe="true"
                   :bizPath="formComputedData.mediaFileSavePath" maxCount="1" />
               </a-col>
-              <a-col :span="24" v-show="directiveMediaBtnValue == 3">
+              <a-col :span="24" v-show="directiveMediaBtnValue == 2">
                 <JUploadMP4 v-if="opeType == 'dmlook'" :value="formData.mp4File" maxCount="1" fileType="mp4" />
                 <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 == 4">
+              <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"
                   :bizPath="formComputedData.mediaFileSavePath" maxCount="1" />
               </a-col>
-              <a-col :span="24" v-show="directiveMediaBtnValue == 5">
+              <a-col :span="24" v-show="directiveMediaBtnValue == 4">
                 <JImageUploadtz v-if="opeType == 'dmlook'"
                   :value="!!formData.immediateFileFocus ? formData.immediateFileFocus : defaultImmediatePic"
                   maxCount="1" />
@@ -157,7 +165,7 @@
                   :bizPath="formComputedData.mediaFileSavePath" maxCount="1" />
               </a-col>
             </a-row>
-            <a-row style="padding: 20px;">
+            <!-- <a-row style="padding: 20px;">
               <a-col :span="2">
                 <div class="description-container">
                   <a-button @click="toggleDescription">服务指令描述</a-button>
@@ -169,14 +177,12 @@
                       </span>
                     </div>
                     <div>
-                      <a-textarea v-model:value="formData.serviceContent" placeholder="请输入服务指令描述" :maxlength="200"
-                        :rows="3" :autosize="{ minRows: 3 }" :showCount="true"
-                        :disabled="disabled || (!isMain && !!formData.id)" />
+                      <
                     </div>
                   </div>
                 </div>
               </a-col>
-            </a-row>
+            </a-row> -->
           </a-form>
         </template>
       </JFormContainer>
@@ -314,8 +320,10 @@ const formData = reactive<Record<string, any>>({
   immediateFileFocus: defaultImmediatePic,
 });
 const { createMessage } = useMessage();
-const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 4 } });
-const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 19 } });
+const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 6 } });
+const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
+const labelCol2 = ref<any>({ xs: { span: 24 }, sm: { span: 3 } });
+const wrapperCol2 = ref<any>({ xs: { span: 24 }, sm: { span: 17 } });
 const confirmLoading = ref<boolean>(false);
 const isEditMedia = ref(false)
 const instructionTagName = ref('')
diff --git a/src/views/services/serviceDirective/components/ConfigServiceDirectiveModal.vue b/src/views/services/serviceDirective/components/ConfigServiceDirectiveModal.vue
index 0757a75..4bc04e6 100644
--- a/src/views/services/serviceDirective/components/ConfigServiceDirectiveModal.vue
+++ b/src/views/services/serviceDirective/components/ConfigServiceDirectiveModal.vue
@@ -1,5 +1,5 @@
 <template>
-  <a-drawer :title="title" width="80vw" v-model:visible="visible" :closable="true"
+  <a-drawer :title="title" width="1200" v-model:visible="visible" :closable="true"
     :footer-style="{ textAlign: 'right' }" @close="handleCancel"
     :bodyStyle="{ background: 'linear-gradient(135deg, #f1f7ff 0%, #f1f7ff 100%)', padding: '14px' }">
     <a-spin :spinning="loading">
diff --git a/src/views/services/serviceDirective/components/DirectiveRadioCom.vue b/src/views/services/serviceDirective/components/DirectiveRadioCom.vue
index 6819805..006bd8d 100644
--- a/src/views/services/serviceDirective/components/DirectiveRadioCom.vue
+++ b/src/views/services/serviceDirective/components/DirectiveRadioCom.vue
@@ -24,7 +24,7 @@ const props = defineProps({
 
 const emit = defineEmits(['update:directiveMediaBtnValue', 'change'])
 
-const tabs = ['服务指令图片(大)', '服务指令图片(小)', '指令音频文件', '指令视频文件', '即时指令图标', '即时指令-焦点']
+const tabs = ['服务指令图片', '指令音频文件', '指令视频文件', '默认指令图标', '焦点指令图标']
 const activeTab = ref(props.directiveMediaBtnValue)
 
 watch(() => props.directiveMediaBtnValue, (newVal) => {