Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

src/api/wms/saleShipmentDetail/index.ts

@@ -0,0 +1,65 @@
+import request from '@/config/axios'
+
+export interface SaleShipmentDetailVO {
+  id: number
+  soNumber: string
+  soLine: string
+  fromOwnerCode: string
+  packingNumber: string
+  batch: string
+  inventoryStatus: string
+  fromLocationCode: string
+  masterId: number
+  number: string
+  itemCode: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  remark: string
+  concurrencyStamp: string
+  siteId: number
+}
+
+// 查询销售发运申请子列表
+export const getSaleShipmentDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/sale-shipment-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/sale-shipment-detail/page`, params })
+  }
+}
+
+// 查询销售发运申请子详情
+export const getSaleShipmentDetail = async (id: number) => {
+  return await request.get({ url: `/wms/sale-shipment-detail/get?id=` + id })
+}
+
+// 新增销售发运申请子
+export const createSaleShipmentDetail = async (data: SaleShipmentDetailVO) => {
+  return await request.post({ url: `/wms/sale-shipment-detail/create`, data })
+}
+
+// 修改销售发运申请子
+export const updateSaleShipmentDetail = async (data: SaleShipmentDetailVO) => {
+  return await request.put({ url: `/wms/sale-shipment-detail/update`, data })
+}
+
+// 删除销售发运申请子
+export const deleteSaleShipmentDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/sale-shipment-detail/delete?id=` + id })
+}
+
+// 导出销售发运申请子 Excel
+export const exportSaleShipmentDetail = async (params) => {
+  return await request.download({ url: `/wms/sale-shipment-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/sale-shipment-detail/get-import-template' })
+}

src/api/wms/saleShipmentMain/index.ts

@@ -0,0 +1,64 @@
+import request from '@/config/axios'
+
+export interface SaleShipmentMainVO {
+  id: number
+  customerCode: string
+  number: string
+  businessType: string
+  remark: string
+  extraProperties: string
+  siteId: number
+  invoiceTime: Date
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  status: string
+  autoCommit: string
+  autoAgree: string
+  autoExecute: string
+  directCreateRecord: string
+  concurrencyStamp: string
+  ruleUserId: number
+  serialNumber: string
+}
+
+// 查询销售发运申请主列表
+export const getSaleShipmentMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/sale-shipment-main-request/senior', data })
+  } else {
+    return await request.get({ url: `/wms/sale-shipment-main-request/page`, params })
+  }
+}
+
+// 查询销售发运申请主详情
+export const getSaleShipmentMain = async (id: number) => {
+  return await request.get({ url: `/wms/sale-shipment-main-request/get?id=` + id })
+}
+
+// 新增销售发运申请主
+export const createSaleShipmentMain = async (data: SaleShipmentMainVO) => {
+  return await request.post({ url: `/wms/sale-shipment-main-request/create`, data })
+}
+
+// 修改销售发运申请主
+export const updateSaleShipmentMain = async (data: SaleShipmentMainVO) => {
+  return await request.put({ url: `/wms/sale-shipment-main-request/update`, data })
+}
+
+// 删除销售发运申请主
+export const deleteSaleShipmentMain = async (id: number) => {
+  return await request.delete({ url: `/wms/sale-shipment-main-request/delete?id=` + id })
+}
+
+// 导出销售发运申请主 Excel
+export const exportSaleShipmentMain = async (params) => {
+  return await request.download({ url: `/wms/sale-shipment-main-request/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/sale-shipment-main-request/get-import-template' })
+}

src/views/qms/basicDataManage/inspectionScheme/addForm.vue

@@ -104,7 +104,13 @@
                         '检验模板',
                         InspectionTemplateMain.allSchemas,
                         InspectionTemplateApi.inspectionTemplatePage,
-                        null,
+                        [
+                          {
+                            key: 'available',
+                            value: 'TRUE',
+                            isMainValue: false
+                          }
+                        ],
                         false,
                         'main',
                         null

src/views/qms/inspection/inspectionRequest/inspectionRequestMain.data.ts

@@ -370,8 +370,8 @@ export const InspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
 
 // 表单校验
 export const InspectionRequestPackageRules = reactive({
-  packageCode: [required],
+  // packageCode: [required],
-  packageSpecificationCode: [required],
+  // packageSpecificationCode: [required],
   amount: [required,{ validator:validateTwoNum, message: '小数点后最多2位', trigger: 'blur'}],
   measuringUnit: [required],
 })
@@ -388,9 +388,6 @@ export const InspectionRequestPackage = useCrudSchemas(reactive<CrudSchema[]>([
     tableForm:{
       disabled:true
     },
-    table:{
-      width:200
-    },
     isTableForm:false,
     form:{
       componentProps:{
@@ -406,9 +403,6 @@ export const InspectionRequestPackage = useCrudSchemas(reactive<CrudSchema[]>([
     tableForm:{
       disabled:false
     },
-    table:{
-      width:200
-    }
   },
   {
     label: '包装规格',
@@ -418,9 +412,6 @@ export const InspectionRequestPackage = useCrudSchemas(reactive<CrudSchema[]>([
     tableForm:{
       disabled:false
     },
-    table:{
-      width:180
-    }
   },
   {
     label: '数量',
@@ -434,9 +425,6 @@ export const InspectionRequestPackage = useCrudSchemas(reactive<CrudSchema[]>([
     tableForm:{
       disabled:false
     },
-    table:{
-      width:150
-    }
   },
   {
     label: '计量单位',

src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue

@@ -92,7 +92,6 @@ import { DeliverRequestMain,DeliverRequestMainRules,DeliverRequestDetail,Deliver
 import * as DeliverRequestMainApi from '@/api/wms/deliverRequestMain'
 import * as DeliverRequestDetailApi from '@/api/wms/deliverRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import * as DeliverPlanDetailApi from '@/api/wms/deliverPlanDetail'
 
 // 发货申请
 defineOptions({ name: 'DeliverRequestMain' })
@@ -103,7 +102,6 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const customerCode = ref()
 const tableColumns = ref([...DeliverRequestMain.allSchemas.tableColumns,...DeliverRequestDetail.allSchemas.tableMainColumns])
 
 const isShowButton = ref(true)

src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue

@@ -0,0 +1,325 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="SaleShipmentMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="SaleShipmentMain.allSchemas"
+      :detailAllSchemas="SaleShipmentDetail.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <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.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    :isOpenSearchTable="true"
+    fieldTableColumn="itemCode"
+    @success="getList"
+    :rules="SaleShipmentMainRules"
+    :formAllSchemas="SaleShipmentMain.allSchemas"
+    :tableAllSchemas="SaleShipmentDetail.allSchemas"
+    :tableFormRules="SaleShipmentDetailRules"
+    :tableData="tableData"
+    :apiUpdate="SaleShipmentMainApi.updateSaleShipmentMain"
+    :apiCreate="SaleShipmentMainApi.createSaleShipmentMain"
+    :isBusiness="true"
+    fromeWhere="SaleShipmentRequestMain"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+    :isShowButton = isShowButton
+  />
+ <!-- 详情 -->
+ <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="SaleShipmentMain.allSchemas"
+    :detailAllSchemas="SaleShipmentDetail.allSchemas"
+    :detailAllSchemasRules="SaleShipmentDetailRules"
+    :apiCreate="SaleShipmentDetailApi.createSaleShipmentDetail"
+    :apiUpdate="SaleShipmentDetailApi.updateSaleShipmentDetail"
+    :apiPage="SaleShipmentDetailApi.getSaleShipmentDetailPage"
+    :apiDelete="SaleShipmentDetailApi.deleteSaleShipmentDetail"
+    fromeWhere="SaleShipmentRequestDetail"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+    :detailButtonIsShowAdd="trueFalse"
+    :detailButtonIsShowDelete="trueFalse"
+    @detailOpenForm="detailOpenForm"
+  />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/sale-shipment-main/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { SaleShipmentMain,SaleShipmentMainRules,SaleShipmentDetail,SaleShipmentDetailRules } from './saleShipmentMain.data'
+import * as SaleShipmentMainApi from '@/api/wms/saleShipmentMain'
+import * as SaleShipmentDetailApi from '@/api/wms/saleShipmentDetail'
+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: 'SaleShipmentMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(SaleShipmentMain.allSchemas.tableColumns)
+
+//定义  展示子表数据时是否显示新增/修改/删除按钮
+const trueFalse = ref(false)
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    if(formField == 'CustomerCode') {
+      setV['CustomerCode'] = val[0]['CustomerCode']
+      } else {
+        setV[formField] = val[0][searchField]
+      }
+      formRef.setValues(setV)
+  })
+}
+
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+const isShowButton = ref(true)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: SaleShipmentMainApi.getSaleShipmentMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:sale-shipment-main-request:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:sale-shipment-main-request:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:sale-shipment-main-request: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') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:sale-shipment-main-request:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:sale-shipment-main-request:delete'}), // 删除
+]
+
+const tableData = ref([])
+
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+
+/**
+ * 详情 编辑页面打开
+ * @param row 
+ */
+ const detailOpenForm = (type) => {
+
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  let isExist = false
+  tableData.value.forEach(item => {
+   let rs =  tableData.value.filter(filterItem => (filterItem.itemCode == item.itemCode))
+   if(rs.length > 1) isExist = true
+  })
+  if (isExist) {
+    basicFormRef.value.formLoading = false
+    return message.warning('物料代码重复')
+  }
+  try {
+    if (formType === 'create') {
+      if(tableData.value.length <= 0){
+      message.warning(`子表明细不能为空!`)
+      basicFormRef.value.formLoading = false
+      return;
+  }
+      await SaleShipmentMainApi.createSaleShipmentMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await SaleShipmentMainApi.updateSaleShipmentMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    basicFormRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    basicFormRef.value.formLoading = false
+  }
+}
+
+// 添加明细
+const handleAddTable = () => {
+    tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+  }
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicSaleShipmentMain')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await SaleShipmentMainApi.deleteSaleShipmentMain(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 SaleShipmentMainApi.exportSaleShipmentMain(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 SaleShipmentMainApi.importTemplate()
+})
+
+</script>

src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts

@@ -0,0 +1,439 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+import * as CustomerApi from '@/api/wms/customer'
+import { Customer } from '@/views/wms/basicDataManage/customerManage/customer/customer.data'
+
+import * as SaleMainApi from '@/api/wms/saleMain'
+import { SaleMain } from '@/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data'
+
+import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'DeliverRequest'
+}
+ const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+ const requestsettingData =data?.list[0]||{}
+
+// 表单校验
+export const SaleShipmentMainRules = reactive({
+})
+
+export const SaleShipmentMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '客户代码',
+    field: 'customerCode',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        enterSearch: true,
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择客户代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '客户信息', // 查询弹窗标题
+        searchAllSchemas: Customer.allSchemas, // 查询弹窗所需类
+        searchPage: CustomerApi.getCustomerPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false,
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    isForm: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+  },
+  {
+    label: '发票时间',
+    field: 'invoiceTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    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')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    isForm: false,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isForm:false,
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    isForm: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    isForm: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoAgree,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    isForm: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoExecute,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isForm: false,
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    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: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+// 表单校验
+export const SaleShipmentDetailRules = reactive({
+})
+
+export const SaleShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 180
+    },
+    isTable: false,
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '销售订单号',
+    field: 'soNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择销售订单号',
+      searchField: 'number',
+      searchTitle: '销售订单信息',
+      searchAllSchemas: SaleMain.allSchemas,
+      searchPage: SaleMainApi.getSaleMainPage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择销售订单号',
+        searchField: 'number',
+        searchTitle: '销售订单信息',
+        searchAllSchemas: SaleMain.allSchemas,
+        searchPage: SaleMainApi.getSaleMainPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '销售订单行',
+    field: 'soLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择销售订单行',
+      searchField: 'lineNumber',
+      searchTitle: '销售订单信息',
+      searchAllSchemas: SaleMain.allSchemas,
+      searchPage: SaleMainApi.getSaleMainPage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择销售订单行',
+        searchField: 'lineNumber',
+        searchTitle: '销售订单信息',
+        searchAllSchemas: SaleMain.allSchemas,
+        searchPage: SaleMainApi.getSaleMainPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'Radio'
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '主表ID',
+    field: 'masterId',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '物品代码',
+    field: 'itemCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '物品名称',
+    field: 'itemName',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '物品描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '物品描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    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: '地点ID',
+    field: 'siteId',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))

src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue

@@ -615,6 +615,14 @@ const handleImport = () => {
     data.subList = tableData.value // 拼接子表数据参数
     try {
       if (formType === 'create') {
+        if(data.subList.length == 0){
+          message.warning("请添明细数据")
+          return;
+        }
+        if(data.subList.length > 999){
+          message.warning("明细数据条数已超过最大数量限制【999条】")
+          return;
+        }
         await SupplierinvoiceRequestMainApi.createSupplierinvoiceRequestMain(data)
         message.success(t('common.createSuccess'))
       } else {