From da347d212b2daeb2fb0c1fe81a50fe40ccdfa664 Mon Sep 17 00:00:00 2001
From: wsm <2746563060@侵权。>
Date: Mon, 25 May 2026 16:34:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9xispeak=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=95=8C=E9=9D=A2=EF=BC=8C=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AE=BD=E5=BA=A6=EF=BC=8C=E5=AE=9E=E7=8E=B0?=
 =?UTF-8?q?=E5=B7=A6=E5=AF=B9=E9=BD=90=EF=BC=8C=E6=A0=B9=E6=8D=AE=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E7=B1=BB=E5=88=AB=E5=88=86=E6=A8=A1=E5=9D=97=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8D=E6=8D=A2=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bg/xispeak/components/BgXiSpeakForm.vue   | 128 ++++++------------
 .../bg/xispeak/components/BgXiSpeakModal.vue  |   2 +-
 2 files changed, 41 insertions(+), 89 deletions(-)

diff --git a/src/views/bg/xispeak/components/BgXiSpeakForm.vue b/src/views/bg/xispeak/components/BgXiSpeakForm.vue
index 50f531b..052ca7f 100644
--- a/src/views/bg/xispeak/components/BgXiSpeakForm.vue
+++ b/src/views/bg/xispeak/components/BgXiSpeakForm.vue
@@ -2,16 +2,20 @@
   <a-spin :spinning="confirmLoading">
     <JFormContainer :disabled="disabled">
       <template #detail>
-        <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="BgXiSpeakForm">
-          <a-row>
-            <a-col :span="12">
+        <a-form ref="formRef" class="antd-modal-form" labelAlign="left" :labelCol="labelCol" :wrapperCol="wrapperCol" name="BgXiSpeakForm">
+          <!-- 基本信息 -->
+          <a-divider orientation="left" plain>基本信息</a-divider>
+          <a-row :gutter="[16, 0]">
+            <a-col :span="24">
               <a-form-item
-                label="习近平总书记重要讲话指示批示情况"
+                label="重要讲话指示批示"
                 v-bind="validateInfos.speakStatus"
                 id="BgXiSpeakForm-speakStatus"
                 name="speakStatus"
+                :labelCol="{ xs: { span: 24 }, sm: { span: 3 } }"
+                :wrapperCol="{ xs: { span: 24 }, sm: { span: 21 } }"
               >
-                <a-textarea v-model:value="formData.speakStatus" :rows="4" placeholder="请输入习近平总书记重要讲话指示批示情况" allow-clear />
+                <a-textarea v-model:value="formData.speakStatus" :rows="3" placeholder="请输入习近平总书记重要讲话指示批示情况" allow-clear />
               </a-form-item>
             </a-col>
             <a-col :span="12">
@@ -25,7 +29,7 @@
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item label="学习传达研究部署情况" v-bind="validateInfos.status" id="BgXiSpeakForm-status" name="status">
+              <a-form-item label="学习传达研究部署" v-bind="validateInfos.status" id="BgXiSpeakForm-status" name="status">
                 <a-input v-model:value="formData.status" placeholder="请输入学习传达研究部署情况" allow-clear></a-input>
               </a-form-item>
             </a-col>
@@ -39,11 +43,6 @@
                 <j-select-user v-model:value="formData.responsiblePerson" placeholder="请从所党委选择责任人" allow-clear />
               </a-form-item>
             </a-col>
-            <!--            <a-col :span="12">-->
-            <!--              <a-form-item label="落实方案" v-bind="validateInfos.implPlan" id="BgXiSpeakForm-implPlan" name="implPlan">-->
-            <!--                <a-input v-model:value="formData.implPlan" placeholder="请输入落实方案" allow-clear></a-input>-->
-            <!--              </a-form-item>-->
-            <!--            </a-col>-->
             <a-col :span="12">
               <a-form-item label="牵头部门" v-bind="validateInfos.implDept" id="BgXiSpeakForm-implDept" name="implDept">
                 <j-select-dept v-model:value="formData.implDept" :multiple="true" placeholder="请选择牵头部门" checkStrictly allow-clear />
