Merge remote-tracking branch 'origin/master'

src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue

@@ -184,13 +184,10 @@
             </a-col>
             <a-col v-if="showSubApproveUserSelector" :span="12">
               <a-form-item label="部门经办人" :labelCol="wideLabelCol" :wrapperCol="wideWrapperCol">
-
-                  <j-select-user
-                    v-model:value="subApproveUser"
-                    :disabled="savingSubApproveUser"
-                    allow-clear
-                  />
-
+                <sz-dept-user-modal
+                  v-model:value="subApproveUser"
+                  :disabled="savingSubApproveUser"
+                />
               </a-form-item>
             </a-col>
 <!--            <a-col :span="24">-->
@@ -226,7 +223,7 @@
   import JDictSelectTag from "../../../../components/Form/src/jeecg/components/JDictSelectTag.vue";
   import BgPartymatterBPMFeedbackModal from './BgPartymatterBPMFeedbackModal.vue';
   import SUploadFile from '/@/components/semri/fileComponent/SUploadFile.vue';
-  import JSelectUser from "../../../../components/Form/src/jeecg/components/JSelectUser.vue";
+  import SzDeptUserModal from '/@/components/semri/deptUserComponent/SzDeptUserModal.vue';
   const { isDisabledAuth, hasPermission, initBpmFormData} = usePermission();
 
   const props = defineProps({

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

@@ -262,6 +262,7 @@
           :claim="claim"
           :showSelnextUser="showSelnextUser"
           :beforeHandle="saveMainFormBeforeProcessHandle"
+          :defaultReason="defaultHandleReason"
           @success="handleProcessSuccess"
           @claimSuccess="handleClaimSuccess"
         />
@@ -441,6 +442,59 @@
     processTableName: props.formData?.processTableName,
   }));
 
+  // ==================== 默认审批意见 ====================
+  const handleReasonTemplateMap: Record<string, () => string> = {
+    // TODO: 填写各节点的 taskDefKey
+    // 部门负责人审批 / 所党委审批 / 督办部门负责人审批 / 纪检负责人审批
+    // 'Task_': buildApproveReason,
+    // 部门经办人反馈完成情况 / 收集流程部门经办人填写 / 反馈流程部门经办人填写反馈
+    // 'Task_': buildDeptHandlerFeedbackReason,
+    // 部门负责人接受任务并分配
+    // 'Task_': buildDeptLeaderAssignReason,
+    // 部门负责人直接反馈
+    // 'Task_': buildDeptLeaderDirectFeedbackReason,
+    // 督办部门经办人确认全部反馈事项
+    // 'Task_': buildSuperviseConfirmAllReason,
+    // 督办经办人核查 / 反馈流程督办经办人核查
+    // 'Task_': buildSuperviseCheckReason,
+    // 纪检经办人监察
+    // 'Task_': buildJiJianCheckReason,
+  };
+
+  const defaultHandleReason = computed(() => {
+    const builder = handleReasonTemplateMap[String(processInfo.value.taskDefKey || '')];
+    return builder ? builder() : '';
+  });
+
+  function buildApproveReason() {
+    return '同意。';
+  }
+
+  function buildDeptHandlerFeedbackReason() {
+    return '已完成反馈，请领导审批。';
+  }
+
+  function buildDeptLeaderAssignReason() {
+    const userNameText = subApproveUser.value || '';
+    return userNameText ? `请${userNameText}办理。` : '';
+  }
+
+  function buildDeptLeaderDirectFeedbackReason() {
+    return '已完成反馈。';
+  }
+
+  function buildSuperviseConfirmAllReason() {
+    return '已确认全部反馈事项。';
+  }
+
+  function buildSuperviseCheckReason() {
+    return '已核查。';
+  }
+
+  function buildJiJianCheckReason() {
+    return '已监察。';
+  }
+
   onMounted(() => {
     initFormData();
   });