Merge branch 'master_hella_20240701' into master_hella

src/api/wms/demandforecastingDetail/index.ts

@@ -1,4 +1,6 @@
 import request from '@/config/axios'
+import { isString } from '@/utils/is'
+import dayjs from 'dayjs'
 
 export interface DemandforecastingDetailVO {
   predictTimeType: string
@@ -15,6 +17,57 @@ export interface DemandforecastingDetailVO {
   available: string
 }
 
+// 要货预测-列表和头部请求参数
+const getPageParams = (params)=>{
+  // 到货日期
+  if(params.dueDate&&params.dueDate.length>0){
+    if(isString(params.dueDate[0])){
+      params.startDate = params.dueDate[0]
+    }else{
+      params.startDate = params.dueDate[0].format('YYYY-MM-DD')
+    }
+
+  }
+  if(params.dueDate&&params.dueDate.length>1){
+    if(isString(params.dueDate[1])){
+      params.endDate = params.dueDate[1]
+    }else{
+      params.endDate = params.dueDate[1].format('YYYY-MM-DD')
+    }
+  }
+  params.dueDate = ''
+
+  //计划员
+  if(params.planerId&&params.planerId.length>0){
+    params.planers = params.planerId.join(',')
+  }
+  params.planerId = ''
+  // 供应商代码
+  if(params.supplierCode&&params.supplierCode.length>0){
+    let keyValue = params.supplierCode.split(' ')
+    keyValue.forEach(item=>{item = item.trim()})
+    params.supplierCodes = keyValue.join(',')
+  }
+  params.supplierCode = ''
+
+  // 物料代码
+  if(params.itemCode&&params.itemCode.length>0){
+    let keyValue = params.itemCode.split(' ')
+    keyValue.forEach(item=>{item = item.trim()})
+    params.itemCodes = keyValue.join(',')
+  }
+  params.itemCode = ''
+
+  // 版本号
+  if(params.version&&params.version.length>0){
+    let keyValue = params.version.split(' ')
+    keyValue.forEach(item=>{item = item.trim()})
+    params.versions = keyValue.join(',')
+  }
+  params.version = ''
+  return params
+}
+
 // 查询要货预测子列表
 export const getDemandforecastingDetailPage = async (params) => {
   if (params.isSearch) {
@@ -22,6 +75,8 @@ export const getDemandforecastingDetailPage = async (params) => {
     const data = {...params}
     return await request.post({ url: '/wms/demandforecasting-detail/senior', data })
   } else {
+    params = getPageParams(params)
+    console.log('params',params)
     return await request.get({ url: `/wms/demandforecasting-detail/page`, params })
   }
 }
@@ -50,3 +105,16 @@ export const deleteDemandforecastingDetail = async (id: number) => {
 export const exportDemandforecastingDetail = async (params) => {
   return await request.download({ url: `/wms/demandforecasting-detail/export-excel`, params })
 }
+
+// 查询要货预测主列表
+export const getPageTableHead = async (params) => {
+  params = getPageParams(params)
+  console.log('params',params)
+  return await request.get({ url: `/wms/demandforecasting-detail/queryPageTableHead`, params })
+}
+
+
+// 查询版本号
+export const queryVersion = async (data) => {
+  return await request.post({ url: `/wms/demandforecasting-detail/queryVersion`, data })
+}

src/api/wms/demandforecastingMain/index.ts

@@ -81,3 +81,23 @@ export const exportDemandforecastingMain = async (params) => {
 export const importTemplate = () => {
   return request.download({ url: '/wms/demandforecasting-main/get-import-template' })
 }
+
+
+// 计划员
+export const queryUserPlanerList = async () => {
+  return await request.post({ url: `/wms/demandforecasting-main/queryUserPlanerList`,data:{} })
+
+}
+
+// 供应商代码
+export const querySupplierList = async (data) => {
+  return await request.post({ url: `/wms/demandforecasting-main/querySupplierList`,data })
+}
+
+
+// 是否已读接口
+export const updateIsRead = async (data) => {
+  return await request.post({ url: `/wms/demandforecasting-main/updateIsRead`,data })
+}
+
+

src/api/wms/itempackage/index.ts

@@ -29,7 +29,16 @@ export const getItempackagingPage = async (params) => {
     return await request.get({ url: `/wms/itempackage/page`, params })
   }
 }
-
+// 查询物料包装信息树形列表
+export const getItempackagingPageTree = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/itempackage/seniorTree', data })
+  } else {
+    return await request.get({ url: `/wms/itempackage/pageTree`, params })
+  }
+}
 // 查询物料包装信息 列表--供应商发货申请
 export const getItempackagingPageBySupplierdeliver = async (params) => {
   if (params.isSearch) {

src/api/wms/packageunit/index.ts

@@ -33,7 +33,26 @@ export const getPackageunitPage = async (params) => {
     return await request.get({ url: `/wms/packageunit/page`, params })
   }
 }
-
+// 查询物品包装规格信息 列表树状图
+export const getPackageunitPageTree = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/packageunit/seniorTree', data })
+  } else {
+    return await request.get({ url: `/wms/packageunit/pageTree`, params })
+  }
+}
+// 查询物品父级包装规格信息
+export const getPackageunitPageParent = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/packageunit/seniorParent', data })
+  } else {
+    return await request.get({ url: `/wms/packageunit/pageParent`, params })
+  }
+}
 // 查询物品包装规格信息 详情
 export const getPackageunit = async (id: number) => {
   return await request.get({ url: `/wms/packageunit/get?id=` + id })

src/api/wms/purchasePlanDetail/index.ts

@@ -15,7 +15,17 @@ export interface PurchasePlanDetailVO {
   updater: string
   available: string
 }
+// 要货预测-列表和头部请求参数
+const getPageParams = (params)=>{
 
+  console.log('params.status',params.status)
+  // 状态
+  if(params.status&&params.status.length>0){
+    params.statuss = params.status.join(',')
+  }
+  params.status = ''
+  return params
+}
 // 查询要货计划子列表
 export const getPurchasePlanDetailPage = async (params) => {
   if (params.isSearch) {
@@ -23,6 +33,7 @@ export const getPurchasePlanDetailPage = async (params) => {
     const data = {...params}
     return await request.post({ url: '/wms/purchase-plan-detail/senior', data })
   } else {
+    params = getPageParams(params)
     return await request.get({ url: `/wms/purchase-plan-detail/page`, params })
   }
 }

src/api/wms/purchasePlanMain/index.ts

@@ -85,7 +85,24 @@ export const exportPurchasePlanMain = async (params) => {
     return await request.download({ url: `/wms/purchase-plan-main/export-excel`, params })
   }
 }
-
+// 导出明细要货计划主 Excel
+export const exportDetailsPurchasePlanMain = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/purchase-plan-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/purchase-plan-main/export-excel-detail`, params })
+  }
+}
+// 导出要货计划二维表 Excel
+export const exportTablePurchasePlanMain = async (params) => {
+  // if (params.isSearch) {
+  //   const data = {...params}
+  //   return await request.downloadPost({ url: `/wms/purchase-plan-main/export-excel-senior`, data })
+  // } else {
+    return await request.download({ url: `/wms/purchase-plan-main/export-excel`, params })
+  //}
+}
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/purchase-plan-main/get-import-template' })

src/api/wms/supplierCycle/index.ts

@@ -0,0 +1,65 @@
+import request from '@/config/axios'
+
+export interface SupplierCycleVO {
+  id: number
+  supplierCode: string
+  monday: string
+  tuesday: string
+  wednesday: string
+  thursday: string
+  friday: string
+  saturday: string
+  sunday: string
+  version: string
+  remark: string
+  extraProperties: string
+  siteId: string
+  beginTime: Date
+  endTime: Date
+  available: string
+  status: string
+  concurrencyStamp: string
+  ruleUserId: number
+  departmentCode: string
+}
+
+// 查询要货预测周期列表
+export const getSupplierCyclePage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/supplier-cycle/senior', data })
+  } else {
+    return await request.get({ url: `/wms/supplier-cycle/page`, params })
+  }
+}
+
+// 查询要货预测周期详情
+export const getSupplierCycle = async (id: number) => {
+  return await request.get({ url: `/wms/supplier-cycle/get?id=` + id })
+}
+
+// 新增要货预测周期
+export const createSupplierCycle = async (data: SupplierCycleVO) => {
+  return await request.post({ url: `/wms/supplier-cycle/create`, data })
+}
+
+// 修改要货预测周期
+export const updateSupplierCycle = async (data: SupplierCycleVO) => {
+  return await request.put({ url: `/wms/supplier-cycle/update`, data })
+}
+
+// 删除要货预测周期
+export const deleteSupplierCycle = async (id: number) => {
+  return await request.delete({ url: `/wms/supplier-cycle/delete?id=` + id })
+}
+
+// 导出要货预测周期 Excel
+export const exportSupplierCycle = async (params) => {
+  return await request.download({ url: `/wms/supplier-cycle/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/supplier-cycle/get-import-template' })
+}

src/api/wms/supplierdeliverRequestDetail/index.ts

@@ -43,7 +43,14 @@ export const getSupplierdeliverRequestDetailPage = async (params) => {
     return await request.get({ url: `/wms/supplierdeliver-request-detail/page`, params })
   }
 }
