sz-team/supervision-test-frontend-repo
17
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
ye1023
2026-06-17 10:46:34 +08:00
parent a44ee47c9b 0a1141decf
commit 4aeb89ff44
5 changed files with 118 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/bg/xispeak/BgXiSpeakList.vue
+9 -5
View File
@@ -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 {
src/views/bg/xispeak/components/BgXiSpeakBPMForm.vue
+70 -65
View File
@@ -68,14 +68,14 @@
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="牵头部门" name="implDept"> <a-form-item label="牵头部门" name="implDept">
<j-select-dept v-model:value="mainForm.implDept" :disabled="mainDisabled" :multiple="true" checkStrictly allow-clear /> <SzSelectDept v-model:value="mainForm.implDept" :disabled="mainDisabled" :multiple="true" checkStrictly allow-clear />
</a-form-item> </a-form-item>
</a-col> </a-col>
<!-- <a-col :span="12">--> <!-- <a-col :span="12">-->
<!-- <a-form-item label="落实方案" name="implPlan">--> <!-- <a-form-item label="落实方案" name="implPlan">-->
<!-- <a-input v-model:value="mainForm.implPlan" :disabled="mainDisabled" allow-clear />--> <!-- <a-input v-model:value="mainForm.implPlan" :disabled="mainDisabled" allow-clear />-->
<!-- </a-form-item>--> <!-- </a-form-item>-->
<!-- </a-col>--> <!-- </a-col>-->
<a-col :span="12"> <a-col :span="12">
<a-form-item label="贯彻落实措施" name="implMeasures"> <a-form-item label="贯彻落实措施" name="implMeasures">
<a-input v-model:value="mainForm.implMeasures" :disabled="mainDisabled" allow-clear /> <a-input v-model:value="mainForm.implMeasures" :disabled="mainDisabled" allow-clear />
@@ -86,16 +86,16 @@
<a-input-number v-model:value="mainForm.numberOfResolutions" :disabled="mainDisabled" style="width: 100%" /> <a-input-number v-model:value="mainForm.numberOfResolutions" :disabled="mainDisabled" style="width: 100%" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<!-- <a-col :span="12">--> <!-- <a-col :span="12">-->
<!-- <a-form-item label="落实条数" name="implCount">--> <!-- <a-form-item label="落实条数" name="implCount">-->
<!-- <a-input-number v-model:value="mainForm.implCount" :disabled="mainDisabled" style="width: 100%" />--> <!-- <a-input-number v-model:value="mainForm.implCount" :disabled="mainDisabled" style="width: 100%" />-->
<!-- </a-form-item>--> <!-- </a-form-item>-->
<!-- </a-col>--> <!-- </a-col>-->
<!-- <a-col :span="12">--> <!-- <a-col :span="12">-->
<!-- <a-form-item label="已闭环数量" name="closedCount">--> <!-- <a-form-item label="已闭环数量" name="closedCount">-->
<!-- <a-input-number v-model:value="mainForm.closedCount" :disabled="mainDisabled" style="width: 100%" />--> <!-- <a-input-number v-model:value="mainForm.closedCount" :disabled="mainDisabled" style="width: 100%" />-->
<!-- </a-form-item>--> <!-- </a-form-item>-->
<!-- </a-col>--> <!-- </a-col>-->
<a-col :span="12"> <a-col :span="12">
<a-form-item label="完成状态" name="completionStatus"> <a-form-item label="完成状态" name="completionStatus">
<JDictSelectTag <JDictSelectTag
@@ -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">
@@ -124,14 +118,14 @@
<a-input v-model:value="mainForm.reportFeedbackStatus" :disabled="mainDisabled" allow-clear /> <a-input v-model:value="mainForm.reportFeedbackStatus" :disabled="mainDisabled" allow-clear />
</a-form-item> </a-form-item>
</a-col> </a-col>
<!-- <a-col :span="12">--> <!-- <a-col :span="12">-->
<!-- <a-form-item label="是否存在完成风险" name="isCompletionRisk">--> <!-- <a-form-item label="是否存在完成风险" name="isCompletionRisk">-->
<!-- <a-radio-group v-model:value="mainForm.isCompletionRisk" :disabled="mainDisabled">--> <!-- <a-radio-group v-model:value="mainForm.isCompletionRisk" :disabled="mainDisabled">-->
<!-- <a-radio :value="0">不存在</a-radio>--> <!-- <a-radio :value="0">不存在</a-radio>-->
<!-- <a-radio :value="1">存在</a-radio>--> <!-- <a-radio :value="1">存在</a-radio>-->
<!-- </a-radio-group>--> <!-- </a-radio-group>-->
<!-- </a-form-item>--> <!-- </a-form-item>-->
<!-- </a-col>--> <!-- </a-col>-->
<a-col :span="12"> <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-group v-model:value="mainForm.needSdwApproval" :disabled="mainDisabled">
@@ -150,34 +144,34 @@
/> />
</a-form-item> </a-form-item>
</a-col> </a-col>
<!-- <a-col :span="12">--> <!-- <a-col :span="12">-->
<!-- <a-form-item label="拖期风险应对措施" name="delayRiskMitigation">--> <!-- <a-form-item label="拖期风险应对措施" name="delayRiskMitigation">-->
<!-- <a-input v-model:value="mainForm.delayRiskMitigation" :disabled="mainDisabled" allow-clear />--> <!-- <a-input v-model:value="mainForm.delayRiskMitigation" :disabled="mainDisabled" allow-clear />-->
<!-- </a-form-item>--> <!-- </a-form-item>-->
<!-- </a-col>--> <!-- </a-col>-->
<a-col :span="12"> <a-col :span="12">
<a-form-item label="督办次数" name="supervisionCount"> <a-form-item label="督办次数" name="supervisionCount">
<a-input-number v-model:value="mainForm.supervisionCount" :disabled="mainDisabled" style="width: 100%" /> <a-input-number v-model:value="mainForm.supervisionCount" :disabled="mainDisabled" style="width: 100%" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<!-- <a-col :span="12">--> <!-- <a-col :span="12">-->
<!-- <a-form-item label="父级节点" name="pid">--> <!-- <a-form-item label="父级节点" name="pid">-->
<!-- <j-tree-select--> <!-- <j-tree-select-->
<!-- v-model:value="mainForm.pid"--> <!-- v-model:value="mainForm.pid"-->
<!-- dict="bg_xi_speak,impl_status,id"--> <!-- dict="bg_xi_speak,impl_status,id"-->
<!-- pidField="pid"--> <!-- pidField="pid"-->
<!-- pidValue="0"--> <!-- pidValue="0"-->
<!-- hasChildField="has_child"--> <!-- hasChildField="has_child"-->
<!-- :disabled="mainDisabled"--> <!-- :disabled="mainDisabled"-->
<!-- allow-clear--> <!-- allow-clear-->
<!-- />--> <!-- />-->
<!-- </a-form-item>--> <!-- </a-form-item>-->
<!-- </a-col>--> <!-- </a-col>-->
<!-- <a-col :span="12">--> <!-- <a-col :span="12">-->
<!-- <a-form-item label="落实情况" name="implStatus">--> <!-- <a-form-item label="落实情况" name="implStatus">-->
<!-- <a-textarea v-model:value="mainForm.implStatus" :auto-size="{ minRows: 1, maxRows: 7 }" :disabled="mainDisabled" allow-clear />--> <!-- <a-textarea v-model:value="mainForm.implStatus" :auto-size="{ minRows: 1, maxRows: 7 }" :disabled="mainDisabled" allow-clear />-->
<!-- </a-form-item>--> <!-- </a-form-item>-->
<!-- </a-col>--> <!-- </a-col>-->
</template> </template>
</a-row> </a-row>
</a-form> </a-form>
@@ -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>
@@ -278,19 +271,13 @@
import { useMessage } from '/@/hooks/web/useMessage'; import { useMessage } from '/@/hooks/web/useMessage';
import { useUserStore } from '/@/store/modules/user'; import { useUserStore } from '/@/store/modules/user';
import JSelectDept from '/@/components/Form/src/jeecg/components/JSelectDept.vue'; import SzSelectDept from '/@/components/Form/src/jeecg/components/SzSelectDept.vue';
import JSelectUser from '/@/components/Form/src/jeecg/components/JSelectUser.vue'; import JSelectUser from '/@/components/Form/src/jeecg/components/JSelectUser.vue';
import SzDeptUserModal from '/@/components/semri/deptUserComponent/SzDeptUserModal.vue'; import SzDeptUserModal from '/@/components/semri/deptUserComponent/SzDeptUserModal.vue';
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));
}); });
} }
src/views/dashboard/ProcessPortal/components/MyWork.vue
+35 -1
View File
@@ -147,12 +147,46 @@
vars: result.records, vars: result.records,
}; };
let tempFormUrl = result.formUrl; let tempFormUrl = result.formUrl;
if (tempFormUrl && tempFormUrl.indexOf('?') != -1 && !/^http[s]?:\/\/.*/.test(tempFormUrl) && tempFormUrl.indexOf('{{DOMAIN_URL}}') == -1) { //节点配置表单URL，VUE组件类型对应的拓展参数
if (tempFormUrl && tempFormUrl.indexOf('?') != -1 && !isURL(tempFormUrl) && tempFormUrl.indexOf('{{DOMAIN_URL}}') == -1) {
tempFormUrl = result.formUrl.split('?')[0]; tempFormUrl = result.formUrl.split('?')[0];
let qv: any = getQueryVariable(result.formUrl);
if (qv.edit == 1) {
formData['disabled'] = false;
}
formData.extendUrlParams = qv;
}
//如果没有taskId参数，程序自动追加，用于设计器表单节点权限
if (tempFormUrl != null && tempFormUrl.indexOf('{{DOMAIN_URL}}/desform/') != -1 && tempFormUrl.indexOf('taskId') == -1) {
tempFormUrl = tempFormUrl.trim();
if (tempFormUrl.endsWith('?')) {
tempFormUrl = tempFormUrl + 'taskId=' + result.taskDefKey;
} else {
tempFormUrl = tempFormUrl + '&taskId=' + result.taskDefKey;
}
} }
return { formData, formUrl: tempFormUrl }; return { formData, formUrl: tempFormUrl };
} }
function isURL(s) {
return /^http[s]?:\/\/.*/.test(s);
}
function getQueryVariable(url) {
if (!url) return;
let t,
n,
r,
i = url.split('?')[1],
s = {};
(t = i.split('&')), (r = null), (n = null);
for (let o in t) {
let u = t[o].indexOf('=');
u !== -1 && ((r = t[o].substr(0, u)), (n = t[o].substr(u + 1)), (s[r] = n));
}
return s;
}
async function handleClaim(record) { async function handleClaim(record) {
await taskClaim({ taskId: record.id }); await taskClaim({ taskId: record.id });
await reloadTodo(); await reloadTodo();
src/views/dashboard/ProcessPortal/components/WelcomeBanner.vue
+1 -1
View File
@@ -4,7 +4,7 @@
<div class="welcome-banner__deco welcome-banner__deco--bottom"></div> <div class="welcome-banner__deco welcome-banner__deco--bottom"></div>
<div class="welcome-banner__content"> <div class="welcome-banner__content">
<div class="welcome-banner__left"> <div class="welcome-banner__left">
<h2 class="welcome-banner__title">{{ greeting }}，{{ userinfo.realname }}<span class="welcome-banner__wave">👋</span></h2> <h2 class="welcome-banner__title">{{ greeting }}，{{ userinfo.realname }}</h2>
</div> </div>
<div class="welcome-banner__right"> <div class="welcome-banner__right">
<div class="welcome-banner__date-btn"> <div class="welcome-banner__date-btn">
src/views/dq/inspectTask/components/DqInspectTaskForm.vue
+3 -3
View File
@@ -73,7 +73,7 @@
<a-row :gutter="[16, 0]"> <a-row :gutter="[16, 0]">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="措施责任部门" v-bind="validateInfos.measureResDept" id="DqInspectTaskForm-measureResDept" name="measureResDept"> <a-form-item label="措施责任部门" v-bind="validateInfos.measureResDept" id="DqInspectTaskForm-measureResDept" name="measureResDept">
<j-select-dept v-model:value="formData.measureResDept" :multiple="true" checkStrictly allow-clear /> <SzSelectDept v-model:value="formData.measureResDept" :multiple="true" checkStrictly allow-clear />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
@@ -169,7 +169,7 @@
import { dqInspectProgressColumns } from '../DqInspectTask.data'; import { dqInspectProgressColumns } from '../DqInspectTask.data';
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue'; 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 JSelectDept from '/@/components/Form/src/jeecg/components/JSelectDept.vue'; import SzSelectDept from '/@/components/Form/src/jeecg/components/SzSelectDept.vue';
import DeptRoleUserSelectRadioGroup from '/@/components/semri/userComponent/DeptRoleUserSelectRadioGroup.vue'; import DeptRoleUserSelectRadioGroup from '/@/components/semri/userComponent/DeptRoleUserSelectRadioGroup.vue';
import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue'; import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
import { Form } from 'ant-design-vue'; import { Form } from 'ant-design-vue';
@@ -182,7 +182,7 @@ import JSwitch from '/@/components/Form/src/jeecg/components/JSwitch.vue';
DeptRoleUserSelectDropDown, DeptRoleUserSelectDropDown,
JDictSelectTag, JDictSelectTag,
JSwitch, JSwitch,
JSelectDept, SzSelectDept,
DeptRoleUserSelectRadioGroup, DeptRoleUserSelectRadioGroup,
JVxeTable, JVxeTable,
JFormContainer, JFormContainer,