From 34f5ec35cc8453aa7e133f0fbaf23312ed3a1b11 Mon Sep 17 00:00:00 2001
From: new_new_new <8454518+new-twice@user.noreply.gitee.com>
Date: Wed, 17 Jun 2026 02:21:08 +0000
Subject: [PATCH] =?UTF-8?q?!45=20feat(xispeak):=20=E8=A1=A5=E5=85=85BPM?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=AE=A1=E6=89=B9=E6=84=8F=E8=A7=81=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E8=8A=82=E7=82=B9=E6=98=A0=E5=B0=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat(xispeak): 补充BPM表单审批意见任务节点映射
* style(xispeak): 优化查询表单布局并替换牵头部门选人组件
---
 src/views/bg/xispeak/BgXiSpeakList.vue        |  14 +-
 .../xispeak/components/BgXiSpeakBPMForm.vue   | 131 +++++++++---------
 2 files changed, 77 insertions(+), 68 deletions(-)

diff --git a/src/views/bg/xispeak/BgXiSpeakList.vue b/src/views/bg/xispeak/BgXiSpeakList.vue
index 4f90d64..be25e79 100644
--- a/src/views/bg/xispeak/BgXiSpeakList.vue
+++ b/src/views/bg/xispeak/BgXiSpeakList.vue
@@ -4,14 +4,14 @@
     <div class="jeecg-basic-table-form-container">
       <a-form ref="formRef" @keyup.enter="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
         <a-row :gutter="24">
-          <a-col :lg="6" :md="8" :sm="12">
-            <a-form-item label="重要讲话指示批示情况" name="speakStatus">
+          <a-col :lg="8" :md="10" :sm="12">
+            <a-form-item label="重要讲话指示批示情况" name="speakStatus" :labelCol="{ xs: { span: 24 }, sm: { span: 10 } }" :wrapperCol="{ xs: { span: 24 }, sm: { span: 14 } }">
               <JInput v-model:value="queryParam.speakStatus" type="like" placeholder="请输入重要讲话指示批示情况" allow-clear trim />
             </a-form-item>
           </a-col>
-          <a-col :lg="5" :md="8" :sm="12">
+          <a-col :lg="6" :md="8" :sm="12">
             <a-form-item label="牵头部门" name="implDept">
-              <j-select-dept v-model:value="queryParam.implDept" placeholder="选择牵头部门" allow-clear style="width: 100%" />
+              <SzSelectDept v-model:value="queryParam.implDept" placeholder="选择牵头部门" allow-clear style="width: 100%" />
             </a-form-item>
           </a-col>
           <a-col :lg="4" :md="6" :sm="8">
@@ -92,7 +92,7 @@
 
   import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
   import JInput from '/@/components/Form/src/jeecg/components/JInput.vue';
-  import JSelectDept from '/@/components/Form/src/jeecg/components/JSelectDept.vue';
+  import SzSelectDept from '/@/components/Form/src/jeecg/components/SzSelectDept.vue';
   import BgXiSpeakModal from './components/BgXiSpeakModal.vue';
 
   import BusinessProcessListModal from '/src/components/semri/process/BusinessProcessListModal.vue';
@@ -793,6 +793,10 @@
     :deep(.ant-input-number) {
       width: 100%;
     }
