!123 Merge branch 'refs/heads/master' into wsq-20260727

Merge pull request !123 from 王淑勤/wsq-20260727

src/components/Form/src/container/JFormContainer.vue

@@ -1,6 +1,6 @@
 <template>
   <div :class="formDisabled ? 'jeecg-form-container-disabled jeecg-form-detail-effect' : 'jeecg-and-modal-form'">
-    <fieldset :disabled="formDisabled">
+    <fieldset :class="{ 'is-disabled': formDisabled }">
       <slot name="detail"></slot>
     </fieldset>
     <slot name="edit"> </slot>
@@ -59,7 +59,7 @@
   .jeecg-form-container-disabled {
     cursor: not-allowed;
   }
-  .jeecg-form-container-disabled fieldset[disabled] {
+  .jeecg-form-container-disabled fieldset.is-disabled {
     -ms-pointer-events: none;
     pointer-events: none;
   }
@@ -67,6 +67,12 @@
     -ms-pointer-events: none;
     pointer-events: none;
   }
+  .jeecg-form-container-disabled fieldset.is-disabled :deep(.s-upload-file-container) {
+    pointer-events: auto !important;
+  }
+  .jeecg-form-container-disabled fieldset.is-disabled :deep(.s-upload-file-container .file-actions .ant-btn) {
+    pointer-events: auto !important;
+  }
   // update-begin--author:liaozhiyang---date:20240605---for：【TV360X-857】online代码生成详情样式调整
   // begin antdv 禁用样式
   // .jeecg-form-container-disabled :deep(.ant-input-number),
@@ -202,11 +208,11 @@
   .jeecg-form-container-disabled :deep(.ant-upload-list) {
     cursor: grabbing;
   }
-  .jeecg-form-container-disabled fieldset[disabled] :deep(.ant-upload-list){
+  .jeecg-form-container-disabled fieldset.is-disabled :deep(.ant-upload-list){
     // -ms-pointer-events: auto !important;
     // pointer-events: auto !important;
   }
-  .jeecg-form-container-disabled fieldset[disabled] iframe {
+  .jeecg-form-container-disabled fieldset.is-disabled iframe {
     -ms-pointer-events: auto !important;
     pointer-events: auto !important;
   }

src/views/gh/improvementProposal/ImprovementProposalList.vue

@@ -25,7 +25,7 @@
         <a-col v-if="toggleSearchStatus" :lg="6">
         <a-form-item name="proposalDeptId">
         <template #label><span title="提案部门">提案部门</span></template>
-            <JDictSelectTag v-model:value="queryParam.proposalDeptId" dictCode="sys_depart,depart_name,id" placeholder="请选择提案部门" allow-clear />
+            <sz-select-dept v-model:value="queryParam.proposalDeptId" :multiple="false" checkStrictly allow-clear />
         </a-form-item>
         </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -92,6 +92,7 @@
   import {downloadFile} from '/@/utils/common/renderUtils';
   import JInput from "/@/components/Form/src/jeecg/components/JInput.vue";
   import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  import SzSelectDept from '/@/components/Form/src/jeecg/components/SzSelectDept.vue';
 
   const [registerBpmModal, { openModal: bpmPicModal }] = useModal();
   const formRef = ref();

src/views/gh/improvementProposal/components/ImprovementProposalForm.vue

@@ -357,6 +357,12 @@
         // 普通编辑不加载子表，并清理弹窗复用时可能残留的表格数据。
         improvementDeptScoreTable.dataSource = [];
         improvementInstituteVoteTable.dataSource = [];
+        // 加载改善前/后图片文件列表
+        await nextTick();
+        if (formData.id) {
+          beforeFileRef.value?.loadFileList();
+          afterFileRef.value?.loadFileList();
+        }
       }
 
       async function queryMainData(id) {
@@ -409,8 +415,8 @@
           const newId = typeof result === 'string' ? result : (result?.id || result);
           if (newId) {
             formData.id = newId;
-            await beforeFileRef.value?.bindBussinessId(`${newId}:before`);
-            await afterFileRef.value?.bindBussinessId(`${newId}:after`);
+            await beforeFileRef.value?.bindBussinessId(`${formData.proposalNo}:before`);
+            await afterFileRef.value?.bindBussinessId(`${formData.proposalNo}:after`);
           }
         }
         emit('success');