From 051f4829a4467a9a3c9edfcbd8034d1eb673934a Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Tue, 2 Jul 2024 15:05:37 +0800
Subject: [PATCH 01/84] =?UTF-8?q?=E9=A2=84=E6=B5=8B=E5=91=A8=E6=9C=9F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/supplierCycle/index.ts            |  65 +++++
 .../supplierManage/supplierCycle/index.vue    | 244 ++++++++++++++++++
 .../supplierCycle/supplierCycle.data.ts       | 200 ++++++++++++++
 .../demandforecastingMain.data.ts             |  40 +++
 4 files changed, 549 insertions(+)
 create mode 100644 src/api/wms/supplierCycle/index.ts
 create mode 100644 src/views/wms/basicDataManage/supplierManage/supplierCycle/index.vue
 create mode 100644 src/views/wms/basicDataManage/supplierManage/supplierCycle/supplierCycle.data.ts

diff --git a/src/api/wms/supplierCycle/index.ts b/src/api/wms/supplierCycle/index.ts
new file mode 100644
index 000000000..da29ff1fc
--- /dev/null
+++ b/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: '/basic/supplier-cycle/senior', data })
+  } else {
+    return await request.get({ url: `/basic/supplier-cycle/page`, params })
+  }
+}
+
+// 查询要货预测周期详情
+export const getSupplierCycle = async (id: number) => {
+  return await request.get({ url: `/basic/supplier-cycle/get?id=` + id })
+}
+
+// 新增要货预测周期
+export const createSupplierCycle = async (data: SupplierCycleVO) => {
+  return await request.post({ url: `/basic/supplier-cycle/create`, data })
+}
+
+// 修改要货预测周期
+export const updateSupplierCycle = async (data: SupplierCycleVO) => {
+  return await request.put({ url: `/basic/supplier-cycle/update`, data })
+}
+
+// 删除要货预测周期
+export const deleteSupplierCycle = async (id: number) => {
+  return await request.delete({ url: `/basic/supplier-cycle/delete?id=` + id })
+}
+
+// 导出要货预测周期 Excel
+export const exportSupplierCycle = async (params) => {
+  return await request.download({ url: `/basic/supplier-cycle/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/basic/supplier-cycle/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/supplierManage/supplierCycle/index.vue b/src/views/wms/basicDataManage/supplierManage/supplierCycle/index.vue
new file mode 100644
index 000000000..a20c3f4b5
--- /dev/null
+++ b/src/views/wms/basicDataManage/supplierManage/supplierCycle/index.vue
@@ -0,0 +1,244 @@
+<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 #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </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:supplierCycle:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:supplierCycle:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:supplierCycle: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:supplierCycle:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:supplierCycle:delete'}), // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  var isHave =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>
diff --git a/src/views/wms/basicDataManage/supplierManage/supplierCycle/supplierCycle.data.ts b/src/views/wms/basicDataManage/supplierManage/supplierCycle/supplierCycle.data.ts
new file mode 100644
index 000000000..c17d4da1d
--- /dev/null
+++ b/src/views/wms/basicDataManage/supplierManage/supplierCycle/supplierCycle.data.ts
@@ -0,0 +1,200 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const SupplierCycleRules = reactive({
+  available: [required],
+  departmentCode: [required],
+})
+
+export const SupplierCycle = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: 'id',
+    field: 'id',
+    sort: 'custom',
+    isForm: false,
+    isTable:false,
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '星期一',
+    field: 'monday',
+    sort: 'custom',
+  },
+  {
+    label: '星期二',
+    field: 'tuesday',
+    sort: 'custom',
+  },
+  {
+    label: '星期三',
+    field: 'wednesday',
+    sort: 'custom',
+  },
+  {
+    label: '星期四',
+    field: 'thursday',
+    sort: 'custom',
+  },
+  {
+    label: '星期五',
+    field: 'friday',
+    sort: 'custom',
+  },
+  {
+    label: '星期六',
+    field: 'saturday',
+    sort: 'custom',
+  },
+  {
+    label: '星期日',
+    field: 'sunday',
+    sort: 'custom',
+  },
+  {
+    label: '版本号',
+    field: 'version',
+    sort: 'custom',
+    isTable:false,
+    isForm:false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isTable:false,
+    isForm:false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    isTable:false,
+    isForm:false,
+    formatter: dateFormatter,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+  },
+  {
+    label: '扩展属性',
+    field: 'extraProperties',
+    sort: 'custom',
+    isTable:false,
+    isForm:false,
+  },
+  {
+    label: '地点ID',
+    field: 'siteId',
+    sort: 'custom',
+    isTable:false,
+    isForm:false,
+  },
+  {
+    label: '开始时间',
+    field: 'beginTime',
+    sort: 'custom',
+    isTable:false,
+    isForm:false,
+    formatter: dateFormatter,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '结束时间',
+    field: 'endTime',
+    sort: 'custom',
+    isTable:false,
+    isForm:false,
+    formatter: dateFormatter,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    sort: 'custom',
+    isTable:false,
+    isForm:false,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    sort: 'custom',
+    isTable:false,
+    isForm:false,
+    form: {
+      component: 'Radio'
+    },
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    isTable:false,
+    isForm:false,
+  },
+  {
+    label: '权限所属人员id',
+    field: 'ruleUserId',
+    sort: 'custom',
+    isTable:false,
+    isForm:false,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    isTable:false,
+    isForm:false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
index 471262417..110b85c76 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
@@ -222,6 +222,46 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
+  {
+    label: '计划员',
+    field: 'planerId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false,
+    isForm: false,
+  },
+  {
+    label: '计划员名称',
+    field: 'planerUserName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false,
+    isForm: false,
+  },
+  {
+    label: '版本',
+    field: 'activeVersion',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false,
+    isForm: false,
+  },
+  {
+    label: '到货日期',
+    field: 'dueDate',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false,
+    isForm: false,
+  },
   {
     label: '操作',
     field: 'action',

From e206394c14adf3f00db18126994e9d950f23c9e0 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Tue, 2 Jul 2024 15:29:16 +0800
Subject: [PATCH 02/84] =?UTF-8?q?=E8=A6=81=E8=B4=A7=E9=A2=84=E6=B5=8B?=
 =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demandforecastingMain.data.ts             | 611 ++++++++++++++++++
 .../demandforecastingSupplierMain/index.vue   | 425 ++++++++++++
 2 files changed, 1036 insertions(+)
 create mode 100644 src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts
 create mode 100644 src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts
new file mode 100644
index 000000000..110b85c76
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts
@@ -0,0 +1,611 @@
+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 PurchaseMainApi from '@/api/wms/purchaseMain'
+import * as PurchaseDetailApi from '@/api/wms/purchaseDetail'
+import { PurchaseDetail, PurchaseMain } from '../purchaseMain/purchaseMain.data'
+const { t } = useI18n() // 国际化
+
+/**
+ * @returns {Array} 要货预测主表
+ */
+export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 200,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    form: {
+      labelMessage: '影响明细中物料代码，需在供应商物料中维护',
+      componentProps: {
+        enterSearch:true,
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '供应商信息', // 查询弹窗标题
+        searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
+        searchPage: SupplierApi.getSupplierPageSCP, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '版本号',
+    field: 'version',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '发布时间',
+    field: 'publishTime',
+    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,
+  },
+  {
+    label: '开始时间',
+    field: 'beginTime',
+    isTable: true,
+    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,
+  },
+  {
+    label: '结束时间',
+    field: 'endTime',
+    isTable: true,
+    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,
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false,
+    isForm: false,
+    form: {
+      value: 'PurchasePrediction',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.PURCHASE_ORDER_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    isForm:false,
+    isSearch: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTable:false,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width: '100%' },
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false,
+    isForm: false,
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '计划员',
+    field: 'planerId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false,
+    isForm: false,
+  },
+  {
+    label: '计划员名称',
+    field: 'planerUserName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false,
+    isForm: false,
+  },
+  {
+    label: '版本',
+    field: 'activeVersion',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false,
+    isForm: false,
+  },
+  {
+    label: '到货日期',
+    field: 'dueDate',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false,
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+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: true,
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select'
+    }
+  },
+  {
+    label: '预测日期',
+    field: 'predictTime',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    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: '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',
+    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'}]
+})
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue
new file mode 100644
index 000000000..bea1c5d35
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue
@@ -0,0 +1,425 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="[...DemandforecastingMain.allSchemas.searchSchema,...DemandforecastingDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="DemandforecastingMain.allSchemas"
+      :detailAllSchemas="DemandforecastingDetail.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table v-clientTable
+      :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 #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)" />
+      </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">
+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: 'DemandforecastingSupplierMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref([...DemandforecastingMain.allSchemas.tableColumns,...DemandforecastingDetail.allSchemas.tableMainColumns])
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccess = (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]
+      formRef.setValues(setV)
+    }
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  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, tableMethods } = useTable({
+  getListApi: DemandforecastingDetailApi.getDemandforecastingDetailPage // 分页接口
+})
+
+// 获得表格的各种操作
+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.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const 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 handleWit = async (id : number) => {
+    try {
+      // 下架的二次确认
+      await message.confirm(t('ts.是否下架所选中数据？'))
+      tableObject.loading = true
+      // 发起下架
+      await DemandforecastingMainApi.witPurchaseMain(id)
+      message.success(t('ts.下架成功!'))
+      tableObject.loading = false
+      // 刷新列表
+      await getList()
+    } 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 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
+  }
+}
+
+/**
+  * 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({
+  templateUrl: '',
+  templateTitle: `${t('ts.要货预测主导入模版')}.xlsx`
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await DemandforecastingMainApi.importTemplate()
+})
+</script>

From f4dc9210780270568e138907efd7601bd524b7d3 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Tue, 2 Jul 2024 16:35:46 +0800
Subject: [PATCH 03/84] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demandforecastingMain.data.ts             | 22 +++++++++++++---
 .../demandforecastingMain.data.ts             | 25 +++++++++++++++++--
 2 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
index 110b85c76..684532850 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
@@ -62,6 +62,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '发布时间',
     field: 'publishTime',
     formatter: dateFormatter,
+    isTable: false,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
@@ -83,7 +84,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '开始时间',
     field: 'beginTime',
-    isTable: true,
+    isTable: false,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -106,7 +107,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '结束时间',
     field: 'endTime',
-    isTable: true,
+    isTable: false,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -229,6 +230,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isSearch:true,
     isTable:false,
     isForm: false,
   },
@@ -249,6 +251,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isSearch:true,
     isTable:false,
     isForm: false,
   },
@@ -259,6 +262,18 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isSearch:true,
+    isTable:false,
+    isForm: false,
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch:true,
     isTable:false,
     isForm: false,
   },
@@ -315,7 +330,7 @@ export const DemandforecastingDetail = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.PREDICT_TIME_TYPE,
     sort: 'custom',
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     table: {
       width: 150
     },
@@ -334,6 +349,7 @@ export const DemandforecastingDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts
index 110b85c76..561ce9eee 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts
@@ -58,6 +58,17 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch:true,
+    isTable:false,
+    isForm: false,
+  },
   {
     label: '发布时间',
     field: 'publishTime',
@@ -69,6 +80,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -88,6 +100,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
+    isTable: false,
     sort: 'custom',
     table: {
       width: 180
@@ -111,6 +124,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
+    isTable: false,
     sort: 'custom',
     table: {
       width: 180
@@ -124,7 +138,6 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
-    isForm: false,
   },
   {
     label: '业务类型',
@@ -294,6 +307,14 @@ export const DemandforecastingMainRules = reactive({
  * @returns {Array} 要货预测子表
  */
 export const DemandforecastingDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '是否已读',
+    field: 'isRead',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '单据号',
     field: 'number',
@@ -315,7 +336,7 @@ export const DemandforecastingDetail = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.PREDICT_TIME_TYPE,
     sort: 'custom',
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     table: {
       width: 150
     },

From 60468f06eaec5b8da8ec6e2013a9bc31d251bd3e Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Wed, 3 Jul 2024 14:00:01 +0800
Subject: [PATCH 04/84] =?UTF-8?q?=E8=A6=81=E8=B4=A7=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SearchTable/src/SearchTable.vue           |   3 +-
 .../purchasePlanMain/index.vue                |  52 +++++-
 .../purchasePlanMain/purchasePlanMain.data.ts | 158 +++++++++++-------
 3 files changed, 149 insertions(+), 64 deletions(-)

diff --git a/src/components/SearchTable/src/SearchTable.vue b/src/components/SearchTable/src/SearchTable.vue
index edbac8a4a..d68fdc039 100644
--- a/src/components/SearchTable/src/SearchTable.vue
+++ b/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>
@@ -217,7 +218,7 @@ const buttonBaseClick = (val, item) => {
 }
 
 
-defineExpose({ open,openData,hiddenFilterButton ,changeDialogWidth}) // 提供 open 方法，用于打开弹窗
+defineExpose({ open,openData,hiddenFilterButton ,changeDialogWidth,searchFormClick}) // 提供 open 方法，用于打开弹窗
 
 // Table 组件 ref
 const searchTableRef = ref()
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index 905708139..c5ead4ca7 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/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 :schema="[...PurchasePlanMain.allSchemas.searchSchema,...PurchasePlanDetail.allSchemas.searchSchema]" @search="searchList" @reset="searchList"/>
   </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}">
-        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
-          <span>{{ row.number }}</span>
+      <template #supplierCode="{row}">
+        <el-button type="primary" link @click="openDetail(row, '供应商代码', row.supplierCode)">
+          <span>{{ row.supplierCode }}</span>
         </el-button>
       </template>
       <template #action="{ row,$index }">
@@ -51,7 +51,16 @@
     @tableSelectionDelete="tableSelectionDelete"
     @searchTableSuccess="searchTableSuccess" 
     @submitForm="submitForm" 
-    @onEnter="onEnter"/>
+    @onEnter="onEnter">
+    <template #searchQuerypoNumber>
+     <div style="display:flex;flex-direction: row;">
+      <div v-for="dict in orderTypeArray" style="margin-right: 20px;">
+        <span style="margin-right: 10px;">{{dict.label}}</span>
+        <el-switch  v-model="dict.switch" @change="updateOrderTypeParams"/>
+      </div>
+     </div>
+    </template>
+  </BasicForm>
 
   <!-- 详情 -->
   <!-- 隐藏子表编辑和删除是因为要货计划以后是接口发过来的，而且我们的计划数量是放入到采购订单已计划数量里，无法再次编辑数量-->
@@ -91,6 +100,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' })
 
@@ -107,6 +117,38 @@
     tableColumns.value = val
   }
 
+  const orderTypeArray = ref(getStrDictOptions(DICT_TYPE.PURCHASE_ORDER_TYPE).map(item=>({...item,switch:true})))
+  const updateOrderTypeParams = ()=>{
+    console.log('orderTypeArray',orderTypeArray)
+    let orderTypeValue = []
+    orderTypeArray.value.forEach(item=>{
+      if(item.switch){
+        orderTypeValue.push(item.value)
+      }
+    })
+    if(orderTypeValue.length==1){
+      formRef.value.searchTableRef.searchFormClick({
+        filters:[{
+          action: "==",
+          column: "type",
+          value: orderTypeValue[0]
+        }]
+      })
+    }else if(orderTypeValue.length==0||orderTypeValue.length==orderTypeArray.length){
+      formRef.value.searchTableRef.searchFormClick({
+        filters:[]
+      })
+    }else{
+      formRef.value.searchTableRef.searchFormClick({
+        filters:[{
+          action: "in",
+          column: "type",
+          value: orderTypeValue.join(',')
+        }]
+      })
+    }
+  }
+
   // 查询页面返回
   const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
     console.log('searchTableSuccess', formField, searchField, val, formRef, type, row)
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
index b4938d19e..afe8158a3 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
@@ -12,25 +12,16 @@ 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,
     form: {
       labelMessage: '影响明细中物料代码，需在供应商物料中维护',
       componentProps: {
@@ -49,6 +40,59 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  //仅是主列表页面的筛选搜索条件
+  {
+    label: '送达日期',
+    field: 'deliveryDate',
+    sort: 'custom',
+    isDetail:false,
+    isTable: false,
+    isForm:false,
+    isTableForm:false,
+    isSearch:true,
+    formatter: dateFormatter,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD',
+        type: 'daterange',
+        defaultTime: [new Date('1 '), new Date('1 ')]
+      }
+    },
+  },
+  {
+    label: '送达日期',
+    field: 'deliveryDate',
+    table: {
+      width: 150
+    },
+    formatter: dateFormatter2,
+    sortTableDefault:2,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isForm: false,
+    table: {
+      width: 180,
+    },
+    sortTableDefault:11,
+    isSearch: true
+  },
+  
   {
     label: '采购订单',
     field: 'poNumber',
@@ -110,47 +154,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  //仅是主列表页面的筛选搜索条件
-  {
-    label: '送达日期',
-    field: 'deliveryDate',
-    sort: 'custom',
-    isDetail:false,
-    isTable: false,
-    isForm:false,
-    isTableForm:false,
-    isSearch:true,
-    formatter: dateFormatter,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD',
-        type: 'daterange',
-        defaultTime: [new Date('1 '), new Date('1 ')]
-      }
-    },
-  },
-  {
-    label: '送达日期',
-    field: 'deliveryDate',
-    table: {
-      width: 150
-    },
-    sortTableDefault:1000,
-    formatter: dateFormatter2,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width: '100%'},
-        type: 'date',
-        dateFormat: 'YYYY-MM-DD',
-        valueFormat: 'x',
-      }
-    },
-    detail: {
-      dateFormat: 'YYYY-MM-DD'
-    },
-  },
+  
   {
     label: '时间窗口',
     field: 'timeWindow',
@@ -167,7 +171,9 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    sortTableDefault:1001,
+    isTable:false,
+    isForm:false,
+    isDetail:false,
     form:{
       component:"TimePicker",
       componentProps: {
@@ -182,7 +188,9 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    sortTableDefault:1002,
+    isTable:false,
+    isForm:false,
+    isDetail:false,
     form:{
       component:"TimePicker",
       componentProps: {
@@ -238,6 +246,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:12,
     form: {
       value: '1',
       componentProps: {
@@ -379,6 +388,8 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isTable: false,
+    isForm:false,
+    isDetail:false,
   },
   {
     label: '操作',
@@ -443,7 +454,8 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '采购订单号',
     field: 'poNumber',
     isSearch:true,
-    isTable:false,
+    isTable:true,
+    sortTableDefault:8,
     isForm:false,
     isTableForm:false
   },
@@ -454,6 +466,8 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    hiddenInMain:true,
+    isTableForm:false,
     tableForm: {
       disabled: true,
       isInpuFocusShow: false,
@@ -511,6 +525,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:9,
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
@@ -560,6 +575,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:3,
     isSearch:true,
     form: {
       componentProps: {
@@ -582,6 +598,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
         disabled: true
       }
     },
+    sortTableDefault:9,
     tableForm: {
       disabled: true
     }
@@ -598,6 +615,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
       type: 'InputNumber',
       precision: 6
     },
+    sortTableDefault:4,
     form: {
       component: 'InputNumber',
       componentProps: {
@@ -614,8 +632,29 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTableForm: false,
     isForm: false,
-    hiddenInMain:true,
-
+    sortTableDefault:5,
+  },
+  {
+    label: '已收货数量（没有字段，需要加）',
+    field: 'shippedQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    sortTableDefault:6,
+  },
+  {
+    label: '在途数量（没有字段，需要加）',
+    field: 'shippedQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    sortTableDefault:7,
   },
   {
     label: '计量单位',
@@ -627,6 +666,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:10,
     tableForm: {
       type: 'Select',
       disabled:true,
@@ -638,6 +678,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isTableForm:false,
     hiddenInMain:true,
     sort: 'custom',
     table: {
@@ -697,6 +738,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'remark',
     sort: 'custom',
     hiddenInMain:true,
+    isTableForm:false,
     table: {
       width: 150
     },

From e5d8efbb76d129d42146ba4e45b65244ff6a2ece Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Wed, 3 Jul 2024 14:01:40 +0800
Subject: [PATCH 05/84] =?UTF-8?q?=E8=A6=81=E8=B4=A7=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicForm.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 5fa0fbd9a..9e7f6cfd9 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -127,7 +127,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'
@@ -837,7 +841,7 @@ const buttonOperationClick = (row, label, index)=> {
 }
 
 
-defineExpose({ open, formRef, opensearchTable, dialogVisible, formLoading ,handleAddTable,changeDialogWidth}) // 提供 open 方法，用于打开弹窗
+defineExpose({ open, formRef, opensearchTable, dialogVisible, formLoading ,handleAddTable,changeDialogWidth,searchTableRef}) // 提供 open 方法，用于打开弹窗
 
 </script>
 <style lang="scss" scoped>

From 6cb0258636fbae9e9dc4671530ce08cb74e807d3 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Wed, 3 Jul 2024 14:53:58 +0800
Subject: [PATCH 06/84] =?UTF-8?q?=E8=A6=81=E8=B4=A7=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/demandforecastingDetail/index.ts  |   5 +
 src/components/Search/src/Search.vue          | 123 +++++-
 .../demandforecastingMain.data.ts             | 399 ++++--------------
 .../demandforecastingMain/index.vue           | 318 ++------------
 4 files changed, 248 insertions(+), 597 deletions(-)

diff --git a/src/api/wms/demandforecastingDetail/index.ts b/src/api/wms/demandforecastingDetail/index.ts
index f45e61a27..827b23ada 100644
--- a/src/api/wms/demandforecastingDetail/index.ts
+++ b/src/api/wms/demandforecastingDetail/index.ts
@@ -50,3 +50,8 @@ 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) => {
+  return await request.get({ url: `/wms/demandforecasting-detail/queryPageTableHead`, params })
+}
diff --git a/src/components/Search/src/Search.vue b/src/components/Search/src/Search.vue
index 8ac7e2a60..d24477819 100644
--- a/src/components/Search/src/Search.vue
+++ b/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,21 @@ const props = defineProps({
   model: {
     type: Object as PropType<Recordable>,
     default: () => ({})
+  },
+  // 详情数据
+  detailData: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  showSearchTableQueryFields:{
+    type: Array,
+    required: false,
+    default: []
   }
 })
 
-const emit = defineEmits(['search', 'reset','onInput'])
+const emit = defineEmits(['search', 'reset','onInput','searchTableSuccess'])
 
 const visible = ref(true)
 
@@ -92,6 +104,107 @@ const onInput = (field,value) => {
   emit('onInput', 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) {
+        _searchCondition[searchCondition[i].key] = formRef.value.formModel[searchCondition[i].value]
+          ? formRef.value.formModel[searchCondition[i].value]
+          : props.detailData
+          ? props.detailData[searchCondition[i].value]
+          : row
+          ? row[searchCondition[i].value]
+          : ''
+        // 是否含有空参数情况
+        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 +237,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 +261,7 @@ defineExpose({setFormValues}) // 提供 open 方法，用于打开弹窗
       hide-required-asterisk
       @register="register"
       @onInput="onInput"
+      @opensearchTable="opensearchTable"
     >
       <template #action>
         <div v-if="layout === 'inline'">
@@ -188,6 +307,8 @@ defineExpose({setFormValues}) // 提供 open 方法，用于打开弹窗
       <slot name="actionMore"></slot>
     </div>
   </template>
+  <SearchTable ref="searchTableRef" :showSearchTableQueryFields="showSearchTableQueryFields" @searchTableSuccess="searchTableSuccess" />
+
 </template>
 <style lang="scss" scoped>
 .search ::v-deep(.el-form-item) {
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
index 684532850..a7bc10e7c 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
@@ -4,6 +4,8 @@ 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'
@@ -14,15 +16,29 @@ const { t } = useI18n() // 国际化
  */
 export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '单据号',
-    field: 'number',
+    label: '计划员',
+    field: 'planerId',
     sort: 'custom',
     table: {
-      width: 200,
-      fixed: 'left'
+      width: 150
     },
+    isTable:false,
     isForm: false,
-    isSearch: true,
+    isSearch:true,
+    search:{
+      component:'Select',
+      componentProps: {
+        showAll:true,// 备用做全选
+        multiple:true,
+        options:[{
+          label:'1111',
+          value: 1111
+        },{
+          label:'222',
+          value: 222
+        }]
+      }
+    },
   },
   {
     label: '供应商代码',
@@ -32,8 +48,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isSearch: true,
-    form: {
-      labelMessage: '影响明细中物料代码，需在供应商物料中维护',
+    search: {
       componentProps: {
         enterSearch:true,
         isSearchList: true, // 开启查询弹窗
@@ -51,213 +66,91 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '版本号',
-    field: 'version',
+    label: '订单号',
+    field: 'poNumber',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '发布时间',
-    field: 'publishTime',
-    formatter: dateFormatter,
-    isTable: false,
-    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,
-  },
-  {
-    label: '开始时间',
-    field: 'beginTime',
-    isTable: false,
-    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,
-  },
-  {
-    label: '结束时间',
-    field: 'endTime',
-    isTable: false,
-    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,
-  },
-  {
-    label: '业务类型',
-    field: 'businessType',
+    label: '订单行',
+    field: 'poLine',
     sort: 'custom',
     table: {
       width: 150
-    },
-    isTable:false,
-    isForm: false,
-    form: {
-      value: 'PurchasePrediction',
-      componentProps: {
-        disabled: true
-      }
     }
   },
   {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.PURCHASE_ORDER_STATUS,
-    dictClass: 'string',
-    isTable: true,
-    isForm:false,
-    isSearch: true,
+    label: '物料代码',
+    field: 'itemCode',
     sort: 'custom',
     table: {
       width: 150
     },
-    form: {
-      value: '1',
+    isSearch:true,
+    isTable:true,
+    isForm: false,
+    search: {
+      // labelMessage: '信息提示说明！！！',
       componentProps: {
-        disabled: true
+        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
+        }]
       }
     }
   },
   {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable:false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: { width: '100%' },
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-    isForm: false,
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    isForm: false,
-  },
-  {
-    label: '是否可用',
-    field: 'available',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
+    label: '版本号',
+    field: 'version',
     sort: 'custom',
     table: {
       width: 150
     },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
+    isSearch:true,
+    search: {
+      // labelMessage: '信息提示说明！！！',
       componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+        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
+        }]
       }
-    },
-  },
-  {
-    label: '计划员',
-    field: 'planerId',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch:true,
-    isTable:false,
-    isForm: false,
-  },
-  {
-    label: '计划员名称',
-    field: 'planerUserName',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    isForm: false,
-  },
-  {
-    label: '版本',
-    field: 'activeVersion',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch:true,
-    isTable:false,
-    isForm: false,
+    }
   },
   {
     label: '到货日期',
     field: 'dueDate',
+    formatter: dateFormatter,
     sort: 'custom',
     table: {
       width: 150
@@ -265,26 +158,14 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch:true,
     isTable:false,
     isForm: false,
-  },
-  {
-    label: '物料代码',
-    field: 'itemCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch:true,
-    isTable:false,
-    isForm: false,
-  },
-  {
-    label: '操作',
-    field: 'action',
-    isDetail: false,
-    isForm: false,
-    table: {
-      width: 300,
-      fixed: 'right'
+    search: {
+      value:[],
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD',
+        type: 'daterange',
+        defaultTime: [new Date('1 '), new Date('1 ')]
+      }
     },
   }
 ]))
@@ -365,117 +246,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',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
index b2df52603..74a1f4f75 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
+++ b/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 :schema="DemandforecastingMain.allSchemas.searchSchema" @search="searchClick" @reset="searchClick" @searchTableSuccess="searchTableSuccess"/>
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,7 +12,6 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="DemandforecastingMain.allSchemas"
-      :detailAllSchemas="DemandforecastingDetail.allSchemas"
     />
 
   <!-- 列表 -->
@@ -27,59 +26,10 @@
       v-model:pageSize="tableObject.pageSize"
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
-    >
-      <template #number="{row}">
-        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
-          <span>{{ row.number }}</span>
-        </el-button>
-      </template>
-      <template #action="{ row,$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,11 +48,23 @@ 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 updateDateTableColumns = ()=>{
+  console.log('tableObjectHead',tableObjectHead)
+  let dateColumns = []
+  tableObjectHead.tableList.forEach(item=>{
+    dateColumns.push({
+      field: item,
+      label: item,
+    })
+  })
+  tableColumns.value  = [...orginTableColumns.value,...dateColumns]
+  console.log('tableColumns',tableColumns.value)
 }
 
 // 查询页面返回
@@ -123,19 +85,14 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
     }
   })
 }
-// 查询页面返回——详情
-const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
-  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
 
 const { tableObject, tableMethods } = useTable({
   getListApi: DemandforecastingDetailApi.getDemandforecastingDetailPage // 分页接口
@@ -146,29 +103,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) => {
-  if (val == 'add') { // 新增
-    openForm('create')
-  } else if (val == 'import') { // 导入
-    handleImport()
-  } else if (val == 'export') { // 导出
+const buttonBaseClick = async (val, item) => {
+  if (val == 'export') { // 导出
     handleExport()
   } else if (val == 'refresh') { // 刷新
     if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
@@ -176,7 +119,10 @@ const buttonBaseClick = (val, item) => {
         filters: tableObject.params.filters
       })
     } else {
+      await getListHead()
+      updateDateTableColumns()
       getList()
+
     }
   } else if (val == 'filtrate') { // 筛选
   } else { // 其他按钮
@@ -184,148 +130,13 @@ 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 handleWit = async (id : number) => {
-    try {
-      // 下架的二次确认
-      await message.confirm(t('ts.是否下架所选中数据？'))
-      tableObject.loading = true
-      // 发起下架
-      await DemandforecastingMainApi.witPurchaseMain(id)
-      message.success(t('ts.下架成功!'))
-      tableObject.loading = false
-      // 刷新列表
-      await getList()
-    } catch { }finally{
-      tableObject.loading = false
-    }
-  }
 
-/** 详情操作 */
-const detailRef = ref()
-const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue,'planDemandforecastingMain')
+const searchClick = async (data)=>{
+  await setSearchParamsHead(data)
+  updateDateTableColumns()
+  setSearchParams(data)
 }
-
-/** 删除按钮操作 */
-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 exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
@@ -342,60 +153,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 +160,6 @@ const importTemplateData = reactive({
   templateTitle: `${t('ts.要货预测主导入模版')}.xlsx`
 })
 
-// 导入成功之后
-const importSuccess = () => {
-  getList()
-}
-
 // 筛选提交
 const searchFormClick = (searchData) => {
   tableObject.params = {
@@ -419,6 +171,8 @@ const searchFormClick = (searchData) => {
 
 /** 初始化 **/
 onMounted(async () => {
+  await getListHead()
+  updateDateTableColumns()
   getList()
   importTemplateData.templateUrl = await DemandforecastingMainApi.importTemplate()
 })

From 08d2e6862e9153fed3b45b3e50095eeef4408692 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Wed, 3 Jul 2024 15:00:20 +0800
Subject: [PATCH 07/84] =?UTF-8?q?=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/demandforecastingDetail/index.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/api/wms/demandforecastingDetail/index.ts b/src/api/wms/demandforecastingDetail/index.ts
index 827b23ada..f07440a8c 100644
--- a/src/api/wms/demandforecastingDetail/index.ts
+++ b/src/api/wms/demandforecastingDetail/index.ts
@@ -22,6 +22,14 @@ export const getDemandforecastingDetailPage = async (params) => {
     const data = {...params}
     return await request.post({ url: '/wms/demandforecasting-detail/senior', data })
   } else {
+    console.log('params',params)
+    if(params.dueDate&&params.dueDate.length>0){
+      params.startDate = params.dueDate[0]
+    }
+    if(params.dueDate&&params.dueDate.length>1){
+      params.endDate = params.dueDate[1]
+    }
+    params.dueDate = ''
     return await request.get({ url: `/wms/demandforecasting-detail/page`, params })
   }
 }

From 76f62de928887689bbb07044829066f68dbb7db8 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Wed, 3 Jul 2024 15:01:24 +0800
Subject: [PATCH 08/84] =?UTF-8?q?=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/demandforecastingDetail/index.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/api/wms/demandforecastingDetail/index.ts b/src/api/wms/demandforecastingDetail/index.ts
index f07440a8c..e2e61f681 100644
--- a/src/api/wms/demandforecastingDetail/index.ts
+++ b/src/api/wms/demandforecastingDetail/index.ts
@@ -61,5 +61,12 @@ export const exportDemandforecastingDetail = async (params) => {
 
 // 查询要货预测主列表
 export const getPageTableHead = async (params) => {
+  if(params.dueDate&&params.dueDate.length>0){
+    params.startDate = params.dueDate[0]
+  }
+  if(params.dueDate&&params.dueDate.length>1){
+    params.endDate = params.dueDate[1]
+  }
+  params.dueDate = ''
   return await request.get({ url: `/wms/demandforecasting-detail/queryPageTableHead`, params })
 }

From 17d7a9ff870097c3ef1c9c39974be96ce6575f85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Wed, 3 Jul 2024 17:27:55 +0800
Subject: [PATCH 09/84] =?UTF-8?q?=E8=A1=A5=E6=96=99=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E5=AD=90=E6=B7=BB=E5=8A=A0=E6=9C=AA=E6=89=A7=E8=A1=8C=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E6=95=B0=E9=87=8F=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repleinshRequestMain.data.ts                    | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
index f18f34c0d..91ff71563 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
@@ -831,6 +831,19 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     hiddenInMain:true,
     isForm: false
   },
+  {
+    label: '未执行任务数量',
+    field: 'unexecutedQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    },
+    isTableForm:false,
+    hiddenInMain:true,
+  },
   {
     label: '操作',
     field: 'action',

From 74cd111ae8ecc62a2e7d16687a4e73b1ee68b00c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Wed, 3 Jul 2024 19:18:39 +0800
Subject: [PATCH 10/84] =?UTF-8?q?=E9=9A=94=E7=A6=BB=E9=80=80=E6=96=99?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionreturnRequestMainNo.data.ts        | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts
index 1901bc019..1bed49b17 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts
@@ -165,16 +165,20 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
       searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类
       searchPage: BalanceApi.getBalancePage, // 查询弹窗所需分页方法
       searchCondition:[
-      //   {
-      //   key: 'locationCode',
-      //   value: 'fromLocationCode',
-      //   message: '请填写从库位代码！',
-      //   isMainValue: true
-      // },
+        {
+        key: 'locationCode',
+        value: 'fromLocationCode',
+        message: '请填写从库位代码！',
+        isMainValue: true
+      },
       {
         key: 'inventoryStatus',
         value: 'OK',
         isMainValue: false
+      },{
+        key: 'businessType',
+        value: 'ReturnToHold', // 隔离退料
+        isMainValue: false
       }]
     },
   },

From 86eddac955bc81a2eaa26eb5b5be053939db5b6e Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 4 Jul 2024 09:16:43 +0800
Subject: [PATCH 11/84] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/demandforecastingMain/index.ts    | 10 +++++++++-
 .../demandforecastingMain.data.ts             | 19 +++++++++++--------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/api/wms/demandforecastingMain/index.ts b/src/api/wms/demandforecastingMain/index.ts
index 68b471769..1c1478e5d 100644
--- a/src/api/wms/demandforecastingMain/index.ts
+++ b/src/api/wms/demandforecastingMain/index.ts
@@ -80,4 +80,12 @@ export const exportDemandforecastingMain = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/demandforecasting-main/get-import-template' })
-}
\ No newline at end of file
+}
+
+
+// 计划员
+export const queryUserPlanerList = async () => {
+  return await request.post({ url: `/wms/demandforecasting-main/queryUserPlanerList`,data:{} })
+
+}
+
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
index a7bc10e7c..529031a9f 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
@@ -9,7 +9,11 @@ import {Itembasic} from "@/views/wms/basicDataManage/itemManage/itembasic/itemba
 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'
+
 const { t } = useI18n() // 国际化
+const planerList = await DemandforecastingMainApi.queryUserPlanerList()
+console.log('planerList',planerList)
 
 /**
  * @returns {Array} 要货预测主表
@@ -27,16 +31,14 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch:true,
     search:{
       component:'Select',
+      value:planerList.length>0?[planerList[0]['planerId']]:[],
       componentProps: {
         showAll:true,// 备用做全选
         multiple:true,
-        options:[{
-          label:'1111',
-          value: 1111
-        },{
-          label:'222',
-          value: 222
-        }]
+        options:planerList.map(item=>({
+          label:item.planerUsername,
+          value:item.planerId
+        }))
       }
     },
   },
@@ -45,11 +47,12 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'supplierCode',
     sort: 'custom',
     table: {
-      width: 150
+      width: 150,
     },
     isSearch: true,
     search: {
       componentProps: {
+        multiple: true,
         enterSearch:true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择供应商代码', // 输入框占位文本

From 34930a43adf906449ffb793d75c0919cb5a74837 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 4 Jul 2024 13:15:17 +0800
Subject: [PATCH 12/84] =?UTF-8?q?=E8=A6=81=E8=B4=A7=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasePlanMain/index.vue                |  57 ++---
 .../purchasePlanMain/purchasePlanMain.data.ts | 199 +++++++++++++-----
 2 files changed, 163 insertions(+), 93 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index c5ead4ca7..c726ac833 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/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 :schema="[...PurchasePlanMain.allSchemas.searchSchema,...PurchasePlanDetail.allSchemas.searchSchema]" @search="searchList" @reset="searchList" @searchTableSuccess="searchQueryTableSuccess"/>
   </ContentWrap>
 
   <!-- 列表头部 -->
@@ -45,22 +45,14 @@
     :apiUpdate="PurchasePlanMainApi.updatePurchasePlanMain" 
     :apiCreate="PurchasePlanMainApi.createPurchasePlanMain"
     :isBusiness="true" 
+    :isShowReduceButtonSelection="isShowButtonSelection" 
+    :isShowButton="isShowButtonSelection"
     @handleAddTable="handleAddTable" 
     @handleDeleteTable="handleDeleteTable"
-    :isShowReduceButtonSelection="true"
     @tableSelectionDelete="tableSelectionDelete"
     @searchTableSuccess="searchTableSuccess" 
     @submitForm="submitForm" 
-    @onEnter="onEnter">
-    <template #searchQuerypoNumber>
-     <div style="display:flex;flex-direction: row;">
-      <div v-for="dict in orderTypeArray" style="margin-right: 20px;">
-        <span style="margin-right: 10px;">{{dict.label}}</span>
-        <el-switch  v-model="dict.switch" @change="updateOrderTypeParams"/>
-      </div>
-     </div>
-    </template>
-  </BasicForm>
+    @onEnter="onEnter"/>
 
   <!-- 详情 -->
   <!-- 隐藏子表编辑和删除是因为要货计划以后是接口发过来的，而且我们的计划数量是放入到采购订单已计划数量里，无法再次编辑数量-->
@@ -117,36 +109,14 @@
     tableColumns.value = val
   }
 
-  const orderTypeArray = ref(getStrDictOptions(DICT_TYPE.PURCHASE_ORDER_TYPE).map(item=>({...item,switch:true})))
-  const updateOrderTypeParams = ()=>{
-    console.log('orderTypeArray',orderTypeArray)
-    let orderTypeValue = []
-    orderTypeArray.value.forEach(item=>{
-      if(item.switch){
-        orderTypeValue.push(item.value)
-      }
+  
+  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)
     })
-    if(orderTypeValue.length==1){
-      formRef.value.searchTableRef.searchFormClick({
-        filters:[{
-          action: "==",
-          column: "type",
-          value: orderTypeValue[0]
-        }]
-      })
-    }else if(orderTypeValue.length==0||orderTypeValue.length==orderTypeArray.length){
-      formRef.value.searchTableRef.searchFormClick({
-        filters:[]
-      })
-    }else{
-      formRef.value.searchTableRef.searchFormClick({
-        filters:[{
-          action: "in",
-          column: "type",
-          value: orderTypeValue.join(',')
-        }]
-      })
-    }
   }
 
   // 查询页面返回
@@ -400,15 +370,20 @@ const getSearchTableData = async (number,formField,searchField)=>{
       })
     }
   }
+
+  const isShowButtonSelection = ref(false)
   /** 添加/修改操作 */
   const formRef = ref()
   const openForm = async (type : string, row ?: number) => {
     tableData.value = [] // 重置明细数据
     formRef.value.open(type, row)
     if('create'==type){
+      isShowButtonSelection.value = false
       nextTick(async () => {
         formRef.value.formRef.setValues({deliveryDate:dayjs().format('YYYY-MM-DD')})
       })
+    }else{
+      isShowButtonSelection.value = true
     }
   }
 // 获取部门 用于详情 部门回显
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
index afe8158a3..58d6358c1 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
@@ -6,6 +6,8 @@ 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() // 国际化
 
 /**
@@ -22,6 +24,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true,
     sortTableDefault:1,
+    sortSearchDefault:1,
     form: {
       labelMessage: '影响明细中物料代码，需在供应商物料中维护',
       componentProps: {
@@ -38,6 +41,22 @@ 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
+        }]
+      }
     }
   },
   //仅是主列表页面的筛选搜索条件
@@ -50,6 +69,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     isForm:false,
     isTableForm:false,
     isSearch:true,
+    sortSearchDefault:3,
     formatter: dateFormatter,
     search: {
       component: 'DatePicker',
@@ -60,36 +80,17 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
+  
   {
-    label: '送达日期',
-    field: 'deliveryDate',
-    table: {
-      width: 150
-    },
-    formatter: dateFormatter2,
-    sortTableDefault:2,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width: '100%'},
-        type: 'date',
-        dateFormat: 'YYYY-MM-DD',
-        valueFormat: 'x',
-      }
-    },
-    detail: {
-      dateFormat: 'YYYY-MM-DD'
-    },
-  },
-  {
-    label: '单据号',
+    label: '要货计划单号',
     field: 'number',
     sort: 'custom',
     isForm: false,
     table: {
       width: 180,
     },
-    sortTableDefault:11,
+    sortTableDefault:8,
+    sortSearchDefault:4,
     isSearch: true
   },
   
@@ -112,6 +113,10 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
         searchAllSchemas: PurchaseMain.allSchemas,
         searchPage: PurchaseMainApi.getPurchaseMainPage,
         searchCondition: [{
+          key: 'type',
+          value: 'SCHEDULE',
+          isMainValue: false
+        },{
           key: 'available',
           value: 'TRUE',
           isMainValue: false
@@ -128,6 +133,41 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '送达日期',
+    field: 'deliveryDate',
+    table: {
+      width: 150
+    },
+    formatter: dateFormatter2,
+    sortTableDefault:2,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+  },
+  {
+    label: '采购订单类型',
+    field: 'status',
+    sort: 'custom',
+    dictType: DICT_TYPE.PURCHASE_ORDER_TYPE,
+    dictClass: 'string',
+    isTable: false,
+    isForm:true,
+    isSearch: true,
+    table: {
+      width: 150
+    },
+    
+  },
   {
     label: '收货人',
     field: 'contacts',
@@ -242,11 +282,12 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictClass: 'string',
     isTable: true,
     isForm:false,
-    isSearch: false,
+    isSearch: true,
     table: {
       width: 150
     },
-    sortTableDefault:12,
+    sortTableDefault:13,
+    sortSearchDefault:6,
     form: {
       value: '1',
       componentProps: {
@@ -436,7 +477,7 @@ export const PurchasePlanMainRules = reactive({
  */
 export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '单据号',
+    label: '要货计划单号',
     field: 'number',
     sort: 'custom',
     isTableForm: false,
@@ -455,9 +496,36 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'poNumber',
     isSearch:true,
     isTable:true,
-    sortTableDefault:8,
+    sortTableDefault:9,
+    sortSearchDefault:2,
     isForm:false,
-    isTableForm:false
+    isTableForm:false,
+    search: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        dialogWidth:'1085px',//搜索出来弹窗的宽度
+        isSearchList: 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
+        }]
+      }
+    }
   },
   {
     label: '订单号',
@@ -518,6 +586,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',
@@ -525,7 +613,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    sortTableDefault:9,
+    sortTableDefault:10,
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
@@ -576,6 +664,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     sortTableDefault:3,
+    sortSearchDefault:5,
     isSearch:true,
     form: {
       componentProps: {
@@ -584,6 +673,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
+        }]
+      }
     }
   },
   {
@@ -598,31 +710,13 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
         disabled: true
       }
     },
-    sortTableDefault:9,
+    sortTableDefault:11,
     tableForm: {
       disabled: true
     }
 
   },
-  {
-    label: '计划数量',
-    field: 'planQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      type: 'InputNumber',
-      precision: 6
-    },
-    sortTableDefault:4,
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        precision: 6
-      }
-    }
-  },
+  
   {
     label: '已发货数量',
     field: 'shippedQty',
@@ -666,7 +760,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    sortTableDefault:10,
+    sortTableDefault:12,
     tableForm: {
       type: 'Select',
       disabled:true,
@@ -762,7 +856,7 @@ const validatePlanQty = (rule, value, callback) => {
   if (numReg.test(value)&&value>0) {
       callback()
   } else {
-      callback(new Error('计划数量不能为0'))
+      callback(new Error('计划数量不能小于0'))
   }
 }
 //表单校验
@@ -778,7 +872,8 @@ export const PurchasePlanDetailRules = reactive({
   ],
   planQty: [
     { required: true, message: '请输入计划数量', trigger: 'blur' },
-    { validator:validatePlanQty, message: '计划数量不能为0', trigger: 'blur'}
+    { max: 0, message: '计划数量不能小于0', trigger: 'blur' }
+    // { validator:validatePlanQty, message: '计划数量不能小于0', trigger: 'blur'}
   ],
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }

From a9a556ac966abfea3bcf87fe2e1dbcc0deb78bfc Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 4 Jul 2024 13:21:08 +0800
Subject: [PATCH 13/84] =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasePlanMain/index.vue                | 37 ++++++++++---------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index c726ac833..31240d9d6 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@@ -641,23 +641,26 @@ const handleSelectionPublish = async ()=>{
     data.subList = []
     let flag = false
     for (let item of tableData.value) {
-      await PurchaseDetailApi.getPurchaseDetailPageCheckData({
-        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(item.planQty>0){
+        data.subList.push(item) // 拼接子表数据参数
+      }
+      // await PurchaseDetailApi.getPurchaseDetailPageCheckData({
+      //   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

From b81cc2ab30f73f3d787bdacd63f5174421b67a00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Thu, 4 Jul 2024 14:24:07 +0800
Subject: [PATCH 14/84] =?UTF-8?q?=E8=A1=A5=E6=96=99=E7=94=B3=E8=AF=B7=20?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E5=AE=8C=E6=88=90=E7=8A=B6=E6=80=81=E4=B8=8B?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/issueManage/repleinsh/repleinshRequestMain/index.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
index b71d95777..cbfa1a2b6 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
+++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
@@ -206,7 +206,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'}), // 删除
     ]

From 947f44bae9cfdb5f9dedfdae6f6da80a6d043db2 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 4 Jul 2024 14:44:05 +0800
Subject: [PATCH 15/84] =?UTF-8?q?=E8=A6=81=E8=B4=A7=E9=A2=84=E6=B5=8B--?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/demandforecastingDetail/index.ts  |  37 +++++
 src/api/wms/demandforecastingMain/index.ts    |   4 +
 src/components/Search/src/Search.vue          |  38 +++--
 .../SearchTable/src/SearchTable.vue           |  17 ++-
 .../demandforecastingMain.data.ts             | 138 ++++++++++++++++--
 .../demandforecastingMain/index.vue           |  60 +++++---
 6 files changed, 246 insertions(+), 48 deletions(-)

diff --git a/src/api/wms/demandforecastingDetail/index.ts b/src/api/wms/demandforecastingDetail/index.ts
index e2e61f681..25b01662a 100644
--- a/src/api/wms/demandforecastingDetail/index.ts
+++ b/src/api/wms/demandforecastingDetail/index.ts
@@ -23,6 +23,7 @@ export const getDemandforecastingDetailPage = async (params) => {
     return await request.post({ url: '/wms/demandforecasting-detail/senior', data })
   } else {
     console.log('params',params)
+    // 到货日期
     if(params.dueDate&&params.dueDate.length>0){
       params.startDate = params.dueDate[0]
     }
@@ -30,6 +31,36 @@ export const getDemandforecastingDetailPage = async (params) => {
       params.endDate = params.dueDate[1]
     }
     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.detailVersion = keyValue.join(',')
+    }
+    params.version = ''
+    
     return await request.get({ url: `/wms/demandforecasting-detail/page`, params })
   }
 }
@@ -70,3 +101,9 @@ export const getPageTableHead = async (params) => {
   params.dueDate = ''
   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 })
+}
\ No newline at end of file
diff --git a/src/api/wms/demandforecastingMain/index.ts b/src/api/wms/demandforecastingMain/index.ts
index 1c1478e5d..588fbd8bd 100644
--- a/src/api/wms/demandforecastingMain/index.ts
+++ b/src/api/wms/demandforecastingMain/index.ts
@@ -89,3 +89,7 @@ export const queryUserPlanerList = async () => {
 
 }
 
+// 供应商代码
+export const querySupplierList = async (data) => {
+  return await request.post({ url: `/wms/demandforecasting-main/querySupplierList`,data })
+}
\ No newline at end of file
diff --git a/src/components/Search/src/Search.vue b/src/components/Search/src/Search.vue
index d24477819..5c1af8f17 100644
--- a/src/components/Search/src/Search.vue
+++ b/src/components/Search/src/Search.vue
@@ -48,6 +48,11 @@ const props = defineProps({
     required: true,
     default: null
   },
+  hiddenFilterBtnFields:{
+    type: Array,
+    required: false,
+    default: []
+  },
   showSearchTableQueryFields:{
     type: Array,
     required: false,
@@ -127,21 +132,36 @@ const opensearchTable = (
     // searchCondition.forEach((item) => {
       // 查询条件为主表某字段，需要赋值主表数据，数据来源是详情的，赋值需要从row中获取
       if (searchCondition[i].isMainValue) {
-        _searchCondition[searchCondition[i].key] = formRef.value.formModel[searchCondition[i].value]
+        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]
           : ''
-        // 是否含有空参数情况
-        let isNull = false
-        if (_searchCondition[searchCondition[i].key] == '' || _searchCondition[searchCondition[i].key] == undefined) {
-          isNull = true
+          
+        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)
         }
-        if (isNull) {
-          message.warning(searchCondition[i].message?searchCondition[i].message:'前置条件未选择！')
-          return
+        _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){
@@ -307,7 +327,7 @@ defineExpose({setFormValues}) // 提供 open 方法，用于打开弹窗
       <slot name="actionMore"></slot>
     </div>
   </template>
-  <SearchTable ref="searchTableRef" :showSearchTableQueryFields="showSearchTableQueryFields" @searchTableSuccess="searchTableSuccess" />
+  <SearchTable ref="searchTableRef" :hiddenFilterBtnFields="hiddenFilterBtnFields" :showSearchTableQueryFields="showSearchTableQueryFields" @searchTableSuccess="searchTableSuccess" />
 
 </template>
 <style lang="scss" scoped>
diff --git a/src/components/SearchTable/src/SearchTable.vue b/src/components/SearchTable/src/SearchTable.vue
index d68fdc039..c4dc9264f 100644
--- a/src/components/SearchTable/src/SearchTable.vue
+++ b/src/components/SearchTable/src/SearchTable.vue
@@ -50,7 +50,12 @@ const props = defineProps({
     type: Array,
     required: false,
     default: []
-  }
+  },
+  hiddenFilterBtnFields:{
+    type: Array,
+    required: false,
+    default: []
+  },
 })
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -91,6 +96,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
@@ -111,16 +117,21 @@ const openData = (titleName: any, tableObject:any ,allSchemas: any,multiple: any
 }
 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) => {
   searchQuery.value = props.showSearchTableQueryFields.find(item=>item==formField)?true:false
+  hiddenFilterBtn.value = props.hiddenFilterBtnFields.find(item=>item==formField)?true:false
+  
   dialogWidth.value = '80%'
   multipleBol.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
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
index 529031a9f..d0f017b8c 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
@@ -1,7 +1,7 @@
 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 { 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'
@@ -10,6 +10,7 @@ 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'
 
 const { t } = useI18n() // 国际化
 const planerList = await DemandforecastingMainApi.queryUserPlanerList()
@@ -18,6 +19,100 @@ console.log('planerList',planerList)
 /**
  * @returns {Array} 要货预测主表
  */
+
+export const Supplier = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '用户名称',
+    field: 'userName',
+    sort: 'custom',
+    isSearch:true,
+    table: {
+      width: 150,
+    }
+  },
+  {
+    label: '用户昵称',
+    field: 'nickName',
+    sort: 'custom',
+    table: {
+      width: 150,
+    }
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    isSearch:true,
+    sort: 'custom',
+    table: {
+      width: 150,
+    }
+  },
+  {
+    label: '供应商名称',
+    field: 'supplierName',
+    sort: 'custom',
+    table: {
+      width: 150,
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  }
+]))
+export const Version = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '供应商代码',
+    field: 'supplerCodes',
+    sort: 'custom',
+    isSearch:true,
+    table: {
+      width: 150,
+    }
+  },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    isSearch:true,
+    table: {
+      width: 150,
+    }
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150,
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    isSearch:true,
+    sort: 'custom',
+    table: {
+      width: 150,
+    }
+  },
+  {
+    label: '子表版本',
+    field: 'detailVersion',
+    sort: 'custom',
+    table: {
+      width: 150,
+    }
+  }
+]))
 export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '计划员',
@@ -52,15 +147,22 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
     search: {
       componentProps: {
+        dialogWidth:'700px',//搜索出来弹窗的宽度
         multiple: true,
         enterSearch:true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
+        searchField: 'supplierCode', // 查询弹窗赋值字段
         searchTitle: '供应商信息', // 查询弹窗标题
         searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
-        searchPage: SupplierApi.getSupplierPageSCP, // 查询弹窗所需分页方法
+        searchPage: DemandforecastingMainApi.querySupplierList, // 查询弹窗所需分页方法
         searchCondition: [{
+          key: 'planers',
+          value: 'planerId',
+          message: '请选择计划员！',
+          isMainValue: true,
+          isCSV:true,//是否用逗号分隔参数
+        },{
           key: 'available',
           value: 'TRUE',
           isMainValue: false
@@ -101,15 +203,16 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
         enterSearch: true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择物料代码', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
+        searchField: 'itemCode', // 查询弹窗赋值字段
         searchTitle: '物料基础信息', // 查询弹窗标题
-        searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
-        searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
+        searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
+        searchPage: SupplieritemApi.getSupplieritemPageSCP, // 查询弹窗所需分页方法
         searchCondition: [{
-          key: 'supplierCode',
+          key: 'supplierCodes',
           value: 'supplierCode',
           message: '请填写供应商代码！',
-          isMainValue: true
+          isMainValue: true,
+          isCSV:true,//是否用逗号分隔参数
         },{
           key: 'available',
           value: 'TRUE',
@@ -133,15 +236,22 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
         enterSearch: true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择物料代码', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '物料基础信息', // 查询弹窗标题
-        searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
-        searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
+        searchField: 'detailVersion', // 查询弹窗赋值字段
+        searchTitle: '版本号', // 查询弹窗标题
+        searchAllSchemas: Version.allSchemas, // 查询弹窗所需类
+        searchPage: DemandforecastingDetailApi.queryVersion, // 查询弹窗所需分页方法
         searchCondition: [{
-          key: 'supplierCode',
+          key: 'supplierCodes',
           value: 'supplierCode',
           message: '请填写供应商代码！',
-          isMainValue: true
+          isMainValue: true,
+          isCSV:true,//是否用逗号分隔参数
+        },{
+          key: 'itemCodes',
+          value: 'itemCode',
+          message: '请填写物料代码！',
+          isMainValue: true,
+          isCSV:true,//是否用逗号分隔参数
         },{
           key: 'available',
           value: 'TRUE',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
index 74a1f4f75..3bcf87e5a 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
@@ -1,18 +1,18 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="DemandforecastingMain.allSchemas.searchSchema" @search="searchClick" @reset="searchClick" @searchTableSuccess="searchTableSuccess"/>
+    <Search :showSearchTableQueryFields="['supplierCode','itemCode']" :hiddenFilterBtnFields="['supplierCode','itemCode']" :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"
-    />
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="DemandforecastingMain.allSchemas"
+  />
 
   <!-- 列表 -->
   <ContentWrap>
@@ -26,7 +26,11 @@
       v-model:pageSize="tableObject.pageSize"
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
-    />
+    >
+    <template v-for="name in tableObjectHead.tableList" :key="name" #[name]="{row}">
+      <span :class="{'red-text':row.differencePrice!=0}">{{ row[name] }}</span>
+    </template>
+    </Table>
   </ContentWrap>
 
 
@@ -61,6 +65,9 @@ const updateDateTableColumns = ()=>{
     dateColumns.push({
       field: item,
       label: item,
+      table:{
+        width: 120
+      }
     })
   })
   tableColumns.value  = [...orginTableColumns.value,...dateColumns]
@@ -68,18 +75,19 @@ const updateDateTableColumns = ()=>{
 }
 
 // 查询页面返回
-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 = {}
+    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)
     }
@@ -133,6 +141,7 @@ const buttonBaseClick = async (val, item) => {
 
 
 const searchClick = async (data)=>{
+  console.log('searchClick',data)
   await setSearchParamsHead(data)
   updateDateTableColumns()
   setSearchParams(data)
@@ -177,3 +186,10 @@ onMounted(async () => {
   importTemplateData.templateUrl = await DemandforecastingMainApi.importTemplate()
 })
 </script>
+<style lang="scss" scoped>
+
+.red-text{
+  color:var(--el-color-danger);
+  font-weight:700;
+}
+</style>
\ No newline at end of file

From 76967eb5f9f415e690a67da0325a3cbbab7ad72b Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 4 Jul 2024 15:28:41 +0800
Subject: [PATCH 16/84] =?UTF-8?q?head=E8=AF=B7=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/demandforecastingDetail/index.ts | 32 ++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/src/api/wms/demandforecastingDetail/index.ts b/src/api/wms/demandforecastingDetail/index.ts
index 25b01662a..2f8543f2c 100644
--- a/src/api/wms/demandforecastingDetail/index.ts
+++ b/src/api/wms/demandforecastingDetail/index.ts
@@ -92,6 +92,8 @@ export const exportDemandforecastingDetail = async (params) => {
 
 // 查询要货预测主列表
 export const getPageTableHead = async (params) => {
+  console.log('params',params)
+  // 到货日期
   if(params.dueDate&&params.dueDate.length>0){
     params.startDate = params.dueDate[0]
   }
@@ -99,6 +101,36 @@ export const getPageTableHead = async (params) => {
     params.endDate = params.dueDate[1]
   }
   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.detailVersion = keyValue.join(',')
+  }
+  params.version = ''
+  
   return await request.get({ url: `/wms/demandforecasting-detail/queryPageTableHead`, params })
 }
 

From d814e01051e248d19fc070852af45fb22ce376e0 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 4 Jul 2024 16:09:17 +0800
Subject: [PATCH 17/84] =?UTF-8?q?=E8=A6=81=E8=B4=A7=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/demandforecastingDetail/index.ts  | 120 +++++++-----------
 .../purchasePlanMain/index.vue                |  36 +++---
 .../purchasePlanMain/purchasePlanMain.data.ts |  14 +-
 3 files changed, 72 insertions(+), 98 deletions(-)

diff --git a/src/api/wms/demandforecastingDetail/index.ts b/src/api/wms/demandforecastingDetail/index.ts
index 2f8543f2c..2f7963155 100644
--- a/src/api/wms/demandforecastingDetail/index.ts
+++ b/src/api/wms/demandforecastingDetail/index.ts
@@ -15,6 +15,48 @@ export interface DemandforecastingDetailVO {
   available: string
 }
 
+// 要货预测-列表和头部请求参数
+const getPageParams = (params)=>{
+  // 到货日期
+  if(params.dueDate&&params.dueDate.length>0){
+    params.startDate = params.dueDate[0]
+  }
+  if(params.dueDate&&params.dueDate.length>1){
+    params.endDate = params.dueDate[1]
+  }
+  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.detailVersion = keyValue.join(',')
+  }
+  params.version = ''
+  return params
+}
+
 // 查询要货预测子列表
 export const getDemandforecastingDetailPage = async (params) => {
   if (params.isSearch) {
@@ -22,45 +64,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)
-    // 到货日期
-    if(params.dueDate&&params.dueDate.length>0){
-      params.startDate = params.dueDate[0]
-    }
-    if(params.dueDate&&params.dueDate.length>1){
-      params.endDate = params.dueDate[1]
-    }
-    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.detailVersion = keyValue.join(',')
-    }
-    params.version = ''
-    
     return await request.get({ url: `/wms/demandforecasting-detail/page`, params })
   }
 }
@@ -92,45 +97,8 @@ export const exportDemandforecastingDetail = async (params) => {
 
 // 查询要货预测主列表
 export const getPageTableHead = async (params) => {
+  params = getPageParams(params)
   console.log('params',params)
-  // 到货日期
-  if(params.dueDate&&params.dueDate.length>0){
-    params.startDate = params.dueDate[0]
-  }
-  if(params.dueDate&&params.dueDate.length>1){
-    params.endDate = params.dueDate[1]
-  }
-  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.detailVersion = keyValue.join(',')
-  }
-  params.version = ''
-  
   return await request.get({ url: `/wms/demandforecasting-detail/queryPageTableHead`, params })
 }
 
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index 31240d9d6..514f68d71 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@@ -181,6 +181,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') {
@@ -666,25 +670,23 @@ const handleSelectionPublish = async ()=>{
       formRef.value.formLoading = false
       return;
     }
-    if (data.subList.length == tableData.value.length) {
-      try {
-        if (formType === 'create') {
-          if(data.subList.length == 0){
-            message.error(t('ts.子列表数量不能空'))
-            return
-          }
-          await PurchasePlanMainApi.createPurchasePlanMain(data)
-          message.success(t('common.createSuccess'))
-        } else {
-          await PurchasePlanMainApi.updatePurchasePlanMain(data)
-          message.success(t('common.updateSuccess'))
+    try {
+      if (formType === 'create') {
+        if(data.subList.length == 0){
+          message.error(t('ts.子列表数量不能空'))
+          return
         }
-        formRef.value.dialogVisible = false
-        // 刷新当前列表
-        getList()
-      } finally {
-        formRef.value.formLoading = false
+        await PurchasePlanMainApi.createPurchasePlanMain(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await PurchasePlanMainApi.updatePurchasePlanMain(data)
+        message.success(t('common.updateSuccess'))
       }
+      formRef.value.dialogVisible = false
+      // 刷新当前列表
+      getList()
+    } finally {
+      formRef.value.formLoading = false
     }
     formRef.value.formLoading = false
   }
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
index 58d6358c1..5c7ff76d6 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
@@ -156,7 +156,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '采购订单类型',
-    field: 'status',
+    field: 'type',
     sort: 'custom',
     dictType: DICT_TYPE.PURCHASE_ORDER_TYPE,
     dictClass: 'string',
@@ -166,7 +166,12 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        disabled: true
+      }
+    }
   },
   {
     label: '收货人',
@@ -853,7 +858,7 @@ 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'))
@@ -872,8 +877,7 @@ export const PurchasePlanDetailRules = reactive({
   ],
   planQty: [
     { required: true, message: '请输入计划数量', trigger: 'blur' },
-    { max: 0, message: '计划数量不能小于0', trigger: 'blur' }
-    // { validator:validatePlanQty, message: '计划数量不能小于0', trigger: 'blur'}
+    { validator:validatePlanQty, message: '计划数量不能小于0', trigger: 'blur'}
   ],
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }

From 06a41c910a804699f4a839e46333ea451f662f11 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 4 Jul 2024 16:38:27 +0800
Subject: [PATCH 18/84] =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/demandforecastingDetail/index.ts  |  2 +-
 .../demandforecastingMain.data.ts             | 35 +++----------------
 .../demandforecastingMain/index.vue           |  6 ++--
 3 files changed, 9 insertions(+), 34 deletions(-)

diff --git a/src/api/wms/demandforecastingDetail/index.ts b/src/api/wms/demandforecastingDetail/index.ts
index 2f7963155..7940f5cdc 100644
--- a/src/api/wms/demandforecastingDetail/index.ts
+++ b/src/api/wms/demandforecastingDetail/index.ts
@@ -51,7 +51,7 @@ const getPageParams = (params)=>{
   if(params.version&&params.version.length>0){
     let keyValue = params.version.split(' ')
     keyValue.forEach(item=>{item = item.trim()})
-    params.detailVersion = keyValue.join(',')
+    params.versions = keyValue.join(',')
   }
   params.version = ''
   return params
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
index d0f017b8c..6c88ba60e 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
@@ -26,34 +26,26 @@ export const Supplier = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'userName',
     sort: 'custom',
     isSearch:true,
-    table: {
-      width: 150,
-    }
+    
   },
   {
     label: '用户昵称',
     field: 'nickName',
     sort: 'custom',
-    table: {
-      width: 150,
-    }
+    
   },
   {
     label: '供应商代码',
     field: 'supplierCode',
     isSearch:true,
     sort: 'custom',
-    table: {
-      width: 150,
-    }
+    
   },
   {
     label: '供应商名称',
     field: 'supplierName',
     sort: 'custom',
-    table: {
-      width: 150,
-    }
+   
   },
   {
     label: '创建时间',
@@ -63,9 +55,7 @@ export const Supplier = useCrudSchemas(reactive<CrudSchema[]>([
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     sort: 'custom',
-    table: {
-      width: 180
-    },
+    
   }
 ]))
 export const Version = useCrudSchemas(reactive<CrudSchema[]>([
@@ -74,43 +64,28 @@ export const Version = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'supplerCodes',
     sort: 'custom',
     isSearch:true,
-    table: {
-      width: 150,
-    }
   },
   {
     label: '订单号',
     field: 'poNumber',
     sort: 'custom',
     isSearch:true,
-    table: {
-      width: 150,
-    }
   },
   {
     label: '订单行',
     field: 'poLine',
     sort: 'custom',
-    table: {
-      width: 150,
-    }
   },
   {
     label: '物料代码',
     field: 'itemCode',
     isSearch:true,
     sort: 'custom',
-    table: {
-      width: 150,
-    }
   },
   {
     label: '子表版本',
     field: 'detailVersion',
     sort: 'custom',
-    table: {
-      width: 150,
-    }
   }
 ]))
 export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
index 3bcf87e5a..aaea984b8 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
@@ -28,7 +28,7 @@
       v-model:sort="tableObject.sort"
     >
     <template v-for="name in tableObjectHead.tableList" :key="name" #[name]="{row}">
-      <span :class="{'red-text':row.differencePrice!=0}">{{ row[name] }}</span>
+      <span :class="{'success-text':row['planType_F'].indexOf(name)>-1}">{{ row[name] }}</span>
     </template>
     </Table>
   </ContentWrap>
@@ -188,8 +188,8 @@ onMounted(async () => {
 </script>
 <style lang="scss" scoped>
 
-.red-text{
-  color:var(--el-color-danger);
+.success-text{
+  color:var(--el-color-success);
   font-weight:700;
 }
 </style>
\ No newline at end of file

From 8561ad274017ffe68f9d036e5eeea79f5d9dd8c4 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 4 Jul 2024 17:04:52 +0800
Subject: [PATCH 19/84] bug

---
 .../demandforecastingMain/index.vue           | 41 +++++++++++--------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
index aaea984b8..864c3eae6 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
@@ -58,21 +58,8 @@ const tableColumns = ref(DemandforecastingMain.allSchemas.tableColumns)
 const updataTableColumns = (val) => {
   orginTableColumns.value = val
 }
-const updateDateTableColumns = ()=>{
-  console.log('tableObjectHead',tableObjectHead)
-  let dateColumns = []
-  tableObjectHead.tableList.forEach(item=>{
-    dateColumns.push({
-      field: item,
-      label: item,
-      table:{
-        width: 120
-      }
-    })
-  })
-  tableColumns.value  = [...orginTableColumns.value,...dateColumns]
-  console.log('tableColumns',tableColumns.value)
-}
+
+
 
 // 查询页面返回
 const searchQueryTableSuccess = (formField, searchField, val, formRef, type, row ) => {
@@ -102,6 +89,24 @@ const { tableObject:tableObjectHead, tableMethods:tableMethodsHead } = useTable(
 // 获得表格的各种操作
 const { getList:getListHead, setSearchParams:setSearchParamsHead } = tableMethodsHead
 
+watch(()=>tableObjectHead.tableList,()=>{
+  updateDateTableColumns()
+},{deep:true})
+const updateDateTableColumns = ()=>{
+  console.log('tableObjectHead',tableObjectHead)
+  let dateColumns = []
+  tableObjectHead.tableList.forEach(item=>{
+    dateColumns.push({
+      field: item,
+      label: item,
+      table:{
+        width: 120
+      }
+    })
+  })
+  tableColumns.value  = [...orginTableColumns.value,...dateColumns]
+  console.log('tableColumns',tableColumns.value)
+}
 const { tableObject, tableMethods } = useTable({
   getListApi: DemandforecastingDetailApi.getDemandforecastingDetailPage // 分页接口
 })
@@ -128,7 +133,7 @@ const buttonBaseClick = async (val, item) => {
       })
     } else {
       await getListHead()
-      updateDateTableColumns()
+      // updateDateTableColumns()
       getList()
 
     }
@@ -143,7 +148,7 @@ const buttonBaseClick = async (val, item) => {
 const searchClick = async (data)=>{
   console.log('searchClick',data)
   await setSearchParamsHead(data)
-  updateDateTableColumns()
+  // updateDateTableColumns()
   setSearchParams(data)
 }
 /** 导出按钮操作 */
@@ -181,7 +186,7 @@ const searchFormClick = (searchData) => {
 /** 初始化 **/
 onMounted(async () => {
   await getListHead()
-  updateDateTableColumns()
+  // updateDateTableColumns()
   getList()
   importTemplateData.templateUrl = await DemandforecastingMainApi.importTemplate()
 })

From d016a25b17fec607b1cfe31f008ea67b194f2675 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 4 Jul 2024 17:09:17 +0800
Subject: [PATCH 20/84] =?UTF-8?q?=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliver/demandforecastingMain/index.vue         | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
index 864c3eae6..615661842 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
@@ -97,11 +97,9 @@ const updateDateTableColumns = ()=>{
   let dateColumns = []
   tableObjectHead.tableList.forEach(item=>{
     dateColumns.push({
+      width:120,
       field: item,
-      label: item,
-      table:{
-        width: 120
-      }
+      label: item
     })
   })
   tableColumns.value  = [...orginTableColumns.value,...dateColumns]

From 1470ddceeb3f40e124b23ecd14300ce879ccab50 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 4 Jul 2024 17:28:06 +0800
Subject: [PATCH 21/84] =?UTF-8?q?=E8=A6=81=E8=B4=A7=E9=A2=84=E6=B5=8B?=
 =?UTF-8?q?=E5=91=A8=E6=9C=9F=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierManage/supplierCycle/index.vue    |  28 ++-
 .../supplierCycle/supplierCycle.data.ts       | 210 +++++++-----------
 2 files changed, 102 insertions(+), 136 deletions(-)

diff --git a/src/views/wms/basicDataManage/supplierManage/supplierCycle/index.vue b/src/views/wms/basicDataManage/supplierManage/supplierCycle/index.vue
index a20c3f4b5..7b0767b23 100644
--- a/src/views/wms/basicDataManage/supplierManage/supplierCycle/index.vue
+++ b/src/views/wms/basicDataManage/supplierManage/supplierCycle/index.vue
@@ -49,7 +49,6 @@
     @searchTableSuccess="searchTableSuccess"
     :isBusiness="false"
   />
-
   <!-- 详情 -->
   <Detail ref="detailRef" :isBasic="true" :allSchemas="SupplierCycle.allSchemas" />
 
@@ -65,7 +64,7 @@ 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() // 消息弹窗
@@ -99,12 +98,13 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:supplierCycle:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:supplierCycle:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'wms:supplierCycle:export'}), // 导出
-  defaultButtons.defaultFreshBtn(null), // 刷新
-  defaultButtons.defaultFilterBtn(null), // 筛选
-  defaultButtons.defaultSetBtn(null), // 设置
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:supplierCycle:create'}), // 新增
+  defaultButtons.defaultAddBtn({}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:supplierCycle:import'}), // 导入
+  // defaultButtons.defaultExportBtn({hasPermi:'wms:supplierCycle:export'}), // 导出
+  // defaultButtons.defaultFreshBtn(null), // 刷新
+  // defaultButtons.defaultFilterBtn(null), // 筛选
+  // defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',
@@ -133,7 +133,8 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'wms:supplierCycle:update'}), // 编辑
+  // defaultButtons.mainListEditBtn({hasPermi:'wms:supplierCycle:update'}), // 编辑
+  defaultButtons.mainListEditBtn({}), // 编辑
   defaultButtons.mainListDeleteBtn({hasPermi:'wms:supplierCycle:delete'}), // 删除
 ]
 
@@ -153,7 +154,14 @@ const openForm = (type: string, row?: any) => {
 }
 
 // form表单提交
-const formsSuccess = async (formType,data) => {
+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';
   });
diff --git a/src/views/wms/basicDataManage/supplierManage/supplierCycle/supplierCycle.data.ts b/src/views/wms/basicDataManage/supplierManage/supplierCycle/supplierCycle.data.ts
index c17d4da1d..b872a03c1 100644
--- a/src/views/wms/basicDataManage/supplierManage/supplierCycle/supplierCycle.data.ts
+++ b/src/views/wms/basicDataManage/supplierManage/supplierCycle/supplierCycle.data.ts
@@ -1,6 +1,7 @@
 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 SupplierCycleRules = reactive({
   available: [required],
@@ -20,173 +21,130 @@ export const SupplierCycle = useCrudSchemas(reactive<CrudSchema[]>([
     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: '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: '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',
-  },
-  {
-    label: '版本号',
-    field: 'version',
-    sort: 'custom',
-    isTable:false,
-    isForm:false,
-  },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    isTable:false,
-    isForm:false,
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    sort: 'custom',
-    isTable:false,
-    isForm:false,
-    formatter: dateFormatter,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
-    },
-  },
-  {
-    label: '扩展属性',
-    field: 'extraProperties',
-    sort: 'custom',
-    isTable:false,
     isForm:false,
+
   },
   {
-    label: '地点ID',
-    field: 'siteId',
-    sort: 'custom',
-    isTable:false,
-    isForm:false,
-  },
-  {
-    label: '开始时间',
-    field: 'beginTime',
-    sort: 'custom',
-    isTable:false,
-    isForm:false,
-    formatter: dateFormatter,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
-      }
-    },
-  },
-  {
-    label: '结束时间',
-    field: 'endTime',
+    label: '同步周期',
+    field: 'cycle',
+    isForm:true,
+    isDetail: false,
     sort: 'custom',
     isTable:false,
-    isForm:false,
-    formatter: dateFormatter,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
-    },
     form: {
-      component: 'DatePicker',
+      value:[],
+      component:'Checkbox',
       componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
-      }
-    },
-  },
-  {
-    label: '是否可用',
-    field: 'available',
-    sort: 'custom',
-    isTable:false,
-    isForm:false,
-  },
-  {
-    label: '状态',
-    field: 'status',
-    sort: 'custom',
-    isTable:false,
-    isForm:false,
-    form: {
-      component: 'Radio'
-    },
-  },
-  {
-    label: '并发乐观锁',
-    field: 'concurrencyStamp',
-    sort: 'custom',
-    isTable:false,
-    isForm:false,
-  },
-  {
-    label: '权限所属人员id',
-    field: 'ruleUserId',
-    sort: 'custom',
-    isTable:false,
-    isForm:false,
-    form: {
-      component: 'InputNumber',
-      value: 0
-    },
-  },
-  {
-    label: '部门',
-    field: 'departmentCode',
-    sort: 'custom',
-    isTable:false,
-    isForm:false,
+        options: [
+          {label:'星期一',value:'monday'},
+          {label:'星期二',value:'tuesday'},
+          {label:'星期三',value:'wednesday'},
+          {label:'星期四',value:'thursday'},
+          {label:'星期五',value:'friday'},
+          {label:'星期六',value:'saturday'},
+          {label:'星期日',value:'sunday'}
+        ]
+      },
+    }
   },
   {
     label: '操作',

From d2bd1d179fea51652f6f9e646a81937c98e5a5db Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 4 Jul 2024 17:35:13 +0800
Subject: [PATCH 22/84] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliver/purchasePlanMain/index.vue                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index 514f68d71..9572e183a 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@@ -384,7 +384,7 @@ const getSearchTableData = async (number,formField,searchField)=>{
     if('create'==type){
       isShowButtonSelection.value = false
       nextTick(async () => {
-        formRef.value.formRef.setValues({deliveryDate:dayjs().format('YYYY-MM-DD')})
+        formRef.value.formRef.setValues({deliveryDate:dayjs().valueOf()})
       })
     }else{
       isShowButtonSelection.value = true

From fbbaab0fa9894a1b9b18726116d33df3ee2d08bc Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Thu, 4 Jul 2024 18:06:44 +0800
Subject: [PATCH 23/84] =?UTF-8?q?=E8=A6=81=E8=B4=A7=E9=A2=84=E6=B5=8B?=
 =?UTF-8?q?=E5=91=A8=E6=9C=9F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/supplierCycle/index.ts            | 16 ++++----
 .../supplierManage/supplierCycle/index.vue    | 12 +++---
 .../supplierCycle/supplierCycle.data.ts       | 40 +++++++++----------
 3 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/src/api/wms/supplierCycle/index.ts b/src/api/wms/supplierCycle/index.ts
index da29ff1fc..ddaf2013e 100644
--- a/src/api/wms/supplierCycle/index.ts
+++ b/src/api/wms/supplierCycle/index.ts
@@ -28,38 +28,38 @@ export const getSupplierCyclePage = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
-    return await request.post({ url: '/basic/supplier-cycle/senior', data })
+    return await request.post({ url: '/wms/supplier-cycle/senior', data })
   } else {
-    return await request.get({ url: `/basic/supplier-cycle/page`, params })
+    return await request.get({ url: `/wms/supplier-cycle/page`, params })
   }
 }
 
 // 查询要货预测周期详情
 export const getSupplierCycle = async (id: number) => {
-  return await request.get({ url: `/basic/supplier-cycle/get?id=` + id })
+  return await request.get({ url: `/wms/supplier-cycle/get?id=` + id })
 }
 
 // 新增要货预测周期
 export const createSupplierCycle = async (data: SupplierCycleVO) => {
-  return await request.post({ url: `/basic/supplier-cycle/create`, data })
+  return await request.post({ url: `/wms/supplier-cycle/create`, data })
 }
 
 // 修改要货预测周期
 export const updateSupplierCycle = async (data: SupplierCycleVO) => {
-  return await request.put({ url: `/basic/supplier-cycle/update`, data })
+  return await request.put({ url: `/wms/supplier-cycle/update`, data })
 }
 
 // 删除要货预测周期
 export const deleteSupplierCycle = async (id: number) => {
-  return await request.delete({ url: `/basic/supplier-cycle/delete?id=` + id })
+  return await request.delete({ url: `/wms/supplier-cycle/delete?id=` + id })
 }
 
 // 导出要货预测周期 Excel
 export const exportSupplierCycle = async (params) => {
-  return await request.download({ url: `/basic/supplier-cycle/export-excel`, params })
+  return await request.download({ url: `/wms/supplier-cycle/export-excel`, params })
 }
 
 // 下载用户导入模板
 export const importTemplate = () => {
-  return request.download({ url: '/basic/supplier-cycle/get-import-template' })
+  return request.download({ url: '/wms/supplier-cycle/get-import-template' })
 }
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/supplierManage/supplierCycle/index.vue b/src/views/wms/basicDataManage/supplierManage/supplierCycle/index.vue
index 7b0767b23..a28c90ac4 100644
--- a/src/views/wms/basicDataManage/supplierManage/supplierCycle/index.vue
+++ b/src/views/wms/basicDataManage/supplierManage/supplierCycle/index.vue
@@ -98,10 +98,9 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  // defaultButtons.defaultAddBtn({hasPermi:'wms:supplierCycle:create'}), // 新增
-  defaultButtons.defaultAddBtn({}), // 新增
-  // defaultButtons.defaultImportBtn({hasPermi:'wms:supplierCycle:import'}), // 导入
-  // defaultButtons.defaultExportBtn({hasPermi:'wms:supplierCycle:export'}), // 导出
+  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), // 设置
@@ -133,9 +132,8 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = [
-  // defaultButtons.mainListEditBtn({hasPermi:'wms:supplierCycle:update'}), // 编辑
-  defaultButtons.mainListEditBtn({}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'wms:supplierCycle:delete'}), // 删除
+  defaultButtons.mainListEditBtn({hasPermi:'wms:supplier-cycle:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:supplier-cycle:delete'}), // 删除
 ]
 
 // 列表-操作按钮事件
diff --git a/src/views/wms/basicDataManage/supplierManage/supplierCycle/supplierCycle.data.ts b/src/views/wms/basicDataManage/supplierManage/supplierCycle/supplierCycle.data.ts
index b872a03c1..3fba51bec 100644
--- a/src/views/wms/basicDataManage/supplierManage/supplierCycle/supplierCycle.data.ts
+++ b/src/views/wms/basicDataManage/supplierManage/supplierCycle/supplierCycle.data.ts
@@ -54,26 +54,6 @@ export const SupplierCycle = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    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: 'monday',
@@ -146,6 +126,26 @@ export const SupplierCycle = useCrudSchemas(reactive<CrudSchema[]>([
       },
     }
   },
+  {
+    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: 'action',

From fdf18c6d59622c35bfbcd702bf27e7c764ede2df Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 5 Jul 2024 08:44:57 +0800
Subject: [PATCH 24/84] =?UTF-8?q?=E8=A6=81=E8=B4=A7=E9=A2=84=E6=B5=8B?=
 =?UTF-8?q?=E5=91=A8=E6=9C=9F=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierManage/supplierCycle/index.vue    | 26 +++++++++---
 .../supplierCycle/supplierCycle.data.ts       | 40 +++++++++----------
 2 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/src/views/wms/basicDataManage/supplierManage/supplierCycle/index.vue b/src/views/wms/basicDataManage/supplierManage/supplierCycle/index.vue
index a28c90ac4..a61aabbe5 100644
--- a/src/views/wms/basicDataManage/supplierManage/supplierCycle/index.vue
+++ b/src/views/wms/basicDataManage/supplierManage/supplierCycle/index.vue
@@ -13,7 +13,7 @@
       @searchFormClick="searchFormClick"
       :allSchemas="SupplierCycle.allSchemas"
     />
-
+    
   <!-- 列表 -->
   <ContentWrap>
     <Table
@@ -27,10 +27,26 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #code="{row}">
-        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
-          <span>{{ row.code }}</span>
-        </el-button>
+      <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)" />
diff --git a/src/views/wms/basicDataManage/supplierManage/supplierCycle/supplierCycle.data.ts b/src/views/wms/basicDataManage/supplierManage/supplierCycle/supplierCycle.data.ts
index 3fba51bec..704ff81e9 100644
--- a/src/views/wms/basicDataManage/supplierManage/supplierCycle/supplierCycle.data.ts
+++ b/src/views/wms/basicDataManage/supplierManage/supplierCycle/supplierCycle.data.ts
@@ -103,6 +103,26 @@ export const SupplierCycle = useCrudSchemas(reactive<CrudSchema[]>([
     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',
@@ -126,26 +146,6 @@ export const SupplierCycle = useCrudSchemas(reactive<CrudSchema[]>([
       },
     }
   },
-  {
-    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: 'action',

From 0d09138253f49d0edc7e6eb09b1a68729b82e844 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 5 Jul 2024 10:09:49 +0800
Subject: [PATCH 25/84] =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=B7=B2=E8=AF=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/demandforecastingMain/index.ts    |  10 +-
 src/locales/en-US.ts                          |   3 +-
 src/locales/zh-CN.ts                          |   4 +-
 .../demandforecastingMain.data.ts             | 430 ++++-------------
 .../demandforecastingSupplierMain/index.vue   | 448 ++++++------------
 5 files changed, 258 insertions(+), 637 deletions(-)

diff --git a/src/api/wms/demandforecastingMain/index.ts b/src/api/wms/demandforecastingMain/index.ts
index 588fbd8bd..7d5596a8f 100644
--- a/src/api/wms/demandforecastingMain/index.ts
+++ b/src/api/wms/demandforecastingMain/index.ts
@@ -92,4 +92,12 @@ export const queryUserPlanerList = async () => {
 // 供应商代码
 export const querySupplierList = async (data) => {
   return await request.post({ url: `/wms/demandforecasting-main/querySupplierList`,data })
-}
\ No newline at end of file
+}
+
+
+// 是否已读接口
+export const updateIsRead = async (data) => {
+  return await request.post({ url: `/wms/demandforecasting-main/updateIsRead`,data })
+}
+
+
diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index 19f98f6c5..03c07ece7 100644
--- a/src/locales/en-US.ts
+++ b/src/locales/en-US.ts
@@ -1138,7 +1138,8 @@ export default {
     批量发布:'Batch release',
     '重新生成标签会删除上次生成的标签，是否确认继续？':'Regenerating labels will delete the last generated label. Are you sure you want to continue?',
     '确 认':'Confirm',
-    请输入拒收原因:'Please enter the reason for rejection'
+    请输入拒收原因:'Please enter the reason for rejection',
+    全部已读:'All read'
   },
   
 
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 3b9c17161..7f47117c5 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -1138,7 +1138,9 @@ export default {
     批量发布:'批量发布',
     '重新生成标签会删除上次生成的标签，是否确认继续？':'重新生成标签会删除上次生成的标签，是否确认继续？',
     '确 认':'确 认',
-    请输入拒收原因:'请输入拒收原因'
+    请输入拒收原因:'请输入拒收原因',
+    全部已读:'全部已读'
+
   },
 
 }
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts
index 561ce9eee..2ae6c3e90 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts
@@ -1,288 +1,171 @@
 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 { 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'
+
 const { t } = useI18n() // 国际化
 
 /**
  * @returns {Array} 要货预测主表
  */
-export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
+
+export const Version = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '单据号',
-    field: 'number',
+    label: '供应商代码',
+    field: 'supplerCodes',
     sort: 'custom',
-    table: {
-      width: 200,
-      fixed: 'left'
-    },
-    isForm: false,
-    isSearch: true,
+    isSearch:true,
   },
   {
-    label: '供应商代码',
-    field: 'supplierCode',
+    label: '订单号',
+    field: 'poNumber',
     sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch: true,
-    form: {
-      labelMessage: '影响明细中物料代码，需在供应商物料中维护',
-      componentProps: {
-        enterSearch:true,
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '供应商信息', // 查询弹窗标题
-        searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
-        searchPage: SupplierApi.getSupplierPageSCP, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
-      }
-    }
+    isSearch:true,
   },
   {
-    label: '版本号',
-    field: 'version',
+    label: '订单行',
+    field: 'poLine',
     sort: 'custom',
-    table: {
-      width: 150
-    },
   },
   {
     label: '物料代码',
     field: 'itemCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
     isSearch:true,
-    isTable:false,
-    isForm: false,
-  },
-  {
-    label: '发布时间',
-    field: 'publishTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
     sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: { width: '100%' },
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-    isForm: false,
   },
   {
-    label: '开始时间',
-    field: 'beginTime',
-    isTable: true,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    isTable: false,
+    label: '子表版本',
+    field: 'detailVersion',
     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 DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '结束时间',
-    field: 'endTime',
-    isTable: true,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    isTable: false,
+    label: '是否已读',
+    field: 'isRead',
     sort: 'custom',
     table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: { width: '100%' },
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
+      width: 150
     },
   },
   {
-    label: '业务类型',
-    field: 'businessType',
+    label: '订单号',
+    field: 'poNumber',
     sort: 'custom',
     table: {
       width: 150
     },
-    isTable:false,
-    isForm: false,
-    form: {
-      value: 'PurchasePrediction',
-      componentProps: {
-        disabled: true
-      }
-    }
   },
   {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.PURCHASE_ORDER_STATUS,
-    dictClass: 'string',
-    isTable: true,
-    isForm:false,
-    isSearch: true,
+    label: '订单行',
+    field: 'poLine',
     sort: 'custom',
     table: {
       width: 150
-    },
-    form: {
-      value: '1',
-      componentProps: {
-        disabled: true
-      }
     }
   },
   {
-    label: '备注',
-    field: 'remark',
+    label: '物料代码',
+    field: 'itemCode',
     sort: 'custom',
     table: {
       width: 150
     },
-    isTable: false,
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable:false,
-    form: {
-      component: 'DatePicker',
+    isSearch:true,
+    isTable:true,
+    isForm: false,
+    search: {
+      // labelMessage: '信息提示说明！！！',
       componentProps: {
-        style: { width: '100%' },
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+        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
+        }]
       }
-    },
-    isForm: false,
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    isForm: false,
+    }
   },
   {
-    label: '是否可用',
-    field: 'available',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
+    label: '版本号',
+    field: 'version',
     sort: 'custom',
     table: {
       width: 150
     },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
+    isSearch:true,
+    search: {
+      // labelMessage: '信息提示说明！！！',
       componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+        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: 'planerId',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    isForm: false,
-  },
-  {
-    label: '计划员名称',
-    field: 'planerUserName',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    isForm: false,
-  },
-  {
-    label: '版本',
-    field: 'activeVersion',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    isForm: false,
+    }
   },
   {
     label: '到货日期',
     field: 'dueDate',
+    formatter: dateFormatter,
     sort: 'custom',
     table: {
       width: 150
     },
+    isSearch:true,
     isTable:false,
     isForm: false,
-  },
-  {
-    label: '操作',
-    field: 'action',
-    isDetail: false,
-    isForm: false,
-    table: {
-      width: 300,
-      fixed: 'right'
+    search: {
+      value:[],
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD',
+        type: 'daterange',
+        defaultTime: [new Date('1 '), new Date('1 ')]
+      }
     },
   }
 ]))
@@ -307,14 +190,6 @@ export const DemandforecastingMainRules = reactive({
  * @returns {Array} 要货预测子表
  */
 export const DemandforecastingDetail = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '是否已读',
-    field: 'isRead',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
   {
     label: '单据号',
     field: 'number',
@@ -355,6 +230,7 @@ export const DemandforecastingDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -370,117 +246,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',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue
index bea1c5d35..9ce425e76 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue
@@ -1,23 +1,23 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="[...DemandforecastingMain.allSchemas.searchSchema,...DemandforecastingDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :showSearchTableQueryFields="['supplierCode','itemCode']" :hiddenFilterBtnFields="['supplierCode','itemCode']" :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"
-      :detailAllSchemas="DemandforecastingDetail.allSchemas"
-    />
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="DemandforecastingMain.allSchemas"
+  />
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table v-clientTable
+    <Table ref="tableRef" v-clientTable
+      :selection="true"
       :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
@@ -27,59 +27,20 @@
       v-model:pageSize="tableObject.pageSize"
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
+      @getSelectionRows="getSelectionRows"
     >
-      <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)" />
-      </template>
+    <template #isRead="{row}" >
+      <el-button v-show="row.isRead!=3" :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>
 
-  <!-- 表单弹窗：添加/修改 -->
-  <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">
@@ -90,7 +51,7 @@ import * as DemandforecastingDetailApi from '@/api/wms/demandforecastingDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 
 // 要货预测
-defineOptions({ name: 'DemandforecastingSupplierMain' })
+defineOptions({ name: 'DemandforecastingMain' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
@@ -98,45 +59,59 @@ 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 = {}
+    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 searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
-  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 = []
+  tableObjectHead.tableList.forEach(item=>{
+    dateColumns.push({
+      width:120,
+      field: item,
+      label: item
+    })
+  })
+  tableColumns.value  = [...orginTableColumns.value,...dateColumns]
+  console.log('tableColumns',tableColumns.value)
+}
 const { tableObject, tableMethods } = useTable({
   getListApi: DemandforecastingDetailApi.getDemandforecastingDetailPage // 分页接口
 })
@@ -146,29 +121,26 @@ 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: ''
-  // },
+  {
+      label: t('ts.全部已读'),
+      name: 'read',
+      hide: false,
+      type: 'primary',
+      // icon: 'ep:operation',
+      color: '',
+      float:'left',
+      link: false, // 文本展现按钮
+      hasPermi: ''
+  }
 ]
 
 // 头部按钮事件
-const buttonBaseClick = (val, item) => {
-  if (val == 'add') { // 新增
-    openForm('create')
-  } else if (val == 'import') { // 导入
-    handleImport()
-  } else if (val == 'export') { // 导出
+const buttonBaseClick = async (val, item) => {
+  if (val == 'export') { // 导出
     handleExport()
   } else if (val == 'refresh') { // 刷新
     if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
@@ -176,156 +148,27 @@ const buttonBaseClick = (val, item) => {
         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 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 handleWit = async (id : number) => {
-    try {
-      // 下架的二次确认
-      await message.confirm(t('ts.是否下架所选中数据？'))
-      tableObject.loading = true
-      // 发起下架
-      await DemandforecastingMainApi.witPurchaseMain(id)
-      message.success(t('ts.下架成功!'))
-      tableObject.loading = false
-      // 刷新列表
-      await getList()
-    } catch { }finally{
-      tableObject.loading = false
-    }
-  }
 
-/** 详情操作 */
-const detailRef = ref()
-const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue,'planDemandforecastingMain')
+const searchClick = async (data)=>{
+  console.log('searchClick',data)
+  await setSearchParamsHead(data)
+  // updateDateTableColumns()
+  setSearchParams(data)
 }
-
-/** 删除按钮操作 */
-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 exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
@@ -342,60 +185,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 +192,6 @@ const importTemplateData = reactive({
   templateTitle: `${t('ts.要货预测主导入模版')}.xlsx`
 })
 
-// 导入成功之后
-const importSuccess = () => {
-  getList()
-}
-
 // 筛选提交
 const searchFormClick = (searchData) => {
   tableObject.params = {
@@ -417,9 +201,69 @@ const searchFormClick = (searchData) => {
   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){
+    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{
+    rows = [row.mainId]
+    console.log('已读',rows.join(','))
+  }
+  let getLoading = ElLoading.service({
+    lock: true,
+    text: 'loading...',
+    background: 'rgba(0, 0, 0, 0.7)'
+  })
+  if(selectionRows.value==0){
+    return
+  }
+  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>
\ No newline at end of file

From 2b6083dfc812e59115f759f8e3bdf2c9a83d6bfa Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 5 Jul 2024 10:13:25 +0800
Subject: [PATCH 26/84] =?UTF-8?q?=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierManage/supplierCycle/index.vue             | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/views/wms/basicDataManage/supplierManage/supplierCycle/index.vue b/src/views/wms/basicDataManage/supplierManage/supplierCycle/index.vue
index a61aabbe5..c7ef5cf17 100644
--- a/src/views/wms/basicDataManage/supplierManage/supplierCycle/index.vue
+++ b/src/views/wms/basicDataManage/supplierManage/supplierCycle/index.vue
@@ -164,6 +164,16 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 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)
 }
 

From 695427384b3206d627fd52ed99cad18816d060c1 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 5 Jul 2024 10:18:24 +0800
Subject: [PATCH 27/84] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierManage/supplierCycle/supplierCycle.data.ts | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/views/wms/basicDataManage/supplierManage/supplierCycle/supplierCycle.data.ts b/src/views/wms/basicDataManage/supplierManage/supplierCycle/supplierCycle.data.ts
index 704ff81e9..528c37fec 100644
--- a/src/views/wms/basicDataManage/supplierManage/supplierCycle/supplierCycle.data.ts
+++ b/src/views/wms/basicDataManage/supplierManage/supplierCycle/supplierCycle.data.ts
@@ -3,10 +3,7 @@ import { dateFormatter } from '@/utils/formatTime'
 import * as SupplierApi from '@/api/wms/supplier'
 import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
 // 表单校验
-export const SupplierCycleRules = reactive({
-  available: [required],
-  departmentCode: [required],
-})
+
 
 export const SupplierCycle = useCrudSchemas(reactive<CrudSchema[]>([
   {
@@ -156,3 +153,8 @@ export const SupplierCycle = useCrudSchemas(reactive<CrudSchema[]>([
     }
   }
 ]))
+export const SupplierCycleRules = reactive({
+  supplierCode: [
+    { required: true, message: '供应商代码不能为空', trigger: 'blur' },
+  ],
+})
\ No newline at end of file

From 50fa8ad38c6f8beb043ac7732f77a45fa03da9bc Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 5 Jul 2024 10:30:02 +0800
Subject: [PATCH 28/84] =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasePlanMain/index.vue                | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index 9572e183a..f70bb30a9 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@@ -161,14 +161,17 @@
         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)
-		        var me = beginTime.substring(3)
-            setV['beginTime'] = new Date(2024, 1, 1, Number(ms), Number(me))
-            let endTime = res.endTime
-            var ms = endTime.substring(0, 2)
-		        var me = endTime.substring(3)
-            setV['endTime'] = new Date(2024, 1, 1, Number(ms), Number(me))
+            
+            // let beginTime = res.beginTime
+            // var ms = beginTime.substring(0, 2)
+		        // var me = beginTime.substring(3)
+            // setV['beginTime'] = new Date(2024, 1, 1, Number(ms), Number(me))
+            // let endTime = res.endTime
+            // var ms = endTime.substring(0, 2)
+		        // var me = endTime.substring(3)
+            // setV['endTime'] = new Date(2024, 1, 1, Number(ms), Number(me))
+            setV['beginTime'] = res.beginTime
+            setV['endTime'] = res.endTime
             setV['contacts'] = res.contacts
             setV['phone'] = res.phone
           })
@@ -329,7 +332,7 @@ const getSearchTableData = async (number,formField,searchField)=>{
       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.创建供应商发货申请'),

From 2c869f8390965173a331898590d53f02065efc3c Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 5 Jul 2024 10:42:23 +0800
Subject: [PATCH 29/84] =?UTF-8?q?=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliver/purchasePlanMain/index.vue     | 14 ++++++++++++++
 .../purchasePlanMain/purchasePlanMain.data.ts      | 10 +++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index f70bb30a9..b87a21fac 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@@ -389,7 +389,21 @@ const getSearchTableData = async (number,formField,searchField)=>{
       nextTick(async () => {
         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
+        }
+      })
       isShowButtonSelection.value = true
     }
   }
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
index 5c7ff76d6..4d84e28d5 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
@@ -145,8 +145,8 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'DatePicker',
       componentProps: {
         style: {width: '100%'},
-        type: 'date',
-        dateFormat: 'YYYY-MM-DD',
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
       }
     },
@@ -160,7 +160,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     dictType: DICT_TYPE.PURCHASE_ORDER_TYPE,
     dictClass: 'string',
-    isTable: false,
+    isTable: true,
     isForm:true,
     isSearch: true,
     table: {
@@ -745,8 +745,8 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     sortTableDefault:6,
   },
   {
-    label: '在途数量（没有字段，需要加）',
-    field: 'shippedQty',
+    label: '在途数量',
+    field: 'notReceiveQty',
     sort: 'custom',
     table: {
       width: 150

From 5c5042417b36c47d3e2b12309155616a10d3139b Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 5 Jul 2024 13:19:58 +0800
Subject: [PATCH 30/84] =?UTF-8?q?=E5=AD=90=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasePlanMain/index.vue                | 19 +++++++++++--------
 .../purchasePlanMain/purchasePlanMain.data.ts | 18 ++++++++++--------
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index b87a21fac..ca1db0367 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@@ -45,8 +45,9 @@
     :apiUpdate="PurchasePlanMainApi.updatePurchasePlanMain" 
     :apiCreate="PurchasePlanMainApi.createPurchasePlanMain"
     :isBusiness="true" 
-    :isShowReduceButtonSelection="isShowButtonSelection" 
-    :isShowButton="isShowButtonSelection"
+    :isShowReduceButtonSelection="false" 
+    :isShowReduceButton="false" 
+    :isShowButton="false"
     @handleAddTable="handleAddTable" 
     @handleDeleteTable="handleDeleteTable"
     @tableSelectionDelete="tableSelectionDelete"
@@ -68,8 +69,13 @@
     :apiDelete="PurchasePlanDetailApi.deletePurchasePlanDetail"
     @searchTableSuccessDetail="searchTableSuccessDetail"
     :detailValidate="detailValidate" 
-    :detailButtonIsShowDelete="false"
-    :detailButtonIsShowEdit="false"
+    :detailButtonIsShowAddStatusArray="['1','2','3','4','5']"
+    :detailButtonIsShowEdit="true"
+    :detailButtonIsShowDelete="true"
+    :detailButtonIsShowAdd="true"
+    :isOpenSearchTable="true"
+    fieldTableColumn="poLine"
+
   />
 
   <!-- 导入 -->
@@ -201,7 +207,7 @@
 
 const getSearchTableData = async (number,formField,searchField)=>{
   const {tableObject ,tableMethods} = useTable({
-    defaultParams:{number},
+    defaultParams:{number,available:'TRUE'},
     getListApi: PurchaseDetailApi.getPurchaseDetailPagePoNumber // 分页接口
   })
   tableObject.pageSize = 500
@@ -378,14 +384,12 @@ const getSearchTableData = async (number,formField,searchField)=>{
     }
   }
 
-  const isShowButtonSelection = ref(false)
   /** 添加/修改操作 */
   const formRef = ref()
   const openForm = async (type : string, row ?: number) => {
     tableData.value = [] // 重置明细数据
     formRef.value.open(type, row)
     if('create'==type){
-      isShowButtonSelection.value = false
       nextTick(async () => {
         formRef.value.formRef.setValues({deliveryDate:dayjs().valueOf()})
       })
@@ -404,7 +408,6 @@ const getSearchTableData = async (number,formField,searchField)=>{
           item.componentProps.isSearchList = false
         }
       })
-      isShowButtonSelection.value = true
     }
   }
 // 获取部门 用于详情 部门回显
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
index 4d84e28d5..132aecbbf 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
@@ -109,7 +109,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
         isSearchList: true,
         searchListPlaceholder: '请选择采购订单',
         searchField: 'number',
-        searchTitle: '采购订单信息',
+        searchTitle: '采购订单信息3',
         searchAllSchemas: PurchaseMain.allSchemas,
         searchPage: PurchaseMainApi.getPurchaseMainPage,
         searchCondition: [{
@@ -512,7 +512,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
         isSearchList: true,
         searchListPlaceholder: '请选择采购订单',
         searchField: 'number',
-        searchTitle: '采购订单信息',
+        searchTitle: '采购订单信息5',
         searchAllSchemas: PurchaseMain.allSchemas,
         searchPage: PurchaseMainApi.getPurchaseMainPage,
         searchCondition: [{
@@ -546,7 +546,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
       isInpuFocusShow: false,
       searchListPlaceholder: '请选择订单号',
       searchField: 'number',
-      searchTitle: '采购订单信息',
+      searchTitle: '采购订单信息4',
       searchAllSchemas: PurchaseMain.allSchemas,
       searchPage: PurchaseMainApi.getPurchaseMainPage,
       searchCondition: [{
@@ -568,10 +568,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: [{
@@ -622,10 +623,11 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
-        isSearchList: true,
+        disabled: true,
+        isSearchList: false,
         searchListPlaceholder: '请选择订单行',
         searchField: 'lineNumber',
-        searchTitle: '采购订单信息',
+        searchTitle: '采购订单信息2',
         searchAllSchemas: PurchaseDetail.allSchemas,
         searchPage: PurchaseDetailApi.getPurchaseDetailPagePoNumber,
         searchCondition: [{
@@ -646,7 +648,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
       isInpuFocusShow: false,
       searchListPlaceholder: '请选择订单行',
       searchField: 'lineNumber',
-      searchTitle: '采购订单信息',
+      searchTitle: '采购订单信息1',
       searchAllSchemas: PurchaseDetail.allSchemas,
       searchPage: PurchaseDetailApi.getPurchaseDetailPagePoNumber,
       searchCondition: [{

From 30457cde559ec8d7da80adc71c3717484d5e7355 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 5 Jul 2024 13:22:54 +0800
Subject: [PATCH 31/84] =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliver/purchasePlanMain/index.vue                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index ca1db0367..a35c5fb98 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@@ -69,7 +69,7 @@
     :apiDelete="PurchasePlanDetailApi.deletePurchasePlanDetail"
     @searchTableSuccessDetail="searchTableSuccessDetail"
     :detailValidate="detailValidate" 
-    :detailButtonIsShowAddStatusArray="['1','2','3','4','5']"
+    :detailButtonIsShowAddStatusArray="['1','3','4','5','6']"
     :detailButtonIsShowEdit="true"
     :detailButtonIsShowDelete="true"
     :detailButtonIsShowAdd="true"

From 0a32b4f8c6d9c430e0441215428d36a721fede13 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 5 Jul 2024 13:23:49 +0800
Subject: [PATCH 32/84] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliverRequestMain.data.ts        | 130 +++++++++++-------
 1 file changed, 79 insertions(+), 51 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index a1c199d2f..860ccfe75 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -68,16 +68,16 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       }
     }
   },
-  {
-    label: '发货单号',
-    field: 'asnNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch: true,
-    isForm: true
-  },
+  // {
+  //   label: '发货单号',
+  //   field: 'asnNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isSearch: true,
+  //   isForm: true
+  // },
   {
     label: '要货计划单号',
     field: 'ppNumber',
@@ -118,26 +118,58 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     }
   },
   {
-    label: '联系人姓名',
-    field: 'contactName',
+    label: '要求到货时间',
+    field: 'planArriveTime1',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
     sort: 'custom',
-    isTable:false,
     table: {
-      width: 150
+      width: 180
+    },
+    isTable:false,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width: '100%' },
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
     },
   },
   {
-    label: '联系人电话',
-    field: 'contactPhone',
+    label: '采购订单',
+    field: 'poNumber',
+    isForm:true,
+    isTableForm:false,
+  },
+  {
+    label: '计划到货时间',
+    field: 'planArriveTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
     sort: 'custom',
-    isTable:false,
     table: {
-      width: 150
+      width: 180
+    },
+    isTable:false,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width: '100%' },
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
     },
   },
   {
-    label: '联系人电子邮件',
-    field: 'contactEmail',
+    label: '发货联系人姓名',
+    field: 'contactName',
     sort: 'custom',
     isTable:false,
     table: {
@@ -145,20 +177,38 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   {
-    label: '供应商发货仓库代码',
-    field: 'fromWarehouseCode',
+    label: '发货联系人电话',
+    field: 'contactPhone',
     sort: 'custom',
     isTable:false,
     table: {
       width: 150
     },
-    form: {
-      componentProps: {
-        disbaled: true
-      }
-    },
-    isForm: true
   },
+  // {
+  //   label: '联系人电子邮件',
+  //   field: 'contactEmail',
+  //   sort: 'custom',
+  //   isTable:false,
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '供应商发货仓库代码',
+  //   field: 'fromWarehouseCode',
+  //   sort: 'custom',
+  //   isTable:false,
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     componentProps: {
+  //       disbaled: true
+  //     }
+  //   },
+  //   isForm: true
+  // },
   {
     label: '到仓库代码',
     field: 'toWarehouseCode',
@@ -189,29 +239,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     },
     isForm: false
   },
-  {
-    label: '计划到货时间',
-    field: 'planArriveTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable:false,
-    form: {
-      disabled:true,
-      component: 'DatePicker',
-      componentProps: {
-        style: { width: '100%' },
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-  },
+  
   {
     label: '承运商',
     field: 'carrierCode',

From eef893aac22514eeb7fa4217eef21915d883d005 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 5 Jul 2024 13:42:31 +0800
Subject: [PATCH 33/84] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Table/src/Table.vue            |   2 +
 src/locales/en-US.ts                          |   1 +
 src/locales/zh-CN.ts                          |   1 +
 src/utils/disposition/defaultButtons.ts       |  14 +-
 .../itemManage/itempackage/index.vue          |   8 +-
 .../supplierdeliverRequestMain/index.vue      |  18 +-
 .../supplierdeliverRequestMain/labelForm.vue  | 444 ++++++++++++++++++
 7 files changed, 485 insertions(+), 3 deletions(-)
 create mode 100644 src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue

diff --git a/src/components/Table/src/Table.vue b/src/components/Table/src/Table.vue
index 7fb9ee6cf..77c23e377 100644
--- a/src/components/Table/src/Table.vue
+++ b/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'],
   setup(props, { attrs, slots, emit, expose }) {
@@ -388,6 +389,7 @@ export default defineComponent({
           onSelect-all={selectAll}
           onSelection-change={selectionChange}
           onSort-change={sortChange}
+          row-key={unref(getProps).rowKey}
           {...unref(getBindValue)} 
         >
           {{
diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index 03c07ece7..4a972c1e1 100644
--- a/src/locales/en-US.ts
+++ b/src/locales/en-US.ts
@@ -884,6 +884,7 @@ export default {
     共:'Total',
     打开:'Open',
     保存:'Save',
+    下一步:'Next',
     请选择筛选对象:'Please select filter',
     请输入内容:'Please inputr content',
     附件:'Attachment',
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 7f47117c5..8b311e52c 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -884,6 +884,7 @@ export default {
     共:'共',
     打开:'打开',
     保存:'保存',
+    下一步:'下一步',
     请选择筛选对象:'请选择筛选对象',
     请输入内容:'请输入内容',
     附件:'附件',
diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts
index 0e13e51f7..f18e42998 100644
--- a/src/utils/disposition/defaultButtons.ts
+++ b/src/utils/disposition/defaultButtons.ts
@@ -236,7 +236,19 @@ export function formStagingBtn(option:any) {
     hasPermi: ''
   })
 }
-
+// form表单-下一步按钮
+export function formNextStepBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: t(`ts.下一步`).replace('ts.', ''),
+    name: 'nextStep',
+    hide: false,
+    type: 'primary',
+    icon: 'ep:select',
+    color: '',
+    float:'right',
+    hasPermi: ''
+  })
+}
 
 // drawer抽屉头部-编辑按钮
 export function drawerEditBtn(option:any) {
diff --git a/src/views/wms/basicDataManage/itemManage/itempackage/index.vue b/src/views/wms/basicDataManage/itemManage/itempackage/index.vue
index 4f25372ad..bbd6a7ee5 100644
--- a/src/views/wms/basicDataManage/itemManage/itempackage/index.vue
+++ b/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)">
@@ -328,7 +329,12 @@ const searchFormClick = (searchData) => {
 
 /** 初始化 **/
 onMounted(async () => {
-  getList()
+  await getList()
+  tableObject.tableList.forEach(item=>{
+    item.children=[{
+      packUnit:'300000100'
+    }]
+  })
   importTemplateData.templateUrl = await ItempackagingApi.importTemplate()
 })
 </script>
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index e3dd21a14..edd0cedba 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -133,6 +133,8 @@
     @submitForm="submitFormLabel"
     :isShowReduceButton="false"
     @clearInput='clearInput'
+   :footButttondata="footButttondata"
+    @footButtonClick='footButtonClick'
   />
   <!-- 上传质量报告 -->
   <BasicForm
@@ -159,6 +161,7 @@
       <el-button type="primary" @click="printAllClick">打印全部</el-button>
     </template> -->
   </SearchTable>
+  <labelForm ref="labelFormRef" :tableAllSchemas="SupplierdeliverRequestDetailLabel.allSchemas"/>
 </template>
 
 <script setup lang="ts">
@@ -185,6 +188,7 @@ 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' })
@@ -557,7 +561,19 @@ const buttonTableClick = async (val, row) => {
     handleDocumentPrint(row.masterId)
   }
 }
-
+const footButttondata = ref([
+  defaultButtons.formNextStepBtn(null), // BOM下一步
+  defaultButtons.formCloseBtn(null) // BOM关闭
+])
+// 下一步
+const labelFormRef = ref()
+const footButtonClick = (val)=>{
+  if(val == 'nextStep'){
+    labelFormRef.value.openLabel(detatableData.tableList)
+  }else if(val == 'close'){
+    formLabelRef.value.dialogVisible = false
+  }
+}
 // 获取部门 用于详情 部门回显
 const { wsCache } = useCache()
 /** 详情操作 */
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
new file mode 100644
index 000000000..c9974c456
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
@@ -0,0 +1,444 @@
+<template>
+  <el-dialog v-model="dialogTableVisible" title="标签" width="1100">
+    <el-table
+      :data="tableData"
+      border
+      row-key="id"
+      style="width: 1050px; max-height: 70vh; overflow-y: auto"
+      v-if="tableData.length>0"
+    >
+      <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.packUnit && scope.row.packQty"
+          >
+            <el-table
+              :data="scope.row.children"
+              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="qty1" align="center">
+                        <template #default="scope2">
+                          <el-input
+                            v-model="scope2.row.qty1"
+                            @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="qty1" 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>
+            <el-table
+              :data="scope.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="qty1" align="center">
+                <template #default="scope1">
+                  <el-input v-model="scope1.row.qty1" @blur="blurThree(scope.row, 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)"
+                    >添加箱</el-button
+                  >
+                </template>
+                <template #default="scope1">
+                  <el-button type="warning" link @click="removeX(scope.row, scope.$index, scope1.row, scope1.$index)"
+                    >移出</el-button
+                  >
+                </template>
+              </el-table-column>
+            </el-table>
+          </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="orderQty" align="center" />
+      <el-table-column label="计量单位" width="100" prop="uom" align="center" />
+      <el-table-column label="托个数" width="100" prop="packQty1" align="center" />
+      <el-table-column label="托规格" width="100" prop="packUnit" align="center" />
+      <el-table-column label="托数量" width="100" prop="packQty" align="center" />
+      <el-table-column label="箱规格" width="100" prop="secondPackUnit" align="center" />
+      <el-table-column label="箱数量" width="100" prop="secondPackQty" align="center" />
+    </el-table>
+    <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 tableData = ref([])
+const openLabel = (tableList) => {
+  console.log(tableList)
+  dialogTableVisible.value = true
+  tableData.value = tableList
+  intData()
+}
+const oneId = ref(0)
+const twoId = ref(0)
+const intData = () => {
+  // 目前托信息等于包装规格1
+  tableData.value.forEach((item) => {
+    item.packQty1 = 3
+  
+    // 判断托信息是否存在
+    console.log(44,item.packUnit);
+    console.log(item.packQty);
+    
+    if (item.packUnit && item.packQty) {
+        // 数量除以托数量获取余数
+    item.lastNumber = parseFloat(item.orderQty) % parseFloat(item.packQty)
+    // 托数量/箱数量  一托可以放几箱
+    item.otherNumber = parseFloat(item.packQty) / parseFloat(item.secondPackQty)
+    // 数量%每箱数量  获取总共几箱
+    item.allPackQty = Math.ceil(parseFloat(item.orderQty) / parseFloat(item.secondPackQty))
+      item.children = []
+      for (let i = 0; i < item.packQty1; i++) {
+        oneId.value++
+        // 如果有余数
+        if (item.lastNumber) {
+          // 最后一条信息直接展示余数的信息
+          if (i == item.packQty1 - 1) {
+            item.children.push({
+              id: oneId.value,
+              tPoNumber: i + 1,
+              xNumber: Math.ceil(item.lastNumber / parseFloat(item.secondPackQty)),
+              qty1: item.lastNumber
+            })
+          } else {
+            // 其他数据展示一托的全部箱数和全部数量
+            item.children.push({
+              id: oneId.value,
+              tPoNumber: i + 1,
+              xNumber: item.otherNumber,
+              qty1: item.packQty
+            })
+          }
+        } else {
+          // 如果沒有余数,直接展示一托的全部箱数和全部数量
+          item.children.push({
+            id: oneId.value,
+            tPoNumber: i + 1,
+            xNumber: item.otherNumber,
+            qty1: item.packQty
+          })
+        }
+      }
+      // 判断箱信息是否存在
+      if (item.secondPackUnit && item.secondPackQty) {
+        item.children.forEach((cur, key) => {
+          cur.children = []
+          // 数量除以托数量获取余数
+          cur.xLastNumber = parseFloat(cur.xNumber) % parseFloat(item.secondPackQty)
+          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,
+                  qty1: cur.xLastNumber
+                })
+              } else {
+                // 其他数据展示一托的全部箱数和全部数量
+                cur.children.push({
+                  id: twoId.value,
+                  xPoNumber: j + 1,
+                  qty1: item.secondPackQty
+                })
+              }
+            } else {
+              // 如果沒有余数,直接展示一托的全部箱数和全部数量
+              cur.children.push({
+                id: twoId.value,
+                xPoNumber: j + 1,
+                qty1: item.secondPackQty
+              })
+            }
+          }
+        })
+      }
+    }else{
+        // 数量除以箱数量获取余数
+        item.lastNumber = parseFloat(item.orderQty) % parseFloat(item.secondPackQty)
+        item.children=[]
+        console.log(item.packQty1)
+        for (let i = 0; i < item.packQty1; i++) {
+          oneId.value++
+          if (item.lastNumber) {
+            // 最后一条信息直接展示余数的信息
+            if (i == item.packQty - 1) {
+              item.children.push({
+                id: oneId.value,
+                xPoNumber : i + 1,
+                qty1: item.lastNumber
+              })
+            } else {
+              // 其他数据展示一托的全部箱数和全部数量
+              item.children.push({
+                id: oneId.value,
+                xPoNumber: i + 1,
+                qty1: item.secondPackQty
+              })
+            }
+          }else{
+            item.children.push({
+                id: oneId.value,
+                xPoNumber: i + 1,
+                qty1: item.secondPackQty
+              })
+          }
+        }
+        console.log(item.children)
+    }
+  })
+  console.log(tableData.value)
+}
+/** 弹窗按钮 */
+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 addT = (oneRow) => {
+  console.log(oneRow)
+  oneId.value++
+  oneRow.children.push({
+    id: oneId.value,
+    tPoNumber: oneRow.children[oneRow.children.length - 1].tPoNumber + 1,
+    xNumber: '',
+    qty1: ''
+  })
+  oneRow.packQty1 = oneRow.children.length
+}
+// 移出托
+const removeT = (oneRow, oneIndex, twoRow, twoIndex) => {
+  oneRow.children.splice(twoIndex, 1)
+  oneRow.packQty1 = oneRow.children.length
+}
+const addX = (oneRow, oneIndex, twoRow, twoIndex,type) => {
+ twoId.value++
+//  有父集托的时候
+  if(type == 1){
+    console.log(444,twoRow.children)
+    twoRow.children.push({
+      id:twoId.value,
+      xPoNumber:  twoRow?.children[twoRow.children.length - 1]?.xPoNumber? twoRow?.children[twoRow.children.length - 1]?.xPoNumber:0 + 1,
+      qty1: ''
+  })
+  twoRow.xNumber = twoRow.children.length
+  }else{
+    oneRow.children.push({
+      id:oneId.value,
+    xPoNumber:  oneRow.children[oneRow.children.length - 1].xPoNumber + 1,
+    qty1: ''
+  })
+  oneRow.packQty1 = oneRow.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.qty1) || 0
+    })
+    twoRow.qty1 = num
+    twoRow.xNumber = twoRow.children.length
+  }else{
+    oneRow.children.splice(twoIndex, 1)
+    oneRow.packQty1 = oneRow.children.length
+  }
+}
+// 隐藏展开图标
+const getRowClass = (row) => {
+  if (!row.row.children || row.row.children.length == 0) {
+    return 'row-expand-cover'
+  }
+}
+const blurOne = (oneRow, twoRow) => {
+  if (parseFloat(twoRow.xNumber) > parseFloat(oneRow.otherNumber)) {
+    message.warning('每托箱个数最多' + oneRow.otherNumber + '箱')
+    twoRow.xNumber = oneRow.otherNumber
+    twoRow.children = []
+    twoRow.qty1 = parseFloat(twoRow.xNumber) * parseFloat(oneRow.secondPackQty)
+  }
+  twoRow.qty1 = parseFloat(twoRow.xNumber) * parseFloat(oneRow.secondPackQty)
+  let num = 0
+  oneRow.children.forEach((item) => {
+    num += parseFloat(item.xNumber) || 0
+  })
+  if (num > oneRow.allPackQty) {
+    message.warning('总箱数不可以大于' + oneRow.allPackQty)
+    twoRow.xNumber = ''
+    return
+  }
+  // 判断箱信息是否存在
+  if (oneRow.secondPackUnit && oneRow.secondPackQty) {
+      oneRow.children.forEach((cur, key) => {
+          cur.children = []
+          // 数量除以托数量获取余数
+          cur.xLastNumber = parseFloat(cur.xNumber) % parseFloat(oneRow.secondPackQty)
+          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,
+                  qty1: cur.xLastNumber
+                })
+              } else {
+                // 其他数据展示一托的全部箱数和全部数量
+                cur.children.push({
+                  id: twoId.value,
+                  xPoNumber: j + 1,
+                  qty1: oneRow.secondPackQty
+                })
+              }
+            } else {
+              // 如果沒有余数,直接展示一托的全部箱数和全部数量
+              cur.children.push({
+                id: twoId.value,
+                xPoNumber: j + 1,
+                qty1: oneRow.secondPackQty
+              })
+            }
+          }
+        })
+      }
+}
+
+const blurTwo = (oneRow, twoRow, threeRow) => {
+  if (parseFloat(threeRow.xNumber) > parseFloat(oneRow.secondPackQty)) {
+    message.warning('数量不可以大于箱数量')
+    threeRow.qty1 = ''
+    return
+  }
+  let num = 0
+  twoRow.children.forEach((item) => {
+    num += parseFloat(item.qty1) || 0
+  })
+  twoRow.qty1 = num
+}
+const blurThree = (oneRow,twoRow)=>{
+  if(parseFloat(twoRow.qty1)>parseFloat(oneRow.secondPackQty)){
+    message.warning('每箱个数最多' + oneRow.secondPackQty )
+    twoRow.qty1 =oneRow.secondPackQty
+  }
+}
+defineExpose({ openLabel }) // 提供 open 方法，用于打开弹窗
+</script>
+<style lang="scss" scoped>
+::v-deep .row-expand-cover td .el-table__expand-icon {
+  visibility: hidden;
+}
+</style>
\ No newline at end of file

From de9e6c478b4b2c6a0a6a49340979ea56a731ce7d Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 5 Jul 2024 14:02:40 +0800
Subject: [PATCH 34/84] =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=85=81=E8=AE=B8?=
 =?UTF-8?q?=E8=B6=85=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/dict.ts                             |  1 +
 .../supplieritem/supplieritem.data.ts         | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index d7a5442ae..ab9b25b3b 100644
--- a/src/utils/dict.ts
+++ b/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', // 物料种类
diff --git a/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts b/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts
index 4f89e559f..82f7bf3e8 100644
--- a/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts
+++ b/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',

From 184e9a0ec61914f24a5fc4ffac414d0891c6035c Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 5 Jul 2024 14:12:31 +0800
Subject: [PATCH 35/84] =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliverRequestMain.data.ts                          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index 860ccfe75..88db460d0 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -118,7 +118,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     }
   },
   {
-    label: '要求到货时间',
+    label: '要求到货时间（提供字段）',
     field: 'planArriveTime1',
     formatter: dateFormatter,
     detail: {

From 9576e5a89a0babec107093b9b636d53def0cf0d1 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 5 Jul 2024 15:21:33 +0800
Subject: [PATCH 36/84] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TableForm/src/TableForm.vue    |   1 +
 .../supplierdeliverBasicForm.vue              |   3 +
 .../supplierdeliverRequestMain.data.ts        | 132 +++++++++++++-----
 3 files changed, 101 insertions(+), 35 deletions(-)

diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue
index af8cab620..44fca3917 100644
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@@ -505,6 +505,7 @@ const emit = defineEmits([
   'tableSelectionDelete',
   'extendedButtonsClick',
   'formSelectChange',
+  'inputNumberChange',
   'tableSortChange',
   'selectCallback',
   'handleTableSelect',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
index b89fe91d3..1cd66176e 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
@@ -262,6 +262,9 @@ const getSearchTableData = async (number,formField,searchField)=>{
     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']
     tableData.value.push(newRow)
     itemCodes.push(row['itemCode'])
   })
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index 5fe4e1352..f25c37716 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -691,26 +691,24 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     }
   },
   {
-    label: '批次',
-    field: 'batch',
+    label: '申请发货数量',
+    field: 'qty',
     sort: 'custom',
     table: {
       width: 150
     },
-    hiddenInMain:true,
-    tableForm: {
-      disabled: true
-    }
-  },
-  {
-    label: '供应商批次',
-    field: 'supplierBatch',
-    sort: 'custom',
-    table: {
-      width: 150
+    sortTableDefault:2,
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
     },
     tableForm: {
-      disabled: false
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
     }
   },
   {
@@ -739,6 +737,70 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       valueFormat: 'x',
     }
   },
+  {
+    label: '供应商批次',
+    field: 'supplierBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: false
+    }
+  },
+  {
+    label: '发货批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain:true,
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    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: 'shippedQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'InputNumber',
+      precision: 6
+    },
+    sortTableDefault:4,
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    }
+  },
+  
   
   // {
   //   label: '替代批次',
@@ -811,27 +873,27 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       disabled: true
     }
   },
-  {
-    label: '发货数量',
-    field: 'qty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:2,
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        min: 1,
-        precision: 6
-      }
-    },
-    tableForm: {
-      type: 'InputNumber',
-      min: 1,
-      precision: 6
-    }
-  },
+  // {
+  //   label: '发货数量',
+  //   field: 'qty',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   sortTableDefault:2,
+  //   form: {
+  //     component: 'InputNumber',
+  //     componentProps: {
+  //       min: 1,
+  //       precision: 6
+  //     }
+  //   },
+  //   tableForm: {
+  //     type: 'InputNumber',
+  //     min: 1,
+  //     precision: 6
+  //   }
+  // },
   {
     label: '订单数量',
     field: 'orderQty',

From df7e9a9455b15f72d02e5e7dba8bbe6db9758d35 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 5 Jul 2024 15:43:10 +0800
Subject: [PATCH 37/84] =?UTF-8?q?=E6=96=B0=E5=A2=9E--=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=B8=A6=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliverBasicForm.vue                       |  2 ++
 .../supplierdeliverRequestMain.data.ts                 | 10 +++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
index 1cd66176e..4f0b3e14a 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
@@ -216,6 +216,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
       setV[formField] = val[0][searchField]
       if(formField == 'ppNumber'){
         //新增--选择完要货计划，自动展示明细
+        
+        setV['poNumber'] = val[0]['poNumber'] //采购订单
         getSearchTableData(val[0]['number'],formField,searchField)
 
         // 设置计划到货时间
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index f25c37716..030bd4f25 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -119,7 +119,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
   },
   {
     label: '要求到货时间（提供字段）',
-    field: 'planArriveTime1',
+    field: 'planArriveTime',
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -132,6 +132,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     form: {
       component: 'DatePicker',
       componentProps: {
+        disabled: true,
         style: { width: '100%' },
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
@@ -144,6 +145,12 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'poNumber',
     isForm:true,
     isTableForm:false,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        disabled: true,
+      }
+    }
   },
   {
     label: '计划到货时间',
@@ -1151,6 +1158,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     label: '备注',
     field: 'remark',
     sort: 'custom',
+    isTable: false,
     hiddenInMain:true,
     table: {
       width: 150

From eacb0329ae70c5a399d1c1084ef4ac373552b9a8 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 5 Jul 2024 15:59:42 +0800
Subject: [PATCH 38/84] =?UTF-8?q?=E7=94=9F=E6=88=90=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../itemManage/packageunit/index.vue          |   1 +
 .../supplierdeliverRequestMain/labelForm.vue  | 299 ++++++++++--------
 2 files changed, 160 insertions(+), 140 deletions(-)

diff --git a/src/views/wms/basicDataManage/itemManage/packageunit/index.vue b/src/views/wms/basicDataManage/itemManage/packageunit/index.vue
index 075c78dbd..3a998d42c 100644
--- a/src/views/wms/basicDataManage/itemManage/packageunit/index.vue
+++ b/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)">
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
index c9974c456..1086fa936 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
@@ -5,7 +5,7 @@
       border
       row-key="id"
       style="width: 1050px; max-height: 70vh; overflow-y: auto"
-      v-if="tableData.length>0"
+      v-if="tableData.length > 0"
     >
       <el-table-column type="expand" width="50">
         <template #default="scope">
@@ -23,17 +23,12 @@
               <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 :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="qty1" align="center">
+                      <el-table-column label="数量" width="100" prop="qtyTwo" align="center">
                         <template #default="scope2">
                           <el-input
-                            v-model="scope2.row.qty1"
+                            v-model="scope2.row.qtyTwo"
                             @blur="blurTwo(scope.row, scope1.row, scope2.row)"
                           />
                         </template>
@@ -43,7 +38,7 @@
                           <el-button
                             type="primary"
                             link
-                            @click="addX(scope.row, scope.$index, scope1.row, scope1.$index,1)"
+                            @click="addX(scope.row, scope.$index, scope1.row, scope1.$index, 1)"
                             >添加箱</el-button
                           >
                         </template>
@@ -76,7 +71,7 @@
                   <el-input v-model="scope1.row.xNumber" @blur="blurOne(scope.row, scope1.row)" />
                 </template>
               </el-table-column>
-              <el-table-column label="数量" width="100" prop="qty1" align="center" />
+              <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
@@ -95,16 +90,11 @@
             </el-table>
           </div>
           <div style="margin-left: 550px; margin-top: -8px; margin-bottom: -8px" v-else>
-            <el-table
-              :data="scope.row.children"
-              border
-              style="width: 300px"
-              row-key="id"
-            >
+            <el-table :data="scope.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="qty1" align="center">
+              <el-table-column label="数量" width="100" prop="qtyOne" align="center">
                 <template #default="scope1">
-                  <el-input v-model="scope1.row.qty1" @blur="blurThree(scope.row, scope1.row)" />
+                  <el-input v-model="scope1.row.qtyOne" @blur="blurThree(scope.row, scope1.row)" />
                 </template>
               </el-table-column>
               <el-table-column label="添加箱" width="100" prop="add" align="center">
@@ -114,7 +104,10 @@
                   >
                 </template>
                 <template #default="scope1">
-                  <el-button type="warning" link @click="removeX(scope.row, scope.$index, scope1.row, scope1.$index)"
+                  <el-button
+                    type="warning"
+                    link
+                    @click="removeX(scope.row, scope.$index, scope1.row, scope1.$index)"
                     >移出</el-button
                   >
                 </template>
@@ -162,24 +155,21 @@ const openLabel = (tableList) => {
   tableData.value = tableList
   intData()
 }
-const oneId = ref(0)
-const twoId = ref(0)
+const oneId = ref(0)//每托的id
+const twoId = ref(0)//每箱的id
 const intData = () => {
   // 目前托信息等于包装规格1
   tableData.value.forEach((item) => {
     item.packQty1 = 3
-  
+
     // 判断托信息是否存在
-    console.log(44,item.packUnit);
-    console.log(item.packQty);
-    
     if (item.packUnit && item.packQty) {
-        // 数量除以托数量获取余数
-    item.lastNumber = parseFloat(item.orderQty) % parseFloat(item.packQty)
-    // 托数量/箱数量  一托可以放几箱
-    item.otherNumber = parseFloat(item.packQty) / parseFloat(item.secondPackQty)
-    // 数量%每箱数量  获取总共几箱
-    item.allPackQty = Math.ceil(parseFloat(item.orderQty) / parseFloat(item.secondPackQty))
+      // 数量除以托数量获取余数
+      item.lastNumber = parseFloat(item.orderQty) % parseFloat(item.packQty)
+      // 托数量/箱数量  一托可以放几箱
+      item.otherNumber = parseFloat(item.packQty) / parseFloat(item.secondPackQty)
+      // 数量%每箱数量  获取总共几箱
+      item.allPackQty = Math.ceil(parseFloat(item.orderQty) / parseFloat(item.secondPackQty))
       item.children = []
       for (let i = 0; i < item.packQty1; i++) {
         oneId.value++
@@ -191,7 +181,7 @@ const intData = () => {
               id: oneId.value,
               tPoNumber: i + 1,
               xNumber: Math.ceil(item.lastNumber / parseFloat(item.secondPackQty)),
-              qty1: item.lastNumber
+              qtyOne: item.lastNumber
             })
           } else {
             // 其他数据展示一托的全部箱数和全部数量
@@ -199,7 +189,7 @@ const intData = () => {
               id: oneId.value,
               tPoNumber: i + 1,
               xNumber: item.otherNumber,
-              qty1: item.packQty
+              qtyOne: item.packQty
             })
           }
         } else {
@@ -208,7 +198,7 @@ const intData = () => {
             id: oneId.value,
             tPoNumber: i + 1,
             xNumber: item.otherNumber,
-            qty1: item.packQty
+            qtyOne: item.packQty
           })
         }
       }
@@ -227,14 +217,14 @@ const intData = () => {
                 cur.children.push({
                   id: twoId.value,
                   xPoNumber: j + 1,
-                  qty1: cur.xLastNumber
+                  qtyTwo: cur.xLastNumber
                 })
               } else {
                 // 其他数据展示一托的全部箱数和全部数量
                 cur.children.push({
                   id: twoId.value,
                   xPoNumber: j + 1,
-                  qty1: item.secondPackQty
+                  qtyTwo: item.secondPackQty
                 })
               }
             } else {
@@ -242,44 +232,44 @@ const intData = () => {
               cur.children.push({
                 id: twoId.value,
                 xPoNumber: j + 1,
-                qty1: item.secondPackQty
+                qtyTwo: item.secondPackQty
               })
             }
           }
         })
       }
-    }else{
-        // 数量除以箱数量获取余数
-        item.lastNumber = parseFloat(item.orderQty) % parseFloat(item.secondPackQty)
-        item.children=[]
-        console.log(item.packQty1)
-        for (let i = 0; i < item.packQty1; i++) {
-          oneId.value++
-          if (item.lastNumber) {
-            // 最后一条信息直接展示余数的信息
-            if (i == item.packQty - 1) {
-              item.children.push({
-                id: oneId.value,
-                xPoNumber : i + 1,
-                qty1: item.lastNumber
-              })
-            } else {
-              // 其他数据展示一托的全部箱数和全部数量
-              item.children.push({
-                id: oneId.value,
-                xPoNumber: i + 1,
-                qty1: item.secondPackQty
-              })
-            }
-          }else{
+    } else {
+      // 数量除以箱数量获取余数
+      item.lastNumber = parseFloat(item.orderQty) % parseFloat(item.secondPackQty)
+      item.children = []
+      console.log(item.packQty1)
+      for (let i = 0; i < item.packQty1; i++) {
+        oneId.value++
+        if (item.lastNumber) {
+          // 最后一条信息直接展示余数的信息
+          if (i == item.packQty - 1) {
             item.children.push({
-                id: oneId.value,
-                xPoNumber: i + 1,
-                qty1: item.secondPackQty
-              })
+              id: oneId.value,
+              xPoNumber: i + 1,
+              qtyOne: item.lastNumber
+            })
+          } else {
+            // 其他数据展示一托的全部箱数和全部数量
+            item.children.push({
+              id: oneId.value,
+              xPoNumber: i + 1,
+              qtyOne: item.secondPackQty
+            })
           }
+        } else {
+          item.children.push({
+            id: oneId.value,
+            xPoNumber: i + 1,
+            qtyOne: item.secondPackQty
+          })
         }
-        console.log(item.children)
+      }
+      console.log(item.children)
     }
   })
   console.log(tableData.value)
@@ -302,16 +292,35 @@ const buttonBaseClick = (val) => {
     dialogTableVisible.value = false
   }
 }
-
+// 保存
+const submitForm = () => {
+  let arr = tableData.value.map((item) => {
+    item.allNumber = 0
+    // 判断托信息是否存在
+      item.children.forEach((cur) => {
+        item.allNumber += parseFloat(cur.qtyOne) || 0
+      })
+   
+    if (item.allNumber == parseFloat(item.orderQty)) {
+      return true
+    } else {
+      return false
+    }
+  })
+  const isBol = arr.some((item) => item == false)
+  if (isBol) {
+    message.warning('当前添加的数量与总数量不一致')
+    return
+  }
+}
 // 添加托
 const addT = (oneRow) => {
-  console.log(oneRow)
   oneId.value++
   oneRow.children.push({
     id: oneId.value,
-    tPoNumber: oneRow.children[oneRow.children.length - 1].tPoNumber + 1,
+    tPoNumber: oneRow.children[oneRow.children.length - 1].tPoNumber + 1, //行号是上一行的行号加1
     xNumber: '',
-    qty1: ''
+    qtyOne: ''
   })
   oneRow.packQty1 = oneRow.children.length
 }
@@ -320,56 +329,62 @@ const removeT = (oneRow, oneIndex, twoRow, twoIndex) => {
   oneRow.children.splice(twoIndex, 1)
   oneRow.packQty1 = oneRow.children.length
 }
-const addX = (oneRow, oneIndex, twoRow, twoIndex,type) => {
- twoId.value++
-//  有父集托的时候
-  if(type == 1){
-    console.log(444,twoRow.children)
+// 添加箱
+const addX = (oneRow, oneIndex, twoRow, twoIndex, type) => {
+  twoId.value++
+  //  有父级托的时候
+  if (type == 1) {
+    // 在托下添加箱
     twoRow.children.push({
-      id:twoId.value,
-      xPoNumber:  twoRow?.children[twoRow.children.length - 1]?.xPoNumber? twoRow?.children[twoRow.children.length - 1]?.xPoNumber:0 + 1,
-      qty1: ''
-  })
-  twoRow.xNumber = twoRow.children.length
-  }else{
+      id: twoId.value,
+      xPoNumber: twoRow?.children[twoRow.children.length - 1]?.xPoNumber
+        ? twoRow?.children[twoRow.children.length - 1]?.xPoNumber
+        : 0 + 1,
+      qtyOne: ''
+    })
+    twoRow.xNumber = twoRow.children.length
+  } else {
+    // 直接添加箱
     oneRow.children.push({
-      id:oneId.value,
-    xPoNumber:  oneRow.children[oneRow.children.length - 1].xPoNumber + 1,
-    qty1: ''
-  })
-  oneRow.packQty1 = oneRow.children.length
+      id: oneId.value,
+      xPoNumber: oneRow.children[oneRow.children.length - 1].xPoNumber + 1,
+      qtyOne: ''
+    })
+    oneRow.packQty1 = oneRow.children.length
   }
-
 }
-const removeX = (oneRow, oneIndex, twoRow, twoIndex, threeRow, threeIndex,type) => {
-//  有父集托的时候
-  if(type == 1){
-  twoRow.children.splice(threeIndex, 1)
+// 移除箱
+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.qty1) || 0
+      num += parseFloat(item.qtyTwo) || 0
     })
-    twoRow.qty1 = num
+    twoRow.qtyOne = num
     twoRow.xNumber = twoRow.children.length
-  }else{
+  } else {
     oneRow.children.splice(twoIndex, 1)
     oneRow.packQty1 = oneRow.children.length
   }
 }
-// 隐藏展开图标
+// 是否显示展开图标
 const getRowClass = (row) => {
   if (!row.row.children || row.row.children.length == 0) {
     return 'row-expand-cover'
   }
 }
+// 托失去焦点
 const blurOne = (oneRow, twoRow) => {
   if (parseFloat(twoRow.xNumber) > parseFloat(oneRow.otherNumber)) {
     message.warning('每托箱个数最多' + oneRow.otherNumber + '箱')
     twoRow.xNumber = oneRow.otherNumber
     twoRow.children = []
-    twoRow.qty1 = parseFloat(twoRow.xNumber) * parseFloat(oneRow.secondPackQty)
+    twoRow.qtyOne = parseFloat(twoRow.xNumber) * parseFloat(oneRow.secondPackQty)
   }
-  twoRow.qty1 = parseFloat(twoRow.xNumber) * parseFloat(oneRow.secondPackQty)
+  twoRow.qtyOne = parseFloat(twoRow.xNumber) * parseFloat(oneRow.secondPackQty)
   let num = 0
   oneRow.children.forEach((item) => {
     num += parseFloat(item.xNumber) || 0
@@ -379,60 +394,64 @@ const blurOne = (oneRow, twoRow) => {
     twoRow.xNumber = ''
     return
   }
+  // 托信息修改的時候箱数据自动排列
   // 判断箱信息是否存在
   if (oneRow.secondPackUnit && oneRow.secondPackQty) {
-      oneRow.children.forEach((cur, key) => {
-          cur.children = []
-          // 数量除以托数量获取余数
-          cur.xLastNumber = parseFloat(cur.xNumber) % parseFloat(oneRow.secondPackQty)
-          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,
-                  qty1: cur.xLastNumber
-                })
-              } else {
-                // 其他数据展示一托的全部箱数和全部数量
-                cur.children.push({
-                  id: twoId.value,
-                  xPoNumber: j + 1,
-                  qty1: oneRow.secondPackQty
-                })
-              }
-            } else {
-              // 如果沒有余数,直接展示一托的全部箱数和全部数量
-              cur.children.push({
-                id: twoId.value,
-                xPoNumber: j + 1,
-                qty1: oneRow.secondPackQty
-              })
-            }
+    oneRow.children.forEach((cur, key) => {
+      cur.children = []
+      // 数量除以托数量获取余数
+      cur.xLastNumber = parseFloat(cur.xNumber) % parseFloat(oneRow.secondPackQty)
+      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.secondPackQty
+            })
           }
-        })
+        } else {
+          // 如果沒有余数,直接展示一托的全部箱数和全部数量
+          cur.children.push({
+            id: twoId.value,
+            xPoNumber: j + 1,
+            qtyTwo: oneRow.secondPackQty
+          })
+        }
       }
+    })
+  }
 }
-
+//在托下方的箱数量失去焦点
 const blurTwo = (oneRow, twoRow, threeRow) => {
-  if (parseFloat(threeRow.xNumber) > parseFloat(oneRow.secondPackQty)) {
-    message.warning('数量不可以大于箱数量')
-    threeRow.qty1 = ''
+  console.log(parseFloat(threeRow.qtyTwo))
+  console.log(parseFloat(oneRow.secondPackQty))
+  if (parseFloat(threeRow.qtyTwo) > parseFloat(oneRow.secondPackQty)) {
+    message.warning('数量最多为'+oneRow.secondPackQty)
+    threeRow.qtyTwo = oneRow.secondPackQty
     return
   }
   let num = 0
   twoRow.children.forEach((item) => {
-    num += parseFloat(item.qty1) || 0
+    num += parseFloat(item.qtyTwo) || 0
   })
-  twoRow.qty1 = num
+  twoRow.qtyOne = num
 }
-const blurThree = (oneRow,twoRow)=>{
-  if(parseFloat(twoRow.qty1)>parseFloat(oneRow.secondPackQty)){
-    message.warning('每箱个数最多' + oneRow.secondPackQty )
-    twoRow.qty1 =oneRow.secondPackQty
+// 箱数量失去焦点
+const blurThree = (oneRow, twoRow) => {
+  if (parseFloat(twoRow.qtyOne) > parseFloat(oneRow.secondPackQty)) {
+    message.warning('每箱个数最多' + oneRow.secondPackQty)
+    twoRow.qtyOne = oneRow.secondPackQty
   }
 }
 defineExpose({ openLabel }) // 提供 open 方法，用于打开弹窗

From 26df1a5638283fd31cf7be9b8177c75a3f0c087b Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 5 Jul 2024 16:03:03 +0800
Subject: [PATCH 39/84] =?UTF-8?q?=E8=A6=81=E6=B1=82=E5=88=B0=E8=B4=A7?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliverRequestMain/supplierdeliverBasicForm.vue   | 1 +
 .../supplierdeliverRequestMain.data.ts                        | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
index 4f0b3e14a..eaecff5e4 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
@@ -227,6 +227,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 = []
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index 030bd4f25..6c15daee9 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -118,8 +118,8 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     }
   },
   {
-    label: '要求到货时间（提供字段）',
-    field: 'planArriveTime',
+    label: '要求到货时间',
+    field: 'arriveTime',
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'

From 3197972a7eadc4eb03d3432d894b52d936b41eda Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 5 Jul 2024 17:58:16 +0800
Subject: [PATCH 40/84] =?UTF-8?q?=E7=94=9F=E6=88=90=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/locales/en-US.ts                          |   1 -
 src/locales/zh-CN.ts                          |   1 -
 .../packageunit/packageunit.data.ts           | 342 +++++++++++++++++-
 .../supplierdeliverRequestMain/labelForm.vue  | 161 +++++----
 4 files changed, 417 insertions(+), 88 deletions(-)

diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index 16eae4a35..14e24389f 100644
--- a/src/locales/en-US.ts
+++ b/src/locales/en-US.ts
@@ -885,7 +885,6 @@ export default {
     打开:'Open',
     保存:'Save',
     下一步:'Next',
-    下一步:'Next',
     请选择筛选对象:'Please select filter',
     请输入内容:'Please inputr content',
     附件:'Attachment',
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index d5bec6b15..ddc8193f9 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -885,7 +885,6 @@ export default {
     打开:'打开',
     保存:'保存',
     下一步:'下一步',
-    下一步:'下一步',
     请选择筛选对象:'请选择筛选对象',
     请输入内容:'请输入内容',
     附件:'附件',
diff --git a/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts b/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts
index 8572f2373..80332842f 100644
--- a/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts
+++ b/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.getPackageunitPage, // 查询弹窗所需分页方法
+        searchCondition:[{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
   },
-  // {
-  //   label: '父包装代码',
-  //   field: 'parentCode',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
   {
     label: '包装名称',
     field: 'name',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
index 1086fa936..fc80a2a7c 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
@@ -64,7 +64,7 @@
                     </el-table>
                   </div>
                 </template>
-              </el-table-column>
+              </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">
@@ -155,12 +155,12 @@ const openLabel = (tableList) => {
   tableData.value = tableList
   intData()
 }
-const oneId = ref(0)//每托的id
-const twoId = ref(0)//每箱的id
+const oneId = ref(0) //每托的id
+const twoId = ref(0) //每箱的id
 const intData = () => {
   // 目前托信息等于包装规格1
   tableData.value.forEach((item) => {
-    item.packQty1 = 3
+    item.packQty1 = 11
 
     // 判断托信息是否存在
     if (item.packUnit && item.packQty) {
@@ -170,70 +170,67 @@ const intData = () => {
       item.otherNumber = parseFloat(item.packQty) / parseFloat(item.secondPackQty)
       // 数量%每箱数量  获取总共几箱
       item.allPackQty = Math.ceil(parseFloat(item.orderQty) / parseFloat(item.secondPackQty))
+      // 数量%托数量  获取总共几托
+      item.allTuoQty = Math.ceil(parseFloat(item.orderQty) / parseFloat(item.packQty))
       item.children = []
+      // 循环托
       for (let i = 0; i < item.packQty1; i++) {
         oneId.value++
-        // 如果有余数
-        if (item.lastNumber) {
-          // 最后一条信息直接展示余数的信息
-          if (i == item.packQty1 - 1) {
-            item.children.push({
-              id: oneId.value,
-              tPoNumber: i + 1,
-              xNumber: Math.ceil(item.lastNumber / parseFloat(item.secondPackQty)),
-              qtyOne: item.lastNumber
-            })
-          } else {
-            // 其他数据展示一托的全部箱数和全部数量
-            item.children.push({
-              id: oneId.value,
-              tPoNumber: i + 1,
-              xNumber: item.otherNumber,
-              qtyOne: item.packQty
-            })
+        // 先给所有托一个默认对象值
+        item.children[i] = {
+          id: oneId.value,
+          tPoNumber: i + 1,
+          xNumber: '',
+          qtyOne: ''
+        }
+        // 循环当前数量所需要的托数量
+        for (let j = 0; j < item.allTuoQty; j++) {
+          if (i == j) {
+            // 如果有余数
+            if (item.lastNumber) {
+              // 最后一条信息直接展示余数的信息
+              if (j == item.allTuoQty - 1) {
+              item.children[j].xNumber =  Math.ceil(item.lastNumber / parseFloat(item.secondPackQty))
+              item.children[j].qtyOne = item.lastNumber
+              }else{
+                // 其他数据展示一托的全部箱数和全部数量
+              item.children[j].xNumber = item.otherNumber
+              item.children[j].qtyOne = item.packQty
+            }
+            }else{
+              // 如果沒有余数,直接展示一托的全部箱数和全部数量
+              item.children[j].xNumber = item.otherNumber
+              item.children[j].qtyOne = item.packQty
+            }
+           
           }
-        } else {
-          // 如果沒有余数,直接展示一托的全部箱数和全部数量
-          item.children.push({
-            id: oneId.value,
-            tPoNumber: i + 1,
-            xNumber: item.otherNumber,
-            qtyOne: item.packQty
-          })
         }
       }
       // 判断箱信息是否存在
       if (item.secondPackUnit && item.secondPackQty) {
         item.children.forEach((cur, key) => {
           cur.children = []
-          // 数量除以托数量获取余数
-          cur.xLastNumber = parseFloat(cur.xNumber) % parseFloat(item.secondPackQty)
-          for (let j = 0; j < cur.xNumber; j++) {
+          // 数量除以箱数量获取余数
+          cur.xLastNumber = parseFloat(cur.qtyOne) % parseFloat(item.secondPackQty)
+          // cur.xiangNumber = Math.ceil(parseFloat(cur.qtyOne) / parseFloat(item.secondPackQty))
+          for (let i = 0; i < cur.xNumber; i++) {
             twoId.value++
+            cur.children[i]={
+              id: twoId.value,
+              xPoNumber: i + 1,
+            }
             // 如果有余数
             if (cur.xLastNumber) {
               // 最后一条信息直接展示余数的信息
-              if (j == cur.xNumbery - 1) {
-                cur.children.push({
-                  id: twoId.value,
-                  xPoNumber: j + 1,
-                  qtyTwo: cur.xLastNumber
-                })
+              if (i == cur.xNumber - 1) {
+                cur.children[i].qtyTwo = cur.xLastNumber
               } else {
                 // 其他数据展示一托的全部箱数和全部数量
-                cur.children.push({
-                  id: twoId.value,
-                  xPoNumber: j + 1,
-                  qtyTwo: item.secondPackQty
-                })
+                cur.children[i].qtyTwo = item.secondPackQty
               }
             } else {
               // 如果沒有余数,直接展示一托的全部箱数和全部数量
-              cur.children.push({
-                id: twoId.value,
-                xPoNumber: j + 1,
-                qtyTwo: item.secondPackQty
-              })
+              cur.children[i].qtyTwo = item.secondPackQty
             }
           }
         })
@@ -241,38 +238,44 @@ const intData = () => {
     } else {
       // 数量除以箱数量获取余数
       item.lastNumber = parseFloat(item.orderQty) % parseFloat(item.secondPackQty)
+      // 数量%每箱数量  获取总共几箱
+      item.allPackQty = Math.ceil(parseFloat(item.orderQty) / parseFloat(item.secondPackQty))
       item.children = []
-      console.log(item.packQty1)
+      console.log(333,item.lastNumber)
+      // 循环箱
       for (let i = 0; i < item.packQty1; i++) {
         oneId.value++
-        if (item.lastNumber) {
-          // 最后一条信息直接展示余数的信息
-          if (i == item.packQty - 1) {
-            item.children.push({
-              id: oneId.value,
-              xPoNumber: i + 1,
-              qtyOne: item.lastNumber
-            })
-          } else {
-            // 其他数据展示一托的全部箱数和全部数量
-            item.children.push({
-              id: oneId.value,
-              xPoNumber: i + 1,
-              qtyOne: item.secondPackQty
-            })
+        // 先给所有托一个默认对象值
+        item.children[i] = {
+          id: oneId.value,
+          xPoNumber: i + 1,
+          qtyOne: ''
+        }
+        console.log(444,item.allPackQty)
+         // 循环当前数量所需要的箱数量
+         for (let j = 0; j < item.allPackQty; j++) {
+          if (i == j) {
+            // 如果有余数
+            if (item.lastNumber) {
+              // 最后一条信息直接展示余数的信息
+              if (j == item.allPackQty - 1) {
+              item.children[j].qtyOne = item.lastNumber
+              }else{
+                // 其他数据展示一托的全部箱数和全部数量
+              item.children[j].qtyOne = item.secondPackQty
+            }
+            }else{
+              // 如果沒有余数,直接展示一托的全部箱数和全部数量
+              item.children[j].qtyOne = item.secondPackQty
+            }
+           
           }
-        } else {
-          item.children.push({
-            id: oneId.value,
-            xPoNumber: i + 1,
-            qtyOne: item.secondPackQty
-          })
         }
       }
-      console.log(item.children)
+     
     }
   })
-  console.log(tableData.value)
+  console.log(111, tableData.value)
 }
 /** 弹窗按钮 */
 let Butttondata: any = []
@@ -297,10 +300,10 @@ const submitForm = () => {
   let arr = tableData.value.map((item) => {
     item.allNumber = 0
     // 判断托信息是否存在
-      item.children.forEach((cur) => {
-        item.allNumber += parseFloat(cur.qtyOne) || 0
-      })
-   
+    item.children.forEach((cur) => {
+      item.allNumber += parseFloat(cur.qtyOne) || 0
+    })
+
     if (item.allNumber == parseFloat(item.orderQty)) {
       return true
     } else {
@@ -383,6 +386,7 @@ const blurOne = (oneRow, twoRow) => {
     twoRow.xNumber = oneRow.otherNumber
     twoRow.children = []
     twoRow.qtyOne = parseFloat(twoRow.xNumber) * parseFloat(oneRow.secondPackQty)
+    return
   }
   twoRow.qtyOne = parseFloat(twoRow.xNumber) * parseFloat(oneRow.secondPackQty)
   let num = 0
@@ -392,6 +396,7 @@ const blurOne = (oneRow, twoRow) => {
   if (num > oneRow.allPackQty) {
     message.warning('总箱数不可以大于' + oneRow.allPackQty)
     twoRow.xNumber = ''
+    twoRow.qtyOne = ''
     return
   }
   // 托信息修改的時候箱数据自动排列
@@ -437,7 +442,7 @@ const blurTwo = (oneRow, twoRow, threeRow) => {
   console.log(parseFloat(threeRow.qtyTwo))
   console.log(parseFloat(oneRow.secondPackQty))
   if (parseFloat(threeRow.qtyTwo) > parseFloat(oneRow.secondPackQty)) {
-    message.warning('数量最多为'+oneRow.secondPackQty)
+    message.warning('数量最多为' + oneRow.secondPackQty)
     threeRow.qtyTwo = oneRow.secondPackQty
     return
   }

From 06cd2d566395263f4239e41efbdda7966ebe6356 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Mon, 8 Jul 2024 10:12:19 +0800
Subject: [PATCH 41/84] =?UTF-8?q?=E5=8C=85=E8=A3=85=E8=A7=84=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/packageunit/index.ts              | 11 ++++++-
 .../itemManage/packageunit/index.vue          | 29 +++++++++++++++----
 .../packageunit/packageunit.data.ts           |  2 +-
 3 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/src/api/wms/packageunit/index.ts b/src/api/wms/packageunit/index.ts
index fa1718d35..9a5fd1f51 100644
--- a/src/api/wms/packageunit/index.ts
+++ b/src/api/wms/packageunit/index.ts
@@ -33,7 +33,16 @@ 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 getPackageunit = async (id: number) => {
   return await request.get({ url: `/wms/packageunit/get?id=` + id })
diff --git a/src/views/wms/basicDataManage/itemManage/packageunit/index.vue b/src/views/wms/basicDataManage/itemManage/packageunit/index.vue
index 3a998d42c..1e2341a23 100644
--- a/src/views/wms/basicDataManage/itemManage/packageunit/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/packageunit/index.vue
@@ -34,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>
@@ -80,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)
@@ -92,7 +96,7 @@ const updataTableColumns = (val) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: PackageunitApi.getPackageunitPage // 分页接口
+  getListApi: PackageunitApi.getPackageunitPageTree // 分页接口
 })
 
 // 获得表格的各种操作
@@ -133,10 +137,23 @@ const buttonBaseClick = (val, item) => {
 }
 
 // 列表-操作按钮
-const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'wms:packageunit:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'wms:packageunit:delete'}), // 删除
-]
+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.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) => {
diff --git a/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts b/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts
index 80332842f..fd4e685a6 100644
--- a/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts
@@ -335,7 +335,7 @@ export const Packageunit = useCrudSchemas(reactive<CrudSchema[]>([
       // labelMessage: '信息提示说明！！！',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择到库位代码', // 输入框占位文本
+        searchListPlaceholder: '请选择父包装代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '包装规格信息', // 查询弹窗标题
         searchAllSchemas: Packageunit1.allSchemas, // 查询弹窗所需类

From ad49570645bab6a6da2869e6e38af97fd3c07b63 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Mon, 8 Jul 2024 10:41:00 +0800
Subject: [PATCH 42/84] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=88=B6=E7=BA=A7?=
 =?UTF-8?q?=E8=A7=84=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/packageunit/index.ts                       | 10 ++++++++++
 .../itemManage/packageunit/packageunit.data.ts         |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/api/wms/packageunit/index.ts b/src/api/wms/packageunit/index.ts
index 9a5fd1f51..94f053f3a 100644
--- a/src/api/wms/packageunit/index.ts
+++ b/src/api/wms/packageunit/index.ts
@@ -43,6 +43,16 @@ export const getPackageunitPageTree = async (params) => {
     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 })
diff --git a/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts b/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts
index fd4e685a6..33fdc3d71 100644
--- a/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts
@@ -339,7 +339,7 @@ export const Packageunit = useCrudSchemas(reactive<CrudSchema[]>([
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '包装规格信息', // 查询弹窗标题
         searchAllSchemas: Packageunit1.allSchemas, // 查询弹窗所需类
-        searchPage: PackageunitApi.getPackageunitPage, // 查询弹窗所需分页方法
+        searchPage: PackageunitApi.getPackageunitPageParent, // 查询弹窗所需分页方法
         searchCondition:[{
           key: 'available',
           value: 'TRUE',

From c1bd587c3afcbe735ddb7e34a898ce2e3da9307f Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 8 Jul 2024 14:53:34 +0800
Subject: [PATCH 43/84] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/locales/en-US.ts                          |  5 +-
 src/locales/zh-CN.ts                          |  5 +-
 .../supplierdeliverBasicForm.vue              | 68 ++++++++++++++++++-
 .../supplierdeliverRequestMain.data.ts        | 24 ++++++-
 4 files changed, 96 insertions(+), 6 deletions(-)

diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index 14e24389f..8b06e1779 100644
--- a/src/locales/en-US.ts
+++ b/src/locales/en-US.ts
@@ -1141,7 +1141,10 @@ export default {
     '确 认':'Confirm',
     请输入拒收原因:'Please enter the reason for rejection',
     查看明细:'View details',
-    全部已读:'All read'
+    全部已读:'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'
   },
   
 
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index ddc8193f9..83b24fa03 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -1141,7 +1141,10 @@ export default {
     '确 认':'确 认',
     请输入拒收原因:'请输入拒收原因',
     查看明细:'查看明细',
-    全部已读:'全部已读'
+    全部已读:'全部已读',
+    '申请发货数量不能大于 计划数量 - 已发货数量':'申请发货数量不能大于 计划数量 - 已发货数量',
+    不允许超发:'不允许超发',
+    总数量超出计划数量:'总数量超出计划数量'
 
   },
 
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
index eaecff5e4..6821060a0 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
+++ b/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'
@@ -183,19 +185,28 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
       //   row['orderQty'] = val[0]['orderQty']
       //   row['uom'] = val[0]['uom']
       // }
-       //添加费用明细--点击确定
+      //添加费用明细--点击确定
       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
+        // 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)
       })
@@ -260,6 +271,7 @@ 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']
@@ -268,6 +280,10 @@ const getSearchTableData = async (number,formField,searchField)=>{
     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
     tableData.value.push(newRow)
     itemCodes.push(row['itemCode'])
   })
@@ -304,6 +320,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);
@@ -341,7 +384,26 @@ 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
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index 6c15daee9..f534f2cac 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -633,6 +633,11 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
             message: '请填写要货计划单号！',
             isMainValue: true
           },
+          {
+            key: 'flag',
+            value: 1,
+            isMainValue: false
+          },
           {
             key: 'available',
             value: 'TRUE',
@@ -656,6 +661,11 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
           message: '请填写要货计划单号！',
           isMainValue: true
         },
+        {
+          key: 'flag',
+          value: 1,
+          isMainValue: false
+        },
         {
           key: 'available',
           value: 'TRUE',
@@ -775,6 +785,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       width: 150
     },
     tableForm: {
+      disabled: true,
       type: 'InputNumber',
       precision: 6
     },
@@ -795,6 +806,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       width: 150
     },
     tableForm: {
+      disabled: true,
       type: 'InputNumber',
       precision: 6
     },
@@ -1191,13 +1203,23 @@ const validateBatch = (rule: any, value: any, callback: any) => {
       }
   }
 }
+
+const validateQty = (rule: any, value: any, callback: any,a,b) => {
+  console.log('validateQty',rule, value,a,b)
+  // if (!reg.test(value)) {
+  //     callback(new Error('英文字母、数字或下划线'));
+  // } else {
+      callback();
+  // }
+}  
 //表单校验
 export const SupplierdeliverRequestDetailRules = reactive({
   // packingNumber: [
   //   { required: true, message: '请输入包装号', trigger: 'blur' }
   // ],
   qty:[
-    { required: true, message: '请输入发货数量', trigger: 'change' },
+    { required: true, message: '请输入发货数量1', trigger: 'change' },
+    // { validator: validateQty, trigger: 'change' },
   ],
   batch: [
     { required: true, message: '请输入批次', trigger: 'blur' },

From ca2f54abcf88e5a5014c9f7f269bc794411069f9 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 8 Jul 2024 15:47:34 +0800
Subject: [PATCH 44/84] =?UTF-8?q?=E9=80=81=E8=BE=BE=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasePlanMain/purchasePlanMain.data.ts          | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
index 132aecbbf..4b2f6594b 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
@@ -74,8 +74,8 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     search: {
       component: 'DatePicker',
       componentProps: {
-        valueFormat: 'YYYY-MM-DD',
-        type: 'daterange',
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'datetimerange',
         defaultTime: [new Date('1 '), new Date('1 ')]
       }
     },
@@ -137,9 +137,9 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '送达日期',
     field: 'deliveryDate',
     table: {
-      width: 150
+      width: 180
     },
-    formatter: dateFormatter2,
+    formatter: dateFormatter,
     sortTableDefault:2,
     form: {
       component: 'DatePicker',
@@ -151,7 +151,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     detail: {
-      dateFormat: 'YYYY-MM-DD'
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
   },
   {

From 8b244c98e0dfead346b1b45de71e699d8e5bfc22 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 8 Jul 2024 15:59:11 +0800
Subject: [PATCH 45/84] receivedQty

---
 .../supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
index 4b2f6594b..6c839e6cc 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
@@ -736,8 +736,8 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     sortTableDefault:5,
   },
   {
-    label: '已收货数量（没有字段，需要加）',
-    field: 'shippedQty',
+    label: '已收货数量',
+    field: 'receivedQty',
     sort: 'custom',
     table: {
       width: 150

From d1b4581ceb6035c931bbca122af68cfe7365e925 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 8 Jul 2024 16:01:33 +0800
Subject: [PATCH 46/84] =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=8F=AF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
index 6c839e6cc..6a9f37bcf 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
@@ -780,6 +780,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     dictClass: 'string',
     isTable: true,
     isTableForm:false,
+    isForm:false,
     hiddenInMain:true,
     sort: 'custom',
     table: {

From 2ac57297a20571d9a68c7219cefcce1f024c3528 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 8 Jul 2024 16:16:18 +0800
Subject: [PATCH 47/84] =?UTF-8?q?=20=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Detail/src/Detail.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue
index 52b781867..966c5a8a1 100644
--- a/src/components/Detail/src/Detail.vue
+++ b/src/components/Detail/src/Detail.vue
@@ -649,6 +649,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)

From d154bc3b54929fb8f5f1b27cdebe33199d58dc8e Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 8 Jul 2024 16:25:49 +0800
Subject: [PATCH 48/84] =?UTF-8?q?flag=EF=BC=9A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliverRequestMain/supplierdeliverBasicForm.vue     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
index 6821060a0..a8bfacd3d 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
@@ -255,7 +255,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
 
 const getSearchTableData = async (number,formField,searchField)=>{
   const {tableObject ,tableMethods} = useTable({
-    defaultParams:{number},
+    defaultParams:{number,flag:1},
     getListApi: PurchasePlanDetailApi.getPurchasePlanDetailPage // 分页接口
   })
   tableObject.pageSize = 500

From a19a43b56768181d51b74ea8fc041d1307bcb5c7 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Mon, 8 Jul 2024 16:55:08 +0800
Subject: [PATCH 49/84] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=8C=85=E8=A3=85?=
 =?UTF-8?q?=E7=9A=84=E6=A0=91=E7=8A=B6=E5=9B=BE=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/itempackage/index.ts                      | 11 ++++++++++-
 .../basicDataManage/itemManage/itempackage/index.vue  |  8 +-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/api/wms/itempackage/index.ts b/src/api/wms/itempackage/index.ts
index 555a174b0..0917dc431 100644
--- a/src/api/wms/itempackage/index.ts
+++ b/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) {
diff --git a/src/views/wms/basicDataManage/itemManage/itempackage/index.vue b/src/views/wms/basicDataManage/itemManage/itempackage/index.vue
index bbd6a7ee5..14ac5e459 100644
--- a/src/views/wms/basicDataManage/itemManage/itempackage/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/itempackage/index.vue
@@ -98,7 +98,7 @@ const updataTableColumns = (val) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: ItempackagingApi.getItempackagingPage // 分页接口
+  getListApi: ItempackagingApi.getItempackagingPageTree // 分页接口
 })
 
 // 获得表格的各种操作
@@ -330,12 +330,6 @@ const searchFormClick = (searchData) => {
 /** 初始化 **/
 onMounted(async () => {
   await getList()
-  tableObject.tableList.forEach(item=>{
-    item.children=[{
-      packUnit:'300000100'
-    }]
-  })
   importTemplateData.templateUrl = await ItempackagingApi.importTemplate()
 })
 </script>
-@/api/wms/itempackage

From c8b725130e1efe9a3367445f64ff2f03c1f76c63 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 8 Jul 2024 17:19:05 +0800
Subject: [PATCH 50/84] =?UTF-8?q?=E8=AE=A1=E9=87=8F=E5=8D=95=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasePlanMain/purchasePlanMain.data.ts             | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
index 6a9f37bcf..ed2b20f14 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
@@ -505,6 +505,9 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     sortSearchDefault:2,
     isForm:false,
     isTableForm:false,
+    table: {
+      width: 150
+    },
     search: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
@@ -768,6 +771,11 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     sortTableDefault:12,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
     tableForm: {
       type: 'Select',
       disabled:true,

From c167421658ed89b86fd125d701fe0baf46079ae4 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Tue, 9 Jul 2024 11:27:05 +0800
Subject: [PATCH 51/84] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E7=89=A9?=
 =?UTF-8?q?=E6=96=99SCP=E5=8C=BA=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/supplieritem/index.ts             | 11 ++++++++++
 .../supplierManage/supplieritem/index.vue     | 22 ++++++++++++++-----
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/src/api/wms/supplieritem/index.ts b/src/api/wms/supplieritem/index.ts
index 81cbf3d12..274469390 100644
--- a/src/api/wms/supplieritem/index.ts
+++ b/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) => {
diff --git a/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue b/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue
index 182966119..8ec5dc8af 100644
--- a/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue
+++ b/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue
@@ -44,8 +44,8 @@
     @success="formsSuccess" 
     :rules="SupplieritemRules" 
     :formAllSchemas="Supplieritem.allSchemas"
-    :apiUpdate="SupplieritemApi.updateSupplieritem"
-    :apiCreate="SupplieritemApi.createSupplieritem"
+    :apiUpdate="routeName.includes('SCP')?SupplieritemApi.updateSupplieritemSCP:SupplieritemApi.updateSupplieritem"
+    :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') {
-        await SupplieritemApi.createSupplieritem(data)
+        if(routeName.value.includes('SCP')){
+          await SupplieritemApi.createSupplieritemSCP(data)
+        }else{
+          await SupplieritemApi.createSupplieritem(data)
+        }
         message.success(t('common.createSuccess'))
       } else {
-        await SupplieritemApi.updateSupplieritem(data)
+        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
     // 发起删除
-    await SupplieritemApi.deleteSupplieritem(id)
+    if(routeName.value.includes('SCP')){
+      await SupplieritemApi.deleteSupplieritem(id)
+    }else{
+      await SupplieritemApi.deleteSupplieritem(id)
+    }
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表

From 001440fa629bb9fc2aecc3675b0990d52c1fa9be Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Tue, 9 Jul 2024 13:14:22 +0800
Subject: [PATCH 52/84] arriveTime

---
 .../wms/basicDataManage/supplierManage/supplieritem/index.vue   | 2 +-
 .../supplierdeliverRequestMain/supplierdeliverBasicForm.vue     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue b/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue
index 8ec5dc8af..83ad11f01 100644
--- a/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue
+++ b/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue
@@ -230,7 +230,7 @@ const handleDelete = async (id: number) => {
     tableObject.loading = true
     // 发起删除
     if(routeName.value.includes('SCP')){
-      await SupplieritemApi.deleteSupplieritem(id)
+      await SupplieritemApi.deleteSupplieritemSCP(id)
     }else{
       await SupplieritemApi.deleteSupplieritem(id)
     }
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
index a8bfacd3d..9ab4d4dab 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
@@ -110,6 +110,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)
 

From 951e75618f83f15790925b462e2aeddb4271f15c Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 9 Jul 2024 13:43:21 +0800
Subject: [PATCH 53/84] =?UTF-8?q?=E7=94=9F=E6=88=90=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/supplierdeliverRequestDetail/index.ts |   4 +
 .../supplierdeliverRequestMain/index.vue      |   2 +-
 .../supplierdeliverRequestMain/labelForm.vue  |   6 +-
 .../supplierdeliverRequestMain.data.ts        | 168 +-----------------
 4 files changed, 16 insertions(+), 164 deletions(-)

diff --git a/src/api/wms/supplierdeliverRequestDetail/index.ts b/src/api/wms/supplierdeliverRequestDetail/index.ts
index 64580a04e..832c9baca 100644
--- a/src/api/wms/supplierdeliverRequestDetail/index.ts
+++ b/src/api/wms/supplierdeliverRequestDetail/index.ts
@@ -43,6 +43,10 @@ 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/generateLabelParentList`, params })
+}
 
 // 查询供应商发货申请子详情
 export const getSupplierdeliverRequestDetail = async (id: number) => {
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index d482568c7..51e46e76f 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -835,7 +835,7 @@ const handleExport = async () => {
 const isCreateLabel = ref(false)
 const formLabelRef = ref()
 const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({
-  getListApi: SupplierdeliverRequestDetailApi.getSupplierdeliverRequestDetailPage
+  getListApi: SupplierdeliverRequestDetailApi.getGenerateLabelList
 })
 detatableData.pageSize = 500
 const { getList:getDetailList } = detatableMethods
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
index fc80a2a7c..42f72289b 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
@@ -5,13 +5,11 @@
       border
       row-key="id"
       style="width: 1050px; max-height: 70vh; overflow-y: auto"
-      v-if="tableData.length > 0"
     >
       <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.packUnit && scope.row.packQty"
           >
             <el-table
               :data="scope.row.children"
@@ -89,7 +87,7 @@
               </el-table-column>
             </el-table>
           </div>
-          <div style="margin-left: 550px; margin-top: -8px; margin-bottom: -8px" v-else>
+          <!-- <div style="margin-left: 550px; margin-top: -8px; margin-bottom: -8px" v-else>
             <el-table :data="scope.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="qtyOne" align="center">
@@ -113,7 +111,7 @@
                 </template>
               </el-table-column>
             </el-table>
-          </div>
+          </div> -->
         </template>
       </el-table-column>
       <el-table-column label="物料代码" width="150" prop="itemCode" align="center" />
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index f534f2cac..8298b64d8 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -1597,174 +1597,24 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     }
   },
   {
-    label: '包装规格1',
+    label: '箱规格',
     field: 'packUnit',
     isTable: true,
     sort: 'custom',
-    table: {
-      width: 150,
-      componentProps: {
-        disabled: true,
-        isSearchList: true,
-        searchListPlaceholder: '请选择包装',
-        searchField: 'packUnit',
-        searchTitle: '物品包装信息',
-        searchAllSchemas: Itempackaging.allSchemas,
-        searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
-        searchCondition: [
-          {
-            key: 'itemCode',
-            value: 'itemCode',
-            message: '请选择订单行',
-            isMainValue: true
-          },
-          {
-            key: 'available',
-            value: 'TRUE',
-            isMainValue: false
-          }
-        ]
-
-      }
-    },
-    tableForm: {
-      disabled: true,
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择包装',
-      searchField: 'itemCode',
-      searchTitle: '物品包装信息',
-      searchAllSchemas: Itempackaging.allSchemas,
-      searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
-      searchCondition: [
-        {
-          key: 'itemCode',
-          value: 'itemCode',
-          message: '请选择订单行',
-          isTableRowValue: true, 
-          isMainValue:false
-        },
-        {
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
-    }
-  },
-  {
-    label: '包装名称1',
-    field: 'packName',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
     form: {
-      componentProps: {
-        disabled: true
-      }
-    },
-    tableForm: {
-      disabled: true
-    }
-  },
-  {
-    label: '物料数量1',
-    field: 'packQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      componentProps: {
-      }
-    },
-    tableForm: {
-    }
-  },
-  {
-    label: '包装规格2',
-    field: 'secondPackUnit',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150,
+      value: userDept.id,
+      component: 'Select',
+      api: () => userDeptArray,
       componentProps: {
         disabled: true,
-        isSearchList: true,
-        searchListPlaceholder: '请选择包装',
-        searchField: 'packUnit',
-        searchTitle: '物品包装信息',
-        searchAllSchemas: Itempackaging.allSchemas,
-        searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
-        searchCondition: [
-          {
-            key: 'itemCode',
-            value: 'itemCode',
-            message: '请选择订单行',
-            isMainValue: true
-          },
-          {
-            key: 'available',
-            value: 'TRUE',
-            isMainValue: false
-          }
-        ]
-
-      }
-    },
-    tableForm: {
-      clearable: true,
-      disabled: true,
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择包装',
-      searchField: 'packUnit',
-      searchTitle: '物品包装信息',
-      searchAllSchemas: Itempackaging.allSchemas,
-      searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
-      searchCondition: [
-        {
-          key: 'itemCode',
-          value: 'itemCode',
-          message: '请选择订单行',
-          isTableRowValue: true, 
-          isMainValue:false
-        },
-        {
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
-    }
-  },
-  {
-    label: '包装名称2',
-    field: 'secondPackName',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      componentProps: {
-        disabled: true
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        }
       }
-    },
-    tableForm: {
-      disabled: true
-    }
-  },
-  {
-    label: '物料数量2',
-    field: 'secondPackQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      componentProps: {
-      }
-    },
-    tableForm: {
     }
   },
+ 
   {
     label: '物料名称',
     field: 'itemName',

From cf0eebfe63be84a855706d48970e9c74b6445bae Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Tue, 9 Jul 2024 13:58:19 +0800
Subject: [PATCH 54/84] =?UTF-8?q?=E8=BF=87=E6=9C=9F=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliverRequestMain/supplierdeliverBasicForm.vue  | 5 +++++
 .../supplierdeliverRequestMain.data.ts                       | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
index 9ab4d4dab..80268a9df 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
@@ -206,6 +206,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
         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'])
@@ -285,6 +287,8 @@ const getSearchTableData = async (number,formField,searchField)=>{
     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'])
   })
@@ -409,6 +413,7 @@ const formFormDateChange = (field, val,row, index) => {
     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()
   }
 }
 //供应商代码 回车搜索
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index f534f2cac..8127d98df 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -866,6 +866,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     hiddenInMain:true,
     field: 'expireDate',
     formatter: dateFormatter2,
+    isTableForm:false, 
     detail: {
       dateFormat: 'YYYY-MM-DD'
     },
@@ -920,6 +921,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       width: 150
     },
     hiddenInMain:true,
+    isTableForm: false,
     form: {
       component: 'InputNumber',
       componentProps: {

From 9085d23514863ee8cecd6e5653f0a26b4e0c0f5b Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 9 Jul 2024 15:10:19 +0800
Subject: [PATCH 55/84] =?UTF-8?q?=E7=AE=B1=E6=89=98=E8=A7=84=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/supplierdeliverRequestDetail/index.ts |   5 +-
 src/components/TableForm/src/TableForm.vue    |  16 +-
 .../supplierdeliverRequestMain/index.vue      | 560 +++++++++++-------
 .../supplierdeliverRequestMain.data.ts        |  57 +-
 4 files changed, 398 insertions(+), 240 deletions(-)

diff --git a/src/api/wms/supplierdeliverRequestDetail/index.ts b/src/api/wms/supplierdeliverRequestDetail/index.ts
index 832c9baca..ab0609463 100644
--- a/src/api/wms/supplierdeliverRequestDetail/index.ts
+++ b/src/api/wms/supplierdeliverRequestDetail/index.ts
@@ -45,9 +45,12 @@ export const getSupplierdeliverRequestDetailPage = async (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 })
diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue
index e7972b878..2def32a83 100644
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@@ -166,7 +166,7 @@
               @blur="tableFormSelectOnBlur(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.', '')"
                 :value="op.value"
                 :key="op.value"
@@ -196,7 +196,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 +302,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 +326,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)"
@@ -520,8 +520,12 @@ const emit = defineEmits([
   'batchAdd'
 ])
 // 获取下拉列表 | type = radio | type = select
-const initSelectOptions = (item) => {
-  return item.dictType ? getStrDictOptions(item.dictType) : item.tableForm.initOptions
+const initSelectOptions = (headerItem,row) => {
+  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) => {
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 51e46e76f..42e86c8f6 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/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"
     />
@@ -20,8 +23,9 @@
   />
 
   <!-- 列表 -->
-  <ContentWrap >
-    <Table v-clientTable
+  <ContentWrap>
+    <Table
+      v-clientTable
       :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
@@ -37,14 +41,20 @@
           <span>{{ row.number }}</span>
         </el-button>
       </template>
-      <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event, row)" />
+      <template #action="{ row, $index }">
+        <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,28 +86,32 @@
   <!-- 详情 -->
   <Detail
     ref="detailRef"
-    :annexTable="[{
-      label: '质检明细',
-      prop: 'uploadFile',
-      tableName:'SupplierdeliverInspectionDetail',
-      hasSubDetail:true, // 附件中是否展示明细表
-      showPreview:true, // 附件中是否展示预览按钮
-      fileType:['pdf','jpg','png','jpeg'],
-      align:'left',
-      //明细表数据
-      subDetailTableData:{
-        queryParams:[{
-          queryField:'masterId',
-          rowField:'masterId'
-        }], // 查询参数
-        getSubList:SupplierdeliverInspectionDetailApi.getSupplierdeliverInspectionDetailPage,//请求接口
-        tableColumns:SupplierdeliverInspectionDetail.allSchemas.tableColumns,
-        tableList:[],//表格数据
-        total:1,
-        pageSize:10,
-        currentPage:1,
+    :annexTable="[
+      {
+        label: '质检明细',
+        prop: 'uploadFile',
+        tableName: 'SupplierdeliverInspectionDetail',
+        hasSubDetail: true, // 附件中是否展示明细表
+        showPreview: true, // 附件中是否展示预览按钮
+        fileType: ['pdf', 'jpg', 'png', 'jpeg'],
+        align: 'left',
+        //明细表数据
+        subDetailTableData: {
+          queryParams: [
+            {
+              queryField: 'masterId',
+              rowField: 'masterId'
+            }
+          ], // 查询参数
+          getSubList: SupplierdeliverInspectionDetailApi.getSupplierdeliverInspectionDetailPage, //请求接口
+          tableColumns: SupplierdeliverInspectionDetail.allSchemas.tableColumns,
+          tableList: [], //表格数据
+          total: 1,
+          pageSize: 10,
+          currentPage: 1
+        }
       }
-    }]"
+    ]"
     :isBasic="false"
     :allSchemas="SupplierdeliverRequestMain.allSchemas"
     :detailAllSchemas="SupplierdeliverRequestDetail.allSchemas"
@@ -120,21 +134,22 @@
     :mode="2"
   />
 
-<!-- 创建标签 -->
-<BasicForm
+  <!-- 创建标签 -->
+  <BasicForm
     ref="formLabelRef"
     @success="getList"
     :tableAllSchemas="SupplierdeliverRequestDetailLabel.allSchemas"
     :tableFormRules="SupplierdeliverRequestDetailRules"
-    :tableData="detatableData.tableList"
+    :tableData="detatableData1"
     :isBusiness="true"
     :isShowButton="false"
     @searchTableSuccess="searchTableSuccessLabel"
     @submitForm="submitFormLabel"
     :isShowReduceButton="false"
-    @clearInput='clearInput'
-   :footButttondata="footButttondata"
-    @footButtonClick='footButtonClick'
+    @clearInput="clearInput"
+    :footButttondata="footButttondata"
+    @footButtonClick="footButtonClick"
+    @formSelectChange='formSelectChangeLabel'
   />
   <!-- 上传质量报告 -->
   <BasicForm
@@ -156,12 +171,12 @@
   </BasicForm>
 
   <!-- 标签打印 -->
-  <SearchTable width="905px" ref="searchTableRef" @searchTableSuccess="searchTableSuccess1" >
+  <SearchTable width="905px" ref="searchTableRef" @searchTableSuccess="searchTableSuccess1">
     <!-- <template #actions>
       <el-button type="primary" @click="printAllClick">打印全部</el-button>
     </template> -->
   </SearchTable>
-  <labelForm ref="labelFormRef" :tableAllSchemas="SupplierdeliverRequestDetailLabel.allSchemas"/>
+  <labelForm ref="labelFormRef" :tableAllSchemas="SupplierdeliverRequestDetailLabel.allSchemas" />
 </template>
 
 <script setup lang="ts">
@@ -174,9 +189,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'
@@ -190,17 +208,21 @@ import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/su
 import supplierdeliverBasicForm from './supplierdeliverBasicForm.vue'
 import labelForm from './labelForm.vue'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
+import { log } from 'console'
 // 供应商发货申请
 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) => {
@@ -211,8 +233,8 @@ const planArriveTimeStr = ref()
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
   nextTick(() => {
-    console.log("type:",type)
-    console.log("formField:",formField)
+    console.log('type:', type)
+    console.log('formField:', formField)
     console.log(formField, searchField, val, formRef, type, row)
     if (type == 'tableForm') {
       // 明细查询页赋值
@@ -224,11 +246,11 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
       //   row['orderQty'] = val[0]['orderQty']
       //   row['uom'] = val[0]['uom']
       // }
-       //添加费用明细--点击确定
+      //添加费用明细--点击确定
       const itemCodes = []
-      val.forEach(item=>{
-        if(tableData.value.find(item1=>item1['id'] == item['id'])) return
-        const newRow = {...row}
+      val.forEach((item) => {
+        if (tableData.value.find((item1) => item1['id'] == item['id'])) return
+        const newRow = { ...row }
         newRow[formField] = item[searchField]
         newRow['poNumber'] = item['poNumber']
         newRow['itemCode'] = item['itemCode']
@@ -240,29 +262,29 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
       })
       //有效期
       ItembasicApi.getItembasicPage({
-        code:itemCodes.join(',')
-      }).then((res)=>{
-        res.list.forEach((item,index)=>{
-          const findItem = tableData.value.find(item1=>item1['itemCode']==item['code'])
+        code: itemCodes.join(',')
+      }).then((res) => {
+        res.list.forEach((item, index) => {
+          const findItem = tableData.value.find((item1) => item1['itemCode'] == item['code'])
           findItem['expireTime'] = findItem['expireTime']
         })
       })
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]
-      if(formField == 'ppNumber'){
+      if (formField == 'ppNumber') {
         //新增--选择完要货计划，自动展示明细
-        getSearchTableData(val[0]['number'],formField,searchField)
+        getSearchTableData(val[0]['number'], formField, searchField)
 
         // 设置计划到货时间
-        let beginTime =  val[0]['endTime']
-        let deliveryDate =  formatDate(val[0]['deliveryDate'],'YYYY-MM-DD')
-        planArriveTimeStr.value = deliveryDate + ' '+ beginTime+":00"
-        setV['planArriveTime']= new Date(planArriveTimeStr.value).valueOf();
+        let beginTime = val[0]['endTime']
+        let deliveryDate = formatDate(val[0]['deliveryDate'], 'YYYY-MM-DD')
+        planArriveTimeStr.value = deliveryDate + ' ' + beginTime + ':00'
+        setV['planArriveTime'] = new Date(planArriveTimeStr.value).valueOf()
         // 清空子表数据
         tableData.value = []
       }
-      if(formField == 'supplierCode'){
+      if (formField == 'supplierCode') {
         setV['contactName'] = val[0]['contacts']
         setV['contactPhone'] = val[0]['phone']
         setV['contactEmail'] = val[0]['email']
@@ -272,21 +294,30 @@ 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,[{
-    key:'code',
-    value:value
-  }])
+const onEnter = async (field, value) => {
+  console.log(field, value)
+  formRef.value.opensearchTable(
+    'supplierCode',
+    'code',
+    '供应商信息',
+    Supplier.allSchemas,
+    SupplierApi.getSupplierPage,
+    [
+      {
+        key: 'code',
+        value: value
+      }
+    ]
+  )
 }
 
-const getSearchTableData = async (number,formField,searchField)=>{
-  const {tableObject ,tableMethods} = useTable({
-    defaultParams:{number},
+const getSearchTableData = async (number, formField, searchField) => {
+  const { tableObject, tableMethods } = useTable({
+    defaultParams: { number },
     getListApi: PurchasePlanDetailApi.getPurchasePlanDetailPage // 分页接口
   })
   // 获得表格的各种操作
-  const { getList:getList1 } = tableMethods
+  const { getList: getList1 } = tableMethods
   await getList1()
   const tableColumns = PurchasePlanDetail.allSchemas.tableFormColumns
   tableColumns.forEach((item) => {
@@ -294,8 +325,8 @@ const getSearchTableData = async (number,formField,searchField)=>{
   })
   tableData.value = []
   const itemCodes = []
-  tableObject.tableList.forEach(row=>{
-    const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...row}))
+  tableObject.tableList.forEach((row) => {
+    const newRow = JSON.parse(JSON.stringify({ ...tableFormKeys, ...row }))
     newRow[formField] = row[searchField]
     newRow['poNumber'] = row['poNumber']
     newRow['itemCode'] = row['itemCode']
@@ -308,12 +339,11 @@ const getSearchTableData = async (number,formField,searchField)=>{
 
   //有效期
   ItembasicApi.getItembasicPage({
-    code:itemCodes.join(',')
-  }).then((res)=>{
-    res.list.forEach((item,index)=>{
-      const findItem = tableData.value.find(item1=>item1['itemCode']==item['code'])
+    code: itemCodes.join(',')
+  }).then((res) => {
+    res.list.forEach((item, index) => {
+      const findItem = tableData.value.find((item1) => item1['itemCode'] == item['code'])
       findItem['expireTime'] = findItem['expireTime']
-
     })
   })
 }
@@ -336,8 +366,8 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
 // 查询页面返回
 const searchTableSuccessLabel = (formField, searchField, val, formRef, type, row) => {
   nextTick(() => {
-    console.log("formField:",formField)
-    console.log("val:",val)
+    console.log('formField:', formField)
+    console.log('val:', val)
     if (type == 'tableForm') {
       // 明细查询页赋值
       row[formField] = val[0][searchField]
@@ -351,12 +381,10 @@ const searchTableSuccessLabel = (formField, searchField, val, formRef, type, row
         row['secondPackName'] = val[0]['packName']
         row['secondPackQty'] = val[0]['packQty']
       }
-    } 
+    }
   })
 }
 
-
-
 const { tableObject, tableMethods } = useTable({
   getListApi: SupplierdeliverRequestDetailApi.getSupplierdeliverRequestDetailPage // 分页接口
 })
@@ -395,7 +423,7 @@ const buttonBaseClick = (val, item) => {
     handleExport()
   } else if (val == 'refresh') {
     // 刷新
-    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+    if (tableObject.params.filters && tableObject.params.filters.length > 0) {
       searchFormClick({
         filters: tableObject.params.filters
       })
@@ -419,9 +447,9 @@ const isShowMainButton = (row, val) => {
 // 根据状态返回该按钮是否显示
 const isShowMainButtonLabel = (row, val) => {
   if (val.indexOf(row.status) > -1) {
-    if(row.labelStatus == '2'){
+    if (row.labelStatus == '2') {
       return true
-    }else{
+    } else {
       return false
     }
   } else {
@@ -432,9 +460,9 @@ const isShowMainButtonLabel = (row, val) => {
 // 根据状态返回该按钮是否显示
 const isReGenLabelShowMainButtonLabel = (row, val) => {
   if (val.indexOf(row.status) > -1) {
-    if(row.labelStatus == '1'){
+    if (row.labelStatus == '1') {
       return true
-    }else{
+    } else {
       return false
     }
   } else {
@@ -443,17 +471,34 @@ const isReGenLabelShowMainButtonLabel = (row, val) => {
 }
 
 // 列表-操作按钮
-const butttondata = (row,$index) => {
-  const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
-  if(findIndex>-1&&findIndex<$index){
+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.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['5']),hasPermi: 'wms:supplierdeliver-request-main:open' }), // 打开
-    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.mainListPurchasePlanOpeBtn({
+      hide: isShowMainButton(row, ['5']),
+      hasPermi: 'wms:supplierdeliver-request-main:open'
+    }), // 打开
+    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'
@@ -479,7 +524,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']) }), // 单据打印
     // 生成记录
     {
@@ -492,10 +540,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') {
@@ -507,7 +559,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainPlanUploadQualityReport') {
     // 上传质量报告
     handleUploadQualityReport(row)
-  }  else if (val == 'mainPlanSub') {
+  } else if (val == 'mainPlanSub') {
     // 提交审批
     handleSub(row.masterId)
   } else if (val == 'mainPlanApp') {
@@ -528,31 +580,51 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'ssbq') {
     // 生成标签
     detatableData.params = {
-      masterId:row.masterId
+      masterId: row.masterId
     }
     genLabelId.value = row.masterId
-    await getDetailList()
-    formLabelRef.value.open('create', row, null,'createLabel')//创建标签页面 createLabel 标题
-  } else if( val == 'ressbq'){
-    console.log("重新生成标签")
+    // await getDetailList()
+    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) => {
+        console.log(item.boxPackaging)
+        if (item.boxPackaging?.length > 0) {
+          item.packUnitInitOptions = item.boxPackaging.map((cur) => {
+            return { label: cur.packName, value: cur.packUnit }
+          })
+        }
+      })
+    })
+    formLabelRef.value.open('create', row, null, 'createLabel') //创建标签页面 createLabel 标题
+  } else if (val == 'ressbq') {
+    console.log('重新生成标签')
     ElMessageBox.confirm(t('ts.重新生成标签会删除上次生成的标签，是否确认继续？'), '提示', {
       confirmButtonText: t('ts.确 认'),
       cancelButtonText: t('ts.取 消')
-    }).then(() => {
-       SupplierdeliverRequestMainApi.deleteOldLabels(row.masterId).then(async res =>{
-          if(res){
+    })
+      .then(() => {
+        SupplierdeliverRequestMainApi.deleteOldLabels(row.masterId).then(async (res) => {
+          if (res) {
             // 生成标签
             detatableData.params = {
-              masterId:row.masterId
+              masterId: row.masterId
             }
             genLabelId.value = row.masterId
             await getDetailList()
-            formLabelRef.value.open('create', row, null,'createLabel')//创建标签页面 createLabel 标题
+            formLabelRef.value.open('create', row, null, 'createLabel') //创建标签页面 createLabel 标题
           }
+        })
       })
-    }).catch(() => {
+      .catch(() => {
         console.info('操作取消')
-    })
+      })
   } else if (val == 'point') {
     // 标签打印
     labelPrint(row)
@@ -567,21 +639,38 @@ const footButttondata = ref([
 ])
 // 下一步
 const labelFormRef = ref()
-const footButtonClick = (val)=>{
-  if(val == 'nextStep'){
-    labelFormRef.value.openLabel(detatableData.tableList)
-  }else if(val == 'close'){
+const footButtonClick = async (val) => {
+  if (val == 'nextStep') {
+    labelFormRef.value.openLabel(detatableData1)
+  } 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 )
+    row.packQty = obj.packQty
+    // 获取拖规格
+    const params1 = {
+      itemCode:row.itemCode,
+	packUnit:row.packUnit
+    }
+    SupplierdeliverRequestDetailApi.getGenerateLabelParentList(params1).then((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')
+  detailRef.value.openDetail(row, titleName, titleValue, 'requestSupplierdeliverMain')
 }
 //添加/修改操作
 const formRef = ref()
@@ -637,7 +726,8 @@ const handleDelete = async (id: number) => {
     message.success(t('common.delSuccess'))
     // 刷新列表
     await getList()
-  } catch {}finally{
+  } catch {
+  } finally {
     tableObject.loading = false
   }
 }
@@ -653,7 +743,8 @@ const handleClo = async (id: number) => {
     message.success(t('ts.关闭成功!'))
     // 刷新列表
     await getList()
-  } catch {}finally{
+  } catch {
+  } finally {
     tableObject.loading = false
   }
 }
@@ -669,46 +760,56 @@ const handleOpe = async (id: number) => {
     message.success(t('ts.打开成功!'))
     // 刷新列表
     await getList()
-  } catch {}finally{
+  } catch {
+  } finally {
     tableObject.loading = false
   }
 }
 const ploadQualityReportRef = ref()
 const uploadQualityReportTableData = ref([])
 
-const handleAddQualityReport = ()=>{
-  const tableFormKeys  = {}
+const handleAddQualityReport = () => {
+  const tableFormKeys = {}
   SupplierdeliverInspectionDetail.allSchemas.tableFormColumns.forEach((item) => {
     tableFormKeys[item.field] = item.default ? item.default : ''
   })
   uploadQualityReportTableData.value.push(tableFormKeys)
   console.log('handleAddQualityReport')
 }
-const handleDeleteQualityReport = (row,index)=>{
-  uploadQualityReportTableData.value.splice(index,1)
-  console.log('handleDeleteQualityReport',row)
-
+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')
-  if(uploadFile){
+const handleUploadQualityReport = async (row) => {
+  console.log('SupplierdeliverInspectionDetail', SupplierdeliverInspectionDetail.allSchemas)
+  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 标题
-  const tableFormKeys  = {}
+  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 => {
-    if(res){
-      // console.log("返回结果:",res)
-      uploadQualityReportTableData.value = res;
+  await SupplierdeliverInspectionDetailApi.getSupplierdeliverDetailInfo(row.masterId).then(
+    (res) => {
+      if (res) {
+        // console.log("返回结果:",res)
+        uploadQualityReportTableData.value = res
+      }
     }
-  })
+  )
   //uploadQualityReportTableData.value = [tableFormKeys]
 }
 
@@ -737,7 +838,8 @@ const handleSub = async (id: number) => {
     message.success(t('ts.提交审批成功!'))
     // 刷新列表
     await getList()
-  } catch {}finally{
+  } catch {
+  } finally {
     tableObject.loading = false
   }
 }
@@ -753,7 +855,8 @@ const handleApp = async (id: number) => {
     message.success(t('ts.审批通过成功!'))
     // 刷新列表
     await getList()
-  } catch {}finally{
+  } catch {
+  } finally {
     tableObject.loading = false
   }
 }
@@ -769,7 +872,8 @@ const handleTur = async (id: number) => {
     message.success(t('ts.驳回成功!'))
     // 刷新列表
     await getList()
-  } catch {}finally{
+  } catch {
+  } finally {
     tableObject.loading = false
   }
 }
@@ -777,11 +881,12 @@ const handleTur = async (id: number) => {
 /** 处理按钮操作 */
 const genRecords = async (id: number) => {
   let getLoading = null
-    await SupplierdeliverRequestMainApi.selfCheckReport(id).then(async res => {
-      if(!res){
-          message.warning(t('ts.请先上传自检报告!'))
-          return
-      }else{
+  await SupplierdeliverRequestMainApi.selfCheckReport(id)
+    .then(async (res) => {
+      if (!res) {
+        message.warning(t('ts.请先上传自检报告!'))
+        return
+      } else {
         // 处理的二次确认
         await message.confirm(t('ts.是否处理所选中数据？'))
         getLoading = ElLoading.service({
@@ -790,26 +895,27 @@ const genRecords = async (id: number) => {
           background: 'rgba(0, 0, 0, 0.7)'
         })
         // 发起处理
-        SupplierdeliverRequestMainApi.genRecordsSupplierdeliverRequestMain(id).then(res => {
-          message.success(t('ts.处理成功!'))
-          console.log('resresresresres',res)
-          // 刷新列表
-          getList()
-          console.log('刷新列表')
-          getLoading?.close()
-
-          // 单据打印
-          handleDocumentPrint(res)
-        }).catch(err=>{
-          console.log("发起处理",err)
-          getLoading?.close()
-        })
-
+        SupplierdeliverRequestMainApi.genRecordsSupplierdeliverRequestMain(id)
+          .then((res) => {
+            message.success(t('ts.处理成功!'))
+            console.log('resresresresres', res)
+            // 刷新列表
+            getList()
+            console.log('刷新列表')
+            getLoading?.close()
+
+            // 单据打印
+            handleDocumentPrint(res)
+          })
+          .catch((err) => {
+            console.log('发起处理', err)
+            getLoading?.close()
+          })
       }
-    }).catch(err => {
-      console.log("自检报告校验异常",err)
+    })
+    .catch((err) => {
+      console.log('自检报告校验异常', err)
       getLoading?.close()
-
     })
 }
 
@@ -834,43 +940,45 @@ const handleExport = async () => {
 // 生成标签
 const isCreateLabel = ref(false)
 const formLabelRef = ref()
-const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({
-  getListApi: SupplierdeliverRequestDetailApi.getGenerateLabelList
+const { tableObject: detatableData, tableMethods: detatableMethods } = useTable({
+  getListApi: SupplierdeliverRequestDetailApi.getSupplierdeliverRequestDetailPage
 })
 detatableData.pageSize = 500
-const { getList:getDetailList } = detatableMethods
-
+const { getList: getDetailList } = detatableMethods
 
 // 生成标签按钮操作
 const submitFormLabel = async (formType, submitData) => {
-  let data = {...submitData}
-  if(data.masterId){
+  let data = { ...submitData }
+  if (data.masterId) {
     data.id = data.masterId
   }
   try {
-    console.log("formType==",formType)
-    console.log("data==",data)
+    console.log('formType==', formType)
+    console.log('data==', data)
     data.subList = detatableData.tableList
-    if(detatableData.tableList.find(item=>item.secondPackUnit==item.packUnit)){
+    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; //修改标包数量
+    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)
+    console.log('返回结果', flag)
+    if (flag) {
+      console.log('detatableData', detatableData)
       await message.confirm(t('ts.是否为此数据生成标签？'))
       await SupplierdeliverRequestMainApi.genLabel(data)
       isCreateLabel.value = true
@@ -882,14 +990,13 @@ const submitFormLabel = async (formType, submitData) => {
     formLabelRef.value.dialogVisible = false
   }
 }
-const clearInput = async (field,row,index) => {
-  row[field]=''
-  row['secondPackQty']=''
-  
+const clearInput = async (field, row, index) => {
+  row[field] = ''
+  row['secondPackQty'] = ''
+
   SupplierdeliverRequestDetailRules.secondPackQty[0].required = false
 }
 
-
 const BASE_URL = getJmreportBaseUrl()
 const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
 getListApi: PurchasePlanDetailApi.getPurchasePlanDetailPage // 分页接口
@@ -898,48 +1005,48 @@ getListApi: PurchasePlanDetailApi.getPurchasePlanDetailPage // 分页接口
 const searchTableRef = ref()
 const labelPrint = async (row) => {
   tableObject.loading = true
-  const defaultParams = {'moduleName':'supplier','recordNumber':row.number}
-  const {tableObject:tableObjectPrint ,tableMethods} = useTable({
+  const defaultParams = { moduleName: 'supplier', recordNumber: row.number }
+  const { tableObject: tableObjectPrint, tableMethods } = useTable({
     defaultParams,
-    getListApi: PackageApi.getLabelDetailPage  // 分页接口
+    getListApi: PackageApi.getLabelDetailPage // 分页接口
   })
 
   // 获得表格的各种操作
-  const { getList:getListPrint } = tableMethods
+  const { getList: getListPrint } = tableMethods
   getListPrint()
   tableObject.loading = false
   const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns
   tableColumns.forEach((item) => {
     item.width = item.table?.width
   })
-  searchTableRef.value.openData(t('ts.标签信息'),tableObjectPrint,{tableColumns},true)
+  searchTableRef.value.openData(t('ts.标签信息'), tableObjectPrint, { tableColumns }, true)
 }
 
 // 打印全部
-const printAllClick = ()=>{
-
-}
+const printAllClick = () => {}
 
 // 批量打印--供应商发货申请
 const searchTableSuccess1 = async (formField, searchField, val, formRef, type, row) => {
-  console.log('批量打印',val)
+  console.log('批量打印', val)
   // let rows:any = []
   // val.forEach(item=>{
   //   rows = [...rows,...item.selectionRows.map(item1=>item1.number)]
   // })
-  if(val.length == 0){
+  if (val.length == 0) {
     message.warning(t('ts.请先选择要打印的数据'))
     return
   }
   // 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 => {
-    console.log(err)
-    message.error(t('ts.创建标签失败'))
-  })
+    })
+    .catch((err) => {
+      console.log(err)
+      message.error(t('ts.创建标签失败'))
+    })
 }
 
 const print = async () => {
@@ -974,14 +1081,14 @@ const handleDeleteTable = (item, index) => {
 
 // 主子数据 提交
 const submitForm = async (formType, submitData) => {
-  let data = {...submitData}
-  if(data.masterId){
+  let data = { ...submitData }
+  if (data.masterId) {
     data.id = data.masterId
   }
   data.subList = tableData.value // 拼接子表数据参数
   let isHave = data.subList.some((item) => {
-    console.log("CCCCC",item.expireDate)
-    if(item.expireDate != null){
+    console.log('CCCCC', item.expireDate)
+    if (item.expireDate != null) {
       item.produceDate > item.expireDate
     }
   })
@@ -992,27 +1099,30 @@ const submitForm = async (formType, submitData) => {
   }
   try {
     if (formType === 'create') {
-      let planArriveStr = formatDate(data.planArriveTime);
-      if(planArriveStr > planArriveTimeStr.value){
-        let confirmFlag = false;
-        await message.confirm(`${t('ts.计划到货时间大于')}${planArriveTimeStr.value}${t('ts.是否继续？')}`).then(() => {
-          console.log("选择了OK")
-          //选择OK
-        }).catch(() => {
-          //选择取消
-          console.log("选择了cancel")
-          confirmFlag = true;
-          formRef.value.formLoading = false
-          return;
-        })
-        if(confirmFlag){
-          return;
+      let planArriveStr = formatDate(data.planArriveTime)
+      if (planArriveStr > planArriveTimeStr.value) {
+        let confirmFlag = false
+        await message
+          .confirm(`${t('ts.计划到货时间大于')}${planArriveTimeStr.value}${t('ts.是否继续？')}`)
+          .then(() => {
+            console.log('选择了OK')
+            //选择OK
+          })
+          .catch(() => {
+            //选择取消
+            console.log('选择了cancel')
+            confirmFlag = true
+            formRef.value.formLoading = false
+            return
+          })
+        if (confirmFlag) {
+          return
         }
       }
-      if(tableData.value.length <= 0){
+      if (tableData.value.length <= 0) {
         message.warning(t('ts.子表明细不能为空!'))
         formRef.value.formLoading = false
-        return;
+        return
       }
       await SupplierdeliverRequestMainApi.createSupplierdeliverRequestMain(data)
       message.success(t('common.createSuccess'))
@@ -1054,9 +1164,9 @@ const searchFormClick = (searchData) => {
   getList() // 刷新当前列表
 }
 
-const formFormDateChange = (field, val,row, index) => {
-  if(field == 'produceDate'){
-    let produceDateStr = formatDate(val,'YYYYMMDD');
+const formFormDateChange = (field, val, row, index) => {
+  if (field == 'produceDate') {
+    let produceDateStr = formatDate(val, 'YYYYMMDD')
     row.batch = produceDateStr
     row.supplierBatch = produceDateStr
   }
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index 03078629c..93babb68f 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -1604,16 +1604,57 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     isTable: true,
     sort: 'custom',
     form: {
-      value: userDept.id,
-      component: 'Select',
-      api: () => userDeptArray,
+    },
+    tableForm: {
+      type: 'Select',
+      initOptions: [{
+        label: '',
+        value: ''
+      }]
+    }
+  },{
+    label: '箱规格数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
       componentProps: {
-        disabled: true,
-        optionsAlias: {
-          labelField: 'name',
-          valueField: 'id'
-        }
       }
+    },
+    tableForm: {
+      disabled:true
+    }
+  },
+  {
+    label: '托规格',
+    field: 'parentCode',
+    isTable: true,
+    sort: 'custom',
+    form: {
+    },
+    tableForm: {
+      type: 'Select',
+      initOptions: [{
+        label: '',
+        value: ''
+      }]
+    }
+  },
+  {
+    label: '托规格数量',
+    field: 'parentQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+      }
+    },
+    tableForm: {
+      disabled:true
     }
   },
  

From 54b32f86e21fffe38e9e40fe085b62ee6a5d8811 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Tue, 9 Jul 2024 15:25:39 +0800
Subject: [PATCH 56/84] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliverRequestMain/index.vue      |   5 +
 .../supplierdeliverRequestMain.data.ts        | 177 ++++++++++--------
 2 files changed, 99 insertions(+), 83 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 42e86c8f6..0efeed9b4 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -36,6 +36,11 @@
       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>
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index 93babb68f..0e5766b0b 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -35,6 +35,17 @@ import { tr } from 'element-plus/es/locale'
  * @returns {Array} 供应商发货申请主表
  */
 export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '发货单号',
+    field: 'asnNumber',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true,
+    isForm: false
+  },
   {
     label: '单据号',
     field: 'number',
@@ -43,6 +54,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       width: 180,
       fixed: 'left'
     },
+    isTable:false,
     isForm: false,
     isSearch: true,
   },
@@ -53,7 +65,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
-    sortTableDefault:2,
+    isTable:false,
     isSearch: true,
     form: {
       // labelMessage: '信息提示说明！！！',
@@ -68,16 +80,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       }
     }
   },
-  // {
-  //   label: '发货单号',
-  //   field: 'asnNumber',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   isSearch: true,
-  //   isForm: true
-  // },
+  
   {
     label: '要货计划单号',
     field: 'ppNumber',
@@ -86,7 +89,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
-    sortTableDefault:1,
+    sortTableDefault:9,
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
@@ -144,6 +147,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     label: '采购订单',
     field: 'poNumber',
     isForm:true,
+    isTable:false,
     isTableForm:false,
     form: {
       // labelMessage: '信息提示说明！！！',
@@ -163,7 +167,8 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 180
     },
-    isTable:false,
+    isTable:true,
+    sortTableDefault:6,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -412,6 +417,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    sortTableDefault:2,
     form: {
       value: '1',
       componentProps: {
@@ -609,70 +615,7 @@ export const SupplierdeliverRequestMainRules = reactive({
  * @returns {Array} 供应商发货申请子表
  */
 export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '采购订单号',
-    field: 'poNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch:true,
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true,
-        searchListPlaceholder: '请选择订单号',
-        searchField: 'number',
-        searchTitle: '要货计划信息',
-        searchAllSchemas: PurchasePlanDetail.allSchemas,
-        searchPage: PurchasePlanDetailApi.getPurchasePlanDetailPage,
-        searchCondition: [
-          {
-            key: 'number',
-            value: 'ppNumber',
-            message: '请填写要货计划单号！',
-            isMainValue: true
-          },
-          {
-            key: 'flag',
-            value: 1,
-            isMainValue: false
-          },
-          {
-            key: 'available',
-            value: 'TRUE',
-            isMainValue: false
-          }
-
-        ]
-      }
-    },
-    tableForm: {
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择订单号',
-      searchField: 'number',
-      searchTitle: '要货计划信息',
-      searchAllSchemas: PurchasePlanDetail.allSchemas,
-      searchPage: PurchasePlanDetailApi.getPurchasePlanDetailPage,
-      searchCondition: [
-        {
-          key: 'number',
-          value: 'ppNumber',
-          message: '请填写要货计划单号！',
-          isMainValue: true
-        },
-        {
-          key: 'flag',
-          value: 1,
-          isMainValue: false
-        },
-        {
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
-    }
-  },
+  
   {
     label: '订单行',
     field: 'poLine',
@@ -697,7 +640,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
-    sortTableDefault:2,
+    sortTableDefault:3,
     form: {
       componentProps: {
         disabled: true
@@ -714,7 +657,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
-    sortTableDefault:2,
+    sortTableDefault:4,
     form: {
       component: 'InputNumber',
       componentProps: {
@@ -739,6 +682,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 180
     },
+    sortTableDefault:7,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -761,6 +705,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    sortTableDefault:8,
     tableForm: {
       disabled: false
     }
@@ -784,12 +729,12 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    isTable:false,
     tableForm: {
       disabled: true,
       type: 'InputNumber',
       precision: 6
     },
-    sortTableDefault:4,
     form: {
       component: 'InputNumber',
       componentProps: {
@@ -810,7 +755,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       type: 'InputNumber',
       precision: 6
     },
-    sortTableDefault:4,
+    isTable: false,
     form: {
       component: 'InputNumber',
       componentProps: {
@@ -1022,7 +967,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     dictType: DICT_TYPE.UOM,
     dictClass: 'string',
     isTable: true,
-    sortTableDefault:3,
+    sortTableDefault:5,
     table: {
       width: 150
     },
@@ -1031,7 +976,73 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       type: 'Select'
     }
   },
-  
+  {
+    label: '采购订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch:true,
+    sortTableDefault:10,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        disabled:true,
+        // isSearchList: true,
+        searchListPlaceholder: '请选择订单号',
+        searchField: 'number',
+        searchTitle: '要货计划信息',
+        searchAllSchemas: PurchasePlanDetail.allSchemas,
+        searchPage: PurchasePlanDetailApi.getPurchasePlanDetailPage,
+        searchCondition: [
+          {
+            key: 'number',
+            value: 'ppNumber',
+            message: '请填写要货计划单号！',
+            isMainValue: true
+          },
+          {
+            key: 'flag',
+            value: 1,
+            isMainValue: false
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+
+        ]
+      }
+    },
+    tableForm: {
+      disabled:true,
+      isInpuFocusShow: false,
+      searchListPlaceholder: '请选择订单号',
+      searchField: 'number',
+      searchTitle: '要货计划信息',
+      searchAllSchemas: PurchasePlanDetail.allSchemas,
+      searchPage: PurchasePlanDetailApi.getPurchasePlanDetailPage,
+      searchCondition: [
+        {
+          key: 'number',
+          value: 'ppNumber',
+          message: '请填写要货计划单号！',
+          isMainValue: true
+        },
+        {
+          key: 'flag',
+          value: 1,
+          isMainValue: false
+        },
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+    }
+  },
   {
     label: '从货主代码',
     field: 'fromOwnerCode',

From dd961ba5038e60fce08b4fa881f456336f08d968 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Tue, 9 Jul 2024 15:37:56 +0800
Subject: [PATCH 57/84] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=BE=9B=E5=BA=94?=
 =?UTF-8?q?=E5=95=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliverRequestMain/index.vue         | 16 ++++++++++++++--
 .../supplierdeliverBasicForm.vue                 |  3 ++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 0efeed9b4..f5a35e350 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -682,7 +682,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'){
@@ -1176,9 +1176,21 @@ const formFormDateChange = (field, val, row, index) => {
     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()
 })
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
index 80268a9df..c4991cd51 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
@@ -132,7 +132,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'){
@@ -154,6 +154,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

From c7ea2698b9187833a9442cb19c0844a03a1f62dc Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Tue, 9 Jul 2024 15:52:33 +0800
Subject: [PATCH 58/84] UI

---
 .../demandforecastingMain/index.vue           | 19 +++++++++++++-----
 .../demandforecastingSupplierMain/index.vue   | 20 ++++++++++++++-----
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
index 615661842..83c4eb7d5 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
@@ -95,13 +95,22 @@ watch(()=>tableObjectHead.tableList,()=>{
 const updateDateTableColumns = ()=>{
   console.log('tableObjectHead',tableObjectHead)
   let dateColumns = []
-  tableObjectHead.tableList.forEach(item=>{
+  if(tableObjectHead.tableList.length>10){
+    tableObjectHead.tableList.forEach(item=>{
     dateColumns.push({
-      width:120,
-      field: item,
-      label: item
+        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)
 }
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue
index 9ce425e76..556415855 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue
@@ -102,13 +102,23 @@ watch(()=>tableObjectHead.tableList,()=>{
 const updateDateTableColumns = ()=>{
   console.log('tableObjectHead',tableObjectHead)
   let dateColumns = []
-  tableObjectHead.tableList.forEach(item=>{
+  if(tableObjectHead.tableList.length>10){
+    tableObjectHead.tableList.forEach(item=>{
     dateColumns.push({
-      width:120,
-      field: item,
-      label: item
+        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)
 }

From affdd872518a1dd527924bcf8d9e27caec64e801 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 9 Jul 2024 17:58:08 +0800
Subject: [PATCH 59/84] =?UTF-8?q?=E7=94=9F=E6=88=90=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicForm.vue    |   2 +-
 .../supplierdeliverRequestMain/index.vue      |  60 +++--
 .../supplierdeliverRequestMain/labelForm.vue  | 254 +++++++++++++-----
 .../supplierdeliverRequestMain.data.ts        |   4 +-
 4 files changed, 224 insertions(+), 96 deletions(-)

diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 9e7f6cfd9..bd4735411 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -841,7 +841,7 @@ const buttonOperationClick = (row, label, index)=> {
 }
 
 
-defineExpose({ open, formRef, opensearchTable, dialogVisible, formLoading ,handleAddTable,changeDialogWidth,searchTableRef}) // 提供 open 方法，用于打开弹窗
+defineExpose({ open, formRef, opensearchTable, dialogVisible, formLoading ,handleAddTable,changeDialogWidth,searchTableRef,tableFormRef}) // 提供 open 方法，用于打开弹窗
 
 </script>
 <style lang="scss" scoped>
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index f5a35e350..931410a00 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -154,7 +154,7 @@
     @clearInput="clearInput"
     :footButttondata="footButttondata"
     @footButtonClick="footButtonClick"
-    @formSelectChange='formSelectChangeLabel'
+    @formSelectChange="formSelectChangeLabel"
   />
   <!-- 上传质量报告 -->
   <BasicForm
@@ -646,27 +646,43 @@ const footButttondata = ref([
 const labelFormRef = ref()
 const footButtonClick = async (val) => {
   if (val == 'nextStep') {
-    labelFormRef.value.openLabel(detatableData1)
+    const validateForm = await formLabelRef.value.tableFormRef.validateForm()
+    if (!validateForm) {
+        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 )
+// 选择箱规格 拖规格
+let tuoList = []
+const formSelectChangeLabel = (field, val, row) => {
+  if (field == 'packUnit') {
+    let obj = row.boxPackaging.find((item) => item.packUnit == val)
     row.packQty = obj.packQty
-    // 获取拖规格
+    row.parentCode = ''
+    // 获取托规格
     const params1 = {
-      itemCode:row.itemCode,
-	packUnit:row.packUnit
+      itemCode: row.itemCode,
+      packUnit: row.packUnit
     }
-    SupplierdeliverRequestDetailApi.getGenerateLabelParentList(params1).then((res)=>{
-
+    SupplierdeliverRequestDetailApi.getGenerateLabelParentList(params1).then((res) => {
+      tuoList = res
+      row.secondPackUnitInitOptions = res.map((cur) => {
+        return { label: cur.packName, value: cur.packUnit }
+      })
     })
   }
+  // 设置托
+  if (field == 'secondPackUnit') {
+    let obj = tuoList.find((item) => item.packUnit == val)
+    row.secondPackQty = obj.packQty
+  }
 }
-  // 获取部门 用于详情 部门回显
+
+// 获取部门 用于详情 部门回显
 const { wsCache } = useCache()
 /** 详情操作 */
 const detailRef = ref()
@@ -682,7 +698,7 @@ const formRef = ref()
 const supplierdeliverFormRef = ref()
 
 const openForm = async (type: string, row?: number) => {
-  supplierdeliverFormRef.value.openForm(type, row,defaultSupplierCode.value)
+  supplierdeliverFormRef.value.openForm(type, row, defaultSupplierCode.value)
   // if(type == "update"){
   //   SupplierdeliverRequestMain.allSchemas.formSchema.forEach((item) => {
   //     if(item.field == 'supplierCode'){
@@ -1177,16 +1193,16 @@ const formFormDateChange = (field, val, row, index) => {
   }
 }
 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)
+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()
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
index 42f72289b..e32e1f22f 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
@@ -5,11 +5,14 @@
       border
       row-key="id"
       style="width: 1050px; max-height: 70vh; overflow-y: auto"
+      v-if="tableData.length > 0 && dialogTableVisible == true"
+      @expand-change="expandChange"
     >
       <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.children"
@@ -62,7 +65,7 @@
                     </el-table>
                   </div>
                 </template>
-              </el-table-column> 
+              </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">
@@ -87,7 +90,7 @@
               </el-table-column>
             </el-table>
           </div>
-          <!-- <div style="margin-left: 550px; margin-top: -8px; margin-bottom: -8px" v-else>
+          <div style="margin-left: 550px; margin-top: -8px; margin-bottom: -8px" v-else>
             <el-table :data="scope.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="qtyOne" align="center">
@@ -111,18 +114,18 @@
                 </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="orderQty" 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="packQty1" align="center" />
-      <el-table-column label="托规格" width="100" prop="packUnit" align="center" />
-      <el-table-column label="托数量" width="100" prop="packQty" 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="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>
     <template #footer>
       <slot name="foorter"></slot>
@@ -145,16 +148,126 @@ const props = defineProps({
 })
 
 const dialogTableVisible = ref(false)
+const defaultExpandAll = ref(false)
 
 const tableData = ref([])
 const openLabel = (tableList) => {
   console.log(tableList)
   dialogTableVisible.value = true
   tableData.value = tableList
-  intData()
+  defaultExpandAll.value = false
+  // intData()
+  intData1()
 }
 const oneId = ref(0) //每托的id
 const twoId = ref(0) //每箱的id
+const intData1 = () => {
+  tableData.value.forEach((row) => {
+    // 数量%托数量  获取总共几托
+    row.allTuoQty = Math.ceil(parseFloat(row.qty) / parseFloat(row.secondPackQty))
+  })
+}
+const expandChange = (row: any, expandedRows: any[]) => {
+  console.log(row)
+  console.log(expandedRows)
+  // 判断托信息是否存在
+  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.children = []
+    row.isTuo = 1//有托
+    // 循环托
+    for (let i = 0; i < row.allTuoQty; i++) {
+      oneId.value++
+      // 先给所有托一个默认对象值
+      row.children[i] = {
+        id: oneId.value,
+        tPoNumber: i + 1,
+        xNumber: '',
+        qtyOne: ''
+      }
+      // 如果有余数
+      if (row.lastNumber) {
+        // 最后一条信息直接展示余数的信息
+        if (i == row.allTuoQty - 1) {
+          row.children[i].xNumber = Math.ceil(row.lastNumber / parseFloat(row.packQty))
+          row.children[i].qtyOne = row.lastNumber
+        } else {
+          // 其他数据展示一托的全部箱数和全部数量
+          row.children[i].xNumber = row.otherNumber
+          row.children[i].qtyOne = row.secondPackQty
+        }
+      } else {
+        // 如果沒有余数,直接展示一托的全部箱数和全部数量
+        row.children[i].xNumber = row.otherNumber
+        row.children[i].qtyOne = row.secondPackQty
+      }
+    }
+    // 判断箱信息是否存在
+    if (row.packUnit && row.packQty) {
+      row.children.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 i = 0; i < cur.xNumber; i++) {
+          twoId.value++
+          cur.children[i] = {
+            id: twoId.value,
+            xPoNumber: i + 1
+          }
+          // 如果有余数
+          if (cur.xLastNumber) {
+            // 最后一条信息直接展示余数的信息
+            if (i == cur.xNumber - 1) {
+              cur.children[i].qtyTwo = cur.xLastNumber
+            } else {
+              // 其他数据展示一托的全部箱数和全部数量
+              cur.children[i].qtyTwo = row.packQty
+            }
+          } else {
+            // 如果沒有余数,直接展示一托的全部箱数和全部数量
+            cur.children[i].qtyTwo = row.packQty
+          }
+        }
+      })
+    }
+  } else {
+    // 数量除以箱数量获取余数
+    row.lastNumber = parseFloat(row.qty) % parseFloat(row.packQty)
+    // 数量%每箱数量  获取总共几箱
+    row.allTuoQty = Math.ceil(parseFloat(row.qty) / parseFloat(row.packQty))
+    row.isTuo = 0//无托
+    row.children = []
+    // 循环箱
+    for (let i = 0; i < row.allTuoQty; i++) {
+      oneId.value++
+      // 先给所有托一个默认对象值
+      row.children[i] = {
+        id: oneId.value,
+        xPoNumber: i + 1,
+        qtyOne: ''
+      }
+      // 如果有余数
+      if (row.lastNumber) {
+        // 最后一条信息直接展示余数的信息
+        if (i == row.allTuoQty - 1) {
+          row.children[i].qtyOne = row.lastNumber
+        } else {
+          // 其他数据展示一托的全部箱数和全部数量
+          row.children[i].qtyOne = row.packQty
+        }
+      } else {
+        // 如果沒有余数,直接展示一托的全部箱数和全部数量
+        row.children[i].qtyOne = row.packQty
+      }
+    }
+  }
+}
 const intData = () => {
   // 目前托信息等于包装规格1
   tableData.value.forEach((item) => {
@@ -163,13 +276,13 @@ const intData = () => {
     // 判断托信息是否存在
     if (item.packUnit && item.packQty) {
       // 数量除以托数量获取余数
-      item.lastNumber = parseFloat(item.orderQty) % parseFloat(item.packQty)
+      item.lastNumber = parseFloat(item.qty) % parseFloat(item.packQty)
       // 托数量/箱数量  一托可以放几箱
       item.otherNumber = parseFloat(item.packQty) / parseFloat(item.secondPackQty)
       // 数量%每箱数量  获取总共几箱
-      item.allPackQty = Math.ceil(parseFloat(item.orderQty) / parseFloat(item.secondPackQty))
+      item.allPackQty = Math.ceil(parseFloat(item.qty) / parseFloat(item.secondPackQty))
       // 数量%托数量  获取总共几托
-      item.allTuoQty = Math.ceil(parseFloat(item.orderQty) / parseFloat(item.packQty))
+      item.allTuoQty = Math.ceil(parseFloat(item.qty) / parseFloat(item.packQty))
       item.children = []
       // 循环托
       for (let i = 0; i < item.packQty1; i++) {
@@ -179,30 +292,31 @@ const intData = () => {
           id: oneId.value,
           tPoNumber: i + 1,
           xNumber: '',
-          qtyOne: ''
+          qtyOne: '',
+          children: []
         }
         // 循环当前数量所需要的托数量
-        for (let j = 0; j < item.allTuoQty; j++) {
-          if (i == j) {
-            // 如果有余数
-            if (item.lastNumber) {
-              // 最后一条信息直接展示余数的信息
-              if (j == item.allTuoQty - 1) {
-              item.children[j].xNumber =  Math.ceil(item.lastNumber / parseFloat(item.secondPackQty))
-              item.children[j].qtyOne = item.lastNumber
-              }else{
-                // 其他数据展示一托的全部箱数和全部数量
-              item.children[j].xNumber = item.otherNumber
-              item.children[j].qtyOne = item.packQty
-            }
-            }else{
-              // 如果沒有余数,直接展示一托的全部箱数和全部数量
-              item.children[j].xNumber = item.otherNumber
-              item.children[j].qtyOne = item.packQty
-            }
-           
-          }
-        }
+        // for (let j = 0; j < item.allTuoQty; j++) {
+        //   if (i == j) {
+        //     // 如果有余数
+        //     if (item.lastNumber) {
+        //       // 最后一条信息直接展示余数的信息
+        //       if (j == item.allTuoQty - 1) {
+        //       item.children[j].xNumber =  Math.ceil(item.lastNumber / parseFloat(item.secondPackQty))
+        //       item.children[j].qtyOne = item.lastNumber
+        //       }else{
+        //         // 其他数据展示一托的全部箱数和全部数量
+        //       item.children[j].xNumber = item.otherNumber
+        //       item.children[j].qtyOne = item.packQty
+        //     }
+        //     }else{
+        //       // 如果沒有余数,直接展示一托的全部箱数和全部数量
+        //       item.children[j].xNumber = item.otherNumber
+        //       item.children[j].qtyOne = item.packQty
+        //     }
+
+        //   }
+        // }
       }
       // 判断箱信息是否存在
       if (item.secondPackUnit && item.secondPackQty) {
@@ -213,9 +327,9 @@ const intData = () => {
           // cur.xiangNumber = Math.ceil(parseFloat(cur.qtyOne) / parseFloat(item.secondPackQty))
           for (let i = 0; i < cur.xNumber; i++) {
             twoId.value++
-            cur.children[i]={
+            cur.children[i] = {
               id: twoId.value,
-              xPoNumber: i + 1,
+              xPoNumber: i + 1
             }
             // 如果有余数
             if (cur.xLastNumber) {
@@ -235,11 +349,11 @@ const intData = () => {
       }
     } else {
       // 数量除以箱数量获取余数
-      item.lastNumber = parseFloat(item.orderQty) % parseFloat(item.secondPackQty)
+      item.lastNumber = parseFloat(item.qty) % parseFloat(item.secondPackQty)
       // 数量%每箱数量  获取总共几箱
-      item.allPackQty = Math.ceil(parseFloat(item.orderQty) / parseFloat(item.secondPackQty))
+      item.allPackQty = Math.ceil(parseFloat(item.qty) / parseFloat(item.secondPackQty))
       item.children = []
-      console.log(333,item.lastNumber)
+      console.log(333, item.lastNumber)
       // 循环箱
       for (let i = 0; i < item.packQty1; i++) {
         oneId.value++
@@ -249,31 +363,27 @@ const intData = () => {
           xPoNumber: i + 1,
           qtyOne: ''
         }
-        console.log(444,item.allPackQty)
-         // 循环当前数量所需要的箱数量
-         for (let j = 0; j < item.allPackQty; j++) {
+        // 循环当前数量所需要的箱数量
+        for (let j = 0; j < item.allPackQty; j++) {
           if (i == j) {
             // 如果有余数
             if (item.lastNumber) {
               // 最后一条信息直接展示余数的信息
               if (j == item.allPackQty - 1) {
-              item.children[j].qtyOne = item.lastNumber
-              }else{
+                item.children[j].qtyOne = item.lastNumber
+              } else {
                 // 其他数据展示一托的全部箱数和全部数量
-              item.children[j].qtyOne = item.secondPackQty
-            }
-            }else{
+                item.children[j].qtyOne = item.secondPackQty
+              }
+            } else {
               // 如果沒有余数,直接展示一托的全部箱数和全部数量
               item.children[j].qtyOne = item.secondPackQty
             }
-           
           }
         }
       }
-     
     }
   })
-  console.log(111, tableData.value)
 }
 /** 弹窗按钮 */
 let Butttondata: any = []
@@ -302,7 +412,7 @@ const submitForm = () => {
       item.allNumber += parseFloat(cur.qtyOne) || 0
     })
 
-    if (item.allNumber == parseFloat(item.orderQty)) {
+    if (item.allNumber == parseFloat(item.qty)) {
       return true
     } else {
       return false
@@ -319,16 +429,16 @@ const addT = (oneRow) => {
   oneId.value++
   oneRow.children.push({
     id: oneId.value,
-    tPoNumber: oneRow.children[oneRow.children.length - 1].tPoNumber + 1, //行号是上一行的行号加1
+    tPoNumber: (oneRow.children[oneRow.children.length - 1]?.tPoNumber || 0) + 1, //行号是上一行的行号加1
     xNumber: '',
     qtyOne: ''
   })
-  oneRow.packQty1 = oneRow.children.length
+  oneRow.allTuoQty = oneRow.children.length
 }
 // 移出托
 const removeT = (oneRow, oneIndex, twoRow, twoIndex) => {
   oneRow.children.splice(twoIndex, 1)
-  oneRow.packQty1 = oneRow.children.length
+  oneRow.allTuoQty = oneRow.children.length
 }
 // 添加箱
 const addX = (oneRow, oneIndex, twoRow, twoIndex, type) => {
@@ -351,7 +461,7 @@ const addX = (oneRow, oneIndex, twoRow, twoIndex, type) => {
       xPoNumber: oneRow.children[oneRow.children.length - 1].xPoNumber + 1,
       qtyOne: ''
     })
-    oneRow.packQty1 = oneRow.children.length
+    oneRow.allTuoQty = oneRow.children.length
   }
 }
 // 移除箱
@@ -368,7 +478,7 @@ const removeX = (oneRow, oneIndex, twoRow, twoIndex, threeRow, threeIndex, type)
     twoRow.xNumber = twoRow.children.length
   } else {
     oneRow.children.splice(twoIndex, 1)
-    oneRow.packQty1 = oneRow.children.length
+    oneRow.allTuoQty = oneRow.children.length
   }
 }
 // 是否显示展开图标
@@ -379,14 +489,16 @@ const getRowClass = (row) => {
 }
 // 托失去焦点
 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.secondPackQty)
-    return
+    twoRow.qtyOne = parseFloat(twoRow.xNumber) * parseFloat(oneRow.packQty)
   }
-  twoRow.qtyOne = parseFloat(twoRow.xNumber) * parseFloat(oneRow.secondPackQty)
+  twoRow.qtyOne = parseFloat(twoRow.xNumber) * parseFloat(oneRow.packQty)
   let num = 0
   oneRow.children.forEach((item) => {
     num += parseFloat(item.xNumber) || 0
@@ -399,11 +511,11 @@ const blurOne = (oneRow, twoRow) => {
   }
   // 托信息修改的時候箱数据自动排列
   // 判断箱信息是否存在
-  if (oneRow.secondPackUnit && oneRow.secondPackQty) {
+  if (oneRow.packUnit && oneRow.packQty) {
     oneRow.children.forEach((cur, key) => {
       cur.children = []
       // 数量除以托数量获取余数
-      cur.xLastNumber = parseFloat(cur.xNumber) % parseFloat(oneRow.secondPackQty)
+      cur.xLastNumber = parseFloat(cur.xNumber) % parseFloat(oneRow.packQty)
       for (let j = 0; j < cur.xNumber; j++) {
         twoId.value++
         // 如果有余数
@@ -420,7 +532,7 @@ const blurOne = (oneRow, twoRow) => {
             cur.children.push({
               id: twoId.value,
               xPoNumber: j + 1,
-              qtyTwo: oneRow.secondPackQty
+              qtyTwo: oneRow.packQty
             })
           }
         } else {
@@ -428,7 +540,7 @@ const blurOne = (oneRow, twoRow) => {
           cur.children.push({
             id: twoId.value,
             xPoNumber: j + 1,
-            qtyTwo: oneRow.secondPackQty
+            qtyTwo: oneRow.packQty
           })
         }
       }
@@ -438,10 +550,10 @@ const blurOne = (oneRow, twoRow) => {
 //在托下方的箱数量失去焦点
 const blurTwo = (oneRow, twoRow, threeRow) => {
   console.log(parseFloat(threeRow.qtyTwo))
-  console.log(parseFloat(oneRow.secondPackQty))
-  if (parseFloat(threeRow.qtyTwo) > parseFloat(oneRow.secondPackQty)) {
-    message.warning('数量最多为' + oneRow.secondPackQty)
-    threeRow.qtyTwo = oneRow.secondPackQty
+  console.log(parseFloat(oneRow.packQty))
+  if (parseFloat(threeRow.qtyTwo) > parseFloat(oneRow.packQty)) {
+    message.warning('数量最多为' + oneRow.packQty)
+    threeRow.qtyTwo = oneRow.packQty
     return
   }
   let num = 0
@@ -452,9 +564,9 @@ const blurTwo = (oneRow, twoRow, threeRow) => {
 }
 // 箱数量失去焦点
 const blurThree = (oneRow, twoRow) => {
-  if (parseFloat(twoRow.qtyOne) > parseFloat(oneRow.secondPackQty)) {
-    message.warning('每箱个数最多' + oneRow.secondPackQty)
-    twoRow.qtyOne = oneRow.secondPackQty
+  if (parseFloat(twoRow.qtyOne) > parseFloat(oneRow.packQty)) {
+    message.warning('每箱个数最多' + oneRow.packQty)
+    twoRow.qtyOne = oneRow.packQty
   }
 }
 defineExpose({ openLabel }) // 提供 open 方法，用于打开弹窗
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index 0e5766b0b..ec88f1221 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -1640,7 +1640,7 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
   },
   {
     label: '托规格',
-    field: 'parentCode',
+    field: 'secondPackUnit',
     isTable: true,
     sort: 'custom',
     form: {
@@ -1655,7 +1655,7 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
   },
   {
     label: '托规格数量',
-    field: 'parentQty',
+    field: 'secondPackQty',
     sort: 'custom',
     table: {
       width: 150

From bbef88d7d5a4b085f8499aea8d2fa8e54e457a18 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Tue, 9 Jul 2024 19:24:54 +0800
Subject: [PATCH 60/84] bug

---
 .../supplierdeliver/purchasePlanMain/index.vue               | 5 ++++-
 .../supplierdeliverRequestMain/supplierdeliverBasicForm.vue  | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index a35c5fb98..1456bae42 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@@ -53,7 +53,8 @@
     @tableSelectionDelete="tableSelectionDelete"
     @searchTableSuccess="searchTableSuccess" 
     @submitForm="submitForm" 
-    @onEnter="onEnter"/>
+    @onEnter="onEnter"
+    @onBlur="onEnter"/>
 
   <!-- 详情 -->
   <!-- 隐藏子表编辑和删除是因为要货计划以后是接口发过来的，而且我们的计划数量是放入到采购订单已计划数量里，无法再次编辑数量-->
@@ -176,6 +177,7 @@
             // var ms = endTime.substring(0, 2)
 		        // 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
@@ -377,6 +379,7 @@ 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 // 送达日期
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
index c4991cd51..14a656acb 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
@@ -99,6 +99,7 @@ const openFormByCreate = async ( data ) => {
     const setV = {}
     // 供应商代码回显
     setV['supplierCode'] = data['supplierCode'] // 供应商代码
+    setV['poNumber'] = data['poNumber'] //采购订单
     setV['ppNumber'] = data['number'] // 要货单号
     searchPage: SupplierApi.getSupplierPage
     //新增--选择完要货计划，自动展示明细

From 984d6a47d9eb4ede867849202d1f3184b6b0db32 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 9 Jul 2024 19:25:28 +0800
Subject: [PATCH 61/84] =?UTF-8?q?=E7=94=9F=E6=88=90=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TableForm/src/TableForm.vue    |   1 +
 .../supplierdeliverRequestMain/index.vue      |  93 ++++----
 .../supplierdeliverRequestMain/labelForm.vue  | 206 +++++-------------
 3 files changed, 102 insertions(+), 198 deletions(-)

diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue
index 2def32a83..5e952d597 100644
--- a/src/components/TableForm/src/TableForm.vue
+++ b/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"
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 931410a00..7fb1ded0f 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -149,7 +149,6 @@
     :isBusiness="true"
     :isShowButton="false"
     @searchTableSuccess="searchTableSuccessLabel"
-    @submitForm="submitFormLabel"
     :isShowReduceButton="false"
     @clearInput="clearInput"
     :footButttondata="footButttondata"
@@ -181,7 +180,11 @@
       <el-button type="primary" @click="printAllClick">打印全部</el-button>
     </template> -->
   </SearchTable>
-  <labelForm ref="labelFormRef" :tableAllSchemas="SupplierdeliverRequestDetailLabel.allSchemas" />
+  <labelForm
+    ref="labelFormRef"
+    :tableAllSchemas="SupplierdeliverRequestDetailLabel.allSchemas"
+    @submitForm="submitFormLabel"
+  />
 </template>
 
 <script setup lang="ts">
@@ -341,7 +344,6 @@ const getSearchTableData = async (number, formField, searchField) => {
     tableData.value.push(newRow)
     itemCodes.push(row['itemCode'])
   })
-
   //有效期
   ItembasicApi.getItembasicPage({
     code: itemCodes.join(',')
@@ -367,7 +369,6 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
     formRef.setValues(setV)
   })
 }
-
 // 查询页面返回
 const searchTableSuccessLabel = (formField, searchField, val, formRef, type, row) => {
   nextTick(() => {
@@ -648,9 +649,9 @@ const footButtonClick = async (val) => {
   if (val == 'nextStep') {
     const validateForm = await formLabelRef.value.tableFormRef.validateForm()
     if (!validateForm) {
-        return
-      }
-      const data = JSON.parse(JSON.stringify(detatableData1.value))
+      return
+    }
+    const data = JSON.parse(JSON.stringify(detatableData1.value))
     labelFormRef.value.openLabel(data)
   } else if (val == 'close') {
     formLabelRef.value.dialogVisible = false
@@ -661,8 +662,13 @@ let tuoList = []
 const formSelectChangeLabel = (field, val, row) => {
   if (field == 'packUnit') {
     let obj = row.boxPackaging.find((item) => item.packUnit == val)
-    row.packQty = obj.packQty
-    row.parentCode = ''
+    if (obj) {
+      row.packQty = obj.packQty
+    } else {
+      row.packQty = ''
+    }
+    row.secondPackUnit = ''
+    row.secondPackQty = ''
     // 获取托规格
     const params1 = {
       itemCode: row.itemCode,
@@ -678,7 +684,11 @@ const formSelectChangeLabel = (field, val, row) => {
   // 设置托
   if (field == 'secondPackUnit') {
     let obj = tuoList.find((item) => item.packUnit == val)
-    row.secondPackQty = obj.packQty
+    if (obj) {
+      row.secondPackQty = obj.packQty
+    } else {
+      row.secondPackQty = ''
+    }
   }
 }
 
@@ -968,43 +978,42 @@ detatableData.pageSize = 500
 const { getList: getDetailList } = detatableMethods
 
 // 生成标签按钮操作
-const submitFormLabel = async (formType, submitData) => {
-  let data = { ...submitData }
-  if (data.masterId) {
-    data.id = data.masterId
-  }
+const submitFormLabel = async (data) => {
   try {
-    console.log('formType==', formType)
-    console.log('data==', data)
-    data.subList = detatableData.tableList
-    if (detatableData.tableList.find((item) => item.secondPackUnit == item.packUnit)) {
-      message.warning(t('ts.包装规格1和包装规格2不能相同'))
-      return
+    // console.log('formType==', formType)
+    // console.log('data==', data)
+    // data.subList = detatableData.tableList
+    // if (detatableData.tableList.find((item) => item.secondPackUnit == item.packUnit)) {
+    //   message.warning(t('ts.包装规格1和包装规格2不能相同'))
+    //   return
+    // }
+    const data1 = {
+      subList: [...data]
     }
-    // 校验物料包装规格数量是否修改
-    let flag = false
-    await SupplierdeliverRequestMainApi.checkPackQty(data).then(async (res) => {
-      if (res) {
-        await message
-          .confirm(t('ts.是否修改物料包装标包数量') + '?')
-          .then(() => {
-            flag = true //修改标包数量
-          })
-          .catch(() => {
-            flag = false
-          })
+    data1.subList.forEach((row) => {
+      if (row.secondPackUnit && row.secondPackQty) {
       } else {
-        flag = true //修改标包数量
+        row.children = []
+        let obj = {}
+        row.packageList.forEach((item) => {
+          obj = {
+            xPoNumber: item.xPoNumber,
+            qtyTwo: item.qtyOne
+          }
+          row.children.push(obj)
+        })
+        row.packageList = []
+        row.packageList.push({
+          isTuo: 0,
+          children: row.children
+        })
       }
     })
-    console.log('返回结果', flag)
-    if (flag) {
-      console.log('detatableData', detatableData)
-      await message.confirm(t('ts.是否为此数据生成标签？'))
-      await SupplierdeliverRequestMainApi.genLabel(data)
-      isCreateLabel.value = true
-      message.success(t('ts.创建标签成功'))
-    }
+    console.log('detatableData', detatableData)
+    await message.confirm(t('ts.是否为此数据生成标签？'))
+    await SupplierdeliverRequestMainApi.genLabel(data1)
+    isCreateLabel.value = true
+    message.success(t('ts.创建标签成功'))
     getList()
   } finally {
     formLabelRef.value.formLoading = false
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
index e32e1f22f..f3785c95b 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
@@ -15,7 +15,7 @@
             v-if="scope.row.secondPackUnit && scope.row.secondPackQty"
           >
             <el-table
-              :data="scope.row.children"
+              :data="scope.row.packageList"
               border
               style="width: 550px"
               row-key="id"
@@ -91,7 +91,7 @@
             </el-table>
           </div>
           <div style="margin-left: 550px; margin-top: -8px; margin-bottom: -8px" v-else>
-            <el-table :data="scope.row.children" border style="width: 300px" row-key="id">
+            <el-table :data="scope.row.packageList" 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">
@@ -152,24 +152,28 @@ const defaultExpandAll = ref(false)
 
 const tableData = ref([])
 const openLabel = (tableList) => {
-  console.log(tableList)
   dialogTableVisible.value = true
   tableData.value = tableList
   defaultExpandAll.value = false
   // intData()
-  intData1()
+  intData()
 }
 const oneId = ref(0) //每托的id
 const twoId = ref(0) //每箱的id
-const intData1 = () => {
+const intData = () => {
   tableData.value.forEach((row) => {
-    // 数量%托数量  获取总共几托
-    row.allTuoQty = Math.ceil(parseFloat(row.qty) / parseFloat(row.secondPackQty))
+    if (row.secondPackUnit && row.secondPackQty) {
+      row.isTuo = 1 //有托
+      // 数量%托数量  获取总共几托
+      row.allTuoQty = Math.ceil(parseFloat(row.qty) / parseFloat(row.secondPackQty))
+    } else {
+      row.isTuo = 0 //有托
+      // 数量%每箱数量  获取总共几箱
+      row.allTuoQty = Math.ceil(parseFloat(row.qty) / parseFloat(row.packQty))
+    }
   })
 }
 const expandChange = (row: any, expandedRows: any[]) => {
-  console.log(row)
-  console.log(expandedRows)
   // 判断托信息是否存在
   if (row.secondPackUnit && row.secondPackQty) {
     // 数量除以托数量获取余数
@@ -178,38 +182,38 @@ const expandChange = (row: any, expandedRows: any[]) => {
     row.otherNumber = parseFloat(row.secondPackQty) / parseFloat(row.packQty)
     // 数量%托数量  获取总共几托
     row.allTuoQty = Math.ceil(parseFloat(row.qty) / parseFloat(row.secondPackQty))
-    row.children = []
-    row.isTuo = 1//有托
+    row.packageList = []
     // 循环托
     for (let i = 0; i < row.allTuoQty; i++) {
       oneId.value++
       // 先给所有托一个默认对象值
-      row.children[i] = {
+      row.packageList[i] = {
         id: oneId.value,
         tPoNumber: i + 1,
         xNumber: '',
-        qtyOne: ''
+        qtyOne: '',
+       isTuo : 1 //有托
       }
       // 如果有余数
       if (row.lastNumber) {
         // 最后一条信息直接展示余数的信息
         if (i == row.allTuoQty - 1) {
-          row.children[i].xNumber = Math.ceil(row.lastNumber / parseFloat(row.packQty))
-          row.children[i].qtyOne = row.lastNumber
+          row.packageList[i].xNumber = Math.ceil(row.lastNumber / parseFloat(row.packQty))
+          row.packageList[i].qtyOne = row.lastNumber
         } else {
           // 其他数据展示一托的全部箱数和全部数量
-          row.children[i].xNumber = row.otherNumber
-          row.children[i].qtyOne = row.secondPackQty
+          row.packageList[i].xNumber = row.otherNumber
+          row.packageList[i].qtyOne = row.secondPackQty
         }
       } else {
         // 如果沒有余数,直接展示一托的全部箱数和全部数量
-        row.children[i].xNumber = row.otherNumber
-        row.children[i].qtyOne = row.secondPackQty
+        row.packageList[i].xNumber = row.otherNumber
+        row.packageList[i].qtyOne = row.secondPackQty
       }
     }
     // 判断箱信息是否存在
     if (row.packUnit && row.packQty) {
-      row.children.forEach((cur, key) => {
+      row.packageList.forEach((cur, key) => {
         cur.children = []
         // 数量除以箱数量获取余数
         cur.xLastNumber = parseFloat(cur.qtyOne) % parseFloat(row.packQty)
@@ -237,17 +241,17 @@ const expandChange = (row: any, expandedRows: any[]) => {
       })
     }
   } else {
+    row.isTuo = 0 //有托
     // 数量除以箱数量获取余数
     row.lastNumber = parseFloat(row.qty) % parseFloat(row.packQty)
     // 数量%每箱数量  获取总共几箱
     row.allTuoQty = Math.ceil(parseFloat(row.qty) / parseFloat(row.packQty))
-    row.isTuo = 0//无托
-    row.children = []
+    row.packageList = []
     // 循环箱
     for (let i = 0; i < row.allTuoQty; i++) {
       oneId.value++
       // 先给所有托一个默认对象值
-      row.children[i] = {
+      row.packageList[i] = {
         id: oneId.value,
         xPoNumber: i + 1,
         qtyOne: ''
@@ -256,135 +260,19 @@ const expandChange = (row: any, expandedRows: any[]) => {
       if (row.lastNumber) {
         // 最后一条信息直接展示余数的信息
         if (i == row.allTuoQty - 1) {
-          row.children[i].qtyOne = row.lastNumber
+          row.packageList[i].qtyOne = row.lastNumber
         } else {
           // 其他数据展示一托的全部箱数和全部数量
-          row.children[i].qtyOne = row.packQty
+          row.packageList[i].qtyOne = row.packQty
         }
       } else {
         // 如果沒有余数,直接展示一托的全部箱数和全部数量
-        row.children[i].qtyOne = row.packQty
+        row.packageList[i].qtyOne = row.packQty
       }
     }
   }
 }
-const intData = () => {
-  // 目前托信息等于包装规格1
-  tableData.value.forEach((item) => {
-    item.packQty1 = 11
 
-    // 判断托信息是否存在
-    if (item.packUnit && item.packQty) {
-      // 数量除以托数量获取余数
-      item.lastNumber = parseFloat(item.qty) % parseFloat(item.packQty)
-      // 托数量/箱数量  一托可以放几箱
-      item.otherNumber = parseFloat(item.packQty) / parseFloat(item.secondPackQty)
-      // 数量%每箱数量  获取总共几箱
-      item.allPackQty = Math.ceil(parseFloat(item.qty) / parseFloat(item.secondPackQty))
-      // 数量%托数量  获取总共几托
-      item.allTuoQty = Math.ceil(parseFloat(item.qty) / parseFloat(item.packQty))
-      item.children = []
-      // 循环托
-      for (let i = 0; i < item.packQty1; i++) {
-        oneId.value++
-        // 先给所有托一个默认对象值
-        item.children[i] = {
-          id: oneId.value,
-          tPoNumber: i + 1,
-          xNumber: '',
-          qtyOne: '',
-          children: []
-        }
-        // 循环当前数量所需要的托数量
-        // for (let j = 0; j < item.allTuoQty; j++) {
-        //   if (i == j) {
-        //     // 如果有余数
-        //     if (item.lastNumber) {
-        //       // 最后一条信息直接展示余数的信息
-        //       if (j == item.allTuoQty - 1) {
-        //       item.children[j].xNumber =  Math.ceil(item.lastNumber / parseFloat(item.secondPackQty))
-        //       item.children[j].qtyOne = item.lastNumber
-        //       }else{
-        //         // 其他数据展示一托的全部箱数和全部数量
-        //       item.children[j].xNumber = item.otherNumber
-        //       item.children[j].qtyOne = item.packQty
-        //     }
-        //     }else{
-        //       // 如果沒有余数,直接展示一托的全部箱数和全部数量
-        //       item.children[j].xNumber = item.otherNumber
-        //       item.children[j].qtyOne = item.packQty
-        //     }
-
-        //   }
-        // }
-      }
-      // 判断箱信息是否存在
-      if (item.secondPackUnit && item.secondPackQty) {
-        item.children.forEach((cur, key) => {
-          cur.children = []
-          // 数量除以箱数量获取余数
-          cur.xLastNumber = parseFloat(cur.qtyOne) % parseFloat(item.secondPackQty)
-          // cur.xiangNumber = Math.ceil(parseFloat(cur.qtyOne) / parseFloat(item.secondPackQty))
-          for (let i = 0; i < cur.xNumber; i++) {
-            twoId.value++
-            cur.children[i] = {
-              id: twoId.value,
-              xPoNumber: i + 1
-            }
-            // 如果有余数
-            if (cur.xLastNumber) {
-              // 最后一条信息直接展示余数的信息
-              if (i == cur.xNumber - 1) {
-                cur.children[i].qtyTwo = cur.xLastNumber
-              } else {
-                // 其他数据展示一托的全部箱数和全部数量
-                cur.children[i].qtyTwo = item.secondPackQty
-              }
-            } else {
-              // 如果沒有余数,直接展示一托的全部箱数和全部数量
-              cur.children[i].qtyTwo = item.secondPackQty
-            }
-          }
-        })
-      }
-    } else {
-      // 数量除以箱数量获取余数
-      item.lastNumber = parseFloat(item.qty) % parseFloat(item.secondPackQty)
-      // 数量%每箱数量  获取总共几箱
-      item.allPackQty = Math.ceil(parseFloat(item.qty) / parseFloat(item.secondPackQty))
-      item.children = []
-      console.log(333, item.lastNumber)
-      // 循环箱
-      for (let i = 0; i < item.packQty1; i++) {
-        oneId.value++
-        // 先给所有托一个默认对象值
-        item.children[i] = {
-          id: oneId.value,
-          xPoNumber: i + 1,
-          qtyOne: ''
-        }
-        // 循环当前数量所需要的箱数量
-        for (let j = 0; j < item.allPackQty; j++) {
-          if (i == j) {
-            // 如果有余数
-            if (item.lastNumber) {
-              // 最后一条信息直接展示余数的信息
-              if (j == item.allPackQty - 1) {
-                item.children[j].qtyOne = item.lastNumber
-              } else {
-                // 其他数据展示一托的全部箱数和全部数量
-                item.children[j].qtyOne = item.secondPackQty
-              }
-            } else {
-              // 如果沒有余数,直接展示一托的全部箱数和全部数量
-              item.children[j].qtyOne = item.secondPackQty
-            }
-          }
-        }
-      }
-    }
-  })
-}
 /** 弹窗按钮 */
 let Butttondata: any = []
 Butttondata = [
@@ -408,37 +296,41 @@ const submitForm = () => {
   let arr = tableData.value.map((item) => {
     item.allNumber = 0
     // 判断托信息是否存在
-    item.children.forEach((cur) => {
+    console.log(item.packageList)
+    item.packageList.forEach((cur) => {
       item.allNumber += parseFloat(cur.qtyOne) || 0
     })
-
     if (item.allNumber == parseFloat(item.qty)) {
       return true
     } else {
       return false
     }
   })
+  console.log(3434, arr)
   const isBol = arr.some((item) => item == false)
   if (isBol) {
     message.warning('当前添加的数量与总数量不一致')
     return
   }
+  console.log(343546568678)
+ 
+  emit('submitForm', tableData.value)
 }
 // 添加托
 const addT = (oneRow) => {
   oneId.value++
-  oneRow.children.push({
+  oneRow.packageList.push({
     id: oneId.value,
-    tPoNumber: (oneRow.children[oneRow.children.length - 1]?.tPoNumber || 0) + 1, //行号是上一行的行号加1
+    tPoNumber: (oneRow.packageList[oneRow.packageList.length - 1]?.tPoNumber || 0) + 1, //行号是上一行的行号加1
     xNumber: '',
     qtyOne: ''
   })
-  oneRow.allTuoQty = oneRow.children.length
+  oneRow.allTuoQty = oneRow.packageList.length
 }
 // 移出托
 const removeT = (oneRow, oneIndex, twoRow, twoIndex) => {
-  oneRow.children.splice(twoIndex, 1)
-  oneRow.allTuoQty = oneRow.children.length
+  oneRow.packageList.splice(twoIndex, 1)
+  oneRow.allTuoQty = oneRow.packageList.length
 }
 // 添加箱
 const addX = (oneRow, oneIndex, twoRow, twoIndex, type) => {
@@ -456,12 +348,12 @@ const addX = (oneRow, oneIndex, twoRow, twoIndex, type) => {
     twoRow.xNumber = twoRow.children.length
   } else {
     // 直接添加箱
-    oneRow.children.push({
+    oneRow.packageList.push({
       id: oneId.value,
-      xPoNumber: oneRow.children[oneRow.children.length - 1].xPoNumber + 1,
+      xPoNumber: oneRow.packageList[oneRow.packageList.length - 1].xPoNumber + 1,
       qtyOne: ''
     })
-    oneRow.allTuoQty = oneRow.children.length
+    oneRow.allTuoQty = oneRow.packageList.length
   }
 }
 // 移除箱
@@ -477,8 +369,8 @@ const removeX = (oneRow, oneIndex, twoRow, twoIndex, threeRow, threeIndex, type)
     twoRow.qtyOne = num
     twoRow.xNumber = twoRow.children.length
   } else {
-    oneRow.children.splice(twoIndex, 1)
-    oneRow.allTuoQty = oneRow.children.length
+    oneRow.packageList.splice(twoIndex, 1)
+    oneRow.allTuoQty = oneRow.packageList.length
   }
 }
 // 是否显示展开图标
@@ -500,7 +392,7 @@ const blurOne = (oneRow, twoRow) => {
   }
   twoRow.qtyOne = parseFloat(twoRow.xNumber) * parseFloat(oneRow.packQty)
   let num = 0
-  oneRow.children.forEach((item) => {
+  oneRow.packageList.forEach((item) => {
     num += parseFloat(item.xNumber) || 0
   })
   if (num > oneRow.allPackQty) {
@@ -512,7 +404,7 @@ const blurOne = (oneRow, twoRow) => {
   // 托信息修改的時候箱数据自动排列
   // 判断箱信息是否存在
   if (oneRow.packUnit && oneRow.packQty) {
-    oneRow.children.forEach((cur, key) => {
+    oneRow.packageList.forEach((cur, key) => {
       cur.children = []
       // 数量除以托数量获取余数
       cur.xLastNumber = parseFloat(cur.xNumber) % parseFloat(oneRow.packQty)
@@ -569,6 +461,8 @@ const blurThree = (oneRow, twoRow) => {
     twoRow.qtyOne = oneRow.packQty
   }
 }
+// 传递给父类
+const emit = defineEmits(['submitForm'])
 defineExpose({ openLabel }) // 提供 open 方法，用于打开弹窗
 </script>
 <style lang="scss" scoped>

From 81b7051a1305909703b308c05ee8c73ae22a9c16 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 9 Jul 2024 19:52:59 +0800
Subject: [PATCH 62/84] =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliverRequestMain/index.vue      | 35 +++++++++++++------
 .../supplierdeliverRequestMain/labelForm.vue  |  6 +++-
 2 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 7fb1ded0f..0a3bff66d 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -623,7 +623,25 @@ const buttonTableClick = async (val, row) => {
               masterId: row.masterId
             }
             genLabelId.value = row.masterId
-            await getDetailList()
+            // await getDetailList()
+            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) => {
+                  console.log(item.boxPackaging)
+                  if (item.boxPackaging?.length > 0) {
+                    item.packUnitInitOptions = item.boxPackaging.map((cur) => {
+                      return { label: cur.packName, value: cur.packUnit }
+                    })
+                  }
+                })
+              })
             formLabelRef.value.open('create', row, null, 'createLabel') //创建标签页面 createLabel 标题
           }
         })
@@ -980,15 +998,8 @@ const { getList: getDetailList } = detatableMethods
 // 生成标签按钮操作
 const submitFormLabel = async (data) => {
   try {
-    // console.log('formType==', formType)
-    // console.log('data==', data)
-    // data.subList = detatableData.tableList
-    // if (detatableData.tableList.find((item) => item.secondPackUnit == item.packUnit)) {
-    //   message.warning(t('ts.包装规格1和包装规格2不能相同'))
-    //   return
-    // }
     const data1 = {
-      subList: [...data]
+      subList: JSON.parse(JSON.stringify(data))
     }
     data1.subList.forEach((row) => {
       if (row.secondPackUnit && row.secondPackQty) {
@@ -1009,7 +1020,8 @@ const submitFormLabel = async (data) => {
         })
       }
     })
-    console.log('detatableData', detatableData)
+    
+    console.log(data1)
     await message.confirm(t('ts.是否为此数据生成标签？'))
     await SupplierdeliverRequestMainApi.genLabel(data1)
     isCreateLabel.value = true
@@ -1018,6 +1030,9 @@ const submitFormLabel = async (data) => {
   } finally {
     formLabelRef.value.formLoading = false
     formLabelRef.value.dialogVisible = false
+    labelFormRef.value.formLoading = false
+    labelFormRef.value.dialogVisible = false
+
   }
 }
 const clearInput = async (field, row, index) => {
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
index f3785c95b..ce6f5bb86 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
@@ -6,7 +6,6 @@
       row-key="id"
       style="width: 1050px; max-height: 70vh; overflow-y: auto"
       v-if="tableData.length > 0 && dialogTableVisible == true"
-      @expand-change="expandChange"
     >
       <el-table-column type="expand" width="50">
         <template #default="scope">
@@ -170,12 +169,16 @@ const intData = () => {
       row.isTuo = 0 //有托
       // 数量%每箱数量  获取总共几箱
       row.allTuoQty = Math.ceil(parseFloat(row.qty) / parseFloat(row.packQty))
+      
     }
+    expandChange(row)
   })
+  console.log(tableData.value)
 }
 const expandChange = (row: any, expandedRows: any[]) => {
   // 判断托信息是否存在
   if (row.secondPackUnit && row.secondPackQty) {
+    console.log(222,row)
     // 数量除以托数量获取余数
     row.lastNumber = parseFloat(row.qty) % parseFloat(row.secondPackQty)
     // 托数量/箱数量  一托可以放几箱
@@ -194,6 +197,7 @@ const expandChange = (row: any, expandedRows: any[]) => {
         qtyOne: '',
        isTuo : 1 //有托
       }
+      console.log(222,row)
       // 如果有余数
       if (row.lastNumber) {
         // 最后一条信息直接展示余数的信息

From 78f67bbfac045e27f14f10ae591a28fa314a72dc Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 9 Jul 2024 19:58:53 +0800
Subject: [PATCH 63/84] =?UTF-8?q?=E7=94=9F=E6=88=90=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=BC=B9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliver/supplierdeliverRequestMain/index.vue    | 6 ++++--
 .../supplierdeliverRequestMain/labelForm.vue                | 5 +++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 0a3bff66d..1a82e289a 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -1023,6 +1023,7 @@ const submitFormLabel = async (data) => {
     
     console.log(data1)
     await message.confirm(t('ts.是否为此数据生成标签？'))
+    labelFormRef.value.isLoading = true
     await SupplierdeliverRequestMainApi.genLabel(data1)
     isCreateLabel.value = true
     message.success(t('ts.创建标签成功'))
@@ -1031,8 +1032,9 @@ const submitFormLabel = async (data) => {
     formLabelRef.value.formLoading = false
     formLabelRef.value.dialogVisible = false
     labelFormRef.value.formLoading = false
-    labelFormRef.value.dialogVisible = false
-
+    labelFormRef.value.dialogTableVisible = false
+    labelFormRef.value.isLoading = false
+    
   }
 }
 const clearInput = async (field, row, index) => {
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
index ce6f5bb86..71dd6a519 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
@@ -6,6 +6,7 @@
       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">
@@ -150,6 +151,7 @@ const dialogTableVisible = ref(false)
 const defaultExpandAll = ref(false)
 
 const tableData = ref([])
+const isLoading = ref(false)
 const openLabel = (tableList) => {
   dialogTableVisible.value = true
   tableData.value = tableList
@@ -317,7 +319,6 @@ const submitForm = () => {
     return
   }
   console.log(343546568678)
- 
   emit('submitForm', tableData.value)
 }
 // 添加托
@@ -467,7 +468,7 @@ const blurThree = (oneRow, twoRow) => {
 }
 // 传递给父类
 const emit = defineEmits(['submitForm'])
-defineExpose({ openLabel }) // 提供 open 方法，用于打开弹窗
+defineExpose({ openLabel,dialogTableVisible,isLoading }) // 提供 open 方法，用于打开弹窗
 </script>
 <style lang="scss" scoped>
 ::v-deep .row-expand-cover td .el-table__expand-icon {

From a98e7ea911bc55f1435328b89ea8267afc04d1de Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 9 Jul 2024 19:59:34 +0800
Subject: [PATCH 64/84] =?UTF-8?q?=E5=8E=BB=E6=8E=89console?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliverRequestMain/labelForm.vue              | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
index 71dd6a519..fc932ffca 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
@@ -175,12 +175,10 @@ const intData = () => {
     }
     expandChange(row)
   })
-  console.log(tableData.value)
 }
 const expandChange = (row: any, expandedRows: any[]) => {
   // 判断托信息是否存在
   if (row.secondPackUnit && row.secondPackQty) {
-    console.log(222,row)
     // 数量除以托数量获取余数
     row.lastNumber = parseFloat(row.qty) % parseFloat(row.secondPackQty)
     // 托数量/箱数量  一托可以放几箱
@@ -199,7 +197,6 @@ const expandChange = (row: any, expandedRows: any[]) => {
         qtyOne: '',
        isTuo : 1 //有托
       }
-      console.log(222,row)
       // 如果有余数
       if (row.lastNumber) {
         // 最后一条信息直接展示余数的信息
@@ -302,7 +299,6 @@ const submitForm = () => {
   let arr = tableData.value.map((item) => {
     item.allNumber = 0
     // 判断托信息是否存在
-    console.log(item.packageList)
     item.packageList.forEach((cur) => {
       item.allNumber += parseFloat(cur.qtyOne) || 0
     })
@@ -312,13 +308,11 @@ const submitForm = () => {
       return false
     }
   })
-  console.log(3434, arr)
   const isBol = arr.some((item) => item == false)
   if (isBol) {
     message.warning('当前添加的数量与总数量不一致')
     return
   }
-  console.log(343546568678)
   emit('submitForm', tableData.value)
 }
 // 添加托
@@ -446,8 +440,6 @@ const blurOne = (oneRow, twoRow) => {
 }
 //在托下方的箱数量失去焦点
 const blurTwo = (oneRow, twoRow, threeRow) => {
-  console.log(parseFloat(threeRow.qtyTwo))
-  console.log(parseFloat(oneRow.packQty))
   if (parseFloat(threeRow.qtyTwo) > parseFloat(oneRow.packQty)) {
     message.warning('数量最多为' + oneRow.packQty)
     threeRow.qtyTwo = oneRow.packQty

From f8fe72122d8e8997ebd39626a99892441196edcc Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Wed, 10 Jul 2024 08:48:09 +0800
Subject: [PATCH 65/84] =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demandforecastingMain/demandforecastingMain.data.ts         | 2 +-
 .../demandforecastingSupplierMain/demandforecastingMain.data.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
index 6c88ba60e..052e130e1 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
@@ -210,7 +210,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
         multiple: true,
         enterSearch: true,
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择版本号', // 输入框占位文本
         searchField: 'detailVersion', // 查询弹窗赋值字段
         searchTitle: '版本号', // 查询弹窗标题
         searchAllSchemas: Version.allSchemas, // 查询弹窗所需类
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts
index 2ae6c3e90..703645466 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts
@@ -122,7 +122,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
         multiple: true,
         enterSearch: true,
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择版本号', // 输入框占位文本
         searchField: 'detailVersion', // 查询弹窗赋值字段
         searchTitle: '版本号', // 查询弹窗标题
         searchAllSchemas: Version.allSchemas, // 查询弹窗所需类

From 3c09f472f7a9947af857525b6fa25052a6a6f53d Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Wed, 10 Jul 2024 10:19:41 +0800
Subject: [PATCH 66/84] =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86-=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Search/src/Search.vue          |  7 +++++--
 .../demandforecastingMain.data.ts             | 21 ++++++++++++++-----
 .../demandforecastingMain/index.vue           | 20 ++++++++++++++++--
 .../demandforecastingMain.data.ts             |  4 ++--
 4 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/src/components/Search/src/Search.vue b/src/components/Search/src/Search.vue
index 5c1af8f17..e83c3f215 100644
--- a/src/components/Search/src/Search.vue
+++ b/src/components/Search/src/Search.vue
@@ -60,7 +60,7 @@ const props = defineProps({
   }
 })
 
-const emit = defineEmits(['search', 'reset','onInput','searchTableSuccess'])
+const emit = defineEmits(['search', 'reset','onInput','onChange','searchTableSuccess'])
 
 const visible = ref(true)
 
@@ -108,7 +108,9 @@ 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,
@@ -282,6 +284,7 @@ defineExpose({setFormValues}) // 提供 open 方法，用于打开弹窗
       @register="register"
       @onInput="onInput"
       @opensearchTable="opensearchTable"
+      @onChange="onChange"
     >
       <template #action>
         <div v-if="layout === 'inline'">
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
index 052e130e1..474482084 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
@@ -1,8 +1,9 @@
 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";
@@ -13,14 +14,22 @@ import * as DemandforecastingMainApi from '@/api/wms/demandforecastingMain'
 import * as DemandforecastingDetailApi from '@/api/wms/demandforecastingDetail'
 
 const { t } = useI18n() // 国际化
-const planerList = await DemandforecastingMainApi.queryUserPlanerList()
+let planerList = await DemandforecastingMainApi.queryUserPlanerList()
+if(planerList.length>0){
+  planerList.unshift({
+    planerId:'',
+    planerNickname:'全选',
+    planerUsername:'全选'
+  })
+}
 console.log('planerList',planerList)
 
 /**
  * @returns {Array} 要货预测主表
  */
+Supplieritem.allSchemas.searchSchema = Supplieritem.allSchemas.searchSchema.filter(item=>item.field!="allowOverShipment")
 
-export const Supplier = useCrudSchemas(reactive<CrudSchema[]>([
+export const Supplier1 = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '用户名称',
     field: 'userName',
@@ -101,10 +110,12 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch:true,
     search:{
       component:'Select',
-      value:planerList.length>0?[planerList[0]['planerId']]:[],
+      value:planerList.length>1?[planerList[1]['planerId']]:[],
       componentProps: {
         showAll:true,// 备用做全选
         multiple:true,
+        emptyValues:[null, undefined],
+        valueOnClear:null,
         options:planerList.map(item=>({
           label:item.planerUsername,
           value:item.planerId
@@ -129,7 +140,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
         searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
         searchField: 'supplierCode', // 查询弹窗赋值字段
         searchTitle: '供应商信息', // 查询弹窗标题
-        searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
+        searchAllSchemas: Supplier1.allSchemas, // 查询弹窗所需类
         searchPage: DemandforecastingMainApi.querySupplierList, // 查询弹窗所需分页方法
         searchCondition: [{
           key: 'planers',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
index 83c4eb7d5..5f21e7394 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :showSearchTableQueryFields="['supplierCode','itemCode']" :hiddenFilterBtnFields="['supplierCode','itemCode']" :schema="DemandforecastingMain.allSchemas.searchSchema" @search="searchClick" @reset="searchClick" @searchTableSuccess="searchQueryTableSuccess"/>
+    <Search ref="seachRef" :showSearchTableQueryFields="['supplierCode','itemCode']" :hiddenFilterBtnFields="['supplierCode','itemCode']" :schema="DemandforecastingMain.allSchemas.searchSchema" @search="searchClick" @reset="searchClick" @searchTableSuccess="searchQueryTableSuccess" @onChange="onSearchChange"/>
   </ContentWrap>
 
   <!-- 列表头部 -->
@@ -151,7 +151,23 @@ const buttonBaseClick = async (val, item) => {
 }
 
 
-
+const seachRef = ref()
+const onSearchChange = (field, value)=>{
+  if(field=='planerId'){
+    if(value.length>0){
+      if(value[value.length-1]==''){
+        //全选
+        seachRef.value.setFormValues({
+          planerId:['']
+        })
+      }else{
+        seachRef.value.setFormValues({
+          planerId:value.filter(item=>item!='')
+        })
+      }
+    }
+  }
+}
 const searchClick = async (data)=>{
   console.log('searchClick',data)
   await setSearchParamsHead(data)
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts
index 703645466..c1a3a17cf 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts
@@ -1,7 +1,7 @@
 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 { 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'
@@ -17,7 +17,7 @@ const { t } = useI18n() // 国际化
 /**
  * @returns {Array} 要货预测主表
  */
-
+Supplieritem.allSchemas.searchSchema = Supplieritem.allSchemas.searchSchema.filter(item=>item.field!="allowOverShipment")
 export const Version = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '供应商代码',

From 5e349c4f6abb5fbc0dcd935d2e6e18f069eeb82a Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Wed, 10 Jul 2024 10:43:27 +0800
Subject: [PATCH 67/84] =?UTF-8?q?=E4=B8=89=E4=B8=AA=E6=9C=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demandforecastingMain.data.ts                    |  3 ++-
 .../demandforecastingMain.data.ts                    |  3 ++-
 .../demandforecastingSupplierMain/index.vue          | 12 +++++++++---
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
index 474482084..5fe1b92eb 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
@@ -12,6 +12,7 @@ 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 = await DemandforecastingMainApi.queryUserPlanerList()
@@ -258,8 +259,8 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
     isTable:false,
     isForm: false,
     search: {
-      value:[],
       component: 'DatePicker',
+      value: [dayjs(),  dayjs().subtract(-3,'month')],
       componentProps: {
         valueFormat: 'YYYY-MM-DD',
         type: 'daterange',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts
index c1a3a17cf..b094557b3 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts
@@ -11,6 +11,7 @@ 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() // 国际化
 
@@ -159,7 +160,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
     isTable:false,
     isForm: false,
     search: {
-      value:[],
+      value: [dayjs(),  dayjs().subtract(-3,'month')],
       component: 'DatePicker',
       componentProps: {
         valueFormat: 'YYYY-MM-DD',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue
index 556415855..726a18a00 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue
@@ -229,6 +229,10 @@ const getSelectionRows = (currentPage,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)
@@ -237,17 +241,19 @@ const readHandle = (row,isAll)=>{
     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)'
   })
-  if(selectionRows.value==0){
-    return
-  }
   DemandforecastingMainApi.updateIsRead({isReadMainIds:rows.join(',')}).then(res => {
     console.log('res',res);
     getLoading?.close()

From 2e5c8bcbaaca21c2389b3d35dcce70c3c40873cf Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 10 Jul 2024 10:43:50 +0800
Subject: [PATCH 68/84] =?UTF-8?q?=E7=94=9F=E6=88=90=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TableForm/src/TableForm.vue    |  21 ++-
 .../supplierdeliverRequestMain/index.vue      |  45 ++----
 .../supplierdeliverRequestMain/labelForm.vue  | 145 +++++++++--------
 .../supplierdeliverRequestMain.data.ts        | 148 +++---------------
 4 files changed, 130 insertions(+), 229 deletions(-)

diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue
index 5e952d597..c08408bc6 100644
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@@ -168,9 +168,9 @@
             >
               <el-option
                 v-for="op in initSelectOptions(headerItem,row)"
-                :label="t(`ts.${op.label}`).replace('ts.', '')"
-                :value="op.value"
-                :key="op.value"
+                :label="t(`ts.${initLabel(headerItem,op)}`).replace('ts.', '')"
+                :value="initValue(headerItem,op)"
+                :key="initValue(headerItem,op)"
               />
             </el-select>
           </el-form-item>
@@ -699,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,
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 1a82e289a..0f05b902d 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -601,11 +601,7 @@ const buttonTableClick = async (val, row) => {
       detatableData1.value = res
       detatableData1.value.forEach((item) => {
         console.log(item.boxPackaging)
-        if (item.boxPackaging?.length > 0) {
-          item.packUnitInitOptions = item.boxPackaging.map((cur) => {
-            return { label: cur.packName, value: cur.packUnit }
-          })
-        }
+        item.packUnitInitOptions = item.boxPackaging
       })
     })
     formLabelRef.value.open('create', row, null, 'createLabel') //创建标签页面 createLabel 标题
@@ -676,7 +672,6 @@ const footButtonClick = async (val) => {
   }
 }
 // 选择箱规格 拖规格
-let tuoList = []
 const formSelectChangeLabel = (field, val, row) => {
   if (field == 'packUnit') {
     let obj = row.boxPackaging.find((item) => item.packUnit == val)
@@ -693,15 +688,12 @@ const formSelectChangeLabel = (field, val, row) => {
       packUnit: row.packUnit
     }
     SupplierdeliverRequestDetailApi.getGenerateLabelParentList(params1).then((res) => {
-      tuoList = res
-      row.secondPackUnitInitOptions = res.map((cur) => {
-        return { label: cur.packName, value: cur.packUnit }
-      })
+      row.secondPackUnitInitOptions  = res
     })
   }
   // 设置托
   if (field == 'secondPackUnit') {
-    let obj = tuoList.find((item) => item.packUnit == val)
+    let obj = row.secondPackUnitInitOptions.find((item) => item.packUnit == val)
     if (obj) {
       row.secondPackQty = obj.packQty
     } else {
@@ -996,35 +988,16 @@ detatableData.pageSize = 500
 const { getList: getDetailList } = detatableMethods
 
 // 生成标签按钮操作
-const submitFormLabel = async (data) => {
+const submitFormLabel = async (list) => {
   try {
-    const data1 = {
-      subList: JSON.parse(JSON.stringify(data))
-    }
-    data1.subList.forEach((row) => {
-      if (row.secondPackUnit && row.secondPackQty) {
-      } else {
-        row.children = []
-        let obj = {}
-        row.packageList.forEach((item) => {
-          obj = {
-            xPoNumber: item.xPoNumber,
-            qtyTwo: item.qtyOne
-          }
-          row.children.push(obj)
-        })
-        row.packageList = []
-        row.packageList.push({
-          isTuo: 0,
-          children: row.children
-        })
-      }
-    })
     
-    console.log(data1)
+   let data = {
+    subList:list
+   }
+    console.log(data)
     await message.confirm(t('ts.是否为此数据生成标签？'))
     labelFormRef.value.isLoading = true
-    await SupplierdeliverRequestMainApi.genLabel(data1)
+    await SupplierdeliverRequestMainApi.genLabel(data)
     isCreateLabel.value = true
     message.success(t('ts.创建标签成功'))
     getList()
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
index fc932ffca..337596fe2 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
@@ -6,7 +6,7 @@
       row-key="id"
       style="width: 1050px; max-height: 70vh; overflow-y: auto"
       v-if="tableData.length > 0 && dialogTableVisible == true"
-      v-loading='isLoading'
+      v-loading="isLoading"
     >
       <el-table-column type="expand" width="50">
         <template #default="scope">
@@ -91,29 +91,37 @@
             </el-table>
           </div>
           <div style="margin-left: 550px; margin-top: -8px; margin-bottom: -8px" v-else>
-            <el-table :data="scope.row.packageList" 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.qtyOne" @blur="blurThree(scope.row, 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)"
-                    >添加箱</el-button
-                  >
-                </template>
-                <template #default="scope1">
-                  <el-button
-                    type="warning"
-                    link
-                    @click="removeX(scope.row, scope.$index, scope1.row, scope1.$index)"
-                    >移出</el-button
-                  >
-                </template>
-              </el-table-column>
-            </el-table>
+            <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>
@@ -164,14 +172,11 @@ const twoId = ref(0) //每箱的id
 const intData = () => {
   tableData.value.forEach((row) => {
     if (row.secondPackUnit && row.secondPackQty) {
-      row.isTuo = 1 //有托
       // 数量%托数量  获取总共几托
       row.allTuoQty = Math.ceil(parseFloat(row.qty) / parseFloat(row.secondPackQty))
     } else {
-      row.isTuo = 0 //有托
       // 数量%每箱数量  获取总共几箱
       row.allTuoQty = Math.ceil(parseFloat(row.qty) / parseFloat(row.packQty))
-      
     }
     expandChange(row)
   })
@@ -195,7 +200,7 @@ const expandChange = (row: any, expandedRows: any[]) => {
         tPoNumber: i + 1,
         xNumber: '',
         qtyOne: '',
-       isTuo : 1 //有托
+        isTuo: 1 //有托
       }
       // 如果有余数
       if (row.lastNumber) {
@@ -221,35 +226,33 @@ const expandChange = (row: any, expandedRows: any[]) => {
         // 数量除以箱数量获取余数
         cur.xLastNumber = parseFloat(cur.qtyOne) % parseFloat(row.packQty)
         // cur.xiangNumber = Math.ceil(parseFloat(cur.qtyOne) / parseFloat(item.secondPackQty))
-        for (let i = 0; i < cur.xNumber; i++) {
+        for (let j = 0; j < cur.xNumber; j++) {
           twoId.value++
-          cur.children[i] = {
+          cur.children[j] = {
             id: twoId.value,
-            xPoNumber: i + 1
+            xPoNumber: j + 1
           }
           // 如果有余数
           if (cur.xLastNumber) {
             // 最后一条信息直接展示余数的信息
-            if (i == cur.xNumber - 1) {
-              cur.children[i].qtyTwo = cur.xLastNumber
+            if (j == cur.xNumber - 1) {
+              cur.children[j].qtyTwo = cur.xLastNumber
             } else {
               // 其他数据展示一托的全部箱数和全部数量
-              cur.children[i].qtyTwo = row.packQty
+              cur.children[j].qtyTwo = row.packQty
             }
           } else {
             // 如果沒有余数,直接展示一托的全部箱数和全部数量
-            cur.children[i].qtyTwo = row.packQty
+            cur.children[j].qtyTwo = row.packQty
           }
         }
       })
     }
   } else {
-    row.isTuo = 0 //有托
-    // 数量除以箱数量获取余数
-    row.lastNumber = parseFloat(row.qty) % parseFloat(row.packQty)
     // 数量%每箱数量  获取总共几箱
-    row.allTuoQty = Math.ceil(parseFloat(row.qty) / parseFloat(row.packQty))
+    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++
@@ -257,22 +260,35 @@ const expandChange = (row: any, expandedRows: any[]) => {
       row.packageList[i] = {
         id: oneId.value,
         xPoNumber: i + 1,
-        qtyOne: ''
+        qtyOne: row.qty,
+        isTuo: 0 //无托
       }
-      // 如果有余数
-      if (row.lastNumber) {
-        // 最后一条信息直接展示余数的信息
-        if (i == row.allTuoQty - 1) {
-          row.packageList[i].qtyOne = row.lastNumber
+    }
+    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 {
-          // 其他数据展示一托的全部箱数和全部数量
-          row.packageList[i].qtyOne = row.packQty
+          // 如果沒有余数,直接展示一托的全部箱数和全部数量
+          cur.children[j].qtyTwo = row.packQty
         }
-      } else {
-        // 如果沒有余数,直接展示一托的全部箱数和全部数量
-        row.packageList[i].qtyOne = row.packQty
       }
-    }
+    })
   }
 }
 
@@ -347,12 +363,12 @@ const addX = (oneRow, oneIndex, twoRow, twoIndex, type) => {
     twoRow.xNumber = twoRow.children.length
   } else {
     // 直接添加箱
-    oneRow.packageList.push({
-      id: oneId.value,
-      xPoNumber: oneRow.packageList[oneRow.packageList.length - 1].xPoNumber + 1,
-      qtyOne: ''
+    twoRow.children.push({
+      id: twoId.value,
+      xPoNumber: twoRow.children[twoRow.children.length - 1].xPoNumber + 1,
+      qtyTwo: ''
     })
-    oneRow.allTuoQty = oneRow.packageList.length
+    oneRow.allTuoQty = twoRow.children.length
   }
 }
 // 移除箱
@@ -368,8 +384,8 @@ const removeX = (oneRow, oneIndex, twoRow, twoIndex, threeRow, threeIndex, type)
     twoRow.qtyOne = num
     twoRow.xNumber = twoRow.children.length
   } else {
-    oneRow.packageList.splice(twoIndex, 1)
-    oneRow.allTuoQty = oneRow.packageList.length
+    twoRow.children.splice(twoIndex, 1)
+    oneRow.allTuoQty = twoRow.children.length
   }
 }
 // 是否显示展开图标
@@ -452,15 +468,20 @@ const blurTwo = (oneRow, twoRow, threeRow) => {
   twoRow.qtyOne = num
 }
 // 箱数量失去焦点
-const blurThree = (oneRow, twoRow) => {
-  if (parseFloat(twoRow.qtyOne) > parseFloat(oneRow.packQty)) {
+const blurThree = (oneRow, twoRow, thereeRow) => {
+  if (parseFloat(thereeRow.qtyTwo) > parseFloat(oneRow.packQty)) {
     message.warning('每箱个数最多' + oneRow.packQty)
-    twoRow.qtyOne = 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 方法，用于打开弹窗
+defineExpose({ openLabel, dialogTableVisible, isLoading }) // 提供 open 方法，用于打开弹窗
 </script>
 <style lang="scss" scoped>
 ::v-deep .row-expand-cover td .el-table__expand-icon {
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index 0d512d215..ee175ec8c 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -1487,77 +1487,23 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     }
   },
   {
-    label: '包装规格1',
+    label: '箱规格',
     field: 'packUnit',
     isTable: true,
     sort: 'custom',
-    table: {
-      width: 150,
-      componentProps: {
-        disabled: true,
-        isSearchList: true,
-        searchListPlaceholder: '请选择包装',
-        searchField: 'packUnit',
-        searchTitle: '物品包装信息',
-        searchAllSchemas: Itempackaging.allSchemas,
-        searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
-        searchCondition: [
-          {
-            key: 'itemCode',
-            value: 'itemCode',
-            message: '请选择订单行',
-            isMainValue: true
-          },
-          {
-            key: 'available',
-            value: 'TRUE',
-            isMainValue: false
-          }
-        ]
-
-      }
-    },
-    tableForm: {
-      disabled: true,
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择包装',
-      searchField: 'itemCode',
-      searchTitle: '物品包装信息',
-      searchAllSchemas: Itempackaging.allSchemas,
-      searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
-      searchCondition: [
-        {
-          key: 'itemCode',
-          value: 'itemCode',
-          message: '请选择订单行',
-          isTableRowValue: true, 
-          isMainValue:false
-        },
-        {
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
-    }
-  },
-  {
-    label: '包装名称1',
-    field: 'packName',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
     form: {
-      componentProps: {
-        disabled: true
-      }
     },
     tableForm: {
-      disabled: true
+      type: 'Select',
+      labelField: 'packName',
+      valueField: 'packUnit',
+      initOptions: [{
+        label: '',
+        value: ''
+      }]
     }
-  },
-  {
-    label: '物料数量1',
+  },{
+    label: '箱规格数量',
     field: 'packQty',
     sort: 'custom',
     table: {
@@ -1568,81 +1514,28 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
       }
     },
     tableForm: {
+      disabled:true
     }
   },
   {
-    label: '包装规格2',
+    label: '托规格',
     field: 'secondPackUnit',
     isTable: true,
     sort: 'custom',
-    table: {
-      width: 150,
-      componentProps: {
-        disabled: true,
-        isSearchList: true,
-        searchListPlaceholder: '请选择包装',
-        searchField: 'packUnit',
-        searchTitle: '物品包装信息',
-        searchAllSchemas: Itempackaging.allSchemas,
-        searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
-        searchCondition: [
-          {
-            key: 'itemCode',
-            value: 'itemCode',
-            message: '请选择订单行',
-            isMainValue: true
-          },
-          {
-            key: 'available',
-            value: 'TRUE',
-            isMainValue: false
-          }
-        ]
-
-      }
-    },
-    tableForm: {
-      clearable: true,
-      disabled: true,
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择包装',
-      searchField: 'packUnit',
-      searchTitle: '物品包装信息',
-      searchAllSchemas: Itempackaging.allSchemas,
-      searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
-      searchCondition: [
-        {
-          key: 'itemCode',
-          value: 'itemCode',
-          message: '请选择订单行',
-          isTableRowValue: true, 
-          isMainValue:false
-        },
-        {
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
-    }
-  },
-  {
-    label: '包装名称2',
-    field: 'secondPackName',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
     form: {
-      componentProps: {
-        disabled: true
-      }
     },
     tableForm: {
-      disabled: true
+      type: 'Select',
+      labelField: 'packName',
+      valueField: 'packUnit',
+      initOptions: [{
+        label: '',
+        value: ''
+      }]
     }
   },
   {
-    label: '物料数量2',
+    label: '托规格数量',
     field: 'secondPackQty',
     sort: 'custom',
     table: {
@@ -1653,6 +1546,7 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
       }
     },
     tableForm: {
+      disabled:true
     }
   },
   {

From 74f36ceccad90e00ab49dba6f844e3ffbf4f4d60 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 10 Jul 2024 10:52:30 +0800
Subject: [PATCH 69/84] =?UTF-8?q?=E7=94=9F=E6=88=90=E6=A0=87=E7=AD=BEbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliverRequestMain/labelForm.vue              | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
index 337596fe2..b25277d6f 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
@@ -336,7 +336,7 @@ const addT = (oneRow) => {
   oneId.value++
   oneRow.packageList.push({
     id: oneId.value,
-    tPoNumber: (oneRow.packageList[oneRow.packageList.length - 1]?.tPoNumber || 0) + 1, //行号是上一行的行号加1
+    tPoNumber: oneRow?.packageList?.length>0?oneRow.packageList[oneRow.packageList.length - 1]?.tPoNumber  + 1 :1, //行号是上一行的行号加1
     xNumber: '',
     qtyOne: ''
   })
@@ -355,9 +355,7 @@ const addX = (oneRow, oneIndex, twoRow, twoIndex, type) => {
     // 在托下添加箱
     twoRow.children.push({
       id: twoId.value,
-      xPoNumber: twoRow?.children[twoRow.children.length - 1]?.xPoNumber
-        ? twoRow?.children[twoRow.children.length - 1]?.xPoNumber
-        : 0 + 1,
+      xPoNumber: twoRow?.children?.length>0? twoRow?.children[twoRow.children.length - 1]?.xPoNumber + 1 :1,
       qtyOne: ''
     })
     twoRow.xNumber = twoRow.children.length
@@ -365,7 +363,7 @@ const addX = (oneRow, oneIndex, twoRow, twoIndex, type) => {
     // 直接添加箱
     twoRow.children.push({
       id: twoId.value,
-      xPoNumber: twoRow.children[twoRow.children.length - 1].xPoNumber + 1,
+      xPoNumber:twoRow.children.length>0? twoRow.children[twoRow.children.length - 1].xPoNumber + 1:1,
       qtyTwo: ''
     })
     oneRow.allTuoQty = twoRow.children.length

From 41253b0ce996f4eaa4fd899d3a55732c4a2aa2fa Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 10 Jul 2024 14:06:35 +0800
Subject: [PATCH 70/84] =?UTF-8?q?=E5=8C=85=E8=A3=85=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicDataManage/itemManage/itempackage/itempackage.data.ts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts
index 04e2537e2..2d8126c1d 100644
--- a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts
+++ b/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: {

From b56ad07f7e9861f93fc46c9486b6b3b50b1bd1f9 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Wed, 10 Jul 2024 14:23:59 +0800
Subject: [PATCH 71/84] =?UTF-8?q?=E9=9A=90=E8=97=8F=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliver/demandforecastingMain/index.vue             | 2 +-
 .../supplierdeliver/demandforecastingSupplierMain/index.vue     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
index 5f21e7394..a1d9979bc 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search ref="seachRef" :showSearchTableQueryFields="['supplierCode','itemCode']" :hiddenFilterBtnFields="['supplierCode','itemCode']" :schema="DemandforecastingMain.allSchemas.searchSchema" @search="searchClick" @reset="searchClick" @searchTableSuccess="searchQueryTableSuccess" @onChange="onSearchChange"/>
+    <Search ref="seachRef" :showSearchTableQueryFields="['supplierCode','itemCode','version']" :hiddenFilterBtnFields="['supplierCode','itemCode','version']" :schema="DemandforecastingMain.allSchemas.searchSchema" @search="searchClick" @reset="searchClick" @searchTableSuccess="searchQueryTableSuccess" @onChange="onSearchChange"/>
   </ContentWrap>
 
   <!-- 列表头部 -->
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue
index 726a18a00..daf81d0e0 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :showSearchTableQueryFields="['supplierCode','itemCode']" :hiddenFilterBtnFields="['supplierCode','itemCode']" :schema="DemandforecastingMain.allSchemas.searchSchema" @search="searchClick" @reset="searchClick" @searchTableSuccess="searchQueryTableSuccess"/>
+    <Search :showSearchTableQueryFields="['supplierCode','itemCode','version']" :hiddenFilterBtnFields="['supplierCode','itemCode','version']" :schema="DemandforecastingMain.allSchemas.searchSchema" @search="searchClick" @reset="searchClick" @searchTableSuccess="searchQueryTableSuccess"/>
   </ContentWrap>
 
   <!-- 列表头部 -->

From 9426617be05832864dbe15ffbc32bc09bd666cec Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Wed, 10 Jul 2024 15:35:26 +0800
Subject: [PATCH 72/84] =?UTF-8?q?=E8=A6=81=E8=B4=A7=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliver/purchasePlanMain/index.vue         |  2 +-
 .../purchasePlanMain/purchasePlanMain.data.ts          |  1 -
 .../supplierdeliverBasicForm.vue                       |  8 ++++----
 .../supplierdeliverRequestMain.data.ts                 | 10 ++++++++++
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index 1456bae42..d38d27177 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@@ -334,7 +334,7 @@ const getSearchTableData = async (number,formField,searchField)=>{
   }
     return [
       defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['2']) }), // 打开
-      defaultButtons.mainListPurchasePlanCloBtn({ hide: isShowMainButton(row, ['1']) }), // 关闭
+      defaultButtons.mainListPurchasePlanCloBtn({ hide: !(row.status==6&&row.type=='SCHEDULE') }), // 关闭
       defaultButtons.mainListPurchasePlanPubBtn({ hide: isShowMainButton(row, ['1']) }), // 发布
       defaultButtons.mainListPurchasePlanAccBtn({ hide: isShowMainButton(row, ['3']) }), // 接受
       defaultButtons.mainListPurchasePlanRejBtn({ hide: isShowMainButton(row, ['3']) }), // 不接受
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
index ed2b20f14..af0c18ef5 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
@@ -162,7 +162,6 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictClass: 'string',
     isTable: true,
     isForm:true,
-    isSearch: true,
     table: {
       width: 150
     },
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
index 14a656acb..411cde414 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
@@ -103,7 +103,7 @@ const openFormByCreate = async ( data ) => {
     setV['ppNumber'] = data['number'] // 要货单号
     searchPage: SupplierApi.getSupplierPage
     //新增--选择完要货计划，自动展示明细
-    getSearchTableData(data['number'],'ppNumber','number')
+    getSearchTableData(data['number'],'ppNumber','number',0)
 
     // 设置计划到货时间
     let beginTime =  data['endTime']
@@ -234,7 +234,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
         //新增--选择完要货计划，自动展示明细
         
         setV['poNumber'] = val[0]['poNumber'] //采购订单
-        getSearchTableData(val[0]['number'],formField,searchField)
+        getSearchTableData(val[0]['number'],formField,searchField,1)
 
         // 设置计划到货时间
         
@@ -258,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,flag:1},
+    defaultParams:{number,flag:1,isAll},
     getListApi: PurchasePlanDetailApi.getPurchasePlanDetailPage // 分页接口
   })
   tableObject.pageSize = 500
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index ee175ec8c..7f12eb21a 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -642,6 +642,16 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
           key: 'available',
           value: 'TRUE',
           isMainValue: false
+        },
+        {
+          key: 'flag',
+          value: '1',
+          isMainValue: false
+        },
+        {
+          key: 'isAll',
+          value: '1',
+          isMainValue: false
         }]
     }
   },

From 701d92b51ccd29dd8177e5c200d38fd187b25c99 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Wed, 10 Jul 2024 15:46:53 +0800
Subject: [PATCH 73/84] isAll

---
 .../supplierdeliverRequestMain/supplierdeliverBasicForm.vue     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
index 411cde414..7b01aade1 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
@@ -234,7 +234,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
         //新增--选择完要货计划，自动展示明细
         
         setV['poNumber'] = val[0]['poNumber'] //采购订单
-        getSearchTableData(val[0]['number'],formField,searchField,1)
+        getSearchTableData(val[0]['number'],formField,searchField,0)
 
         // 设置计划到货时间
         

From 3a6bca300843bcd050f49ddaa1b37efd78440446 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Wed, 10 Jul 2024 15:55:34 +0800
Subject: [PATCH 74/84] bug

---
 .../supplierdeliver/demandforecastingSupplierMain/index.vue   | 2 +-
 .../supplierdeliver/purchasePlanMain/index.vue                | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue
index daf81d0e0..9e3dea6c8 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue
@@ -30,7 +30,7 @@
       @getSelectionRows="getSelectionRows"
     >
     <template #isRead="{row}" >
-      <el-button v-show="row.isRead!=3" :type="row.isRead==1?'info':'primary'" link  @click="readHandle(row,false)">
+      <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>
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index d38d27177..27a6ed966 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@@ -333,8 +333,8 @@ const getSearchTableData = async (number,formField,searchField)=>{
     return []
   }
     return [
-      defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['2']) }), // 打开
-      defaultButtons.mainListPurchasePlanCloBtn({ hide: !(row.status==6&&row.type=='SCHEDULE') }), // 关闭
+      // defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['2']) }), // 打开
+      defaultButtons.mainListPurchasePlanCloBtn({ hide: !(row.status!=6&&row.type=='SCHEDULE') }), // 关闭
       defaultButtons.mainListPurchasePlanPubBtn({ hide: isShowMainButton(row, ['1']) }), // 发布
       defaultButtons.mainListPurchasePlanAccBtn({ hide: isShowMainButton(row, ['3']) }), // 接受
       defaultButtons.mainListPurchasePlanRejBtn({ hide: isShowMainButton(row, ['3']) }), // 不接受

From 1cfb7bf3b8fed8869c3a63edbf366b8803e10bd1 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Wed, 10 Jul 2024 16:30:42 +0800
Subject: [PATCH 75/84] =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=A4=9A=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/purchasePlanDetail/index.ts       | 11 ++++++++++
 .../purchasePlanMain/index.vue                | 21 ++++++++++++++++---
 .../purchasePlanMain/purchasePlanMain.data.ts |  6 ++++++
 3 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/src/api/wms/purchasePlanDetail/index.ts b/src/api/wms/purchasePlanDetail/index.ts
index 3da2f8973..a436ab74a 100644
--- a/src/api/wms/purchasePlanDetail/index.ts
+++ b/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 })
   }
 }
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index 27a6ed966..96da73c97 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/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" @searchTableSuccess="searchQueryTableSuccess"/>
+    <Search ref="seachRef" :schema="[...PurchasePlanMain.allSchemas.searchSchema,...PurchasePlanDetail.allSchemas.searchSchema]" @search="searchList" @reset="searchList" @searchTableSuccess="searchQueryTableSuccess" @onChange="onSearchChange"/>
   </ContentWrap>
 
   <!-- 列表头部 -->
@@ -115,8 +115,23 @@
   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(() => {
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
index af0c18ef5..b77397b3b 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
@@ -292,6 +292,12 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     sortTableDefault:13,
     sortSearchDefault:6,
+    search:{
+      value:[],
+      componentProps: {
+        multiple:true
+      }
+    },
     form: {
       value: '1',
       componentProps: {

From ad050d5e99b88e4e273c8cab49c70d6a32a9de54 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Wed, 10 Jul 2024 16:40:11 +0800
Subject: [PATCH 76/84] row.status!=2

---
 .../supplierdeliver/purchasePlanMain/index.vue                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index 96da73c97..67f401792 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@@ -349,7 +349,7 @@ const getSearchTableData = async (number,formField,searchField)=>{
   }
     return [
       // defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['2']) }), // 打开
-      defaultButtons.mainListPurchasePlanCloBtn({ hide: !(row.status!=6&&row.type=='SCHEDULE') }), // 关闭
+      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']) }), // 不接受

From afd292db91c87f0955434c47cb989824764427fb Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 10 Jul 2024 19:33:13 +0800
Subject: [PATCH 77/84] =?UTF-8?q?=E7=94=9F=E6=88=90=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=98=BE=E7=A4=BA=E7=AE=B1=E8=A7=84=E6=A0=BC?=
 =?UTF-8?q?=EF=BC=8C=E5=88=86=E9=A1=B5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicForm.vue    |  7 +-
 src/components/TableForm/src/TableForm.vue    |  8 +-
 .../supplierdeliverRequestMain/index.vue      | 90 ++++++++++---------
 .../supplierdeliverRequestMain/labelForm.vue  | 40 +++++++--
 4 files changed, 93 insertions(+), 52 deletions(-)

diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 13c1698d7..c9d62bbca 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/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>
@@ -692,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)
diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue
index c08408bc6..d0bd80109 100644
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@@ -165,6 +165,7 @@
               :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,row)"
@@ -518,7 +519,8 @@ const emit = defineEmits([
   'tableFormSelectOnBlur',
   'formFormDateChange',
   'clearInput',
-  'batchAdd'
+  'batchAdd',
+  'visibleChange'
 ])
 // 获取下拉列表 | type = radio | type = select
 const initSelectOptions = (headerItem,row) => {
@@ -653,7 +655,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 = () => {
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 0f05b902d..28fc1a113 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -154,6 +154,7 @@
     :footButttondata="footButttondata"
     @footButtonClick="footButtonClick"
     @formSelectChange="formSelectChangeLabel"
+    @visibleChange='visibleChange'
   />
   <!-- 上传质量报告 -->
   <BasicForm
@@ -590,20 +591,7 @@ const buttonTableClick = async (val, row) => {
     }
     genLabelId.value = row.masterId
     // await getDetailList()
-    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) => {
-        console.log(item.boxPackaging)
-        item.packUnitInitOptions = item.boxPackaging
-      })
-    })
+    await getGenerateLabelList(row)
     formLabelRef.value.open('create', row, null, 'createLabel') //创建标签页面 createLabel 标题
   } else if (val == 'ressbq') {
     console.log('重新生成标签')
@@ -620,24 +608,7 @@ const buttonTableClick = async (val, row) => {
             }
             genLabelId.value = row.masterId
             // await getDetailList()
-            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) => {
-                  console.log(item.boxPackaging)
-                  if (item.boxPackaging?.length > 0) {
-                    item.packUnitInitOptions = item.boxPackaging.map((cur) => {
-                      return { label: cur.packName, value: cur.packUnit }
-                    })
-                  }
-                })
-              })
+            await  getGenerateLabelList(row)
             formLabelRef.value.open('create', row, null, 'createLabel') //创建标签页面 createLabel 标题
           }
         })
@@ -657,6 +628,27 @@ 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) => {
@@ -665,6 +657,13 @@ const footButtonClick = async (val) => {
     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') {
@@ -682,14 +681,7 @@ const formSelectChangeLabel = (field, val, row) => {
     }
     row.secondPackUnit = ''
     row.secondPackQty = ''
-    // 获取托规格
-    const params1 = {
-      itemCode: row.itemCode,
-      packUnit: row.packUnit
-    }
-    SupplierdeliverRequestDetailApi.getGenerateLabelParentList(params1).then((res) => {
-      row.secondPackUnitInitOptions  = res
-    })
+   
   }
   // 设置托
   if (field == 'secondPackUnit') {
@@ -701,6 +693,24 @@ const formSelectChangeLabel = (field, val, row) => {
     }
   }
 }
+// tableForm下拉框弹出隐藏
+const visibleChange=(field, val, row, index)=>{
+  row.secondPackUnitInitOptions=[]
+  console.log(field, val, row)
+  if(field=='secondPackUnit'){
+    if(val){
+  // 获取托规格
+    const params1 = {
+      itemCode: row.itemCode,
+      packUnit: row.packUnit
+    }
+    SupplierdeliverRequestDetailApi.getGenerateLabelParentList(params1).then((res) => {
+      row.secondPackUnitInitOptions  = res
+    })
+    }
+  }
+
+}
 
 // 获取部门 用于详情 部门回显
 const { wsCache } = useCache()
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
index b25277d6f..d15d37673 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog v-model="dialogTableVisible" title="标签" width="1100">
     <el-table
-      :data="tableData"
+      :data="showTableData()"
       border
       row-key="id"
       style="width: 1050px; max-height: 70vh; overflow-y: auto"
@@ -135,6 +135,16 @@
       <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" />
@@ -157,19 +167,31 @@ const props = defineProps({
 
 const dialogTableVisible = ref(false)
 const defaultExpandAll = ref(false)
-
 const tableData = ref([])
 const isLoading = ref(false)
-const openLabel = (tableList) => {
+const oneId = ref(0) //每托的id
+const twoId = ref(0) //每箱的id
+const openLabel =async (tableList) => {
   dialogTableVisible.value = true
   tableData.value = tableList
   defaultExpandAll.value = false
-  // intData()
-  intData()
+  await intData()
 }
-const oneId = ref(0) //每托的id
-const twoId = ref(0) //每箱的id
-const intData = () => {
+const currentPage = ref(1)
+const pageSize = ref(10)
+const showTableData = () => {
+  console.log(777,tableData.value.length)
+  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) {
       // 数量%托数量  获取总共几托
@@ -178,7 +200,7 @@ const intData = () => {
       // 数量%每箱数量  获取总共几箱
       row.allTuoQty = Math.ceil(parseFloat(row.qty) / parseFloat(row.packQty))
     }
-    expandChange(row)
+   expandChange(row)
   })
 }
 const expandChange = (row: any, expandedRows: any[]) => {

From 7cbc3e9aadbd9ce156c8cea9e40e192abceabbe7 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Wed, 10 Jul 2024 19:37:13 +0800
Subject: [PATCH 78/84] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/demandforecastingDetail/index.ts | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/api/wms/demandforecastingDetail/index.ts b/src/api/wms/demandforecastingDetail/index.ts
index 7940f5cdc..059cc4ce2 100644
--- a/src/api/wms/demandforecastingDetail/index.ts
+++ b/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
@@ -19,10 +21,19 @@ export interface DemandforecastingDetailVO {
 const getPageParams = (params)=>{
   // 到货日期
   if(params.dueDate&&params.dueDate.length>0){
-    params.startDate = params.dueDate[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){
-    params.endDate = params.dueDate[1]
+    if(isString(params.dueDate[1])){
+      params.endDate = params.dueDate[1]
+    }else{
+      params.endDate = params.dueDate[1].format('YYYY-MM-DD')
+    }
   }
   params.dueDate = ''
 

From f9b2994e5d9878d91a0f2f938887db5205888b5e Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 10 Jul 2024 19:47:35 +0800
Subject: [PATCH 79/84] =?UTF-8?q?=E5=8E=BB=E6=8E=89console?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TableForm/src/TableForm.vue                    | 4 ----
 .../supplierdeliver/supplierdeliverRequestMain/index.vue      | 3 ---
 .../supplierdeliver/supplierdeliverRequestMain/labelForm.vue  | 1 -
 3 files changed, 8 deletions(-)

diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue
index d0bd80109..502cd36e1 100644
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@@ -613,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
@@ -671,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')
@@ -684,7 +681,6 @@ const batchAdd = () => {
       field = supplierFields.field
     }
   }
-  console.log(field)
   emit('batchAdd', keyWord.value)
 }
 const disabledInput = (headerItem, row) => {
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 28fc1a113..e6b157d16 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -217,7 +217,6 @@ import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/su
 import supplierdeliverBasicForm from './supplierdeliverBasicForm.vue'
 import labelForm from './labelForm.vue'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
-import { log } from 'console'
 // 供应商发货申请
 defineOptions({ name: 'SupplierdeliverRequestMain' })
 
@@ -696,7 +695,6 @@ const formSelectChangeLabel = (field, val, row) => {
 // tableForm下拉框弹出隐藏
 const visibleChange=(field, val, row, index)=>{
   row.secondPackUnitInitOptions=[]
-  console.log(field, val, row)
   if(field=='secondPackUnit'){
     if(val){
   // 获取托规格
@@ -1004,7 +1002,6 @@ const submitFormLabel = async (list) => {
    let data = {
     subList:list
    }
-    console.log(data)
     await message.confirm(t('ts.是否为此数据生成标签？'))
     labelFormRef.value.isLoading = true
     await SupplierdeliverRequestMainApi.genLabel(data)
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
index d15d37673..65dbdc44a 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
@@ -180,7 +180,6 @@ const openLabel =async (tableList) => {
 const currentPage = ref(1)
 const pageSize = ref(10)
 const showTableData = () => {
-  console.log(777,tableData.value.length)
   if (tableData.value.length > 10) {
     return tableData.value.slice(
       (currentPage.value - 1) * pageSize.value,

From 889dbbcef8f3f498430da7fa72e011ef5bcf21d2 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 11 Jul 2024 08:20:44 +0800
Subject: [PATCH 80/84] =?UTF-8?q?=E5=85=A8=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demandforecastingMain/demandforecastingMain.data.ts     | 2 +-
 .../supplierdeliver/demandforecastingMain/index.vue         | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
index 5fe1b92eb..5e9af683e 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
@@ -18,7 +18,7 @@ const { t } = useI18n() // 国际化
 let planerList = await DemandforecastingMainApi.queryUserPlanerList()
 if(planerList.length>0){
   planerList.unshift({
-    planerId:'',
+    planerId:'ALL',
     planerNickname:'全选',
     planerUsername:'全选'
   })
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
index a1d9979bc..4f0b0c9b6 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
@@ -155,14 +155,14 @@ const seachRef = ref()
 const onSearchChange = (field, value)=>{
   if(field=='planerId'){
     if(value.length>0){
-      if(value[value.length-1]==''){
+      if(value[value.length-1]=='ALL'){
         //全选
         seachRef.value.setFormValues({
-          planerId:['']
+          planerId:['ALL']
         })
       }else{
         seachRef.value.setFormValues({
-          planerId:value.filter(item=>item!='')
+          planerId:value.filter(item=>item!='ALL')
         })
       }
     }

From 475d42e7cc9363428aac86d8b4664d7b1d046176 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 11 Jul 2024 09:02:02 +0800
Subject: [PATCH 81/84] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=BC=BA=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliverRequestMain.data.ts        | 503 +++++++++++-------
 1 file changed, 313 insertions(+), 190 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index 7f12eb21a..672b2ea87 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
+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 getRequestsettingApi from '@/api/wms/requestsetting/index'
@@ -9,7 +9,7 @@ import { validateHanset, validateEmail } from '@/utils/validator'
 import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
 import * as ItemPackageApi from '@/api/wms/itempackage/index'
 
-import { validateInteger } from '@/utils/validator'
+import {validateInteger} from '@/utils/validator'
 const { t } = useI18n() // 国际化
 
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
@@ -21,15 +21,15 @@ const queryParams = {
 const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
 const requestsettingData = data?.list[0] || {}
 
-// 获取当前操作人的部门
+ // 获取当前操作人的部门
 import { useUserStore } from '@/store/modules/user'
 import { TableColumn } from '@/types/table'
 import { tr } from 'element-plus/es/locale'
-const userStore = useUserStore()
-const userDept = userStore.userSelfInfo.dept
-// id 转str 否则form回显匹配不到
-userDept.id = userDept.id.toString()
-const userDeptArray: any = [userDept]
+ const userStore = useUserStore()
+ const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
+ const userDeptArray:any = [userDept] 
 
 /**
  * @returns {Array} 供应商发货申请主表
@@ -556,10 +556,18 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
 
 //表单校验
 export const SupplierdeliverRequestMainRules = reactive({
-  supplierCode: [{ required: true, message: '请输入供应商代码', trigger: 'blur' }],
-  ppNumber: [{ required: true, message: '请输入要货计划单号', trigger: 'blur' }],
-  asnNumber: [{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  contactName: [{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
+  supplierCode: [
+    { required: true, message: '请输入供应商代码', trigger: 'blur' }
+  ],
+  ppNumber: [
+    { required: true, message: '请输入要货计划单号', trigger: 'blur' }
+  ],
+  asnNumber: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  contactName: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
   contactPhone: [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' },
     { validator: validateHanset, message: '请输入正确的手机号', trigger: 'blur' }
@@ -568,20 +576,36 @@ export const SupplierdeliverRequestMainRules = reactive({
     { max: 50, message: '不得超过50个字符', trigger: 'blur' },
     { validator: validateEmail, message: '请输入正确的邮箱地址', trigger: 'blur' }
   ],
-  carrierCode: [{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  transferMode: [{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  vehiclePlateNumber: [{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  remark: [{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  planArriveTime: [{ required: true, message: '请输入计划到货时间', trigger: 'blur' }],
+  carrierCode: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  transferMode: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  vehiclePlateNumber: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  planArriveTime: [
+    { required: true, message: '请输入计划到货时间', trigger: 'blur' }
+  ],
   // departmentCode: [
   //   { required: true, message: '请输入部门', trigger: 'blur' }
   // ],
-  autoCommit: [{ required: true, message: '请选择是否自动提交', trigger: 'change' }],
-  autoAgree: [{ required: true, message: '请选择是否自动通过', trigger: 'change' }],
-  autoExecute: [{ required: true, message: '请选择是否自动执行', trigger: 'change' }],
+  autoCommit: [
+    { required: true, message: '请选择是否自动提交', trigger: 'change' }
+  ],
+  autoAgree: [
+    { required: true, message: '请选择是否自动通过', trigger: 'change' }
+  ],
+  autoExecute: [
+    { required: true, message: '请选择是否自动执行', trigger: 'change' }
+  ],
   directCreateRecord: [
     { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
-  ]
+  ],
   // businessType: [
   //   { required: true, message: '请输入业务类型', trigger: 'blur' }
   // ],
@@ -591,70 +615,7 @@ export const SupplierdeliverRequestMainRules = reactive({
  * @returns {Array} 供应商发货申请子表
  */
 export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '采购订单号',
-    field: 'poNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch:true,
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true,
-        searchListPlaceholder: '请选择订单号',
-        searchField: 'number',
-        searchTitle: '要货计划信息',
-        searchAllSchemas: PurchasePlanDetail.allSchemas,
-        searchPage: PurchasePlanDetailApi.getPurchasePlanDetailPage,
-        searchCondition: [
-          {
-            key: 'number',
-            value: 'ppNumber',
-            message: '请填写要货计划单号！',
-            isMainValue: true
-          },
-          {
-            key: 'available',
-            value: 'TRUE',
-            isMainValue: false
-          }
-
-        ]
-      }
-    },
-    tableForm: {
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择订单号',
-      searchField: 'number',
-      searchTitle: '要货计划信息',
-      searchAllSchemas: PurchasePlanDetail.allSchemas,
-      searchPage: PurchasePlanDetailApi.getPurchasePlanDetailPage,
-      searchCondition: [
-        {
-          key: 'number',
-          value: 'ppNumber',
-          message: '请填写要货计划单号！',
-          isMainValue: true
-        },
-        {
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        },
-        {
-          key: 'flag',
-          value: '1',
-          isMainValue: false
-        },
-        {
-          key: 'isAll',
-          value: '1',
-          isMainValue: false
-        }]
-    }
-  },
+  
   {
     label: '订单行',
     field: 'poLine',
@@ -679,7 +640,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
-    sortTableDefault:2,
+    sortTableDefault:3,
     form: {
       componentProps: {
         disabled: true
@@ -690,26 +651,24 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     }
   },
   {
-    label: '批次',
-    field: 'batch',
+    label: '申请发货数量',
+    field: 'qty',
     sort: 'custom',
     table: {
       width: 150
     },
-    hiddenInMain:true,
-    tableForm: {
-      disabled: true
-    }
-  },
-  {
-    label: '供应商批次',
-    field: 'supplierBatch',
-    sort: 'custom',
-    table: {
-      width: 150
+    sortTableDefault:4,
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
     },
     tableForm: {
-      disabled: false
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
     }
   },
   {
@@ -723,6 +682,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 180
     },
+    sortTableDefault:7,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -738,6 +698,73 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       valueFormat: 'x',
     }
   },
+  {
+    label: '供应商批次',
+    field: 'supplierBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:8,
+    tableForm: {
+      disabled: false
+    }
+  },
+  {
+    label: '发货批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain:true,
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '计划数量',
+    field: 'planQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false,
+    tableForm: {
+      disabled: true,
+      type: 'InputNumber',
+      precision: 6
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    }
+  },
+  {
+    label: '已发货数量',
+    field: 'shippedQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+      type: 'InputNumber',
+      precision: 6
+    },
+    isTable: false,
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    }
+  },
+  
   
   // {
   //   label: '替代批次',
@@ -784,6 +811,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     hiddenInMain:true,
     field: 'expireDate',
     formatter: dateFormatter2,
+    isTableForm:false, 
     detail: {
       dateFormat: 'YYYY-MM-DD'
     },
@@ -810,27 +838,27 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       disabled: true
     }
   },
-  {
-    label: '发货数量',
-    field: 'qty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:2,
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        min: 1,
-        precision: 6
-      }
-    },
-    tableForm: {
-      type: 'InputNumber',
-      min: 1,
-      precision: 6
-    }
-  },
+  // {
+  //   label: '发货数量',
+  //   field: 'qty',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   sortTableDefault:2,
+  //   form: {
+  //     component: 'InputNumber',
+  //     componentProps: {
+  //       min: 1,
+  //       precision: 6
+  //     }
+  //   },
+  //   tableForm: {
+  //     type: 'InputNumber',
+  //     min: 1,
+  //     precision: 6
+  //   }
+  // },
   {
     label: '订单数量',
     field: 'orderQty',
@@ -838,6 +866,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       width: 150
     },
     hiddenInMain:true,
+    isTableForm: false,
     form: {
       component: 'InputNumber',
       componentProps: {
@@ -938,7 +967,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     dictType: DICT_TYPE.UOM,
     dictClass: 'string',
     isTable: true,
-    sortTableDefault:3,
+    sortTableDefault:5,
     table: {
       width: 150
     },
@@ -947,7 +976,83 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       type: 'Select'
     }
   },
-  
+  {
+    label: '采购订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch:true,
+    sortTableDefault:10,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        disabled:true,
+        // isSearchList: true,
+        searchListPlaceholder: '请选择订单号',
+        searchField: 'number',
+        searchTitle: '要货计划信息',
+        searchAllSchemas: PurchasePlanDetail.allSchemas,
+        searchPage: PurchasePlanDetailApi.getPurchasePlanDetailPage,
+        searchCondition: [
+          {
+            key: 'number',
+            value: 'ppNumber',
+            message: '请填写要货计划单号！',
+            isMainValue: true
+          },
+          {
+            key: 'flag',
+            value: 1,
+            isMainValue: false
+          },
+          {
+            key: 'isAll',
+            value: '1',
+            isMainValue: false
+          },  
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+
+        ]
+      }
+    },
+    tableForm: {
+      disabled:true,
+      isInpuFocusShow: false,
+      searchListPlaceholder: '请选择订单号',
+      searchField: 'number',
+      searchTitle: '要货计划信息',
+      searchAllSchemas: PurchasePlanDetail.allSchemas,
+      searchPage: PurchasePlanDetailApi.getPurchasePlanDetailPage,
+      searchCondition: [
+        {
+          key: 'number',
+          value: 'ppNumber',
+          message: '请填写要货计划单号！',
+          isMainValue: true
+        },
+        {
+          key: 'flag',
+          value: 1,
+          isMainValue: false
+        },
+        {
+          key: 'isAll',
+          value: '1',
+          isMainValue: false
+        },  
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+    }
+  },
   {
     label: '从货主代码',
     field: 'fromOwnerCode',
@@ -1088,6 +1193,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     label: '备注',
     field: 'remark',
     sort: 'custom',
+    isTable: false,
     hiddenInMain:true,
     table: {
       width: 150
@@ -1109,15 +1215,15 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
 
 // 批次校验
 const validateBatch = (rule: any, value: any, callback: any) => {
-  const reg = /^[_a-zA-Z0-9]+$/
+  const reg = /^[_a-zA-Z0-9]+$/;
   if (value == '' || value == undefined || value == null) {
-    callback()
+      callback();
   } else {
-    if (!reg.test(value)) {
-      callback(new Error('英文字母、数字或下划线'))
-    } else {
-      callback()
-    }
+      if (!reg.test(value)) {
+          callback(new Error('英文字母、数字或下划线'));
+      } else {
+          callback();
+      }
   }
 }
 
@@ -1135,29 +1241,46 @@ export const SupplierdeliverRequestDetailRules = reactive({
   //   { required: true, message: '请输入包装号', trigger: 'blur' }
   // ],
   qty:[
-    { required: true, message: '请输入发货数量', trigger: 'change' },
+    { required: true, message: '请输入发货数量1', trigger: 'change' },
+    // { validator: validateQty, trigger: 'change' },
   ],
   batch: [
     { required: true, message: '请输入批次', trigger: 'blur' },
     { max: 50, message: '不得超过50个字符', trigger: 'blur' },
     { validator: validateBatch, trigger: 'change' }
   ],
-  produceDate: [{ required: true, message: '请输入生产日期', trigger: 'blur' }],
+  produceDate: [
+    { required: true, message: '请输入生产日期', trigger: 'blur' }
+  ],
   packQty: [
-    { required: true, message: '请输入包装数量', trigger: 'blur' }
-    // { validator: validateInteger, message: '请输入正确的整数', trigger: 'blur' }
+    { required: true, message: '请输入包装数量', trigger: 'blur' },
+    { validator: validateInteger, message: '请输入正确的整数', trigger: 'blur' }
+  ],
+  poNumber: [
+    { required: true, message: '请选择订单号', trigger: 'change' }
+  ],
+  poLine: [
+    { required: true, message: '请选择订单行', trigger: 'change' }
+  ],
+  packUnit: [
+    { required: true, message: '请选择包装规格', trigger: 'change' }
+  ],
+  secondPackUnit: [
+    { required: false, message: '请选择包装规格2', trigger: 'change' }
   ],
-  poNumber: [{ required: true, message: '请选择订单号', trigger: 'change' }],
-  poLine: [{ required: true, message: '请选择订单行', trigger: 'change' }],
-  packUnit: [{ required: true, message: '请选择包装规格', trigger: 'change' }],
-  secondPackUnit: [{ required: false, message: '请选择包装规格2', trigger: 'change' }],
   secondPackQty: [
-    { required: false, message: '请输入包装数量2', trigger: 'blur' }
-    // { validator: validateInteger, message: '请输入正确的整数', trigger: 'blur' }
+    { required: false, message: '请输入包装数量2', trigger: 'blur' },
+    { validator: validateInteger, message: '请输入正确的整数', trigger: 'blur' }
+  ],
+  convertRate: [
+    { required: true, message: '请输入转换率', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
-  convertRate: [{ required: true, message: '请输入转换率', trigger: 'blur' }],
-  itemCode: [{ required: true, message: '请选择物料代码', trigger: 'change' }],
-  remark: [{ max: 50, message: '不得超过50个字符', trigger: 'blur' }]
   // secondPackQty:[{ validator:validateInteger, message: '请输入正确的整数', trigger: 'blur'}]
 })
 
@@ -1505,8 +1628,6 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     },
     tableForm: {
       type: 'Select',
-      labelField: 'packName',
-      valueField: 'packUnit',
       initOptions: [{
         label: '',
         value: ''
@@ -1536,8 +1657,6 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     },
     tableForm: {
       type: 'Select',
-      labelField: 'packName',
-      valueField: 'packUnit',
       initOptions: [{
         label: '',
         value: ''
@@ -1559,6 +1678,7 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
       disabled:true
     }
   },
+ 
   {
     label: '物料名称',
     field: 'itemName',
@@ -1601,47 +1721,50 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
   },
 ]))
 
-export const SupplierdeliverRequestPackage = useCrudSchemas(
-  reactive<CrudSchema[]>([
-    {
-      label: '包装号',
-      field: 'number',
-      sort: 'custom',
-      isSearch: true,
-      table: {
-        fixed: 'left'
-      }
+export const SupplierdeliverRequestPackage = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '包装号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      fixed: 'left'
     },
-    {
-      label: '物料代码',
-      field: 'itemCode',
-      sort: 'custom',
-      isSearch: true,
-      table: {}
-    },
-    {
-      label: '批次',
-      field: 'batch',
-      sort: 'custom',
-      isSearch: true,
-      table: {}
-    },
-    {
-      label: '数量',
-      field: 'qty',
-      sort: 'custom',
-      table: {}
-    },
-    {
-      label: '计量单位',
-      field: 'uom',
-      sort: 'custom',
-      dictType: DICT_TYPE.UOM,
-      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-      form: {
-        component: 'SelectV2'
-      },
-      table: {}
-    }
-  ])
-)
+  },
+{
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+    },
+  },
+{
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    sort: 'custom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    form: {
+      component: 'SelectV2'
+    },
+    table: {
+    },
+  },
+
+]))

From ae3ee586a1bd6d225eb79ce8275817e6e69a4566 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 11 Jul 2024 09:27:58 +0800
Subject: [PATCH 82/84] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=EF=BC=8C=E4=BA=8C=E7=BB=B4=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/purchasePlanMain/index.ts         | 19 +++++++++-
 src/locales/en-US.ts                          |  6 +++-
 src/locales/zh-CN.ts                          |  6 ++--
 src/utils/disposition/defaultButtons.ts       | 25 +++++++++++++
 .../purchasePlanMain/index.vue                | 35 ++++++++++++++++++-
 5 files changed, 86 insertions(+), 5 deletions(-)

diff --git a/src/api/wms/purchasePlanMain/index.ts b/src/api/wms/purchasePlanMain/index.ts
index 167e3ffd6..9d5e42230 100644
--- a/src/api/wms/purchasePlanMain/index.ts
+++ b/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' })
diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index 8b06e1779..e2d991a60 100644
--- a/src/locales/en-US.ts
+++ b/src/locales/en-US.ts
@@ -1144,7 +1144,11 @@ export default {
     全部已读:'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'
+    总数量超出计划数量:'The total quantity exceeds the planned quantity',
+    导出二维表:'Exporting two-dimensional tables',
+    要货计划明细:'Detailed requisition plan',
+    要货计划二维表:'Two dimensional requisition schedule'
+
   },
   
 
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 83b24fa03..48bd82c29 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -1144,8 +1144,10 @@ export default {
     全部已读:'全部已读',
     '申请发货数量不能大于 计划数量 - 已发货数量':'申请发货数量不能大于 计划数量 - 已发货数量',
     不允许超发:'不允许超发',
-    总数量超出计划数量:'总数量超出计划数量'
-
+    总数量超出计划数量:'总数量超出计划数量',
+    导出二维表:'导出二维表',
+    要货计划明细:'要货计划明细',
+    要货计划二维表:'要货计划二维表'
   },
 
 }
diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts
index 07d5bc1a7..9b36e0f6f 100644
--- a/src/utils/disposition/defaultButtons.ts
+++ b/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) {
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index 67f401792..1e234687a 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@@ -292,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), // 筛选
@@ -316,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({
@@ -628,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方法
   */

From e75fe741fd8da9a936f0f6fd42eb283078d1463e Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 11 Jul 2024 10:56:53 +0800
Subject: [PATCH 83/84] =?UTF-8?q?=E4=B8=AD=E8=8B=B1=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/locales/en-US.ts                                     | 7 ++++++-
 src/locales/zh-CN.ts                                     | 7 ++++++-
 src/store/modules/permission.ts                          | 9 +++++++++
 .../demandforecastingMain/demandforecastingMain.data.ts  | 4 ++--
 4 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index e2d991a60..70665df76 100644
--- a/src/locales/en-US.ts
+++ b/src/locales/en-US.ts
@@ -1147,7 +1147,12 @@ export default {
     总数量超出计划数量:'The total quantity exceeds the planned quantity',
     导出二维表:'Exporting two-dimensional tables',
     要货计划明细:'Detailed requisition plan',
-    要货计划二维表:'Two dimensional requisition schedule'
+    要货计划二维表:'Two dimensional requisition schedule',
+    '要货预测-计划员':'Demand forecast-Planner',
+    '要货预测-供应商':'Demand forecast-Supplier',
+    全选:'All',
+    计划员:'Planner',
+
 
   },
   
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 48bd82c29..9e6733363 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -1147,7 +1147,12 @@ export default {
     总数量超出计划数量:'总数量超出计划数量',
     导出二维表:'导出二维表',
     要货计划明细:'要货计划明细',
-    要货计划二维表:'要货计划二维表'
+    要货计划二维表:'要货计划二维表',
+    '要货预测-计划员':'要货预测-计划员',
+    '要货预测-供应商':'要货预测-供应商',
+    全选:'全选',
+    计划员:'计划员',
+
   },
 
 }
diff --git a/src/store/modules/permission.ts b/src/store/modules/permission.ts
index c729cea02..19a8bcb38 100644
--- a/src/store/modules/permission.ts
+++ b/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([
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
index 5e9af683e..85e043a17 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
@@ -19,8 +19,8 @@ let planerList = await DemandforecastingMainApi.queryUserPlanerList()
 if(planerList.length>0){
   planerList.unshift({
     planerId:'ALL',
-    planerNickname:'全选',
-    planerUsername:'全选'
+    planerNickname:t('ts.全选'),
+    planerUsername:t('ts.全选'),
   })
 }
 console.log('planerList',planerList)

From b5f16c42d8105dc31509ae8e0844f971a58da816 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 11 Jul 2024 11:04:16 +0800
Subject: [PATCH 84/84] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=91=98=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demandforecastingMain.data.ts             | 25 +++++++++++--------
 .../demandforecastingMain/index.vue           |  6 ++++-
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
index 85e043a17..406aeb737 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
@@ -15,15 +15,20 @@ import * as DemandforecastingDetailApi from '@/api/wms/demandforecastingDetail'
 import dayjs from 'dayjs'
 
 const { t } = useI18n() // 国际化
-let planerList = await DemandforecastingMainApi.queryUserPlanerList()
-if(planerList.length>0){
-  planerList.unshift({
-    planerId:'ALL',
-    planerNickname:t('ts.全选'),
-    planerUsername:t('ts.全选'),
-  })
+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) {
+  
 }
-console.log('planerList',planerList)
 
 /**
  * @returns {Array} 要货预测主表
@@ -117,10 +122,10 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
         multiple:true,
         emptyValues:[null, undefined],
         valueOnClear:null,
-        options:planerList.map(item=>({
+        options:planerList.length>0?planerList.map(item=>({
           label:item.planerUsername,
           value:item.planerId
-        }))
+        })):[]
       }
     },
   },
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
index 4f0b0c9b6..1057b940a 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
@@ -208,7 +208,11 @@ const searchFormClick = (searchData) => {
 
 /** 初始化 **/
 onMounted(async () => {
-  await getListHead()
+  try {
+    await getListHead()
+  } catch (error) {
+    
+  }
   // updateDateTableColumns()
   getList()
   importTemplateData.templateUrl = await DemandforecastingMainApi.importTemplate()