+
+    :deep(.ant-form-item-label > label) {
+      overflow: visible;
+    }
   }
 
   .erpNativeList {
diff --git a/src/views/bg/xispeak/components/BgXiSpeakBPMForm.vue b/src/views/bg/xispeak/components/BgXiSpeakBPMForm.vue
index 92be68e..e6ee152 100644
--- a/src/views/bg/xispeak/components/BgXiSpeakBPMForm.vue
+++ b/src/views/bg/xispeak/components/BgXiSpeakBPMForm.vue
@@ -71,11 +71,11 @@
                 <j-select-dept v-model:value="mainForm.implDept" :disabled="mainDisabled" :multiple="true" checkStrictly allow-clear />
               </a-form-item>
             </a-col>
-<!--            <a-col :span="12">-->
-<!--              <a-form-item label="落实方案" name="implPlan">-->
-<!--                <a-input v-model:value="mainForm.implPlan" :disabled="mainDisabled" allow-clear />-->
-<!--              </a-form-item>-->
-<!--            </a-col>-->
+            <!--            <a-col :span="12">-->
+            <!--              <a-form-item label="落实方案" name="implPlan">-->
+            <!--                <a-input v-model:value="mainForm.implPlan" :disabled="mainDisabled" allow-clear />-->
+            <!--              </a-form-item>-->
+            <!--            </a-col>-->
             <a-col :span="12">
               <a-form-item label="贯彻落实措施" name="implMeasures">
                 <a-input v-model:value="mainForm.implMeasures" :disabled="mainDisabled" allow-clear />
@@ -86,16 +86,16 @@
                 <a-input-number v-model:value="mainForm.numberOfResolutions" :disabled="mainDisabled" style="width: 100%" />
               </a-form-item>
             </a-col>
-<!--            <a-col :span="12">-->
-<!--              <a-form-item label="落实条数" name="implCount">-->
-<!--                <a-input-number v-model:value="mainForm.implCount" :disabled="mainDisabled" style="width: 100%" />-->
-<!--              </a-form-item>-->
-<!--            </a-col>-->
-<!--            <a-col :span="12">-->
-<!--              <a-form-item label="已闭环数量" name="closedCount">-->
-<!--                <a-input-number v-model:value="mainForm.closedCount" :disabled="mainDisabled" style="width: 100%" />-->
-<!--              </a-form-item>-->
-<!--            </a-col>-->
+            <!--            <a-col :span="12">-->
+            <!--              <a-form-item label="落实条数" name="implCount">-->
+            <!--                <a-input-number v-model:value="mainForm.implCount" :disabled="mainDisabled" style="width: 100%" />-->
+            <!--              </a-form-item>-->
+            <!--            </a-col>-->
+            <!--            <a-col :span="12">-->
+            <!--              <a-form-item label="已闭环数量" name="closedCount">-->
+            <!--                <a-input-number v-model:value="mainForm.closedCount" :disabled="mainDisabled" style="width: 100%" />-->
+            <!--              </a-form-item>-->
+            <!--            </a-col>-->
             <a-col :span="12">
               <a-form-item label="完成状态" name="completionStatus">
                 <JDictSelectTag
@@ -110,13 +110,7 @@
             </a-col>
             <a-col :span="12">
               <a-form-item label="截止日期" name="deadline">
-                <a-date-picker
-                  v-model:value="mainForm.deadline"
-                  value-format="YYYY-MM-DD"
-                  :disabled="mainDisabled"
-                  style="width: 100%"
-                  allow-clear
-                />
+                <a-date-picker v-model:value="mainForm.deadline" value-format="YYYY-MM-DD" :disabled="mainDisabled" style="width: 100%" allow-clear />
               </a-form-item>
             </a-col>
             <a-col :span="12">
@@ -124,14 +118,14 @@
                 <a-input v-model:value="mainForm.reportFeedbackStatus" :disabled="mainDisabled" allow-clear />
               </a-form-item>
             </a-col>
-<!--            <a-col :span="12">-->
-<!--              <a-form-item label="是否存在完成风险" name="isCompletionRisk">-->
-<!--                <a-radio-group v-model:value="mainForm.isCompletionRisk" :disabled="mainDisabled">-->
-<!--                  <a-radio :value="0">不存在</a-radio>-->
-<!--                  <a-radio :value="1">存在</a-radio>-->
-<!--                </a-radio-group>-->
-<!--              </a-form-item>-->
-<!--            </a-col>-->
+            <!--            <a-col :span="12">-->
+            <!--              <a-form-item label="是否存在完成风险" name="isCompletionRisk">-->
+            <!--                <a-radio-group v-model:value="mainForm.isCompletionRisk" :disabled="mainDisabled">-->
+            <!--                  <a-radio :value="0">不存在</a-radio>-->
+            <!--                  <a-radio :value="1">存在</a-radio>-->
+            <!--                </a-radio-group>-->
+            <!--              </a-form-item>-->
+            <!--            </a-col>-->
             <a-col :span="12">
               <a-form-item label="是否需要督办领导" name="needSdwApproval">
                 <a-radio-group v-model:value="mainForm.needSdwApproval" :disabled="mainDisabled">
@@ -150,34 +144,34 @@
                 />
               </a-form-item>
             </a-col>
-<!--            <a-col :span="12">-->
-<!--              <a-form-item label="拖期风险应对措施" name="delayRiskMitigation">-->
-<!--                <a-input v-model:value="mainForm.delayRiskMitigation" :disabled="mainDisabled" allow-clear />-->
-<!--              </a-form-item>-->
-<!--            </a-col>-->
+            <!--            <a-col :span="12">-->
+            <!--              <a-form-item label="拖期风险应对措施" name="delayRiskMitigation">-->
+            <!--                <a-input v-model:value="mainForm.delayRiskMitigation" :disabled="mainDisabled" allow-clear />-->
+            <!--              </a-form-item>-->
+            <!--            </a-col>-->
             <a-col :span="12">
               <a-form-item label="督办次数" name="supervisionCount">
                 <a-input-number v-model:value="mainForm.supervisionCount" :disabled="mainDisabled" style="width: 100%" />
               </a-form-item>
             </a-col>
-<!--            <a-col :span="12">-->
-<!--              <a-form-item label="父级节点" name="pid">-->
-<!--                <j-tree-select-->
-<!--                  v-model:value="mainForm.pid"-->
-<!--                  dict="bg_xi_speak,impl_status,id"-->
-<!--                  pidField="pid"-->
-<!--                  pidValue="0"-->
-<!--                  hasChildField="has_child"-->
-<!--                  :disabled="mainDisabled"-->
-<!--                  allow-clear-->
-<!--                />-->
-<!--              </a-form-item>-->
-<!--            </a-col>-->
-<!--            <a-col :span="12">-->
-<!--              <a-form-item label="落实情况" name="implStatus">-->
-<!--                <a-textarea v-model:value="mainForm.implStatus" :auto-size="{ minRows: 1, maxRows: 7 }" :disabled="mainDisabled" allow-clear />-->
-<!--              </a-form-item>-->
-<!--            </a-col>-->
+            <!--            <a-col :span="12">-->
+            <!--              <a-form-item label="父级节点" name="pid">-->
+            <!--                <j-tree-select-->
+            <!--                  v-model:value="mainForm.pid"-->
+            <!--                  dict="bg_xi_speak,impl_status,id"-->
+            <!--                  pidField="pid"-->
+            <!--                  pidValue="0"-->
+            <!--                  hasChildField="has_child"-->
+            <!--                  :disabled="mainDisabled"-->
+            <!--                  allow-clear-->
+            <!--                />-->
+            <!--              </a-form-item>-->
+            <!--            </a-col>-->
+            <!--            <a-col :span="12">-->
+            <!--              <a-form-item label="落实情况" name="implStatus">-->
+            <!--                <a-textarea v-model:value="mainForm.implStatus" :auto-size="{ minRows: 1, maxRows: 7 }" :disabled="mainDisabled" allow-clear />-->
+            <!--              </a-form-item>-->
+            <!--            </a-col>-->
           </template>
         </a-row>
       </a-form>
@@ -236,7 +230,6 @@
       />
 
       <template v-if="showProcessHandle">
-
         <a-divider />
         <div class="process-header section-toolbar">
           <div class="section-title">流程办理</div>
@@ -280,17 +273,11 @@
   import { useUserStore } from '/@/store/modules/user';
   import JSelectDept from '/@/components/Form/src/jeecg/components/JSelectDept.vue';
   import JSelectUser from '/@/components/Form/src/jeecg/components/JSelectUser.vue';
-import SzDeptUserModal from '/@/components/semri/deptUserComponent/SzDeptUserModal.vue';
+  import SzDeptUserModal from '/@/components/semri/deptUserComponent/SzDeptUserModal.vue';
   import JTreeSelect from '/@/components/Form/src/jeecg/components/JTreeSelect.vue';
   import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
   import Icon from '/@/components/Icon/index';
-  import {
-    bgXiSpeakFeedbackList,
-    bgXiSpeakFeedbackListWithDept,
-    bgXiSpeakFeedbackDelete,
-    saveBpmForm,
-    saveSubApprove,
-  } from '../BgXiSpeak.api';
+  import { bgXiSpeakFeedbackList, bgXiSpeakFeedbackListWithDept, bgXiSpeakFeedbackDelete, saveBpmForm, saveSubApprove } from '../BgXiSpeak.api';
   import { usePermission } from '/@/hooks/web/usePermission';
   import TaskHandleInnerContent from '/@/views/super/bpm/process/personalOffice/myHandleTask/content/TaskHandleInnerContent.vue';
   import BgXiSpeakBPMFeedbackModal from './BgXiSpeakBPMFeedbackModal.vue';
@@ -461,6 +448,22 @@ import SzDeptUserModal from '/@/components/semri/deptUserComponent/SzDeptUserMod
     // 'Task_': buildSuperviseCheckReason,
     // 纪检经办人监察
     // 'Task_': buildJiJianCheckReason,
+    Task_15sm4w5: buildApproveReason,
+    Task_00i7rrp: buildApproveReason,
+    Task_00v3pcv: buildDeptHandlerFeedbackReason,
+    Task_04bazej: buildApproveReason,
+    Task_08zb04x: buildDeptHandlerFeedbackReason,
+    Task_0bj578x: buildApproveReason,
+    Task_0jrgrzs: buildDeptHandlerFeedbackReason,
+    Task_0mf32ge: buildApproveReason,
+    Task_0zmn6ik: buildApproveReason,
+    Task_133caii: buildApproveReason,
+    Task_15sm4w5: buildApproveReason,
+    Task_175afz2: buildApproveReason,
+    Task_1ogk921: buildApproveReason,
+    Task_1v9ce78: buildDeptLeaderAssignReason,
+    Task_1w4vxgc: buildApproveReason,
+    Task_1wfkrvj: buildApproveReason,
   };
 
   const defaultHandleReason = computed(() => {
@@ -583,7 +586,9 @@ import SzDeptUserModal from '/@/components/semri/deptUserComponent/SzDeptUserMod
       const deptId = getCurrentUserDeptId();
       if (deptId) {
         list = list.filter((item: any) => {
-          const deptIds = String(item.responDeptid || '').split(',').map((s: string) => s.trim());
+          const deptIds = String(item.responDeptid || '')
+            .split(',')
+            .map((s: string) => s.trim());
           return deptIds.includes(String(deptId));
         });
       }