人员查询

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);

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);

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)

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;

zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementRegister.vue

@@ -43,7 +43,8 @@
 
         <!-- 弹窗组件 -->
         <RegisterPopups :visible="showPopups" :selected-persons="selectedPersonsList"
-            :current-enforcement-unit="formData.enforcementUnit" @close-popup="handleClosePopup"
+            :current-enforcement-unit="formData.enforcementUnit" :is-non-enforcement="isNonEnforcement"
+            @close-popup="handleClosePopup"
             @select-enterprise="handleSelectEnterprise" @link-notice="handleLinkNotice"
             @confirm-category="handleCategoryConfirm" @confirm-task-source="handleTaskSourceConfirm"
             @select-person="handleSelectPerson" @select-basis="handleSelectBasis"

zdxt-web-client/zdxt-efcode-enforcement-app/vite-env/.env.enforcement-dev-wmy

@@ -4,8 +4,8 @@ VITE_BASE_URL = '/efcode20-enf-app/api'
 VITE_CONTEXT_PATH = '/efcode20-enf-app/'
 # VITE_PROXY_TARGET = 'http://139.186.148.21:8080'
 # VITE_API_URL = 'http://192.168.1.17:8080'
-# VITE_PROXY_TARGET = 'http://172.16.21.213:8080'
-VITE_PROXY_TARGET = 'http://172.16.21.93:8080'
+VITE_PROXY_TARGET = 'http://172.16.21.213:8080'
+# VITE_PROXY_TARGET = 'http://172.16.21.93:8080'
 # VITE_PROXY_TARGET = 'http://172.16.20.72:8080'
 VITE_DEFAULT_LOGIN = '/enforcement/loginByPassword'
 VITE_APP_ENV = 'dev'