+
@@ -180,21 +206,22 @@
import JSelectUser from '/@/components/Form/src/jeecg/components/JSelectUser.vue';
import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
import { Form } from 'ant-design-vue';
- import DeptRoleUserSelectRadioGroup
- from "@/components/semri/userComponent/DeptRoleUserSelectRadioGroup.vue";
- import SzDeptUserModal from "@/components/semri/deptUserComponent/SzDeptUserModal.vue";
- import DeptRoleUserSelectDropDown from "@/components/semri/userComponent/DeptRoleUserSelectDropDown.vue";
+ import DeptRoleUserSelectRadioGroup from '@/components/semri/userComponent/DeptRoleUserSelectRadioGroup.vue';
+ import SzDeptUserModal from '@/components/semri/deptUserComponent/SzDeptUserModal.vue';
+ import DeptRoleUserSelectDropDown from '@/components/semri/userComponent/DeptRoleUserSelectDropDown.vue';
import {
SUOBAN_DEPT_ID,
MEASURE_RES_LEADER_ROLE_ID,
PARTY_COMMITTEE_DEPT_ID as CHARGE_LEADER_DEPT_ID,
CHARGE_LEADER_ROLE_ID,
} from '/@/constant/supervision';
+ import RoleUserSelectDropDown from '@/components/semri/userComponent/RoleUserSelectDropDown.vue';
const useForm = Form.useForm;
export default defineComponent({
- name: "BgTakepulseForm",
- components:{
+ name: 'BgTakepulseForm',
+ components: {
+ RoleUserSelectDropDown,
SzDeptUserModal,
DeptRoleUserSelectDropDown,
DeptRoleUserSelectRadioGroup,
@@ -202,18 +229,18 @@
JSwitch,
SzSelectDept,
JSelectUser,
- JFormContainer,
+ JFormContainer,
},
- props:{
- formDisabled:{
+ props: {
+ formDisabled: {
type: Boolean,
- default: false
+ default: false,
},
- formData: { type: Object, default: ()=>{} },
- formBpm: { type: Boolean, default: true }
+ formData: { type: Object, default: () => {} },
+ formBpm: { type: Boolean, default: true },
},
- emits:['success'],
- setup(props, {emit}) {
+ emits: ['success'],
+ setup(props, { emit }) {
const SUP_LEADER_DEPT_ID = SUOBAN_DEPT_ID;
const SUP_LEADER_ROLE_ID = MEASURE_RES_LEADER_ROLE_ID;
const { createMessage } = useMessage();
@@ -281,21 +308,21 @@
},
],
});
- const {resetFields, validate, validateInfos, clearValidate} = useForm(formData, validatorRules, {immediate: false});
+ const { resetFields, validate, validateInfos, clearValidate } = useForm(formData, validatorRules, { immediate: false });
const dbData = {};
const formItemLayout = {
- labelCol: {xs: {span: 24}, sm: {span: 7}},
- wrapperCol: {xs: {span: 24}, sm: {span: 17}},
+ labelCol: { xs: { span: 24 }, sm: { span: 7 } },
+ wrapperCol: { xs: { span: 24 }, sm: { span: 17 } },
};
const wideLabelCol = { xs: { span: 24 }, sm: { span: 3 } };
const wideWrapperCol = { xs: { span: 24 }, sm: { span: 21 } };
// 表单禁用
- const disabled = computed(()=>{
- if(props.formBpm === true){
- if(props.formData.disabled === false){
+ const disabled = computed(() => {
+ if (props.formBpm === true) {
+ if (props.formData.disabled === false) {
return false;
- }else{
+ } else {
return true;
}
}
@@ -312,33 +339,32 @@
watch(() => formData.isNeedAppro, clearSupDeptLeaderIfNotNeeded);
- onMounted(()=>{
+ onMounted(() => {
initFormData();
});
//渲染流程表单数据
const queryByIdUrl = '/bqtakepulse/bgTakepulse/queryById';
- async function initFormData(){
- if(props.formBpm === true){
- let params = {id: props.formData.dataId};
- const row = await defHttp.get({url: queryByIdUrl, params});
+ async function initFormData() {
+ if (props.formBpm === true) {
+ let params = { id: props.formData.dataId };
+ const row = await defHttp.get({ url: queryByIdUrl, params });
//设置表单的值
- Object.keys(row).map(k => {
+ Object.keys(row).map((k) => {
formData[k] = row[k];
});
clearSupDeptLeaderIfNotNeeded();
}
}
// 是否显示提交按钮
- const showFlowSubmitButton = computed(()=>{
- if(props.formBpm === true){
- if(props.formData.disabled === false){
- return true
+ const showFlowSubmitButton = computed(() => {
+ if (props.formBpm === true) {
+ if (props.formData.disabled === false) {
+ return true;
}
}
- return false
+ return false;
});
-
function add() {
resetFields();
}
@@ -352,12 +378,12 @@
resetFields();
const tmpData = {};
Object.keys(formData).forEach((key) => {
- if(row.hasOwnProperty(key)){
- tmpData[key] = row[key]
+ if (row.hasOwnProperty(key)) {
+ tmpData[key] = row[key];
}
- })
+ });
//赋值
- Object.assign(formData,tmpData);
+ Object.assign(formData, tmpData);
clearSupDeptLeaderIfNotNeeded();
}
@@ -374,7 +400,7 @@
}
return Promise.reject(errorFields);
}
- return normalizeMainFormData(toRaw(formData))
+ return normalizeMainFormData(toRaw(formData));
}
function normalizeMainFormData(data) {
@@ -394,8 +420,8 @@
async function submitForm() {
const mainData = await getFormData();
const values = Object.assign({}, dbData, mainData);
- console.log('表单提交数据', values)
- const isUpdate = values.id ? true : false
+ console.log('表单提交数据', values);
+ const isUpdate = values.id ? true : false;
await saveOrUpdate(values, isUpdate);
createMessage.success('保存成功');
//关闭弹窗
@@ -403,8 +429,8 @@
}
function setFieldsValue(values) {
- if(values){
- Object.keys(values).map(k=>{
+ if (values) {
+ Object.keys(values).map((k) => {
formData[k] = values[k];
});
clearSupDeptLeaderIfNotNeeded();
@@ -420,7 +446,6 @@
formData[key] = value;
}
-
return {
validatorRules,
validateInfos,
@@ -443,8 +468,8 @@
add,
edit,
formRef,
- }
- }
+ };
+ },
});
diff --git a/src/views/bg/fixcontact/components/FixedContact20260730Form.vue b/src/views/bg/fixcontact/components/FixedContact20260730Form.vue
index 567b977..1ff5597 100644
--- a/src/views/bg/fixcontact/components/FixedContact20260730Form.vue
+++ b/src/views/bg/fixcontact/components/FixedContact20260730Form.vue
@@ -15,7 +15,12 @@
-
+
-
+
@@ -40,22 +51,48 @@
-
+
-
+
-
+
-
+
-
+
是
否
@@ -88,13 +125,18 @@
-
+
diff --git a/src/views/dq/inspectTask/BPM_NODE_PERMISSIONS_DELETE.md b/src/views/dq/inspectTask/BPM_NODE_PERMISSIONS_DELETE.md
index c54f9e5..53ca4be 100644
--- a/src/views/dq/inspectTask/BPM_NODE_PERMISSIONS_DELETE.md
+++ b/src/views/dq/inspectTask/BPM_NODE_PERMISSIONS_DELETE.md
@@ -34,7 +34,7 @@ showFeedbackInfo → 反馈信息区域（表格 + 表头）
## 整改任务审批流程
-### 节点: <责任部门领导接受任务并分配>
+### 节点: <责任部门负责人接受任务并分配>
* taskDefKey: `
`
* **edit** `1` —— 基础信息可编辑
@@ -57,7 +57,7 @@ showFeedbackInfo → 反馈信息区域（表格 + 表头）
* **showEditFeedback** `1` —— 编辑/删除操作列
* dq/inspectTask/components/DqInspectTaskBPMForm?showProcessHandle=1&showFeedbackInfo=1&showAddFeedback=1&showEditFeedback=1
---
-### 节点: <责任部门领导审批>
+### 节点: <责任部门负责人审批>
* taskDefKey: ``
* **edit** `0` —— 基础信息只读
diff --git a/src/views/dq/inspectTask/BPM_NODE_PERMISSIONS_INSPECT.md b/src/views/dq/inspectTask/BPM_NODE_PERMISSIONS_INSPECT.md
index db33101..0e2f4b2 100644
--- a/src/views/dq/inspectTask/BPM_NODE_PERMISSIONS_INSPECT.md
+++ b/src/views/dq/inspectTask/BPM_NODE_PERMISSIONS_INSPECT.md
@@ -55,7 +55,7 @@ showFeedbackInfo → 反馈信息区域（表格 + 表头）
* dq/inspectTask/components/DqInspectTaskBPMForm?showProcessHandle=1&showFeedbackInfo=1&showAddFeedback=1&showEditFeedback=1
---
-### 节点: <责任部门领导审批>
+### 节点: <责任部门负责人审批>
* taskDefKey: ``
* dq/inspectTask/components/DqInspectTaskBPMForm?showProcessHandle=1&showFeedbackInfo=1
---
@@ -65,7 +65,7 @@ showFeedbackInfo → 反馈信息区域（表格 + 表头）
* dq/inspectTask/components/DqInspectTaskBPMForm?showProcessHandle=1&showFeedbackInfo=1
---
-### 节点: <责任部门领导接受任务并分配>
+### 节点: <责任部门负责人接受任务并分配>
* taskDefKey: ``
* dq/inspectTask/components/DqInspectTaskBPMForm?showProcessHandle=1&showSubApproveUser=1&showFeedbackInfo=1&showAddFeedback=1&showEditFeedback=1
---
diff --git a/src/views/dq/inspectTask/DqInspectTask.data.ts b/src/views/dq/inspectTask/DqInspectTask.data.ts
index c8337ef..fa45bda 100644
--- a/src/views/dq/inspectTask/DqInspectTask.data.ts
+++ b/src/views/dq/inspectTask/DqInspectTask.data.ts
@@ -42,7 +42,7 @@ export const columns: BasicColumn[] = [
dataIndex: 'measureResDept_dictText',
},
{
- title: '措施责任领导',
+ title: '措施责任负责人',
align: 'center',
dataIndex: 'measureResLeader_dictText',
},
@@ -57,12 +57,12 @@ export const columns: BasicColumn[] = [
dataIndex: 'evaluationCriterion',
},
{
- title: '是否需要党群领导审批',
+ title: '是否需要党群负责人审批',
align: 'center',
dataIndex: 'isNeedAppro_dictText',
},
{
- title: '党群领导',
+ title: '党群负责人',
align: 'center',
dataIndex: 'supDeptleaderid_dictText',
},
@@ -177,12 +177,12 @@ export const superQuerySchema = {
improveMeasure: {title: '整改措施',order: 2,view: 'text', type: 'string',},
deadline: {title: '完成时限',order: 3,view: 'date', type: 'string',},
targetNode: {title: '目标节点',order: 4,view: 'text', type: 'string',},
- measureResLeader: {title: '措施责任领导',order: 5,view: 'sel_user', type: 'string',},
+ measureResLeader: {title: '措施责任负责人',order: 5,view: 'sel_user', type: 'string',},
measureResDept: {title: '措施责任部门',order: 6,view: 'sel_depart', type: 'string',},
rectificationEvidence: {title: '整改交付成果',order: 7,view: 'text', type: 'string',},
evaluationCriterion: {title: '成效评价标准',order: 8,view: 'text', type: 'string',},
- isNeedAppro: {title: '是否需要党群领导审批',order: 9,view: 'radio', type: 'string',dictCode: 'yn',},
- supDeptleaderid: {title: '党群领导',order: 10,view: 'sel_user', type: 'string',},
+ isNeedAppro: {title: '是否需要党群负责人审批',order: 9,view: 'radio', type: 'string',dictCode: 'yn',},
+ supDeptleaderid: {title: '党群负责人',order: 10,view: 'sel_user', type: 'string',},
inspectionStatus: {title: '检查情况',order: 11,view: 'text', type: 'string',},
supervisoryOpinion: {title: '监督意见',order: 12,view: 'text', type: 'string',},
measureCount: {title: '措施数量',order: 13,view: 'number', type: 'number',},
@@ -252,7 +252,7 @@ export const ledgerColumns: BasicColumn[] = [
dataIndex: 'measureResDept_dictText'
},
{
- title: '措施责任领导',
+ title: '措施责任负责人',
align:"center",
dataIndex: 'measureResLeader_dictText'
},
diff --git a/src/views/dq/inspectTask/DqInspectTaskList.vue b/src/views/dq/inspectTask/DqInspectTaskList.vue
index 728f5e9..cc9f4fe 100644
--- a/src/views/dq/inspectTask/DqInspectTaskList.vue
+++ b/src/views/dq/inspectTask/DqInspectTaskList.vue
@@ -11,9 +11,8 @@
-
-
+
-
+
-
+
@@ -96,13 +113,18 @@
-
+
-
-
+
+
@@ -194,28 +216,33 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
String(props.formData?.extendUrlParams?.nonJiJianFieldsReadonly ?? '') === '1');
const showSelnextUser = computed(() => String(props.formData?.extendUrlParams?.showSelnextUser ?? '') === '1');
const showSubApproveUser = computed(() => String(props.formData?.extendUrlParams?.showSubApproveUser ?? '') === '1');
- const showIsNeedLeaderApprove = computed(
- () => String(props.formData?.extendUrlParams?.showIsNeedLeaderApprove ?? '') === '1'
- );
+ const showIsNeedLeaderApprove = computed(() => String(props.formData?.extendUrlParams?.showIsNeedLeaderApprove ?? '') === '1');
const showSubApproveUserSelector = computed(() => showSubApproveUser.value && String(isEnd.value) !== '1');
const showIsNeedLeaderApproveSelector = computed(() => showIsNeedLeaderApprove.value && String(isNeedLeaderApprove.value) === '1');
@@ -416,7 +439,7 @@ import { buildDeptLeaderAssignReason, normalizeDeptNames } from '/@/composables/
// ==================== 默认审批意见 ====================
// 仅覆盖需要动态内容（人名）的节点，其余节点走后端节点配置
const handleReasonTemplateMap: Record string> = {
- // 责任部门领导接受任务并分配
+ // 责任部门负责人接受任务并分配
Task_1c64uvl: () => {
if (isEnd.value === 1) return '';
return buildDeptLeaderAssignReason(normalizeDeptNames(subApproveUserNames.value));
@@ -430,7 +453,10 @@ import { buildDeptLeaderAssignReason, normalizeDeptNames } from '/@/composables/
provide('formDefaultReason', defaultHandleReason);
provide('extraVars', formScope);
- provide('flowVars', computed(() => props.formData?.vars || {}));
+ provide(
+ 'flowVars',
+ computed(() => props.formData?.vars || {})
+ );
provide('defaultCcUsers', defaultCcUsers);
onMounted(() => {
diff --git a/src/views/dq/inspectTask/components/DqInspectTaskForm.vue b/src/views/dq/inspectTask/components/DqInspectTaskForm.vue
index 70e4546..710da43 100644
--- a/src/views/dq/inspectTask/components/DqInspectTaskForm.vue
+++ b/src/views/dq/inspectTask/components/DqInspectTaskForm.vue
@@ -7,7 +7,14 @@
基本信息
-
+
-
+
@@ -123,13 +125,17 @@
-
+
-
-
+
+
@@ -168,18 +174,25 @@
import { JVxeTable } from '/@/components/jeecg/JVxeTable';
import { dqInspectProgressColumns } from '../DqInspectTask.data';
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
-import JSwitch from '/@/components/Form/src/jeecg/components/JSwitch.vue';
+ import JSwitch from '/@/components/Form/src/jeecg/components/JSwitch.vue';
import SzSelectDept from '/@/components/Form/src/jeecg/components/SzSelectDept.vue';
import DeptRoleUserSelectRadioGroup from '/@/components/semri/userComponent/DeptRoleUserSelectRadioGroup.vue';
import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
import { Form } from 'ant-design-vue';
import DeptRoleUserSelectDropDown from '@/components/semri/userComponent/DeptRoleUserSelectDropDown.vue';
-import { PARTY_COMMITTEE_DEPT_ID, CHARGE_LEADER_ROLE_ID as _CHARGE_LEADER_ROLE_ID, PARTY_MASSES_DEPT_ID as _PARTY_MASSES_DEPT_ID, MEASURE_RES_LEADER_ROLE_ID as _MEASURE_RES_LEADER_ROLE_ID } from '/@/constant/supervision';
+ import {
+ PARTY_COMMITTEE_DEPT_ID,
+ CHARGE_LEADER_ROLE_ID as _CHARGE_LEADER_ROLE_ID,
+ PARTY_MASSES_DEPT_ID as _PARTY_MASSES_DEPT_ID,
+ MEASURE_RES_LEADER_ROLE_ID as _MEASURE_RES_LEADER_ROLE_ID,
+ } from '/@/constant/supervision';
+ import RoleUserSelectDropDown from '@/components/semri/userComponent/RoleUserSelectDropDown.vue';
const useForm = Form.useForm;
export default defineComponent({
name: 'DqInspectTaskForm',
components: {
+ RoleUserSelectDropDown,
DeptRoleUserSelectDropDown,
JDictSelectTag,
JSwitch,
@@ -249,9 +262,9 @@ import { PARTY_COMMITTEE_DEPT_ID, CHARGE_LEADER_ROLE_ID as _CHARGE_LEADER_ROLE_I
improveMeasure: [{ required: true, message: '请输入整改措施' }],
deadline: [{ required: true, message: '请选择完成时限' }],
measureResDept: [{ required: true, message: '请选择措施责任部门' }],
- measureResLeader: [{ required: true, message: '请选择措施责任领导' }],
+ measureResLeader: [{ required: true, message: '请选择措施责任负责人' }],
chargeLeaderId: [{ required: true, message: '请选择分管所领导' }],
- isNeedAppro: [{ required: true, message: '请选择是否需要党群领导审批' }],
+ isNeedAppro: [{ required: true, message: '请选择是否需要党群负责人审批' }],
});
const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
const dbData = {};