From 1a2413f54bc700a3a71c6c6915c14acc97b2a868 Mon Sep 17 00:00:00 2001
From: kylin L <452061493@qq.com>
Date: Sat, 13 Apr 2024 12:37:43 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=8C=E6=94=BF=E6=A3=80=E6=9F=A5=E9=A2=84?=
 =?UTF-8?q?=E7=BA=A6=E7=BA=A7=E8=81=94=E5=B1=95=E7=A4=BAbug=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/linkage.js                            |  1 +
 src/views/administrative/appointment.vue      |  4 +--
 src/views/administrative/appointmentList.vue  | 26 +++++++++++++++----
 .../enterprise/enterpriseInspectionDetail.vue | 21 ++++++++-------
 4 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/src/api/linkage.js b/src/api/linkage.js
index cc78268..e328c4d 100644
--- a/src/api/linkage.js
+++ b/src/api/linkage.js
@@ -1,5 +1,6 @@
 import { _get, _post,_form,_delete } from "../http/index";
 
 export const queryLinkage = (params, success, error) => _post("/code/linkage/list",params,success,error)
+export const queryLinkageById = (params, success, error) => _post("/code/linkage/objById",params,success,error)
 export const queryLinkageDictByValueAndParentId = (params, success, error) => _post("/code/linkage/selectLinkageDictByValueAndParentId",params,success,error)
 
diff --git a/src/views/administrative/appointment.vue b/src/views/administrative/appointment.vue
index b8b3823..bba9622 100644
--- a/src/views/administrative/appointment.vue
+++ b/src/views/administrative/appointment.vue
@@ -274,7 +274,7 @@ const getLinkageByParentIdToItem = (parentId) => {
             data.item_columns.push({ text: success[i].title, value: success[i].id, id: success[i].id })
             if (i==0) {
                 data.checkItemText = success[i].title;
-                submitData.checkItem = success[i].value;
+                submitData.checkItem = success[i].id;
                 getLinkageByParentIdToGA(success[i].id);
             }
         }
@@ -289,7 +289,7 @@ const getLinkageByParentIdToGA = (parentId) => {
             data.ga_columns.push({ text: success[i].title, value: success[i].id, id: success[i].id })
             if (i==0) {
                 data.checkRequireText = success[i].title;
-                submitData.checkRequire = success[i].value;
+                submitData.checkRequire = success[i].id;
             }
         }
     },error=>{});
diff --git a/src/views/administrative/appointmentList.vue b/src/views/administrative/appointmentList.vue
index 4927a09..b823f44 100644
--- a/src/views/administrative/appointmentList.vue
+++ b/src/views/administrative/appointmentList.vue
@@ -84,6 +84,7 @@
 	import {queryEnterpriseLawEnforcementList} from '../../api/administrative';
 	import { setGoodsNum } from "@/util/util";
 	import {getDict} from "../../api/Home";
+	import {queryLinkage, queryLinkageById, queryLinkageDictByValueAndParentId} from "../../api/linkage";
 	const { useCommon, useShopCard } = $globalStore;
 
 	const router = useRouter();
@@ -127,16 +128,31 @@
 		searchParam.enterpriseNumber = useCommon.enterpriseNumber;
 
 		// 查询检查要求字典信息
-		getDict({"dictType": "checkRequire"}, success => {
-			for(var i=0; i<success.data.length; i++) {
-				data.ga_columns.push({ text: success.data[i].dictLabel, value: success.data[i].dictValue })
-			}
-			queryList();
+		// getDict({"dictType": "checkRequire"}, success => {
+		// 	for(var i=0; i<success.data.length; i++) {
+		// 		data.ga_columns.push({ text: success.data[i].dictLabel, value: success.data[i].dictValue })
+		// 	}
+		// 	queryList();
+		// },error=>{});
+
+		queryLinkageDictByValueAndParentId({"value": "check_item", "parentId": "100"}, success => {
+			getLinkageByParentIdToItem(success.id)
 		},error=>{});
 
 		// queryList();
 		data.dateSearch = nowDate(new Date());
 	});
+
+	const getLinkageByParentIdToItem = (parentId) => {
+		// 查询检查要求字典信息
+		queryLinkage({"parentId": parentId}, success => {
+			for(var i=0; i<success.length; i++) {
+				data.ga_columns.push({ text: success[i].title, value: success[i].id, id: success[i].id })
+			}
+			queryList();
+		},error=>{});
+	}
+
 	const queryList = () =>{
 		queryEnterpriseLawEnforcementList(searchParam,success =>{
 			for (var i=0; i<success.data.length; i++) {
diff --git a/src/views/enterprise/enterpriseInspectionDetail.vue b/src/views/enterprise/enterpriseInspectionDetail.vue
index a373113..aaacbd7 100644
--- a/src/views/enterprise/enterpriseInspectionDetail.vue
+++ b/src/views/enterprise/enterpriseInspectionDetail.vue
@@ -108,6 +108,7 @@
 import {getEnterpriseLawEnforcement} from '../../api/administrative'
 import { reactive, ref } from "vue";
 import {getDict} from "../../api/Home";
+import {queryLinkageById} from "../../api/linkage";
 
 const router = useRouter();
 const route = useRoute();
@@ -169,15 +170,14 @@ const goBack = () => {
 	router.go(-1);
 };
 
-const setDict = () =>{
-    // 查询检查要求字典信息
-    getDict({"dictType": "checkRequire"}, success => {
-        for(var i=0; i<success.data.length; i++) {
-            if (submitData.checkItem == success.data[i].dictValue) {
-                submitData.checkItem = success.data[i].dictLabel
-                break;
-            }
-        }
+const setLinkageItem = (id) => {
+    queryLinkageById({"id": id}, success => {
+        submitData.checkItem = success.title
+    },error=>{});
+}
+const setLinkageGA = (id) => {
+    queryLinkageById({"id": id}, success => {
+        submitData.checkRequire = success.title
     },error=>{});
 }
 
@@ -198,7 +198,8 @@ onMounted(() =>{
         submitData.checkTime = success.data.checkTime;
         submitData.remark = success.data.remark;
 
-        setDict();
+        setLinkageItem(submitData.checkItem);
+        setLinkageGA(submitData.checkRequire);
     }
   },error=>{
       console.log("登记失败")