!45 feat(xispeak): 补充BPM表单审批意见任务节点映射
* feat(xispeak): 补充BPM表单审批意见任务节点映射 * style(xispeak): 优化查询表单布局并替换牵头部门选人组件
This commit is contained in:
@@ -4,14 +4,14 @@
|
|||||||
<div class="jeecg-basic-table-form-container">
|
<div class="jeecg-basic-table-form-container">
|
||||||
<a-form ref="formRef" @keyup.enter="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
|
<a-form ref="formRef" @keyup.enter="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
|
||||||
<a-row :gutter="24">
|
<a-row :gutter="24">
|
||||||
<a-col :lg="6" :md="8" :sm="12">
|
<a-col :lg="8" :md="10" :sm="12">
|
||||||
<a-form-item label="重要讲话指示批示情况" name="speakStatus">
|
<a-form-item label="重要讲话指示批示情况" name="speakStatus" :labelCol="{ xs: { span: 24 }, sm: { span: 10 } }" :wrapperCol="{ xs: { span: 24 }, sm: { span: 14 } }">
|
||||||
<JInput v-model:value="queryParam.speakStatus" type="like" placeholder="请输入重要讲话指示批示情况" allow-clear trim />
|
<JInput v-model:value="queryParam.speakStatus" type="like" placeholder="请输入重要讲话指示批示情况" allow-clear trim />
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col :lg="5" :md="8" :sm="12">
|
<a-col :lg="6" :md="8" :sm="12">
|
||||||
<a-form-item label="牵头部门" name="implDept">
|
<a-form-item label="牵头部门" name="implDept">
|
||||||
<j-select-dept v-model:value="queryParam.implDept" placeholder="选择牵头部门" allow-clear style="width: 100%" />
|
<SzSelectDept v-model:value="queryParam.implDept" placeholder="选择牵头部门" allow-clear style="width: 100%" />
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col :lg="4" :md="6" :sm="8">
|
<a-col :lg="4" :md="6" :sm="8">
|
||||||
@@ -92,7 +92,7 @@
|
|||||||
|
|
||||||
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
|
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
|
||||||
import JInput from '/@/components/Form/src/jeecg/components/JInput.vue';
|
import JInput from '/@/components/Form/src/jeecg/components/JInput.vue';
|
||||||
import JSelectDept from '/@/components/Form/src/jeecg/components/JSelectDept.vue';
|
import SzSelectDept from '/@/components/Form/src/jeecg/components/SzSelectDept.vue';
|
||||||
import BgXiSpeakModal from './components/BgXiSpeakModal.vue';
|
import BgXiSpeakModal from './components/BgXiSpeakModal.vue';
|
||||||
|
|
||||||
import BusinessProcessListModal from '/src/components/semri/process/BusinessProcessListModal.vue';
|
import BusinessProcessListModal from '/src/components/semri/process/BusinessProcessListModal.vue';
|
||||||
@@ -793,6 +793,10 @@
|
|||||||
:deep(.ant-input-number) {
|
:deep(.ant-input-number) {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
:deep(.ant-form-item-label > label) {
|
||||||
|
overflow: visible;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.erpNativeList {
|
.erpNativeList {
|
||||||
|
|||||||
@@ -110,13 +110,7 @@
|
|||||||
</a-col>
|
</a-col>
|
||||||
<a-col :span="12">
|
<a-col :span="12">
|
||||||
<a-form-item label="截止日期" name="deadline">
|
<a-form-item label="截止日期" name="deadline">
|
||||||
<a-date-picker
|
<a-date-picker v-model:value="mainForm.deadline" value-format="YYYY-MM-DD" :disabled="mainDisabled" style="width: 100%" allow-clear />
|
||||||
v-model:value="mainForm.deadline"
|
|
||||||
value-format="YYYY-MM-DD"
|
|
||||||
:disabled="mainDisabled"
|
|
||||||
style="width: 100%"
|
|
||||||
allow-clear
|
|
||||||
/>
|
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col :span="12">
|
<a-col :span="12">
|
||||||
@@ -236,7 +230,6 @@
|
|||||||
/>
|
/>
|
||||||
|
|
||||||
<template v-if="showProcessHandle">
|
<template v-if="showProcessHandle">
|
||||||
|
|
||||||
<a-divider />
|
<a-divider />
|
||||||
<div class="process-header section-toolbar">
|
<div class="process-header section-toolbar">
|
||||||
<div class="section-title">流程办理</div>
|
<div class="section-title">流程办理</div>
|
||||||
@@ -284,13 +277,7 @@ import SzDeptUserModal from '/@/components/semri/deptUserComponent/SzDeptUserMod
|
|||||||
import JTreeSelect from '/@/components/Form/src/jeecg/components/JTreeSelect.vue';
|
import JTreeSelect from '/@/components/Form/src/jeecg/components/JTreeSelect.vue';
|
||||||
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
|
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
|
||||||
import Icon from '/@/components/Icon/index';
|
import Icon from '/@/components/Icon/index';
|
||||||
import {
|
import { bgXiSpeakFeedbackList, bgXiSpeakFeedbackListWithDept, bgXiSpeakFeedbackDelete, saveBpmForm, saveSubApprove } from '../BgXiSpeak.api';
|
||||||
bgXiSpeakFeedbackList,
|
|
||||||
bgXiSpeakFeedbackListWithDept,
|
|
||||||
bgXiSpeakFeedbackDelete,
|
|
||||||
saveBpmForm,
|
|
||||||
saveSubApprove,
|
|
||||||
} from '../BgXiSpeak.api';
|
|
||||||
import { usePermission } from '/@/hooks/web/usePermission';
|
import { usePermission } from '/@/hooks/web/usePermission';
|
||||||
import TaskHandleInnerContent from '/@/views/super/bpm/process/personalOffice/myHandleTask/content/TaskHandleInnerContent.vue';
|
import TaskHandleInnerContent from '/@/views/super/bpm/process/personalOffice/myHandleTask/content/TaskHandleInnerContent.vue';
|
||||||
import BgXiSpeakBPMFeedbackModal from './BgXiSpeakBPMFeedbackModal.vue';
|
import BgXiSpeakBPMFeedbackModal from './BgXiSpeakBPMFeedbackModal.vue';
|
||||||
@@ -461,6 +448,22 @@ import SzDeptUserModal from '/@/components/semri/deptUserComponent/SzDeptUserMod
|
|||||||
// 'Task_': buildSuperviseCheckReason,
|
// 'Task_': buildSuperviseCheckReason,
|
||||||
// 纪检经办人监察
|
// 纪检经办人监察
|
||||||
// 'Task_': buildJiJianCheckReason,
|
// 'Task_': buildJiJianCheckReason,
|
||||||
|
Task_15sm4w5: buildApproveReason,
|
||||||
|
Task_00i7rrp: buildApproveReason,
|
||||||
|
Task_00v3pcv: buildDeptHandlerFeedbackReason,
|
||||||
|
Task_04bazej: buildApproveReason,
|
||||||
|
Task_08zb04x: buildDeptHandlerFeedbackReason,
|
||||||
|
Task_0bj578x: buildApproveReason,
|
||||||
|
Task_0jrgrzs: buildDeptHandlerFeedbackReason,
|
||||||
|
Task_0mf32ge: buildApproveReason,
|
||||||
|
Task_0zmn6ik: buildApproveReason,
|
||||||
|
Task_133caii: buildApproveReason,
|
||||||
|
Task_15sm4w5: buildApproveReason,
|
||||||
|
Task_175afz2: buildApproveReason,
|
||||||
|
Task_1ogk921: buildApproveReason,
|
||||||
|
Task_1v9ce78: buildDeptLeaderAssignReason,
|
||||||
|
Task_1w4vxgc: buildApproveReason,
|
||||||
|
Task_1wfkrvj: buildApproveReason,
|
||||||
};
|
};
|
||||||
|
|
||||||
const defaultHandleReason = computed(() => {
|
const defaultHandleReason = computed(() => {
|
||||||
@@ -583,7 +586,9 @@ import SzDeptUserModal from '/@/components/semri/deptUserComponent/SzDeptUserMod
|
|||||||
const deptId = getCurrentUserDeptId();
|
const deptId = getCurrentUserDeptId();
|
||||||
if (deptId) {
|
if (deptId) {
|
||||||
list = list.filter((item: any) => {
|
list = list.filter((item: any) => {
|
||||||
const deptIds = String(item.responDeptid || '').split(',').map((s: string) => s.trim());
|
const deptIds = String(item.responDeptid || '')
|
||||||
|
.split(',')
|
||||||
|
.map((s: string) => s.trim());
|
||||||
return deptIds.includes(String(deptId));
|
return deptIds.includes(String(deptId));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user