From fcd42060c1bb86036c7878dc209769258c2cc8b2 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Thu, 29 Jan 2026 08:59:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/OrgApplyInfoModal.vue          |  4 +-
 .../components/DirectiveOpeLogInfoAdd.vue     | 37 ++++++++++++-------
 .../components/DirectiveOpeLogInfoCompare.vue |  4 +-
 .../components/DirectiveOpeLogMainModal.vue   |  2 +-
 .../components/DirectiveRadioCom.vue          |  2 +-
 5 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/src/views/admin/orgapplyinfo/components/OrgApplyInfoModal.vue b/src/views/admin/orgapplyinfo/components/OrgApplyInfoModal.vue
index d72bb9e..2acb299 100644
--- a/src/views/admin/orgapplyinfo/components/OrgApplyInfoModal.vue
+++ b/src/views/admin/orgapplyinfo/components/OrgApplyInfoModal.vue
@@ -1,5 +1,5 @@
 <template>
-  <a-drawer :title="title" :width="`70vw`"  v-model:visible="visible" :closable="true"
+  <a-drawer :title="title" :width="`1100`"  v-model:visible="visible" :closable="true"
     :footer-style="{ textAlign: 'right' }" :bodyStyle="{padding:'0px'}" @close="handleCancel">
     <OrgApplyInfoForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false">
     </OrgApplyInfoForm>
@@ -9,7 +9,7 @@
     </template>
   </a-drawer>
 
-  <a-drawer :title="title" :width="`70vw`"  v-model:visible="contractVisible" :closable="true"
+  <a-drawer :title="title" :width="`1100`"  v-model:visible="contractVisible" :closable="true"
     :footer-style="{ textAlign: 'right' }" :bodyStyle="{padding:'0px'}" @close="handleCancel">
     <OrgUpContractForm ref="upContractForm" @ok="submitContractCallback" :formBpm="false"></OrgUpContractForm>
     <template #footer>
diff --git a/src/views/synchronization/directive/directiveopelog/components/DirectiveOpeLogInfoAdd.vue b/src/views/synchronization/directive/directiveopelog/components/DirectiveOpeLogInfoAdd.vue
index fe9255d..0b523f0 100644
--- a/src/views/synchronization/directive/directiveopelog/components/DirectiveOpeLogInfoAdd.vue
+++ b/src/views/synchronization/directive/directiveopelog/components/DirectiveOpeLogInfoAdd.vue
@@ -49,29 +49,36 @@
                 </a-form-item>
               </a-col> -->
               <a-col :span="12">
-                <a-form-item label="服务时长（分钟）" v-bind="validateInfos.serviceDuration"
+                <a-form-item label="服务时长 (分钟)" v-bind="validateInfos.serviceDuration"
                   id="ConfigServiceDirectiveForm-serviceDuration" name="serviceDuration">
                   <a-input v-model:value="formData.serviceDuration" placeholder="服务时长（分钟）" disabled></a-input>
                 </a-form-item>
               </a-col>
               <a-col :span="12">
-                <a-form-item label="收费价格(元)" v-bind="validateInfos.tollPrice" id="ConfigServiceDirectiveForm-tollPrice"
+                <a-form-item label="收费价格 (元)" v-bind="validateInfos.tollPrice" id="ConfigServiceDirectiveForm-tollPrice"
                   name="tollPrice">
                   <a-input v-model:value="formData.tollPrice" placeholder="收费价格" disabled></a-input>
                 </a-form-item>
               </a-col>
               <a-col :span="12">
-                <a-form-item label="超时时长（分钟）" v-bind="validateInfos.timeoutDuration"
+                <a-form-item label="超时时长 (分钟)" v-bind="validateInfos.timeoutDuration"
                   id="ConfigServiceDirectiveForm-timeoutDuration" name="timeoutDuration">
                   <a-input v-model:value="formData.timeoutDuration" placeholder="超时时长（分钟）" disabled></a-input>
                 </a-form-item>
               </a-col>
               <a-col :span="12">
-                <a-form-item label="提成价格(元)" v-bind="validateInfos.comPrice" id="ConfigServiceDirectiveForm-comPrice"
+                <a-form-item label="提成价格 (元)" v-bind="validateInfos.comPrice" id="ConfigServiceDirectiveForm-comPrice"
                   name="comPrice">
                   <a-input v-model:value="formData.comPrice" placeholder="提成价格" disabled></a-input>
                 </a-form-item>
               </a-col>
