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,68 +26,68 @@
   </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 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 * as defaultButtons from '@/utils/disposition/defaultButtons'
+  import { DeviceAccounts, DeviceAccountsRules } from '@/views/eam/device/deviceAccounts/deviceAccounts.data'
-import TableHead from '@/components/TableHead/src/TableHead.vue'
+  import * as DeviceAccountsApi from '@/api/eam/device/deviceAccounts'
-import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+  import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import Detail from '@/components/Detail/src/Detail.vue'
+  import TableHead from '@/components/TableHead/src/TableHead.vue'
-
+  // import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-defineOptions({ name: 'Item' })
+  import Detail from '@/components/Detail/src/Detail.vue'
-
+
-const message = useMessage() // 消息弹窗
+  import { SearchTable } from '@/components/SearchTable'
-const { t } = useI18n() // 国际化
+
-
+  defineOptions({ name: 'Item' })
-const route = useRoute() // 路由信息
+
-const routeName = ref()
+  const message = useMessage() // 消息弹窗
-routeName.value = route.name
+  const { t } = useI18n() // 国际化
-const tableColumns = ref(Item.allSchemas.tableColumns)
+
-
+  const route = useRoute() // 路由信息
-// 查询页面返回
+  const routeName = ref()
-const searchTableSuccess = (formField, searchField, val, formRef) => {
+  routeName.value = route.name
+  const tableColumns = ref(Item.allSchemas.tableColumns)
+
+
+
+  // 查询页面返回
+  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(null), // 新增
     defaultButtons.defaultExportBtn(null), // 导出
+
     defaultButtons.defaultFreshBtn(null), // 刷新
     defaultButtons.defaultFilterBtn(null), // 筛选
     defaultButtons.defaultSetBtn(null), // 设置
@@ -112,10 +99,10 @@ const HeadButttondata = [
     //   icon: 'Select',
     //   color: ''
     // },
-]
+  ]
 
-// 头部按钮事件
+  // 头部按钮事件
-const buttonBaseClick = (val, item) => {
+  const buttonBaseClick = (val, item) => {
     if (val == 'add') { // 新增
       openForm('create')
     } else if (val == 'export') { // 导出
@@ -126,42 +113,55 @@ const buttonBaseClick = (val, item) => {
     } else { // 其他按钮
       console.log('其他按钮', item)
     }
-}
+  }
 
-// 列表-操作按钮
+  // 列表-操作按钮
-const butttondata = [
+  const butttondata = [
     defaultButtons.mainListEditBtn(null), // 编辑
+    defaultButtons.selectDeviceBtn(null), // 选择设备
     defaultButtons.mainListDeleteBtn(null), // 删除
-]
+  ]
 
-// 列表-操作按钮事件
+  // 列表-操作按钮事件
-const buttonTableClick = async (val, row) => {
+  const buttonTableClick = async (val, row) => {
     if (val == 'edit') { // 编辑
       openForm('update', row)
+    } else if (val == 'selectDevice') { // 筛选
+      selectDevice(row)
     } else if (val == 'delete') { // 删除
       handleDelete(row.id)
     }
-}
+  }
 
-/** 添加/修改操作 */
+  /** 添加设备操作 */
-const basicFormRef = ref()
+
-const openForm = (type: string, row?: any) => {
+  // (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) => {
     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) {
+    var isHave = Item.allSchemas.formSchema.some(function (item) {
       return item.field === 'activeTime' || item.field === 'expireTime';
     });
-  if(isHave){
+    if (isHave) {
-    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+      if (data.activeTime && data.expireTime && data.activeTime >= data.expireTime) {
         message.error('失效时间要大于生效时间')
         return;
       }
     }
-  if(data.activeTime==0)data.activeTime = null;
+    if (data.activeTime == 0) data.activeTime = null;
-  if(data.expireTime==0)data.expireTime = null;
+    if (data.expireTime == 0) data.expireTime = null;
     if (formType === 'create') {
       await ItemApi.createItem(data)
       message.success(t('common.createSuccess'))
@@ -171,16 +171,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()
@@ -189,12 +189,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()
@@ -206,20 +206,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/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'
     }
   }