From 6b58d051f9264709a4a06764e9662c7817c1d372 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Thu, 23 Jan 2025 13:21:43 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E4=BA=8C=E7=BB=B4?=
 =?UTF-8?q?=E7=A0=81=E8=B7=B3=E8=BD=AC=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/formTable/page/cardPage.vue | 16 ++++++++++------
 src/views/formTable/taskListPage.vue  |  7 ++++++-
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/views/formTable/page/cardPage.vue b/src/views/formTable/page/cardPage.vue
index dab8100..4368648 100644
--- a/src/views/formTable/page/cardPage.vue
+++ b/src/views/formTable/page/cardPage.vue
@@ -175,7 +175,8 @@ const asfGetPageData = (asfFormId: any,asfToSelectMastersKey: any) => {
                     console.log(data.data.list)
 					for(let i = 0;i<data.data.list.length;i++){
 						let asfMasterAndAsfId:any = {}
-						asfMasterAndAsfId.asfId = data.data.list[i][asfDetails[j].field]
+						//asfMasterAndAsfId.asfId = data.data.list[i][asfDetails[j].field]
+                        asfMasterAndAsfId.asfId = data.data.list[i].id
 						asfMasterAndAsfId.asfMasterId = data.data.list[i].id
 						
 						asfToSelectIds.push(asfMasterAndAsfId)
@@ -234,9 +235,12 @@ const asfGetPageData = (asfFormId: any,asfToSelectMastersKey: any) => {
 			/* tablePageClass.value = 4;	
 			drawerWith.value = container.value?.clientWidth
 			 */
-            props.stateForm.type=3
-            //lookInfo.value = itval
-            asflookPageInfoIsShow.value = true;
+            setTimeout(()=>{
+                props.stateForm.type=3
+                //lookInfo.value = itval
+                asflookPageInfoIsShow.value = true;
+            },500)
+            
 						
 
 		})
@@ -485,7 +489,7 @@ const qrJumpGetPageData = (qrDetailId: string) => {
 const getPageData = () => {
     loadText.value = "数据加载中，请稍后......"
     loadingList.value = true
-    console.log(searchQuery.value)
+    //console.log(searchQuery.value)
     let sendData = {
         formId: props.appId,
         page: state.page,
@@ -603,7 +607,7 @@ const fullUrl = ref(window.location.href);
 
 onMounted(()=>{
     nextTick(()=>{
-        console.log(fullUrl.value)
+        //console.log(fullUrl.value)
         if(fullUrl.value.includes("&qrDetailId=")){
             let urlSplitArray = fullUrl.value.split("&qrDetailId=")
             let qrDetailId = urlSplitArray[1]
diff --git a/src/views/formTable/taskListPage.vue b/src/views/formTable/taskListPage.vue
index e072442..720b9a0 100644
--- a/src/views/formTable/taskListPage.vue
+++ b/src/views/formTable/taskListPage.vue
@@ -245,7 +245,13 @@ const initLoadData = () => {
 						}
 					}
 				}
+                //liwenxuan 二维码 20250123 start
+                stateData.tableData.controlBtn = stateData.tableData.controlBtn.filter(
+                    (item: any) => item.key != "showQrCode"
+                );
+                //liwenxuan 二维码 20250123 end
                 stateList.tableData = stateData.tableData
+
 				stateList.searchData = stateData.searchData
 				if(stateList.searchData == null){
 					stateList.searchData = new Array()
@@ -502,7 +508,6 @@ const performAction = (val) => {}
             <div class="contentBetween">
                 <div v-if="stateList.tableData.controlBtn.length > 0">
                     <el-button
-                        
                         v-for="item in stateList.tableData.controlBtn"
                         v-bind="item"
                         :key="item.type"