BUG修改

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

@@ -1,36 +1,19 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search
+    <Search :schema="Item.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
-      :schema="Item.allSchemas.searchSchema"
-      @search="setSearchParams"
-      @reset="setSearchParams"
-    />
   </ContentWrap>
 
   <!-- 列表头部 -->
-  <TableHead
+  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
-    :HeadButttondata="HeadButttondata"
+    @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick" :allSchemas="Item.allSchemas" />
-    @button-base-click="buttonBaseClick"
-    :routeName="routeName"
-    @updataTableColumns="updataTableColumns"
-    @searchFormClick="searchFormClick"
-    :allSchemas="Item.allSchemas"
-  />
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table
+    <Table :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
-      :columns="tableColumns"
-      :data="tableObject.tableList"
-      :loading="tableObject.loading"
-      :pagination="{
         total: tableObject.total
-      }"
+      }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
-      v-model:pageSize="tableObject.pageSize"
+      v-model:sort="tableObject.sort">
-      v-model:currentPage="tableObject.currentPage"
-      v-model:sort="tableObject.sort"
-    >
       <template #code="{ row }">
         <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
           <span>{{ row.code }}</span>
@@ -43,101 +26,96 @@
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <BasicForm
+  <BasicForm ref="basicFormRef" @success="formsSuccess" :rules="ItemRules" :formAllSchemas="Item.allSchemas"
-    ref="basicFormRef"
+    :apiUpdate="ItemApi.updateItem" :apiCreate="ItemApi.createItem" @searchTableSuccess="searchTableSuccess"
-    @success="formsSuccess"
+    :isBusiness="false" />
-    :rules="ItemRules"
-    :formAllSchemas="Item.allSchemas"
-    :apiUpdate="ItemApi.updateItem"
-    :apiCreate="ItemApi.createItem"
-    @searchTableSuccess="searchTableSuccess"
-    :isBusiness="false"
-  />
 
   <SearchTable ref="searchTableRef" @searchTableSuccess="submitItem" />
 
   <!-- 详情 -->
   <Detail ref="detailRef" :isBasic="true" :allSchemas="Item.allSchemas" />
-  <Dialog
+  <Dialog ref="basicFormViewRef" v-model="showView" :key="viewKey" :closeOnClickModal="true" :title="viewTitle">
-    ref="basicFormViewRef"
-    v-model="showView"
-    :key="viewKey"
-    :closeOnClickModal="true"
-    :title="viewTitle"
-  >
     <el-image v-for="url in urls" :key="url" :src="url" lazy />
   </Dialog>
 </template>
 
 <script setup lang="ts">
-import download from '@/utils/download'
+  import download from '@/utils/download'
-import { Item, ItemRules } from './item.data'
+  import { Item, ItemRules } from './item.data'
-import * as ItemApi from '@/api/eam/basic/item'
+  import * as ItemApi from '@/api/eam/basic/item'
-import { createDeviceItemBatch, getDeviceItemPage, getDeviceItemNoPage } from '@/api/eam/basic/rel'
+  import { createDeviceItemBatch, getDeviceItemPage, getDeviceItemNoPage } from '@/api/eam/basic/rel'
-import {
+  import {
     DeviceAccounts,
     DeviceAccountsRules
-} from '@/views/eam/device/deviceAccounts/deviceAccounts.data'
+  } from '@/views/eam/device/deviceAccounts/deviceAccounts.data'
-import * as DeviceAccountsApi from '@/api/eam/device/deviceAccounts'
+  import * as DeviceAccountsApi from '@/api/eam/device/deviceAccounts'
-import * as defaultButtons from '@/utils/disposition/defaultButtons'
+  import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import TableHead from '@/components/TableHead/src/TableHead.vue'
+  import TableHead from '@/components/TableHead/src/TableHead.vue'
-// import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+  // import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-import Detail from '@/components/Detail/src/Detail.vue'
+  import Detail from '@/components/Detail/src/Detail.vue'
-import { SearchTable } from '@/components/SearchTable'
+  import { SearchTable } from '@/components/SearchTable'
+  import { getAccessToken } from '@/utils/auth'
 
