From 0ce46235d05a29df1728c8fe0c8a901724e53bd6 Mon Sep 17 00:00:00 2001
From: ljlong_2630 <ljlong_2630@yeah.net>
Date: Wed, 6 Mar 2024 10:29:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A8=A1=E5=85=B7=E5=8F=B0?=
 =?UTF-8?q?=E8=B4=A6=E7=95=8C=E9=9D=A2bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/eam/device/deviceAccounts/index.vue       |  2 ++
 .../deviceSpotInspectionRecordMain.data.ts          |  6 +++---
 src/views/eam/mold/moldAccounts/index.vue           | 13 ++++++++-----
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/views/eam/device/deviceAccounts/index.vue b/src/views/eam/device/deviceAccounts/index.vue
index 2a83fb9..2d3f30a 100644
--- a/src/views/eam/device/deviceAccounts/index.vue
+++ b/src/views/eam/device/deviceAccounts/index.vue
@@ -219,6 +219,7 @@ const butttondata = [
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
+  debugger
   if (val == 'edit') {
     // 编辑
     openForm('update', row)
@@ -228,6 +229,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'selectItem') {
     openItem(row.number)
   } else if (val == 'qrCode') {
+    debugger
     window.open(src.value + "&number='" + row.number + "'")
   } else {
     // 其他按钮
diff --git a/src/views/eam/device/deviceSpotInspectionRecordMain/deviceSpotInspectionRecordMain.data.ts b/src/views/eam/device/deviceSpotInspectionRecordMain/deviceSpotInspectionRecordMain.data.ts
index dc28025..ebeff46 100644
--- a/src/views/eam/device/deviceSpotInspectionRecordMain/deviceSpotInspectionRecordMain.data.ts
+++ b/src/views/eam/device/deviceSpotInspectionRecordMain/deviceSpotInspectionRecordMain.data.ts
@@ -97,7 +97,7 @@ export const DeviceSpotInspectionRecordMain = useCrudSchemas(reactive<CrudSchema
     dictType: DICT_TYPE.WEI_XIU_ORDER_STATUS,
     dictClass: 'string',
     table: {
-      width: '150',
+      width: 'c',
     },
     form: {
       component: 'Select'
@@ -108,7 +108,7 @@ export const DeviceSpotInspectionRecordMain = useCrudSchemas(reactive<CrudSchema
     field: 'type',
     sort: 'custom',
     table: {
-      width: '150',
+      width: 'getDeviceSpotInspectionRecordMainSenior',
     },
     formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
       return deviceMoldTypeList.find((account) => account.value == cellValue)?.label
@@ -182,7 +182,7 @@ export const DeviceSpotInspectionRecordDetail = useCrudSchemas(reactive<CrudSche
     sort: 'custom',
     isSearch: true,
     table: {
-      width: '300',
+      width: 'auto',
     },
   },
   
diff --git a/src/views/eam/mold/moldAccounts/index.vue b/src/views/eam/mold/moldAccounts/index.vue
index 65dca2d..5112ace 100644
--- a/src/views/eam/mold/moldAccounts/index.vue
+++ b/src/views/eam/mold/moldAccounts/index.vue
@@ -116,6 +116,7 @@ import * as MoldMaintainOrderMainApi from '@/api/eam/mold/moldMaintainOrderMain'
 import * as MoldMaintenanceMainApi from '@/api/eam/mold/moldMaintenanceMain'
 import * as moldMaintenanceDetailApi from '@/api/eam/mold/moldMaintenanceDetail'
 import * as MoldMilestoneApi from '@/api/eam/basic/moldMilestone'
+import { getAccessToken } from '@/utils/auth'
 
 import {
   MoldMaintainOrderMain,
@@ -149,7 +150,7 @@ const dialogAllSchemas = ref()
 const dialogAllSchemasRules = ref()
 const milestone = ref("milestone")
 const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
-const src = ref(BASE_URL + '/jmreport/view/924818618605031424?token=' + getAccessToken())
+const src = ref(BASE_URL + '/jmreport/view/924987924638945280?token=' + getAccessToken())
 
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
@@ -229,12 +230,9 @@ const buttonTableClick = async (val, row) => {
   if (val == 'edit') {
     // 编辑
     openForm('update', row)
-  } else if (val == 'qrCode') {
-    // 二维码
-    openQrCode(row.number)
   } else if (val == 'qrCode') {
     window.open(src.value + "&number='" + row.number + "'")
-  }  else if (val == 'selectItem') {
+  } else if (val == 'selectItem') {
     openItem(row.number)
   }
 }
@@ -494,4 +492,9 @@ const getDeviceItemList = async () => {
 }
 
 
+const qrCodeBatch = async (val,item) => {
+  const qrCodeList = tableObject.tableList.map(item => `'${item?.number}'`).join(', ')
+  window.open(src.value + "&number=" + qrCodeList)
+}
+
 </script>