BUG修改

src/utils/disposition/defaultButtons.ts

@@ -735,6 +735,19 @@ export function mainThawRequesttBtn(option:any) {
     hasPermi: ''
   })
 }
+
+// 主列表-选择设备
+export function selectDeviceBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '选择设备',
+    name: 'selectDevice',
+    hide: false,
+    type: 'primary',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
 // 默认按钮规则
 function __defaultBtnOption(option:any,specific:any){
   return {

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

@@ -5,28 +5,15 @@
   </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>
@@ -39,33 +26,30 @@
   </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"
-  />
 
   <!-- 详情 -->
   <Detail ref="detailRef" :isBasic="true" :allSchemas="Item.allSchemas" />
 
-  <!-- 导入 -->
+  <!-- 选择设备 -->
-  <ImportForm ref="importFormRef" url="/eam/item/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <SearchTable ref="searchTableRef" @success="formsSuccess" @searchTableSuccess="searchTableSuccess" />
 </template>
 
 <script setup lang="ts">
   import download from '@/utils/download'
   import { Item, ItemRules } from './item.data'
   import * as ItemApi from '@/api/eam/basic/item'
+  import { DeviceAccounts, DeviceAccountsRules } from '@/views/eam/device/deviceAccounts/deviceAccounts.data'
+  import * as DeviceAccountsApi from '@/api/eam/device/deviceAccounts'
   import * as defaultButtons from '@/utils/disposition/defaultButtons'
   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 { SearchTable } from '@/components/SearchTable'
+
   defineOptions({ name: 'Item' })
 
   const message = useMessage() // 消息弹窗
@@ -76,6 +60,8 @@ const routeName = ref()
   routeName.value = route.name
   const tableColumns = ref(Item.allSchemas.tableColumns)
 
+
+
   // 查询页面返回
   const searchTableSuccess = (formField, searchField, val, formRef) => {
     nextTick(() => {
@@ -101,6 +87,7 @@ const { getList, setSearchParams } = tableMethods
   const HeadButttondata = [
     defaultButtons.defaultAddBtn(null), // 新增
     defaultButtons.defaultExportBtn(null), // 导出
+
     defaultButtons.defaultFreshBtn(null), // 刷新
     defaultButtons.defaultFilterBtn(null), // 筛选
     defaultButtons.defaultSetBtn(null), // 设置
@@ -131,6 +118,7 @@ const buttonBaseClick = (val, item) => {
   // 列表-操作按钮
   const butttondata = [
     defaultButtons.mainListEditBtn(null), // 编辑
+    defaultButtons.selectDeviceBtn(null), // 选择设备
     defaultButtons.mainListDeleteBtn(null), // 删除
   ]
 
@@ -138,11 +126,23 @@ const butttondata = [
   const buttonTableClick = async (val, row) => {
     if (val == 'edit') { // 编辑
       openForm('update', row)
+    } else if (val == 'selectDevice') { // 筛选
+      selectDevice(row)
     } else if (val == 'delete') { // 删除
       handleDelete(row.id)
     }
   }
 
+  /** 添加设备操作 */
+
+  // (titleName: any, allSchemas: any,getApiPage: any, formField: any, searchField: any,multiple: any, type: any, row: any, searchCondition:any , isCountRequestRe:any )
+  const searchTableRef = ref()
+  const selectDevice = (type : string, row ?: any) => {
+    searchTableRef.value.open('设备列表', DeviceAccounts.allSchemas, DeviceAccountsApi.getDeviceAccountsPage, '', '', '', '', '');
+    
+    // ItemApi.createItem(row)
+  }
+
   /** 添加/修改操作 */
   const basicFormRef = ref()
   const openForm = (type : string, row ?: any) => {
@@ -221,5 +221,4 @@ const searchFormClick = (searchData) => {
   onMounted(async () => {
     getList()
   })
-
 </script>

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

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