Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/bg/xispeak/components/BgXiSpeakBPMForm.vue

src/views/bg/bgpartymatter/BgPartymatterList.vue

@@ -238,7 +238,7 @@
       },
     },
     exportConfig: {
-      name: props.ledgerTitle,
+      name: props.meetingType === 'office' ? '所务会' : '党委会',
       url: getExportUrl,
       params: getLedgerQueryParams,
     },
@@ -638,7 +638,7 @@
     const blob = new Blob([data]);
     const link = document.createElement('a');
     link.href = URL.createObjectURL(blob);
-    link.download = '党建议题-导入模板.xls';
+    link.download = props.meetingType === 'office' ? '所务会-导入模板.xls' : '党委会-导入模板.xls';
     link.click();
     URL.revokeObjectURL(link.href);
   }

src/views/bg/xispeak/BgXiSpeakList.vue

@@ -19,6 +19,17 @@
               <JDictSelectTag v-model:value="queryParam.completionStatus" dictCode="db_status" placeholder="请选择完成状态" allow-clear @change="searchQuery" />
             </a-form-item>
           </a-col>
+          <a-col :lg="6">
+            <a-form-item name="completedStage" label="流程阶段">
+              <a-select v-model:value="queryParam.completedStage" placeholder="请选择" allow-clear @change="searchQuery">
+                <a-select-option :value="0">未发起流程</a-select-option>
+                <a-select-option :value="1">正在落实措施收集流程</a-select-option>
+                <a-select-option :value="2">落实措施收集流程结束</a-select-option>
+                <a-select-option :value="3">正在经办人执行反馈流程</a-select-option>
+                <a-select-option :value="4">经办人执行反馈流程结束</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
           <a-col :lg="4" :md="8" :sm="12">
             <span class="table-page-search-submitButtons">
               <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
@@ -96,7 +107,7 @@
 </template>
 
 <script lang="ts" name="bg.xispeak-bgXiSpeak" setup>
-  import { ref, reactive, unref, computed, provide } from 'vue';
+  import { ref, reactive, unref, computed, provide, nextTick } from 'vue';
   import { BasicTable, useTable } from '/@/components/Table';
   import { Dropdown } from '/@/components/Dropdown';
   import { useListPage } from '/@/hooks/system/useListPage';
@@ -619,14 +630,16 @@ import { defHttp } from '/@/utils/http/axios';
 
   function handleFeedbackRightNowConfirm({ record, feedbackRightNow }) {
     pendingFeedbackRightNow.value = feedbackRightNow;
-    flowScheduleModalRef.value?.open({
-      title: '发起落实措施收集流程',
-      payload: { record },
-      deptOptions: getLeadDeptOptions(record),
-      showSuoleaderFields: true,
-      isNeedAppro: record?.needSdwApproval,
-      supDeptleaderid: record?.sdwLeaderList,
-      supDeptleaderName: record?.sdwLeaderList_dictText,
+    nextTick(() => {
+      flowScheduleModalRef.value?.open({
+        title: '发起落实措施收集流程',
+        payload: { record },
+        deptOptions: getLeadDeptOptions(record),
+        showSuoleaderFields: true,
+        isNeedAppro: record?.needSdwApproval,
+        supDeptleaderid: record?.sdwLeaderList,
+        supDeptleaderName: record?.sdwLeaderList_dictText,
+      });
     });
   }
 

src/views/bg/xispeak/components/BgXiSpeakBPMForm.vue

@@ -213,7 +213,7 @@
             <span v-else>-</span>
           </template>
           <template v-if="column.key === 'feedbackAction'">
-            <a-button type="link" size="small" @click="handleEditFeedback(record)">编辑</a-button>
+            <a-button type="link" size="small" @click="handleEditFeedback(record)">{{ showJiJianFields && nonJiJianFieldsReadonly ? '督察' : '编辑' }}</a-button>
             <a-popconfirm title="确定删除该反馈吗？" @confirm="handleDeleteFeedback(record)">
               <a-button type="link" size="small" danger>删除</a-button>
             </a-popconfirm>

src/views/bg/xispeak/components/BgXiSpeakForm.vue

@@ -107,6 +107,17 @@
                 <a-input-number v-model:value="formData.supervisionCount" placeholder="每次发起督办流程自动加1" style="width: 100%" disabled />
               </a-form-item>
             </a-col>
+            <a-col :span="12">
+              <a-form-item label="流程阶段" name="completedStage">
+                <a-select v-model:value="formData.completedStage" placeholder="请选择流程阶段" allow-clear>
+                  <a-select-option :value="0">未发起流程</a-select-option>
+                  <a-select-option :value="1">正在落实措施收集流程</a-select-option>
+                  <a-select-option :value="2">落实措施收集流程结束</a-select-option>
+                  <a-select-option :value="3">正在经办人执行反馈流程</a-select-option>
+                  <a-select-option :value="4">经办人执行反馈流程结束</a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
           </a-row>
 
           <a-col v-if="showFlowSubmitButton" :span="24" style="width: 100%; text-align: center; margin-top: 16px;">
@@ -172,6 +183,7 @@ import { PARTY_COMMITTEE_DEPT_ID, SDW_LEADER_ROLE_ID } from '/@/constant/supervi
       delFlag: undefined,
       bpmStatus: undefined,
       supervisionCount: undefined,
+      completedStage: undefined,
     };
   }