diff --git a/src/components/semri/userComponent/DeptRoleUserSelectDropDown.vue b/src/components/semri/userComponent/DeptRoleUserSelectDropDown.vue index 95266f7..6912943 100644 --- a/src/components/semri/userComponent/DeptRoleUserSelectDropDown.vue +++ b/src/components/semri/userComponent/DeptRoleUserSelectDropDown.vue @@ -38,18 +38,16 @@ const modelValue = defineModel('value', { default: '' }); const userList = ref>([]); async function fetchUserList() { - if (!props.deptId) { - userList.value = []; - return; - } try { const params = { - departId: props.deptId, roleId: props.roleId, searchSecurityLevel: 5, pageNo: 1, pageSize: 999, }; + if (props.deptId) { + params.departId = props.deptId; + } const res = await defHttp.get({ url: '/sys/user/queryUserRoleComponentData', params }); const records = res?.records || res?.result?.records || []; userList.value = records.sort((a, b) => (a.sortno ?? Infinity) - (b.sortno ?? Infinity)); diff --git a/src/views/bg/bgpartymatter/BgPartymatterList.vue b/src/views/bg/bgpartymatter/BgPartymatterList.vue index c89efdf..c25821b 100644 --- a/src/views/bg/bgpartymatter/BgPartymatterList.vue +++ b/src/views/bg/bgpartymatter/BgPartymatterList.vue @@ -17,7 +17,7 @@ - + @@ -53,9 +53,9 @@
查询 + 重置 -
@@ -181,7 +181,7 @@ import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue'; import JInput from '/@/components/Form/src/jeecg/components/JInput.vue'; import DeptRoleUserSelectDropDown from '/@/components/semri/userComponent/DeptRoleUserSelectDropDown.vue'; - import { PARTY_COMMITTEE_DEPT_ID, CHARGE_LEADER_ROLE_ID } from '/@/constant/supervision'; + import { CHARGE_LEADER_ROLE_ID } from '/@/constant/supervision'; import { Tooltip } from 'ant-design-vue'; import Icon from '/@/components/Icon/index'; import BgPartymatterModal from './components/BgPartymatterModal.vue'; diff --git a/src/views/bg/bqtakepulse/BgTakepulseList.vue b/src/views/bg/bqtakepulse/BgTakepulseList.vue index 1dadd58..1646256 100644 --- a/src/views/bg/bqtakepulse/BgTakepulseList.vue +++ b/src/views/bg/bqtakepulse/BgTakepulseList.vue @@ -9,7 +9,9 @@ - +
@@ -17,7 +19,14 @@ - + @@ -25,7 +34,16 @@ - + @@ -33,7 +51,15 @@ - + @@ -41,51 +67,79 @@ - +
查询 + 重置 -
- - + + - + @@ -148,22 +206,33 @@ - - + +