!34 feat(inspect): 新增默认审批意见和默认抄送人功能

Merge pull request !34 from new_new_new/feature/inspect_fin_node_send

src/views/dq/inspectTask/components/DqInspectTaskBPMForm.vue

@@ -29,7 +29,12 @@
         </div>
         <a-row class="base-info-row" :gutter="[12, 4]">
           <a-col :span="24">
-            <a-form-item label="具体问题" name="problemId" :labelCol="{ xs: { span: 24 }, sm: { span: 4 } }" :wrapperCol="{ xs: { span: 24 }, sm: { span: 20 } }">
+            <a-form-item
+              label="具体问题"
+              name="problemId"
+              :labelCol="{ xs: { span: 24 }, sm: { span: 4 } }"
+              :wrapperCol="{ xs: { span: 24 }, sm: { span: 20 } }"
+            >
               <a-tree-select
                 v-model:value="mainForm.problemId"
                 :tree-data="problemTreeData"
@@ -43,14 +48,25 @@
             </a-form-item>
           </a-col>
           <a-col :span="24">
-            <a-form-item label="整改措施" name="improveMeasure" :labelCol="{ xs: { span: 24 }, sm: { span: 4 } }" :wrapperCol="{ xs: { span: 24 }, sm: { span: 20 } }">
+            <a-form-item
+              label="整改措施"
+              name="improveMeasure"
+              :labelCol="{ xs: { span: 24 }, sm: { span: 4 } }"
+              :wrapperCol="{ xs: { span: 24 }, sm: { span: 20 } }"
+            >
               <a-textarea v-model:value="mainForm.improveMeasure" :auto-size="{ minRows: 1, maxRows: 4 }" :disabled="mainDisabled" allow-clear />
             </a-form-item>
           </a-col>
           <template v-if="showBaseInfoDetail">
             <a-col :span="12">
               <a-form-item label="密级" name="secretLevel">
-                <j-dict-select-tag v-model:value="mainForm.secretLevel" dictCode="secret_level" placeholder="请选择密级" :disabled="mainDisabled" allow-clear />
+                <j-dict-select-tag
+                  v-model:value="mainForm.secretLevel"
+                  dictCode="secret_level"
+                  placeholder="请选择密级"
+                  :disabled="mainDisabled"
+                  allow-clear
+                />
               </a-form-item>
             </a-col>
             <a-col :span="12">
@@ -214,6 +230,8 @@
           :claim="claim"
           :showSelnextUser="showSelnextUser"
           :beforeHandle="saveMainFormBeforeProcessHandle"
+          :defaultReason="defaultHandleReason"
+          :defaultCc="defaultCcUsers"
           @success="handleProcessSuccess"
           @claimSuccess="handleClaimSuccess"
         />
@@ -273,6 +291,33 @@
   const isNeedLeaderApprove = ref(0);
   const leaderApproveUser = ref('');
   const savingIsNeedLeaderApprove = ref(false);
+  const defaultCcUsers = ref<Array<{ username: string; realname: string }>>([]);
+
+  const handleReasonTemplateMap: Record<string, () => string> = {
+    Task_0g8sc6n: () => '同意。',
+    Task_0ixi1rs: () => '已收集完成，同意。',
+    Task_0l5ik22: () => '同意。',
+    Task_0mbr735: () => '已完成反馈，请领导审批。',
+    Task_0mxtg05: () => '已审批。',
+    Task_14226iy: () => '已审查。',
+    Task_1c64uvl: () => '请相关部门办理。',
+    Task_1i99s6v: () => '同意。',
+    Task_1nj4k7b: () => '已发起督办流程。',
+
+    Task_09qxoto: () => '纪委书记已审批。',
+    Task_0cfjknn: () => '党委书记已审批。',
+    Task_0r2vutj: () => '责任经办部门已审批。',
+    Task_1azpeqj: () => '纪检经办人已监察。',
+    Task_1cvft2f: () => '党群经办人已确认。',
+    Task_1k1zt37: () => '分管所领导已审批。',
+    Task_1k36lmv: () => '责任部门负责人已审批。',
+    Task_1k6n75g: () => '分配人办理流程。',
+  };
+
+  const defaultHandleReason = computed(() => {
+    const builder = handleReasonTemplateMap[String(processInfo.value.taskDefKey || '')];
+    return builder ? builder() : '';
+  });
 
   const mainForm = reactive<Record<string, any>>({
     id: '',
@@ -333,33 +378,21 @@
     if (explicit === '1') return true;
     return props.formBpm && !!props.formData?.taskId;
   });