+              <a-col :span="24" >
+                <a-form-item label="服务指令描述" v-bind="validateInfos.comPrice" id="ConfigServiceDirectiveForm-comPrice" :labelCol="labelCol2" :wrapperCol="wrapperCol2"
+                  name="comPrice">
+                  <a-textarea style="color: #606266;" v-model:value="formData.serviceContent" placeholder="服务指令描述"
+                        :maxlength="200" :rows="3" :autoSize="{ minRows: 3 }" :showCount="true" disabled />
+                </a-form-item>
+              </a-col>
             </a-row>
           </a-form>
         </template>
@@ -93,26 +100,26 @@
               <a-col :span="24" v-show="directiveMediaBtnValue == 0">
                 <JImageUploadtz :value="!!formData.previewFile ? formData.previewFile : defaultPrePic" disabled />
               </a-col>
-              <a-col :span="24" v-show="directiveMediaBtnValue == 1">
+              <!-- <a-col :span="24" v-show="directiveMediaBtnValue == 1">
                 <JImageUploadtz :value="!!formData.previewFileSmall ? formData.previewFileSmall : defaultPreSmallPic"
                   disabled />
-              </a-col>
-              <a-col :span="24" v-show="directiveMediaBtnValue == 2">
+              </a-col> -->
+              <a-col :span="24" v-show="directiveMediaBtnValue == 1">
                 <JUploadMP3 :value="formData.mp3File" disabled />
               </a-col>
-              <a-col :span="24" v-show="directiveMediaBtnValue == 3">
+              <a-col :span="24" v-show="directiveMediaBtnValue == 2">
                 <JUploadMP4 :value="formData.mp4File" fileType="mp4" disabled />
               </a-col>
-              <a-col :span="24" v-show="directiveMediaBtnValue == 4">
+              <a-col :span="24" v-show="directiveMediaBtnValue == 3">
                 <JImageUploadtz :value="!!formData.immediateFile ? formData.immediateFile : defaultImmediatePic"
                   disabled />
               </a-col>
-              <a-col :span="24" v-show="directiveMediaBtnValue == 5">
+              <a-col :span="24" v-show="directiveMediaBtnValue == 4">
                 <JImageUploadtz
                   :value="!!formData.immediateFileFocus ? formData.immediateFileFocus : defaultImmediatePic" disabled />
               </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>
@@ -130,7 +137,7 @@
                   </div>
                 </div>
               </a-col>
-            </a-row>
+            </a-row> -->
           </a-form>
         </template>
       </JFormContainer>
@@ -191,8 +198,10 @@ const formData = reactive<Record<string, any>>({
   previewFile: '',
   previewFileSmall: '',
 });
-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: 20 } });
 const confirmLoading = ref<boolean>(false);
 const isEditMedia = ref(false)
 //表单验证
diff --git a/src/views/synchronization/directive/directiveopelog/components/DirectiveOpeLogInfoCompare.vue b/src/views/synchronization/directive/directiveopelog/components/DirectiveOpeLogInfoCompare.vue
index 0e77bcc..598049e 100644
--- a/src/views/synchronization/directive/directiveopelog/components/DirectiveOpeLogInfoCompare.vue
+++ b/src/views/synchronization/directive/directiveopelog/components/DirectiveOpeLogInfoCompare.vue
@@ -78,8 +78,8 @@ const fieldLabels: Record<string, string> = {
   mp4File: '视频文件',
   previewFile: '服务指令图片',
   // previewFileSmall: '预览图片(小)',
-  immediateFile: '指令样式（选中）',
-  immediateFileFocus: '指令样式（选中）',
+  immediateFile: '默认指令图标',
+  immediateFileFocus: '焦点指令图标',
 };
 
 // 需要显示的字段顺序
diff --git a/src/views/synchronization/directive/directiveopelog/components/DirectiveOpeLogMainModal.vue b/src/views/synchronization/directive/directiveopelog/components/DirectiveOpeLogMainModal.vue
index 418f2bc..7d01945 100644
--- a/src/views/synchronization/directive/directiveopelog/components/DirectiveOpeLogMainModal.vue
+++ b/src/views/synchronization/directive/directiveopelog/components/DirectiveOpeLogMainModal.vue
@@ -1,5 +1,5 @@
 <template>
-  <a-drawer :title="title" width="1000" 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' }" @close="handleCancel">
     <!-- 新增-查看 -->
     <DirectiveOpeLogInfoAdd v-if="dataType == 'add'" ref="registerForm" @ok="submitCallback"
diff --git a/src/views/synchronization/directive/directiveopelog/components/DirectiveRadioCom.vue b/src/views/synchronization/directive/directiveopelog/components/DirectiveRadioCom.vue
index 6819805..006bd8d 100644
--- a/src/views/synchronization/directive/directiveopelog/components/DirectiveRadioCom.vue
+++ b/src/views/synchronization/directive/directiveopelog/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) => {