-defineOptions({ name: 'Item' })
+  defineOptions({ name: 'Item' })
 
-const message = useMessage() // 消息弹窗
+  const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
+  const { t } = useI18n() // 国际化
-const route = useRoute() // 路由信息
+  const route = useRoute() // 路由信息
-const routeName = ref()
+  const routeName = ref()
-routeName.value = route.name
+  routeName.value = route.name
-const itemNumber = ref()
+  const itemNumber = ref()
-const tableColumns = ref(Item.allSchemas.tableColumns)
+  const tableColumns = ref(Item.allSchemas.tableColumns)
+  const importFormRef = ref()
+  const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
+  const src = ref(BASE_URL + '/jmreport/view/950552010397122560?token=' + getAccessToken())
 
-const showView = ref(false)
+  const showView = ref(false)
-const viewTitle = ref('图片预览')
+  const viewTitle = ref('图片预览')
-const urls = ref([])
+  const urls = ref([])
-const viewKey = ref(0)
+  const viewKey = ref(0)
 
-// 查询页面返回
+  // 查询页面返回
-const searchTableSuccess = (formField, searchField, val, formRef) => {
+  const searchTableSuccess = (formField, searchField, val, formRef) => {
     nextTick(() => {
       const setV = {}
       setV[formField] = val[0][searchField]
       formRef.setValues(setV)
     })
-}
+  }
 
-// 字段设置 更新主列表字段
+  // 字段设置 更新主列表字段
-const updataTableColumns = (val) => {
+  const updataTableColumns = (val) => {
     tableColumns.value = val
-}
+  }
 
-const { tableObject, tableMethods } = useTable({
+  const { tableObject, tableMethods } = useTable({
     getListApi: ItemApi.getItemPage // 分页接口
-})
+  })
 
-// 获得表格的各种操作
+  // 获得表格的各种操作
-const { getList, setSearchParams } = tableMethods
+  const { getList, setSearchParams } = tableMethods
 
-// 列表头部按钮
+  // 列表头部按钮
-const HeadButttondata =[
+  const HeadButttondata = [
     defaultButtons.defaultAddBtn({ hasPermi: 'basic:item:create' }), // 新增
     defaultButtons.defaultExportBtn({ hasPermi: 'basic:item:export' }), // 导出
+    defaultButtons.selectQrCodeBatchBtn(null), //批量生成二维码
     defaultButtons.defaultFreshBtn(null), // 刷新
     defaultButtons.defaultFilterBtn(null), // 筛选
     defaultButtons.defaultSetBtn(null) // 设置
-]
+  ]
 