-  const showAddFeedback = computed(
+  const showAddFeedback = computed(() => String(props.formData?.extendUrlParams?.showAddFeedback ?? '') === '1');
-    () => String(props.formData?.extendUrlParams?.showAddFeedback ?? '') === '1'
-  );
   const showFeedbackInfo = computed(() => {
     const p = props.formData?.extendUrlParams;
     const explicit = p?.showFeedbackInfo;
     if (explicit === '0') return false;
     if (explicit === '1') return true;
-    return (
+    return String(p?.showAddFeedback ?? '') === '1' || String(p?.showEditFeedback ?? '') === '1' || String(p?.showDeptFeedback ?? '') === '1';
-      String(p?.showAddFeedback ?? '') === '1' ||
-      String(p?.showEditFeedback ?? '') === '1' ||
-      String(p?.showDeptFeedback ?? '') === '1'
-    );
   });
-  const showEditFeedback = computed(
+  const showEditFeedback = computed(() => String(props.formData?.extendUrlParams?.showEditFeedback ?? '') === '1');
-    () => String(props.formData?.extendUrlParams?.showEditFeedback ?? '') === '1'
+  const showDeptFeedback = computed(() => String(props.formData?.extendUrlParams?.showDeptFeedback ?? '') === '1');
-  );
-  const showDeptFeedback = computed(
-    () => String(props.formData?.extendUrlParams?.showDeptFeedback ?? '') === '1'
-  );
   const showJiJianFields = computed(() => String(props.formData?.extendUrlParams?.showJiJianFields ?? '') === '1');
   const jiJianFieldsReadonly = computed(() => String(props.formData?.extendUrlParams?.jiJianFieldsReadonly ?? '') === '1');
   const nonJiJianFieldsReadonly = computed(() => String(props.formData?.extendUrlParams?.nonJiJianFieldsReadonly ?? '') === '1');
   const showSelnextUser = computed(() => String(props.formData?.extendUrlParams?.showSelnextUser ?? '') === '1');
-  const showSubApproveUser = computed(
+  const showSubApproveUser = computed(() => String(props.formData?.extendUrlParams?.showSubApproveUser ?? '') === '1');
-    () => String(props.formData?.extendUrlParams?.showSubApproveUser ?? '') === '1'
-  );
   const showIsNeedLeaderApprove = computed(
     () => String(props.formData?.extendUrlParams?.showIsNeedLeaderApprove ?? '') === '1'
   );
@@ -407,6 +440,37 @@
     { immediate: true }
   );
 
