Merge remote-tracking branch 'origin/master'

src/layouts/default/header/components/user-dropdown/DepartSelect.vue

@@ -50,7 +50,7 @@
   </BasicModal>
 </template>
 <script lang="ts" setup>
-  import { ref, computed, watch, unref } from 'vue';
+  import { ref, computed, watch, unref, onMounted } from 'vue';
   import { Avatar } from 'ant-design-vue';
   import { BasicModal } from '/@/components/Modal';
   import { getUserDeparts, selectDepart } from '/@/views/system/depart/depart.api';
@@ -125,8 +125,12 @@
     if (!result.list || result.list.length == 0) {
       return;
     }
-    let currentDepart = result.list.filter((item) => item.orgCode == result.orgCode);
-    departList.value = result.list;
+    let filteredList = result.list.filter((item) => item.departType != '4');
+    if (filteredList.length == 0) {
+      return;
+    }
+    let currentDepart = filteredList.filter((item) => item.orgCode == result.orgCode);
+    departList.value = filteredList;
     departSelected.value = currentDepart && currentDepart.length > 0 ? result.orgCode : '';
     currentDepartName.value = currentDepart && currentDepart.length > 0 ? currentDepart[0].departName : '';
     isMultiDepart.value = true;
@@ -252,8 +256,29 @@
     }
   );
 
+  /**
+   * 检测当前 orgCode 与部门列表是否匹配，不匹配则自动弹出确认弹窗。
+   * 用于管理员修改用户部门后，用户端自动提示确认。
+   */
+  async function checkAndShow() {
+    try {
+      await loadDepartList();
+      if (unref(departList).length > 0 && !unref(departSelected)) {
+        currTitle.value = '部门信息已更新，请确认当前部门';
+        visible.value = true;
+      }
+    } catch {
+      // 部门信息加载失败（如未登录），静默跳过
+    }
+  }
+
+  onMounted(() => {
+    checkAndShow();
+  });
+
   defineExpose({
     show,
+    checkAndShow,
   });
 </script>
 <style lang="less" scoped>

src/views/bg/xispeak/BgXiSpeakList.vue

@@ -14,19 +14,17 @@
               <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">
-            <a-form-item label="完成状态" name="completionStatus">
-              <JDictSelectTag v-model:value="queryParam.completionStatus" dictCode="db_status" placeholder="请选择完成状态" allow-clear @change="searchQuery" />
-            </a-form-item>
-          </a-col>
+<!--          <a-col :lg="4" :md="6" :sm="8">-->
+<!--            <a-form-item label="完成状态" name="completionStatus">-->
+<!--              <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-form-item name="bpmStatus" label="督办状态">
+              <a-select v-model:value="queryParam.bpmStatus" placeholder="请选择" allow-clear @change="searchQuery">
+                <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>
             </a-form-item>
           </a-col>

src/views/dq/inspectTask/DqInspectTaskList.vue

@@ -17,13 +17,11 @@
             </a-form-item>
           </a-col>
           <a-col :lg="6">
-            <a-form-item name="completedStage" label="流程阶段">
-              <a-select v-model:value="completedStageFilter" placeholder="请选择" allow-clear @change="handleCompletedStageChange">
-                <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-form-item name="bpmStatus" label="督办状态">
+              <a-select v-model:value="bpmStatusFilter" placeholder="请选择" allow-clear @change="handleBpmStatusChange">
+                <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>
             </a-form-item>
           </a-col>
@@ -175,7 +173,7 @@
   const feedbackViewModalRef = ref();
   const flowScheduleModalRef = ref();
   const businessProcessListModalRef = ref();
-  const completedStageFilter = ref();
+  const bpmStatusFilter = ref();
   const userStore = useUserStore();
   const { createMessage } = useMessage();
   //注册table数据
@@ -592,8 +590,8 @@
   function searchReset() {
     formRef.value.resetFields();
     selectedRowKeys.value = [];
-    completedStageFilter.value = undefined;
-    delete queryParam.completedStage;
+    bpmStatusFilter.value = undefined;
+    delete queryParam.bpmStatus;
     //刷新数据
     reload();
   }
@@ -603,11 +601,11 @@
    * @param key
    * @param value
    */
-  function handleCompletedStageChange(value) {
+  function handleBpmStatusChange(value) {
     if (value != null) {
-      queryParam.completedStage = Number(value);
+      queryParam.bpmStatus = value;
     } else {
-      delete queryParam.completedStage;
+      delete queryParam.bpmStatus;
     }
     reload();
   }