Merge remote-tracking branch 'origin/master'

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

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,
     };
   }