@@ -55,22 +54,12 @@
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item
-                label="会议决策数"
-                v-bind="validateInfos.numberOfResolutions"
-                id="BgXiSpeakForm-numberOfResolutions"
-                name="numberOfResolutions"
-              >
+              <a-form-item label="会议决策数" v-bind="validateInfos.numberOfResolutions" id="BgXiSpeakForm-numberOfResolutions" name="numberOfResolutions">
                 <a-input-number v-model:value="formData.numberOfResolutions" placeholder="请输入会议决策数" style="width: 100%" />
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item
-                label="是否需要所党委督办领导"
-                v-bind="validateInfos.needSdwApproval"
-                id="BgXiSpeakForm-needSdwApproval"
-                name="needSdwApproval"
-              >
+              <a-form-item label="是否需要督办领导" v-bind="validateInfos.needSdwApproval" id="BgXiSpeakForm-needSdwApproval" name="needSdwApproval">
                 <a-radio-group v-model:value="formData.needSdwApproval">
                   <a-radio :value="1">是</a-radio>
                   <a-radio :value="0">否</a-radio>
@@ -78,48 +67,30 @@
               </a-form-item>
             </a-col>
             <a-col v-if="formData.needSdwApproval === 1" :span="12">
-              <a-form-item label="所党委督办领导列表" v-bind="validateInfos.sdwLeaderList" id="BgXiSpeakForm-sdwLeaderList" name="sdwLeaderList">
+              <a-form-item label="督办领导列表" v-bind="validateInfos.sdwLeaderList" id="BgXiSpeakForm-sdwLeaderList" name="sdwLeaderList">
                 <j-select-user v-model:value="formData.sdwLeaderList" :multiple="true" allow-clear placeholder="请选择督办领导" />
               </a-form-item>
             </a-col>
+          </a-row>
 
+          <!-- 状态与统计 -->
+          <a-divider orientation="left" plain>状态与统计</a-divider>
+          <a-row :gutter="[16, 0]">
             <a-col :span="12">
               <a-form-item label="指定落实措施条数" v-bind="validateInfos.implCount" id="BgXiSpeakForm-implCount" name="implCount">
-                <a-input-number
-                  v-model:value="formData.implCount"
-                  placeholder="指定落实措施条数无需输入，每增加一条反馈数量加1"
-                  style="width: 100%"
-                />
+                <a-input-number v-model:value="formData.implCount" placeholder="每增加一条反馈数量加1" style="width: 100%" />
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="措施已闭环数量" v-bind="validateInfos.closedCount" id="BgXiSpeakForm-closedCount" name="closedCount">
-                <a-input-number v-model:value="formData.closedCount" placeholder="措施已闭环数量无需输入，每一个牵头部门完成反馈全流程，增加相应反馈数量" style="width: 100%" />
+                <a-input-number v-model:value="formData.closedCount" placeholder="完成反馈全流程后增加" style="width: 100%" />
               </a-form-item>
             </a-col>
-<!--            <a-col :span="12">-->
-<!--              <a-form-item label="落实情况" v-bind="validateInfos.implStatus" id="BgXiSpeakForm-implStatus" name="implStatus">-->
-<!--                <a-textarea v-model:value="formData.implStatus" :rows="4" placeholder="请输入" allow-clear />-->
-<!--              </a-form-item>-->
-<!--            </a-col>-->
             <a-col :span="12">
-              <a-form-item
-                label="报告反馈情况"
-                v-bind="validateInfos.reportFeedbackStatus"
-                id="BgXiSpeakForm-reportFeedbackStatus"
-                name="reportFeedbackStatus"
-              >
+              <a-form-item label="报告反馈情况" v-bind="validateInfos.reportFeedbackStatus" id="BgXiSpeakForm-reportFeedbackStatus" name="reportFeedbackStatus">
                 <a-input v-model:value="formData.reportFeedbackStatus" placeholder="请输入" allow-clear></a-input>
               </a-form-item>
             </a-col>
-            <!--            <a-col :span="12">-->
-            <!--              <a-form-item label="是否存在完成风险" id="BgXiSpeakForm-isCompletionRisk" name="isCompletionRisk">-->
-            <!--                <a-radio-group v-model:value="formData.isCompletionRisk">-->
-            <!--                  <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="完成状态" v-bind="validateInfos.completionStatus" id="BgXiSpeakForm-completionStatus" name="completionStatus">
                 <JDictSelectTag v-model:value="formData.completionStatus" dictCode="db_status" placeholder="请选择完成状态" type="radio" />
