!159 fix(bqtakepulse): 筛选条件文案改为意见类型
* fix(bqtakepulse): 筛选条件文案改为意见类型 * fix(bgpartymatter): 反馈弹窗字段对齐 * fix(inspectProblem): 上级问题字段按问题种类动态显示必填星号 * fix(bqtakepulse): 督办次数改为数字输入 * fix(bqtakepulse): 反馈弹窗字段对齐并支持长label换行 * feat(bpm): 各流程表单默认抄送改用角色查询接口 * fix(bgpartymatter): 所办负责人审批改为单选并调整编辑表单布局 * fix(modal): 详情弹窗支持点击遮罩关闭
This commit is contained in:
@@ -127,7 +127,7 @@
|
||||
<!-- </a-form-item>-->
|
||||
<!-- </a-col>-->
|
||||
<a-col :span="12">
|
||||
<a-form-item label="是否需要督办领导" name="needSdwApproval">
|
||||
<a-form-item label="是否需要督办负责人" name="needSdwApproval">
|
||||
<a-radio-group v-model:value="mainForm.needSdwApproval" :disabled="mainDisabled">
|
||||
<a-radio :value="1">是</a-radio>
|
||||
<a-radio :value="0">否</a-radio>
|
||||
@@ -135,7 +135,7 @@
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col v-if="mainForm.needSdwApproval === 1" :span="12">
|
||||
<a-form-item label="督导领导列表" name="sdwLeaderList">
|
||||
<a-form-item label="督导负责人列表" name="sdwLeaderList">
|
||||
<DeptRoleUserSelectRadioGroup
|
||||
v-model:value="mainForm.sdwLeaderList"
|
||||
:deptId="PARTY_COMMITTEE_DEPT_ID"
|
||||
@@ -213,7 +213,9 @@
|
||||
<span v-else>-</span>
|
||||
</template>
|
||||
<template v-if="column.key === 'feedbackAction'">
|
||||
<a-button type="link" size="small" @click="handleEditFeedback(record)">{{ showJiJianFields && nonJiJianFieldsReadonly ? '督察' : '编辑' }}</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>
|
||||
@@ -246,7 +248,12 @@
|
||||
</a-col>
|
||||
<a-col v-if="showSubApproveUserSelector" :xs="24" :md="{ span: 22, offset: 1 }">
|
||||
<a-form-item label="部门经办人" :labelCol="processLabelCol" :wrapperCol="processUserWrapperCol">
|
||||
<sz-dept-user-modal class="process-user-selector" v-model:value="subApproveUser" :disabled="savingSubApproveUser" @confirm="setDisplayNames" />
|
||||
<sz-dept-user-modal
|
||||
class="process-user-selector"
|
||||
v-model:value="subApproveUser"
|
||||
:disabled="savingSubApproveUser"
|
||||
@confirm="setDisplayNames"
|
||||
/>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
</a-row>
|
||||
@@ -285,17 +292,17 @@
|
||||
import BgXiSpeakBPMFeedbackModal from './BgXiSpeakBPMFeedbackModal.vue';
|
||||
import SUploadFile from '/@/components/semri/fileComponent/SUploadFile.vue';
|
||||
import DeptRoleUserSelectRadioGroup from '/@/components/semri/userComponent/DeptRoleUserSelectRadioGroup.vue';
|
||||
import { PARTY_COMMITTEE_DEPT_ID, SDW_LEADER_ROLE_ID, CHARGE_LEADER_ROLE_ID } from '/@/constant/supervision';
|
||||
import {
|
||||
buildApproveReason,
|
||||
buildDeptHandlerFeedbackReason,
|
||||
buildDeptLeaderAssignReason,
|
||||
buildDeptLeaderDirectFeedbackReason,
|
||||
buildSuperviseConfirmAllReason,
|
||||
buildSuperviseCheckReason,
|
||||
buildJiJianCheckReason,
|
||||
normalizeDeptNames,
|
||||
} from '/@/composables/useDefaultApprovalReason';
|
||||
import { PARTY_COMMITTEE_DEPT_ID, SDW_LEADER_ROLE_ID, CHARGE_LEADER_ROLE_ID } from '/@/constant/supervision';
|
||||
import {
|
||||
buildApproveReason,
|
||||
buildDeptHandlerFeedbackReason,
|
||||
buildDeptLeaderAssignReason,
|
||||
buildDeptLeaderDirectFeedbackReason,
|
||||
buildSuperviseConfirmAllReason,
|
||||
buildSuperviseCheckReason,
|
||||
buildJiJianCheckReason,
|
||||
normalizeDeptNames,
|
||||
} from '/@/composables/useDefaultApprovalReason';
|
||||
|
||||
const { isDisabledAuth, hasPermission, initBpmFormData } = usePermission();
|
||||
const userStore = useUserStore();
|
||||
@@ -500,7 +507,10 @@ import {
|
||||
}));
|
||||
|
||||
provide('extraVars', formScope);
|
||||
provide('flowVars', computed(() => props.formData?.vars || {}));
|
||||
provide(
|
||||
'flowVars',
|
||||
computed(() => props.formData?.vars || {})
|
||||
);
|
||||
provide('formDefaultReason', defaultHandleReason);
|
||||
provide('defaultCcUsers', defaultCcUsers);
|
||||
|
||||
@@ -542,7 +552,7 @@ import {
|
||||
try {
|
||||
// 默认抄送按分管所领导角色跨部门查询,与 bgpartymatter/bqtakepulse 保持一致
|
||||
const res = await defHttp.get({
|
||||
url: '/sys/user/queryUserRoleComponentData',
|
||||
url: '/sys/user/queryUserByRoleId',
|
||||
params: { roleId: CHARGE_LEADER_ROLE_ID, searchSecurityLevel: 5, pageNo: 1, pageSize: 999 },
|
||||
});
|
||||
const records = res?.records || res?.result?.records || [];
|
||||
@@ -601,7 +611,10 @@ import {
|
||||
const res = await getProcessVariable({ taskId, key: 'impl_dept_id', isLocal: true });
|
||||
const value = res?.result?.value ?? res?.value;
|
||||
if (value) {
|
||||
const result = String(value).split(',').map((s: string) => s.trim()).filter(Boolean);
|
||||
const result = String(value)
|
||||
.split(',')
|
||||
.map((s: string) => s.trim())
|
||||
.filter(Boolean);
|
||||
return result;
|
||||
}
|
||||
} catch (e) {
|
||||
@@ -614,12 +627,18 @@ import {
|
||||
if (value) {
|
||||
const result = Array.isArray(value)
|
||||
? value.map((v: any) => String(v).trim()).filter(Boolean)
|
||||
: String(value).split(',').map((s: string) => s.trim()).filter(Boolean);
|
||||
: String(value)
|
||||
.split(',')
|
||||
.map((s: string) => s.trim())
|
||||
.filter(Boolean);
|
||||
return result;
|
||||
}
|
||||
// 最终 fallback 到主表已保存的牵头部门
|
||||
if (mainForm.implDept) {
|
||||
const result = String(mainForm.implDept).split(',').map((s: string) => s.trim()).filter(Boolean);
|
||||
const result = String(mainForm.implDept)
|
||||
.split(',')
|
||||
.map((s: string) => s.trim())
|
||||
.filter(Boolean);
|
||||
return result;
|
||||
}
|
||||
return [];
|
||||
@@ -793,7 +812,6 @@ import {
|
||||
.join(',');
|
||||
}
|
||||
|
||||
|
||||
function handleProcessSuccess() {
|
||||
emit('success');
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user