BUG修改

src/api/eam/basic/item/index.ts

@@ -33,6 +33,11 @@ export const getItemPage = async (params) => {
   }
 }
 
+// 生成标签
+export const genDevice = async (data: ItemVO) => {
+  return await request.post({ url: `/eam/item/genDevice`,data})
+}
+
 // 查询备件详情
 export const getItem = async (id: number) => {
   return await request.get({ url: `/eam/item/get?id=` + id })

src/api/eam/item/itemApplyDetail/index.ts

@@ -0,0 +1,57 @@
+import request from '@/config/axios'
+
+export interface ItemApplyDetailVO {
+  number: string
+  name: string
+  type: string
+  applyId: number
+  applyDeptId: number
+  approveId: number
+  approveTime: Date
+  outId: number
+  outTime: Date
+  siteId: string
+  available: string
+  concurrencyStamp: number
+}
+
+// 查询备件申领记录主列表
+export const getItemApplyDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/eam/item-apply-detail/senior', data })
+  } else {
+    return await request.get({ url: `/eam/item-apply-detail/page`, params })
+  }
+}
+
+// 查询备件申领记录主详情
+export const getItemApplyDetail = async (id: number) => {
+  return await request.get({ url: `/eam/item-apply-detail/get?id=` + id })
+}
+
+// 新增备件申领记录主
+export const createItemApplyDetail = async (data: ItemApplyDetailVO) => {
+  return await request.post({ url: `/eam/item-apply-detail/create`, data })
+}
+
+// 修改备件申领记录主
+export const updateItemApplyDetail = async (data: ItemApplyDetailVO) => {
+  return await request.put({ url: `/eam/item-apply-detail/update`, data })
+}
+
+// 删除备件申领记录主
+export const deleteItemApplyDetail = async (id: number) => {
+  return await request.delete({ url: `/eam/item-apply-detail/delete?id=` + id })
+}
+
+// 导出备件申领记录主 Excel
+export const exportItemApplyDetail = async (params) => {
+  return await request.download({ url: `/eam/item-apply-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/eam/item-apply-detail/get-import-template' })
+}

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

@@ -34,7 +34,8 @@
   <Detail ref="detailRef" :isBasic="true" :allSchemas="Item.allSchemas" />
 
   <!-- 选择设备 -->
-  <SearchTable ref="searchTableRef" @success="formsSuccess" @searchTableSuccess="searchTableSuccess" />
+  <SearchTable ref="searchTableRef" @success="formsSuccess" :formAllSchemas="Item.allSchemas"
+    @searchTableSuccess="searchTableSuccess" />
 </template>
 
 <script setup lang="ts">
@@ -60,14 +61,27 @@
   const tableColumns = ref(Item.allSchemas.tableColumns)
 
 
-
+  const paramNumber = ref([])
   // 查询页面返回
   const searchTableSuccess = (formField, searchField, val, formRef) => {
-    nextTick(() => {
-      const setV = {}
-      setV[formField] = val[0][searchField]
-      formRef.setValues(setV)
+    // console.log(formField);
+    // console.log(val);
+    let dataResult = [];
+    let param = [];
+    val.forEach((element) => {
+      dataResult.push(element.number);
     })
+    paramNumber.value.push(formField, dataResult);
+    ItemApi.genDevice(paramNumber.value);
+    message.success(t('common.delSuccess '))
+    // 刷新列表
+    getList()
+
+    // nextTick(() => {
+    //   const setV = {}
+    //   setV[formField] = val[0][searchField]
+    //   formRef.setValues(setV)
+    // })
   }
 
   // 字段设置 更新主列表字段
@@ -136,9 +150,8 @@
 
   // (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, '', '', '', '', '');
-    
+  const selectDevice = (row) => {
+    searchTableRef.value.open('设备列表11', DeviceAccounts.allSchemas, DeviceAccountsApi.getDeviceAccountsPage, row.number, '', true, '', '');
     // ItemApi.createItem(row)
   }
 

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

@@ -4,241 +4,281 @@
     <Search :schema="ItemApplyMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
-    <!-- 列表头部 -->
-    <TableHead
-      :HeadButttondata="HeadButttondata"
-      @button-base-click="buttonBaseClick"
-      :routeName="routeName"
-      @updataTableColumns="updataTableColumns"
-      @searchFormClick="searchFormClick"
-      :allSchemas="ItemApplyMain.allSchemas"
-    />
+  <!-- 列表头部 -->
+  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
+    @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick"
+    :allSchemas="ItemApplyMain.allSchemas" />
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table
-      :columns="tableColumns"
-      :data="tableObject.tableList"
-      :loading="tableObject.loading"
-      :pagination="{
+    <Table :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"
-    >
-      <template #code="{row}">
-        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
-          <span>{{ row.code }}</span>
+      }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort">
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <BasicForm
-    ref="basicFormRef"
-    @success="formsSuccess"
-    :rules="ItemApplyMainRules"
-    :formAllSchemas="ItemApplyMain.allSchemas"
-    :apiUpdate="ItemApplyMainApi.updateItemApplyMain"
-    :apiCreate="ItemApplyMainApi.createItemApplyMain"
-    @searchTableSuccess="searchTableSuccess"
-    :isBusiness="false"
-  />
+  <BasicForm ref="formRef" @success="getList" :rules="ItemApplyMainRules" :formAllSchemas="ItemApplyMain.allSchemas"
+    :tableAllSchemas="ItemApplyDetail.allSchemas" :tableFormRules="ItemApplyDetailRules" :tableData="tableData"
+    :apiUpdate="ItemApplyMainApi.updateItemApplyMain" :apiCreate="ItemApplyMainApi.createItemApplyMain" :isBusiness="true"
+    @handleAddTable="handleAddTable" @handleDeleteTable="handleDeleteTable" @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm" />
 
   <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="true" :allSchemas="ItemApplyMain.allSchemas" />
+  <Detail ref="detailRef" :isBasic="false" :allSchemas="ItemApplyMain.allSchemas"
+    :detailAllSchemas="ItemApplyDetail.allSchemas" :detailAllSchemasRules="ItemApplyDetailRules"
+    :apiCreate="ItemApplyDetailApi.createItemApplyDetail" :apiUpdate="ItemApplyDetailApi.updateItemApplyDetail"
+    :apiPage="ItemApplyDetailApi.getItemApplyDetailPage" :apiDelete="ItemApplyDetailApi.deleteItemApplyDetail" :Echo="Echo"
+    @searchTableSuccessDetail="searchTableSuccessDetail" />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/eam/item-apply-main/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <ImportForm ref="importFormRef" url="/wms/purchase-main/import" :importTemplateData="importTemplateData"
+    @success="importSuccess" :isShowOut="true" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
 </template>
 
 <script setup lang="ts">
-import download from '@/utils/download'
-import { ItemApplyMain,ItemApplyMainRules } from './itemApplyMain.data'
-import * as ItemApplyMainApi from '@/api/eam/item/itemApplyMain'
-import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import TableHead from '@/components/TableHead/src/TableHead.vue'
-import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-import Detail from '@/components/Detail/src/Detail.vue'
-
-defineOptions({ name: 'ItemApplyMain' })
-
-const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
-
-const route = useRoute() // 路由信息
-const routeName = ref()
-routeName.value = route.name
-const tableColumns = ref(ItemApplyMain.allSchemas.tableColumns)
-
-// 查询页面返回
-const searchTableSuccess = (formField, searchField, val, formRef) => {
-  nextTick(() => {
-    const setV = {}
-    setV[formField] = val[0][searchField]
-    formRef.setValues(setV)
+  import download from '@/utils/download'
+  import {ItemApplyMain, ItemApplyMainRules, ItemApplyDetail, ItemApplyDetailRules} from './itemApplyMain.data'
+  import * as ItemApplyMainApi from '@/api/eam/item/itemApplyMain'
+  import * as ItemApplyDetailApi from '@/api/eam/item/itemApplyDetail'
+  import * as defaultButtons from '@/utils/disposition/defaultButtons'
+  import TableHead from '@/components/TableHead/src/TableHead.vue'
+  import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+
+  // 采购订单
+  defineOptions({ name: 'ItemApplyMain' })
+
+  const message = useMessage() // 消息弹窗
+  const { t } = useI18n() // 国际化
+  const route = useRoute() // 路由信息
+  const routeName = ref()
+  routeName.value = route.name
+  const tableColumns = ref(ItemApplyMain.allSchemas.tableColumns)
+
+  // 字段设置 更新主列表字段
+  const updataTableColumns = (val) => {
+    tableColumns.value = val
+  }
+
+  // 查询页面返回
+  const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
+    nextTick(async() => {
+     if (type == 'tableForm') {
+       // 明细查询页赋值
+       row[formField] = val[0][searchField]
+       row['itemNumber'] = val[0]['number']
+       
+     }else {
+        const setV = {}
+        setV[formField] = val[0][searchField]
+        formRef.setValues(setV)
+      }
+    })
+  }
+  // 查询页面返回——详情
+  const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
+    nextTick(async() => {
+      const setV = {}
+      // if(formField == 'itemCode'){
+      //     await ItembasicApi.getItembasicPage({
+      //       code: setV['itemCode']
+      //     }).then(res => {
+      //       setV['uom'] = res.list[0].uom
+      //       setV[formField] = val[0][searchField]
+      //     })
+      //   }
+      formRef.setValues(setV)
+    })
+  }
+
+  // 子表新增的时候选择表格之后需要会显得字段
+  // const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+  const Echo = []
+
+  const { tableObject, tableMethods } = useTable({
+    getListApi: ItemApplyMainApi.getItemApplyMainPage // 分页接口
+  })
+
+  // 获得表格的各种操作
+  const { getList, setSearchParams } = tableMethods
+
+  // 列表头部按钮
+  const HeadButttondata = [
+    defaultButtons.defaultAddBtn(null), // 新增
+    defaultButtons.defaultImportBtn(null), // 导入
+    defaultButtons.defaultExportBtn(null), // 导出
+    defaultButtons.defaultFreshBtn(null), // 刷新
+    defaultButtons.defaultFilterBtn(null), // 筛选
+    defaultButtons.defaultSetBtn(null), // 设置
+    // {
+    //   label: '自定义扩展按钮',
+    //   name: 'zdy',
+    //   hide: false,
+    //   type: 'primary',
+    //   icon: 'Select',
+    //   color: ''
+    // },
+  ]
+
+  // 头部按钮事件
+  const buttonBaseClick = (val, item) => {
+    if (val == 'add') { // 新增
+      openForm('create')
+    } else if (val == 'import') { // 导入
+      handleImport()
+    } else if (val == 'export') { // 导出
+      handleExport()
+    } else if (val == 'refresh') { // 刷新
+      getList()
+    } else if (val == 'filtrate') { // 筛选
+    } else { // 其他按钮
+      console.log('其他按钮', item)
+    }
+  }
+
+  // 根据状态返回该按钮是否显示
+  const isShowMainButton = (row, val) => {
+    if (val.indexOf(row.status) > -1) {
+      return false
+    } else {
+      return true
+    }
+  }
+
+  // 列表-操作按钮
+  const butttondata = (row) => {
+    return [
+      defaultButtons.mainListEditBtn(null), // 编辑
+      defaultButtons.mainListDeleteBtn(null), // 删除
+    ]
+  }
+
+  // 列表-操作按钮事件
+  const buttonTableClick = async (val, row) => {
+    if (val == 'edit') { // 编辑
+      openForm('update', row)
+    } else if (val == 'delete') { // 删除
+      handleDelete(row.id)
+    } 
+  }
+
+  /** 添加/修改操作 */
+  const formRef = ref()
+  const openForm = async (type : string, row ?: number) => {
+    tableData.value = [] // 重置明细数据
+    formRef.value.open(type, row)
+  }
+
+ /** 详情操作 */
+ const detailRef = ref()
+ const openDetail = (row : any, titleName : any, titleValue : any) => {
+   detailRef.value.openDetail(row, titleName, titleValue, 'basicItemApplyMain')
+ }
+
+  /** 删除按钮操作 */
+  const handleDelete = async (id : number) => {
+    try {
+      // 删除的二次确认
+      await message.delConfirm()
+      // 发起删除
+      await ItemApplyMainApi.deleteItemApplyMain(id)
+      message.success(t('common.delSuccess'))
+      // 刷新列表
+      await getList()
+    } catch { }
+  }
+
+  /** 导出按钮操作 */
+  const exportLoading = ref(false) // 导出的加载中
+  const handleExport = async () => {
+    try {
+      // 导出的二次确认
+      await message.exportConfirm()
+      // 发起导出
+      exportLoading.value = true
+      const data = await ItemApplyMainApi.exportItemApplyMain(tableObject.params)
+      download.excel(data, '备件申领记录主.xlsx')
+    } catch {
+    } finally {
+      exportLoading.value = false
+    }
+  }
+
+  /**
+    * tableForm方法
+  */
+  const tableFormKeys = {}
+  ItemApplyDetail.allSchemas.tableFormColumns.forEach(item => {
+    tableFormKeys[item.field] = item.default ? item.default : ''
   })
-}
-
-// 字段设置 更新主列表字段
-const updataTableColumns = (val) => {
-  tableColumns.value = val
-}
-
-const { tableObject, tableMethods } = useTable({
-  getListApi: ItemApplyMainApi.getItemApplyMainPage // 分页接口
-})
-
-// 获得表格的各种操作
-const { getList, setSearchParams } = tableMethods
-
-// 列表头部按钮
-const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'eam:itemApplyMain:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'eam:itemApplyMain:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'eam:itemApplyMain:export'}), // 导出
-  defaultButtons.defaultFreshBtn(null), // 刷新
-  defaultButtons.defaultFilterBtn(null), // 筛选
-  defaultButtons.defaultSetBtn(null), // 设置
-  // {
-  //   label: '自定义扩展按钮',
-  //   name: 'zdy',
-  //   hide: false,
-  //   type: 'primary',
-  //   icon: 'Select',
-  //   color: ''
-  // },
-]
-
-// 头部按钮事件
-const buttonBaseClick = (val, item) => {
-  if (val == 'add') { // 新增
-    openForm('create')
-  } else if (val == 'import') { // 导入
-    handleImport()
-  } else if (val == 'export') { // 导出
-    handleExport()
-  } else if (val == 'refresh') { // 刷新
+  const tableData = ref([])
+
+  // 添加明细
+  const handleAddTable = () => {
+    tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+  }
+  // 删除明细
+  const handleDeleteTable = (item, index) => {
+    tableData.value.splice(index, 1)
+  }
+
+  // 主子数据 提交
+  const submitForm = async (formType, data) => {
+    data.subList = tableData.value // 拼接子表数据参数
+    try {
+      if (formType === 'create') {
+        await ItemApplyMainApi.createItemApplyMain(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await ItemApplyMainApi.updateItemApplyMain(data)
+        message.success(t('common.updateSuccess'))
+      }
+      formRef.value.dialogVisible = false
+      // 刷新当前列表
+      getList()
+    } finally {
+      formRef.value.formLoading = false
+    }
+  }
+
+  /** 导入 */
+  const importFormRef = ref()
+  const handleImport = () => {
+    importFormRef.value.open()
+  }
+
+  // 导入附件弹窗所需的参数
+  const importTemplateData = reactive({
+    templateUrl: '',
+    templateTitle: '采购订单主导入模版.xlsx'
+  })
+
+  // 导入成功之后
+  const importSuccess = () => {
     getList()
-  } else if (val == 'filtrate') { // 筛选
-  } else { // 其他按钮
-    console.log('其他按钮', item)
-  }
-}
-
-// 列表-操作按钮
-const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'eam:itemApplyMain:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'eam:itemApplyMain:delete'}), // 删除
-]
-
-// 列表-操作按钮事件
-const buttonTableClick = async (val, row) => {
-  if (val == 'edit') { // 编辑
-    openForm('update', row)
-  } else if (val == 'delete') { // 删除
-    handleDelete(row.id)
-  }
-}
-
-/** 添加/修改操作 */
-const basicFormRef = ref()
-const openForm = (type: string, row?: any) => {
-  basicFormRef.value.open(type, row)
-}
-
-// form表单提交
-const formsSuccess = async (formType,data) => {
-  var isHave =ItemApplyMain.allSchemas.formSchema.some(function (item) {
-    return item.field === 'activeTime' || item.field === 'expireTime';
-  });
-  if(isHave){
-    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
-      message.error('失效时间要大于生效时间')
-      return;
+  }
+
+  // 筛选提交
+  const searchFormClick = (searchData) => {
+    tableObject.params = {
+      isSearch: true,
+      filters: searchData.filters
     }
+    getList() // 刷新当前列表
   }
-  if(data.activeTime==0)data.activeTime = null;
-  if(data.expireTime==0)data.expireTime = null;
-  if (formType === 'create') {
-    await ItemApplyMainApi.createItemApplyMain(data)
-    message.success(t('common.createSuccess'))
-  } else {
-    await ItemApplyMainApi.updateItemApplyMain(data)
-    message.success(t('common.updateSuccess'))
-  }
-  basicFormRef.value.dialogVisible = false
-  getList()
-}
-
-/** 详情操作 */
-const detailRef = ref()
-const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue, 'basicItemApplyMain')
-}
-
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await ItemApplyMainApi.deleteItemApplyMain(id)
-    message.success(t('common.delSuccess'))
-    // 刷新列表
-    await getList()
-  } catch {}
-}
-
-/** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
-const handleExport = async () => {
-  try {
-    // 导出的二次确认
-    await message.exportConfirm()
-    // 发起导出
-    exportLoading.value = true
-    const data = await ItemApplyMainApi.exportItemApplyMain(tableObject.params)
-    download.excel(data, '备件申领记录主.xlsx')
-  } catch {
-  } finally {
-    exportLoading.value = false
-  }
-}
-
-/** 导入 */
-const importFormRef = ref()
-const handleImport = () => {
-  importFormRef.value.open()
-}
-// 导入附件弹窗所需的参数
-const importTemplateData = reactive({
-  templateUrl: '',
-  templateTitle: '备件申领记录主导入模版.xlsx'
-})
-// 导入成功之后
-const importSuccess = () => {
-  getList()
-}
-
-// 筛选提交
-const searchFormClick = (searchData) => {
-  tableObject.params = {
-    isSearch: true,
-    filters: searchData.filters
-  }
-  getList() // 刷新当前列表
-}
-
-/** 初始化 **/
-onMounted(async () => {
-  getList()
-  importTemplateData.templateUrl = await ItemApplyMainApi.importTemplate()
-})
 
+  /** 初始化 **/
+  onMounted(async () => {
+    getList()
+    importTemplateData.templateUrl = await ItemApplyMainApi.importTemplate()
+  })
 </script>

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

@@ -1,13 +1,16 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
 
-// 表单校验
-export const ItemApplyMainRules = reactive({
-  number: [required],
-  name: [required],
-  concurrencyStamp: [required],
-})
+import { Item } from '@/views/eam/basic/item/item.data'
+import * as ItemApi from '@/api/eam/basic/item'
+
 
+import { validateHanset, validateEmail } from '@/utils/validator'
+const { t } = useI18n() // 国际化
+
+/**
+ * @returns {Array} 备件申请主表
+ */
 export const ItemApplyMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '申请编号',
@@ -151,4 +154,163 @@ export const ItemApplyMain = useCrudSchemas(reactive<CrudSchema[]>([
       fixed: 'right'
     }
   }
-]))
+]))
+
+//表单校验
+export const ItemApplyMainRules = reactive({
+  type: [
+    { required: true, message: '请选择订单类型', trigger: 'change' }
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  available: [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+})
+
+/**
+ * @returns {Array} 备件申请子表
+ */
+export const ItemApplyDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '备件编号',
+    field: 'itemNumber',
+    sort: 'custom',
+    isSearch: true,
+    tableForm: {
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择备件编号',
+      searchField: 'number',
+      searchTitle: '库区信息',
+      searchAllSchemas: Item.allSchemas, // 查询弹窗所需类
+      searchPage: ItemApi.getItemPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }
+      ]
+    },
+  },
+
+  {
+    label: '备注',
+    field: 'remark',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      default: 'TRUE',
+      inactiveValue: 'FALSE',
+      activeValue: 'TRUE'
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    isTable: true,
+    isTableForm: false,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    isForm: false,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width: '100%' },
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm: false,
+  }
+]))
+
+//表单校验
+export const ItemApplyDetailRules = reactive({
+  lineNumber: [
+    { required: true, message: '请输入行号', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  stdPackQty: [
+    { required: true, message: '请输入标包数量', trigger: 'blur' }
+  ],
+  stdPackUnit: [
+    { required: true, message: '请选择标包单位', trigger: 'change' }
+  ],
+  convertRate: [
+    { required: true, message: '请输入转换率', trigger: 'blur' }
+  ],
+  taxRate: [
+    { required: true, message: '请输入税率', trigger: 'blur' }
+  ],
+  shippedQty: [
+    { required: true, message: '请输入已发货数量', trigger: 'blur' }
+  ],
+  receivedQty: [
+    { required: true, message: '请输入已收货数量', trigger: 'blur' }
+  ],
+  returnedQty: [
+    { required: true, message: '请输入已退货数量', trigger: 'blur' }
+  ],
+  putawayQty: [
+    { required: true, message: '请输入已上架数量', trigger: 'blur' }
+  ],
+  overReceivingPercent: [
+    { required: true, message: '请输入超收百分比', trigger: 'blur' }
+  ],
+  orderQty: [
+    { required: true, message: '请输入订单数量', trigger: 'blur' }
+  ],
+  uom: [
+    { required: true, message: '请选择计量单位', trigger: 'change' }
+  ],
+  available: [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+  nuumber: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物品代码', trigger: 'change' }
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})

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

@@ -1,6 +1,9 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
 
+import * as SupplierApi from '@/api/eam/basic/supplier'
+import { Supplier } from '@/views/eam/basic/supplier/supplier.data'
+
 // 表单校验
 export const ItemOrderMainRules = reactive({
   number: [required],
@@ -28,16 +31,6 @@ export const ItemOrderMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
-  {
-    label: '电话',
-    field: 'phone',
-    sort: 'custom',
-  },
-  {
-    label: '传真',
-    field: 'fax',
-    sort: 'custom',
-  },
   {
     label: '采购员',
     field: 'purchaser',
@@ -47,27 +40,30 @@ export const ItemOrderMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '供应商编号',
     field: 'supplierNumber',
     sort: 'custom',
+    isSearch: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库区编号', // 输入框占位文本
+        searchField: 'number', // 查询弹窗赋值字段
+        searchTitle: '库区信息', // 查询弹窗标题
+        searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
+        searchPage: SupplierApi.getSupplierPage, // 查询弹窗所需分页方法
+        searchCondition: [
+          {
+            key: 'available',
+            value: "TRUE",
+            isMainValue: false
+          }]
+      }
+    }
   },
   {
     label: '供应商名称',
     field: 'supplierName',
     sort: 'custom',
   },
-  {
-    label: '供应商地址',
-    field: 'supplierAddress',
-    sort: 'custom',
-  },
-  {
-    label: '发货至',
-    field: 'shipTo',
-    sort: 'custom',
-  },
-  {
-    label: '开票至',
-    field: 'invoiceTo',
-    sort: 'custom',
-  },
   {
     label: '联系人',
     field: 'contacts',
@@ -78,50 +74,6 @@ export const ItemOrderMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'contactsPhone',
     sort: 'custom',
   },
-  {
-    label: '付款方式',
-    field: 'paymentType',
-    sort: 'custom',
-    form: {
-      component: 'Select'
-    },
-  },
-  {
-    label: '注册地',
-    field: 'registLocation',
-    sort: 'custom',
-  },
-  {
-    label: '开户行',
-    field: 'bank',
-    sort: 'custom',
-  },
-  {
-    label: '账号',
-    field: 'account',
-    sort: 'custom',
-  },
-  {
-    label: '税号',
-    field: 'dutyParagraph',
-    sort: 'custom',
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: true,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
-    },
-    isForm: false,
-  },
   {
     label: '是否可用',
     field: 'available',
@@ -156,4 +108,4 @@ export const ItemOrderMain = useCrudSchemas(reactive<CrudSchema[]>([
       fixed: 'right'
     }
   }
-]))
+]))