diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/api/enforcement/index.js b/zdxt-web-client/zdxt-efcode-enforcement-app/src/api/enforcement/index.js index bb689960..3de13f6b 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/api/enforcement/index.js +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/api/enforcement/index.js @@ -91,7 +91,7 @@ export const queryEvaluateDetail = (params, success, error) => _get("/app-ent/ev export const queryUsersByPage = (params, success, error) => _get(baseUrl + "/system/queryUsersByPage", params, success, error); // 查询执法单位下的用户列表 -export const getBureauUnitUsers = (params, success, error) => _get("/enforcementcode/bureauUnit/users", params, success, error); +export const getBureauUnitUsers = (params, success, error) => _get("/enforcementcode/bureauUnit/queryUsersByPage", params, success, error); // 获取部门列表 export const queryDeptList = (params, success, error) => _get(baseUrl +"/system/dept", params, success, error); diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/api/nos/common.js b/zdxt-web-client/zdxt-efcode-enforcement-app/src/api/nos/common.js index 73780a38..3767628e 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/api/nos/common.js +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/api/nos/common.js @@ -8,6 +8,6 @@ export const queryListAndQrInfo = (params, success, error) => _post(baseUrl + "/ // 执法端-分页查询用户 export const queryUsersByPage = (params, success, error) => _get(baseUrl + "/system/queryUsersByPage", params, success, error); // 查询执法单位下的用户列表 -export const getBureauUnitUsers = (params, success, error) => _get("/enforcementcode/bureauUnit/users", params, success, error); +export const getBureauUnitUsers = (params, success, error) => _get("/enforcementcode/bureauUnit/queryUsersByPage", params, success, error); // 查询执依据告列表 export const queryAccordingList = (params, success, error) => _get(baseUrl + "/according/list", params, success, error); diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/nos/RegisterPopups.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/nos/RegisterPopups.vue index 78bfc918..5eca170d 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/nos/RegisterPopups.vue +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/nos/RegisterPopups.vue @@ -290,6 +290,7 @@ const loadPersonList = () => { globalSearch: "false", pageNum: personPageNum.value, pageSize: personPageSize.value, + dataScopeId: useCommon.userId || "", }, (res) => { console.log(res) diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/register/RegisterPopups.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/register/RegisterPopups.vue index 28397385..c719a00d 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/register/RegisterPopups.vue +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/register/RegisterPopups.vue @@ -138,6 +138,11 @@ const props = defineProps({ currentEnforcementUnit: { type: String, default: '' + }, + + isNonEnforcement: { + type: Boolean, + default: false } }); @@ -244,6 +249,8 @@ const loadPersonList = () => { globalSearch: 'false', pageNum: personPageNum.value, pageSize: personPageSize.value, + dataScopeId: useCommon.userId || "", + isShowCardId: props.isNonEnforcement ? '1' : '0', }; if (notUserId) { params.notUserId = notUserId; diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementRegister.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementRegister.vue index 399e00cb..15ec3878 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementRegister.vue +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementRegister.vue @@ -43,7 +43,8 @@