-// 头部按钮事件
+  // 头部按钮事件
-const buttonBaseClick = (val, item) => {
+  const buttonBaseClick = (val, item) => {
     if (val == 'add') {
       // 新增
       openForm('create')
     } else if (val == 'export') {
       // 导出
       handleExport()
+    } else if (val == 'qrCodeBatch') {
+      // 批量生成二维码
+      qrCodeBatch(val, item)
     } else if (val == 'refresh') {
       // 刷新
       getList()
@@ -147,29 +125,39 @@ const buttonBaseClick = (val, item) => {
       // 其他按钮
       console.log('其他按钮', item)
     }
-}
+  }
+
+  const qrCodeBatch = async (val, item) => {
+    const qrCodeList = tableObject.tableList.map(item => `'${item?.number}'`).join(', ')
+    window.open(src.value + "&number=" + qrCodeList)
+  }
 
-// 列表-操作按钮
+  // 列表-操作按钮
-const butttondataView = (row) => {
+  const butttondataView = (row) => {
     return [defaultButtons.viewBtn(null)]
-}
+  }
-// 列表-操作按钮
+  // 列表-操作按钮
-const butttondata =(row)=>{
+  const butttondata = (row) => {
 
     return [
       defaultButtons.mainListEditBtn({ hasPermi: 'basic:item:update' }), // 编辑
       defaultButtons.chooseDeviceBtn({ hasPermi: 'basic:item:choose' }), //备件
+      defaultButtons.selectQrCodeBtn(null), //二维码
       defaultButtons.mainListDeleteBtn({ hasPermi: 'basic:item:delete' }), // 删除
-  defaultButtons.viewBtn({hide: !(row.filePathList != null && row.filePathList.length != 0 )})
+      defaultButtons.viewBtn({ hide: !(row.filePathList != null && row.filePathList.length != 0) })
-]}
+    ]
 
-// 列表-操作按钮事件
+  }
-const buttonTableClick = async (val, row) => {
+
+  // 列表-操作按钮事件
+  const buttonTableClick = async (val, row) => {
     if (val == 'edit') {
       // 编辑
       openForm('update', row)
     } else if (val == 'chooseDevice') {
       openItem(row.number)
+    } else if (val == 'qrCode') {
+      window.open(src.value + "&number='" + row.number + "'")
     } else if (val == 'delete') {
       // 删除
       handleDelete(row.id)
@@ -177,11 +165,11 @@ const buttonTableClick = async (val, row) => {
       // 图片预览
       openForm('view', row)
     }
-}
+  }
 
-const searchTableRef = ref()
+  const searchTableRef = ref()
-/** 绑定备件操作 */
+  /** 绑定备件操作 */
-const openItem = async (number: String) => {
+  const openItem = async (number : String) => {
     itemNumber.value = number
     await CallBack1()
     searchTableRef.value.open(
@@ -197,10 +185,10 @@ const openItem = async (number: String) => {
       null,
       searchTableSelections.value
     )
-}
+  }
 
-const searchTableSelections = ref([])
+  const searchTableSelections = ref([])
-const CallBack1 = async () => {
+  const CallBack1 = async () => {
     await getDeviceItemNoPage({ itemNumber: itemNumber.value }).then(async (res) => {
       await DeviceAccountsApi.getDeviceAccountsAllNoPage({}).then((response) => {
         searchTableSelections.value = response.filter((element) => {
@@ -214,9 +202,9 @@ const CallBack1 = async () => {
         })
       })
     })
-}
+  }
 
-const submitItem = async (formFieldRef, searchFieldRef, selections, typeRef, rowRef) => {
+  const submitItem = async (formFieldRef, searchFieldRef, selections, typeRef, rowRef) => {
     const deviceItemRelList = selections.map((element) => ({
       itemNumber: itemNumber.value,
       deviceNumber: element.number
@@ -224,11 +212,11 @@ const submitItem = async (formFieldRef, searchFieldRef, selections, typeRef, row
     createDeviceItemBatch(deviceItemRelList).then((res) => {
       message.success(t('common.createSuccess'))
     })
-}
+  }
 
-/** 添加/修改操作 */
+  /** 添加/修改操作 */
-const basicFormRef = ref()
+  const basicFormRef = ref()
-const openForm = (type: string, row?: any) => {
+  const openForm = (type : string, row ?: any) => {
     console.log(row)
     if (type == 'view') {
       showView.value = true
@@ -245,10 +233,10 @@ const openForm = (type: string, row?: any) => {
       }
       basicFormRef.value.open(type, row)
     }
-}
+  }
 
-// form表单提交
+  // form表单提交
-const formsSuccess = async (formType, data) => {
+  const formsSuccess = async (formType, data) => {
     var isHave = Item.allSchemas.formSchema.some(function (item) {
       return item.field === 'activeTime' || item.field === 'expireTime'
     })
@@ -273,16 +261,16 @@ const formsSuccess = async (formType, data) => {
     }
     basicFormRef.value.dialogVisible = false
     getList()
-}
+  }
 
-/** 详情操作 */
+  /** 详情操作 */
-const detailRef = ref()
+  const detailRef = ref()
-const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const openDetail = (row : any, titleName : any, titleValue : any) => {
     detailRef.value.openDetail(row, titleName, titleValue, 'basicItem')
-}
+  }
 
-/** 删除按钮操作 */
+  /** 删除按钮操作 */
-const handleDelete = async (id: number) => {
+  const handleDelete = async (id : number) => {
     try {
       // 删除的二次确认
       await message.delConfirm()
@@ -291,12 +279,12 @@ const handleDelete = async (id: number) => {
       message.success(t('common.delSuccess'))
       // 刷新列表
       await getList()
-  } catch {}
+    } catch { }
-}
+  }
 
-/** 导出按钮操作 */
+  /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
+  const exportLoading = ref(false) // 导出的加载中
-const handleExport = async () => {
+  const handleExport = async () => {
     try {
       // 导出的二次确认
       await message.exportConfirm()
@@ -308,19 +296,19 @@ const handleExport = async () => {
     } finally {
       exportLoading.value = false
     }
-}
+  }
 
-// 筛选提交
+  // 筛选提交
-const searchFormClick = (searchData) => {
+  const searchFormClick = (searchData) => {
     tableObject.params = {
       isSearch: true,
       filters: searchData.filters
     }
     getList() // 刷新当前列表
-}
+  }
 
-/** 初始化 **/
+  /** 初始化 **/
-onMounted(async () => {
+  onMounted(async () => {
     getList()
-})
+  })
 </script>

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

@@ -46,6 +46,7 @@
   import TableHead from '@/components/TableHead/src/TableHead.vue'
   import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
   import Detail from '@/components/Detail/src/Detail.vue'
+   import { getAccessToken } from '@/utils/auth'
 
   defineOptions({ name: 'Location' })
 
@@ -56,6 +57,9 @@
   const routeName = ref()
   routeName.value = route.name
   const tableColumns = ref(Location.allSchemas.tableColumns)
+  const importFormRef = ref()
+  const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
+  const src = ref(BASE_URL + '/jmreport/view/950537917716037632?token=' + getAccessToken())
 
   // 查询页面返回
   const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
@@ -90,6 +94,7 @@
   const HeadButttondata = [
     defaultButtons.defaultAddBtn({hasPermi:'basic:location:create'}), // 新增
     defaultButtons.defaultExportBtn({hasPermi:'basic:location:update'}), // 导出
+    defaultButtons.selectQrCodeBatchBtn(null), //批量生成二维码
     defaultButtons.defaultFreshBtn(null), // 刷新
     defaultButtons.defaultFilterBtn(null), // 筛选
     defaultButtons.defaultSetBtn(null), // 设置
@@ -109,7 +114,10 @@
       openForm('create')
     } else if (val == 'export') { // 导出
       handleExport()
-    } else if (val == 'refresh') { // 刷新
+    } else if (val == 'qrCodeBatch') {
+       // 批量生成二维码
+       qrCodeBatch(val, item)
+     }else if (val == 'refresh') { // 刷新
       getList()
     } else if (val == 'filtrate') { // 筛选
     } else { // 其他按钮
@@ -117,9 +125,15 @@
     }
   }
   
+  const qrCodeBatch = async (val,item) => {
+    const qrCodeList = tableObject.tableList.map(item => `'${item?.number}'`).join(', ')
+    window.open(src.value + "&number=" + qrCodeList)
+  }
+
   // 列表-操作按钮
   const butttondata = [
     defaultButtons.mainListEditBtn({hasPermi:'basic:location:update'}), // 编辑
+    defaultButtons.selectQrCodeBtn(null), //二维码
     defaultButtons.mainListDeleteBtn({hasPermi:'basic:location:delete'}), // 删除
   ]
 
@@ -127,6 +141,8 @@
   const buttonTableClick = async (val, row) => {
     if (val == 'edit') { // 编辑
       openForm('update', row)
+    } else if (val == 'qrCode') {
+    window.open(src.value + "&number='" + row.number + "'")
   } else if (val == 'delete') { // 删除
       handleDelete(row.id)
     }

src/views/eam/basic/location/location.data.ts

@@ -145,7 +145,7 @@ export const Location = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'action',
     isForm: false,
     table: {
-      width: 150,
+      width: 180,
       fixed: 'right'
     }
   }