From f46235d746a46316a7b38189ee7ae01b9b90c652 Mon Sep 17 00:00:00 2001
From: kylin L <452061493@qq.com>
Date: Tue, 23 Apr 2024 17:59:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E6=B3=95=E7=99=BB=E8=AE=B0=20,=20?=
 =?UTF-8?q?=E9=A2=84=E7=BA=A6=E6=A3=80=E6=9F=A5=20=E5=8A=A0=E5=85=A5?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/administrative.js                    |  1 +
 src/api/enforce.js                           |  1 +
 src/views/administrative/appointmentEdit.vue | 12 +++++++-----
 src/views/enterprise/registrationEdit.vue    |  8 ++++----
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/api/administrative.js b/src/api/administrative.js
index 8adfe4b..75112f4 100644
--- a/src/api/administrative.js
+++ b/src/api/administrative.js
@@ -8,6 +8,7 @@ export const editEnterpriseLawEnforcement = (params, success, error) => _post("/
 //行政检查预约详情
 export const getEnterpriseLawEnforcement = (id, success, error) => _get("/code/enforcement/getById/" + id,null,success,error)
 export const getByUserIdAndZero = (id, success, error) => _get("/code/enforcement/getByUserIdAndZero",null,success,error)
+export const getByIdToDataFillIn = (id, success, error) => _get("/code/enforcement/getByIdToDataFillIn/" + id,null,success,error)
 //查询历史检查信息
 export const queryEnterpriseLawEnforcementList = (params, success, error) => _get("/code/enforcement/queryList",params,success,error)
 
diff --git a/src/api/enforce.js b/src/api/enforce.js
index c8d0704..d515389 100644
--- a/src/api/enforce.js
+++ b/src/api/enforce.js
@@ -32,6 +32,7 @@ export const addEnforcementInspectionProgram = (params, success, error) =>_post(
 export const addEnforcementRegistration = (params, success, error) => _post("/code/registration/add",params,success,error)
 export const editEnforcementRegistration = (params, success, error) => _post("/code/registration/edit",params,success,error)
 export const getRegByUserIdAndZero = (id, success, error) => _get("/code/registration/getByUserIdAndZero",null,success,error)
+export const getByIdToDataFillIn = (id, success, error) => _get("/code/registration/getByIdToDataFillIn/" + id,null,success,error)
 
 //查询历史检查信息
 export const queryRegistrationList = (params, success, error) => _get("/code/registration/queryList",params,success,error)
diff --git a/src/views/administrative/appointmentEdit.vue b/src/views/administrative/appointmentEdit.vue
index 07d2ac6..d9d7e90 100644
--- a/src/views/administrative/appointmentEdit.vue
+++ b/src/views/administrative/appointmentEdit.vue
@@ -137,7 +137,7 @@
 <script setup name="register">
 
     import { showSuccessToast } from 'vant';
-    import {getByUserIdAndZero, addEnterpriseLawEnforcement, editEnterpriseLawEnforcement} from '../../api/administrative'
+    import {getByUserIdAndZero, addEnterpriseLawEnforcement, editEnterpriseLawEnforcement, getByIdToDataFillIn} from '../../api/administrative'
     import {queryUserInfo} from '../../api/enforce'
     import { queryEnterpriseInfoList } from '../../api/enterprise'
     import { reactive, ref } from "vue";
@@ -146,9 +146,11 @@
     import {uploadFile} from "../../util/fileUpload";
     //用户筛选弹窗
     import UserPopup from './userFilter.vue';
+    const router = useRouter();
+    //路由参数
+    const route = useRoute();
     const { useCommon } = $globalStore;
 
-    const router = useRouter();
     let queryaddressId = ref("");
     const data = reactive({
         showLawEnforcerFlag:false,
@@ -265,8 +267,8 @@
         router.go(-1);
     };
 
-    const dataFillIn = () => {
-        getByUserIdAndZero(null,success =>{
+    const dataFillIn = (id) => {
+        getByIdToDataFillIn(id,success =>{
             //跳转企业二维码地址
             if(success.success){
                 Object.keys(submitData).forEach((item) => {
@@ -353,7 +355,7 @@
     //初始化参数，获取扫码的企业统一信用编码
     onMounted(() =>{
         // 数据填充
-        dataFillIn();
+        dataFillIn(route?.query?.id);
 
         //查询当前登录人员信息
         queryUserInfo({},success =>{
diff --git a/src/views/enterprise/registrationEdit.vue b/src/views/enterprise/registrationEdit.vue
index e158ff9..fdfa328 100644
--- a/src/views/enterprise/registrationEdit.vue
+++ b/src/views/enterprise/registrationEdit.vue
@@ -158,7 +158,7 @@
 <script setup name="register">
 
     import { showSuccessToast } from 'vant';
-    import {addEnforcementRegistration, editEnforcementRegistration, getRegByUserIdAndZero, queryUserInfo} from '../../api/enforce'
+    import {addEnforcementRegistration, editEnforcementRegistration, getRegByUserIdAndZero, queryUserInfo, getByIdToDataFillIn} from '../../api/enforce'
     import {getEnterpriseInformation} from '../../api/enterprise'
     import { reactive, ref } from "vue";
     import {uploadFile} from "../../util/fileUpload";
@@ -282,7 +282,7 @@
     //3a0096181c184e5aa56f70923680856d$6e74ceda1463c165fd43eeeadce4f7cd
     //初始化参数，获取扫码的企业统一信用编码
     onMounted(() =>{
-        dataFillIn();
+        dataFillIn(route?.query?.id);
 
         //查询企业信息
         getEnterpriseInformation(route?.query?.enterpriseNumber,success =>{
@@ -370,8 +370,8 @@
     }
     /* 检查要求 end */
 
-    const dataFillIn = () => {
-        getRegByUserIdAndZero(null,success =>{
+    const dataFillIn = (id) => {
+        getByIdToDataFillIn(id,success =>{
             //跳转企业二维码地址
             if(success.success){
                 Object.keys(submitData).forEach((item) => {