BUG修改

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

@@ -0,0 +1,65 @@
+import request from '@/config/axios'
+
+export interface ItemOrderDetailVO {
+  number: string
+  date: string
+  phone: string
+  fax: string
+  purchaser: string
+  supplierNumber: string
+  supplierName: string
+  supplierAddress: string
+  shipTo: string
+  invoiceTo: string
+  contacts: string
+  contactsPhone: string
+  paymentType: string
+  registLocation: string
+  bank: string
+  account: string
+  dutyParagraph: string
+  siteId: string
+  available: string
+  concurrencyStamp: number
+}
+
+// 查询备件采购订单主列表
+export const getItemOrderDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/eam/item-order-detail/senior', data })
+  } else {
+    return await request.get({ url: `/eam/item-order-detail/page`, params })
+  }
+}
+
+// 查询备件采购订单主详情
+export const getItemOrderDetail = async (id: number) => {
+  return await request.get({ url: `/eam/item-order-detail/get?id=` + id })
+}
+
+// 新增备件采购订单主
+export const createItemOrderDetail = async (data: ItemOrderDetailVO) => {
+  return await request.post({ url: `/eam/item-order-detail/create`, data })
+}
+
+// 修改备件采购订单主
+export const updateItemOrderDetail = async (data: ItemOrderDetailVO) => {
+  return await request.put({ url: `/eam/item-order-detail/update`, data })
+}
+
+// 删除备件采购订单主
+export const deleteItemOrderDetail = async (id: number) => {
+  return await request.delete({ url: `/eam/item-order-detail/delete?id=` + id })
+}
+
+// 导出备件采购订单主 Excel
+export const exportItemOrderDetail = async (params) => {
+  return await request.download({ url: `/eam/item-order-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/eam/item-order-detail/get-import-template' })
+}

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

@@ -29,15 +29,15 @@
   <!-- 表单弹窗：添加/修改 -->
   <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"
+    :apiUpdate="ItemApplyMainApi.updateItemApplyMain" :apiCreate="ItemApplyMainApi.createItemApplyMain"
-    @handleAddTable="handleAddTable" @handleDeleteTable="handleDeleteTable" @searchTableSuccess="searchTableSuccess"
+    :isBusiness="true" @handleAddTable="handleAddTable" @handleDeleteTable="handleDeleteTable"
-    @submitForm="submitForm" />
+    @searchTableSuccess="searchTableSuccess" @submitForm="submitForm" />
 
   <!-- 详情 -->
   <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"
+    :apiPage="ItemApplyDetailApi.getItemApplyDetailPage" :apiDelete="ItemApplyDetailApi.deleteItemApplyDetail"
     @searchTableSuccessDetail="searchTableSuccessDetail" />
 
   <!-- 导入 -->

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

@@ -74,9 +74,10 @@ export const ItemApplyMain = useCrudSchemas(reactive<CrudSchema[]>([
  {
    label: '操作',
    field: 'action',
+   isDetail: false,
    isForm: false,
    table: {
-      width: 150,
+     width: 200,
      fixed: 'right'
    }
  }

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

@@ -5,88 +5,106 @@
   </ContentWrap>
 
   <!-- 列表头部 -->
-    <TableHead
+  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
-      :HeadButttondata="HeadButttondata"
+    @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick"
-      @button-base-click="buttonBaseClick"
+    :allSchemas="ItemOrderMain.allSchemas" />
-      :routeName="routeName"
-      @updataTableColumns="updataTableColumns"
-      @searchFormClick="searchFormClick"
-      :allSchemas="ItemOrderMain.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"
+      <template #number="{row}">
-      v-model:sort="tableObject.sort"
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
-    >
+          <span>{{ row.number }}</span>
-      <template #code="{row}">
-        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
-          <span>{{ row.code }}</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
+  <BasicForm ref="formRef" @success="getList" :rules="ItemOrderMainRules" :formAllSchemas="ItemOrderMain.allSchemas"
-    ref="basicFormRef"
+    :tableAllSchemas="ItemOrderDetail.allSchemas" :tableFormRules="ItemOrderDetailRules" :tableData="tableData"
-    @success="formsSuccess"
+    :apiUpdate="ItemOrderMainApi.updateItemOrderMain" :apiCreate="ItemOrderMainApi.createItemOrderMain"
-    :rules="ItemOrderMainRules"
+    :isBusiness="true" @handleAddTable="handleAddTable" @handleDeleteTable="handleDeleteTable"
-    :formAllSchemas="ItemOrderMain.allSchemas"
+    @searchTableSuccess="searchTableSuccess" @submitForm="submitForm" />
-    :apiUpdate="ItemOrderMainApi.updateItemOrderMain"
-    :apiCreate="ItemOrderMainApi.createItemOrderMain"
-    @searchTableSuccess="searchTableSuccess"
-    :isBusiness="false"
-  />
 
   <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="true" :allSchemas="ItemOrderMain.allSchemas" />
+  <Detail ref="detailRef" :isBasic="false" :allSchemas="ItemOrderMain.allSchemas"
+    :detailAllSchemas="ItemOrderDetail.allSchemas" :detailAllSchemasRules="ItemOrderDetailRules"
+    :apiCreate="ItemOrderDetailApi.createItemOrderDetail" :apiUpdate="ItemOrderDetailApi.updateItemOrderDetail"
+    :apiPage="ItemOrderDetailApi.getItemOrderDetailPage" :apiDelete="ItemOrderDetailApi.deleteItemOrderDetail"
+    @searchTableSuccessDetail="searchTableSuccessDetail" />
 
+  <!-- 导入 -->
+  <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 { ItemOrderMain,ItemOrderMainRules } from './itemOrderMain.data'
+  import { ItemOrderMain, ItemOrderMainRules, ItemOrderDetail, ItemOrderDetailRules } from './itemOrderMain.data'
   import * as ItemOrderMainApi from '@/api/eam/item/itemOrderMain'
+  import * as ItemOrderDetailApi from '@/api/eam/item/itemOrderDetail'
   import * as defaultButtons from '@/utils/disposition/defaultButtons'
   import TableHead from '@/components/TableHead/src/TableHead.vue'
-import Detail from '@/components/Detail/src/Detail.vue'
+  import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 
+  // 采购订单
   defineOptions({ name: 'ItemOrderMain' })
 
   const message = useMessage() // 消息弹窗
   const { t } = useI18n() // 国际化
-
   const route = useRoute() // 路由信息
   const routeName = ref()
   routeName.value = route.name
   const tableColumns = ref(ItemOrderMain.allSchemas.tableColumns)
 
+  // 字段设置 更新主列表字段
+  const updataTableColumns = (val) => {
+    tableColumns.value = val
+  }
+
   // 查询页面返回
-const searchTableSuccess = (formField, searchField, val, formRef) => {
+  const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
-  nextTick(() => {
+    nextTick(async () => {
+      if (type == 'tableForm') {
+        // 明细查询页赋值
+        row[formField] = val[0][searchField]
+        row['itemNumber'] = val[0]['number']
+        row['isRadeIn'] = val[0]['isRadeIn']
+        row['available'] = val[0]['available']
+      } else {
         const setV = {}
         setV[formField] = val[0][searchField]
         formRef.setValues(setV)
+      }
     })
   }
-
+  // 查询页面返回——详情
-// 字段设置 更新主列表字段
+  const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
-const updataTableColumns = (val) => {
+    nextTick(async () => {
-  tableColumns.value = val
+      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: ItemOrderMainApi.getItemOrderMainPage // 分页接口
   })
@@ -97,6 +115,7 @@ const { getList, setSearchParams } = tableMethods
   // 列表头部按钮
   const HeadButttondata = [
     defaultButtons.defaultAddBtn(null), // 新增
+    defaultButtons.defaultImportBtn(null), // 导入
     defaultButtons.defaultExportBtn(null), // 导出
     defaultButtons.defaultFreshBtn(null), // 刷新
     defaultButtons.defaultFilterBtn(null), // 筛选
@@ -115,6 +134,8 @@ const HeadButttondata = [
   const buttonBaseClick = (val, item) => {
     if (val == 'add') { // 新增
       openForm('create')
+    } else if (val == 'import') { // 导入
+      handleImport()
     } else if (val == 'export') { // 导出
       handleExport()
     } else if (val == 'refresh') { // 刷新
@@ -125,11 +146,22 @@ const buttonBaseClick = (val, item) => {
     }
   }
 
+  // 根据状态返回该按钮是否显示
+  const isShowMainButton = (row, val) => {
+    if (val.indexOf(row.status) > -1) {
+      return false
+    } else {
+      return true
+    }
+  }
+
   // 列表-操作按钮
-const butttondata = [
+  const butttondata = (row) => {
+    return [
       defaultButtons.mainListEditBtn(null), // 编辑
       defaultButtons.mainListDeleteBtn(null), // 删除
     ]
+  }
 
   // 列表-操作按钮事件
   const buttonTableClick = async (val, row) => {
@@ -141,33 +173,10 @@ const buttonTableClick = async (val, row) => {
   }
 
   /** 添加/修改操作 */
-const basicFormRef = ref()
+  const formRef = ref()
-const openForm = (type: string, row?: any) => {
+  const openForm = async (type : string, row ?: number) => {
-  basicFormRef.value.open(type, row)
+    tableData.value = [] // 重置明细数据
-}
+    formRef.value.open(type, row)
-
-// form表单提交
-const formsSuccess = async (formType,data) => {
-  var isHave =ItemOrderMain.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;
-    }
-  }
-  if(data.activeTime==0)data.activeTime = null;
-  if(data.expireTime==0)data.expireTime = null;
-  if (formType === 'create') {
-    await ItemOrderMainApi.createItemOrderMain(data)
-    message.success(t('common.createSuccess'))
-  } else {
-    await ItemOrderMainApi.updateItemOrderMain(data)
-    message.success(t('common.updateSuccess'))
-  }
-  basicFormRef.value.dialogVisible = false
-  getList()
   }
 
   /** 详情操作 */
@@ -198,13 +207,67 @@ const handleExport = async () => {
       // 发起导出
       exportLoading.value = true
       const data = await ItemOrderMainApi.exportItemOrderMain(tableObject.params)
-    download.excel(data, '备件采购订单主.xlsx')
+      download.excel(data, '备件申领记录主.xlsx')
     } catch {
     } finally {
       exportLoading.value = false
     }
   }
 
+  /**
+    * tableForm方法
+  */
+  const tableFormKeys = {}
+  ItemOrderDetail.allSchemas.tableFormColumns.forEach(item => {
+    tableFormKeys[item.field] = item.default ? item.default : ''
+  })
+  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 ItemOrderMainApi.createItemOrderMain(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await ItemOrderMainApi.updateItemOrderMain(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()
+  }
+
   // 筛选提交
   const searchFormClick = (searchData) => {
     tableObject.params = {
@@ -217,6 +280,6 @@ const searchFormClick = (searchData) => {
   /** 初始化 **/
   onMounted(async () => {
     getList()
+    importTemplateData.templateUrl = await ItemOrderMainApi.importTemplate()
   })
-
 </script>

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

@@ -1,111 +1,269 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+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() // 国际化
 
-import * as SupplierApi from '@/api/eam/basic/supplier'
+/**
-import { Supplier } from '@/views/eam/basic/supplier/supplier.data'
+ * @returns {Array} 备件申请主表
-
+ */
-// 表单校验
-export const ItemOrderMainRules = reactive({
-  number: [required],
-  date: [required],
-  concurrencyStamp: [required],
-})
-
 export const ItemOrderMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '订单号',
+    label: '申请编号',
     field: 'number',
     sort: 'custom',
+    isForm: false,
     isSearch: true,
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
   },
   {
-    label: '日期',
+    label: '申领人',
-    field: 'date',
+    field: 'applyId',
     sort: 'custom',
-    formatter: dateFormatter,
+    isForm: false,
-    form: {
+    isSearch: true,
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
-      }
   },
+  {
+    label: '审批人',
+    field: 'approveId',
+    sort: 'custom',
+    isForm: false,
+    isSearch: true,
   },
   {
-    label: '采购员',
+    label: '出库人',
-    field: 'purchaser',
+    field: 'outId',
     sort: 'custom',
+    isForm: false,
+    isSearch: true,
   },
   {
-    label: '供应商编号',
+    label: '描述',
-    field: 'supplierNumber',
+    field: 'name',
     sort: 'custom',
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
     isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      inactiveValue: 'FALSE',
+      disabled: true
+    },
     form: {
-      // labelMessage: '信息提示说明！！！',
+      component: 'Switch',
+      value: 'TRUE',
       componentProps: {
-        isSearchList: true, // 开启查询弹窗
+        inactiveValue: 'FALSE',
-        searchListPlaceholder: '请选择库区编号', // 输入框占位文本
+        activeValue: 'TRUE'
-        searchField: 'number', // 查询弹窗赋值字段
-        searchTitle: '库区信息', // 查询弹窗标题
-        searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
-        searchPage: SupplierApi.getSupplierPage, // 查询弹窗所需分页方法
-        searchCondition: [
-          {
-            key: 'available',
-            value: "TRUE",
-            isMainValue: false
-          }]
       }
     }
   },
  {
-    label: '供应商名称',
+   label: '操作',
-    field: 'supplierName',
+   field: 'action',
+   isDetail: false,
+   isForm: false,
+   table: {
+     width: 200,
+     fixed: 'right'
+   }
+ }
+]))
+
+//表单校验
+export const ItemOrderMainRules = reactive({
+  name: [
+    { required: true, message: '请填写描述', trigger: 'change' }
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  available: [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+})
+
+/**
+ * @returns {Array} 备件申请子表
+ */
+export const ItemOrderDetail = 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: '联系人',
+    label: '数量',
-    field: 'contacts',
+    field: 'qty',
     sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    }
   },
   {
-    label: '联系电话',
+    label: '库存数量',
-    field: 'contactsPhone',
+    field: 'currentQty',
     sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    }
   },
   {
     label: '是否可用',
     field: 'available',
+    sort: 'custom',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isSearch: true,
     isTable: true,
-    sort: 'custom',
     table: {
       width: 150
     },
     tableForm: {
       type: 'Select',
-      inactiveValue: 'FALSE',
       disabled: true
-    },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
     }
+  },
+  
+  
+  {
+    label: '是否以旧换新',
+    field: 'isRadeIn',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
     }
   },
+  {
+    label: '备注',
+    field: 'remark',
+    table: {
+      width: 150
+    },
+  },
+
   {
     label: '操作',
     field: 'action',
+    isDetail: false,
     isForm: false,
     table: {
       width: 150,
       fixed: 'right'
-    }
+    },
+    isTableForm: false,
   }
 ]))
+
+//表单校验
+export const ItemOrderDetailRules = 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' }
+  ],
+})