@@ -127,50 +98,19 @@
             </a-col>
             <a-col :span="12">
               <a-form-item label="截止日期" v-bind="validateInfos.deadline" id="BgXiSpeakForm-deadline" name="deadline">
-                <a-date-picker
-                  placeholder="请选择截止日期"
-                  v-model:value="formData.deadline"
-                  value-format="YYYY-MM-DD"
-                  style="width: 100%"
-                  allow-clear
-                />
+                <a-date-picker placeholder="请选择截止日期" v-model:value="formData.deadline" value-format="YYYY-MM-DD" style="width: 100%" allow-clear />
               </a-form-item>
             </a-col>
-            <!--            <a-col :span="12">-->
-            <!--              <a-form-item-->
-            <!--                label="拖期风险应对措施"-->
-            <!--                v-bind="validateInfos.delayRiskMitigation"-->
-            <!--                id="BgXiSpeakForm-delayRiskMitigation"-->
-            <!--                name="delayRiskMitigation"-->
-            <!--              >-->
-            <!--                <a-input v-model:value="formData.delayRiskMitigation" placeholder="请输入" allow-clear></a-input>-->
-            <!--              </a-form-item>-->
-            <!--            </a-col>-->
             <a-col :span="12">
               <a-form-item label="督办次数" v-bind="validateInfos.supervisionCount" id="BgXiSpeakForm-supervisionCount" name="supervisionCount">
-                <a-input-number
-                  v-model:value="formData.supervisionCount"
-                  placeholder="督办次数无需输入，每次发起督办流程自动加1"
-                  style="width: 100%"
-                />
+                <a-input-number v-model:value="formData.supervisionCount" placeholder="每次发起督办流程自动加1" style="width: 100%" />
               </a-form-item>
             </a-col>
-            <!--            <a-col :span="12">-->
-            <!--              <a-form-item label="父级节点" v-bind="validateInfos.pid" id="BgXiSpeakForm-pid" name="pid">-->
-            <!--                <j-tree-select-->
-            <!--                  v-model:value="formData.pid"-->
-            <!--                  dict="bg_xi_speak,impl_status,id"-->
-            <!--                  pidField="pid"-->
-            <!--                  pidValue="0"-->
-            <!--                  hasChildField="has_child"-->
-            <!--                  :disabled="disabled"-->
-            <!--                />-->
-            <!--              </a-form-item>-->
-            <!--            </a-col>-->
-            <a-col v-if="showFlowSubmitButton" :span="24" style="width: 100%; text-align: center">
-              <a-button preIcon="ant-design:check-outlined" style="width: 126px" type="primary" @click="submitForm">提 交</a-button>
-            </a-col>
           </a-row>
+
+          <a-col v-if="showFlowSubmitButton" :span="24" style="width: 100%; text-align: center; margin-top: 16px;">
+            <a-button preIcon="ant-design:check-outlined" style="width: 126px" type="primary" @click="submitForm">提 交</a-button>
+          </a-col>
         </a-form>
       </template>
     </JFormContainer>
@@ -230,8 +170,8 @@
   });
 
   const { createMessage } = useMessage();
-  const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
-  const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
+  const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 6 } });
+  const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 18 } });
   const confirmLoading = ref<boolean>(false);
 
   const validatorRules = reactive({
@@ -386,5 +326,17 @@
 <style lang="less" scoped>
   .antd-modal-form {
     padding: 14px;
+
+    :deep(.ant-form-item-label) {
+      overflow: visible;
+      white-space: normal;
+      text-overflow: unset;
+      text-align: left;
+
+      > label {
+        justify-content: flex-start;
+        width: 100%;
+      }
+    }
   }
 </style>
diff --git a/src/views/bg/xispeak/components/BgXiSpeakModal.vue b/src/views/bg/xispeak/components/BgXiSpeakModal.vue
index df0f908..ffb9a4c 100644
--- a/src/views/bg/xispeak/components/BgXiSpeakModal.vue
+++ b/src/views/bg/xispeak/components/BgXiSpeakModal.vue
@@ -16,7 +16,7 @@
   const { createMessage } = useMessage();
 
   const title = ref<string>('');
-  const width = ref<number>(800);
+  const width = ref<number>(1350);
   const visible = ref<boolean>(false);
   const disableSubmit = ref<boolean>(false);
   const registerForm = ref();