Merge remote-tracking branch 'origin/master'

src/views/eam/basic/item/index.vue

@@ -10,7 +10,7 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
+    <Table ref="tableRef" :selection=true :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
         total: tableObject.total
       }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort">
@@ -58,6 +58,7 @@
 
   defineOptions({ name: 'Item' })
 
+  const tableRef = ref(null);
   const message = useMessage() // 消息弹窗
   const { t } = useI18n() // 国际化
   const route = useRoute() // 路由信息
@@ -128,7 +129,12 @@
   }
 
   const qrCodeBatch = async (val, item) => {
-    const qrCodeList = tableObject.tableList.map(item => `'${item?.number}'`).join(', ')
+    let selections = tableRef.value.selections;
+    if (!selections || selections.length === 0) {
+      message.error('请选择要生成标签的数据')
+      return
+    }
+    const qrCodeList = selections.map(item => `'${item?.number}'`).join(', ')
     window.open(src.value + "&number=" + qrCodeList)
   }
 

src/views/eam/basic/location/index.vue

@@ -10,10 +10,12 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
+    <Table
+      ref="tableRef" :selection=true :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
         total: tableObject.total
       }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
-      v-model:sort="tableObject.sort">
+      v-model:sort="tableObject.sort"
+      >
       <template #code="{row}">
         <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
           <span>{{ row.code }}</span>
@@ -49,6 +51,7 @@
    import { getAccessToken } from '@/utils/auth'
 
   defineOptions({ name: 'Location' })
+  const tableRef = ref(null);
 
   const message = useMessage() // 消息弹窗
   const { t } = useI18n() // 国际化
@@ -126,7 +129,12 @@
   }
   
   const qrCodeBatch = async (val,item) => {
-    const qrCodeList = tableObject.tableList.map(item => `'${item?.number}'`).join(', ')
+    let selections = tableRef.value.selections;
+    if (!selections || selections.length === 0) {
+      message.error('请选择要生成标签的数据')
+      return
+    }
+    const qrCodeList = selections.map(item => `'${item?.number}'`).join(', ')
     window.open(src.value + "&number=" + qrCodeList)
   }
 

src/views/eam/device/deviceAccounts/index.vue

@@ -11,7 +11,7 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
+    <Table ref="tableRef" :selection=true :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
         total: tableObject.total
       }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort">
@@ -83,7 +83,7 @@
   import {hasPermi} from "@/directives/permission/hasPermi";
 
   defineOptions({ name: 'DeviceAccounts' })
-
+  const tableRef = ref(null);
   const message = useMessage() // 消息弹窗
   const { t } = useI18n() // 国际化
 
@@ -433,7 +433,12 @@
   }
 
   const qrCodeBatch = async (val, item) => {
-    const qrCodeList = tableObject.tableList.map(item => `'${item?.number}'`).join(', ')
+    let selections = tableRef.value.selections;
+    if (!selections || selections.length === 0) {
+      message.error('请选择要生成标签的数据')
+      return
+    }
+    const qrCodeList = selections.map(item => `'${item?.number}'`).join(', ')
     window.open(src.value + "&number=" + qrCodeList)
   }
   const searchTableSelections = ref([])

src/views/eam/mold/moldAccounts/index.vue

@@ -21,6 +21,8 @@
   <!-- 列表 -->
   <ContentWrap>
     <Table
+      ref="tableRef"
+      :selection=true
       :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
@@ -130,7 +132,7 @@ import {
 import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 
 defineOptions({ name: 'MoldAccounts' })
-
+const tableRef = ref(null);
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
@@ -467,7 +469,12 @@ const submitItem = async (formFieldRef, searchFieldRef, selections, typeRef, row
 }
 
 const qrCodeBatch = async (val,item) => {
-  const qrCodeList = tableObject.tableList.map(item => `'${item?.number}'`).join(', ')
+  let selections = tableRef.value.selections;
+  if (!selections || selections.length === 0) {
+    message.error('请选择要生成标签的数据')
+    return
+  }
+  const qrCodeList = selections.map(item => `'${item?.number}'`).join(', ')
   window.open(src.value + "&number=" + qrCodeList)
 }