-
+// 查询供应商发货申请子列表
+export const getGenerateLabelList = async (params) => {
+  return await request.get({ url: `/wms/supplierdeliver-request-detail/generateLabelList`, params })
+}
+// 查询托规格列表
+export const getGenerateLabelParentList = async (params) => {
+  return await request.get({ url: `/wms/supplierdeliver-request-detail/generateLabelParentList`, params })
+}
 // 查询供应商发货申请子详情
 export const getSupplierdeliverRequestDetail = async (id: number) => {
   return await request.get({ url: `/wms/supplierdeliver-request-detail/get?id=` + id })

src/api/wms/supplieritem/index.ts

@@ -51,16 +51,27 @@ export const getSupplieritem = async (id: number) => {
 export const createSupplieritem = async (data: SupplieritemVO) => {
   return await request.post({ url: `/wms/supplieritem/create`, data })
 }
+export const createSupplieritemSCP = async (data: SupplieritemVO) => {
+  return await request.post({ url: `/wms/supplieritem/createSCP`, data })
+}
 
 // 修改供应商物料
 export const updateSupplieritem = async (data: SupplieritemVO) => {
   return await request.put({ url: `/wms/supplieritem/update`, data })
 }
+// 修改供应商物料
+export const updateSupplieritemSCP = async (data: SupplieritemVO) => {
+  return await request.put({ url: `/wms/supplieritem/updateSCP`, data })
+}
 
 // 删除供应商物料
 export const deleteSupplieritem = async (id: number) => {
   return await request.delete({ url: `/wms/supplieritem/delete?id=` + id })
 }
+export const deleteSupplieritemSCP = async (id: number) => {
+  return await request.delete({ url: `/wms/supplieritem/deleteSCP?id=` + id })
+}
+
 
 // 导出供应商物料 Excel
 export const exportSupplieritem = async (params) => {

src/components/BasicForm/src/BasicForm.vue

@@ -102,6 +102,7 @@
       @clearInput='clearInput'
           @batchAdd="batchAdd"
           :routeName="routeName"
+          @visibleChange='visibleChange'
       >
       <template v-slot="{row}">
         <slot :row="row"></slot>
@@ -127,7 +128,11 @@
     </template>
   
   </Dialog>
-  <SearchTable ref="searchTableRef" :showSearchTableQueryFields="showSearchTableQueryFields" @searchTableSuccess="searchTableSuccess" />
+  <SearchTable ref="searchTableRef" :showSearchTableQueryFields="showSearchTableQueryFields" @searchTableSuccess="searchTableSuccess" >
+    <template v-for="name in Object.keys($slots)" :key="name" #[name]>
+        <slot :name="name"></slot>
+      </template>
+  </SearchTable>
 </template>
 <script setup lang="ts">
 import { SearchTable } from '@/components/SearchTable'
@@ -688,8 +693,12 @@ const emit = defineEmits([
   'footButtonClick',
   'clearSearchInput',
   'clearInput',
-  'sumFormDataHandle'
+  'sumFormDataHandle',
+  'visibleChange'
 ])
+const visibleChange = (field, val, row, index) => {
+  emit('visibleChange',field, val, row, index)
+}
 //普通下拉改变事件
 const formSelectChange = (field, val, row) => {
   emit('formSelectChange', field, val, row)
@@ -837,7 +846,7 @@ const buttonOperationClick = (row, label, index)=> {
 }
 
 
-defineExpose({ open, formRef, opensearchTable, dialogVisible, formLoading ,handleAddTable,changeDialogWidth}) // 提供 open 方法，用于打开弹窗
+defineExpose({ open, formRef, opensearchTable, dialogVisible, formLoading ,handleAddTable,changeDialogWidth,searchTableRef,tableFormRef}) // 提供 open 方法，用于打开弹窗
 
 </script>
 <style lang="scss" scoped>

src/components/Detail/src/Detail.vue

@@ -662,6 +662,7 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName:
     detailLoading.value = true
     try {
       detailData.value = row
+      searchTableFormModel.value = {...searchTableFormModel.value,...row}
       getRemarkList()
       getFileList()
       getAnnexFileList(row)

src/components/Search/src/Search.vue

@@ -9,6 +9,7 @@ import { FormSchema } from '@/types/form'
 
 import { useCache } from '@/hooks/web/useCache'
 const { wsCache } = useCache()
+const message = useMessage() // 消息弹窗
 
 defineOptions({ name: 'Search' })
 
@@ -40,10 +41,26 @@ const props = defineProps({
   model: {
     type: Object as PropType<Recordable>,
     default: () => ({})
+  },
+  // 详情数据
+  detailData: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  hiddenFilterBtnFields:{
+    type: Array,
+    required: false,
+    default: []
+  },
+  showSearchTableQueryFields:{
+    type: Array,
+    required: false,
+    default: []
   }
 })
 
-const emit = defineEmits(['search', 'reset','onInput'])
+const emit = defineEmits(['search', 'reset','onInput','onChange','searchTableSuccess'])
 
 const visible = ref(true)
 
@@ -91,7 +108,125 @@ const { register, elFormRef, methods } = useForm({
 const onInput = (field,value) => {
   emit('onInput', field,value)
 } 
+const onChange = (field, value)=>{
+  emit('onChange', field,value)
+}
+const searchTableRef = ref()
+const opensearchTable = (
+  formField,
+  searchField,
+  searchTitle,
+  searchAllSchemas,
+  searchPage,
+  searchCondition,
+  multiple,
+  type,
+  row,
+  isConcatDetailSchemas=false,
+  searchDetailSchemas: any
+) => {
+  const _searchCondition = {}
+  // 判断查询条件中，是否存在指向主表的数据
+  if (searchCondition && searchCondition.length > 0) {
+    // 转换筛选条件所需
+    let filters: any[] = []
+    for (var i=0; i< searchCondition.length; i++ ) {
+    // searchCondition.forEach((item) => {
+      // 查询条件为主表某字段，需要赋值主表数据，数据来源是详情的，赋值需要从row中获取
+      if (searchCondition[i].isMainValue) {
+        let keyValue = formRef.value.formModel[searchCondition[i].value]
+          ? formRef.value.formModel[searchCondition[i].value]
+          : props.detailData
+          ? props.detailData[searchCondition[i].value]
+          : row
+          ? row[searchCondition[i].value]
+          : ''
           
+        if(searchCondition[i].isCSV&&keyValue){
+          //用逗号分隔取参数
+          if(Array.isArray(keyValue)){
+            keyValue = keyValue.join(',')
+          }else{
+            keyValue = keyValue.split(' ')
+            keyValue.forEach(item=>{item = item.trim()})
+            keyValue = keyValue.join(',')
+          }
+          console.log('keyValue',keyValue)
+        }
+        _searchCondition[searchCondition[i].key] = keyValue
+        if(searchCondition[i].required){
+          // 是否含有空参数情况
+          let isNull = false
+          if (_searchCondition[searchCondition[i].key] == '' || _searchCondition[searchCondition[i].key] == undefined) {
+            isNull = true
+          }
+          if (isNull) {
+            message.warning(searchCondition[i].message?searchCondition[i].message:'前置条件未选择！')
+            return
+          }
+        }
+      }else if(searchCondition[i].isTableRowValue){
+        if(searchCondition[i].required){
+          if (row[searchCondition[i].value] == '' ||row[searchCondition[i].value] == undefined) {
+                message.warning(searchCondition[i].message?searchCondition[i].message:'前置条件未选择！')
+                return
+            }
+        }
+        row[searchCondition[i].value]
+        //查询当前table表数据的值
+        _searchCondition[searchCondition[i].key] = row[searchCondition[i].value]
+      } else {
+        // 扩展 转换为筛选条件进行查询
+        if (searchCondition[i].isSearch) {
+          if (searchCondition[i].isFormModel) {
+            //用formModel中的值
+            if(searchCondition[i].required){
+              if (formRef.value.formModel[searchCondition[i].value] == '' ||formRef.value.formModel[searchCondition[i].value] == undefined) {
+                  message.warning(searchCondition[i].message?searchCondition[i].message:'前置条件未选择！')
+                  return
+              }
+            }
+            filters.push({
+              action: searchCondition[i].action,
+              column: searchCondition[i].key,
+              value: formRef.value.formModel[searchCondition[i].value]
+            })
+          }else{
+            filters.push({
+              action: searchCondition[i].action,
+              column: searchCondition[i].key,
+              value: searchCondition[i].value
+            })
+          }
+          
+        } else {
+          _searchCondition[searchCondition[i].key] = searchCondition[i].value
+        }
+      }
+    }
+    if (filters.length > 0) {
+      _searchCondition.isSearch = true
+      _searchCondition.filters = filters
+    }
+  }
+  const _searchTableTitle = searchTitle
+  const _searchTableAllSchemas = searchAllSchemas
+  const _searchTablePage = searchPage
+  searchTableRef.value.open(
+    _searchTableTitle,
+    _searchTableAllSchemas,
+    _searchTablePage,
+    formField,
+    searchField,
+    multiple,
+    type,
+    row,
+    _searchCondition,
+    undefined,
+    isConcatDetailSchemas,
+    searchDetailSchemas
+  )
+}
 const formRef = ref()
 const setFormValues = (formData)=>{
   formRef.value.setValues(formData)
@@ -124,6 +259,11 @@ const setVisible = () => {
   unref(elFormRef)?.resetFields()
   visible.value = !unref(visible)
 }
+// 弹层确定返回所选数据
+// val ： 弹层列表row 数据
+const searchTableSuccess = (formField, searchField, val, type, row) => {
+  emit('searchTableSuccess', formField, searchField, val, formRef.value, type, row)
+}
 const Search = ref()
 onMounted(() => {})
 defineExpose({setFormValues}) // 提供 open 方法，用于打开弹窗
@@ -143,6 +283,8 @@ defineExpose({setFormValues}) // 提供 open 方法，用于打开弹窗
       hide-required-asterisk
       @register="register"
       @onInput="onInput"
+      @opensearchTable="opensearchTable"
+      @onChange="onChange"
     >
       <template #action>
         <div v-if="layout === 'inline'">
@@ -188,6 +330,8 @@ defineExpose({setFormValues}) // 提供 open 方法，用于打开弹窗
       <slot name="actionMore"></slot>
     </div>
   </template>
+  <SearchTable ref="searchTableRef" :hiddenFilterBtnFields="hiddenFilterBtnFields" :showSearchTableQueryFields="showSearchTableQueryFields" @searchTableSuccess="searchTableSuccess" />
+
 </template>
 <style lang="scss" scoped>
 .search ::v-deep(.el-form-item) {

src/components/SearchTable/src/SearchTable.vue

@@ -1,6 +1,7 @@
 <template>
   <Dialog :title="dialogTitle" v-model="searchDialogVisible" :width="dialogWidth">
     <!-- 搜索工作栏 -->
+    <slot :name="'searchQuery'+formFieldRef"></slot>
     <ContentWrap v-if="searchQuery">
       <Search :schema="searchSchema" @search="setSearchParamsRef" @reset="setSearchParamsRef" />
     </ContentWrap>
@@ -51,7 +52,12 @@ const props = defineProps({
     type: Array,
     required: false,
     default: []
-  }
+  },
+  hiddenFilterBtnFields:{
+    type: Array,
+    required: false,
+    default: []
+  },
 })
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -94,6 +100,7 @@ const allSchemasRef = ref()
 const searchConditionRef = ref()
 const searchTableSelectionsList = ref() //表格弹窗回显的列表
 const searchQuery = ref(false)
+const hiddenFilterBtn = ref(false)
 const openData = (titleName: any, tableObject:any ,allSchemas: any,multiple: any) => {
   dialogWidth.value = '80%'
   multipleBol.value = multiple
@@ -114,35 +121,23 @@ const openData = (titleName: any, tableObject: any, allSchemas: any, multiple: a
   searchSchema.value = allSchemas.searchSchema
   tableColumns.value = allSchemas.tableColumns
 }
-const open = (
+const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, searchField: any,multiple: any, type: any, row: any, searchCondition:any , isCountRequestRe:any,isConcatDetailSchemas=false,detailSchemas: any, searchTableSelections:any) => {
-  titleName: any,
+  searchQuery.value = props.showSearchTableQueryFields.find(item=>item==formField)?true:false
-  allSchemas: any,
+  hiddenFilterBtn.value = props.hiddenFilterBtnFields.find(item=>item==formField)?true:false
-  getApiPage: any,
+  
-  formField: any,
-  searchField: any,
-  multiple: any,
-  type: any,
-  row: any,
-  searchCondition: any,
-  isCountRequestRe: any,
-  isConcatDetailSchemas = false,
-  detailSchemas: any,
-  searchTableSelections: any
-) => {
-  searchQuery.value = props.showSearchTableQueryFields.find((item) => item == formField)
-    ? true
-    : false
   dialogWidth.value = '80%'
   multipleBol.value = multiple
-  HeadButttondata.value = multiple
+   
-    ? [
+  const filterBtns = hiddenFilterBtn.value?[]:[defaultButtons.defaultFilterBtn(null)]
+  
+  HeadButttondata.value = multiple?[
     defaultButtons.defaultWhenPageBtn(null), // 选择当页
     defaultButtons.defaultUnselectPageBtn(null), // 反选当页
     // defaultButtons.defaultDeselectAllBtn(null), // 取消全选
-        defaultButtons.defaultFilterBtn(null) // 筛选
+    ...filterBtns, // 筛选
-      ]
+  ]:
-    : [
+  [
-        defaultButtons.defaultFilterBtn(null) // 筛选
+    ...filterBtns, // 筛选
   ]
   searchDialogVisible.value = true
   formFieldRef.value = formField
@@ -241,7 +236,8 @@ const buttonBaseClick = (val, item) => {
   }
 }
 
-defineExpose({ open, openData, hiddenFilterButton, changeDialogWidth }) // 提供 open 方法，用于打开弹窗
+
+defineExpose({ open,openData,hiddenFilterButton ,changeDialogWidth,searchFormClick}) // 提供 open 方法，用于打开弹窗
 
 // Table 组件 ref
 const searchTableRef = ref()

src/components/Table/src/Table.vue

@@ -62,6 +62,7 @@ export default defineComponent({
     },
     searchTableSelectionsList:[],//回显列表
     selectionColor: propTypes.bool.def(false),
+    rowKey: propTypes.string.def(''),
   },
   emits: ['update:pageSize', 'update:currentPage', 'register', 'update:sort','getSelectionRows','rowClick'],
   setup(props, { attrs, slots, emit, expose }) {
@@ -401,6 +402,7 @@ export default defineComponent({
           onSelect-all={selectAll}
           onSelection-change={selectionChange}
           onSort-change={sortChange}
+          row-key={unref(getProps).rowKey}
           onRow-click={rowClick}
           {...unref(getBindValue)} 
         >

src/components/TableForm/src/TableForm.vue

@@ -92,6 +92,7 @@
               :disabled="disabledInput(headerItem, row)"
               style="flex: 1"
               @blur="inputStringBlur(headerItem, row[headerItem.field], row, index)"
+              @clear='clearInput(headerItem.field, row, index)'
             />
             <Icon
               icon="ep:circle-close"
@@ -164,12 +165,13 @@
               :placeholder="headerItem?.tableForm?.placeholder || '请选择' + headerItem.label"
               @change="formSelectChange(headerItem.field, $event, row)"
               @blur="tableFormSelectOnBlur(headerItem.field, $event, row, $index)"
+              @visible-change="visibleChange(headerItem.field, $event, row, $index)"
             >
               <el-option
-                v-for="op in initSelectOptions(headerItem)"
+                v-for="op in initSelectOptions(headerItem,row)"
-                :label="t(`ts.${op.label}`).replace('ts.', '')"
+                :label="t(`ts.${initLabel(headerItem,op)}`).replace('ts.', '')"
-                :value="op.value"
+                :value="initValue(headerItem,op)"
-                :key="op.value"
+                :key="initValue(headerItem,op)"
               />
             </el-select>
           </el-form-item>
@@ -196,7 +198,7 @@
               @blur="tableFormSelectOnBlur(headerItem.field, $event, row, $index)"
             >
               <el-option-group
-                v-for="group in initSelectOptions(headerItem)"
+                v-for="group in initSelectOptions(headerItem,row)"
                 :key="group.type"
                 :label="t(`ts.${group.name}`).replace('ts.', '')"
               >
@@ -302,7 +304,7 @@
               :id="headerItem?.tableForm?.id"
             >
               <el-radio
-                v-for="(item, index) in initSelectOptions(headerItem)"
+                v-for="(item, index) in initSelectOptions(headerItem,row)"
                 :key="index"
                 :label="t(`ts.${item.value}`).replace('ts.', '')"
                 :size="headerItem?.tableForm?.size"
@@ -326,7 +328,7 @@
               :fill="headerItem?.tableForm?.fill"
             >
               <el-checkbox
-                v-for="(item, index) in initSelectOptions(headerItem)"
+                v-for="(item, index) in initSelectOptions(headerItem,row)"
                 :key="index"
                 :label="t(`ts.${item.value}`).replace('ts.', '')"
                 :disabled="itemIsDisabled(headerItem, row)"
@@ -505,6 +507,7 @@ const emit = defineEmits([
   'tableSelectionDelete',
   'extendedButtonsClick',
   'formSelectChange',
+  'inputNumberChange',
   'tableSortChange',
   'selectCallback',
   'handleTableSelect',
@@ -516,11 +519,16 @@ const emit = defineEmits([
   'tableFormSelectOnBlur',
   'formFormDateChange',
   'clearInput',
-  'batchAdd'
+  'batchAdd',
+  'visibleChange'
 ])
 // 获取下拉列表 | type = radio | type = select
-const initSelectOptions = (item) => {
+const initSelectOptions = (headerItem,row) => {
-  return item.dictType ? getStrDictOptions(item.dictType) : item.tableForm.initOptions
+  if(row[headerItem.field+'InitOptions']){
+    return row[headerItem.field+'InitOptions']
+  }else{
+    return headerItem.dictType ? getStrDictOptions(headerItem.dictType) : headerItem.tableForm.initOptions
+  }
 }
 //普通下拉改变事件
 const formSelectChange = (field, val, row) => {
@@ -605,7 +613,6 @@ const TableBaseForm_Ref = ref()
  */
 
 const validateForm = () => {
-  console.log(TableBaseForm_Ref.value)
   let _lists = TableBaseForm_Ref.value?.map((v) => v.validate())
   if(!_lists ||_lists.length == 0){
     return false
@@ -647,7 +654,9 @@ const clearInput = (field, row, index) => {
 const buttonOperationClick = (row, label, index) => {
   emit('buttonOperationClick', row, label, index)
 }
-
+const visibleChange = (field, val, row, index) => {
+  emit('visibleChange',field, val, row, index)
+}
 const currentPage = ref(1)
 const pageSize = ref(10)
 const showTableData = () => {
@@ -661,9 +670,7 @@ const showTableData = () => {
   }
 }
 const keyWord = ref('')
-console.log(9999, props.tableFields)
 const batchAdd = () => {
-  console.log(keyWord.value)
   let field = ''
   const itemCodeFields = props.tableFields.find((item) => item.field == 'itemCode')
   const supplierFields = props.tableFields.find((item) => item.field == 'supplierCode')
@@ -674,7 +681,6 @@ const batchAdd = () => {
       field = supplierFields.field
     }
   }
-  console.log(field)
   emit('batchAdd', keyWord.value)
 }
 const disabledInput = (headerItem, row) => {
@@ -693,7 +699,20 @@ const disabledInput = (headerItem, row) => {
     )
   }
 }
-
+const  initLabel=(headerItem,op)=>{
+if(headerItem?.tableForm?.labelField){
+  return op[headerItem?.tableForm?.labelField]
+}else{
+  return op.label
+}
+}
+const  initValue=(headerItem,op)=>{
+if(headerItem?.tableForm?.valueField){
+  return op[headerItem?.tableForm?.valueField]
+}else{
+  return op.value
+}
+}
 // setup 语法糖 抛出方法
 defineExpose({
   TableBaseComponents_Ref,

src/locales/en-US.ts

@@ -1140,7 +1140,20 @@ export default {
     '重新生成标签会删除上次生成的标签，是否确认继续？':'Regenerating labels will delete the last generated label. Are you sure you want to continue?',
     '确 认':'Confirm',
     请输入拒收原因:'Please enter the reason for rejection',
-    查看明细:'View details'
+    查看明细:'View details',
+    全部已读:'All read',
+    '申请发货数量不能大于 计划数量 - 已发货数量':'The requested quantity cannot be greater than the planned quantity - the quantity shipped',
+    不允许超发:'Oversend is not allowed',
+    总数量超出计划数量:'The total quantity exceeds the planned quantity',
+    导出二维表:'Exporting two-dimensional tables',
+    要货计划明细:'Detailed requisition plan',
+    要货计划二维表:'Two dimensional requisition schedule',
+    '要货预测-计划员':'Demand forecast-Planner',
+    '要货预测-供应商':'Demand forecast-Supplier',
+    全选:'All',
+    计划员:'Planner',
+
+
   },
   
 

src/locales/zh-CN.ts

@@ -1140,7 +1140,19 @@ export default {
     '重新生成标签会删除上次生成的标签，是否确认继续？':'重新生成标签会删除上次生成的标签，是否确认继续？',
     '确 认':'确 认',
     请输入拒收原因:'请输入拒收原因',
-    查看明细:'查看明细'
+    查看明细:'查看明细',
+    全部已读:'全部已读',
+    '申请发货数量不能大于 计划数量 - 已发货数量':'申请发货数量不能大于 计划数量 - 已发货数量',
+    不允许超发:'不允许超发',
+    总数量超出计划数量:'总数量超出计划数量',
+    导出二维表:'导出二维表',
+    要货计划明细:'要货计划明细',
+    要货计划二维表:'要货计划二维表',
+    '要货预测-计划员':'要货预测-计划员',
+    '要货预测-供应商':'要货预测-供应商',
+    全选:'全选',
+    计划员:'计划员',
+
   },
 
 }

src/store/modules/permission.ts

@@ -4,6 +4,7 @@ import { cloneDeep } from 'lodash-es'
 import remainingRouter from '@/router/modules/remaining'
 import { flatMultiLevelRoutes, generateRoute } from '@/utils/routerHelper'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import {  getTenantId } from '@/utils/auth'
 
 const { wsCache } = useCache()
 
@@ -33,11 +34,19 @@ export const usePermissionStore = defineStore('permission', {
   actions: {
     async generateRoutes(): Promise<unknown> {
       return new Promise<void>(async (resolve) => {
+        let names =[{"text":"长春1379","value":1},{"text":"成都1397","value":2},{"text":"长春2379","value":3}]
+        let tenant = names.find(item=>item.value == getTenantId())
         // 获得菜单列表，它在登录的时候，setUserInfoAction 方法中已经进行获取
         let res: AppCustomRouteRecordRaw[] = []
         if (wsCache.get(CACHE_KEY.ROLE_ROUTERS)) {
           res = wsCache.get(CACHE_KEY.ROLE_ROUTERS) as AppCustomRouteRecordRaw[]
+          res.forEach(item=>{
+            if(item.name == '富维海拉供应商系统'&&tenant){
+              item.name = item.name + tenant['text']
             }
+          })
+        }
+        console.log('菜单res',res)
         const routerMap: AppRouteRecordRaw[] = generateRoute(res)
         // 动态路由，404一定要放到最后面
         this.addRouters = routerMap.concat([

src/utils/dict.ts

@@ -188,6 +188,7 @@ export enum DICT_TYPE {
   UOM = 'uom', // 计量单位
   ABC_CLASS = 'abc_class', // ABC类
   TRUE_FALSE = 'true_false', // 是否
+  ALLOWOVERSHIPMENT = 'allow_over_shipment',//是否允许超发
   FALSE_OR_TRUE = 'false_or_true', // 是否2
   ITEM_GROUP = 'item_group', // 物料分组
   ITEM_CATEGORY = 'Item_category', // 物料种类

src/utils/disposition/defaultButtons.ts

@@ -44,6 +44,31 @@ export function defaultExportBtn(option: any) {
     hasPermi: ''
   })
 }
+// 导出明细按钮
+export function defaultExportDetailsBtn(option: any) {
+  return __defaultBtnOption(option, {
+    label: t(`ts.导出明细`).replace('ts.', ''),
+    name: 'export-details',
+    hide: false,
+    type: 'success',
+    icon: 'ep:download',
+    color: '',
+    hasPermi: ''
+  })
+}
+// 导出明细按钮
+export function defaultExportTableBtn(option: any) {
+  return __defaultBtnOption(option, {
+    label: t(`ts.导出二维表`).replace('ts.', ''),
+    name: 'export-table',
+    hide: false,
+    type: 'success',
+    icon: 'ep:download',
+    color: '',
+    hasPermi: ''
+  })
+}
+
 
 // 字段设置
 // export function defaultFieldSettingBtn(option:any) {
@@ -236,7 +261,6 @@ export function formStagingBtn(option: any) {
     hasPermi: ''
   })
 }
-
 // form表单-下一步按钮
 export function formNextStepBtn(option:any) {
   return __defaultBtnOption(option,{

src/views/wms/basicDataManage/itemManage/itempackage/index.vue

@@ -30,6 +30,7 @@
       v-model:pageSize="tableObject.pageSize"
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
+      rowKey="id"
     >
       <template #itemCode="{ row }">
         <el-button type="primary" link @click="openDetail(row, '物料代码', row.itemCode)">
@@ -97,7 +98,7 @@ const updataTableColumns = (val) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: ItempackagingApi.getItempackagingPage // 分页接口
+  getListApi: ItempackagingApi.getItempackagingPageTree // 分页接口
 })
 
 // 获得表格的各种操作
@@ -337,8 +338,7 @@ const searchFormClick = (searchData) => {
 
 /** 初始化 **/
 onMounted(async () => {
-  getList()
+  await getList()
   importTemplateData.templateUrl = await ItempackagingApi.importTemplate()
 })
 </script>
-@/api/wms/itempackage

src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts

@@ -17,7 +17,7 @@ export const Itempackaging = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     form: {

src/views/wms/basicDataManage/itemManage/packageunit/index.vue

@@ -26,6 +26,7 @@
       v-model:pageSize="tableObject.pageSize"
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
+      rowKey="id"
     >
       <template #code="{row}">
         <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
@@ -33,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBase  :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -79,6 +80,10 @@ const tableColumns = ref(Packageunit.allSchemas.tableColumns)
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
   nextTick(() => {
+    // if(val[0].parentCode){
+    //   message.error('该规格为子包装，请重新选择')
+    //   return
+    // }
     const setV = {}
     setV[formField] = val[0][searchField]
     formRef.setValues(setV)
@@ -91,7 +96,7 @@ const updataTableColumns = (val) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: PackageunitApi.getPackageunitPage // 分页接口
+  getListApi: PackageunitApi.getPackageunitPageTree // 分页接口
 })
 
 // 获得表格的各种操作
@@ -132,10 +137,23 @@ const buttonBaseClick = (val, item) => {
 }
 
 // 列表-操作按钮
-const butttondata = [
+const butttondata = (row,$index) => {
-  defaultButtons.mainListEditBtn({hasPermi:'wms:packageunit:update'}), // 编辑
+  const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
+  if(findIndex>-1&&findIndex<$index){
+    return []
+  }
+    return [
+        defaultButtons.mainListEditBtn({hasPermi:'wms:packageunit:update',hide:isShowButton(row)}), // 编辑
         defaultButtons.mainListDeleteBtn({hasPermi:'wms:packageunit:delete'}), // 删除
     ]
+}
+const isShowButton =(row)=>{
+  if(row.children&&row.children.length>0){
+    return true
+  }else{
+    return false
+  }
+}
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {

src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts

@@ -3,6 +3,316 @@ import { dateFormatter } from '@/utils/formatTime'
 import { fa } from 'element-plus/es/locale'
 import * as PackageunitApi from '@/api/wms/packageunit'
 import { Select } from '@element-plus/icons-vue/dist/types'
+export const Packageunit1 = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '包装代码',
+    field: 'code',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装名称',
+    field: 'name',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装类型',
+    field: 'type',
+    dictType: DICT_TYPE.PACK_UNIT_TYPE,
+    dictClass: 'string',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '长',
+    field: 'length',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '宽',
+    field: 'width',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '高',
+    field: 'height',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '重量',
+    field: 'weight',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '单位',
+    field: 'unit',
+    sort: 'custom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isSearch: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装描述',
+    field: 'desc',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '是否重复使用',
+    field: 'reuse',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: false,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '是否管理包装库存',
+    field: 'manageBalance',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: false,
+    form: {
+      component: 'Switch',
+      value: 'FALSE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '失效时间',
+    field: 'expireTime',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    formatter: dateFormatter,
+    isForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    isForm: false,
+    isTable: true
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    isDetail: true,
+    isForm: false,
+    isTable: false,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    isDetail: true,
+    isForm: false,
+    isTable: false,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '删除时间',
+    field: 'deletionTime',
+    sort: 'custom',
+    isForm: false,
+    isTable: false,
+    isDetail: false,
+    table: {
+      width: 180
+    },
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '删除者',
+    field: 'deleterId',
+    sort: 'custom',
+    isDetail: false,
+    isForm: false,
+    isTable: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '扩展属性',
+    field: 'extraProperties',
+    sort: 'custom',
+    isForm: false,
+    isDetail: false,
+    isTable: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    isForm: false,
+    isDetail: false,
+    isTable: false,
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '地点',
+    field: 'siteId',
+    sort: 'custom',
+    isForm: false,
+    isDetail: false,
+    isTable: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    isDetail: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
 
 export const Packageunit = useCrudSchemas(reactive<CrudSchema[]>([
   {
@@ -13,15 +323,31 @@ export const Packageunit = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+  },{
+    label: '父包装代码',
+    field: 'parentCode',
+    sort: 'custom',
+    isTable:false,
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择父包装代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '包装规格信息', // 查询弹窗标题
+        searchAllSchemas: Packageunit1.allSchemas, // 查询弹窗所需类
+        searchPage: PackageunitApi.getPackageunitPageParent, // 查询弹窗所需分页方法
+        searchCondition:[{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
   },
-  // {
-  //   label: '父包装代码',
-  //   field: 'parentCode',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
   {
     label: '包装名称',
     field: 'name',

src/views/wms/basicDataManage/supplierManage/supplierCycle/index.vue

@@ -0,0 +1,276 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="SupplierCycle.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="SupplierCycle.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 #monday="{row}">
+        <Icon :size="16" v-show="row.monday==1" icon="ep:check" />
+      </template>
+      <template #tuesday="{row}">
+        <Icon :size="16" v-show="row.tuesday==1" icon="ep:check" />
+      </template>
+      <template #wednesday="{row}">
+        <Icon :size="16" v-show="row.wednesday==1" icon="ep:check" />
+      </template>
+      <template #thursday="{row}">
+        <Icon :size="16" v-show="row.thursday==1" icon="ep:check" />
+      </template>
+      <template #friday="{row}">
+        <Icon :size="16" v-show="row.friday==1" icon="ep:check" />
+      </template>
+      <template #saturday="{row}">
+        <Icon :size="16" v-show="row.saturday==1" icon="ep:check" />
+      </template>
+      <template #sunday="{row}">
+        <Icon :size="16" v-show="row.sunday==1" icon="ep:check" />
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="SupplierCycleRules"
+    :formAllSchemas="SupplierCycle.allSchemas"
+    :apiUpdate="SupplierCycleApi.updateSupplierCycle"
+    :apiCreate="SupplierCycleApi.createSupplierCycle"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="SupplierCycle.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/supplier-cycle/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { SupplierCycle,SupplierCycleRules } from './supplierCycle.data'
+import * as SupplierCycleApi from '@/api/wms/supplierCycle'
+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: 'SupplierCycle' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(SupplierCycle.allSchemas.tableColumns)
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: SupplierCycleApi.getSupplierCyclePage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:supplier-cycle:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:supplier-cycle:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:supplier-cycle: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') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:supplier-cycle:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:supplier-cycle: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) => {
+  if('update'==type){
+    let cycle = []
+    let week = ['monday','tuesday','wednesday','thursday','friday','saturday','sunday']
+    week.forEach(item=>{
+      if(row[item]==1){
+        cycle.push(item)
+      }
+    })
+    row.cycle = cycle
+  }
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,submitData) => {
+  let data = {...submitData}
+  let cycle = data.cycle
+  cycle.forEach(item=>{
+    data[item] = 1
+  })
+  delete data.cycle
+  console.log('formsSuccess',formType,data)
+  var isHave =SupplierCycle.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 SupplierCycleApi.createSupplierCycle(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await SupplierCycleApi.updateSupplierCycle(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, 'basicSupplierCycle')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await SupplierCycleApi.deleteSupplierCycle(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 SupplierCycleApi.exportSupplierCycle(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 SupplierCycleApi.importTemplate()
+})
+
+</script>

src/views/wms/basicDataManage/supplierManage/supplierCycle/supplierCycle.data.ts

@@ -0,0 +1,160 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+import * as SupplierApi from '@/api/wms/supplier'
+import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
+// 表单校验
+
+
+export const SupplierCycle = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: 'id',
+    field: 'id',
+    sort: 'custom',
+    isForm: false,
+    isTable:false,
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      componentProps: {
+        enterSearch:true,
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '供应商信息', // 查询弹窗标题
+        searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
+        searchPage: SupplierApi.getSupplierPageSCP, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
+    search: {
+      componentProps: {
+        enterSearch:true,
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '供应商信息', // 查询弹窗标题
+        searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
+        searchPage: SupplierApi.getSupplierPageSCP, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '星期一',
+    field: 'monday',
+    sort: 'custom',
+    isForm:false,
+
+  },
+  {
+    label: '星期二',
+    field: 'tuesday',
+    sort: 'custom',
+    isForm:false,
+
+  },
+  {
+    label: '星期三',
+    field: 'wednesday',
+    sort: 'custom',
+    isForm:false,
+
+  },
+  {
+    label: '星期四',
+    field: 'thursday',
+    sort: 'custom',
+    isForm:false,
+
+  },
+  {
+    label: '星期五',
+    field: 'friday',
+    sort: 'custom',
+    isForm:false,
+
+  },
+  {
+    label: '星期六',
+    field: 'saturday',
+    sort: 'custom',
+    isForm:false,
+
+  },
+  {
+    label: '星期日',
+    field: 'sunday',
+    sort: 'custom',
+    isForm:false,
+
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    isSearch: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '同步周期',
+    field: 'cycle',
+    isForm:true,
+    isDetail: false,
+    sort: 'custom',
+    isTable:false,
+    form: {
+      value:[],
+      component:'Checkbox',
+      componentProps: {
+        options: [
+          {label:'星期一',value:'monday'},
+          {label:'星期二',value:'tuesday'},
+          {label:'星期三',value:'wednesday'},
+          {label:'星期四',value:'thursday'},
+          {label:'星期五',value:'friday'},
+          {label:'星期六',value:'saturday'},
+          {label:'星期日',value:'sunday'}
+        ]
+      },
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+export const SupplierCycleRules = reactive({
+  supplierCode: [
+    { required: true, message: '供应商代码不能为空', trigger: 'blur' },
+  ],
+})

src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue

@@ -44,8 +44,8 @@
     @success="formsSuccess" 
     :rules="SupplieritemRules" 
     :formAllSchemas="Supplieritem.allSchemas"
-    :apiUpdate="SupplieritemApi.updateSupplieritem"
+    :apiUpdate="routeName.includes('SCP')?SupplieritemApi.updateSupplieritemSCP:SupplieritemApi.updateSupplieritem"
-    :apiCreate="SupplieritemApi.createSupplieritem"
+    :apiCreate="routeName.includes('SCP')?SupplieritemApi.createSupplieritemSCP:SupplieritemApi.createSupplieritem"
     @searchTableSuccess="searchTableSuccess"
     :isBusiness="false"
   />
@@ -189,10 +189,18 @@ const formsSuccess = async (formType,data) => {
       if(data.activeTime==0)data.activeTime = null;
       if(data.expireTime==0)data.expireTime = null;
       if (formType === 'create') {
+        if(routeName.value.includes('SCP')){
+          await SupplieritemApi.createSupplieritemSCP(data)
+        }else{
           await SupplieritemApi.createSupplieritem(data)
+        }
         message.success(t('common.createSuccess'))
+      } else {
+        if(routeName.value.includes('SCP')){
+          await SupplieritemApi.updateSupplieritemSCP(data)
         }else{
           await SupplieritemApi.updateSupplieritem(data)
+        }
         message.success(t('common.updateSuccess'))
       }
       basicFormRef.value.dialogVisible = false
@@ -221,7 +229,11 @@ const handleDelete = async (id: number) => {
     await message.delConfirm()
     tableObject.loading = true
     // 发起删除
+    if(routeName.value.includes('SCP')){
+      await SupplieritemApi.deleteSupplieritemSCP(id)
+    }else{
       await SupplieritemApi.deleteSupplieritem(id)
+    }
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表

src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts

@@ -94,6 +94,25 @@ export const Supplieritem = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     }
   },
+  {
+    label: '是否允许超发',
+    field: 'allowOverShipment',
+    dictType: DICT_TYPE.ALLOWOVERSHIPMENT,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    form: {
+      component: 'Switch',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    table: {
+      width: 150
+    }
+  },
   {
     label: '转换率',
     field: 'convertRate',

src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts

@@ -166,16 +166,20 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
       searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类
       searchPage: BalanceApi.getBalancePage, // 查询弹窗所需分页方法
       searchCondition:[
-      //   {
+        {
-      //   key: 'locationCode',
+        key: 'locationCode',
-      //   value: 'fromLocationCode',
+        value: 'fromLocationCode',
-      //   message: '请填写从库位代码！',
+        message: '请填写从库位代码！',
-      //   isMainValue: true
+        isMainValue: true
-      // },
+      },
       {
         key: 'inventoryStatus',
         value: 'OK',
         isMainValue: false
+      },{
+        key: 'businessType',
+        value: 'ReturnToHold', // 隔离退料
+        isMainValue: false
       }]
     },
   },

src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue

@@ -217,7 +217,7 @@ const butttondata = (row,$index) => {
         defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:repleinsh-request-main:submit'}), // 提交审批
         defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:repleinsh-request-main:refused'}), // 驳回
         defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:repleinsh-request-main:handle'}), // 审批通过
-        defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']), hasPermi:'wms:repleinsh-request-main:update'}), // 处理
+        defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3','7']), hasPermi:'wms:repleinsh-request-main:update'}), // 处理
         defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:repleinsh-request-main:update'}), // 编辑
         // defaultButtons.mainListDeleteBtn({hasPermi:'wms:repleinsh-request-main:delete'}), // 删除
     ]

src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts

@@ -861,6 +861,19 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isTable:false,
     isForm: false
   },
+  {
+    label: '未执行任务数量',
+    field: 'unexecutedQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    },
+    isTableForm:false,
+    hiddenInMain:true,
+  },
   {
     label: '操作',
     field: 'action',

src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts

@@ -1,235 +1,276 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 import * as SupplierApi from '@/api/wms/supplier'
-import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
 import * as SupplieritemApi from '@/api/wms/supplieritem'
+import { Supplier} from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
+
 import { Supplieritem } from '@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data'
+import * as ItembasicApi from '@/api/wms/itembasic'
+import {Itembasic} from "@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data";
 import * as PurchaseMainApi from '@/api/wms/purchaseMain'
 import * as PurchaseDetailApi from '@/api/wms/purchaseDetail'
 import { PurchaseDetail, PurchaseMain } from '../purchaseMain/purchaseMain.data'
+import * as DemandforecastingMainApi from '@/api/wms/demandforecastingMain'
+import * as DemandforecastingDetailApi from '@/api/wms/demandforecastingDetail'
+import dayjs from 'dayjs'
+
 const { t } = useI18n() // 国际化
+let planerList = []
+try {
+  planerList = await DemandforecastingMainApi.queryUserPlanerList()
+  if(planerList.length>0){
+    planerList.unshift({
+      planerId:'ALL',
+      planerNickname:t('ts.全选'),
+      planerUsername:t('ts.全选'),
+    })
+  }
+  console.log('planerList',planerList)
+} catch (error) {
+  
+}
 
 /**
  * @returns {Array} 要货预测主表
  */
-export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
+Supplieritem.allSchemas.searchSchema = Supplieritem.allSchemas.searchSchema.filter(item=>item.field!="allowOverShipment")
+
+export const Supplier1 = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '单据号',
+    label: '用户名称',
-    field: 'number',
+    field: 'userName',
     sort: 'custom',
-    table: {
-      width: 200,
-      fixed: 'left'
-    },
-    isForm: false,
     isSearch:true,
+    
   },
   {
-    label: '供应商代码',
+    label: '用户昵称',
-    field: 'supplierCode',
+    field: 'nickName',
     sort: 'custom',
-    table: {
+    
-      width: 150
   },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
     isSearch:true,
-    form: {
+    sort: 'custom',
-      labelMessage: '影响明细中物料代码，需在供应商物料中维护',
+    
-      componentProps: {
-        enterSearch:true,
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '供应商信息', // 查询弹窗标题
-        searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
-        searchPage: SupplierApi.getSupplierPageSCP, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
-      }
-    }
   },
   {
-    label: '版本号',
+    label: '供应商名称',
-    field: 'version',
+    field: 'supplierName',
     sort: 'custom',
-    table: {
+   
-      width: 150
-    },
   },
   {
-    label: '发布时间',
+    label: '创建时间',
-    field: 'publishTime',
+    field: 'createTime',
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     sort: 'custom',
-    table: {
+    
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: { width: '100%' },
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
   }
-    },
+]))
-    isForm: false,
+export const Version = useCrudSchemas(reactive<CrudSchema[]>([
-  },
   {
-    label: '开始时间',
+    label: '供应商代码',
-    field: 'beginTime',
+    field: 'supplerCodes',
-    isTable: true,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
     sort: 'custom',
-    table: {
+    isSearch:true,
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: { width: '100%' },
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
   },
-    isForm: false,
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    isSearch:true,
   },
   {
-    label: '结束时间',
+    label: '订单行',
-    field: 'endTime',
+    field: 'poLine',
-    isTable: true,
+    sort: 'custom',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
   },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    isSearch:true,
     sort: 'custom',
-    table: {
-      width: 180
   },
-    form: {
+  {
-      component: 'DatePicker',
+    label: '子表版本',
-      componentProps: {
+    field: 'detailVersion',
-        style: { width: '100%' },
+    sort: 'custom',
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
   }
-    },
+]))
-    isForm: false,
+export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
-  },
   {
-    label: '业务类型',
+    label: '计划员',
-    field: 'businessType',
+    field: 'planerId',
     sort: 'custom',
     table: {
       width: 150
     },
     isTable:false,
     isForm: false,
-    form: {
+    isSearch:true,
-      value: 'PurchasePrediction',
+    search:{
+      component:'Select',
+      value:planerList.length>1?[planerList[1]['planerId']]:[],
       componentProps: {
-        disabled: true
+        showAll:true,// 备用做全选
-      }
+        multiple:true,
+        emptyValues:[null, undefined],
+        valueOnClear:null,
+        options:planerList.length>0?planerList.map(item=>({
+          label:item.planerUsername,
+          value:item.planerId
+        })):[]
       }
     },
+  },
   {
-    label: '状态',
+    label: '供应商代码',
-    field: 'status',
+    field: 'supplierCode',
-    dictType: DICT_TYPE.PURCHASE_ORDER_STATUS,
-    dictClass: 'string',
-    isTable: true,
-    isForm:false,
-    isSearch: true,
     sort: 'custom',
     table: {
-      width: 150
+      width: 150,
     },
-    form: {
+    isSearch: true,
-      value: '1',
+    search: {
       componentProps: {
-        disabled: true
+        dialogWidth:'700px',//搜索出来弹窗的宽度
+        multiple: true,
+        enterSearch:true,
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+        searchField: 'supplierCode', // 查询弹窗赋值字段
+        searchTitle: '供应商信息', // 查询弹窗标题
+        searchAllSchemas: Supplier1.allSchemas, // 查询弹窗所需类
+        searchPage: DemandforecastingMainApi.querySupplierList, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'planers',
+          value: 'planerId',
+          message: '请选择计划员！',
+          isMainValue: true,
+          isCSV:true,//是否用逗号分隔参数
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
       }
     }
   },
   {
-    label: '备注',
+    label: '订单号',
-    field: 'remark',
+    field: 'poNumber',
     sort: 'custom',
     table: {
       width: 150
     },
-    isTable: false,
   },
   {
-    label: '创建时间',
+    label: '订单行',
-    field: 'createTime',
+    field: 'poLine',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
     sort: 'custom',
     table: {
-      width: 180
+      width: 150
-    },
-    isTable:false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: { width: '100%' },
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
     }
   },
-    isForm: false,
-  },
   {
-    label: '创建者',
+    label: '物料代码',
-    field: 'creator',
+    field: 'itemCode',
     sort: 'custom',
     table: {
       width: 150
     },
-    isTable:false,
+    isSearch:true,
+    isTable:true,
     isForm: false,
+    search: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        multiple: true,
+        enterSearch: true,
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchField: 'itemCode', // 查询弹窗赋值字段
+        searchTitle: '物料基础信息', // 查询弹窗标题
+        searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
+        searchPage: SupplieritemApi.getSupplieritemPageSCP, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'supplierCodes',
+          value: 'supplierCode',
+          message: '请填写供应商代码！',
+          isMainValue: true,
+          isCSV:true,//是否用逗号分隔参数
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
   },
   {
-    label: '是否可用',
+    label: '版本号',
-    field: 'available',
+    field: 'version',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
-    form: {
+    isSearch:true,
-      component: 'Switch',
+    search: {
-      value: 'TRUE',
+      // labelMessage: '信息提示说明！！！',
       componentProps: {
-        inactiveValue: 'FALSE',
+        multiple: true,
-        activeValue: 'TRUE'
+        enterSearch: true,
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择版本号', // 输入框占位文本
+        searchField: 'detailVersion', // 查询弹窗赋值字段
+        searchTitle: '版本号', // 查询弹窗标题
+        searchAllSchemas: Version.allSchemas, // 查询弹窗所需类
+        searchPage: DemandforecastingDetailApi.queryVersion, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'supplierCodes',
+          value: 'supplierCode',
+          message: '请填写供应商代码！',
+          isMainValue: true,
+          isCSV:true,//是否用逗号分隔参数
+        },{
+          key: 'itemCodes',
+          value: 'itemCode',
+          message: '请填写物料代码！',
+          isMainValue: true,
+          isCSV:true,//是否用逗号分隔参数
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
     }
-    },
   },
   {
-    label: '操作',
+    label: '到货日期',
-    field: 'action',
+    field: 'dueDate',
-    isDetail: false,
+    formatter: dateFormatter,
-    isForm: false,
+    sort: 'custom',
     table: {
-      width: 300,
+      width: 150
-      fixed: 'right'
+    },
+    isSearch:true,
+    isTable:false,
+    isForm: false,
+    search: {
+      component: 'DatePicker',
+      value: [dayjs(),  dayjs().subtract(-3,'month')],
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD',
+        type: 'daterange',
+        defaultTime: [new Date('1 '), new Date('1 ')]
+      }
     },
   }
 ]))
@@ -275,7 +316,7 @@ export const DemandforecastingDetail = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.PREDICT_TIME_TYPE,
     sort: 'custom',
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     table: {
       width: 150
     },
@@ -294,6 +335,7 @@ export const DemandforecastingDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -309,117 +351,7 @@ export const DemandforecastingDetail = useCrudSchemas(reactive<CrudSchema[]>([
       valueFormat: 'x',
     }
   },
-  {
+  
-    label: '订单号',
-    field: 'poNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择订单号',
-      searchField: 'number',
-      searchTitle: '采购订单信息',
-      searchAllSchemas: PurchaseMain.allSchemas,
-      searchPage: PurchaseMainApi.getPurchaseMainPage,
-      searchCondition: [{
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
-      }, {
-        key: 'supplierCode',
-        value: 'supplierCode',
-        message: '请填写供应商代码！',
-        isMainValue: true
-      }
-        , {
-        key: 'status',
-        value: 2,
-        isMainValue: false
-      }
-      ]
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true,
-        searchListPlaceholder: '请选择订单号',
-        searchField: 'number',
-        searchTitle: '采购订单信息',
-        searchAllSchemas: PurchaseMain.allSchemas,
-        searchPage: PurchaseMainApi.getPurchaseMainPage,
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
-      }
-    }
-  },
-  {
-    label: '订单行',
-    field: 'poLine',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true,
-        searchListPlaceholder: '请选择订单行',
-        searchField: 'lineNumber',
-        searchTitle: '采购订单信息',
-        searchAllSchemas: PurchaseDetail.allSchemas,
-        searchPage: PurchaseDetailApi.getPurchaseDetailPage,
-        searchCondition: [{
-          key: 'number',
-          value: 'poNumber',
-          message: '请填写订单号！',
-          isMainValue: true
-        }, {
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
-      }
-    },
-    tableForm: {
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择订单行',
-      searchField: 'lineNumber',
-      searchTitle: '采购订单信息',
-      searchAllSchemas: PurchaseDetail.allSchemas,
-      searchPage: PurchaseDetailApi.getPurchaseDetailPage,
-      searchCondition: [{
-        key: 'number',
-        value: 'poNumber',
-        message: '请填写订单号！',
-        isMainValue: true
-      }, {
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
-      }]
-    }
-  },
-  {
-    label: '物料代码',
-    field: 'itemCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    },
-    tableForm: {
-      disabled: true
-    }
-  },
   {
     label: '计量单位',
     field: 'uom',

src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="[...DemandforecastingMain.allSchemas.searchSchema,...DemandforecastingDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
+    <Search ref="seachRef" :showSearchTableQueryFields="['supplierCode','itemCode','version']" :hiddenFilterBtnFields="['supplierCode','itemCode','version']" :schema="DemandforecastingMain.allSchemas.searchSchema" @search="searchClick" @reset="searchClick" @searchTableSuccess="searchQueryTableSuccess" @onChange="onSearchChange"/>
   </ContentWrap>
 
   <!-- 列表头部 -->
@@ -12,7 +12,6 @@
     @updataTableColumns="updataTableColumns"
     @searchFormClick="searchFormClick"
     :allSchemas="DemandforecastingMain.allSchemas"
-      :detailAllSchemas="DemandforecastingDetail.allSchemas"
   />
 
   <!-- 列表 -->
@@ -28,58 +27,13 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #number="{row}">
+    <template v-for="name in tableObjectHead.tableList" :key="name" #[name]="{row}">
-        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+      <span :class="{'success-text':row['planType_F'].indexOf(name)>-1}">{{ row[name] }}</span>
-          <span>{{ row.number }}</span>
-        </el-button>
-      </template>
-      <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
     </template>
     </Table>
   </ContentWrap>
 
-  <!-- 表单弹窗：添加/修改 -->
-  <BasicForm
-    ref="formRef"
-    @success="getList"
-    :rules="DemandforecastingMainRules"
-    :formAllSchemas="DemandforecastingMain.allSchemas"
-    :tableAllSchemas="DemandforecastingDetail.allSchemas"
-    :tableFormRules="DemandforecastingDetailRules"
-    :tableData="tableData"
-    :apiUpdate="DemandforecastingMainApi.updateDemandforecastingMain"
-    :apiCreate="DemandforecastingMainApi.createDemandforecastingMain"
-    :isBusiness="true"
-    @handleAddTable="handleAddTable"
-    @handleDeleteTable="handleDeleteTable"
-    :isShowReduceButtonSelection="true"
-    @tableSelectionDelete="tableSelectionDelete"
-    @searchTableSuccess="searchTableSuccess"
-    @submitForm="submitForm"
-  />
-
-  <!-- 详情 -->
-  <Detail
-    ref="detailRef"
-    :isBasic="false"
-    :allSchemas="DemandforecastingMain.allSchemas"
-    :detailAllSchemas="DemandforecastingDetail.allSchemas"
-    :detailAllSchemasRules="DemandforecastingDetailRules"
-    :apiCreate="DemandforecastingDetailApi.createDemandforecastingDetail"
-    :apiUpdate="DemandforecastingDetailApi.updateDemandforecastingDetail"
-    :apiPage="DemandforecastingDetailApi.getDemandforecastingDetailPage"
-    :apiDelete="DemandforecastingDetailApi.deleteDemandforecastingDetail"
-    :Echo="Echo"
-    :detailButtonIsShowAdd="false"
-    :detailButtonIsShowEdit="false"
-    :detailButtonIsShowDelete="false"
-    @searchTableSuccessDetail="searchTableSuccessDetail"
-  />
 
-  <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/wms/demandforecasting-main/import" :importTemplateData="importTemplateData" 
-  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
 </template>
 
 <script setup lang="ts">
@@ -98,45 +52,68 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref([...DemandforecastingMain.allSchemas.tableColumns,...DemandforecastingDetail.allSchemas.tableMainColumns])
+const orginTableColumns = ref(DemandforecastingMain.allSchemas.tableColumns)
-
+const tableColumns = ref(DemandforecastingMain.allSchemas.tableColumns)
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
-  tableColumns.value = val
+  orginTableColumns.value = val
 }
 
+
+
 // 查询页面返回
-const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+const searchQueryTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  console.log('searchQueryTableSuccess',formField, searchField, val, formRef, type, row )
   nextTick(() => {
-    if (type == 'tableForm') {
-      // 明细查询页赋值
-      row[formField] = val[0][searchField]
-      if (formField == 'poLine') {
-        row['itemCode'] = val[0]['itemCode']
-        row['uom'] = val[0]['uom']
-        row['available'] = val[0]['available']
-      }
-    } else {
     const setV = {}
-      setV[formField] = val[0][searchField]
+    if(formField == 'supplierCode'||formField == 'itemCode'||formField == 'version'){
-      formRef.setValues(setV)
+      //供应商代码 物料代码 版本号
-    }
+      let list = []
+      val.forEach(item=>{
+        list.push(item[searchField])
       })
-}
+      setV[formField] = list.join(' ')
-// 查询页面返回——详情
+      formRef.setValues(setV)
-const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+    }else{
-  nextTick(() => {
-    const setV = {}
       setV[formField] = val[0][searchField]
-    setV['itemCode'] = val[0]['code']
       formRef.setValues(setV)
+    }
   })
 }
 
-// 子表新增的时候选择表格之后需要会显得字段
-// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
-const Echo =  []
 
+const { tableObject:tableObjectHead, tableMethods:tableMethodsHead } = useTable({
+  getListApi: DemandforecastingDetailApi.getPageTableHead // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList:getListHead, setSearchParams:setSearchParamsHead } = tableMethodsHead
+
+watch(()=>tableObjectHead.tableList,()=>{
+  updateDateTableColumns()
+},{deep:true})
+const updateDateTableColumns = ()=>{
+  console.log('tableObjectHead',tableObjectHead)
+  let dateColumns = []
+  if(tableObjectHead.tableList.length>10){
+    tableObjectHead.tableList.forEach(item=>{
+    dateColumns.push({
+        width:120,
+        field: item,
+        label: item
+      })
+    })
+  }else{
+    tableObjectHead.tableList.forEach(item=>{
+    dateColumns.push({
+        field: item,
+        label: item
+      })
+    })
+  }
+  tableColumns.value  = [...orginTableColumns.value,...dateColumns]
+  console.log('tableColumns',tableColumns.value)
+}
 const { tableObject, tableMethods } = useTable({
   getListApi: DemandforecastingDetailApi.getDemandforecastingDetailPage // 分页接口
 })
@@ -146,29 +123,15 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:demandforecasting-main:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:demandforecasting-main:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:demandforecasting-main:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
-  defaultButtons.defaultFilterBtn(null), // 筛选
+  // defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
-  // {
-  //   label: '自定义扩展按钮',
-  //   name: 'zdy',
-  //   hide: false,
-  //   type: 'primary',
-  //   icon: 'Select',
-  //   color: ''
-  // },
 ]
 
 // 头部按钮事件
-const buttonBaseClick = (val, item) => {
+const buttonBaseClick = async (val, item) => {
-  if (val == 'add') { // 新增
+  if (val == 'export') { // 导出
-    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 ) {
@@ -176,7 +139,10 @@ const buttonBaseClick = (val, item) => {
         filters: tableObject.params.filters
       })
     } else {
+      await getListHead()
+      // updateDateTableColumns()
       getList()
+
     }
   } else if (val == 'filtrate') { // 筛选
   } else { // 其他按钮
@@ -184,148 +150,30 @@ const buttonBaseClick = (val, item) => {
   }
 }
 
-// 根据状态返回该按钮是否显示
-const isShowMainButton = (row,val) => {
-  if (val.indexOf(row.status) > -1) {
-    return false
-  } else {
-    return true
-  }
-}
-
-// 列表-操作按钮
-const butttondata = (row,$index) => {
-  const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
-  if(findIndex>-1&&findIndex<$index){
-    return []
-  }
-    return [
-       defaultButtons.mainListOrderCloBtn({ hide: isShowMainButton(row, ['1']) }), // 关闭
-       defaultButtons.mainListOrderOpeBtn({ hide: isShowMainButton(row, ['3']) }), // 打开
-       defaultButtons.mainListOrderPubBtn({ hide: isShowMainButton(row, ['1']) }), // 发布
-       defaultButtons.mainListOrderWitBtn({ hide: isShowMainButton(row, ['2']) }), // 下架
-       defaultButtons.mainListEditBtn({ hasPermi: 'wms:demandforecasting-main:update', hide: isShowMainButton(row, ['1']) }), // 编辑
-    ]
-}
-
-
-
-// 列表-操作按钮事件
-const buttonTableClick = async (val, row) => {
-  if (val == 'mainOrderClo') { // 关闭
-      handleClose(row.masterId)
-  } else if (val == 'mainOrderOpe') { // 打开
-      handleOpen(row.masterId)
-  } else if (val == 'mainOrderPub') { // 发布
-      handlePublish(row.masterId)
-  } else if (val == 'mainOrderWit') { // 下架
-      handleWit(row.masterId)
-  } else if (val == 'edit') { // 编辑
-    openForm('update', row)
-  } else if (val == 'delete') { // 删除
-    handleDelete(row.masterId)
-  }
-}
-
-/** 添加/修改操作 */
-const formRef = ref()
-const openForm =async (type: string, row?: number) => {
-  tableData.value = [] // 重置明细数据
-  formRef.value.open(type, row)
-}
-
-
-/** 关闭按钮操作 */
-const handleClose = async (id : number) => {
-    try {
-      // 关闭的二次确认
-      await message.confirm(t('ts.是否关闭所选中数据？'))
-      tableObject.loading = true
-      // 发起关闭
-      await DemandforecastingMainApi.closePurchaseMain(id)
-      message.success(t('ts.关闭成功!'))
-      tableObject.loading = false
-      // 刷新列表
-      await getList()
-    } catch { }finally{
-      tableObject.loading = false
-    }
-  }
-
-  /** 打开按钮操作 */
-  const handleOpen = async (id : number) => {
-    try {
-      // 打开的二次确认
-      await message.confirm(t('ts.是否打开所选中数据？'))
-      tableObject.loading = true
-      // 发起打开
-      await DemandforecastingMainApi.openPurchaseMain(id)
-      message.success(t('ts.打开成功!'))
-      tableObject.loading = false
-      // 刷新列表
-      await getList()
-    } catch { }finally{
-      tableObject.loading = false
-    }
-  }
-
-  /** 发布按钮操作 */
-  const handlePublish = async (id : number) => {
-    try {
-      // 发布的二次确认
-      await message.confirm(t('ts.是否发布所选中数据？'))
-      tableObject.loading = true
-      // 发起发布
-      await DemandforecastingMainApi.publishPurchaseMain(id)
-      message.success(t('ts.发布成功!'))
-      tableObject.loading = false
-      // 刷新列表
-      await getList()
-    } catch { }finally{
-      tableObject.loading = false
-    }
-  }
 
-  /** 下架按钮操作 */
+const seachRef = ref()
-  const handleWit = async (id : number) => {
+const onSearchChange = (field, value)=>{
-    try {
+  if(field=='planerId'){
-      // 下架的二次确认
+    if(value.length>0){
-      await message.confirm(t('ts.是否下架所选中数据？'))
+      if(value[value.length-1]=='ALL'){
-      tableObject.loading = true
+        //全选
-      // 发起下架
+        seachRef.value.setFormValues({
-      await DemandforecastingMainApi.witPurchaseMain(id)
+          planerId:['ALL']
-      message.success(t('ts.下架成功!'))
+        })
-      tableObject.loading = false
+      }else{
-      // 刷新列表
+        seachRef.value.setFormValues({
-      await getList()
+          planerId:value.filter(item=>item!='ALL')
-    } catch { }finally{
+        })
-      tableObject.loading = false
       }
     }
-
-/** 详情操作 */
-const detailRef = ref()
-const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue,'planDemandforecastingMain')
   }
-
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    tableObject.loading = true
-    // 发起删除
-    await DemandforecastingMainApi.deleteDemandforecastingMain(id)
-    message.success(t('common.delSuccess'))
-    tableObject.loading = false
-    // 刷新列表
-    await getList()
-  } catch {}finally{
-    tableObject.loading = false
 }
+const searchClick = async (data)=>{
+  console.log('searchClick',data)
+  await setSearchParamsHead(data)
+  // updateDateTableColumns()
+  setSearchParams(data)
 }
-
 /** 导出按钮操作 */
 const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
@@ -342,60 +190,6 @@ const handleExport = async () => {
   }
 }
 
-/**
-  * tableForm方法
-*/
-const tableFormKeys = {}
-DemandforecastingDetail.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) => {
-  let itemIndex = tableData.value.indexOf(item)
-  if(itemIndex>-1){
-    tableData.value.splice(itemIndex, 1)
-  }
-}
-const tableSelectionDelete = (selection) => {
-  tableData.value = tableData.value.filter(item => !selection.includes(item))
-}
-
-// 主子数据 提交
-const submitForm = async (formType, submitData) => {
-  let data = {...submitData}
-  if(data.masterId){
-    data.id = data.masterId
-  }
-  data.subList = tableData.value // 拼接子表数据参数
-  try {
-    if (formType === 'create') {
-      await DemandforecastingMainApi.createDemandforecastingMain(data)
-      message.success(t('common.createSuccess'))
-    } else {
-      data.id = data.masterId
-      await DemandforecastingMainApi.updateDemandforecastingMain(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({
@@ -403,11 +197,6 @@ const importTemplateData = reactive({
   templateTitle: `${t('ts.要货预测主导入模版')}.xlsx`
 })
 
-// 导入成功之后
-const importSuccess = () => {
-  getList()
-}
-
 // 筛选提交
 const searchFormClick = (searchData) => {
   tableObject.params = {
@@ -419,7 +208,20 @@ const searchFormClick = (searchData) => {
 
 /** 初始化 **/
 onMounted(async () => {
+  try {
+    await getListHead()
+  } catch (error) {
+    
+  }
+  // updateDateTableColumns()
   getList()
   importTemplateData.templateUrl = await DemandforecastingMainApi.importTemplate()
 })
 </script>
+<style lang="scss" scoped>
+
+.success-text{
+  color:var(--el-color-success);
+  font-weight:700;
+}
+</style>

src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts

@@ -0,0 +1,399 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import * as SupplierApi from '@/api/wms/supplier'
+import { Supplier} from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
+import * as SupplieritemApi from '@/api/wms/supplieritem'
+import { Supplieritem } from '@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data'
+import * as ItembasicApi from '@/api/wms/itembasic'
+import {Itembasic} from "@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data";
+import * as PurchaseMainApi from '@/api/wms/purchaseMain'
+import * as PurchaseDetailApi from '@/api/wms/purchaseDetail'
+import { PurchaseDetail, PurchaseMain } from '../purchaseMain/purchaseMain.data'
+import * as DemandforecastingMainApi from '@/api/wms/demandforecastingMain'
+import * as DemandforecastingDetailApi from '@/api/wms/demandforecastingDetail'
+import dayjs from 'dayjs'
+
+const { t } = useI18n() // 国际化
+
+/**
+ * @returns {Array} 要货预测主表
+ */
+Supplieritem.allSchemas.searchSchema = Supplieritem.allSchemas.searchSchema.filter(item=>item.field!="allowOverShipment")
+export const Version = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '供应商代码',
+    field: 'supplerCodes',
+    sort: 'custom',
+    isSearch:true,
+  },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    isSearch:true,
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    isSearch:true,
+    sort: 'custom',
+  },
+  {
+    label: '子表版本',
+    field: 'detailVersion',
+    sort: 'custom',
+  }
+]))
+export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '是否已读',
+    field: 'isRead',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch:true,
+    isTable:true,
+    isForm: false,
+    search: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        multiple: true,
+        enterSearch: true,
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchField: 'itemCode', // 查询弹窗赋值字段
+        searchTitle: '物料基础信息', // 查询弹窗标题
+        searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
+        searchPage: SupplieritemApi.getSupplieritemPageSCP, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'supplierCodes',
+          value: 'supplierCode',
+          message: '请填写供应商代码！',
+          isMainValue: true,
+          isCSV:true,//是否用逗号分隔参数
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '版本号',
+    field: 'version',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch:true,
+    search: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        multiple: true,
+        enterSearch: true,
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择版本号', // 输入框占位文本
+        searchField: 'detailVersion', // 查询弹窗赋值字段
+        searchTitle: '版本号', // 查询弹窗标题
+        searchAllSchemas: Version.allSchemas, // 查询弹窗所需类
+        searchPage: DemandforecastingDetailApi.queryVersion, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'supplierCodes',
+          value: 'supplierCode',
+          message: '请填写供应商代码！',
+          isMainValue: true,
+          isCSV:true,//是否用逗号分隔参数
+        },{
+          key: 'itemCodes',
+          value: 'itemCode',
+          message: '请填写物料代码！',
+          isMainValue: true,
+          isCSV:true,//是否用逗号分隔参数
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '到货日期',
+    field: 'dueDate',
+    formatter: dateFormatter,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch:true,
+    isTable:false,
+    isForm: false,
+    search: {
+      value: [dayjs(),  dayjs().subtract(-3,'month')],
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD',
+        type: 'daterange',
+        defaultTime: [new Date('1 '), new Date('1 ')]
+      }
+    },
+  }
+]))
+
+//表单校验
+export const DemandforecastingMainRules = reactive({
+  available: [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+  supplierCode: [
+    { required: true, message: '请选择供应商代码', trigger: 'change' }
+  ],
+  version:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 要货预测子表
+ */
+export const DemandforecastingDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    hiddenInMain:true,
+    form: {
+      componentProps: {
+        disbaled: true
+      }
+    }
+  },
+  {
+    label: '预测时间类型',
+    field: 'predictTimeType',
+    dictType: DICT_TYPE.PREDICT_TIME_TYPE,
+    sort: 'custom',
+    dictClass: 'string',
+    isTable: false,
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select'
+    }
+  },
+  {
+    label: '预测日期',
+    field: 'predictTime',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTable:false,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm: {
+      type: 'FormDate',
+      dateFormat: 'YYYY-MM-DD',
+      valueFormat: 'x',
+    }
+  },
+  
+  {
+    label: '计量单位',
+    field: 'uom',
+    sort: 'custom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    }
+  },
+  {
+    label: '计划数量',
+    field: 'planQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width: '100%' },
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width: '100%' },
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '操作',
+    hiddenInMain:true,
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm: false,
+  }
+]))
+
+//表单校验
+export const DemandforecastingDetailRules = reactive({
+  predictTimeType: [
+    { required: true, message: '请选择预测时间类型', trigger: 'change' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  predictTime: [
+    { required: true, message: '请输入预测时间', trigger: 'change' }
+  ],
+  planQty: [
+    { required: true, message: '请输入计划数量', trigger: 'blur' }
+  ],
+  uom: [
+    { required: true, message: '请选择计量单位', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  poLine: [{required:true, message: '请选择订单行', trigger: 'blur'}]
+})

src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue

@@ -0,0 +1,285 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :showSearchTableQueryFields="['supplierCode','itemCode','version']" :hiddenFilterBtnFields="['supplierCode','itemCode','version']" :schema="DemandforecastingMain.allSchemas.searchSchema" @search="searchClick" @reset="searchClick" @searchTableSuccess="searchQueryTableSuccess"/>
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="DemandforecastingMain.allSchemas"
+  />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table ref="tableRef" v-clientTable
+      :selection="true"
+      :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"
+      @getSelectionRows="getSelectionRows"
+    >
+    <template #isRead="{row}" >
+      <el-button v-show="row.isRead!=2" :type="row.isRead==1?'info':'primary'" link  @click="readHandle(row,false)">
+          <span>{{ row.isRead==1?'已读':'未读' }}</span>
+      </el-button>
+    </template>
+    <template v-for="name in tableObjectHead.tableList" :key="name" #[name]="{row}">
+      <span :class="{'success-text':row['planType_F'].indexOf(name)>-1}">{{ row[name] }}</span>
+    </template>
+    </Table>
+  </ContentWrap>
+
+
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { DemandforecastingMain,DemandforecastingMainRules,DemandforecastingDetail,DemandforecastingDetailRules } from './demandforecastingMain.data'
+import * as DemandforecastingMainApi from '@/api/wms/demandforecastingMain'
+import * as DemandforecastingDetailApi from '@/api/wms/demandforecastingDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+
+// 要货预测
+defineOptions({ name: 'DemandforecastingMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const orginTableColumns = ref(DemandforecastingMain.allSchemas.tableColumns)
+const tableColumns = ref(DemandforecastingMain.allSchemas.tableColumns)
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  orginTableColumns.value = val
+}
+
+
+
+// 查询页面返回
+const searchQueryTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  console.log('searchQueryTableSuccess',formField, searchField, val, formRef, type, row )
+  nextTick(() => {
+    const setV = {}
+    if(formField == 'supplierCode'||formField == 'itemCode'||formField == 'version'){
+      //供应商代码 物料代码 版本号
+      let list = []
+      val.forEach(item=>{
+        list.push(item[searchField])
+      })
+      setV[formField] = list.join(' ')
+      formRef.setValues(setV)
+    }else{
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    }
+  })
+}
+
+
+const { tableObject:tableObjectHead, tableMethods:tableMethodsHead } = useTable({
+  getListApi: DemandforecastingDetailApi.getPageTableHead // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList:getListHead, setSearchParams:setSearchParamsHead } = tableMethodsHead
+
+watch(()=>tableObjectHead.tableList,()=>{
+  updateDateTableColumns()
+},{deep:true})
+const updateDateTableColumns = ()=>{
+  console.log('tableObjectHead',tableObjectHead)
+  let dateColumns = []
+  if(tableObjectHead.tableList.length>10){
+    tableObjectHead.tableList.forEach(item=>{
+    dateColumns.push({
+        width:120,
+        field: item,
+        label: item
+      })
+    })
+  }else{
+    tableObjectHead.tableList.forEach(item=>{
+    dateColumns.push({
+        field: item,
+        label: item
+      })
+    })
+  }
+  
+  tableColumns.value  = [...orginTableColumns.value,...dateColumns]
+  console.log('tableColumns',tableColumns.value)
+}
+const { tableObject, tableMethods } = useTable({
+  getListApi: DemandforecastingDetailApi.getDemandforecastingDetailPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:demandforecasting-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  // defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  {
+      label: t('ts.全部已读'),
+      name: 'read',
+      hide: false,
+      type: 'primary',
+      // icon: 'ep:operation',
+      color: '',
+      float:'left',
+      link: false, // 文本展现按钮
+      hasPermi: ''
+  }
+]
+
+// 头部按钮事件
+const buttonBaseClick = async (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      await getListHead()
+      // updateDateTableColumns()
+      getList()
+
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else if (val == 'read') { // 全部已读
+    readHandle(null,true)
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+
+
+const searchClick = async (data)=>{
+  console.log('searchClick',data)
+  await setSearchParamsHead(data)
+  // updateDateTableColumns()
+  setSearchParams(data)
+}
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await DemandforecastingMainApi.exportDemandforecastingMain(tableObject.params)
+    download.excel(data, `${t('ts.要货预测主')}.xlsx`)
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: `${t('ts.要货预测主导入模版')}.xlsx`
+})
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+const selectionRows = ref<any>([])
+const tableRef = ref()
+const getSelectionRows = (currentPage,currentPageSelectionRows) => {
+  console.log("getSelectionRows",currentPage,currentPageSelectionRows)
+  const currentRows = selectionRows.value.find(item=>item.currentPage==currentPage)
+  if(currentRows){
+    currentRows.selectionRows = currentPageSelectionRows
+  }else{
+    selectionRows.value.push({
+      currentPage,
+      selectionRows:currentPageSelectionRows
+    })
+  }
+}
+
+const readHandle = (row,isAll)=>{
+  let rows:any = []
+  if(isAll){
+    //全部已读
+    if(selectionRows.value==0){
+      return
+    }
+    selectionRows.value.forEach(item=>{
+      let itemSelectionRows = item.selectionRows.filter(item1=>item1.isRead==0)
+      console.log('itemSelectionRows',itemSelectionRows)
+      rows = [...rows,...itemSelectionRows.map(item1=>item1.mainId)]
+    })
+    console.log('selectionRows',selectionRows)
+    console.log('全部已读',rows.join(','))
+  }else{
+    //单行
+    if(row.isRead==1){
+      return
+    }
+    rows = [row.mainId]
+    console.log('已读',rows.join(','))
+  }
+  
+  let getLoading = ElLoading.service({
+    lock: true,
+    text: 'loading...',
+    background: 'rgba(0, 0, 0, 0.7)'
+  })
+  DemandforecastingMainApi.updateIsRead({isReadMainIds:rows.join(',')}).then(res => {
+    console.log('res',res);
+    getLoading?.close()
+    getList()
+    if(isAll){
+      selectionRows.value = []
+    }
+  }).catch(err => {
+    console.log(err)
+    getLoading?.close()
+  })
+  
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  await getListHead()
+  // updateDateTableColumns()
+  getList()
+  importTemplateData.templateUrl = await DemandforecastingMainApi.importTemplate()
+})
+</script>
+<style lang="scss" scoped>
+
+.success-text{
+  color:var(--el-color-success);
+  font-weight:700;
+}
+</style>

src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="[...PurchasePlanMain.allSchemas.searchSchema,...PurchasePlanDetail.allSchemas.searchSchema]" @search="searchList" @reset="searchList" />
+    <Search ref="seachRef" :schema="[...PurchasePlanMain.allSchemas.searchSchema,...PurchasePlanDetail.allSchemas.searchSchema]" @search="searchList" @reset="searchList" @searchTableSuccess="searchQueryTableSuccess" @onChange="onSearchChange"/>
   </ContentWrap>
 
   <!-- 列表头部 -->
@@ -22,9 +22,9 @@
       v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
       @getSelectionRows="getSelectionRows">
-      <template #number="{row}">
+      <template #supplierCode="{row}">
-        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+        <el-button type="primary" link @click="openDetail(row, '供应商代码', row.supplierCode)">
-          <span>{{ row.number }}</span>
+          <span>{{ row.supplierCode }}</span>
         </el-button>
       </template>
       <template #action="{ row,$index }">
@@ -45,13 +45,16 @@
     :apiUpdate="PurchasePlanMainApi.updatePurchasePlanMain" 
     :apiCreate="PurchasePlanMainApi.createPurchasePlanMain"
     :isBusiness="true" 
+    :isShowReduceButtonSelection="false" 
+    :isShowReduceButton="false" 
+    :isShowButton="false"
     @handleAddTable="handleAddTable" 
     @handleDeleteTable="handleDeleteTable"
-    :isShowReduceButtonSelection="true"
     @tableSelectionDelete="tableSelectionDelete"
     @searchTableSuccess="searchTableSuccess" 
     @submitForm="submitForm" 
-    @onEnter="onEnter"/>
+    @onEnter="onEnter"
+    @onBlur="onEnter"/>
 
   <!-- 详情 -->
   <!-- 隐藏子表编辑和删除是因为要货计划以后是接口发过来的，而且我们的计划数量是放入到采购订单已计划数量里，无法再次编辑数量-->
@@ -67,8 +70,13 @@
     :apiDelete="PurchasePlanDetailApi.deletePurchasePlanDetail"
     @searchTableSuccessDetail="searchTableSuccessDetail"
     :detailValidate="detailValidate" 
-    :detailButtonIsShowDelete="false"
+    :detailButtonIsShowAddStatusArray="['1','3','4','5','6']"
-    :detailButtonIsShowEdit="false"
+    :detailButtonIsShowEdit="true"
+    :detailButtonIsShowDelete="true"
+    :detailButtonIsShowAdd="true"
+    :isOpenSearchTable="true"
+    fieldTableColumn="poLine"
+
   />
 
   <!-- 导入 -->
@@ -91,6 +99,7 @@
   import supplierdeliverBasicForm from '../supplierdeliverRequestMain/supplierdeliverBasicForm.vue'
   import * as PurchaseMainApi from '@/api/wms/purchaseMain'
   import { PurchaseMain } from '../purchaseMain/purchaseMain.data'
+  import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
   // 要货计划
   defineOptions({ name: 'PurchasePlanMain' })
 
@@ -106,6 +115,31 @@
   const updataTableColumns = (val) => {
     tableColumns.value = val
   }
+  const seachRef = ref()
+  const onSearchChange = (field, value)=>{
+    if(field=='status'){
+      if(value.length>0){
+        if(value[value.length-1]==''){
+          //全选
+          seachRef.value.setFormValues({
+            status:['']
+          })
+        }else{
+          seachRef.value.setFormValues({
+            status:value.filter(item=>item!='')
+          })
+        }
+      }
+    }
+  }
+  const searchQueryTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+    console.log('searchQueryTableSuccess',formField, searchField, val, formRef, type, row )
+    nextTick(() => {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    })
+  }
 
   // 查询页面返回
   const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
@@ -149,14 +183,18 @@
         if(formField == 'supplierCode'){
           setV['supplierCode'] = val[0]['code']
           await PurchasePlanMainApi.queryPurchasePlan(val[0]['code']).then(res => {
-            let beginTime = res.beginTime
+            
-            var ms = beginTime.substring(0, 2)
+            // let beginTime = res.beginTime
-		        var me = beginTime.substring(3)
+            // var ms = beginTime.substring(0, 2)
-            setV['beginTime'] = new Date(2024, 1, 1, Number(ms), Number(me))
+		        // var me = beginTime.substring(3)
-            let endTime = res.endTime
+            // setV['beginTime'] = new Date(2024, 1, 1, Number(ms), Number(me))
-            var ms = endTime.substring(0, 2)
+            // let endTime = res.endTime
-		        var me = endTime.substring(3)
+            // var ms = endTime.substring(0, 2)
-            setV['endTime'] = new Date(2024, 1, 1, Number(ms), Number(me))
+		        // var me = endTime.substring(3)
+            // setV['endTime'] = new Date(2024, 1, 1, Number(ms), Number(me))
+            setV['timeWindow'] = res.timeWindow
+            setV['beginTime'] = res.beginTime
+            setV['endTime'] = res.endTime
             setV['contacts'] = res.contacts
             setV['phone'] = res.phone
           })
@@ -169,6 +207,10 @@
           setV['planQty'] = val[0]['orderQty']-val[0]['plannedQty']
           setV['available'] = val[0]['available']
         }
+        if(formField == 'poNumber') {
+          //订单类型
+          setV['type'] = val[0]['type']
+        }
         formRef.setValues(setV)
         console.log('formModel',formRef.formModel)
         if(formField == 'poNumber') {
@@ -182,7 +224,7 @@
 
 const getSearchTableData = async (number,formField,searchField)=>{
   const {tableObject ,tableMethods} = useTable({
-    defaultParams:{number},
+    defaultParams:{number,available:'TRUE'},
     getListApi: PurchaseDetailApi.getPurchaseDetailPagePoNumber // 分页接口
   })
   tableObject.pageSize = 500
@@ -250,7 +292,9 @@ const getSearchTableData = async (number,formField,searchField)=>{
   const HeadButttondata = [
     defaultButtons.defaultAddBtn({ hasPermi: 'wms:purchase-plan-main:create' }), // 新增
     defaultButtons.defaultImportBtn({ hasPermi: 'wms:purchase-plan-main:import' }), // 导入
-    defaultButtons.defaultExportBtn({ hasPermi: 'wms:purchase-plan-main:export' }), // 导出
+    // defaultButtons.defaultExportBtn({ hasPermi: 'wms:purchase-plan-main:export' }), // 导出
+    defaultButtons.defaultExportDetailsBtn({ hasPermi: 'wms:purchase-plan-main:export' }), // 导出明细
+    defaultButtons.defaultExportTableBtn({ hasPermi: 'wms:purchase-plan-main:export' }), // 导出二维表
     // defaultButtons.mainListSelectionOrderPubBtn(null), // 批量发布
     defaultButtons.defaultFreshBtn(null), // 刷新
     defaultButtons.defaultFilterBtn(null), // 筛选
@@ -274,6 +318,10 @@ const getSearchTableData = async (number,formField,searchField)=>{
       handleImport()
     } else if (val == 'export') { // 导出
       handleExport()
+    } else if (val == 'export-details') { // 导出明细
+      handleExportDetails()
+    } else if (val == 'export-table') { // 导出二维表
+      handleExportTable()
     } else if (val == 'refresh') { // 刷新
       if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
       searchFormClick({
@@ -306,14 +354,14 @@ const getSearchTableData = async (number,formField,searchField)=>{
     return []
   }
     return [
-      defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['2']) }), // 打开
+      // defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['2']) }), // 打开
-      defaultButtons.mainListPurchasePlanCloBtn({ hide: isShowMainButton(row, ['1']) }), // 关闭
+      defaultButtons.mainListPurchasePlanCloBtn({ hide: !(row.status!=6&&row.status!=2&&row.type=='SCHEDULE') }), // 关闭
       defaultButtons.mainListPurchasePlanPubBtn({ hide: isShowMainButton(row, ['1']) }), // 发布
       defaultButtons.mainListPurchasePlanAccBtn({ hide: isShowMainButton(row, ['3']) }), // 接受
       defaultButtons.mainListPurchasePlanRejBtn({ hide: isShowMainButton(row, ['3']) }), // 不接受
       defaultButtons.mainListPurchasePlanWitBtn({ hide: isShowMainButton(row, ['3']) }), // 下架
       defaultButtons.mainListPurchasePlanModBtn({ hide: isShowMainButton(row, ['5']) }), // 修改
-      // defaultButtons.mainListEditBtn({ hide: isShowMainButton(row, ['1']), hasPermi: 'wms:purchase-plan-main:update' }), // 编辑
+      defaultButtons.mainListEditBtn({ hide: !isShowMainButton(row, ['2']), hasPermi: 'wms:purchase-plan-main:update' }), // 编辑
       // defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchase-plan-main:delete'}), // 删除
       {
         label: t('ts.创建供应商发货申请'),
@@ -352,12 +400,14 @@ const getSearchTableData = async (number,formField,searchField)=>{
     } else if (val == 'supplierdeliver') { // 创建供应商发货申请
       supplierdeliverFormRef.value.openFormByCreate({
         number:row.number, //要货单号
+        poNumber:row.poNumber, //采购订单号
         supplierCode:row.supplierCode, //供应商代码 
         endTime:row.endTime, //结束时间
         deliveryDate:row.deliveryDate // 送达日期
       })
     }
   }
+
   /** 添加/修改操作 */
   const formRef = ref()
   const openForm = async (type : string, row ?: number) => {
@@ -365,7 +415,22 @@ const getSearchTableData = async (number,formField,searchField)=>{
     formRef.value.open(type, row)
     if('create'==type){
       nextTick(async () => {
-        formRef.value.formRef.setValues({deliveryDate:dayjs().format('YYYY-MM-DD')})
+        formRef.value.formRef.setValues({deliveryDate:dayjs().valueOf()})
+      })
+      PurchasePlanMain.allSchemas.formSchema.forEach((item) => {
+        // 供应商代码
+        if(item.field == 'supplierCode'){
+          item.componentProps.disabled = false
+          item.componentProps.isSearchList = true
+        }
+      })
+    }else{
+      PurchasePlanMain.allSchemas.formSchema.forEach((item) => {
+        // 供应商代码
+        if(item.field == 'supplierCode'){
+          item.componentProps.disabled = true
+          item.componentProps.isSearchList = false
+        }
       })
     }
   }
@@ -569,6 +634,33 @@ const handleSelectionPublish = async ()=>{
     }
   }
 
+  const handleExportDetails = async () => {
+    try {
+      // 导出的二次确认
+      await message.exportConfirm()
+      // 发起导出
+      exportLoading.value = true
+      const data = await PurchasePlanMainApi.exportDetailsPurchasePlanMain(tableObject.params)
+      download.excel(data, `${t('ts.要货计划明细')}.xlsx`)
+    } catch {
+    } finally {
+      exportLoading.value = false
+    }
+  }
+  
+  const handleExportTable = async () => {
+    try {
+      // 导出的二次确认
+      await message.exportConfirm()
+      // 发起导出
+      exportLoading.value = true
+      const data = await PurchasePlanMainApi.exportTablePurchasePlanMain(tableObject.params)
+      download.excel(data, `${t('ts.要货计划二维表')}.xlsx`)
+    } catch {
+    } finally {
+      exportLoading.value = false
+    }
+  }
   /**
     * tableForm方法
   */
@@ -624,29 +716,31 @@ const handleSelectionPublish = async ()=>{
     data.subList = []
     let flag = false
     for (let item of tableData.value) {
-      await PurchaseDetailApi.getPurchaseDetailPageCheckData({
+      if(item.planQty>0){
-        number: item.poNumber,
-        lineNumber: item.poLine,
-      }).then(res => {
-        console.log("【要货计划】-每条数据结果",item)
-        if(res.list[0].type == 'DISCRETE'){//只有离散单需要这个校验
-          if (item.planQty > res.list[0].orderQty - res.list[0].plannedQty) {
-            flag = true;
-            message.error(t('ts.要货计划数量不得大于订单数量-已计划数量'))
-            return
-          }else{
         data.subList.push(item) // 拼接子表数据参数
       }
-        }else{
+      // await PurchaseDetailApi.getPurchaseDetailPageCheckData({
-          data.subList.push(item) // 拼接子表数据参数
+      //   number: item.poNumber,
-        }
+      //   lineNumber: item.poLine,
-      })
+      // }).then(res => {
+      //   console.log("【要货计划】-每条数据结果",item)
+      //   if(res.list[0].type == 'DISCRETE'){//只有离散单需要这个校验
+      //     if (item.planQty > res.list[0].orderQty - res.list[0].plannedQty) {
+      //       flag = true;
+      //       message.error(t('ts.要货计划数量不得大于订单数量-已计划数量'))
+      //       return
+      //     }else{
+      //       data.subList.push(item) // 拼接子表数据参数
+      //     }
+      //   }else{
+      //     data.subList.push(item) // 拼接子表数据参数
+      //   }
+      // })
     }
     if(flag){
       formRef.value.formLoading = false
       return;
     }
-    if (data.subList.length == tableData.value.length) {
     try {
       if (formType === 'create') {
         if(data.subList.length == 0){
@@ -665,7 +759,6 @@ const handleSelectionPublish = async ()=>{
     } finally {
       formRef.value.formLoading = false
     }
-    }
     formRef.value.formLoading = false
   }
 

src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts

@@ -6,31 +6,25 @@ import * as PurchaseMainApi from '@/api/wms/purchaseMain'
 import * as PurchaseDetailApi from '@/api/wms/purchaseDetail'
 import { PurchaseDetail, PurchaseMain } from '../purchaseMain/purchaseMain.data'
 import {getPurchaseDetailPagePoNumber} from "@/api/wms/purchaseDetail";
+import * as ItembasicApi from '@/api/wms/itembasic'
+import {Itembasic} from "@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data";
 const { t } = useI18n() // 国际化
 
 /**
  * @returns {Array} 要货计划主表
  */
 export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    isForm: false,
-    table: {
-      width: 180,
-      fixed: 'left'
-    },
-    isSearch: true
-  },
   {
     label: '供应商代码',
     field: 'supplierCode',
     sort: 'custom',
     table: {
-      width: 150
+      width: 150,
+      fixed: 'left'
     },
     isSearch: true,
+    sortTableDefault:1,
+    sortSearchDefault:1,
     form: {
       labelMessage: '影响明细中物料代码，需在供应商物料中维护',
       componentProps: {
@@ -47,8 +41,59 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
           isMainValue: false
         }]
       }
+    },
+    search: {
+      componentProps: {
+        enterSearch: true,
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '供应商信息', // 查询弹窗标题
+        searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
+        searchPage: SupplierApi.getSupplierPageSCP, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
     }
   },
+  //仅是主列表页面的筛选搜索条件
+  {
+    label: '送达日期',
+    field: 'deliveryDate',
+    sort: 'custom',
+    isDetail:false,
+    isTable: false,
+    isForm:false,
+    isTableForm:false,
+    isSearch:true,
+    sortSearchDefault:3,
+    formatter: dateFormatter,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'datetimerange',
+        defaultTime: [new Date('1 '), new Date('1 ')]
+      }
+    },
+  },
+  
+  {
+    label: '要货计划单号',
+    field: 'number',
+    sort: 'custom',
+    isForm: false,
+    table: {
+      width: 180,
+    },
+    sortTableDefault:8,
+    sortSearchDefault:4,
+    isSearch: true
+  },
+  
   {
     label: '采购订单',
     field: 'poNumber',
@@ -64,10 +109,14 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
         isSearchList: true,
         searchListPlaceholder: '请选择采购订单',
         searchField: 'number',
-        searchTitle: '采购订单信息',
+        searchTitle: '采购订单信息3',
         searchAllSchemas: PurchaseMain.allSchemas,
         searchPage: PurchaseMainApi.getPurchaseMainPage,
         searchCondition: [{
+          key: 'type',
+          value: 'SCHEDULE',
+          isMainValue: false
+        },{
           key: 'available',
           value: 'TRUE',
           isMainValue: false
@@ -85,72 +134,71 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '收货人',
+    label: '送达日期',
-    field: 'contacts',
+    field: 'deliveryDate',
-    isTable:false,
     table: {
-      width: 150
+      width: 180
     },
+    formatter: dateFormatter,
+    sortTableDefault:2,
     form: {
+      component: 'DatePicker',
       componentProps: {
-        disabled: false
+        style: {width: '100%'},
-      }
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
       }
     },
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+  },
   {
-    label: '联系电话',
+    label: '采购订单类型',
-    field: 'phone',
+    field: 'type',
-    isTable:false,
+    sort: 'custom',
+    dictType: DICT_TYPE.PURCHASE_ORDER_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    isForm:true,
     table: {
       width: 150
     },
     form: {
+      // labelMessage: '信息提示说明！！！',
       componentProps: {
-        disabled: false
+        disabled: true
       }
     }
   },
-  //仅是主列表页面的筛选搜索条件
   {
-    label: '送达日期',
+    label: '收货人',
-    field: 'deliveryDate',
+    field: 'contacts',
-    sort: 'custom',
-    isDetail:false,
     isTable:false,
-    isForm:false,
+    table: {
-    isTableForm:false,
+      width: 150
-    isSearch:true,
+    },
-    formatter: dateFormatter,
+    form: {
-    search: {
-      component: 'DatePicker',
       componentProps: {
-        valueFormat: 'YYYY-MM-DD',
+        disabled: false
-        type: 'daterange',
+      }
-        defaultTime: [new Date('1 '), new Date('1 ')]
     }
-    },
   },
   {
-    label: '送达日期',
+    label: '联系电话',
-    field: 'deliveryDate',
+    field: 'phone',
+    isTable:false,
     table: {
       width: 150
     },
-    sortTableDefault:1000,
-    formatter: dateFormatter2,
     form: {
-      component: 'DatePicker',
       componentProps: {
-        style: {width: '100%'},
+        disabled: false
-        type: 'date',
+      }
-        dateFormat: 'YYYY-MM-DD',
-        valueFormat: 'x',
     }
   },
-    detail: {
+  
-      dateFormat: 'YYYY-MM-DD'
-    },
-  },
   {
     label: '时间窗口',
     field: 'timeWindow',
@@ -167,7 +215,9 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    sortTableDefault:1001,
+    isTable:false,
+    isForm:false,
+    isDetail:false,
     form:{
       component:"TimePicker",
       componentProps: {
@@ -182,7 +232,9 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    sortTableDefault:1002,
+    isTable:false,
+    isForm:false,
+    isDetail:false,
     form:{
       component:"TimePicker",
       componentProps: {
@@ -234,10 +286,18 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictClass: 'string',
     isTable: true,
     isForm:false,
-    isSearch: false,
+    isSearch: true,
     table: {
       width: 150
     },
+    sortTableDefault:13,
+    sortSearchDefault:6,
+    search:{
+      value:[],
+      componentProps: {
+        multiple:true
+      }
+    },
     form: {
       value: '1',
       componentProps: {
@@ -379,6 +439,8 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isTable: false,
+    isForm:false,
+    isDetail:false,
   },
   {
     label: '操作',
@@ -425,7 +487,7 @@ export const PurchasePlanMainRules = reactive({
  */
 export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '单据号',
+    label: '要货计划单号',
     field: 'number',
     sort: 'custom',
     isTableForm: false,
@@ -443,9 +505,40 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '采购订单号',
     field: 'poNumber',
     isSearch:true,
-    isTable:false,
+    isTable:true,
+    sortTableDefault:9,
+    sortSearchDefault:2,
     isForm:false,
-    isTableForm:false
+    isTableForm:false,
+    table: {
+      width: 150
+    },
+    search: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        dialogWidth:'1085px',//搜索出来弹窗的宽度
+        isSearchList: true,
+        searchListPlaceholder: '请选择采购订单',
+        searchField: 'number',
+        searchTitle: '采购订单信息5',
+        searchAllSchemas: PurchaseMain.allSchemas,
+        searchPage: PurchaseMainApi.getPurchaseMainPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'supplierCode',
+          value: 'supplierCode',
+          message: '请填写供应商代码！',
+          isMainValue: true
+        },{
+          key: 'status',
+          value: 2,
+          isMainValue: false
+        }]
+      }
+    }
   },
   {
     label: '订单号',
@@ -454,12 +547,14 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    hiddenInMain:true,
+    isTableForm:false,
     tableForm: {
       disabled: true,
       isInpuFocusShow: false,
       searchListPlaceholder: '请选择订单号',
       searchField: 'number',
-      searchTitle: '采购订单信息',
+      searchTitle: '采购订单信息4',
       searchAllSchemas: PurchaseMain.allSchemas,
       searchPage: PurchaseMainApi.getPurchaseMainPage,
       searchCondition: [{
@@ -481,10 +576,11 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
-        isSearchList: true,
+        disabled: true,
+        isSearchList: false,
         searchListPlaceholder: '请选择订单号',
         searchField: 'number',
-        searchTitle: '采购订单信息',
+        searchTitle: '采购订单信息6',
         searchAllSchemas: PurchaseMain.allSchemas,
         searchPage: PurchaseMainApi.getPurchaseMainPage,
         searchCondition: [{
@@ -504,6 +600,26 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '计划数量',
+    field: 'planQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'InputNumber',
+      precision: 6
+    },
+    sortTableDefault:4,
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    }
+  },
   {
     label: '订单行',
     field: 'poLine',
@@ -511,13 +627,15 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:10,
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
-        isSearchList: true,
+        disabled: true,
+        isSearchList: false,
         searchListPlaceholder: '请选择订单行',
         searchField: 'lineNumber',
-        searchTitle: '采购订单信息',
+        searchTitle: '采购订单信息2',
         searchAllSchemas: PurchaseDetail.allSchemas,
         searchPage: PurchaseDetailApi.getPurchaseDetailPagePoNumber,
         searchCondition: [{
@@ -538,7 +656,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
       isInpuFocusShow: false,
       searchListPlaceholder: '请选择订单行',
       searchField: 'lineNumber',
-      searchTitle: '采购订单信息',
+      searchTitle: '采购订单信息1',
       searchAllSchemas: PurchaseDetail.allSchemas,
       searchPage: PurchaseDetailApi.getPurchaseDetailPagePoNumber,
       searchCondition: [{
@@ -560,6 +678,8 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:3,
+    sortSearchDefault:5,
     isSearch:true,
     form: {
       componentProps: {
@@ -568,6 +688,29 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     tableForm: {
       disabled: true
+    },
+    search: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        multiple: true,
+        enterSearch: true,
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '物料基础信息', // 查询弹窗标题
+        searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
+        searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'supplierCode',
+          value: 'supplierCode',
+          message: '请填写供应商代码！',
+          isMainValue: true,
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
     }
   },
   {
@@ -582,40 +725,45 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
         disabled: true
       }
     },
+    sortTableDefault:11,
     tableForm: {
       disabled: true
     }
 
   },
+  
   {
-    label: '计划数量',
+    label: '已发货数量',
-    field: 'planQty',
+    field: 'shippedQty',
     sort: 'custom',
     table: {
       width: 150
     },
-    tableForm: {
+    isTableForm: false,
-      type: 'InputNumber',
+    isForm: false,
-      precision: 6
+    sortTableDefault:5,
   },
-    form: {
+  {
-      component: 'InputNumber',
+    label: '已收货数量',
-      componentProps: {
+    field: 'receivedQty',
-        precision: 6
+    sort: 'custom',
-      }
+    table: {
-    }
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    sortTableDefault:6,
   },
   {
-    label: '已发货数量',
+    label: '在途数量',
-    field: 'shippedQty',
+    field: 'notReceiveQty',
     sort: 'custom',
     table: {
       width: 150
     },
     isTableForm: false,
     isForm: false,
-    hiddenInMain:true,
+    sortTableDefault:7,
-
   },
   {
     label: '计量单位',
@@ -627,6 +775,12 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:12,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
     tableForm: {
       type: 'Select',
       disabled:true,
@@ -638,6 +792,8 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isTableForm:false,
+    isForm:false,
     hiddenInMain:true,
     sort: 'custom',
     table: {
@@ -697,6 +853,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'remark',
     sort: 'custom',
     hiddenInMain:true,
+    isTableForm:false,
     table: {
       width: 150
     },
@@ -717,10 +874,10 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
 const validatePlanQty = (rule, value, callback) => {
   console.log('validatePlanQty',value)
   const numReg = /^[\d]+$/
-  if (numReg.test(value)&&value>0) {
+  if (numReg.test(value)&&value>=0) {
       callback()
   } else {
-      callback(new Error('计划数量不能为0'))
+      callback(new Error('计划数量不能小于0'))
   }
 }
 //表单校验
@@ -736,7 +893,7 @@ export const PurchasePlanDetailRules = reactive({
   ],
   planQty: [
     { required: true, message: '请输入计划数量', trigger: 'blur' },
-    { validator:validatePlanQty, message: '计划数量不能为0', trigger: 'blur'}
+    { validator:validatePlanQty, message: '计划数量不能小于0', trigger: 'blur'}
   ],
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue

@@ -2,7 +2,10 @@
   <ContentWrap>
     <!-- 搜索工作栏 -->
     <Search
-      :schema="[...SupplierdeliverRequestMain.allSchemas.searchSchema,...SupplierdeliverRequestDetail.allSchemas.searchSchema]"
+      :schema="[
+        ...SupplierdeliverRequestMain.allSchemas.searchSchema,
+        ...SupplierdeliverRequestDetail.allSchemas.searchSchema
+      ]"
       @search="setSearchParams"
       @reset="setSearchParams"
     />
@@ -21,7 +24,8 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table v-clientTable
+    <Table
+      v-clientTable
       :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
@@ -32,19 +36,30 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
+      <template #asnNumber="{ row }">
+        <el-button type="primary" link @click="openDetail(row, '发货单号', row.asnNumber)">
+          <span>{{ row.asnNumber }}</span>
+        </el-button>
+      </template>
       <template #number="{ row }">
         <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
           <span>{{ row.number }}</span>
         </el-button>
       </template>
       <template #action="{ row, $index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event, row)" />
+        <ButtonBase
+          :Butttondata="butttondata(row, $index)"
+          @button-base-click="buttonTableClick($event, row)"
+        />
       </template>
     </Table>
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <supplierdeliverBasicForm ref="supplierdeliverFormRef" @getList="getList" ></supplierdeliverBasicForm>
+  <supplierdeliverBasicForm
+    ref="supplierdeliverFormRef"
+    @getList="getList"
+  ></supplierdeliverBasicForm>
   <!-- <BasicForm
     ref="formRef"
     :isOpenSearchTable="true"
@@ -76,7 +91,8 @@
   <!-- 详情 -->
   <Detail
     ref="detailRef"
-    :annexTable="[{
+    :annexTable="[
+      {
         label: '质检明细',
         prop: 'uploadFile',
         tableName: 'SupplierdeliverInspectionDetail',
@@ -86,18 +102,21 @@
         align: 'left',
         //明细表数据
         subDetailTableData: {
-        queryParams:[{
+          queryParams: [
+            {
               queryField: 'masterId',
               rowField: 'masterId'
-        }], // 查询参数
+            }
+          ], // 查询参数
           getSubList: SupplierdeliverInspectionDetailApi.getSupplierdeliverInspectionDetailPage, //请求接口
           tableColumns: SupplierdeliverInspectionDetail.allSchemas.tableColumns,
           tableList: [], //表格数据
           total: 1,
           pageSize: 10,
-        currentPage:1,
+          currentPage: 1
+        }
       }
-    }]"
+    ]"
     :isBasic="false"
     :allSchemas="SupplierdeliverRequestMain.allSchemas"
     :detailAllSchemas="SupplierdeliverRequestDetail.allSchemas"
@@ -126,13 +145,16 @@
     @success="getList"
     :tableAllSchemas="SupplierdeliverRequestDetailLabel.allSchemas"
     :tableFormRules="SupplierdeliverRequestDetailRules"
-    :tableData="detatableData.tableList"
+    :tableData="detatableData1"
     :isBusiness="true"
     :isShowButton="false"
     @searchTableSuccess="searchTableSuccessLabel"
-    @submitForm="submitFormLabel"
     :isShowReduceButton="false"
-    @clearInput='clearInput'
+    @clearInput="clearInput"
+    :footButttondata="footButttondata"
+    @footButtonClick="footButtonClick"
+    @formSelectChange="formSelectChangeLabel"
+    @visibleChange='visibleChange'
   />
   <!-- 上传质量报告 -->
   <BasicForm
@@ -159,6 +181,11 @@
       <el-button type="primary" @click="printAllClick">打印全部</el-button>
     </template> -->
   </SearchTable>
+  <labelForm
+    ref="labelFormRef"
+    :tableAllSchemas="SupplierdeliverRequestDetailLabel.allSchemas"
+    @submitForm="submitFormLabel"
+  />
 </template>
 
 <script setup lang="ts">
@@ -171,9 +198,12 @@ import {
   SupplierdeliverRequestDetail,
   SupplierdeliverRequestDetailRules,
   SupplierdeliverRequestDetailLabel,
-  SupplierdeliverRequestPackage,
+  SupplierdeliverRequestPackage
 } from './supplierdeliverRequestMain.data'
-import {    SupplierdeliverInspectionDetail,SupplierdeliverInspectionDetailRules} from '../supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data'
+import {
+  SupplierdeliverInspectionDetail,
+  SupplierdeliverInspectionDetailRules
+} from '../supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data'
 import * as SupplierdeliverRequestMainApi from '@/api/wms/supplierdeliverRequestMain'
 import * as SupplierdeliverRequestDetailApi from '@/api/wms/supplierdeliverRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
@@ -185,18 +215,22 @@ import { PurchasePlanDetail } from '../purchasePlanMain/purchasePlanMain.data'
 import * as SupplierApi from '@/api/wms/supplier'
 import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
 import supplierdeliverBasicForm from './supplierdeliverBasicForm.vue'
+import labelForm from './labelForm.vue'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 // 供应商发货申请
 defineOptions({ name: 'SupplierdeliverRequestMain' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
-const genLabelId = ref();
+const genLabelId = ref()
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
 
-const tableColumns = ref([...SupplierdeliverRequestMain.allSchemas.tableColumns,...SupplierdeliverRequestDetail.allSchemas.tableMainColumns])
+const tableColumns = ref([
+  ...SupplierdeliverRequestMain.allSchemas.tableColumns,
+  ...SupplierdeliverRequestDetail.allSchemas.tableMainColumns
+])
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -207,8 +241,8 @@ const planArriveTimeStr = ref()
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
   nextTick(() => {
-    console.log("type:",type)
+    console.log('type:', type)
-    console.log("formField:",formField)
+    console.log('formField:', formField)
     console.log(formField, searchField, val, formRef, type, row)
     if (type == 'tableForm') {
       // 明细查询页赋值
@@ -222,8 +256,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
       // }
       //添加费用明细--点击确定
       const itemCodes = []
-      val.forEach(item=>{
+      val.forEach((item) => {
-        if(tableData.value.find(item1=>item1['id'] == item['id'])) return
+        if (tableData.value.find((item1) => item1['id'] == item['id'])) return
         const newRow = { ...row }
         newRow[formField] = item[searchField]
         newRow['poNumber'] = item['poNumber']
@@ -239,7 +273,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
         code: itemCodes.join(',')
       }).then((res) => {
         res.list.forEach((item, index) => {
-          const findItem = tableData.value.find(item1=>item1['itemCode']==item['code'])
+          const findItem = tableData.value.find((item1) => item1['itemCode'] == item['code'])
           findItem['expireTime'] = findItem['expireTime']
         })
       })
@@ -253,8 +287,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
         // 设置计划到货时间
         let beginTime = val[0]['endTime']
         let deliveryDate = formatDate(val[0]['deliveryDate'], 'YYYY-MM-DD')
-        planArriveTimeStr.value = deliveryDate + ' '+ beginTime+":00"
+        planArriveTimeStr.value = deliveryDate + ' ' + beginTime + ':00'
-        setV['planArriveTime']= new Date(planArriveTimeStr.value).valueOf();
+        setV['planArriveTime'] = new Date(planArriveTimeStr.value).valueOf()
         // 清空子表数据
         tableData.value = []
       }
@@ -270,10 +304,19 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
 //供应商代码 回车搜索
 const onEnter = async (field, value) => {
   console.log(field, value)
-  formRef.value.opensearchTable('supplierCode', 'code', '供应商信息', Supplier.allSchemas, SupplierApi.getSupplierPage,[{
+  formRef.value.opensearchTable(
+    'supplierCode',
+    'code',
+    '供应商信息',
+    Supplier.allSchemas,
+    SupplierApi.getSupplierPage,
+    [
+      {
         key: 'code',
         value: value
-  }])
+      }
+    ]
+  )
 }
 
 const getSearchTableData = async (number, formField, searchField) => {
@@ -290,7 +333,7 @@ const getSearchTableData = async (number,formField,searchField)=>{
   })
   tableData.value = []
   const itemCodes = []
-  tableObject.tableList.forEach(row=>{
+  tableObject.tableList.forEach((row) => {
     const newRow = JSON.parse(JSON.stringify({ ...tableFormKeys, ...row }))
     newRow[formField] = row[searchField]
     newRow['poNumber'] = row['poNumber']
@@ -301,15 +344,13 @@ const getSearchTableData = async (number,formField,searchField)=>{
     tableData.value.push(newRow)
     itemCodes.push(row['itemCode'])
   })
-
   //有效期
   ItembasicApi.getItembasicPage({
     code: itemCodes.join(',')
   }).then((res) => {
     res.list.forEach((item, index) => {
-      const findItem = tableData.value.find(item1=>item1['itemCode']==item['code'])
+      const findItem = tableData.value.find((item1) => item1['itemCode'] == item['code'])
       findItem['expireTime'] = findItem['expireTime']
-
     })
   })
 }
@@ -328,12 +369,11 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
     formRef.setValues(setV)
   })
 }
-
 // 查询页面返回
 const searchTableSuccessLabel = (formField, searchField, val, formRef, type, row) => {
   nextTick(() => {
-    console.log("formField:",formField)
+    console.log('formField:', formField)
-    console.log("val:",val)
+    console.log('val:', val)
     if (type == 'tableForm') {
       // 明细查询页赋值
       row[formField] = val[0][searchField]
@@ -351,8 +391,6 @@ const searchTableSuccessLabel = (formField, searchField, val, formRef, type, row
   })
 }
 
-
-
 const { tableObject, tableMethods } = useTable({
   getListApi: SupplierdeliverRequestDetailApi.getSupplierdeliverRequestDetailPage // 分页接口
 })
@@ -440,16 +478,33 @@ const isReGenLabelShowMainButtonLabel = (row, val) => {
 
 // 列表-操作按钮
 const butttondata = (row, $index) => {
-  const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
+  const findIndex = row['masterId']
+    ? tableObject.tableList.findIndex((item) => item['masterId'] == row['masterId'])
+    : -1
   if (findIndex > -1 && findIndex < $index) {
     return []
   }
   return [
-    defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['5']),hasPermi: 'wms:supplierdeliver-request-main:open' }), // 打开
+    defaultButtons.mainListPurchasePlanOpeBtn({
-    defaultButtons.mainListPlanUploadQualityReportBtn({ hide: isShowMainButton(row, ['1','2','3']),hasPermi: 'wms:supplierdeliver-request-main:uploadCheck'}), // 上传质量报告
+      hide: isShowMainButton(row, ['5']),
-    defaultButtons.mainListPlanSubBtn({ hide: isShowMainButton(row, ['1']),hasPermi: 'wms:supplierdeliver-request-main:sub' }), // 提交审批
+      hasPermi: 'wms:supplierdeliver-request-main:open'
-    defaultButtons.mainListPlanAppBtn({ hide: isShowMainButton(row, ['2']),hasPermi: 'wms:supplierdeliver-request-main:app' }), // 审批通过
+    }), // 打开
-    defaultButtons.mainListPlanTurBtn({ hide: isShowMainButton(row, ['2']),hasPermi: 'wms:supplierdeliver-request-main:rej' }), // 驳回按钮
+    defaultButtons.mainListPlanUploadQualityReportBtn({
+      hide: isShowMainButton(row, ['1', '2', '3']),
+      hasPermi: 'wms:supplierdeliver-request-main:uploadCheck'
+    }), // 上传质量报告
+    defaultButtons.mainListPlanSubBtn({
+      hide: isShowMainButton(row, ['1']),
+      hasPermi: 'wms:supplierdeliver-request-main:sub'
+    }), // 提交审批
+    defaultButtons.mainListPlanAppBtn({
+      hide: isShowMainButton(row, ['2']),
+      hasPermi: 'wms:supplierdeliver-request-main:app'
+    }), // 审批通过
+    defaultButtons.mainListPlanTurBtn({
+      hide: isShowMainButton(row, ['2']),
+      hasPermi: 'wms:supplierdeliver-request-main:rej'
+    }), // 驳回按钮
     defaultButtons.mainListEditBtn({
       hide: isShowMainButton(row, ['1']),
       hasPermi: 'wms:supplierdeliver-request-main:update'
@@ -475,7 +530,10 @@ const butttondata = (row,$index) => {
       hasPermi: 'wms:supplierdeliver-request-main:genLabels',
       link: true // 文本展现按钮
     },
-    defaultButtons.mainListPointBtn({ hide: isShowMainButton(row, ['3','8']),hasPermi: 'wms:supplierdeliver-request-main:printLabel' }), // 标签打印
+    defaultButtons.mainListPointBtn({
+      hide: isShowMainButton(row, ['3', '8']),
+      hasPermi: 'wms:supplierdeliver-request-main:printLabel'
+    }), // 标签打印
     //defaultButtons.mainListDocumentPrintBtn({ hide: isShowMainButton(row, ['3','8']) }), // 单据打印
     // 生成记录
     {
@@ -488,10 +546,14 @@ const butttondata = (row,$index) => {
       hasPermi: 'wms:supplierdeliver-request-main:genRecords',
       link: true // 文本展现按钮
     },
-    defaultButtons.mainListPurchasePlanCloBtn({ hide: isShowMainButton(row, ['1', '2', '4','3']),hasPermi: 'wms:supplierdeliver-request-main:close' }), // 关闭
+    defaultButtons.mainListPurchasePlanCloBtn({
+      hide: isShowMainButton(row, ['1', '2', '4', '3']),
+      hasPermi: 'wms:supplierdeliver-request-main:close'
+    }) // 关闭
   ]
 }
 
+const detatableData1 = ref([])
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
   if (val == 'mainPurPlanOpe') {
@@ -527,26 +589,30 @@ const buttonTableClick = async (val, row) => {
       masterId: row.masterId
     }
     genLabelId.value = row.masterId
-    await getDetailList()
+    // await getDetailList()
+    await getGenerateLabelList(row)
     formLabelRef.value.open('create', row, null, 'createLabel') //创建标签页面 createLabel 标题
   } else if (val == 'ressbq') {
-    console.log("重新生成标签")
+    console.log('重新生成标签')
     ElMessageBox.confirm(t('ts.重新生成标签会删除上次生成的标签，是否确认继续？'), '提示', {
       confirmButtonText: t('ts.确 认'),
       cancelButtonText: t('ts.取 消')
-    }).then(() => {
+    })
-       SupplierdeliverRequestMainApi.deleteOldLabels(row.masterId).then(async res =>{
+      .then(() => {
+        SupplierdeliverRequestMainApi.deleteOldLabels(row.masterId).then(async (res) => {
           if (res) {
             // 生成标签
             detatableData.params = {
               masterId: row.masterId
             }
             genLabelId.value = row.masterId
-            await getDetailList()
+            // await getDetailList()
+            await  getGenerateLabelList(row)
             formLabelRef.value.open('create', row, null, 'createLabel') //创建标签页面 createLabel 标题
           }
         })
-    }).catch(() => {
+      })
+      .catch(() => {
         console.info('操作取消')
       })
   } else if (val == 'point') {
@@ -557,13 +623,101 @@ const buttonTableClick = async (val, row) => {
     handleDocumentPrint(row.masterId)
   }
 }
+const footButttondata = ref([
+  defaultButtons.formNextStepBtn(null), // BOM下一步
+  defaultButtons.formCloseBtn(null) // BOM关闭
+])
+// 获取箱规格
+const getGenerateLabelList=async(row)=>{
+  const params1 = {
+      masterId: row.masterId,
+      pageSize: '500',
+      pageNo: '1',
+      sort: '',
+      by: 'ASC'
+    }
+    await SupplierdeliverRequestDetailApi.getGenerateLabelList(params1).then((res) => {
+      detatableData1.value = res
+      detatableData1.value.forEach((item) => {
+        item.packUnitInitOptions = item.boxPackaging
+        let obj = item?.boxPackaging[0]
+        if (obj) {
+          item.packUnit= obj.packUnit
+          item.packQty = obj.packQty
+        } 
+      })
+    })
+}
+// 下一步
+const labelFormRef = ref()
+const footButtonClick = async (val) => {
+  if (val == 'nextStep') {
+    const validateForm = await formLabelRef.value.tableFormRef.validateForm()
+    if (!validateForm) {
+      return
+    }
+    let isNext = detatableData1.value.some((item)=>{
+      return !item.packUnit  || !item.packQty
+    })
+    if(isNext){
+      message.warning('有数据没有选择箱规格')
+      return;
+    }
+    const data = JSON.parse(JSON.stringify(detatableData1.value))
+    labelFormRef.value.openLabel(data)
+  } else if (val == 'close') {
+    formLabelRef.value.dialogVisible = false
+  }
+}
+// 选择箱规格 拖规格
+const formSelectChangeLabel = (field, val, row) => {
+  if (field == 'packUnit') {
+    let obj = row.boxPackaging.find((item) => item.packUnit == val)
+    if (obj) {
+      row.packQty = obj.packQty
+    } else {
+      row.packQty = ''
+    }
+    row.secondPackUnit = ''
+    row.secondPackQty = ''
+   
+  }
+  // 设置托
+  if (field == 'secondPackUnit') {
+    let obj = row.secondPackUnitInitOptions.find((item) => item.packUnit == val)
+    if (obj) {
+      row.secondPackQty = obj.packQty
+    } else {
+      row.secondPackQty = ''
+    }
+  }
+}
+// tableForm下拉框弹出隐藏
+const visibleChange=(field, val, row, index)=>{
+  row.secondPackUnitInitOptions=[]
+  if(field=='secondPackUnit'){
+    if(val){
+  // 获取托规格
+    const params1 = {
+      itemCode: row.itemCode,
+      packUnit: row.packUnit
+    }
+    SupplierdeliverRequestDetailApi.getGenerateLabelParentList(params1).then((res) => {
+      row.secondPackUnitInitOptions  = res
+    })
+    }
+  }
+
+}
 
 // 获取部门 用于详情 部门回显
 const { wsCache } = useCache()
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  const departmentCode = wsCache
+    .get(CACHE_KEY.DEPT)
+    .find((account) => account.id == row.departmentCode)?.name
   if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
   detailRef.value.openDetail(row, titleName, titleValue, 'requestSupplierdeliverMain')
 }
@@ -572,7 +726,7 @@ const formRef = ref()
 const supplierdeliverFormRef = ref()
 
 const openForm = async (type: string, row?: number) => {
-  supplierdeliverFormRef.value.openForm(type, row)
+  supplierdeliverFormRef.value.openForm(type, row, defaultSupplierCode.value)
   // if(type == "update"){
   //   SupplierdeliverRequestMain.allSchemas.formSchema.forEach((item) => {
   //     if(item.field == 'supplierCode'){
@@ -621,7 +775,8 @@ const handleDelete = async (id: number) => {
     message.success(t('common.delSuccess'))
     // 刷新列表
     await getList()
-  } catch {}finally{
+  } catch {
+  } finally {
     tableObject.loading = false
   }
 }
@@ -637,7 +792,8 @@ const handleClo = async (id: number) => {
     message.success(t('ts.关闭成功!'))
     // 刷新列表
     await getList()
-  } catch {}finally{
+  } catch {
+  } finally {
     tableObject.loading = false
   }
 }
@@ -653,7 +809,8 @@ const handleOpe = async (id: number) => {
     message.success(t('ts.打开成功!'))
     // 刷新列表
     await getList()
-  } catch {}finally{
+  } catch {
+  } finally {
     tableObject.loading = false
   }
 }
@@ -671,28 +828,37 @@ const handleAddQualityReport = ()=>{
 const handleDeleteQualityReport = (row, index) => {
   uploadQualityReportTableData.value.splice(index, 1)
   console.log('handleDeleteQualityReport', row)
-
 }
 
 /** 上传质量报告 */
 const handleUploadQualityReport = async (row) => {
   console.log('SupplierdeliverInspectionDetail', SupplierdeliverInspectionDetail.allSchemas)
-  const uploadFile = SupplierdeliverInspectionDetail.allSchemas.formSchema.find(item=>item.field=='uploadFile')
+  const uploadFile = SupplierdeliverInspectionDetail.allSchemas.formSchema.find(
+    (item) => item.field == 'uploadFile'
+  )
   if (uploadFile) {
     uploadFile['componentProps']['upData']['tableId'] = row.masterId
   }
-  ploadQualityReportRef.value.open('create', null, {masterId:row.masterId},t('ts.上传质检报告'),t('ts.上传质检报告'))//创建标签页面 createLabel 标题
+  ploadQualityReportRef.value.open(
+    'create',
+    null,
+    { masterId: row.masterId },
+    t('ts.上传质检报告'),
+    t('ts.上传质检报告')
+  ) //创建标签页面 createLabel 标题
   const tableFormKeys = {}
 
   SupplierdeliverInspectionDetail.allSchemas.tableFormColumns.forEach((item) => {
     tableFormKeys[item.field] = item.default ? item.default : ''
   })
-  await SupplierdeliverInspectionDetailApi.getSupplierdeliverDetailInfo(row.masterId).then(res => {
+  await SupplierdeliverInspectionDetailApi.getSupplierdeliverDetailInfo(row.masterId).then(
+    (res) => {
       if (res) {
         // console.log("返回结果:",res)
-      uploadQualityReportTableData.value = res;
+        uploadQualityReportTableData.value = res
       }
-  })
+    }
+  )
   //uploadQualityReportTableData.value = [tableFormKeys]
 }
 
@@ -721,7 +887,8 @@ const handleSub = async (id: number) => {
     message.success(t('ts.提交审批成功!'))
     // 刷新列表
     await getList()
-  } catch {}finally{
+  } catch {
+  } finally {
     tableObject.loading = false
   }
 }
@@ -737,7 +904,8 @@ const handleApp = async (id: number) => {
     message.success(t('ts.审批通过成功!'))
     // 刷新列表
     await getList()
-  } catch {}finally{
+  } catch {
+  } finally {
     tableObject.loading = false
   }
 }
@@ -753,7 +921,8 @@ const handleTur = async (id: number) => {
     message.success(t('ts.驳回成功!'))
     // 刷新列表
     await getList()
-  } catch {}finally{
+  } catch {
+  } finally {
     tableObject.loading = false
   }
 }
@@ -761,7 +930,8 @@ const handleTur = async (id: number) => {
 /** 处理按钮操作 */
 const genRecords = async (id: number) => {
   let getLoading = null
-    await SupplierdeliverRequestMainApi.selfCheckReport(id).then(async res => {
+  await SupplierdeliverRequestMainApi.selfCheckReport(id)
+    .then(async (res) => {
       if (!res) {
         message.warning(t('ts.请先上传自检报告!'))
         return
@@ -774,7 +944,8 @@ const genRecords = async (id: number) => {
           background: 'rgba(0, 0, 0, 0.7)'
         })
         // 发起处理
-        SupplierdeliverRequestMainApi.genRecordsSupplierdeliverRequestMain(id).then(res => {
+        SupplierdeliverRequestMainApi.genRecordsSupplierdeliverRequestMain(id)
+          .then((res) => {
             message.success(t('ts.处理成功!'))
             console.log('resresresresres', res)
             // 刷新列表
@@ -784,16 +955,16 @@ const genRecords = async (id: number) => {
 
             // 单据打印
             handleDocumentPrint(res)
-        }).catch(err=>{
+          })
-          console.log("发起处理",err)
+          .catch((err) => {
+            console.log('发起处理', err)
             getLoading?.close()
           })
-
       }
-    }).catch(err => {
+    })
-      console.log("自检报告校验异常",err)
+    .catch((err) => {
+      console.log('自检报告校验异常', err)
       getLoading?.close()
-
     })
 }
 
@@ -824,46 +995,26 @@ const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({
 detatableData.pageSize = 500
 const { getList: getDetailList } = detatableMethods
 
-
 // 生成标签按钮操作
-const submitFormLabel = async (formType, submitData) => {
+const submitFormLabel = async (list) => {
-  let data = {...submitData}
-  if(data.masterId){
-    data.id = data.masterId
-  }
   try {
-    console.log("formType==",formType)
+    
-    console.log("data==",data)
+   let data = {
-    data.subList = detatableData.tableList
+    subList:list
-    if(detatableData.tableList.find(item=>item.secondPackUnit==item.packUnit)){
-      message.warning(t('ts.包装规格1和包装规格2不能相同'))
-      return
-    }
-    // 校验物料包装规格数量是否修改
-    let flag = false;
-    await SupplierdeliverRequestMainApi.checkPackQty(data).then(async res => {
-      if(res){
-        await message.confirm(t('ts.是否修改物料包装标包数量')+'?').then(()=>{
-          flag = true; //修改标包数量
-        }).catch(() =>{
-          flag = false
-        })
-      }else{
-        flag = true; //修改标包数量
    }
-    })
-    console.log("返回结果",flag);
-    if(flag){
-      console.log("detatableData",detatableData)
     await message.confirm(t('ts.是否为此数据生成标签？'))
+    labelFormRef.value.isLoading = true
     await SupplierdeliverRequestMainApi.genLabel(data)
     isCreateLabel.value = true
     message.success(t('ts.创建标签成功'))
-    }
     getList()
   } finally {
     formLabelRef.value.formLoading = false
     formLabelRef.value.dialogVisible = false
+    labelFormRef.value.formLoading = false
+    labelFormRef.value.dialogTableVisible = false
+    labelFormRef.value.isLoading = false
+    
   }
 }
 const clearInput = async (field, row, index) => {
@@ -873,7 +1024,6 @@ const clearInput = async (field,row,index) => {
   SupplierdeliverRequestDetailRules.secondPackQty[0].required = false
 }
 
-
 const BASE_URL = getJmreportBaseUrl()
 const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
 getListApi: PurchasePlanDetailApi.getPurchasePlanDetailPage // 分页接口
@@ -882,7 +1032,7 @@ getListApi: PurchasePlanDetailApi.getPurchasePlanDetailPage // 分页接口
 const searchTableRef = ref()
 const labelPrint = async (row) => {
   tableObject.loading = true
-  const defaultParams = {'moduleName':'supplier','recordNumber':row.number}
+  const defaultParams = { moduleName: 'supplier', recordNumber: row.number }
   const { tableObject: tableObjectPrint, tableMethods } = useTable({
     defaultParams,
     getListApi: PackageApi.getLabelDetailPage // 分页接口
@@ -900,9 +1050,7 @@ const labelPrint = async (row) => {
 }
 
 // 打印全部
-const printAllClick = ()=>{
+const printAllClick = () => {}
-
-}
 
 // 批量打印--供应商发货申请
 const searchTableSuccess1 = async (formField, searchField, val, formRef, type, row) => {
@@ -917,10 +1065,12 @@ const searchTableSuccess1 = async (formField, searchField, val, formRef, type, r
   }
   // window.open(src.value + '&asn_number=' + val.map(item1=>item1.number).join(','))
 
-  await PackageApi.batchPrintingLable(val.map(item1=>item1.number).join(',')).then(res => {
+  await PackageApi.batchPrintingLable(val.map((item1) => item1.number).join(','))
+    .then((res) => {
       console.log(res)
       window.open(src.value + '&asn_number=' + res)
-  }).catch(err => {
+    })
+    .catch((err) => {
       console.log(err)
       message.error(t('ts.创建标签失败'))
     })
@@ -964,7 +1114,7 @@ const submitForm = async (formType, submitData) => {
   }
   data.subList = tableData.value // 拼接子表数据参数
   let isHave = data.subList.some((item) => {
-    console.log("CCCCC",item.expireDate)
+    console.log('CCCCC', item.expireDate)
     if (item.expireDate != null) {
       item.produceDate > item.expireDate
     }
@@ -976,27 +1126,30 @@ const submitForm = async (formType, submitData) => {
   }
   try {
     if (formType === 'create') {
-      let planArriveStr = formatDate(data.planArriveTime);
+      let planArriveStr = formatDate(data.planArriveTime)
       if (planArriveStr > planArriveTimeStr.value) {
-        let confirmFlag = false;
+        let confirmFlag = false
-        await message.confirm(`${t('ts.计划到货时间大于')}${planArriveTimeStr.value}${t('ts.是否继续？')}`).then(() => {
+        await message
-          console.log("选择了OK")
+          .confirm(`${t('ts.计划到货时间大于')}${planArriveTimeStr.value}${t('ts.是否继续？')}`)
+          .then(() => {
+            console.log('选择了OK')
             //选择OK
-        }).catch(() => {
+          })
+          .catch(() => {
             //选择取消
-          console.log("选择了cancel")
+            console.log('选择了cancel')
-          confirmFlag = true;
+            confirmFlag = true
             formRef.value.formLoading = false
-          return;
+            return
           })
         if (confirmFlag) {
-          return;
+          return
         }
       }
       if (tableData.value.length <= 0) {
         message.warning(t('ts.子表明细不能为空!'))
         formRef.value.formLoading = false
-        return;
+        return
       }
       await SupplierdeliverRequestMainApi.createSupplierdeliverRequestMain(data)
       message.success(t('common.createSuccess'))
@@ -1040,14 +1193,26 @@ const searchFormClick = (searchData) => {
 
 const formFormDateChange = (field, val, row, index) => {
   if (field == 'produceDate') {
-    let produceDateStr = formatDate(val,'YYYYMMDD');
+    let produceDateStr = formatDate(val, 'YYYYMMDD')
     row.batch = produceDateStr
     row.supplierBatch = produceDateStr
   }
 }
+const defaultSupplierCode = ref('')
+const getDefaultSupplier = async () => {
+  let supplier = await SupplierApi.getSupplierPageSCP({ isSearch: false })
+  if (supplier.list && supplier.list.length > 0) {
+    defaultSupplierCode.value = supplier.list[0]['code']
+  } else {
+    defaultSupplierCode.value = ''
+  }
+  console.log('defaultSupplierCode', defaultSupplierCode)
+}
 
 /** 初始化 **/
 onMounted(async () => {
+  getDefaultSupplier()
+
   getList()
   importTemplateData.templateUrl = await SupplierdeliverRequestMainApi.importTemplate()
 })

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue

@@ -0,0 +1,509 @@
+<template>
+  <el-dialog v-model="dialogTableVisible" title="标签" width="1100">
+    <el-table
+      :data="showTableData()"
+      border
+      row-key="id"
+      style="width: 1050px; max-height: 70vh; overflow-y: auto"
+      v-if="tableData.length > 0 && dialogTableVisible == true"
+      v-loading="isLoading"
+    >
+      <el-table-column type="expand" width="50">
+        <template #default="scope">
+          <div
+            style="margin-left: 400px; margin-top: -8px; margin-bottom: -8px"
+            v-if="scope.row.secondPackUnit && scope.row.secondPackQty"
+          >
+            <el-table
+              :data="scope.row.packageList"
+              border
+              style="width: 550px"
+              row-key="id"
+              :row-class-name="getRowClass"
+            >
+              <el-table-column type="expand" width="50">
+                <template #default="scope1">
+                  <div style="margin-left: 150px; margin-top: -8px; margin-bottom: -8px">
+                    <el-table :data="scope1.row.children" border style="width: 300px" row-key="id">
+                      <el-table-column label="箱行号" width="100" prop="xPoNumber" align="center" />
+                      <el-table-column label="数量" width="100" prop="qtyTwo" align="center">
+                        <template #default="scope2">
+                          <el-input
+                            v-model="scope2.row.qtyTwo"
+                            @blur="blurTwo(scope.row, scope1.row, scope2.row)"
+                          />
+                        </template>
+                      </el-table-column>
+                      <el-table-column label="添加箱" width="100" prop="add" align="center">
+                        <template #header>
+                          <el-button
+                            type="primary"
+                            link
+                            @click="addX(scope.row, scope.$index, scope1.row, scope1.$index, 1)"
+                            >添加箱</el-button
+                          >
+                        </template>
+                        <template #default="scope2">
+                          <el-button
+                            type="warning"
+                            link
+                            @click="
+                              removeX(
+                                scope.row,
+                                scope.$index,
+                                scope1.row,
+                                scope1.$index,
+                                scope2.row,
+                                scope2.$index,
+                                1
+                              )
+                            "
+                            >移出</el-button
+                          >
+                        </template>
+                      </el-table-column>
+                    </el-table>
+                  </div>
+                </template>
+              </el-table-column>
+              <el-table-column label="托行号" width="100" prop="tPoNumber" align="center" />
+              <el-table-column label="箱个数" width="100" prop="xNumber" align="center">
+                <template #default="scope1">
+                  <el-input v-model="scope1.row.xNumber" @blur="blurOne(scope.row, scope1.row)" />
+                </template>
+              </el-table-column>
+              <el-table-column label="数量" width="100" prop="qtyOne" align="center" />
+              <el-table-column label="操作" width="100" prop="action" align="center">
+                <template #default="scope1">
+                  <el-button
+                    type="warning"
+                    link
+                    @click="removeT(scope.row, scope.$index, scope1.row, scope1.$index)"
+                    >移出</el-button
+                  >
+                </template>
+              </el-table-column>
+              <el-table-column label="添加托" width="100" prop="add" align="center">
+                <template #header>
+                  <el-button type="primary" link @click="addT(scope.row)">添加托</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+          <div style="margin-left: 550px; margin-top: -8px; margin-bottom: -8px" v-else>
+            <div v-for="(item, index) in scope.row.packageList" :key="index">
+              <el-table :data="item.children" border style="width: 300px" row-key="id">
+                <el-table-column label="箱行号" width="100" prop="xPoNumber" align="center" />
+                <el-table-column label="数量" width="100" prop="qtyOne" align="center">
+                  <template #default="scope1">
+                    <el-input
+                      v-model="scope1.row.qtyTwo"
+                      @blur="blurThree(scope.row, item, scope1.row)"
+                    />
+                  </template>
+                </el-table-column>
+                <el-table-column label="添加箱" width="100" prop="add" align="center">
+                  <template #header>
+                    <el-button
+                      type="primary"
+                      link
+                      @click="addX(scope.row, scope.$index, item, index)"
+                      >添加箱</el-button
+                    >
+                  </template>
+                  <template #default="scope1">
+                    <el-button
+                      type="warning"
+                      link
+                      @click="removeX(scope.row, scope.$index, item, index)"
+                      >移出</el-button
+                    >
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="物料代码" width="150" prop="itemCode" align="center" />
+      <el-table-column label="批次" width="150" prop="batch" align="center" />
+      <el-table-column label="数量" width="100" prop="qty" align="center" />
+      <el-table-column label="计量单位" width="100" prop="uom" align="center" />
+      <el-table-column label="托个数" width="100" prop="allTuoQty" align="center" />
+      <el-table-column label="托规格" width="100" prop="secondPackUnit" align="center" />
+      <el-table-column label="托数量" width="100" prop="secondPackQty" align="center" />
+      <el-table-column label="箱规格" width="100" prop="packUnit" align="center" />
+      <el-table-column label="箱数量" width="100" prop="packQty" align="center" />
+    </el-table>
+    <el-pagination
+      v-show="tableData.length > 10"
+      style="margin-top: 10px"
+      v-model:current-page="currentPage"
+      v-model:page-size="pageSize"
+      :small="true"
+      :background="false"
+      layout="total, prev, pager, next, jumper"
+      :total="tableData.length"
+    />
+    <template #footer>
+      <slot name="foorter"></slot>
+      <ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick" />
+    </template>
+  </el-dialog>
+</template>
+<script setup lang="ts">
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const props = defineProps({
+  // 列表 相关信息
+  tableAllSchemas: {
+    type: Array,
+    required: true,
+    default: null
+  }
+})
+
+const dialogTableVisible = ref(false)
+const defaultExpandAll = ref(false)
+const tableData = ref([])
+const isLoading = ref(false)
+const oneId = ref(0) //每托的id
+const twoId = ref(0) //每箱的id
+const openLabel =async (tableList) => {
+  dialogTableVisible.value = true
+  tableData.value = tableList
+  defaultExpandAll.value = false
+  await intData()
+}
+const currentPage = ref(1)
+const pageSize = ref(10)
+const showTableData = () => {
+  if (tableData.value.length > 10) {
+    return tableData.value.slice(
+      (currentPage.value - 1) * pageSize.value,
+      currentPage.value * pageSize.value
+    )
+  } else {
+    return tableData.value
+  }
+  
+}
+const intData =async () => {
+  tableData.value.forEach((row) => {
+    if (row.secondPackUnit && row.secondPackQty) {
+      // 数量%托数量  获取总共几托
+      row.allTuoQty = Math.ceil(parseFloat(row.qty) / parseFloat(row.secondPackQty))
+    } else {
+      // 数量%每箱数量  获取总共几箱
+      row.allTuoQty = Math.ceil(parseFloat(row.qty) / parseFloat(row.packQty))
+    }
+   expandChange(row)
+  })
+}
+const expandChange = (row: any, expandedRows: any[]) => {
+  // 判断托信息是否存在
+  if (row.secondPackUnit && row.secondPackQty) {
+    // 数量除以托数量获取余数
+    row.lastNumber = parseFloat(row.qty) % parseFloat(row.secondPackQty)
+    // 托数量/箱数量  一托可以放几箱
+    row.otherNumber = parseFloat(row.secondPackQty) / parseFloat(row.packQty)
+    // 数量%托数量  获取总共几托
+    row.allTuoQty = Math.ceil(parseFloat(row.qty) / parseFloat(row.secondPackQty))
+    row.packageList = []
+    // 循环托
+    for (let i = 0; i < row.allTuoQty; i++) {
+      oneId.value++
+      // 先给所有托一个默认对象值
+      row.packageList[i] = {
+        id: oneId.value,
+        tPoNumber: i + 1,
+        xNumber: '',
+        qtyOne: '',
+        isTuo: 1 //有托
+      }
+      // 如果有余数
+      if (row.lastNumber) {
+        // 最后一条信息直接展示余数的信息
+        if (i == row.allTuoQty - 1) {
+          row.packageList[i].xNumber = Math.ceil(row.lastNumber / parseFloat(row.packQty))
+          row.packageList[i].qtyOne = row.lastNumber
+        } else {
+          // 其他数据展示一托的全部箱数和全部数量
+          row.packageList[i].xNumber = row.otherNumber
+          row.packageList[i].qtyOne = row.secondPackQty
+        }
+      } else {
+        // 如果沒有余数,直接展示一托的全部箱数和全部数量
+        row.packageList[i].xNumber = row.otherNumber
+        row.packageList[i].qtyOne = row.secondPackQty
+      }
+    }
+    // 判断箱信息是否存在
+    if (row.packUnit && row.packQty) {
+      row.packageList.forEach((cur, key) => {
+        cur.children = []
+        // 数量除以箱数量获取余数
+        cur.xLastNumber = parseFloat(cur.qtyOne) % parseFloat(row.packQty)
+        // cur.xiangNumber = Math.ceil(parseFloat(cur.qtyOne) / parseFloat(item.secondPackQty))
+        for (let j = 0; j < cur.xNumber; j++) {
+          twoId.value++
+          cur.children[j] = {
+            id: twoId.value,
+            xPoNumber: j + 1
+          }
+          // 如果有余数
+          if (cur.xLastNumber) {
+            // 最后一条信息直接展示余数的信息
+            if (j == cur.xNumber - 1) {
+              cur.children[j].qtyTwo = cur.xLastNumber
+            } else {
+              // 其他数据展示一托的全部箱数和全部数量
+              cur.children[j].qtyTwo = row.packQty
+            }
+          } else {
+            // 如果沒有余数,直接展示一托的全部箱数和全部数量
+            cur.children[j].qtyTwo = row.packQty
+          }
+        }
+      })
+    }
+  } else {
+    // 数量%每箱数量  获取总共几箱
+    row.allXiangQty = Math.ceil(parseFloat(row.qty) / parseFloat(row.packQty))
+    row.packageList = []
+    row.allTuoQty = 1
+    // 循环箱
+    for (let i = 0; i < row.allTuoQty; i++) {
+      oneId.value++
+      // 先给所有托一个默认对象值
+      row.packageList[i] = {
+        id: oneId.value,
+        xPoNumber: i + 1,
+        qtyOne: row.qty,
+        isTuo: 0 //无托
+      }
+    }
+    row.packageList.forEach((cur) => {
+      cur.children = []
+      for (let j = 0; j < row.allXiangQty; j++) {
+        twoId.value++
+        cur.children[j] = {
+          id: twoId.value,
+          xPoNumber: j + 1
+        }
+        // 数量除以箱数量获取余数
+        cur.lastNumber = parseFloat(row.qty) % parseFloat(row.packQty)
+        // 如果有余数
+        if (cur.lastNumber) {
+          // 最后一条信息直接展示余数的信息
+          if (j == row.allXiangQty - 1) {
+            cur.children[j].qtyTwo = cur.lastNumber
+          } else {
+            // 其他数据展示一托的全部箱数和全部数量
+            cur.children[j].qtyTwo = row.packQty
+          }
+        } else {
+          // 如果沒有余数,直接展示一托的全部箱数和全部数量
+          cur.children[j].qtyTwo = row.packQty
+        }
+      }
+    })
+  }
+}
+
+/** 弹窗按钮 */
+let Butttondata: any = []
+Butttondata = [
+  defaultButtons.formSaveBtn(null), // 保存
+  defaultButtons.formCloseBtn(null) // 关闭
+]
+
+/** 按钮事件 */
+const buttonBaseClick = (val) => {
+  // 保存
+  if (val == 'save') {
+    submitForm()
+  }
+  // 关闭
+  else if (val == 'close') {
+    dialogTableVisible.value = false
+  }
+}
+// 保存
+const submitForm = () => {
+  let arr = tableData.value.map((item) => {
+    item.allNumber = 0
+    // 判断托信息是否存在
+    item.packageList.forEach((cur) => {
+      item.allNumber += parseFloat(cur.qtyOne) || 0
+    })
+    if (item.allNumber == parseFloat(item.qty)) {
+      return true
+    } else {
+      return false
+    }
+  })
+  const isBol = arr.some((item) => item == false)
+  if (isBol) {
+    message.warning('当前添加的数量与总数量不一致')
+    return
+  }
+  emit('submitForm', tableData.value)
+}
+// 添加托
+const addT = (oneRow) => {
+  oneId.value++
+  oneRow.packageList.push({
+    id: oneId.value,
+    tPoNumber: oneRow?.packageList?.length>0?oneRow.packageList[oneRow.packageList.length - 1]?.tPoNumber  + 1 :1, //行号是上一行的行号加1
+    xNumber: '',
+    qtyOne: ''
+  })
+  oneRow.allTuoQty = oneRow.packageList.length
+}
+// 移出托
+const removeT = (oneRow, oneIndex, twoRow, twoIndex) => {
+  oneRow.packageList.splice(twoIndex, 1)
+  oneRow.allTuoQty = oneRow.packageList.length
+}
+// 添加箱
+const addX = (oneRow, oneIndex, twoRow, twoIndex, type) => {
+  twoId.value++
+  //  有父级托的时候
+  if (type == 1) {
+    // 在托下添加箱
+    twoRow.children.push({
+      id: twoId.value,
+      xPoNumber: twoRow?.children?.length>0? twoRow?.children[twoRow.children.length - 1]?.xPoNumber + 1 :1,
+      qtyOne: ''
+    })
+    twoRow.xNumber = twoRow.children.length
+  } else {
+    // 直接添加箱
+    twoRow.children.push({
+      id: twoId.value,
+      xPoNumber:twoRow.children.length>0? twoRow.children[twoRow.children.length - 1].xPoNumber + 1:1,
+      qtyTwo: ''
+    })
+    oneRow.allTuoQty = twoRow.children.length
+  }
+}
+// 移除箱
+const removeX = (oneRow, oneIndex, twoRow, twoIndex, threeRow, threeIndex, type) => {
+  //  有父级托的时候
+  if (type == 1) {
+    // 在托下移除箱
+    twoRow.children.splice(threeIndex, 1)
+    let num = 0
+    twoRow.children.forEach((item) => {
+      num += parseFloat(item.qtyTwo) || 0
+    })
+    twoRow.qtyOne = num
+    twoRow.xNumber = twoRow.children.length
+  } else {
+    twoRow.children.splice(twoIndex, 1)
+    oneRow.allTuoQty = twoRow.children.length
+  }
+}
+// 是否显示展开图标
+const getRowClass = (row) => {
+  if (!row.row.children || row.row.children.length == 0) {
+    return 'row-expand-cover'
+  }
+}
+// 托失去焦点
+const blurOne = (oneRow, twoRow) => {
+  if (!twoRow.xNumber) {
+    twoRow.qtyOne = ''
+  }
+  if (parseFloat(twoRow.xNumber) > parseFloat(oneRow.otherNumber)) {
+    message.warning('每托箱个数最多' + oneRow.otherNumber + '箱')
+    twoRow.xNumber = oneRow.otherNumber
+    twoRow.children = []
+    twoRow.qtyOne = parseFloat(twoRow.xNumber) * parseFloat(oneRow.packQty)
+  }
+  twoRow.qtyOne = parseFloat(twoRow.xNumber) * parseFloat(oneRow.packQty)
+  let num = 0
+  oneRow.packageList.forEach((item) => {
+    num += parseFloat(item.xNumber) || 0
+  })
+  if (num > oneRow.allPackQty) {
+    message.warning('总箱数不可以大于' + oneRow.allPackQty)
+    twoRow.xNumber = ''
+    twoRow.qtyOne = ''
+    return
+  }
+  // 托信息修改的時候箱数据自动排列
+  // 判断箱信息是否存在
+  if (oneRow.packUnit && oneRow.packQty) {
+    oneRow.packageList.forEach((cur, key) => {
+      cur.children = []
+      // 数量除以托数量获取余数
+      cur.xLastNumber = parseFloat(cur.xNumber) % parseFloat(oneRow.packQty)
+      for (let j = 0; j < cur.xNumber; j++) {
+        twoId.value++
+        // 如果有余数
+        if (cur.xLastNumber) {
+          // 最后一条信息直接展示余数的信息
+          if (j == cur.xNumbery - 1) {
+            cur.children.push({
+              id: twoId.value,
+              xPoNumber: j + 1,
+              qtyTwo: cur.xLastNumber
+            })
+          } else {
+            // 其他数据展示一托的全部箱数和全部数量
+            cur.children.push({
+              id: twoId.value,
+              xPoNumber: j + 1,
+              qtyTwo: oneRow.packQty
+            })
+          }
+        } else {
+          // 如果沒有余数,直接展示一托的全部箱数和全部数量
+          cur.children.push({
+            id: twoId.value,
+            xPoNumber: j + 1,
+            qtyTwo: oneRow.packQty
+          })
+        }
+      }
+    })
+  }
+}
+//在托下方的箱数量失去焦点
+const blurTwo = (oneRow, twoRow, threeRow) => {
+  if (parseFloat(threeRow.qtyTwo) > parseFloat(oneRow.packQty)) {
+    message.warning('数量最多为' + oneRow.packQty)
+    threeRow.qtyTwo = oneRow.packQty
+    return
+  }
+  let num = 0
+  twoRow.children.forEach((item) => {
+    num += parseFloat(item.qtyTwo) || 0
+  })
+  twoRow.qtyOne = num
+}
+// 箱数量失去焦点
+const blurThree = (oneRow, twoRow, thereeRow) => {
+  if (parseFloat(thereeRow.qtyTwo) > parseFloat(oneRow.packQty)) {
+    message.warning('每箱个数最多' + oneRow.packQty)
+    thereeRow.qtyTwo = oneRow.packQty
+  }
+  let num = 0
+  twoRow.children.forEach((item) => {
+    num += parseFloat(item.qtyTwo) || 0
+  })
+  twoRow.qtyOne = num
+}
+// 传递给父类
+const emit = defineEmits(['submitForm'])
+defineExpose({ openLabel, dialogTableVisible, isLoading }) // 提供 open 方法，用于打开弹窗
+</script>
+<style lang="scss" scoped>
+::v-deep .row-expand-cover td .el-table__expand-icon {
+  visibility: hidden;
+}
+</style>

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue

@@ -21,6 +21,7 @@
     @searchTableSuccess="searchTableSuccess"
     @submitForm="submitForm"
     @formFormDateChange="formFormDateChange"
+    @inputNumberChange="inputNumberChange"
     @onEnter="onEnter"
   >
 
@@ -40,6 +41,7 @@ import {
   SupplierdeliverRequestDetail,
   SupplierdeliverRequestDetailRules,
 } from './supplierdeliverRequestMain.data'
+import dayjs from 'dayjs'
 import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
 import * as SupplierdeliverRequestMainApi from '@/api/wms/supplierdeliverRequestMain'
 import * as PurchasePlanDetailApi from '@/api/wms/purchasePlanDetail'
@@ -97,10 +99,11 @@ const openFormByCreate = async ( data ) => {
     const setV = {}
     // 供应商代码回显
     setV['supplierCode'] = data['supplierCode'] // 供应商代码
+    setV['poNumber'] = data['poNumber'] //采购订单
     setV['ppNumber'] = data['number'] // 要货单号
     searchPage: SupplierApi.getSupplierPage
     //新增--选择完要货计划，自动展示明细
-    getSearchTableData(data['number'],'ppNumber','number')
+    getSearchTableData(data['number'],'ppNumber','number',0)
 
     // 设置计划到货时间
     let beginTime =  data['endTime']
@@ -108,6 +111,7 @@ const openFormByCreate = async ( data ) => {
       let deliveryDate =  formatDate(data['deliveryDate'],'YYYY-MM-DD')
       planArriveTimeStr.value = deliveryDate + ' '+ beginTime+":00"
       setV['planArriveTime']= new Date(planArriveTimeStr.value).valueOf();
+      setV['arriveTime']= new Date(planArriveTimeStr.value).valueOf();
     }
     formRef.value.open('create', null)
 
@@ -129,7 +133,7 @@ const openFormByCreate = async ( data ) => {
         formRef.value.formRef.setValues(setV)
     })
 }
-const openForm = async (type: string, row?: number) => {
+const openForm = async (type: string, row?: number, defaultSupplierCode?: string) => {
   if(type == "update"){
     SupplierdeliverRequestMain.allSchemas.formSchema.forEach((item) => {
       if(item.field == 'supplierCode'){
@@ -151,6 +155,7 @@ const openForm = async (type: string, row?: number) => {
     SupplierdeliverRequestMain.allSchemas.formSchema.forEach((item) => {
       if(item.field == 'supplierCode'){
         item.componentProps.isSearchList = true
+        item.value = defaultSupplierCode
       }
       if(item.field == 'ppNumber'){
         item.componentProps.isSearchList = true
@@ -187,14 +192,25 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
       const itemCodes = []
       val.forEach(item=>{
         const newRow = {...row}
+        newRow.id = dayjs().valueOf()
         newRow[formField] = item[searchField]
+        newRow['allowOverShipment'] = item['allowOverShipment'] // 是否允许超发
         newRow['poNumber'] = item['poNumber']
         newRow['itemCode'] = item['itemCode']
         newRow['poLine'] = item['poLine']
         newRow['orderQty'] = item['orderQty']
         newRow['uom'] = item['uom']
         newRow['id'] = item['id']
-        if(tableData.value.find(item1=>item1['itemCode'] == item['itemCode']&&item1['poLine'] == item['poLine']&&item1['poNumber'] == item['poNumber'])) return
+        newRow['planQty'] = item['planQty']
+        newRow['shippedQty'] = item['shippedQty']
+        newRow['qty'] = item['planQty'] - item['shippedQty']
+        newRow['produceDate'] = dayjs().valueOf() // 是否允许超发
+        let produceDateStr = formatDate(newRow['produceDate'],'YYYYMMDD');
+        newRow['batch'] = produceDateStr
+        newRow['supplierBatch'] = produceDateStr
+        newRow.expireDate =  item['expireTime']?addDay(newRow['produceDate'],item['expireTime']).valueOf():dayjs('2099-12-31').valueOf()
+
+        // if(tableData.value.find(item1=>item1['itemCode'] == item['itemCode']&&item1['poLine'] == item['poLine']&&item1['poNumber'] == item['poNumber'])) return
         
         itemCodes.push(item['itemCode'])
         tableData.value.push(newRow)
@@ -216,7 +232,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
       setV[formField] = val[0][searchField]
       if(formField == 'ppNumber'){
         //新增--选择完要货计划，自动展示明细
-        getSearchTableData(val[0]['number'],formField,searchField)
+        
+        setV['poNumber'] = val[0]['poNumber'] //采购订单
+        getSearchTableData(val[0]['number'],formField,searchField,0)
 
         // 设置计划到货时间
         
@@ -225,6 +243,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
           let deliveryDate =  formatDate(val[0]['deliveryDate'],'YYYY-MM-DD')
           planArriveTimeStr.value = deliveryDate + ' '+ beginTime+":00"
           setV['planArriveTime']= new Date(planArriveTimeStr.value).valueOf();
+          setV['arriveTime']= new Date(planArriveTimeStr.value).valueOf();
         }
         // 清空子表数据
         tableData.value = []
@@ -239,9 +258,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
   })
 }
 
-const getSearchTableData = async (number,formField,searchField)=>{
+const getSearchTableData = async (number,formField,searchField,isAll)=>{
   const {tableObject ,tableMethods} = useTable({
-    defaultParams:{number},
+    defaultParams:{number,flag:1,isAll},
     getListApi: PurchasePlanDetailApi.getPurchasePlanDetailPage // 分页接口
   })
   tableObject.pageSize = 500
@@ -257,11 +276,21 @@ const getSearchTableData = async (number,formField,searchField)=>{
   tableObject.tableList.forEach(row=>{
     const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...row}))
     newRow[formField] = row[searchField]
+    newRow['allowOverShipment'] = row['allowOverShipment'] // 是否允许超发
     newRow['poNumber'] = row['poNumber']
     newRow['itemCode'] = row['itemCode']
     newRow['poLine'] = row['poLine']
     newRow['orderQty'] = row['orderQty']
     newRow['uom'] = row['uom']
+    newRow['planQty'] = row['planQty']
+    newRow['shippedQty'] = row['shippedQty']
+    newRow['qty'] = row['planQty'] - row['shippedQty']
+    newRow['produceDate'] = dayjs().valueOf() // 是否允许超发
+    let produceDateStr = formatDate(newRow['produceDate'],'YYYYMMDD');
+    newRow['batch'] = produceDateStr
+    newRow['supplierBatch'] = produceDateStr
+    newRow.expireDate =  row['expireTime']?addDay(newRow['produceDate'],row['expireTime']).valueOf():dayjs('2099-12-31').valueOf()
+
     tableData.value.push(newRow)
     itemCodes.push(row['itemCode'])
   })
@@ -298,6 +327,33 @@ const submitForm = async (formType, submitData) => {
     formRef.value.formLoading = false
     return
   }
+  // 2.2. 如果物料不允许超发，申请发货数量不能大于 计划数量 - 已发货数量
+  let itemCodes = []				
+  let itemCodeSum = []				
+  data.subList.forEach(item=>{
+    if(item['allowOverShipment']!='TRUE'){
+      let qtyDefault = item['planQty'] - item['shippedQty']
+      if(item['qty']>qtyDefault){
+        itemCodes.push(item['itemCode'])
+      }
+
+      if(!itemCodeSum.includes(item['itemCode'])){
+        let planQty = item['planQty'] //计划数量
+        let sumQty = data.subList.filter(item1=>item1['itemCode']==item['itemCode']).reduce((prev, item1) => prev + item1['qty'],0)
+        if(sumQty>planQty){
+          itemCodeSum.push(item['itemCode'])
+        }
+      }
+    }
+  })
+  if(itemCodes.length>0){
+    message.error(`${itemCodes.join(',')}${t('ts.不允许超发')}`)
+    return
+  }
+  if(itemCodeSum.length>0){
+    message.error(`${itemCodeSum.join(',')}${t('ts.总数量超出计划数量')}`)
+    return
+  }
   try {
     if (formType === 'create') {
       let planArriveStr = formatDate(data.planArriveTime);
@@ -335,11 +391,31 @@ const submitForm = async (formType, submitData) => {
     formRef.value.formLoading = false
   }
 }
+
+
+const inputNumberChange = (field, val,row, index) => {
+  if(field=='qty'){
+    if(row['allowOverShipment']!='TRUE'){
+      let qtyDefault = row['planQty'] - row['shippedQty']
+      if(row['qty']>qtyDefault){
+        message.error(`${row['itemCode']}${t('ts.不允许超发')}`)
+      }
+      let planQty = row['planQty'] //计划数量
+      let sumQty = tableData.value.filter(item1=>item1['itemCode']==row['itemCode']).reduce((prev, item1) => prev + item1['qty'],0)
+      if(sumQty>planQty){
+        message.error(`${row['itemCode']}${t('ts.总数量超出计划数量')}`)
+      }
+    }
+  }
+  console.log('inputNumberChange',field, val,row, index)
+}
 const formFormDateChange = (field, val,row, index) => {
+  console.log('formFormDateChange',field, val,row, index)
   if(field == 'produceDate'){
     let produceDateStr = formatDate(val,'YYYYMMDD');
     row.batch = produceDateStr
     row.supplierBatch = produceDateStr
+    row.expireDate =  row['expireTime']?addDay(row['produceDate'],row['expireTime']).valueOf():dayjs('2099-12-31').valueOf()
   }
 }
 //供应商代码 回车搜索