+  async function fetchDefaultCcUsers() {
+    try {
+      const res = await defHttp.get({
+        url: '/sys/user/queryUserRoleComponentData',
+        params: {
+          departId: '2044677562460508161',
+          roleId: '2044676455280570370',
+          searchSecurityLevel: 5,
+          pageNo: 1,
+          pageSize: 999,
+        },
+      });
+      const records = res?.records || res?.result?.records || [];
+      defaultCcUsers.value = records;
+    } catch {
+      defaultCcUsers.value = [];
+    }
+  }
+
+  watch(
+    () => processInfo.value.taskDefKey,
+    (key) => {
+      if (key === 'Task_0ixi1rs') {
+        fetchDefaultCcUsers();
+      } else {
+        defaultCcUsers.value = [];
+      }
+    },
+    { immediate: true }
+  );
+
   async function loadProblemTree() {
     loadingProblemOptions.value = true;
     try {
@@ -462,7 +526,9 @@
       const deptId = getCurrentUserDeptId();
       if (deptId) {
         list = list.filter((item: any) => {
-          const deptIds = String(item.feedbackDeptId || '').split(',').map((s: string) => s.trim());
+          const deptIds = String(item.feedbackDeptId || '')
+            .split(',')
+            .map((s: string) => s.trim());
           return deptIds.includes(String(deptId));
         });
       }

src/views/super/bpm/process/components/bpmSelectUser/index.vue

@@ -13,7 +13,7 @@
   /**
    * 流程审批中选择用户用 - 只管选择，不管回显
    */
-  import { ref, toRaw, computed } from 'vue';
+  import { ref, toRaw, computed, watch } from 'vue';
   import BpmSelectUserModal from './BpmSelectUserModal.vue';
   import { useModal } from '/@/components/Modal';
 
@@ -27,15 +27,32 @@
         type: String,
         default: '',
       },
+      value: {
+        type: Array,
+        default: () => [],
+      },
     },
     emits: ['change'],
-    setup(_p, { emit }) {
+    setup(props, { emit }) {
       let selectedUserList = [];
       const options = ref([]);
       const selectValue = ref([]);
       const [registerModal, { openModal }] = useModal();
       const lastSelectedRows = ref([]);
 
+      watch(
+        () => props.value,
+        (val) => {
+          const list = (Array.isArray(val) ? val : []).filter((u) => u?.username);
+          if (!list.length) return;
+          selectValue.value = list.map((u) => u.username);
+          options.value = list.map((u) => ({ value: u.username }));
+          selectedUserList = list;
+          lastSelectedRows.value = list;
+        },
+        { immediate: true }
+      );
+
       function openSelect() {
         let arr = getModalData();
         openModal(true, {

src/views/super/bpm/process/personalOffice/myHandleTask/content/MyHandleContent.vue

@@ -83,7 +83,7 @@
         <!-- 抄送 -->
         <a-list-item style="line-height: 32px" v-show="checkedCc">
           <span>抄送给：</span>
-          <bpm-select-user style="display: inline-block" placeholder="请选择抄送人" @change="handleSelectCcUser"></bpm-select-user>
+          <bpm-select-user style="display: inline-block" placeholder="请选择抄送人" :value="defaultCc" @change="handleSelectCcUser"></bpm-select-user>
         </a-list-item>
       </a-list>
 
@@ -187,7 +187,11 @@
       defaultReason: {
         type: String,
         default: '',
-      }
+      },
+      defaultCc: {
+        type: Array,
+        default: () => [],
+      },
     },
     emits: ['success'],
     setup(props, { emit }) {
@@ -288,6 +292,20 @@
         ccPersonList.value = [];
       }
 
+      watch(
+        () => props.defaultCc,
+        (val) => {
+          const list = (Array.isArray(val) ? val : []).filter((u) => u?.username);
+          if (!list.length) return;
+          checkedCc.value = true;
+          const usernames = list.map((u) => u.username);
+          const realnames = list.map((u) => u.realname);
+          model.ccUserIds = usernames.join(',');
+          model.ccUserRealNames = realnames.join(',');
+        },
+        { immediate: true }
+      );
+
       function changeReasonSelection(value) {
         model.reason = value;
       }

src/views/super/bpm/process/personalOffice/myHandleTask/content/TaskHandleInnerContent.vue

@@ -21,6 +21,7 @@
       :allowReject="allowReject"
       :beforeHandle="beforeHandle"
       :defaultReason="defaultReason"
+      :defaultCc="defaultCc"
       :currentTaskName="currentNode.taskName">
     </my-handle-content>
 
@@ -66,6 +67,10 @@
         type: String,
         default: '',
       },
+      defaultCc: {
+        type: Array,
+        default: () => [],
+      },
       showSelnextUser: {
         type: Boolean,
         default: true,