From 69ffc260effae0d0ad09bd8edcddf8f534870308 Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Wed, 26 Jun 2024 11:20:27 +0800
Subject: [PATCH 001/408] =?UTF-8?q?EAM=20=E2=80=94=E2=80=94>=20=20?=
 =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E8=BD=A6=E9=97=B4=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/eam/basicEamWorkshop/index.ts         |  59 +++++
 .../basicEamWorkshop/basicEamWorkshop.data.ts | 199 ++++++++++++++
 src/views/eam/basicEamWorkshop/index.vue      | 244 ++++++++++++++++++
 3 files changed, 502 insertions(+)
 create mode 100644 src/api/eam/basicEamWorkshop/index.ts
 create mode 100644 src/views/eam/basicEamWorkshop/basicEamWorkshop.data.ts
 create mode 100644 src/views/eam/basicEamWorkshop/index.vue

diff --git a/src/api/eam/basicEamWorkshop/index.ts b/src/api/eam/basicEamWorkshop/index.ts
new file mode 100644
index 000000000..330e0a251
--- /dev/null
+++ b/src/api/eam/basicEamWorkshop/index.ts
@@ -0,0 +1,59 @@
+import request from '@/config/axios'
+
+export interface BasicEamWorkshopVO {
+  id: number
+  code: string
+  name: string
+  description: string
+  type: string
+  available: string
+  activeTime: Date
+  expireTime: Date
+  remark: string
+  deletionTime: Date
+  deleterId: string
+  extraProperties: string
+  concurrencyStamp: number
+  siteId: string
+}
+
+// 查询EAM车间列表
+export const getBasicEamWorkshopPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/eam/basic-eam-workshop/senior', data })
+  } else {
+    return await request.get({ url: `/eam/basic-eam-workshop/page`, params })
+  }
+}
+
+// 查询EAM车间详情
+export const getBasicEamWorkshop = async (id: number) => {
+  return await request.get({ url: `/eam/basic-eam-workshop/get?id=` + id })
+}
+
+// 新增EAM车间
+export const createBasicEamWorkshop = async (data: BasicEamWorkshopVO) => {
+  return await request.post({ url: `/eam/basic-eam-workshop/create`, data })
+}
+
+// 修改EAM车间
+export const updateBasicEamWorkshop = async (data: BasicEamWorkshopVO) => {
+  return await request.put({ url: `/eam/basic-eam-workshop/update`, data })
+}
+
+// 删除EAM车间
+export const deleteBasicEamWorkshop = async (id: number) => {
+  return await request.delete({ url: `/eam/basic-eam-workshop/delete?id=` + id })
+}
+
+// 导出EAM车间 Excel
+export const exportBasicEamWorkshop = async (params) => {
+  return await request.download({ url: `/eam/basic-eam-workshop/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/eam/basic-eam-workshop/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/views/eam/basicEamWorkshop/basicEamWorkshop.data.ts b/src/views/eam/basicEamWorkshop/basicEamWorkshop.data.ts
new file mode 100644
index 000000000..49809cffb
--- /dev/null
+++ b/src/views/eam/basicEamWorkshop/basicEamWorkshop.data.ts
@@ -0,0 +1,199 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const BasicEamWorkshopRules = reactive({
+  code: [required],
+  available: [required],
+  concurrencyStamp: [required],
+})
+
+export const BasicEamWorkshop = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: 'id',
+    field: 'id',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+  },
+  {
+    label: '车间编号',
+    field: 'code',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '车间名称',
+    field: 'name',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '描述',
+    field: 'description',
+    sort: 'custom',
+    isSearch: false,
+  },
+  {
+    label: '车间类型',
+    field: 'type',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    sort: 'custom',
+    isSearch: true,
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+    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: 'expireTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+    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: 'remark',
+    sort: 'custom',
+    isSearch: false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '删除时间',
+    field: 'deletionTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+    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: '删除者ID',
+    field: 'deleterId',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+  },
+  {
+    label: '扩展属性',
+    field: 'extraProperties',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '地点ID',
+    field: 'siteId',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
diff --git a/src/views/eam/basicEamWorkshop/index.vue b/src/views/eam/basicEamWorkshop/index.vue
new file mode 100644
index 000000000..95ce7e199
--- /dev/null
+++ b/src/views/eam/basicEamWorkshop/index.vue
@@ -0,0 +1,244 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="BasicEamWorkshop.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="BasicEamWorkshop.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="BasicEamWorkshopRules"
+    :formAllSchemas="BasicEamWorkshop.allSchemas"
+    :apiUpdate="BasicEamWorkshopApi.updateBasicEamWorkshop"
+    :apiCreate="BasicEamWorkshopApi.createBasicEamWorkshop"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="BasicEamWorkshop.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/eam/basic-eam-workshop/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { BasicEamWorkshop,BasicEamWorkshopRules } from './basicEamWorkshop.data'
+import * as BasicEamWorkshopApi from '@/api/eam/basicEamWorkshop'
+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: 'BasicEamWorkshop' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(BasicEamWorkshop.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: BasicEamWorkshopApi.getBasicEamWorkshopPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'eam:basicEamWorkshop:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'eam:basicEamWorkshop:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'eam:basicEamWorkshop: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:'eam:basicEamWorkshop:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'eam:basicEamWorkshop: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 =BasicEamWorkshop.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 BasicEamWorkshopApi.createBasicEamWorkshop(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await BasicEamWorkshopApi.updateBasicEamWorkshop(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, 'basicBasicEamWorkshop')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await BasicEamWorkshopApi.deleteBasicEamWorkshop(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 BasicEamWorkshopApi.exportBasicEamWorkshop(tableObject.params)
+    download.excel(data, 'EAM车间.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: 'EAM车间导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await BasicEamWorkshopApi.importTemplate()
+})
+
+</script>

From 9ade868f1c20ac3851a434be098e71f30b0cff5c Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Wed, 26 Jun 2024 11:27:22 +0800
Subject: [PATCH 002/408] =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=A2=84=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E8=AE=A1=E5=88=92=E6=97=A0=E6=B3=95=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=EF=BC=8C=E6=8A=A5=E9=94=99=E2=80=9C=E7=94=9F=E4=BA=A7=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E4=B8=BB=E4=B8=8D=E5=AD=98=E5=9C=A8=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionplan/productionMain/index.vue                 | 6 +++++-
 .../productionplan/productionMainAssemble/index.vue         | 6 +++++-
 .../productionMainAssembleSparePart/index.vue               | 6 +++++-
 .../productionplan/productionMainPredictSparePart/index.vue | 6 +++++-
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/views/wms/productionManage/productionplan/productionMain/index.vue b/src/views/wms/productionManage/productionplan/productionMain/index.vue
index 25e53a661..ccf175c27 100644
--- a/src/views/wms/productionManage/productionplan/productionMain/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMain/index.vue
@@ -461,7 +461,11 @@ const tableSelectionDelete = (selection) => {
 }
 
 // 主子数据 提交
-const submitForm = async (formType, data) => {
+const submitForm = async (formType, submitData) => {
+    let data = {...submitData}
+    if(data.masterId){
+      data.id = data.masterId
+    }
   if(tableData.value.find(item => (item.planQty <= 0))) {
     message.warning('数量必须大于0')
     formRef.value.formLoading = false
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
index f8dab6fc1..91b97e1da 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
@@ -448,7 +448,11 @@ const tableSelectionDelete = (selection) => {
 }
 
 // 主子数据 提交
-const submitForm = async (formType, data) => {
+const submitForm = async (formType, submitData) => {
+    let data = {...submitData}
+    if(data.masterId){
+      data.id = data.masterId
+    }
   if(tableData.value.find(item => (item.planQty <= 0))) {
     message.warning('数量必须大于0')
     formRef.value.formLoading = false
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
index 338d62945..468b425b1 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
@@ -447,7 +447,11 @@ const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))
 }
 // 主子数据 提交
-const submitForm = async (formType, data) => {
+const submitForm = async (formType, submitData) => {
+    let data = {...submitData}
+    if(data.masterId){
+      data.id = data.masterId
+    }
   if(tableData.value.find(item => (item.planQty <= 0))) {
     message.warning('数量必须大于0')
     formRef.value.formLoading = false
diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
index 186b60738..6d039de03 100644
--- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
@@ -448,7 +448,11 @@ const tableSelectionDelete = (selection) => {
 }
 
 // 主子数据 提交
-const submitForm = async (formType, data) => {
+const submitForm = async (formType, submitData) => {
+    let data = {...submitData}
+    if(data.masterId){
+      data.id = data.masterId
+    }
   if(tableData.value.find(item => (item.planQty <= 0))) {
     message.warning('数量必须大于0')
     formRef.value.formLoading = false

From a4ff2bc4898b1e8a9fad158dc3cc801a6f2969fb Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Wed, 26 Jun 2024 13:27:39 +0800
Subject: [PATCH 003/408] =?UTF-8?q?EAM=20=E2=80=94=E2=80=94>=20=20?=
 =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E8=BD=A6=E9=97=B4=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/eam/basicEamWorkshop/index.ts    |  8 +++-
 src/views/eam/basicEamWorkshop/index.vue | 61 ++++++++++++++++++++++--
 2 files changed, 63 insertions(+), 6 deletions(-)

diff --git a/src/api/eam/basicEamWorkshop/index.ts b/src/api/eam/basicEamWorkshop/index.ts
index 330e0a251..31acbb17c 100644
--- a/src/api/eam/basicEamWorkshop/index.ts
+++ b/src/api/eam/basicEamWorkshop/index.ts
@@ -1,4 +1,5 @@
 import request from '@/config/axios'
+import {EquipmentMainPartVO} from "@/api/eam/equipmentMainPart";
 
 export interface BasicEamWorkshopVO {
   id: number
@@ -56,4 +57,9 @@ export const exportBasicEamWorkshop = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/eam/basic-eam-workshop/get-import-template' })
-}
\ No newline at end of file
+}
+
+// 启用 / 禁用
+export const updateEnableCode = async (data: BasicEamWorkshopVO) => {
+  return await request.post({ url: `/eam/basic-eam-workshop/ables` , data })
+}
diff --git a/src/views/eam/basicEamWorkshop/index.vue b/src/views/eam/basicEamWorkshop/index.vue
index 95ce7e199..c3739217a 100644
--- a/src/views/eam/basicEamWorkshop/index.vue
+++ b/src/views/eam/basicEamWorkshop/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -65,6 +65,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'
+import * as BasicFaultCauseApi from "@/api/eam/basicFaultCause";
 
 defineOptions({ name: 'BasicEamWorkshop' })
 
@@ -131,11 +132,25 @@ const buttonBaseClick = (val, item) => {
   }
 }
 
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.available) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
 // 列表-操作按钮
-const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'eam:basicEamWorkshop:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'eam:basicEamWorkshop:delete'}), // 删除
-]
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListEditBtn({hasPermi:'eam:basicEamWorkshop:update'}), // 编辑
+    //defaultButtons.mainListDeleteBtn({hasPermi:'eam:basicEamWorkshop:delete'}), // 删除
+    defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'eam:basicEamWorkshop:update'}),
+    defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'eam:basicEamWorkshop:update'}),
+  ]
+}
+
+
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
@@ -143,6 +158,10 @@ const buttonTableClick = async (val, row) => {
     openForm('update', row)
   } else if (val == 'delete') { // 删除
     handleDelete(row.id)
+  } else if (val == 'enable') {
+    handleEnable(row.id)
+  } else if (val == 'disable') {
+    handleDisable(row.id)
   }
 }
 
@@ -195,6 +214,38 @@ const handleDelete = async (id: number) => {
   } catch {}
 }
 
+
+/** 启用 */
+const handleEnable = async (id: number) => {
+  try {
+    const params = ref({
+      id: '',
+      available:'',
+    })
+    params.value.id = id
+    params.value.available = 'TRUE'
+    await BasicEamWorkshopApi.updateEnableCode(params.value)
+    message.success(t('common.updateSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+/** 禁用 */
+const handleDisable = async (id: number) => {
+  try {
+    const params = ref({
+      id: '',
+      available:'',
+    })
+    params.value.id = id
+    params.value.available = 'FALSE'
+    await BasicEamWorkshopApi.updateEnableCode(params.value)
+    message.success(t('common.updateSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
 /** 导出按钮操作 */
 const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {

From e5f5b1ad321d831ef2aadc92295e884f508c35fc 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, 26 Jun 2024 14:28:33 +0800
Subject: [PATCH 004/408] =?UTF-8?q?=E5=BA=93=E5=8C=BA=E5=90=8D=E5=AD=97?=
 =?UTF-8?q?=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts b/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts
index 2470bc8c8..1ed56940b 100644
--- a/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts
@@ -254,7 +254,7 @@ export const AreaRules = reactive({
     { validate: validateYS, message: '请输入正确的代码', trigger: 'blur' }
   ],
   name: [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    { required: true, max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
   remark: [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }

From 779681e312f66275acb3922ffd8c5080fc78faee Mon Sep 17 00:00:00 2001
From: zhaoyiran <zhaoyrd@yonyou.com>
Date: Wed, 26 Jun 2024 14:47:08 +0800
Subject: [PATCH 005/408] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=96=B9=E6=A1=88?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/qms/inspectionTemplate/index.ts    |  5 ++++
 src/views/qms/inspectionTemplate/index.vue | 29 ++++++++++++++++++++--
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/src/api/qms/inspectionTemplate/index.ts b/src/api/qms/inspectionTemplate/index.ts
index f3bf638d2..eb80285c8 100644
--- a/src/api/qms/inspectionTemplate/index.ts
+++ b/src/api/qms/inspectionTemplate/index.ts
@@ -37,3 +37,8 @@ export const enableInspectionTemplate = async (id: number) => {
 export const disableInspectionTemplate = async (id: number) => {
   return await request.disable({ url: `/qms/programme-template/disable?id=` + id })
 }
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/qms/programme-template/get-import-template' })
+}
diff --git a/src/views/qms/inspectionTemplate/index.vue b/src/views/qms/inspectionTemplate/index.vue
index dd0a4cea7..d5dc6e642 100644
--- a/src/views/qms/inspectionTemplate/index.vue
+++ b/src/views/qms/inspectionTemplate/index.vue
@@ -56,7 +56,15 @@
     />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/wms/agv-locationrelation/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <ImportForm
+    ref="importFormRef"
+    url="/qms/programme-template/import"
+    :importTemplateData="importTemplateData"
+    @success="importSuccess"
+    :updateIsDisable="true"
+    :coverIsDisable="true"
+    :mode="2"
+  />
 </template>
 
 <script setup lang="ts">
@@ -94,7 +102,7 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultAddBtn({hasPermi:'qms:programme-template:create'}), // 新增
-  // defaultButtons.defaultImportBtn({hasPermi:'wms:agv-locationrelation:import'}), // 导入
+  defaultButtons.defaultImportBtn({hasPermi:'qms:programme-template:import'}), // 导入
   // defaultButtons.defaultExportBtn({hasPermi:'wms:agv-locationrelation:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
@@ -220,9 +228,26 @@ const searchFormClick = (searchData) => {
   getList() // 刷新当前列表
 }
 
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '检验方案导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
 /** 初始化 **/
 onMounted(async () => {
   getList()
+  importTemplateData.templateUrl = await InspectionProcessPageApi.importTemplate()
 })
 
 </script>

From 7509afbe5bc732e0be7922246b94043750d17858 Mon Sep 17 00:00:00 2001
From: bjang03 <wenwu901@icloud.com>
Date: Wed, 26 Jun 2024 15:20:13 +0800
Subject: [PATCH 006/408] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D=201=E3=80=81?=
 =?UTF-8?q?=E7=9B=98=E7=82=B9-=E7=9B=98=E7=82=B9=E8=B0=83=E6=95=B4-?=
 =?UTF-8?q?=E7=9B=98=E7=82=B9=E8=B0=83=E6=95=B4=E7=94=B3=E8=AF=B7=EF=BC=8C?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E4=B8=8D=E5=BA=94=E6=9C=89=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/countManage/countadjust/countadjustRequestMain/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue b/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue
index 7f06f76f3..58e2edbcc 100644
--- a/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue
+++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue
@@ -70,6 +70,7 @@
     :apiPage="CountadjustRequestDetailApi.getCountadjustRequestDetailPage"
     :apiDelete="CountadjustRequestDetailApi.deleteCountadjustRequestDetail"
     fromeWhere="countadjustRequest"
+    :detailButtonIsShowAdd="false"
     :Echo="Echo"
     @searchTableSuccessDetail="searchTableSuccessDetail"
   />

From c263bc3819994f5c8b58820af5ec702bfb0d081a Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Wed, 26 Jun 2024 15:41:41 +0800
Subject: [PATCH 007/408] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=8B=92=E6=94=B6?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/purchasereceiptRecordDetail/index.ts  |   13 +
 .../wms/purchasereceiptRecordMain/index.ts    |   11 +
 .../purchasereceiptRecordRefuseMain/index.vue |  331 +++
 .../purchasereceiptRecordMain.data.ts         | 1979 +++++++++++++++++
 4 files changed, 2334 insertions(+)
 create mode 100644 src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/index.vue
 create mode 100644 src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/purchasereceiptRecordMain.data.ts

diff --git a/src/api/wms/purchasereceiptRecordDetail/index.ts b/src/api/wms/purchasereceiptRecordDetail/index.ts
index 41b7aa7b7..4dc9271e7 100644
--- a/src/api/wms/purchasereceiptRecordDetail/index.ts
+++ b/src/api/wms/purchasereceiptRecordDetail/index.ts
@@ -61,6 +61,19 @@ export const getPurchasereceiptRecordDetailPage = async (params) => {
   }
 }
 
+
+// 查询采购拒收记录
+export const getPurchasereceiptRecordDetailRefusePage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/purchasereceipt-record-detail/seniorRefuse', data })
+  } else {
+    return await request.get({ url: `/wms/purchasereceipt-record-detail/pageRefuse`, params })
+  }
+}
+
+
 // 查询备件收货记录子列表
 export const getPurchasereceiptRecordDetailPageSpare = async (params) => {
   if (params.isSearch) {
diff --git a/src/api/wms/purchasereceiptRecordMain/index.ts b/src/api/wms/purchasereceiptRecordMain/index.ts
index 684984333..017f12336 100644
--- a/src/api/wms/purchasereceiptRecordMain/index.ts
+++ b/src/api/wms/purchasereceiptRecordMain/index.ts
@@ -89,6 +89,17 @@ export const exportPurchasereceiptRecordMain = async (params) => {
   }
 }
 
+// 导出采购收货记录主 Excel
+export const exportPurchasereceiptRecordRefuseMain = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/purchasereceipt-record-main/export-excel-senior-refuse`, data })
+  } else {
+    return await request.download({ url: `/wms/purchasereceipt-record-main/export-excel-refuse`, params })
+  }
+}
+
+
 // 导出备件收货记录
 export const exportSparereceiptRecordMain = async (params) => {
   if (params.isSearch) {
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/index.vue
new file mode 100644
index 000000000..c4befcd4d
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/index.vue
@@ -0,0 +1,331 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="[...PurchasereceiptRecordMain.allSchemas.searchSchema,...PurchasereceiptRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="PurchasereceiptRecordMain.allSchemas"
+      :detailAllSchemas="PurchasereceiptRecordDetail.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="PurchasereceiptRecordMainRules"
+    :formAllSchemas="PurchasereceiptRecordMain.allSchemas"
+    :tableAllSchemas="PurchasereceiptRecordDetail.allSchemas"
+    :tableFormRules="PurchasereceiptRecordDetailRules"
+    :isBusiness="true"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="PurchasereceiptRecordMain.allSchemas"
+    :detailAllSchemas="detailAllSchemas"
+    :detailAllSchemasRules="PurchasereceiptRecordDetailRules"
+    :apiPage="apiPage"
+    :tabs="PurchasereceiptRequestTabsList"
+    @changeTabs="changeTabs"
+    :buttondataTable="buttondataTable"
+    @tableFormButton="tableFormButton"
+  />
+
+  <!-- 记录子包装弹窗 -->
+  <BasicForm
+    ref="detailParenPackingRef"
+    @success="getList"
+    :tableAllSchemas="PurchasereceiptRecordDetailPackingNumber.allSchemas"
+    :tableFormRules="PurchasereceiptRecordDetailRules"
+    :tableData="packingDetatableData.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    :isShowReduceButton="false"
+    :isShowFooterButtton="false"
+  />
+
+ <!-- 缺货子包装弹窗 -->
+ <BasicForm
+    ref="outStockDetailParenPackingRef"
+    @success="getList"
+    :tableAllSchemas="PurchasereceiptRecordDetailPackingNumber.allSchemas"
+    :tableFormRules="PurchasereceiptRecordDetailRules"
+    :tableData="outStockPackingDetatableData.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    :isShowReduceButton="false"
+    :isShowFooterButtton="false"
+  />
+  <el-dialog
+      v-model="showQualityReport"
+      :title="t('质检明细')"
+      width="90%"
+      append-to-body
+      destroy-on-close
+    >
+    <iframe height="600px" width="100%"  :src="qualityReport" frameborder="0"></iframe>
+  </el-dialog>
+
+
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { PurchasereceiptRecordMain,
+  PurchasereceiptRecordMainRules,
+  PurchasereceiptRecordDetail,
+  PurchasereceiptRecordDetailRules,
+  PurchasereceiptRecordDetailPackingNumber } from './purchasereceiptRecordMain.data'
+import * as PurchasereceiptRecordMainApi from '@/api/wms/purchasereceiptRecordMain'
+import * as PurchasereceiptRecordDetailApi from '@/api/wms/purchasereceiptRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { PurchasereceiptRequestTabsList } from '@/utils/disposition/tabsList'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { getReportUrl } from '@/utils/systemParam'
+// 采购收货记录主
+defineOptions({ name: 'PurchasereceiptRecordRefuseMain' })
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const apiPage = ref(routeName.value.includes('SCP')?PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPageSCP:PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailRefusePage)
+const tableColumns = ref([...PurchasereceiptRecordMain.allSchemas.tableColumns,...PurchasereceiptRecordDetail.allSchemas.tableMainColumns])
+const detailAllSchemas = ref(PurchasereceiptRecordDetail.allSchemas)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: routeName.value.includes('SCP')?PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPageSCP:PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailRefusePage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:purchasereceipt-record-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+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.mainInspectRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请
+   defaultButtons.mainPutawayRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createPutawayRequest',hide:row.putawayRequestFlag == "FALSE" }),// 生成采购上架申请
+   defaultButtons.mainListPlanCheckQualityReportBtn({}), // 查看质检报告
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'putawayRequest') { // 生成采购上架申请
+    handleCreatePutawayRequest(row.number)
+  }else if(val == 'inspectRequest'){//生成到货检验申请
+    handleCreateInspectRequest(row.number)
+  }else if(val == 'mainPlanCheckQualityReport'){
+    // 查看质检报告
+    checkQualityReport(row)
+  }
+}
+// 查看质检报告
+const showQualityReport = ref(false)
+const qualityReport = ref('')
+const checkQualityReport = async (row)=>{
+  showQualityReport.value = true
+  qualityReport.value = `${getReportUrl()}/purchasereceiptReport?asnNumber=${row.asnNumber}`
+}
+
+/** 生成采购上架申请按钮操作 */
+const handleCreatePutawayRequest = async (number:string) => {
+  try{
+    await message.confirm(t('ts.确认生成上架申请吗？'))
+    tableObject.loading = true
+    await PurchasereceiptRecordMainApi.createPutawayRequest(number)
+    message.success(t('ts.上架申请生成成功'))
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 生成到货检验申请按钮操作 */
+const handleCreateInspectRequest = async (number:string) => {
+  try{
+    await message.confirm(t('ts.确认生成到货检验申请吗？'))
+    tableObject.loading = true
+    await PurchasereceiptRecordMainApi.createInspectRequest(number)
+    message.success(t('ts.到货检验申请生成成功'))
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+
+// 子包装数据
+const detailParenPackingRef = ref()
+const { tableObject: packingDetatableData, tableMethods: packDetatableMethods } = useTable({
+  getListApi: PurchasereceiptRecordDetailApi.queryPurchaseceiptChildPackingNumber
+})
+const { getList:queryDetailList } = packDetatableMethods
+
+
+// 缺货子包装数据
+const outStockDetailParenPackingRef = ref()
+const { tableObject: outStockPackingDetatableData, tableMethods: outStockPackDetatableMethods } = useTable({
+  getListApi: PurchasereceiptRecordDetailApi.queryPurchaseshortageChildPackingNumber
+})
+const { getList:queryOutStockDetailList } = outStockPackDetatableMethods
+// 获取部门 用于详情 部门回显
+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
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'recordPurchasereceiptMain')
+}
+
+// 详情 table 操作扩展 按钮
+const buttondataTable = ref([{
+    label: t('ts.查看其他包装规格'),
+    name: 'viewParentPickingNumber',
+    hide: false,
+    type: 'primary',
+    icon: '',
+    color: '',
+    hasPermi: '',
+    link: true, // 文本展现按钮
+  }])
+
+
+const tabeKey = ref("receiptDetail");  
+// 查看其他包装规格
+const tableFormButton = async (val , row) => {
+  if (val == 'viewParentPickingNumber' && tabeKey.value == 'receiptDetail') { //查看其他包装规格
+      packingDetatableData.params = {
+        masterId:row.masterId,
+        parentPackingNumber:row.packingNumber
+      }
+      await queryDetailList()
+      detailParenPackingRef.value.open('create', row, null,'viewDetail')//查看明细数据
+  }
+  if (val == 'viewParentPickingNumber' && tabeKey.value == 'scarceGoodsDetail') { //查看其他包装规格
+      outStockPackingDetatableData.params = {
+        masterId:row.masterId,
+        parentPackingNumber:row.packingNumber
+      }
+      await queryOutStockDetailList()
+      outStockDetailParenPackingRef.value.open('create', row, null,'viewDetail')//查看明细数据
+  }
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    if(routeName.value.includes('SCP')){
+      const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMainSCP(tableObject.params)
+      download.excel(data, `${t('ts.采购收货记录主')}.xlsx`)
+    }else{
+      const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordRefuseMain(tableObject.params)
+      download.excel(data, `${t('ts.采购收货记录主')}.xlsx`)
+    }
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+// tabs 切换事件
+const changeTabs = (data) =>{
+  if(data.prop == 'receiptDetail'){
+  console.log(data)
+    apiPage.value = routeName.value.includes('SCP')?PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPageSCP:PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPage
+    detailAllSchemas.value = PurchasereceiptRecordDetail.allSchemas
+    tabeKey.value = 'receiptDetail'
+  }else if(data.prop == 'scarceGoodsDetail'){
+    apiPage.value = PurchasereceiptRecordDetailApi.getScarceGoodsDetailPage
+    detailAllSchemas.value = PurchasereceiptRecordDetail.allSchemas
+    tabeKey.value = 'scarceGoodsDetail'
+  }
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/purchasereceiptRecordMain.data.ts
new file mode 100644
index 000000000..fb416087b
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/purchasereceiptRecordMain.data.ts
@@ -0,0 +1,1979 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import { t } from '@wangeditor/editor'
+
+
+
+/**
+ * @returns {Array} 采购收货记录主表
+ */
+export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true,
+    sortSearchDefault:1,
+    sortTableDefault:1
+
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    sortTableDefault:2
+  },
+  {
+    label: '任务单号',
+    field: 'jobNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    sortTableDefault:3
+  },
+  {
+    label: '发货单号',
+    field: 'asnNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    sortTableDefault:4,
+    isSearch: true
+  },
+  {
+    label: '拒收时间',
+    field: 'refuseTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '拒收原因',
+    field: 'refuseReason',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '拒收人',
+    field: 'refuseUpdater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: 'ERP单据号(无用)',
+  //   field: 'erpNumber',
+  //   isTable:false,
+  //   isTableForm:false,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  // },
+  // {
+  //   label: 'ERP单据号',
+  //   field: 'qadNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 200
+  //   },
+  //   sortTableDefault:5,
+  // },
+  {
+    label: '要货计划单号',
+    field: 'ppNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTable:false
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    sortSearchDefault:2,
+    isTable:false
+  },
+  {
+    label: '到月台代码',
+    field: 'toDockCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false
+  },
+  {
+    label: '承运商',
+    field: 'carrierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false
+  },
+  {
+    label: '运输方式',
+    field: 'transferMode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false
+  },
+  {
+    label: '数据来源',
+    field: 'sourceType',
+    dictType: DICT_TYPE.PURCHASERECEIPT_SOURCE_TYPE,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    isSearch: false,
+    isTable:false
+  },
+  {
+    label: '车牌号',
+    field: 'vehiclePlateNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransaction',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransaction',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false
+  },
+  {
+    label: '执行时间',
+    field: 'executeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTable:false,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '生效日期',
+    field: 'activeDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTable:false,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTable:false,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTable:false,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false,
+  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    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: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  // {
+  //   label: '操作',
+  //   field: 'action',
+  //   isDetail: false,
+  //   isForm: false,
+  //   table: {
+  //     width: 400,
+  //     fixed: 'right'
+  //   },
+  // },
+  {
+    label: '批次', // 实际是子表的从批次，为了不影响页面，单独放上面
+    field: 'fromBatch',
+    sort: 'custom',
+    isForm:false,
+    isTableForm:false,
+    table: {
+      width: 150
+    },
+    sortTableDefault:12,
+  },
+  {
+    label: '包装号', // 实际是子表的从包装号，为了不影响页面，单独放上面
+    field: 'fromPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:16,
+  },
+  // {
+  //   label: '检验申请单号',
+  //   field: 'inspectNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   sortTableDefault:6,
+  // },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:12,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    isForm: false,
+    table: {
+      width: 180
+    },
+    formatter: dateFormatter,
+    detail: {
+      dateFormat : 'YYYY-MM-DD HH:mm:ss'
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    table: {
+      width: 130
+    },
+    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
+    }
+  },
+]))
+
+// 表单校验
+export const PurchasereceiptRecordMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  supplierCode: [
+    { required: true, message: '请选择供应商代码', trigger: 'change' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请选择到仓库代码', trigger: 'change' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请选择到库位类型服务', trigger: 'change' }
+  ],
+  outTransaction: [
+    { required: true, message: '请输入出库事务类型', trigger: 'blur' }
+  ],
+  inTransaction: [
+    { required: true, message: '请输入入库事务类型', trigger: 'blur' }
+  ],
+  executeTime: [
+    { required: true, message: '请输入执行时间', trigger: 'change' }
+  ],
+  activeDate: [
+    { required: true, message: '请输入生效日期', trigger: 'change' }
+  ],
+  available: [
+    { required: true, message: '请输入是否可用', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  interfaceType: [
+    { required: true, message: '请选择接口类型', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请选择创建时间', trigger: 'change' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 采购收货记录子表
+ */
+export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+    },
+    sortTableDefault:1998,
+    hiddenInMain:true
+  },
+  {
+    label: '检验申请单号',
+    field: 'inspectNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false,
+    sortTableDefault:6,
+  },
+  {
+    label: '采购订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortSearchDefault:5,
+    sortTableDefault:7,
+    isSearch: true
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortSearchDefault:5,
+    sortTableDefault:8,
+  },
+  {
+    label: '行类型',
+    field: 'poLineType',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    sortTableDefault:9,
+    hiddenInMain:true,
+    isForm: false,
+    tableForm:{
+      disabled: true
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:10,
+    isSearch: true
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:10,
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:11,
+    hiddenInMain:true
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:11,
+    hiddenInMain:true
+  },
+  {
+    label: '从批次',
+    field: 'fromBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:14,
+    hiddenInMain:true
+  },
+  {
+    label: '到批次',
+    field: 'toBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:14,
+    hiddenInMain:true
+  },
+  {
+    label: '替代批次',
+    field: 'altBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false,
+    hiddenInMain:true
+  },
+  {
+    label: '从包装号',
+    field: 'fromPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:15,
+    hiddenInMain:true
+  },
+  {
+    label: '到包装号',
+    field: 'toPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:15,
+    hiddenInMain:true
+  },
+  {
+    label: '从器具号',
+    field: 'fromContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false,
+    hiddenInMain:true
+  },
+  {
+    label: '到器具号',
+    field: 'toContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false,
+    hiddenInMain:true
+  },
+  {
+    label: '订单数量',
+    field: 'orderQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false,
+    hiddenInMain:true,
+    sortTableDefault:1004
+  },
+  {
+    label: '收货数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain:true,
+    sortTableDefault:12,
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false,
+    form: {
+      component: 'InputNumber',
+    },
+    sortTableDefault:12,
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:13,
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:16,
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    },
+    tableForm: {
+      disabled: true,
+    },
+    isForm:false,
+    sortTableDefault:16,
+  },
+  {
+    label: '供应商计量数量',
+    field: 'supplierQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    },
+    sortTableDefault:24,
+    hiddenInMain:true
+  },
+  {
+    label: '供应商计量单位',
+    field: 'supplierUom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:24,
+    hiddenInMain:true
+  },
+
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:18,
+    hiddenInMain:true
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:18,
+
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:18,
+  },
+  {
+    label: '从库位组',
+    field: 'fromLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:19,
+    hiddenInMain:true
+  },
+  {
+    label: '到库位组',
+    field: 'toLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:19,
+    hiddenInMain:true
+  },
+  {
+    label: '从库区',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:22,
+    hiddenInMain:true,
+  },
+  {
+    label: '到库区',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:22,
+    hiddenInMain:true
+  },
+  {
+    label: '从货主',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:23,
+    hiddenInMain:true
+  },
+  {
+    label: '到货主',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:23,
+    hiddenInMain:true
+  },
+  {
+    label: '到货日期',
+    field: 'arriveDate',
+    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',
+      }
+    },
+    sortTableDefault:17,
+    hiddenInMain:true
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    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',
+      }
+    },
+    sortTableDefault:17,
+    hiddenInMain:true
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    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',
+      }
+    },
+    sortTableDefault:17,
+    hiddenInMain:true
+  },
+  {
+    label: '转换率',
+    field: 'convertRate',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    },
+    sortTableDefault:1997,
+    hiddenInMain:true
+  },
+  {
+    label: '目检结果',
+    field: 'visualInspectResult',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false,
+    hiddenInMain:true
+  },
+  {
+    label: '目检照片',
+    field: 'visualInspectPhotos',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false,
+    hiddenInMain:true
+  },
+  {
+    label: '不合格原因',
+    field: 'failedReason',
+    dictType: DICT_TYPE.PURCHASE_RETURN_REASON,
+    dictClass: 'string',
+    isTable:false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain:true
+  },
+  {
+    label: '单价',
+    field: 'singlePrice',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    },
+    isTable:false,
+    hiddenInMain:true
+  },
+  {
+    label: '金额',
+    field: 'amount',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    },
+    isTable:false,
+    hiddenInMain:true
+  },
+  // {
+  //   label: '任务明细ID',
+  //   field: 'jobDetailId',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:1998,
+    hiddenInMain:true
+  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false,
+    hiddenInMain:true
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain:true,
+    sortTableDefault:2000,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain:true,
+    sortTableDefault:2000,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    hiddenInMain:true,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    sortTableDefault:2000,
+  },
+  // {
+  //   label: '操作',
+  //   hiddenInMain:true,
+  //   field: 'action',
+  //   isDetail: false,
+  //   isForm: false ,
+  //   table: {
+  //     width: 150,
+  //     fixed: 'right'
+  //   },
+  //   isTableForm:true,
+  // }
+]))
+
+// 表单校验
+export const PurchasereceiptRecordDetailRules = reactive({
+  fromPackingNumber: [
+    { required: true, message: '请选择从包装号', trigger: 'change' }
+  ],
+  toPackingNumber: [
+    { required: true, message: '请选择到包装号', trigger: 'change' }
+  ],
+  fromBatch: [
+    { required: true, message: '请输入从批次', trigger: 'blur' }
+  ],
+  toBatch: [
+    { required: true, message: '请输入到批次', trigger: 'blur' }
+  ],
+  arriveDate: [
+    { required: true, message: '请选择到货日期', trigger: 'change' }
+  ],
+  produceDate: [
+    { required: true, message: '请选择生产日期', trigger: 'change' }
+  ],
+  expireDate: [
+    { required: true, message: '请选择过期日期', trigger: 'change' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  toLocationGroupCode: [
+    { required: true, message: '请选择到库位组代码', trigger: 'change' }
+  ],
+  toAreaCodes: [
+    { required: true, message: '请选择到库区代码', trigger: 'change' }
+  ],
+  poNumber: [
+    { required: true, message: '请选择订单号', trigger: 'change' }
+  ],
+  poLine: [
+    { required: true, message: '请选择订单行', trigger: 'change' }
+  ],
+  packQty: [
+    { required: true, message: '请输入包装数量', trigger: 'blur' }
+  ],
+  packUnit: [
+    { required: true, message: '请选择包装规格', trigger: 'change' }
+  ],
+  convertRate: [
+    { required: true, message: '请输入转换率', trigger: 'blur' }
+  ],
+  visualInspectResult: [
+    { required: true, message: '请选择目检结果', trigger: 'change' }
+  ],
+})
+
+
+/**
+ * @returns {Array} 采购收货记录子表-子包装数据
+ */
+export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    hiddenInMain:true,
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '从批次',
+    field: 'fromBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '到批次',
+    field: 'toBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '替代批次',
+    field: 'altBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '从包装号',
+    field: 'fromPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '到包装号',
+    field: 'toPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '从器具号',
+    field: 'fromContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '到器具号',
+    field: 'toContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled:true
+        }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled:true
+        }
+    },
+    tableForm: {
+      disabled: true,
+    }
+
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+
+  },
+  {
+    label: '供应商计量数量',
+    field: 'supplierQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled:true
+        }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '供应商计量单位',
+    field: 'supplierUom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '从库位组代码',
+    field: 'fromLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    sortTableDefault:21,
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '到库位组代码',
+    field: 'toLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    sortTableDefault:21,
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '从库区代码',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '到库区代码',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '到货日期',
+    field: 'arriveDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        disabled: true,
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm: {
+      disabled: true,
+      type:'FormDate',
+      valueFormat: 'x',
+    }
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        disabled: true,
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm: {
+      disabled: true,
+      type:'FormDate',
+      valueFormat: 'x',
+    }
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        disabled: true,
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm: {
+      disabled: true,
+      type:'FormDate',
+      valueFormat: 'x',
+    }
+  },
+  {
+    label: '转换率',
+    field: 'convertRate',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '目检结果',
+    field: 'visualInspectResult',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '目检照片',
+    field: 'visualInspectPhotos',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '不合格原因',
+    field: 'failedReason',
+    dictType: DICT_TYPE.PURCHASE_RETURN_REASON,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '单价',
+    field: 'singlePrice',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '金额',
+    field: 'amount',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  }
+]))

From 75074e27254e3d58df34e54e8405aed769b360d8 Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Wed, 26 Jun 2024 15:55:42 +0800
Subject: [PATCH 008/408] =?UTF-8?q?EAM=20=20=E2=80=94=E2=80=94>=20?=
 =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E7=94=9F=E4=BA=A7=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/eam/basicEamProductionline/index.ts   |  73 +++++
 src/api/eam/basicEamWorkshop/index.ts         |   7 +-
 .../basicEamProductionline.data.ts            | 235 ++++++++++++++
 .../eam/basicEamProductionline/index.vue      | 296 ++++++++++++++++++
 4 files changed, 610 insertions(+), 1 deletion(-)
 create mode 100644 src/api/eam/basicEamProductionline/index.ts
 create mode 100644 src/views/eam/basicEamProductionline/basicEamProductionline.data.ts
 create mode 100644 src/views/eam/basicEamProductionline/index.vue

diff --git a/src/api/eam/basicEamProductionline/index.ts b/src/api/eam/basicEamProductionline/index.ts
new file mode 100644
index 000000000..9f410aea3
--- /dev/null
+++ b/src/api/eam/basicEamProductionline/index.ts
@@ -0,0 +1,73 @@
+import request from '@/config/axios'
+import {BasicEamWorkshopVO} from "@/api/eam/basicEamWorkshop";
+
+export interface BasicEamProductionlineVO {
+  id: number
+  code: string
+  name: string
+  description: string
+  type: string
+  workshopCode: string
+  rawLocationCode: string
+  fgLocationCode: string
+  available: string
+  activeTime: Date
+  expireTime: Date
+  remark: string
+  deletionTime: Date
+  deleterId: string
+  extraProperties: string
+  concurrencyStamp: number
+  siteId: string
+}
+
+// 查询生产线列表
+export const getBasicEamProductionlinePage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/eam/basic-eam-productionline/senior', data })
+  } else {
+    return await request.get({ url: `/eam/basic-eam-productionline/page`, params })
+  }
+}
+
+// 查询生产线详情
+export const getBasicEamProductionline = async (id: number) => {
+  return await request.get({ url: `/eam/basic-eam-productionline/get?id=` + id })
+}
+
+// 新增生产线
+export const createBasicEamProductionline = async (data: BasicEamProductionlineVO) => {
+  return await request.post({ url: `/eam/basic-eam-productionline/create`, data })
+}
+
+// 修改生产线
+export const updateBasicEamProductionline = async (data: BasicEamProductionlineVO) => {
+  return await request.put({ url: `/eam/basic-eam-productionline/update`, data })
+}
+
+// 删除生产线
+export const deleteBasicEamProductionline = async (id: number) => {
+  return await request.delete({ url: `/eam/basic-eam-productionline/delete?id=` + id })
+}
+
+// 导出生产线 Excel
+export const exportBasicEamProductionline = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/eam/basic-eam-productionline/export-excel-senior`, data })
+  }else{
+    return await request.download({ url: `/eam/basic-eam-productionline/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/eam/basic-eam-productionline/get-import-template' })
+}
+
+// 启用 / 禁用
+export const updateEnableCode = async (data: BasicEamProductionlineVO) => {
+  return await request.post({ url: `/eam/basic-eam-productionline/ables` , data })
+}
diff --git a/src/api/eam/basicEamWorkshop/index.ts b/src/api/eam/basicEamWorkshop/index.ts
index 31acbb17c..09d83c2d9 100644
--- a/src/api/eam/basicEamWorkshop/index.ts
+++ b/src/api/eam/basicEamWorkshop/index.ts
@@ -51,7 +51,12 @@ export const deleteBasicEamWorkshop = async (id: number) => {
 
 // 导出EAM车间 Excel
 export const exportBasicEamWorkshop = async (params) => {
-  return await request.download({ url: `/eam/basic-eam-workshop/export-excel`, params })
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/eam/basic-eam-workshop/export-excel-senior`, data })
+  }else{
+    return await request.download({ url: `/eam/basic-eam-workshop/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/views/eam/basicEamProductionline/basicEamProductionline.data.ts b/src/views/eam/basicEamProductionline/basicEamProductionline.data.ts
new file mode 100644
index 000000000..a9018722a
--- /dev/null
+++ b/src/views/eam/basicEamProductionline/basicEamProductionline.data.ts
@@ -0,0 +1,235 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+import * as WorkshopApi from "@/api/eam/basicEamWorkshop";
+import {BasicEamWorkshop} from "@/views/eam/basicEamWorkshop/basicEamWorkshop.data";
+import {getBasicEamWorkshopPage} from "@/api/eam/basicEamWorkshop";
+
+// 表单校验
+export const BasicEamProductionlineRules = reactive({
+  code: [required],
+  available: [required],
+  concurrencyStamp: [required],
+})
+
+export const BasicEamProductionline = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: 'id',
+    field: 'id',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+  },
+  {
+    label: '生产线编号',
+    field: 'code',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '生产线名称',
+    field: 'name',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '描述',
+    field: 'description',
+    sort: 'custom',
+    isSearch: false,
+  },
+  {
+    label: '生产线类型',
+    field: 'type',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '车间代码',
+    field: 'workshopCode',
+    sort: 'custom',
+    isSearch: false,
+    required: true,
+    form: {
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '车间', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '车间信息', // 查询弹窗标题
+        searchAllSchemas: BasicEamWorkshop.allSchemas, // 查询弹窗所需类
+        searchPage: WorkshopApi.getBasicEamWorkshopPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
+  },
+  {
+    label: '原料库位',
+    field: 'rawLocationCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '成品库位',
+    field: 'fgLocationCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+    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: 'expireTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+    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: 'remark',
+    sort: 'custom',
+    isSearch: false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '删除时间',
+    field: 'deletionTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+    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: '删除者ID',
+    field: 'deleterId',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+  },
+  {
+    label: '扩展属性',
+    field: 'extraProperties',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '地点ID',
+    field: 'siteId',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
diff --git a/src/views/eam/basicEamProductionline/index.vue b/src/views/eam/basicEamProductionline/index.vue
new file mode 100644
index 000000000..1b00d53df
--- /dev/null
+++ b/src/views/eam/basicEamProductionline/index.vue
@@ -0,0 +1,296 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="BasicEamProductionline.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="BasicEamProductionline.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(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="BasicEamProductionlineRules"
+    :formAllSchemas="BasicEamProductionline.allSchemas"
+    :apiUpdate="BasicEamProductionlineApi.updateBasicEamProductionline"
+    :apiCreate="BasicEamProductionlineApi.createBasicEamProductionline"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="BasicEamProductionline.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/eam/basic-eam-productionline/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { BasicEamProductionline,BasicEamProductionlineRules } from './basicEamProductionline.data'
+import * as BasicEamProductionlineApi from '@/api/eam/basicEamProductionline'
+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'
+import * as BasicEamWorkshopApi from "@/api/eam/basicEamWorkshop";
+
+defineOptions({ name: 'BasicEamProductionline' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(BasicEamProductionline.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: BasicEamProductionlineApi.getBasicEamProductionlinePage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'eam:basicEamProductionline:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'eam:basicEamProductionline:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'eam:basicEamProductionline: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 isShowMainButton = (row,val) => {
+  if (val.indexOf(row.available) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListEditBtn({hasPermi:'eam:basicEamProductionline:update'}), // 编辑
+    //defaultButtons.mainListDeleteBtn({hasPermi:'eam:basicEamProductionline:delete'}), // 删除
+    defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'eam:basicEamProductionline:update'}),
+    defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'eam:basicEamProductionline:update'}),
+  ]
+}
+
+
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  } else if (val == 'enable') {
+    handleEnable(row.id)
+  } else if (val == 'disable') {
+    handleDisable(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  var isHave =BasicEamProductionline.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 BasicEamProductionlineApi.createBasicEamProductionline(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await BasicEamProductionlineApi.updateBasicEamProductionline(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, 'basicBasicEamProductionline')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await BasicEamProductionlineApi.deleteBasicEamProductionline(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+
+/** 启用 */
+const handleEnable = async (id: number) => {
+  try {
+    const params = ref({
+      id: '',
+      available:'',
+    })
+    params.value.id = id
+    params.value.available = 'TRUE'
+    await BasicEamProductionlineApi.updateEnableCode(params.value)
+    message.success(t('common.updateSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+/** 禁用 */
+const handleDisable = async (id: number) => {
+  try {
+    const params = ref({
+      id: '',
+      available:'',
+    })
+    params.value.id = id
+    params.value.available = 'FALSE'
+    await BasicEamProductionlineApi.updateEnableCode(params.value)
+    message.success(t('common.updateSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await BasicEamProductionlineApi.exportBasicEamProductionline(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 BasicEamProductionlineApi.importTemplate()
+})
+
+</script>

From e31212419e903c370c16cda14b180b262b2db91d Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Wed, 26 Jun 2024 16:34:23 +0800
Subject: [PATCH 009/408] =?UTF-8?q?EAM=20=20=E2=80=94=E2=80=94>=20?=
 =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=20=E8=BD=A6=E9=97=B4?=
 =?UTF-8?q?=E4=BA=A7=E7=BA=BF=20=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicEamProductionline.data.ts                 |  1 -
 src/views/eam/basicEamProductionline/index.vue     | 13 +++++++++++++
 src/views/eam/basicEamWorkshop/index.vue           | 13 +++++++++++++
 .../equipmentMaintenanceMain.data.ts               | 11 +++++------
 .../equipmentRepairJobMain.data.ts                 | 14 +++++++-------
 .../equipmentReportRepairRequest.data.ts           | 11 +++++------
 src/views/eam/maintenance/maintenance.data.ts      | 11 +++++------
 .../eam/planInspection/planInspection.data.ts      | 12 +++++-------
 src/views/eam/planSpotCheck/planSpotCheck.data.ts  | 11 +++++------
 9 files changed, 58 insertions(+), 39 deletions(-)

diff --git a/src/views/eam/basicEamProductionline/basicEamProductionline.data.ts b/src/views/eam/basicEamProductionline/basicEamProductionline.data.ts
index a9018722a..d4470df4d 100644
--- a/src/views/eam/basicEamProductionline/basicEamProductionline.data.ts
+++ b/src/views/eam/basicEamProductionline/basicEamProductionline.data.ts
@@ -2,7 +2,6 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
 import * as WorkshopApi from "@/api/eam/basicEamWorkshop";
 import {BasicEamWorkshop} from "@/views/eam/basicEamWorkshop/basicEamWorkshop.data";
-import {getBasicEamWorkshopPage} from "@/api/eam/basicEamWorkshop";
 
 // 表单校验
 export const BasicEamProductionlineRules = reactive({
diff --git a/src/views/eam/basicEamProductionline/index.vue b/src/views/eam/basicEamProductionline/index.vue
index 1b00d53df..38b483ed9 100644
--- a/src/views/eam/basicEamProductionline/index.vue
+++ b/src/views/eam/basicEamProductionline/index.vue
@@ -169,6 +169,19 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
+  if(type == "create"){
+    BasicEamProductionline.allSchemas.formSchema.forEach((item) => {
+      if(item.field == 'code'){
+        item.componentProps.disabled = false
+      }
+    })
+  }else {
+    BasicEamProductionline.allSchemas.formSchema.forEach((item) => {
+      if(item.field == 'code'){
+        item.componentProps.disabled = false
+      }
+    })
+  }
   basicFormRef.value.open(type, row)
 }
 
diff --git a/src/views/eam/basicEamWorkshop/index.vue b/src/views/eam/basicEamWorkshop/index.vue
index c3739217a..5f9f85977 100644
--- a/src/views/eam/basicEamWorkshop/index.vue
+++ b/src/views/eam/basicEamWorkshop/index.vue
@@ -168,6 +168,19 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
+  if(type == "create"){
+    BasicEamWorkshop.allSchemas.formSchema.forEach((item) => {
+      if(item.field == 'code'){
+        item.componentProps.disabled = false
+      }
+    })
+  }else{
+    BasicEamWorkshop.allSchemas.formSchema.forEach((item) => {
+      if(item.field == 'code'){
+        item.componentProps.disabled = true
+      }
+    })
+  }
   basicFormRef.value.open(type, row)
 }
 
diff --git a/src/views/eam/equipmentMaintenanceMain/equipmentMaintenanceMain.data.ts b/src/views/eam/equipmentMaintenanceMain/equipmentMaintenanceMain.data.ts
index 97d22bbfe..33839e0b6 100644
--- a/src/views/eam/equipmentMaintenanceMain/equipmentMaintenanceMain.data.ts
+++ b/src/views/eam/equipmentMaintenanceMain/equipmentMaintenanceMain.data.ts
@@ -2,8 +2,8 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
 import {EquipmentAccounts} from "@/views/eam/equipmentAccounts/equipmentAccounts.data";
 import * as EquipmentItemApi from "@/api/eam/equipmentAccounts";
-import {Workshop} from "@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data";
-import * as WorkshopApi from "@/api/wms/workshop";
+import {BasicEamWorkshop} from "@/views/eam/basicEamWorkshop/basicEamWorkshop.data";
+import * as WorkshopApi from "@/api/eam/basicEamWorkshop";
 import {RelationMaintenancePlanItem} from "@/views/eam/maintenance/maintenance.data";
 import * as ItemApi from "@/api/eam/relationMaintenancePlanItem";
 import {validateroundNumber} from "@/utils/validator";
@@ -378,20 +378,19 @@ export const EquipmentMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     isForm:false,
   },
   {
-    label: '车间编号',
+    label: '车间代码',
     field: 'workshopCode',
     sort: 'custom',
     isSearch: false,
     required: true,
     form: {
-      // labelMessage: '信息提示说明！！！',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '车间', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '车间信息', // 查询弹窗标题
-        searchAllSchemas: Workshop.allSchemas, // 查询弹窗所需类
-        searchPage: WorkshopApi.getWorkshopPage, // 查询弹窗所需分页方法
+        searchAllSchemas: BasicEamWorkshop.allSchemas, // 查询弹窗所需类
+        searchPage: WorkshopApi.getBasicEamWorkshopPage, // 查询弹窗所需分页方法
         searchCondition: [{
           key: 'available',
           value: 'TRUE',
diff --git a/src/views/eam/equipmentRepairJobMain/equipmentRepairJobMain.data.ts b/src/views/eam/equipmentRepairJobMain/equipmentRepairJobMain.data.ts
index e8b0de93c..076dc0a7b 100644
--- a/src/views/eam/equipmentRepairJobMain/equipmentRepairJobMain.data.ts
+++ b/src/views/eam/equipmentRepairJobMain/equipmentRepairJobMain.data.ts
@@ -4,8 +4,8 @@ import {EquipmentAccounts} from "@/views/eam/equipmentAccounts/equipmentAccounts
 import * as EquipmentItemApi from "@/api/eam/equipmentAccounts";
 import {BasicFaultCause} from "@/views/eam/basicFaultCause/basicFaultCause.data";
 import * as ItemApi from "@/api/eam/basicFaultCause";
-import {Workshop} from "@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data";
-import * as WorkshopApi from "@/api/wms/workshop";
+import {BasicEamWorkshop} from "@/views/eam/basicEamWorkshop/basicEamWorkshop.data";
+import * as WorkshopApi from "@/api/eam/basicEamWorkshop";
 import {BasicFaultType} from "@/views/eam/basicFaultType/basicFaultType.data";
 import * as BasicFaultTypeApi from "@/api/eam/basicFaultType";
 
@@ -452,20 +452,19 @@ export const EquipmentRepairJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   //   isSearch: true,
   // },
   {
-    label: '车间编号',
+    label: '车间代码',
     field: 'workshopCode',
     sort: 'custom',
     isSearch: false,
     required: true,
     form: {
-      // labelMessage: '信息提示说明！！！',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择车间', // 输入框占位文本
+        searchListPlaceholder: '车间', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '车间信息', // 查询弹窗标题
-        searchAllSchemas: Workshop.allSchemas, // 查询弹窗所需类
-        searchPage: WorkshopApi.getWorkshopPage, // 查询弹窗所需分页方法
+        searchAllSchemas: BasicEamWorkshop.allSchemas, // 查询弹窗所需类
+        searchPage: WorkshopApi.getBasicEamWorkshopPage, // 查询弹窗所需分页方法
         searchCondition: [{
           key: 'available',
           value: 'TRUE',
@@ -474,6 +473,7 @@ export const EquipmentRepairJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
+
   // {
   //   label: '产线编号',
   //   field: 'lineCode',
diff --git a/src/views/eam/equipmentReportRepairRequest/equipmentReportRepairRequest.data.ts b/src/views/eam/equipmentReportRepairRequest/equipmentReportRepairRequest.data.ts
index 93b558fc9..538e9e130 100644
--- a/src/views/eam/equipmentReportRepairRequest/equipmentReportRepairRequest.data.ts
+++ b/src/views/eam/equipmentReportRepairRequest/equipmentReportRepairRequest.data.ts
@@ -1,8 +1,8 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import {EquipmentAccounts} from "@/views/eam/equipmentAccounts/equipmentAccounts.data";
 import * as EquipmentItemApi from "@/api/eam/equipmentAccounts";
-import {Workshop} from "@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data";
-import * as WorkshopApi from "@/api/wms/workshop";
+import {BasicEamWorkshop} from "@/views/eam/basicEamWorkshop/basicEamWorkshop.data";
+import * as WorkshopApi from "@/api/eam/basicEamWorkshop";
 import {dateFormatter} from '@/utils/formatTime'
 import {BasicFaultType} from "@/views/eam/basicFaultType/basicFaultType.data";
 import * as BasicFaultTypeApi from "@/api/eam/basicFaultType";
@@ -136,20 +136,19 @@ export const EquipmentReportRepairRequest = useCrudSchemas(reactive<CrudSchema[]
   //   isSearch: false,
   // },
   {
-    label: '车间编号',
+    label: '车间代码',
     field: 'workshopCode',
     sort: 'custom',
     isSearch: false,
     required: true,
     form: {
-      // labelMessage: '信息提示说明！！！',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '车间', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '车间信息', // 查询弹窗标题
-        searchAllSchemas: Workshop.allSchemas, // 查询弹窗所需类
-        searchPage: WorkshopApi.getWorkshopPage, // 查询弹窗所需分页方法
+        searchAllSchemas: BasicEamWorkshop.allSchemas, // 查询弹窗所需类
+        searchPage: WorkshopApi.getBasicEamWorkshopPage, // 查询弹窗所需分页方法
         searchCondition: [{
           key: 'available',
           value: 'TRUE',
diff --git a/src/views/eam/maintenance/maintenance.data.ts b/src/views/eam/maintenance/maintenance.data.ts
index 028fc96d7..706334af0 100644
--- a/src/views/eam/maintenance/maintenance.data.ts
+++ b/src/views/eam/maintenance/maintenance.data.ts
@@ -4,8 +4,8 @@ import { EquipmentAccounts } from "@/views/eam/equipmentAccounts/equipmentAccoun
 import * as EquipmentItemApi from "@/api/eam/equipmentAccounts";
 import { BasicMaintenanceOption } from "@/views/eam/basicMaintenanceOption/basicMaintenanceOption.data";
 import * as MaintenanceOptionApi from "@/api/eam/basicMaintenanceOption";
-import * as WorkshopApi from '@/api/wms/workshop'
-import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data'
+import {BasicEamWorkshop} from "@/views/eam/basicEamWorkshop/basicEamWorkshop.data";
+import * as WorkshopApi from "@/api/eam/basicEamWorkshop";
 
 // 表单校验
 export const MaintenanceRules = reactive({
@@ -232,20 +232,19 @@ export const Maintenance = useCrudSchemas(reactive<CrudSchema[]>([
     isDetail:false,
   },
   {
-    label: '车间编号',
+    label: '车间代码',
     field: 'workshopCode',
     sort: 'custom',
     isSearch: false,
     required: true,
     form: {
-      // labelMessage: '信息提示说明！！！',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '车间', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '车间信息', // 查询弹窗标题
-        searchAllSchemas: Workshop.allSchemas, // 查询弹窗所需类
-        searchPage: WorkshopApi.getWorkshopPage, // 查询弹窗所需分页方法
+        searchAllSchemas: BasicEamWorkshop.allSchemas, // 查询弹窗所需类
+        searchPage: WorkshopApi.getBasicEamWorkshopPage, // 查询弹窗所需分页方法
         searchCondition: [{
           key: 'available',
           value: 'TRUE',
diff --git a/src/views/eam/planInspection/planInspection.data.ts b/src/views/eam/planInspection/planInspection.data.ts
index 23ceae4ec..84bd0d6b6 100644
--- a/src/views/eam/planInspection/planInspection.data.ts
+++ b/src/views/eam/planInspection/planInspection.data.ts
@@ -4,9 +4,8 @@ import {EquipmentAccounts} from "@/views/eam/equipmentAccounts/equipmentAccounts
 import * as EquipmentItemApi from "@/api/eam/equipmentAccounts";
 import * as BasicInspectionApi from "@/api/eam/basicInspectionOption";
 import {BasicInspectionOption} from "@/views/eam/basicInspectionOption/basicInspectionOption.data";
-import {getBasicInspectionOptionPage} from "@/api/eam/basicInspectionOption";
-import {Workshop} from "@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data";
-import * as WorkshopApi from "@/api/wms/workshop";
+import {BasicEamWorkshop} from "@/views/eam/basicEamWorkshop/basicEamWorkshop.data";
+import * as WorkshopApi from "@/api/eam/basicEamWorkshop";
 
 // 表单校验
 export const PlanInspectionRules = reactive({
@@ -234,20 +233,19 @@ export const PlanInspection = useCrudSchemas(reactive<CrudSchema[]>([
     isDetail:false,
   },
   {
-    label: '车间编号',
+    label: '车间代码',
     field: 'workshopCode',
     sort: 'custom',
     isSearch: false,
     required: true,
     form: {
-      // labelMessage: '信息提示说明！！！',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '车间', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '车间信息', // 查询弹窗标题
-        searchAllSchemas: Workshop.allSchemas, // 查询弹窗所需类
-        searchPage: WorkshopApi.getWorkshopPage, // 查询弹窗所需分页方法
+        searchAllSchemas: BasicEamWorkshop.allSchemas, // 查询弹窗所需类
+        searchPage: WorkshopApi.getBasicEamWorkshopPage, // 查询弹窗所需分页方法
         searchCondition: [{
           key: 'available',
           value: 'TRUE',
diff --git a/src/views/eam/planSpotCheck/planSpotCheck.data.ts b/src/views/eam/planSpotCheck/planSpotCheck.data.ts
index 4c94aefcb..01c49f3cd 100644
--- a/src/views/eam/planSpotCheck/planSpotCheck.data.ts
+++ b/src/views/eam/planSpotCheck/planSpotCheck.data.ts
@@ -4,8 +4,8 @@ import {EquipmentAccounts} from "@/views/eam/equipmentAccounts/equipmentAccounts
 import * as EquipmentItemApi from "@/api/eam/equipmentAccounts";
 import * as SpotCheckOptionApi from "@/api/eam/basicSpotCheckOption";
 import {BasicSpotCheckOption} from "@/views/eam/basicSpotCheckOption/basicSpotCheckOption.data";
-import {Workshop} from "@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data";
-import * as WorkshopApi from "@/api/wms/workshop";
+import {BasicEamWorkshop} from "@/views/eam/basicEamWorkshop/basicEamWorkshop.data";
+import * as WorkshopApi from "@/api/eam/basicEamWorkshop";
 
 // 表单校验
 export const PlanSpotCheckRules = reactive({
@@ -233,20 +233,19 @@ export const PlanSpotCheck = useCrudSchemas(reactive<CrudSchema[]>([
     isDetail:false,
   },
   {
-    label: '车间编号',
+    label: '车间代码',
     field: 'workshopCode',
     sort: 'custom',
     isSearch: false,
     required: true,
     form: {
-      // labelMessage: '信息提示说明！！！',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '车间', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '车间信息', // 查询弹窗标题
-        searchAllSchemas: Workshop.allSchemas, // 查询弹窗所需类
-        searchPage: WorkshopApi.getWorkshopPage, // 查询弹窗所需分页方法
+        searchAllSchemas: BasicEamWorkshop.allSchemas, // 查询弹窗所需类
+        searchPage: WorkshopApi.getBasicEamWorkshopPage, // 查询弹窗所需分页方法
         searchCondition: [{
           key: 'available',
           value: 'TRUE',

From 5d04261295c93ba7577f72e2015b5eed0412a1dc Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Wed, 26 Jun 2024 18:04:00 +0800
Subject: [PATCH 010/408] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/purchasereceiptJobMain/index.ts   |  4 +--
 src/locales/en-US.ts                          |  3 +-
 src/locales/zh-CN.ts                          |  1 +
 .../purchasereceiptJobMain/index.vue          | 33 +++++++++++++++----
 4 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/src/api/wms/purchasereceiptJobMain/index.ts b/src/api/wms/purchasereceiptJobMain/index.ts
index 25f05c601..79e546090 100644
--- a/src/api/wms/purchasereceiptJobMain/index.ts
+++ b/src/api/wms/purchasereceiptJobMain/index.ts
@@ -136,6 +136,6 @@ export const acceptPurchasereceiptJobMain = (id: number) => {
 }
 
 // 拒收采购收货任务主
-export const refusalPurchasereceiptJobMain = (id: number) => {
-  return request.put({ url: '/wms/purchasereceipt-job-main/refusal?id=' + id })
+export const refusalPurchasereceiptJobMain = (data) => {
+  return request.post({ url: '/wms/purchasereceipt-job-main/refusal',data})
 }
diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index ec715bc6f..19f98f6c5 100644
--- a/src/locales/en-US.ts
+++ b/src/locales/en-US.ts
@@ -1137,7 +1137,8 @@ export default {
     '驳回原因不能为空，且不超过60字':'The reason for rejection cannot be empty and cannot exceed 60 words',
     批量发布:'Batch release',
     '重新生成标签会删除上次生成的标签，是否确认继续？':'Regenerating labels will delete the last generated label. Are you sure you want to continue?',
-    '确 认':'Confirm'
+    '确 认':'Confirm',
+    请输入拒收原因:'Please enter the reason for rejection'
   },
   
 
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index f7586d6ea..3b9c17161 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -1138,6 +1138,7 @@ export default {
     批量发布:'批量发布',
     '重新生成标签会删除上次生成的标签，是否确认继续？':'重新生成标签会删除上次生成的标签，是否确认继续？',
     '确 认':'确 认',
+    请输入拒收原因:'请输入拒收原因'
   },
 
 }
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
index 58a8a2000..4843c49c6 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
@@ -249,8 +249,8 @@ const buttonTableClick = async (val, row) => {
     // 查看质检报告
     checkQualityReport(row)
   } else if(val == 'mainJobRefusal'){
-    handleRefusal(row.masterId)
-    getList()
+    // handleRefusal(row.masterId)
+    resonSubmit(row)
   }
 }
 // 查看质检报告
@@ -270,12 +270,33 @@ const handleClose = async (id: number) => {
     await getList()
   } catch {}
 }
-
+const resonSubmit = async (row)=>{
+    
+    ElMessageBox.prompt(t('ts.请输入拒收原因'), t('ts.提示'), {
+      confirmButtonText: t('common.ok'),
+      cancelButtonText: t('common.cancel'),
+      inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
+      inputErrorMessage: t(`ts.${'驳回原因不能为空，且不超过256字'}`),
+      inputType:'textarea',
+      inputValidator:(value)=>{
+        if(value.length>60||value.length==0){
+          return false
+        }else{
+          return true
+        }
+      }
+    }).then(({ value }) => {
+      // 驳回原因
+      handleRefusal(row.masterId,value)
+    })
+    .catch(() => {
+    })
+  }
 /** 拒收按钮操作 */
-const handleRefusal = async (id: number) => {
+const handleRefusal = async (id: number,refuseReason:string) => {
+  // refuseReason
   try {
-    await message.confirm(t('common.confirmRefusal'))
-    await PurchasereceiptJobMainApi.refusalPurchasereceiptJobMain(id)
+    await PurchasereceiptJobMainApi.refusalPurchasereceiptJobMain({id,refuseReason})
     message.success(t('common.refusalSuccess'))
     await getList()
   } catch {}

From 757a3cc41a6b712a96cda160a7f318cbe94d8365 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Wed, 26 Jun 2024 18:16:33 +0800
Subject: [PATCH 011/408] =?UTF-8?q?=E6=8B=92=E6=94=B6=E6=98=8E=E7=BB=86?=
 =?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/utils/disposition/tabsList.ts                           | 6 ++++++
 .../purchasereceipt/purchasereceiptJobMain/index.vue        | 2 +-
 .../purchasereceiptRecordRefuseMain/index.vue               | 6 +++---
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/utils/disposition/tabsList.ts b/src/utils/disposition/tabsList.ts
index 77e9c47c6..64d82ab79 100644
--- a/src/utils/disposition/tabsList.ts
+++ b/src/utils/disposition/tabsList.ts
@@ -38,3 +38,9 @@ export const PurchasereceiptRequestTabsList = [{
   }
 ]
 
+export const PurchasereceiptRefuseRequestTabsList = [{
+  label: "拒收明细",
+  prop: 'receiptDetail',
+}
+]
+
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
index 4843c49c6..a1fe92cdd 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
@@ -220,7 +220,7 @@ const butttondata = (row,$index) => {
     {
       label: '拒收',
       name: 'mainJobRefusal',
-      hide: isShowMainButton(row, ['1']),
+      hide: isShowMainButton(row, ['2']),
       type: 'primary',
       icon: '',
       color: '',
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/index.vue
index c4befcd4d..a9c77fe87 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/index.vue
@@ -58,7 +58,7 @@
     :detailAllSchemas="detailAllSchemas"
     :detailAllSchemasRules="PurchasereceiptRecordDetailRules"
     :apiPage="apiPage"
-    :tabs="PurchasereceiptRequestTabsList"
+    :tabs="PurchasereceiptRefuseRequestTabsList"
     @changeTabs="changeTabs"
     :buttondataTable="buttondataTable"
     @tableFormButton="tableFormButton"
@@ -112,7 +112,7 @@ import { PurchasereceiptRecordMain,
 import * as PurchasereceiptRecordMainApi from '@/api/wms/purchasereceiptRecordMain'
 import * as PurchasereceiptRecordDetailApi from '@/api/wms/purchasereceiptRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import { PurchasereceiptRequestTabsList } from '@/utils/disposition/tabsList'
+import { PurchasereceiptRefuseRequestTabsList } from '@/utils/disposition/tabsList'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { getReportUrl } from '@/utils/systemParam'
 // 采购收货记录主
@@ -314,7 +314,7 @@ const searchFormClick = (searchData) => {
 const changeTabs = (data) =>{
   if(data.prop == 'receiptDetail'){
   console.log(data)
-    apiPage.value = routeName.value.includes('SCP')?PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPageSCP:PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPage
+    apiPage.value = routeName.value.includes('SCP')?PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPageSCP:PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailRefusePage
     detailAllSchemas.value = PurchasereceiptRecordDetail.allSchemas
     tabeKey.value = 'receiptDetail'
   }else if(data.prop == 'scarceGoodsDetail'){

From d9d5208eff6fc4a609555a4712eacf646fb489e7 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Wed, 26 Jun 2024 19:53:03 +0800
Subject: [PATCH 012/408] =?UTF-8?q?=E5=88=B6=E5=93=81=E4=B8=8A=E6=9E=B6?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productputaway/productputawayJobMain/index.vue   | 12 ++++++++++++
 .../productputawayJobMain.data.ts                    |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
index 9ca0bd98f..e4209c074 100644
--- a/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
+++ b/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
@@ -73,6 +73,8 @@ import * as ProductputawayJobMainApi from '@/api/wms/productputawayJobMain'
 import * as ProductputawayJobDetailApi from '@/api/wms/productputawayJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import {getAccessToken} from "@/utils/auth";
+import { getJmreportBaseUrl } from '@/utils/systemParam'
 // 制品上架任务主
 defineOptions({ name: 'ProductputawayJobMain' })
 
@@ -156,6 +158,7 @@ const butttondata = (row,$index) => {
     return []
   }
   return [
+    defaultButtons.mainListDocumentPrintBtn(null), // 单据打印
     defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
     defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
     defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
@@ -244,6 +247,9 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainJobAcc') { // 承接
     await ProductputawayJobMainApi.acceptProductputawayMain(row.masterId)
     getList()
+  } else if (val == 'documentPrint') {
+    // 单据打印
+    handleDocumentPrint(row)
   }
 }
 // 获取部门 用于详情 部门回显
@@ -256,6 +262,12 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
   detailRef.value.openDetail(row, titleName, titleValue,'jobProductputawayMain')
 }
 
+const BASE_URL = getJmreportBaseUrl()
+const src = ref(BASE_URL + '/jmreport/view/965858364788637696?token=' + getAccessToken())
+const handleDocumentPrint = async (row) => {
+  window.open(src.value+'&id='+row.masterId)
+}
+
 /** 导出按钮操作 */
 const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
diff --git a/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts
index ba00d25be..bed4de6a6 100644
--- a/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts
+++ b/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts
@@ -575,7 +575,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     isDetail: false,
     isForm: false,
     table: {
-      width: 150,
+      width: 300,
       fixed: 'right'
     },
   }

From 7c61fc6b79a2f84b31dee69dd08fbe0ea724bafa 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, 27 Jun 2024 08:33:02 +0800
Subject: [PATCH 013/408] =?UTF-8?q?=E5=BA=93=E5=8C=BA=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E4=B8=8D=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts b/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts
index 1ed56940b..2470bc8c8 100644
--- a/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts
@@ -254,7 +254,7 @@ export const AreaRules = reactive({
     { validate: validateYS, message: '请输入正确的代码', trigger: 'blur' }
   ],
   name: [
-    { required: true, max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
   remark: [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }

From a380286aa4b7f95d6e00be4e27e83d264eb37faa Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 27 Jun 2024 08:36:59 +0800
Subject: [PATCH 014/408] =?UTF-8?q?=E7=99=BB=E5=BD=95=E7=8E=AF=E5=A2=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.prod     | 2 +-
 .env.test     | 2 +-
 .env.test-scp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.env.prod b/.env.prod
index dabaa224f..cb7c3aa46 100644
--- a/.env.prod
+++ b/.env.prod
@@ -37,7 +37,7 @@ VITE_INTERFACE_URL='http://dev.ccwin-in.com:25310/magic/web/index.html'
 VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:25310'
 
 # 租户配置
-VITE_TENANT='["长春","成都"]'
+VITE_TENANT='["长春1379","成都1397","长春2379"]'
 
 # 查看质检报告环境
 VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400'
diff --git a/.env.test b/.env.test
index 02d51a0d7..2c1e25575 100644
--- a/.env.test
+++ b/.env.test
@@ -37,7 +37,7 @@ VITE_INTERFACE_URL='http://dev.ccwin-in.com:25310/magic/web/index.html'
 VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:25310'
 
 # 租户配置
-VITE_TENANT='["长春","成都"]'
+VITE_TENANT='["长春1379","成都1397","长春2379"]'
 
 # 查看质检报告环境
 VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400'
diff --git a/.env.test-scp b/.env.test-scp
index c97b58331..9c02faed0 100644
--- a/.env.test-scp
+++ b/.env.test-scp
@@ -38,7 +38,7 @@ VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:25311'
 
 
 # 租户配置
-VITE_TENANT='["长春","成都"]'
+VITE_TENANT='["长春1379","成都1397","长春2379"]'
 
 # 查看质检报告环境
 VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400'

From eb259463a33bd00fa36a00e3aac04846d9d9be59 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Thu, 27 Jun 2024 09:16:47 +0800
Subject: [PATCH 015/408] =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productputawayJobMain/index.vue           | 91 +++++--------------
 1 file changed, 21 insertions(+), 70 deletions(-)

diff --git a/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
index e4209c074..14f2f01df 100644
--- a/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
+++ b/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
@@ -119,6 +119,15 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultExportBtn({hasPermi:'wms:productputaway-job-main:export'}), // 导出
+  {
+      label: '待处理状态全部打印',
+      name: 'printAllPending',
+      hide: false,
+      type: 'primary',
+      icon: '',
+      color: '',
+      hasPermi: ''
+  },
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -137,7 +146,10 @@ const buttonBaseClick = (val, item) => {
       getList()
     }
   } else if (val == 'filtrate') { // 筛选
-  } else { // 其他按钮
+  } else if(val == 'printAllPending'){
+    // 单据打印
+    handleDocumentPrintAll()
+  }else { // 其他按钮
     console.log('其他按钮', item)
   }
 }
@@ -169,75 +181,7 @@ const butttondata = (row,$index) => {
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
   if (val == 'mainJobExe') { // 执行
-    let aaa = {
-    "id": "1809190000111838147",
-    "requestNumber": "REC4620231214-0004",
-    "supplierCode": null,
-    "fromWarehouseCode": "W1",
-    "toWarehouseCode": null,
-    "fromAreaCodes": "",
-    "toAreaCodes": "",
-    "fromAreaTypes": "WIP,RAW",
-    "toAreaTypes": "SEMI,FG",
-    "completetime": 1702545291000,
-    "requestTime": 1702524283000,
-    "requestDueTime": 1689562428000,
-    "status": "2",
-    "expiredTime": null,
-    "updateTime": 1702545291000,
-    "updater": "1",
-    "jobStageStatus": null,
-    "priority": null,
-    "priorityIncrement": null,
-    "departmentCode": "103",
-    "acceptUserId": "1",
-    "acceptTime": 1702552206000,
-    "completeUserId": null,
-    "number": "JOB2220231214-0007",
-    "businessType": "ProductPutaway",
-    "remark": "111100",
-    "createTime": 1702545291000,
-    "creator": "1",
-    "autoComplete": "FALSE",
-    "allowModifyLocation": "FALSE",
-    "allowModifyQty": "TRUE",
-    "allowBiggerQty": "TRUE",
-    "allowSmallerQty": "TRUE",
-    "allowModifyInventoryStatus": "TRUE",
-    "allowContinuousScanning": "TRUE",
-    "allowPartialComplete": "TRUE",
-    "allowModifyBatch": "FALSE",
-    "allowModifyPackingNumber": "FALSE",
-    "inInventoryStatuses": "OK",
-    "outInventoryStatuses": "OK",
-      subList: [
-      {
-    "id": "1809190001814017359",
-    "packingNumber": "12",
-    "containerNumber": "001",
-    "batch": "21",
-    "inventoryStatus": "OK",
-    "poNumber": null,
-    "poLine": "item01",
-    "fromLocationCode": "H03",
-    "toLocationCode": "L-R-001-002-1-02",
-    "itemCode": "item01",
-    "itemName": "物料01",
-    "itemDesc1": "",
-    "itemDesc2": "",
-    "projectCode": "xm01",
-    "qty": 3,
-    "uom": "EA",
-    "number": "JOB2220231214-0007",
-    "remark": "00",
-    "createTime": 1702545291000,
-    "creator": "1",
-    "fromOwnerCode": null,
-    "toOwnerCode": null
-}
-      ]
-    }
-    ProductputawayJobMainApi.executeProductputawayMain(aaa)
+    // ProductputawayJobMainApi.executeProductputawayMain(aaa)
   } else if (val == 'mainJobAba') { // 放弃
     await ProductputawayJobMainApi.abandonProductputawayMain(row.masterId)
     getList()
@@ -268,6 +212,13 @@ const handleDocumentPrint = async (row) => {
   window.open(src.value+'&id='+row.masterId)
 }
 
+/**
+ * 待处理全部打印
+ */
+const handleDocumentPrintAll = async () => {
+  window.open(src.value+'&id=printAllPending')
+}
+
 /** 导出按钮操作 */
 const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {

From 9ea70a525ba5fcca1f7b8918ae3115dd151612d2 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 27 Jun 2024 10:19:48 +0800
Subject: [PATCH 016/408] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliverRequestMain.data.ts                         | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index 5c0d9c0c2..a1c199d2f 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -1098,6 +1098,9 @@ export const SupplierdeliverRequestDetailRules = reactive({
   // packingNumber: [
   //   { required: true, message: '请输入包装号', trigger: 'blur' }
   // ],
+  qty:[
+    { required: true, message: '请输入发货数量', trigger: 'change' },
+  ],
   batch: [
     { required: true, message: '请输入批次', trigger: 'blur' },
     { max: 50, message: '不得超过50个字符', trigger: 'blur' },

From f5ac54fb363637511081b04bd2998ff931c855a1 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Thu, 27 Jun 2024 10:20:26 +0800
Subject: [PATCH 017/408] =?UTF-8?q?=E5=8F=96=E6=B6=88=E9=A2=84=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7/=E8=A3=85=E9=85=8D=E6=94=B6=E8=B4=A7=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E4=B8=AD=E7=9A=84=E7=8F=AD=E7=BB=84=E3=80=81=E7=8F=AD?=
 =?UTF-8?q?=E6=AC=A1=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productreceiptRequestMain.data.ts             | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
index 378ccd699..512de06d6 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
@@ -526,12 +526,12 @@ export const ProductreceiptRequestMainRules = reactive({
   workshopCode: [
     { required: true, message: '请选择车间代码', trigger: 'change' }
   ],
-  team: [
-    { required: true, message: '请选择班组代码', trigger: 'change' }
-  ],
-  shift: [
-    { required: true, message: '请选择班次代码', trigger: 'change' }
-  ],
+  // team: [
+  //   { required: true, message: '请选择班组代码', trigger: 'change' }
+  // ],
+  // shift: [
+  //   { required: true, message: '请选择班次代码', trigger: 'change' }
+  // ],
   // departmentCode: [
   //   { required: true, message: '请输入部门', trigger: 'blur' }
   // ],
@@ -996,7 +996,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
     tableForm: {
-      type: 'Select'
+      type: 'Select',
+      disabled: true
     }
 
   },

From 6e30097f30408ba3d37a231b59bb6aacac6b8322 Mon Sep 17 00:00:00 2001
From: bjang03 <259278618@qq.com>
Date: Thu, 27 Jun 2024 10:44:02 +0800
Subject: [PATCH 018/408] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D=201=E3=80=81?=
 =?UTF-8?q?=E7=9B=98=E7=82=B9=E4=BB=BB=E5=8A=A1=EF=BC=8C=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E8=BE=93=E5=85=A5=E7=9B=98=E7=82=B9=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=EF=BC=8C=E5=9C=A8=E5=AF=BC=E5=85=A5=EF=BC=8C=E6=8A=A5?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/countManage/count/countJobMain/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/countManage/count/countJobMain/index.vue b/src/views/wms/countManage/count/countJobMain/index.vue
index e133dff65..ecfb80699 100644
--- a/src/views/wms/countManage/count/countJobMain/index.vue
+++ b/src/views/wms/countManage/count/countJobMain/index.vue
@@ -208,7 +208,7 @@ const butttondata = (row,$index) => {
     {
       label: '导入',
       name: 'importCountJob',
-      hide: isShowMainButton(row,['1','2']),
+      hide: isShowMainButton(row,['2']),
       type: 'success',
       color: '',
       link: true, //文本展现按钮

From 28e9bd7c60a344609fe10e775aa2b9bd821dbd04 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 27 Jun 2024 10:53:24 +0800
Subject: [PATCH 019/408] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7--=E7=BC=96=E8=BE=91id=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereceiptRequestMain/index.vue             | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
index 7a6faa483..0f8416636 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
@@ -420,7 +420,11 @@ const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({
 const { getList:getDetailList } = detatableMethods
 
 // 生成标签按钮操作
-const submitFormLabel = async (formType, data) => {
+const submitFormLabel = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
   try {
     console.log("formType==",formType)
     console.log("data==",data)
@@ -714,7 +718,11 @@ const onEnter = async (field,value)=>{
   getSearchTableData(value,true)
 }
 // 主子数据 提交
-const submitForm = async (formType, data) => {
+const submitForm = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
   tableData.value.forEach((row, index) => {
     row['expireDate'] = row['expireTime']?addDay(row['produceDate'],row['expireTime']).valueOf():dayjs('2099-12-31').valueOf()
   })

From ccf83e7a70c678a5f61d12f85feadafb8b1d6c30 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 27 Jun 2024 11:03:21 +0800
Subject: [PATCH 020/408] =?UTF-8?q?=E7=A7=9F=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.env.development b/.env.development
index 0baf5cba7..13dee5d41 100644
--- a/.env.development
+++ b/.env.development
@@ -37,7 +37,7 @@ VITE_INTERFACE_URL='http://localhost:12080/magic/web/index.html'
 VITE_JMREPORT_BASE_URL='http://localhost:12080'
 
 # 租户配置
-VITE_TENANT='["长春","成都"]'
+VITE_TENANT='["长春1379","成都1397","长春2379"]'
 
 # 查看质检报告环境
 VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400'

From 7f1deb96c43051caa6bb13593e47c94a3bd6bcf1 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 27 Jun 2024 11:19:33 +0800
Subject: [PATCH 021/408] =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=8A=9F=E8=83=BD--id=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customerreceiptRequestMain/index.vue             |  6 +++++-
 .../customerreturnRequestMain/index.vue              | 12 ++++++++++--
 .../customersettleRequestMain/index.vue              |  6 +++++-
 .../deliver/deliverRequestMain/index.vue             |  6 +++++-
 .../deliverplan/deliverPlanMain/index.vue            |  6 +++++-
 .../saleShipmentMainRequest/index.vue                |  6 +++++-
 .../stockup/stockupMainRequest/index.vue             |  6 +++++-
 .../containermanage/containerMainRequest/index.vue   |  6 +++++-
 .../initialContainerMainRequest/index.vue            |  6 +++++-
 .../scrapContainerMainRequest/index.vue              |  6 +++++-
 .../inventoryinitRequestMain/index.vue               |  6 +++++-
 .../packageoverMain/packageoverRequestMain/index.vue |  6 +++++-
 .../scrap/scrapRequestMain/index.vue                 |  6 +++++-
 .../transferissue/transferissueRequestMain/index.vue |  6 +++++-
 .../transferreceiptRequestMain/index.vue             |  6 +++++-
 .../wms/issueManage/issue/issueRequestMain/index.vue |  6 +++++-
 .../preparetoissueplan/preparetoissueMain/index.vue  |  6 +++++-
 .../productionreturnRequestMain/index.vue            | 12 ++++++++++--
 .../productionreturnRequestMainNo/index.vue          | 12 ++++++++++--
 .../repleinsh/repleinshRequestMain/index.vue         |  6 +++++-
 .../inventorychangeRequestMain/index.vue             |  6 +++++-
 .../inventorymove/inventorymoveRequestMain/index.vue |  6 +++++-
 .../offlinesettlementRequestMain/index.vue           |  6 +++++-
 .../processproductionRequest/index.vue               |  6 +++++-
 .../productdismantleRequestMain/index.vue            |  6 +++++-
 .../productputawayRequestMain/index.vue              |  6 +++++-
 .../productputawayAssembleRequestMain/index.vue      |  6 +++++-
 .../productreceiptRequestMain/index.vue              | 12 ++++++++++--
 .../productreceiptAssembleRequestMain/index.vue      | 12 ++++++++++--
 .../productreceiptscrapRequestMain/index.vue         | 12 ++++++++++--
 .../productredressRequestMain/index.vue              |  6 +++++-
 .../productrepair/productrepairRequestMain/index.vue |  6 +++++-
 .../productscrap/productscrapRequestMain/index.vue   |  6 +++++-
 .../inspect/inspectRequestMain/index.vue             |  6 +++++-
 .../purchasereturnRequestMain/index.vue              | 12 ++++++++++--
 .../putaway/putawayRequestMain/index.vue             |  6 +++++-
 .../sparereceipt/sparereceiptRequestMain/index.vue   | 12 ++++++++++--
 .../supplierdeliver/demandforecastingMain/index.vue  |  6 +++++-
 .../supplierdeliver/purchasePlanMain/index.vue       |  6 +++++-
 .../supplierdeliverRequestMain/index.vue             | 12 ++++++++++--
 .../supplierdeliverBasicForm.vue                     |  6 +++++-
 .../purchaseclaim/purchaseclaimRequestMain/index.vue |  6 +++++-
 42 files changed, 255 insertions(+), 51 deletions(-)

diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue
index ec184bff3..69c9681f5 100644
--- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue
@@ -357,7 +357,11 @@ const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))
 }
 // 主子数据 提交
-const submitForm = async (formType, data) => {
+const submitForm = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
   data.subList = tableData.value // 拼接子表数据参数
   try {
     if (formType === 'create') {
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
index 079e21399..d0802749d 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
@@ -437,7 +437,11 @@ const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({
 })
 const { getList:getDetailList } = detatableMethods
 // 生成标签按钮操作
-const submitFormLabel = async (formType, data) => {
+const submitFormLabel = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
   try {
     console.log("formType==",formType)
     console.log("data==",data)
@@ -706,7 +710,11 @@ const tableSelectionDelete = (selection) => {
 const flag = ref(false)
 
 // 主子数据 提交
-const submitForm = async (formType, data) => {
+const submitForm = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
   data.subList = tableData.value // 拼接子表数据参数
   data.subList.forEach(obj => {
     if(obj.qty == 0){
diff --git a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue
index 2aa4d3f9a..cac0f472d 100644
--- a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue
@@ -368,7 +368,11 @@ const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))
 }
 // 主子数据 提交
-const submitForm = async (formType, data) => {
+const submitForm = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
   data.subList = tableData.value // 拼接子表数据参数
   try {
     if (formType === 'create') {
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
index 56519fa52..6ca2b1e18 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
@@ -506,7 +506,11 @@ const tableSelectionDelete = (selection) => {
 const flag = ref(false)
 
 // 主子数据 提交
-const submitForm = async (formType, data) => {
+const submitForm = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
   flag.value = false
   data.subList = tableData.value // 拼接子表数据参数
   data.subList.forEach(item=>{
diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue
index 5602c5b13..c98a71cd7 100644
--- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue
@@ -463,7 +463,11 @@ const tableSelectionDelete = (selection) => {
 const flag = ref(false)
 
 // 主子数据 提交
-const submitForm = async (formType, data) => {
+const submitForm = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
   data.subList = tableData.value // 拼接子表数据参数
   data.subList.forEach(item=>{
     item.toWarehouseCode = data.toWarehouseCode
diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
index 9f9165ebd..afac9f2f0 100644
--- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
+++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
@@ -328,7 +328,11 @@ const openForm = (type: string, row?: any) => {
 
 
 // 主子数据 提交
-const submitForm = async (formType, data) => {
+const submitForm = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
   data.subList = tableData.value // 拼接子表数据参数
   let isExist = false
   tableData.value.forEach(item => {
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue
index 4a5b06a11..9cc571da8 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue
@@ -438,7 +438,11 @@ const tableSelectionDelete = (selection) => {
 const flag = ref(false)
 
 // 主子数据 提交
-const submitForm = async (formType, data) => {
+const submitForm = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
   data.subList = tableData.value // 拼接子表数据参数
   let isExist = false
   tableData.value.forEach(item => {
diff --git a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue
index db23f1dca..250cf0c72 100644
--- a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue
@@ -440,7 +440,11 @@ const tableSelectionDelete = (selection) => {
 const flag = ref()
 
 // form表单提交
-const submitForm = async (formType,data) => {
+const submitForm = async (formType,submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
   data.subList = tableData.value // 拼接子表数据参数  
   data.subList.forEach(item => {
     if(item.toQty == 0){
diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue
index b37e88036..38af72a70 100644
--- a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue
@@ -392,7 +392,11 @@ const tableSelectionDelete = (selection) => {
 const flag = ref()
 
 // form表单提交
-const submitForm = async (formType,data) => {
+const submitForm = async (formType,submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
   data.subList = tableData.value // 拼接子表数据参数  
   data.subList.forEach(item => {
     if(item.qty == 0){
diff --git a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue
index f014cff4b..9f35176d5 100644
--- a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue
@@ -418,7 +418,11 @@ const tableSelectionDelete = (selection) => {
 const flag = ref()
 
 // form表单提交
-const submitForm = async (formType,data) => {
+const submitForm = async (formType,submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
   data.subList = tableData.value // 拼接子表数据参数  
   data.subList.forEach(item => {
     if(item.qty == 0){
diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
index fd19b5f1d..342766d7c 100644
--- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
@@ -417,7 +417,11 @@ const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))
 }
 // 主子数据 提交
-const submitForm = async (formType, data) => {
+const submitForm = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
   data.subList = tableData.value // 拼接子表数据参数
   try {
     if (formType === 'create') {
diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue
index 473c4716e..788f4465e 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue
@@ -386,7 +386,11 @@ const handleDeleteTable = (item, index) => {
 }
 
 // 主子数据 提交
-const submitForm = async (formType, data) => {
+const submitForm = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
   data.subList = tableData.value // 拼接子表数据参数
   if(tableData.value.find(item => (item.toPackUnit == item.fromPackUnit))) {
     message.warning('从包装规格与到包装规格不能相同')
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
index a49a6598e..28d98d053 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
@@ -399,7 +399,11 @@ const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))
 }
 // 主子数据 提交
-const submitForm = async (formType, data) => {
+const submitForm = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
   data.subList = tableData.value // 拼接子表数据参数
   try {
     if (formType === 'create') {
diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue
index 7196e5f01..24d0df98b 100644
--- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue
@@ -407,7 +407,11 @@ const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))
 }
 // 主子数据 提交
-const submitForm = async (formType, data) => {
+const submitForm = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
   data.subList = tableData.value // 拼接子表数据参数
   try {
     console.log("【调拨出库子列表】",data.subList)
diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue
index 06c820e4f..0c52a5d4f 100644
--- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue
@@ -388,7 +388,11 @@ const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))
 }
 // 主子数据 提交
-const submitForm = async (formType, data) => {
+const submitForm = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
   data.subList = tableData.value // 拼接子表数据参数
   try {
     if (formType === 'create') {
diff --git a/src/views/wms/issueManage/issue/issueRequestMain/index.vue b/src/views/wms/issueManage/issue/issueRequestMain/index.vue
index 299c93049..f71bba7c9 100644
--- a/src/views/wms/issueManage/issue/issueRequestMain/index.vue
+++ b/src/views/wms/issueManage/issue/issueRequestMain/index.vue
@@ -386,7 +386,11 @@ const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))
 }
 // 主子数据 提交
-const submitForm = async (formType, data) => {
+const submitForm = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
   data.subList = tableData.value // 拼接子表数据参数
   if(tableData.value.find(item => (item.qty <= 0))) {
     message.warning('数量必须大于0')
diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue
index d01791d34..b52587d8b 100644
--- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue
+++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue
@@ -441,7 +441,11 @@ const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))
 }
 // 主子数据 提交
-const submitForm = async (formType, data) => {
+const submitForm = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
   data.subList = tableData.value // 拼接子表数据参数
   try {
     if (formType === 'create') {
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
index de88ffd93..59cb00dc0 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
@@ -629,7 +629,11 @@ const tableSelectionDelete = (selection) => {
 }
 
 // 主子数据 提交
-const submitForm = async (formType, data) => {
+const submitForm = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
   data.subList = tableData.value // 拼接子表数据参数
   let isZC = true // 数量和标包数量 是否整除
   data.subList.forEach(item => {
@@ -667,7 +671,11 @@ const submitForm = async (formType, data) => {
 }
 
 // 创建标签
-const submitFormLabel = async (formType, data) => {
+const submitFormLabel = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
   try {
     detatableData.tableList.forEach(async (item) => {
       item.toLocationCode = item.fromLocationCode
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
index ca633a136..81bc49646 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
@@ -563,7 +563,11 @@ const handleDeleteTable = (item, index) => {
 }
 
 // 主子数据 提交
-const submitForm = async (formType, data) => {
+const submitForm = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
   data.subList = tableData.value // 拼接子表数据参数
   // 合格退料 添加参数 isOK
   data.isOK = false // 不合格 false
@@ -592,7 +596,11 @@ const submitForm = async (formType, data) => {
 }
 
 // 创建标签
-const submitFormLabel = async (formType, data) => {
+const submitFormLabel = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
   try {
     detatableData.tableList.forEach(async (item) => {
       await PackageApi.createPackageLabel({...item,toLocationCode:item.fromLocationCode}).then(res => {
diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
index 844973658..b71d95777 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
+++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
@@ -361,7 +361,11 @@ const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))
 }
 // 主子数据 提交
-const submitForm = async (formType, data) => {
+const submitForm = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
   data.subList = tableData.value // 拼接子表数据参数
   if(tableData.value.find(item => (item.qty <= 0))) {
     message.warning('数量必须大于0')
diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
index 49b9f297e..143b2f135 100644
--- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
+++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
@@ -430,7 +430,11 @@ const tableSelectionDelete = (selection) => {
 const flag = ref()
 
 // 主子数据 提交
-const submitForm = async (formType, data) => {
+const submitForm = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
   data.subList = tableData.value // 拼接子表数据参数
   const duplicateItems = tableData.value.filter((item, index) => {
   return tableData.value.findIndex((el) => el.itemCode === item.itemCode) !== index;
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
index de4582cb8..bb663d3d6 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
@@ -667,7 +667,11 @@ const tableSelectionDelete = (selection) => {
 const flag = ref()
 
 // 主子数据 提交
-const submitForm = async (formType, data) => {
+const submitForm = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
   data.subList = tableData.value // 拼接子表数据参数  
   let isExist = false
   tableData.value.forEach(item => {
diff --git a/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/index.vue b/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/index.vue
index 15b6e76a2..1321d24d0 100644
--- a/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/index.vue
+++ b/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/index.vue
@@ -312,7 +312,11 @@ const tableSelectionDelete = (selection) => {
 }
 
 // 主子数据 提交
-const submitForm = async (formType, data) => {
+const submitForm = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
   data.subList = tableData.value // 拼接子表数据参数
   try {
     if (formType === 'create') {
diff --git a/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue b/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue
index e13672e97..e62b08b73 100644
--- a/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue
+++ b/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue
@@ -310,7 +310,11 @@ const handleDelete = async (id: number) => {
 
 
 // 主子数据 提交
-const submitForm = async (formType, data) => {
+const submitForm = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
   data.subList = tableData.value // 拼接子表数据参数
   try {
       if (formType === 'create') {
diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue
index fa0a7166c..76468f55c 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue
@@ -547,7 +547,11 @@ const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))
 }
 // 主子数据 提交
-const submitForm = async (formType, data) => {
+const submitForm = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
   data.subList = tableData.value // 拼接子表数据参数
   // 判断 bom 是否添加
   let childListRs = true
diff --git a/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue
index 00cc330b8..aa88d864f 100644
--- a/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue
+++ b/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue
@@ -374,7 +374,11 @@ const tableSelectionDelete = (selection) => {
 }
 
 // 主子数据 提交
-const submitForm = async (formType, data) => {
+const submitForm = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
   data.type = 'predict'
   data.subList = tableData.value // 拼接子表数据参数
   if(data.subList.find(item => (item.qty <= 0))) {
diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue
index fe3749a7e..b7195c45f 100644
--- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue
+++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue
@@ -364,7 +364,11 @@ const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))
 }
 // 主子数据 提交
-const submitForm = async (formType, data) => {
+const submitForm = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
   data.type = 'assemble'
   data.subList = tableData.value // 拼接子表数据参数
   if(data.subList.find(item => (item.qty <= 0))) {
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
index 912b99090..7fb5b61d8 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
@@ -565,7 +565,11 @@ const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))
 }
 // 主子数据 提交
-const submitForm = async (formType, data) => {
+const submitForm = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
   tableData.value.forEach((row, index) => {
     row['expireDate'] = row['expireTime']?addDay(row['produceDate'],row['expireTime']).valueOf():dayjs('2099-12-31').valueOf()
   })
@@ -619,7 +623,11 @@ const searchFormClick = (searchData) => {
 }
 
 // 创建标签
-const submitFormLabel = async (formType, data) => {
+const submitFormLabel = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
   try {
     console.log("aaaaa",data);
     data.subList=detatableData.tableList
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
index 8bb2c8f3f..cd06bef9a 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
@@ -568,7 +568,11 @@ const tableSelectionDelete = (selection) => {
 }
 
 // 主子数据 提交
-const submitForm = async (formType, data) => {
+const submitForm = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
   tableData.value.forEach((row, index) => {
     row['expireDate'] = row['expireTime']?addDay(row['produceDate'],row['expireTime']).valueOf():dayjs('2099-12-31').valueOf()
   })
@@ -622,7 +626,11 @@ const searchFormClick = (searchData) => {
 }
 
 // 创建标签
-const submitFormLabel = async (formType, data) => {
+const submitFormLabel = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
   try {
     console.log("aaaaa",data);
     data.subList=detatableData.tableList
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
index 8c7af6533..e76239855 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
@@ -558,7 +558,11 @@ const tableSelectionDelete = (selection) => {
 }
 
 // 主子数据 提交
-const submitForm = async (formType, data) => {
+const submitForm = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
   data.subList = tableData.value // 拼接子表数据参数
   if(data.subList.find(item => (item.qty <= 0))) {
     message.warning('数量必须大于0')
@@ -611,7 +615,11 @@ const searchFormClick = (searchData) => {
 }
 
 // 创建标签
-const submitFormLabel = async (formType, data) => {
+const submitFormLabel = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
   try {
     detatableData.tableList.forEach(async (item) => {
       // 创建标签 要物料库区配置表中 入库包装规格
diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue
index 5f27152b2..659d48369 100644
--- a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue
+++ b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue
@@ -408,7 +408,11 @@ const tableSelectionDelete = (selection) => {
 }
 
 // 主子数据 提交
-const submitForm = async (formType, data) => {
+const submitForm = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
   data.subList = tableData.value // 拼接子表数据参数
   if(data.subList.find(item => (item.qty <= 0))) {
     message.warning('数量必须大于0')
diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
index 21ade2a3b..5f291b7e7 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
+++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
@@ -580,7 +580,11 @@ const handleDeleteTable = (item, index) => {
 }
 
 // 主子数据 提交
-const submitForm = async (formType, data) => {
+const submitForm = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
   data.subList = tableData.value // 拼接子表数据参数
   // 判断 bom 是否添加
   let childListRs = true
diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
index 3e735bd9e..a4a2d241d 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
@@ -647,7 +647,11 @@ const tableSelectionDelete = (selection) => {
 }
 
 // 主子数据 提交
-const submitForm = async (formType, data) => {
+const submitForm = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
   data.subList = tableData.value // 拼接子表数据参数
   // 判断 bom 是否添加
   let childListRs = true
diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue
index a71224618..91b579ad2 100644
--- a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue
@@ -354,7 +354,11 @@
   }
 
   // 主子数据 提交
-  const submitForm = async (formType, data) => {
+  const submitForm = async (formType, submitData) => {
+    let data = {...submitData}
+    if(data.masterId){
+      data.id = data.masterId
+    }
     data.subList = tableData.value // 拼接子表数据参数
     try {
       if (formType === 'create') {
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
index d654f69dc..d32bddadf 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
@@ -177,7 +177,11 @@ const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({
 const { getList:getDetailList } = detatableMethods
 
 // 生成标签按钮操作
-const submitFormLabel = async (formType, data) => {
+const submitFormLabel = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
   try {
     console.log("formType==",formType)
     console.log("data==",data)
@@ -832,7 +836,11 @@ const tableSelectionDelete = (selection) => {
 }
 
 // 主子数据 提交
-const submitForm = async (formType, data) => {
+const submitForm = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
   console.log('submitForm',tableData.value)
   // if(tableData.value.find(item=>Number(item.returnedQty)>Number(item.receiptQty))){
   //   message.warning("退货数量不能大于收获数量")
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue
index b9caddd35..7ef2eaf06 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue
@@ -439,7 +439,11 @@ const tableSelectionDelete = (selection) => {
 }
 
 // 主子数据 提交
-const submitForm = async (formType, data) => {
+const submitForm = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
   data.subList = tableData.value // 拼接子表数据参数
   try {
     if (formType === 'create') {
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
index 908c243e8..f79b3655e 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
@@ -417,7 +417,11 @@ const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({
 const { getList:getDetailList } = detatableMethods
 
 // 生成标签按钮操作
-const submitFormLabel = async (formType, data) => {
+const submitFormLabel = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
   try {
     await message.confirm(t('ts.是否为此数据生成标签？'))
     await PurchasereceiptRequestMainApi.genLabel(genLabelId.value)
@@ -578,7 +582,11 @@ const tableSelectionDelete = (selection) => {
 }
 
 // 主子数据 提交
-const submitForm = async (formType, data) => {
+const submitForm = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
   data.subList = tableData.value // 拼接子表数据参数
   try {
     if (formType === 'create') {
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
index efa13a5bb..b2df52603 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
@@ -368,7 +368,11 @@ const tableSelectionDelete = (selection) => {
 }
 
 // 主子数据 提交
-const submitForm = async (formType, data) => {
+const submitForm = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
   data.subList = tableData.value // 拼接子表数据参数
   try {
     if (formType === 'create') {
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index 51b649f5c..ae6ec243e 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@@ -614,7 +614,11 @@ const handleSelectionPublish = async ()=>{
   }
 
   // 主子数据 提交
-  const submitForm = async (formType, data) => {
+  const submitForm = async (formType, submitData) => {
+    let data = {...submitData}
+    if(data.masterId){
+      data.id = data.masterId
+    }
     data.subList = []
     let flag = false
     for (let item of tableData.value) {
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 8aacc9693..e22d13671 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -825,7 +825,11 @@ const { getList:getDetailList } = detatableMethods
 
 
 // 生成标签按钮操作
-const submitFormLabel = async (formType, data) => {
+const submitFormLabel = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
   try {
     console.log("formType==",formType)
     console.log("data==",data)
@@ -952,7 +956,11 @@ const handleDeleteTable = (item, index) => {
 }
 
 // 主子数据 提交
-const submitForm = async (formType, data) => {
+const submitForm = async (formType, submitData) => {
+  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)
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
index 4b8ad4e71..70ba54b7c 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
@@ -278,7 +278,11 @@ const getSearchTableData = async (number,formField,searchField)=>{
 
 
 // 主子数据 提交
-const submitForm = async (formType, data) => {
+const submitForm = async (formType, submitData) => {
+  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)
diff --git a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue
index 8c4a12edb..c87d8c806 100644
--- a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue
+++ b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue
@@ -454,7 +454,11 @@ import { getJmreportBaseUrl } from '@/utils/systemParam'
   }
 
   // 主子数据 提交
-  const submitForm = async (formType, data) => {
+  const submitForm = async (formType, submitData) => {
+    let data = {...submitData}
+    if(data.masterId){
+      data.id = data.masterId
+    }
     data.subList = tableData.value // 拼接子表数据参数
     try {
       if (formType === 'create') {

From 7564ec3bd971cb3b47e0ed0d87ed8e2ffaed1303 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Thu, 27 Jun 2024 11:37:50 +0800
Subject: [PATCH 022/408] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=20=20=E7=8F=AD=E7=BB=84=E7=8F=AD=E6=AC=A1?=
 =?UTF-8?q?=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionMain/productionMain.data.ts         | 12 ++++++------
 .../productionMainAssemble.data.ts                | 12 ++++++------
 .../productionMainAssembleSparePart.data.ts       | 12 ++++++------
 .../productionMainPredictSparePart.data.ts        | 12 ++++++------
 .../productreceiptAssembleRequestMain.data.ts     | 15 ++++++++-------
 5 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
index a4af9201e..8919838d3 100644
--- a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
@@ -576,12 +576,12 @@ export const ProductionMainRules = reactive({
   productionLine: [
     { required: true, message: '请选择生产线', trigger: 'change' }
   ],
-  shift: [
-    { required: true, message: '请选择班次', trigger: 'change' }
-  ],
-  team: [
-    { required: true, message: '请选择班组', trigger: 'change' }
-  ],
+  // shift: [
+  //   { required: true, message: '请选择班次', trigger: 'change' }
+  // ],
+  // team: [
+  //   { required: true, message: '请选择班组', trigger: 'change' }
+  // ],
   planDate: [
     { required: true, message: '请输入计划日期', trigger: 'blur' }
   ],
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
index d0f2cf6fa..5c1b7b009 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
@@ -567,12 +567,12 @@ export const ProductionMainRules = reactive({
   productionLine: [
     { required: true, message: '请选择生产线', trigger: 'change' }
   ],
-  shift: [
-    { required: true, message: '请选择班次', trigger: 'change' }
-  ],
-  team: [
-    { required: true, message: '请选择班组', trigger: 'change' }
-  ],
+  // shift: [
+  //   { required: true, message: '请选择班次', trigger: 'change' }
+  // ],
+  // team: [
+  //   { required: true, message: '请选择班组', trigger: 'change' }
+  // ],
   planDate: [
     { required: true, message: '请输入计划日期', trigger: 'blur' }
   ],
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
index c607eb498..b90683818 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
@@ -567,12 +567,12 @@ export const ProductionMainRules = reactive({
   productionLine: [
     { required: true, message: '请选择生产线', trigger: 'change' }
   ],
-  shift: [
-    { required: true, message: '请选择班次', trigger: 'change' }
-  ],
-  team: [
-    { required: true, message: '请选择班组', trigger: 'change' }
-  ],
+  // shift: [
+  //   { required: true, message: '请选择班次', trigger: 'change' }
+  // ],
+  // team: [
+  //   { required: true, message: '请选择班组', trigger: 'change' }
+  // ],
   planDate: [
     { required: true, message: '请输入计划日期', trigger: 'blur' }
   ],
diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
index 156730cf6..2ab4b578d 100644
--- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
@@ -568,12 +568,12 @@ export const ProductionMainRules = reactive({
   productionLine: [
     { required: true, message: '请选择生产线', trigger: 'change' }
   ],
-  shift: [
-    { required: true, message: '请选择班次', trigger: 'change' }
-  ],
-  team: [
-    { required: true, message: '请选择班组', trigger: 'change' }
-  ],
+  // shift: [
+  //   { required: true, message: '请选择班次', trigger: 'change' }
+  // ],
+  // team: [
+  //   { required: true, message: '请选择班组', trigger: 'change' }
+  // ],
   planDate: [
     { required: true, message: '请输入计划日期', trigger: 'blur' }
   ],
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
index 6d33c2859..3cef27943 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
@@ -527,12 +527,12 @@ export const ProductreceiptRequestMainRules = reactive({
   workshopCode: [
     { required: true, message: '请选择车间代码', trigger: 'change' }
   ],
-  team: [
-    { required: true, message: '请选择班组代码', trigger: 'change' }
-  ],
-  shift: [
-    { required: true, message: '请选择班次代码', trigger: 'change' }
-  ],
+  // team: [
+  //   { required: true, message: '请选择班组代码', trigger: 'change' }
+  // ],
+  // shift: [
+  //   { required: true, message: '请选择班次代码', trigger: 'change' }
+  // ],
   // departmentCode: [
   //   { required: true, message: '请输入部门', trigger: 'blur' }
   // ],
@@ -997,7 +997,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
     tableForm: {
-      type: 'Select'
+      type: 'Select',
+      disabled: true
     }
   },
   {

From bafd71d10bfffbfe84bcc37a5db420b5f73feed8 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 27 Jun 2024 11:48:00 +0800
Subject: [PATCH 023/408] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=BC=80=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productputawayJobMain/index.vue           | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
index 14f2f01df..0e7736dc1 100644
--- a/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
+++ b/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
@@ -75,6 +75,8 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import {getAccessToken} from "@/utils/auth";
 import { getJmreportBaseUrl } from '@/utils/systemParam'
+import * as SwitchApi from '@/api/wms/switch'
+
 // 制品上架任务主
 defineOptions({ name: 'ProductputawayJobMain' })
 
@@ -116,13 +118,28 @@ const { tableObject, tableMethods } = useTable({
 // 获得表格的各种操作
 const { getList, setSearchParams } = tableMethods
 
+
+const switchproductPutawayJobPrint = ref(false)
+const getSwitchStatus = async ()=>{
+  let res = await SwitchApi.getSwitchPage({
+    pageSize: 20,
+    pageNo: 1,
+    code: 'productPutawayJobPrint'
+  })
+  console.log('getSwitchStatus',res)
+  if(res&&res.list){
+    switchproductPutawayJobPrint.value = res.list[0].effectiveSetValue == 'TRUE'
+    
+  }
+}
 // 列表头部按钮
-const HeadButttondata = [
+const HeadButttondata = computed(()=>{
+  return [
   defaultButtons.defaultExportBtn({hasPermi:'wms:productputaway-job-main:export'}), // 导出
   {
       label: '待处理状态全部打印',
       name: 'printAllPending',
-      hide: false,
+      hide: !switchproductPutawayJobPrint.value,
       type: 'primary',
       icon: '',
       color: '',
@@ -132,6 +149,7 @@ const HeadButttondata = [
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
 ]
+})
 
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
@@ -244,8 +262,10 @@ const searchFormClick = (searchData) => {
   getList() // 刷新当前列表
 }
 
+
 /** 初始化 **/
 onMounted(async () => {
   getList()
+  getSwitchStatus()
 })
 </script>

From eae64e1b7f288736b2f6770ac4bea5405fc528e7 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 27 Jun 2024 11:51:42 +0800
Subject: [PATCH 024/408] =?UTF-8?q?=E5=8D=95=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productputaway/productputawayJobMain/index.vue            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
index 0e7736dc1..6ba1e2d00 100644
--- a/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
+++ b/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
@@ -188,7 +188,7 @@ const butttondata = (row,$index) => {
     return []
   }
   return [
-    defaultButtons.mainListDocumentPrintBtn(null), // 单据打印
+    defaultButtons.mainListDocumentPrintBtn({hide:!switchproductPutawayJobPrint.value}), // 单据打印
     defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
     defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
     defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
@@ -265,7 +265,7 @@ const searchFormClick = (searchData) => {
 
 /** 初始化 **/
 onMounted(async () => {
+  await getSwitchStatus()
   getList()
-  getSwitchStatus()
 })
 </script>

From b8604a9974ed376454cadebacf5bc32083898000 Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Thu, 27 Jun 2024 12:01:01 +0800
Subject: [PATCH 025/408] =?UTF-8?q?EAM=20=E2=80=94=E2=80=94>=20=20?=
 =?UTF-8?q?=E5=B7=A1=E6=A3=80=E7=82=B9=E6=A3=80=20=E5=89=8D=E5=90=8E?=
 =?UTF-8?q?=E7=AB=AF=20PDA=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/eam/equipmentSpotCheckMain/index.ts   |  2 +-
 src/utils/dict.ts                             |  1 +
 .../equipmentInspectionDetail.data.ts         |  8 +++----
 .../equipmentInspectionMain/finishForm1.vue   | 23 ++++++++++---------
 .../equipmentSpotCheckDetail.data.ts          |  8 +++----
 .../equipmentSpotCheckMain/finishForm1.vue    | 23 ++++++++++---------
 .../eam/equipmentSpotCheckMain/index.vue      | 12 ++++------
 7 files changed, 38 insertions(+), 39 deletions(-)

diff --git a/src/api/eam/equipmentSpotCheckMain/index.ts b/src/api/eam/equipmentSpotCheckMain/index.ts
index 9403acf8d..c7c0fe718 100644
--- a/src/api/eam/equipmentSpotCheckMain/index.ts
+++ b/src/api/eam/equipmentSpotCheckMain/index.ts
@@ -66,7 +66,7 @@ export const updateEquipmentSpotCheckMain = async (data: EquipmentSpotCheckMainV
   return await request.put({ url: `/eam/equipment-spot-check-main/update`, data })
 }
 
-// 修改点检工单主
+// 完成点检工单主
 export const updateEquipmentSpotCheck = async (data: EquipmentSpotCheckMainVO) => {
   return await request.post({ url: `/eam/equipment-spot-check-main/updateOrders`, data })
 }
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index fc5dd0a53..d7a5442ae 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -354,6 +354,7 @@ export enum DICT_TYPE {
   REPAIR_DEGREE = 'repair_degree', //维修紧急程度
   REPAIR_LEVEL = 'repair_level', //维修级别
   IS_COMPLETED = 'is_completed', //是否完成
+  IS_NORMAL = 'is_normal', //正常异常
   MAINTENANCE_CYCLE = 'maintenance_cycle', // 保养周期
   INSPECTION_CYCLE = 'inspection_cycle', // 巡检周期
   SPOTCHECK_CYCLE = 'spotcheck_cycle', // 巡检周期
diff --git a/src/views/eam/equipmentInspectionDetail/equipmentInspectionDetail.data.ts b/src/views/eam/equipmentInspectionDetail/equipmentInspectionDetail.data.ts
index cb52a81a8..e2e98bab0 100644
--- a/src/views/eam/equipmentInspectionDetail/equipmentInspectionDetail.data.ts
+++ b/src/views/eam/equipmentInspectionDetail/equipmentInspectionDetail.data.ts
@@ -78,18 +78,18 @@ export const EquipmentInspectionDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '未完成原因',
+    label: '异常原因',
     field: 'uncompletedCause',
     sort: 'custom',
     isSearch: true,
   },
   {
-    label: '结果枚举',
+    label: '结果',
     field: 'result',
     sort: 'custom',
     isSearch: true,
-    dictType: DICT_TYPE.IS_COMPLETED,
-    dictClass: 'string',
+    dictType: DICT_TYPE.IS_NORMAL,
+    dictClass: 'string'
   },
   {
     label: '巡检项名称',
diff --git a/src/views/eam/equipmentInspectionMain/finishForm1.vue b/src/views/eam/equipmentInspectionMain/finishForm1.vue
index 408be1c53..8be7d99b4 100644
--- a/src/views/eam/equipmentInspectionMain/finishForm1.vue
+++ b/src/views/eam/equipmentInspectionMain/finishForm1.vue
@@ -2,11 +2,11 @@
   <Dialog v-model="dialogVisible" :title="dialogTitle"  :close-on-click-modal="false">
     <el-form ref="basicFormRef" v-loading="formLoading" :model="formData" :rules="formRules" label-width="100px">
       <el-row>
-        <el-col :span="12">
-          <el-form-item label="验证人" prop="verifyer">
-            <el-input v-model="formData.verifyer" placeholder="请输入验证人" :disabled="isDisabled"/>
-          </el-form-item>
-        </el-col>
+<!--        <el-col :span="12">-->
+<!--          <el-form-item label="验证人" prop="verifyer">-->
+<!--            <el-input v-model="formData.verifyer" placeholder="请输入验证人" :disabled="isDisabled"/>-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
         <el-col :span="12">
           <el-form-item label="验证内容" prop="verifyContent">
             <el-input v-model="formData.verifyContent" type="textarea" :input-style="{height:'100px'}" maxlength="300" placeholder="请输入验证内容" />
@@ -41,6 +41,7 @@ import * as EquipmentMaintenanceMainApi from '@/api/eam/equipmentMaintenanceMain
 import * as EquipmentInspectionMainApi from '@/api/eam/equipmentInspectionMain'
 import { SearchTable } from '@/components/SearchTable'
 import {ElInput} from "element-plus";
+import {updateEquipmentInspection} from "@/api/eam/equipmentInspectionMain";
 
 defineOptions({ name: 'TeamForm' })
 
@@ -62,15 +63,15 @@ const InputRef = ref<InstanceType<typeof ElInput>>()
 const formData = ref({
   id:'',
   number:'',
-  verifyer: '',
+  //verifyer: '',
   verifyContent: '',
   verifyTime: '',
 })
 const formRules = reactive({
-  verifyer: [
-    { required: true, message: '验证人不能为空', trigger: 'blur' },
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
-  ],
+  // verifyer: [
+  //   { required: true, message: '验证人不能为空', trigger: 'blur' },
+  //   { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  // ],
   verifyContent: [
     { required: true, message: '验证内容不能为空', trigger: 'blur' },
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
@@ -102,7 +103,7 @@ const submitForm = async (val) => {
    if (!valid) return
 
    //发送数据
-   await EquipmentInspectionMainApi.updateEquipmentInspectionMain(formData.value)
+   await EquipmentInspectionMainApi.updateEquipmentInspection(formData.value)
    //把success函数传递到父页面
    emit('success',formData.value.id)
    dialogVisible.value = false
diff --git a/src/views/eam/equipmentSpotCheckDetail/equipmentSpotCheckDetail.data.ts b/src/views/eam/equipmentSpotCheckDetail/equipmentSpotCheckDetail.data.ts
index 2fe8356fe..b08f30594 100644
--- a/src/views/eam/equipmentSpotCheckDetail/equipmentSpotCheckDetail.data.ts
+++ b/src/views/eam/equipmentSpotCheckDetail/equipmentSpotCheckDetail.data.ts
@@ -11,7 +11,7 @@ export const EquipmentSpotCheckDetailRules = reactive({
   masterId: [required],
   name: [required],
   uncompletedCause:[{
-    required:false ,
+    required: false,
     message:'该项为必填项',
     tagger:['blur','change']
   }],
@@ -78,17 +78,17 @@ export const EquipmentSpotCheckDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '未完成原因',
+    label: '异常原因',
     field: 'uncompletedCause',
     sort: 'custom',
     isSearch: true,
   },
   {
-    label: '结果枚举',
+    label: '结果',
     field: 'result',
     sort: 'custom',
     isSearch: true,
-    dictType: DICT_TYPE.IS_COMPLETED,
+    dictType: DICT_TYPE.IS_NORMAL,
     dictClass: 'string'
   },
   {
diff --git a/src/views/eam/equipmentSpotCheckMain/finishForm1.vue b/src/views/eam/equipmentSpotCheckMain/finishForm1.vue
index a5acf0fb5..80434c83c 100644
--- a/src/views/eam/equipmentSpotCheckMain/finishForm1.vue
+++ b/src/views/eam/equipmentSpotCheckMain/finishForm1.vue
@@ -2,11 +2,11 @@
   <Dialog v-model="dialogVisible" :title="dialogTitle"  :close-on-click-modal="false">
     <el-form ref="basicFormRef" v-loading="formLoading" :model="formData" :rules="formRules" label-width="100px">
       <el-row>
-        <el-col :span="12">
-          <el-form-item label="验证人" prop="verifyer">
-            <el-input v-model="formData.verifyer" placeholder="请输入验证人" :disabled="isDisabled"/>
-          </el-form-item>
-        </el-col>
+<!--        <el-col :span="12">-->
+<!--          <el-form-item label="验证人" prop="verifyer">-->
+<!--            <el-input v-model="formData.verifyer" placeholder="请输入验证人" :disabled="isDisabled"/>-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
         <el-col :span="12">
           <el-form-item label="验证内容" prop="verifyContent">
             <el-input v-model="formData.verifyContent" type="textarea" :input-style="{height:'100px'}" maxlength="300" placeholder="请输入验证内容" />
@@ -42,6 +42,7 @@ import * as EquipmentInspectionMainApi from '@/api/eam/equipmentInspectionMain'
 import { SearchTable } from '@/components/SearchTable'
 import {ElInput} from "element-plus";
 import * as EquipmentSpotCheckMainApi from "@/api/eam/equipmentSpotCheckMain";
+import {updateEquipmentSpotCheck} from "@/api/eam/equipmentSpotCheckMain";
 
 defineOptions({ name: 'TeamForm' })
 
@@ -63,15 +64,15 @@ const InputRef = ref<InstanceType<typeof ElInput>>()
 const formData = ref({
   id:'',
   number:'',
-  verifyer: '',
+ // verifyer: '',
   verifyContent: '',
   verifyTime: '',
 })
 const formRules = reactive({
-  verifyer: [
-    { required: true, message: '验证人不能为空', trigger: 'blur' },
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
-  ],
+  // verifyer: [
+  //   { required: true, message: '验证人不能为空', trigger: 'blur' },
+  //   { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  // ],
   verifyContent: [
     { required: true, message: '验证内容不能为空', trigger: 'blur' },
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
@@ -103,7 +104,7 @@ const submitForm = async (val) => {
    if (!valid) return
 
    //发送数据
-   await EquipmentSpotCheckMainApi.updateEquipmentSpotCheckMain(formData.value)
+   await EquipmentSpotCheckMainApi.updateEquipmentSpotCheck(formData.value)
    //把success函数传递到父页面
    emit('success',formData.value.id)
    dialogVisible.value = false
diff --git a/src/views/eam/equipmentSpotCheckMain/index.vue b/src/views/eam/equipmentSpotCheckMain/index.vue
index 2a739799f..3b076c62b 100644
--- a/src/views/eam/equipmentSpotCheckMain/index.vue
+++ b/src/views/eam/equipmentSpotCheckMain/index.vue
@@ -89,10 +89,6 @@ import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/views/eam/equipmentSpotCheckMain/SpotCheckOrderDetail.vue'
 import FinishForm1 from '@/views/eam/equipmentSpotCheckMain/finishForm1.vue'
 import FinishForm2 from '@/views/eam/equipmentSpotCheckMain/finishForm2.vue'
-import {
-  EquipmentInspectionDetail,
-  EquipmentInspectionDetailRules
-} from "@/views/eam/equipmentInspectionDetail/equipmentInspectionDetail.data";
 import {EquipmentAccounts} from "@/views/eam/equipmentAccounts/equipmentAccounts.data";
 import * as EquipmentItemApi from "@/api/eam/equipmentAccounts";
 import {ToolAccounts} from "@/views/eam/toolAccounts/toolAccounts.data";
@@ -395,19 +391,19 @@ const handleValidate = async (row) => {
 
 
 const detailBasicFormOnChange = (field, item) => {
-  //未完成
+  //异常
   if(field == 'result' && item == '1'){
     EquipmentSpotCheckDetail.allSchemas.formSchema.forEach((items) => {
       if (items.field == 'uncompletedCause') {
-        EquipmentInspectionDetailRules.uncompletedCause[0].required = true
+        EquipmentSpotCheckDetailRules.uncompletedCause[0].required = true
       }
     })
   }
-  //完成
+  //正常
   if(field == 'result' && item == '0'){
     EquipmentSpotCheckDetail.allSchemas.formSchema.forEach((items) => {
       if (items.field == 'uncompletedCause') {
-        EquipmentInspectionDetailRules.uncompletedCause[0].required = false
+        EquipmentSpotCheckDetailRules.uncompletedCause[0].required = false
         detailRef.value.formRef.formRef.setValues({
           uncompletedCause:''
         })

From 2fec157dfd7a463c4263bc8d0f2f1798ec8c6910 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 27 Jun 2024 14:32:51 +0800
Subject: [PATCH 026/408] =?UTF-8?q?=E6=9C=AA=E6=89=A7=E8=A1=8C=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../issueRequestMain/issueRequestMain.data.ts      | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
index f5c3345d5..701d7a9ce 100644
--- a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
+++ b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
@@ -764,6 +764,7 @@ export const IssueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  
   {
     label: '备注',
     field: 'remark',
@@ -930,6 +931,19 @@ export const IssueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isTableForm: false,
     isForm: false
   },
+  {
+    label: '未执行任务数量',
+    field: 'unexecutedQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    },
+    isTableForm:false,
+    hiddenInMain:true,
+  },
   {
     label: '操作',
     field: 'action',

From ffb76f94fcbb5dec6bc324da5b89f30bbca03987 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 27 Jun 2024 15:38:49 +0800
Subject: [PATCH 027/408] =?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                   | 5 ++---
 .../supplierdeliver/supplierdeliverRequestMain/index.vue     | 1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue
index c658bdbba..703f5f630 100644
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@@ -316,7 +316,7 @@
       </el-table-column>
     </el-table>
     <!-- :page-sizes="[ 10,20, 30, 50, 100]" sizes-->
-    <el-pagination v-show="tableData.length>5" style="margin-top:10px"
+    <el-pagination v-show="tableData.length>10" style="margin-top:10px"
           v-model:current-page="currentPage"
           v-model:page-size="pageSize"
           :small="true"
@@ -542,8 +542,7 @@ const buttonOperationClick = (row, label, index)=> {
 const currentPage =ref(1)
 const pageSize = ref(10)
 const showTableData = ()=>{
-  console.log('props.tableData',props.tableData)
-  if(props.tableData.length>100){
+  if(props.tableData.length>10){
     return props.tableData.slice((currentPage.value-1)*pageSize.value,currentPage.value*pageSize.value)
   }else{
     return props.tableData
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index e22d13671..e3dd21a14 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -821,6 +821,7 @@ const formLabelRef = ref()
 const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({
   getListApi: SupplierdeliverRequestDetailApi.getSupplierdeliverRequestDetailPage
 })
+detatableData.pageSize = 500
 const { getList:getDetailList } = detatableMethods
 
 

From a099cbacea1a307adfc86b57deecfd2c3a52ef11 Mon Sep 17 00:00:00 2001
From: zhaoyiran <zhaoyrd@yonyou.com>
Date: Thu, 27 Jun 2024 15:45:18 +0800
Subject: [PATCH 028/408] =?UTF-8?q?=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/pickJobMain/index.ts    | 4 ++--
 src/api/wms/pickRecordMain/index.ts | 4 ++--
 src/api/wms/plansetting/index.ts    | 4 ++--
 src/api/wms/scrapJobMain/index.ts   | 4 ++--
 src/api/wms/stockupMainJob/index.ts | 4 ++--
 src/api/wms/strategy/index.ts       | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/api/wms/pickJobMain/index.ts b/src/api/wms/pickJobMain/index.ts
index 20722e557..3cf2aa47f 100644
--- a/src/api/wms/pickJobMain/index.ts
+++ b/src/api/wms/pickJobMain/index.ts
@@ -75,7 +75,7 @@ export const exportPickJobMain = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
-    return await request.post({ url: '/wms/pick-job-main/export-excel-senior', data })
+    return await request.downloadPost({ url: '/wms/pick-job-main/export-excel-senior', data })
   } else {
     return await request.download({ url: `/wms/pick-job-main/export-excel`, params })
   }
@@ -84,4 +84,4 @@ export const exportPickJobMain = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/pick-job-main/get-import-template' })
-}
\ No newline at end of file
+}
diff --git a/src/api/wms/pickRecordMain/index.ts b/src/api/wms/pickRecordMain/index.ts
index bf291181c..78e83914e 100644
--- a/src/api/wms/pickRecordMain/index.ts
+++ b/src/api/wms/pickRecordMain/index.ts
@@ -62,7 +62,7 @@ export const exportPickRecordMain = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
-    return await request.post({ url: '/wms/pick-record-main/export-excel-senior', data })
+    return await request.downloadPost({ url: '/wms/pick-record-main/export-excel-senior', data })
   } else {
     return await request.download({ url: `/wms/pick-record-main/export-excel`, params })
   }
@@ -71,4 +71,4 @@ export const exportPickRecordMain = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/pick-record-main/get-import-template' })
-}
\ No newline at end of file
+}
diff --git a/src/api/wms/plansetting/index.ts b/src/api/wms/plansetting/index.ts
index 1b703dadc..07badf234 100644
--- a/src/api/wms/plansetting/index.ts
+++ b/src/api/wms/plansetting/index.ts
@@ -51,7 +51,7 @@ export const exportPlansetting = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
-    return await request.post({ url: '/wms/plansetting/export-excel-senior', data })
+    return await request.downloadPost({ url: '/wms/plansetting/export-excel-senior', data })
   } else {
     return await request.download({ url: `/wms/plansetting/export-excel`, params })
   }
@@ -60,4 +60,4 @@ export const exportPlansetting = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/plansetting/get-import-template' })
-}
\ No newline at end of file
+}
diff --git a/src/api/wms/scrapJobMain/index.ts b/src/api/wms/scrapJobMain/index.ts
index e2cc48093..61a448a59 100644
--- a/src/api/wms/scrapJobMain/index.ts
+++ b/src/api/wms/scrapJobMain/index.ts
@@ -85,7 +85,7 @@ export const exportScrapJobMain = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
-    return await request.post({ url: '/wms/scrap-job-main/export-excel-senior', data })
+    return await request.downloadPost({ url: '/wms/scrap-job-main/export-excel-senior', data })
   } else {
     return await request.download({ url: `/wms/scrap-job-main/export-excel`, params })
   }
@@ -94,4 +94,4 @@ export const exportScrapJobMain = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/scrap-job-main/get-import-template' })
-}
\ No newline at end of file
+}
diff --git a/src/api/wms/stockupMainJob/index.ts b/src/api/wms/stockupMainJob/index.ts
index b9dffb7ff..150609126 100644
--- a/src/api/wms/stockupMainJob/index.ts
+++ b/src/api/wms/stockupMainJob/index.ts
@@ -84,7 +84,7 @@ export const exportStockupMainJob = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
-    return await request.post({ url: '/wms/stockup-main-job/export-excel-senior', data })
+    return await request.downloadPost({ url: '/wms/stockup-main-job/export-excel-senior', data })
   } else {
     return await request.download({ url: `/wms/stockup-main-job/export-excel`, params })
   }
@@ -113,4 +113,4 @@ export const closeStockupMainJob = async (id) => {
 // 执行发货任务主
 export const executeStockupMainJob = async (data: StockupMainJobVO) => {
   return await request.put({ url: `/wms/stockup-main-job/execute`, data })
-}
\ No newline at end of file
+}
diff --git a/src/api/wms/strategy/index.ts b/src/api/wms/strategy/index.ts
index d10cd5108..bd26f0071 100644
--- a/src/api/wms/strategy/index.ts
+++ b/src/api/wms/strategy/index.ts
@@ -46,7 +46,7 @@ export const exportStrategy = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
-    return await request.post({ url: '/wms/strategy/export-excel-senior', data })
+    return await request.downloadPost({ url: '/wms/strategy/export-excel-senior', data })
   } else {
     return await request.download({ url: `/wms/strategy/export-excel`, params })
   }

From fa62f879263c73d55fc3b0338d74e8bd4bbc5c34 Mon Sep 17 00:00:00 2001
From: bjang03 <259278618@qq.com>
Date: Thu, 27 Jun 2024 15:50:11 +0800
Subject: [PATCH 029/408] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D=201=E3=80=81?=
 =?UTF-8?q?=E7=9B=98=E7=82=B9=E4=BB=BB=E5=8A=A1=EF=BC=8C=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E8=BE=93=E5=85=A5=E7=9B=98=E7=82=B9=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=EF=BC=8C=E5=9C=A8=E5=AF=BC=E5=85=A5=EF=BC=8C=E6=8A=A5?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../countManage/count/countPlanMain/countPlanMain.data.ts    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
index 4071a1df5..fd38865bb 100644
--- a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
+++ b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
@@ -783,8 +783,7 @@ export const CountPlanDetailRules = reactive({
     { required: true, message: '请选择盘点范围类型', trigger: 'change' }
   ],
   value: [
-    { required: true, message: '请选择盘点范围值', trigger: ['blur','change'] },
-    { max: 50, message: '不得超过50个字符', trigger: ['blur','change'] }
+    { required: true, message: '请选择盘点范围值', trigger: ['blur','change'] }
   ],
 })
 /**
@@ -830,4 +829,4 @@ export const CountPlanMain1 = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-]))
\ No newline at end of file
+]))

From 441cc9f8cb712ac5405c50d2a6ad1aa0a3383992 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 27 Jun 2024 16:47:05 +0800
Subject: [PATCH 030/408] basicform

---
 src/components/BasicForm/src/BasicForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 854ededeb..2df16c7e7 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -494,7 +494,7 @@ watch(()=>props.tableData,() => {
 })
 watch(()=>unref(formRef)?.formModel,() => {
   if(props?.sumFormDataByForm&&unref(formRef)?.formModel){
-    props?.sumFormDataByForm(formRef,unref(formRef)?.formModel)
+    props?.sumFormDataByForm(formRef,unref(formRef)?.formModel,props.tableData)
   }
 },{
   deep:true

From 91affd6163c880a8a41869a15229d5c6cf751022 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Thu, 27 Jun 2024 16:51:18 +0800
Subject: [PATCH 031/408] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/purchasereceiptRequestDetail/index.ts |   12 +
 .../productputawayJobMain/index.vue           |    4 +-
 .../productputawayAssembleJobMain/index.vue   |  127 +-
 .../productputawayAssembleJobMain.data.ts     |    2 +-
 .../purchasereceiptRequestMain.data.ts        |    2 +-
 .../index.vue                                 |  795 ++++++
 .../purchasereceiptRequestMain.data.ts        | 2473 +++++++++++++++++
 7 files changed, 3340 insertions(+), 75 deletions(-)
 create mode 100644 src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue
 create mode 100644 src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/purchasereceiptRequestMain.data.ts

diff --git a/src/api/wms/purchasereceiptRequestDetail/index.ts b/src/api/wms/purchasereceiptRequestDetail/index.ts
index 13ce13323..4d5789976 100644
--- a/src/api/wms/purchasereceiptRequestDetail/index.ts
+++ b/src/api/wms/purchasereceiptRequestDetail/index.ts
@@ -57,6 +57,18 @@ export const getPurchasereceiptRequestDetailPageSpare = async (params) => {
   }
 }
 
+
+// 查询M类型收货申请子列表
+export const getPurchasereceiptRequestDetailPageOrderMType = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/purchasereceipt-request-detail/seniorOrderMType', data })
+  } else {
+    return await request.get({ url: `/wms/purchasereceipt-request-detail/pageOrderMType`, params })
+  }
+}
+
 // 查询采购收货申请子详情
 export const getPurchasereceiptRequestDetail = async (id: number) => {
   return await request.get({ url: `/wms/purchasereceipt-request-detail/get?id=` + id })
diff --git a/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
index 6ba1e2d00..b8f15698c 100644
--- a/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
+++ b/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
@@ -227,14 +227,14 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 const BASE_URL = getJmreportBaseUrl()
 const src = ref(BASE_URL + '/jmreport/view/965858364788637696?token=' + getAccessToken())
 const handleDocumentPrint = async (row) => {
-  window.open(src.value+'&id='+row.masterId)
+  window.open(src.value+'&type=predict'+'&id='+row.masterId)
 }
 
 /**
  * 待处理全部打印
  */
 const handleDocumentPrintAll = async () => {
-  window.open(src.value+'&id=printAllPending')
+  window.open(src.value+'&type=predict'+'&id=printAllPending')
 }
 
 /** 导出按钮操作 */
diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue
index af130fef1..a7ba72a23 100644
--- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue
+++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue
@@ -73,6 +73,9 @@ import * as ProductputawayJobMainApi from '@/api/wms/productputawayJobMain'
 import * as ProductputawayJobDetailApi from '@/api/wms/productputawayJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import * as SwitchApi from '@/api/wms/switch'
+import {getAccessToken} from "@/utils/auth";
+import { getJmreportBaseUrl } from '@/utils/systemParam'
 // 装配制品上架任务主
 defineOptions({ name: 'ProductputawayJobMain' })
 
@@ -114,13 +117,40 @@ const { tableObject, tableMethods } = useTable({
 // 获得表格的各种操作
 const { getList, setSearchParams } = tableMethods
 
+const switchproductPutawayJobPrint = ref(false)
+const getSwitchStatus = async ()=>{
+  let res = await SwitchApi.getSwitchPage({
+    pageSize: 20,
+    pageNo: 1,
+    code: 'productPutawayJobPrint'
+  })
+  console.log('getSwitchStatus',res)
+  if(res&&res.list){
+    switchproductPutawayJobPrint.value = res.list[0].effectiveSetValue == 'TRUE'
+    
+  }
+}
+
 // 列表头部按钮
-const HeadButttondata = [
+const HeadButttondata = computed(()=>{
+  return [
   defaultButtons.defaultExportBtn({hasPermi:'wms:productputaway-job-main:export'}), // 导出
+  {
+      label: '待处理状态全部打印',
+      name: 'printAllPending',
+      hide: !switchproductPutawayJobPrint.value,
+      type: 'primary',
+      icon: '',
+      color: '',
+      hasPermi: ''
+  },
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
-]
+]})
+
+
+
 
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
@@ -134,6 +164,9 @@ const buttonBaseClick = (val, item) => {
     } else {
       getList()
     }
+  } else if(val == 'printAllPending'){
+    // 单据打印
+    handleDocumentPrintAll()
   } else if (val == 'filtrate') { // 筛选
   } else { // 其他按钮
     console.log('其他按钮', item)
@@ -156,6 +189,7 @@ const butttondata = (row,$index) => {
     return []
   }
   return [
+  defaultButtons.mainListDocumentPrintBtn({hide:!switchproductPutawayJobPrint.value}), // 单据打印
     defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
     defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
     defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
@@ -166,75 +200,7 @@ const butttondata = (row,$index) => {
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
   if (val == 'mainJobExe') { // 执行
-    let aaa = {
-    "id": "1809190000111838147",
-    "requestNumber": "REC4620231214-0004",
-    "supplierCode": null,
-    "fromWarehouseCode": "W1",
-    "toWarehouseCode": null,
-    "fromAreaCodes": "",
-    "toAreaCodes": "",
-    "fromAreaTypes": "WIP,RAW",
-    "toAreaTypes": "SEMI,FG",
-    "completetime": 1702545291000,
-    "requestTime": 1702524283000,
-    "requestDueTime": 1689562428000,
-    "status": "2",
-    "expiredTime": null,
-    "updateTime": 1702545291000,
-    "updater": "1",
-    "jobStageStatus": null,
-    "priority": null,
-    "priorityIncrement": null,
-    "departmentCode": "103",
-    "acceptUserId": "1",
-    "acceptTime": 1702552206000,
-    "completeUserId": null,
-    "number": "JOB2220231214-0007",
-    "businessType": "ProductPutaway",
-    "remark": "111100",
-    "createTime": 1702545291000,
-    "creator": "1",
-    "autoComplete": "FALSE",
-    "allowModifyLocation": "FALSE",
-    "allowModifyQty": "TRUE",
-    "allowBiggerQty": "TRUE",
-    "allowSmallerQty": "TRUE",
-    "allowModifyInventoryStatus": "TRUE",
-    "allowContinuousScanning": "TRUE",
-    "allowPartialComplete": "TRUE",
-    "allowModifyBatch": "FALSE",
-    "allowModifyPackingNumber": "FALSE",
-    "inInventoryStatuses": "OK",
-    "outInventoryStatuses": "OK",
-      subList: [
-      {
-    "id": "1809190001814017359",
-    "packingNumber": "12",
-    "containerNumber": "001",
-    "batch": "21",
-    "inventoryStatus": "OK",
-    "poNumber": null,
-    "poLine": "item01",
-    "fromLocationCode": "H03",
-    "toLocationCode": "L-R-001-002-1-02",
-    "itemCode": "item01",
-    "itemName": "物料01",
-    "itemDesc1": "",
-    "itemDesc2": "",
-    "projectCode": "xm01",
-    "qty": 3,
-    "uom": "EA",
-    "number": "JOB2220231214-0007",
-    "remark": "00",
-    "createTime": 1702545291000,
-    "creator": "1",
-    "fromOwnerCode": null,
-    "toOwnerCode": null
-}
-      ]
-    }
-    ProductputawayJobMainApi.executeProductputawayMain(aaa)
+    // ProductputawayJobMainApi.executeProductputawayMain(aaa)
   } else if (val == 'mainJobAba') { // 放弃
     await ProductputawayJobMainApi.abandonProductputawayMain(row.masterId)
     getList()
@@ -244,8 +210,26 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainJobAcc') { // 承接
     await ProductputawayJobMainApi.acceptProductputawayMain(row.masterId)
     getList()
+  }else if (val == 'documentPrint') {
+    // 单据打印
+    handleDocumentPrint(row)
   }
 }
+
+
+const BASE_URL = getJmreportBaseUrl()
+const src = ref(BASE_URL + '/jmreport/view/965858364788637696?token=' + getAccessToken())
+const handleDocumentPrint = async (row) => {
+  window.open(src.value+'&type=assemble'+'&id='+row.masterId)
+}
+
+/**
+ * 待处理全部打印
+ */
+const handleDocumentPrintAll = async () => {
+  window.open(src.value+'&type=assemble'+'&id=printAllPending')
+}
+
 // 获取部门 用于详情 部门回显
 const { wsCache } = useCache()
 /** 详情操作 */
@@ -283,6 +267,7 @@ const searchFormClick = (searchData) => {
 
 /** 初始化 **/
 onMounted(async () => {
+  await getSwitchStatus()
   getList()
 })
 </script>
diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/productputawayAssembleJobMain.data.ts b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/productputawayAssembleJobMain.data.ts
index 2531a7bc4..ed167fa55 100644
--- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/productputawayAssembleJobMain.data.ts
+++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/productputawayAssembleJobMain.data.ts
@@ -545,7 +545,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     isDetail: false,
     isForm: false,
     table: {
-      width: 150,
+      width: 300,
       fixed: 'right'
     },
   }
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
index b5e393dce..aec14295a 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
@@ -552,7 +552,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     isDetail: false,
     isForm: false,
     table: {
-      width: 300,
+      width: 400,
       fixed: 'right'
     },
   }
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue
new file mode 100644
index 000000000..f93c5f128
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue
@@ -0,0 +1,795 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="[...PurchasereceiptRequestMain.allSchemas.searchSchema,...PurchasereceiptRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="PurchasereceiptRequestMain.allSchemas"
+      :detailAllSchemas="PurchasereceiptRequestDetail.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"
+    :isOpenSearchTable="true"
+    fieldTableColumn="poNumber"
+    :rules="PurchasereceiptRequestMainRules"
+    :formAllSchemas="PurchasereceiptRequestMain.allSchemas"
+    :tableAllSchemas="PurchasereceiptRequestDetail.allSchemas"
+    :tableFormRules="PurchasereceiptRequestDetailRules"
+    :tableData="tableData"
+    :apiUpdate="PurchasereceiptRequestMainApi.updatePurchasereceiptRequestMain"
+    :apiCreate="PurchasereceiptRequestMainApi.createPurchasereceiptRequestMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    :isShowReduceButtonSelection="true"
+    @tableSelectionDelete="tableSelectionDelete"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+    @formFormDateChange="formFormDateChange"
+    @onEnter="onEnter"
+  >
+  <template  v-slot="{row}">
+    <el-date-picker v-bind:modelValue="row['expireTime']?addDay(row['produceDate'],row['expireTime']):dayjs('2099-12-31').valueOf()"
+    :clearable="true"
+    style="width: 100%"
+    :disabled="true" 
+    :placeholder="t('ts.选择日期')"/>
+    </template>
+  </BasicForm>
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="PurchasereceiptRequestMain.allSchemas"
+    :detailAllSchemas="detailAllSchemas"
+    :detailAllSchemasRules="PurchasereceiptRequestDetailRules"
+    :apiCreate="PurchasereceiptRequestDetailApi.createPurchasereceiptRequestDetail"
+    :apiUpdate="PurchasereceiptRequestDetailApi.updatePurchasereceiptRequestDetail"
+    :apiPage="apiPage"
+    :apiDelete="PurchasereceiptRequestDetailApi.deletePurchasereceiptRequestDetail"
+    fromeWhere="purchasereceipt"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+    :detailButtonIsShowAdd="false"
+    :detailButtonIsShowEdit="false"
+    :detailButtonIsShowDelete="false"
+    :buttondataTable="buttondataTable"
+    @tableFormButton="tableFormButton"
+  />
+
+  <!-- 导入 -->
+  <ImportForm 
+    ref="importFormRef" 
+    url="/wms/purchasereceipt-request-main/import" 
+    :importTemplateData="importTemplateData" 
+    @success="importSuccess" 
+    :updateIsDisable="true"
+    :coverIsDisable="true"
+    :mode="2"
+  />
+
+  <!-- 创建标签 -->
+  <BasicForm
+    ref="formLabelRef"
+    @success="getList"
+    :tableAllSchemas="PurchasereceiptRequestDetailLabel.allSchemas"
+    :tableFormRules="PurchasereceiptRequestDetailRules"
+    :tableData="detatableData.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    :isShowReduceButton="false"
+    @submitForm="submitFormLabel"
+    @searchTableSuccess="searchTableSuccessLabel"
+  />
+  
+    <!-- 子包装弹窗 -->
+    <BasicForm
+    ref="detailParenPackingRef"
+    @success="getList"
+    :tableAllSchemas="PurchasereceiptRequestDetailPackingNumber.allSchemas"
+    :tableFormRules="PurchasereceiptRequestDetailRules"
+    :tableData="packingDetatableData.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    :isShowReduceButton="false"
+    :isShowFooterButtton="false"
+  />
+  <!-- 标签打印 -->
+  <SearchTable style="width:905px" ref="searchTableRef" @searchTableSuccess="searchTableSuccess1" />
+  <el-dialog
+      v-model="showQualityReport"
+      :title="t('质检明细')"
+      width="90%"
+      append-to-body
+      destroy-on-close
+    >
+    <iframe height="600px" width="100%"  :src="qualityReport" frameborder="0"></iframe>
+  </el-dialog>
+  
+</template>
+
+<script setup lang="ts">
+import dayjs from 'dayjs'
+import { addDay } from '@/utils/formatTime'
+import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { 
+  PurchasereceiptRequestMain,
+  PurchasereceiptRequestMainRules,
+  PurchasereceiptRequestDetail,
+  PurchasereceiptRequestDetailRules,
+  PurchasereceiptRequestDetailLabel,
+  PurchasereceiptRequestDetailPackingNumber
+ } from './purchasereceiptRequestMain.data'
+ import {
+  SupplierdeliverRequestPackage
+} from '../../supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data'
+ import { PurchaseDetail } from '../../supplierdeliver/purchaseMain/purchaseMain.data'
+ import * as PackageApi from '@/api/wms/package'
+import * as PurchasereceiptRequestMainApi from '@/api/wms/purchasereceiptRequestMain'
+import * as PurchasereceiptRequestDetailApi from '@/api/wms/purchasereceiptRequestDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { formatDate } from '@/utils/formatTime'
+import * as SupplieritemApi from '@/api/wms/supplieritem'
+import { getAccessToken } from '@/utils/auth'
+import * as PurchaseDetailApi from '@/api/wms/purchaseDetail'
+import * as ItembasicApi from '@/api/wms/itembasic'
+import { getJmreportBaseUrl } from '@/utils/systemParam'
+import { getReportUrl } from '@/utils/systemParam'
+
+// 采购收货申请-M类型收货
+defineOptions({ name: 'PurchasereceiptRequestOrderMTypeMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const genLabelId = ref(); //主表ID
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref([...PurchasereceiptRequestMain.allSchemas.tableColumns,...PurchasereceiptRequestDetail.allSchemas.tableMainColumns])
+
+const apiPage = ref(PurchasereceiptRequestDetailApi.getPurchasereceiptRequestDetailPageOrderMType)
+const detailAllSchemas = ref(PurchasereceiptRequestDetail.allSchemas)
+
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccessLabel = (formField, searchField, val, formRef, type, row) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      row[formField] = val[0][searchField]
+      if (formField == 'packUnit' || formField == 'packQty') {
+        row['packUnit'] = val[0]['packUnit']
+        row['packQty'] = val[0]['packQty']
+      }
+      if (formField == 'secondPackUnit') {
+        row['secondPackUnit'] = val[0]['packUnit']
+        row['secondPackQty'] = val[0]['packQty']
+      }
+    } 
+  })
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  //console.log("formRef",formRef)
+  console.log("searchTableSuccess",formField, searchField, val, formRef, type, row)
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      //row[formField] = val[0][searchField]
+      if(formField == 'itemCode') {
+        row['itemCode'] = val[0]['code']
+      } else if(formField == 'poNumber') {
+        updateTableData(val)
+        // row['poNumber'] = val[0]['number']
+
+      } else if(formField == 'poLine'){
+        //添加费用明细--点击确定
+        val.forEach(item=>{
+          if(tableData.value.find(item1=>item1['id'] == item['id'])) return
+          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...row}))
+          newRow['poLine'] = item['lineNumber']
+          newRow['itemCode'] = item['itemCode']
+          newRow['uom'] = item['uom']
+          newRow['poNumber'] = item['number']
+          newRow['poLineType'] = item['poLineType']
+          let supplierCode = formRef.formModel.supplierCode;
+          let queryData = {
+            supplierCode:supplierCode,
+            itemCode: item['itemCode']
+          } 
+          SupplieritemApi.getDefaultLocationCode(queryData as SupplieritemApi.SupplieritemVO).then(res =>{
+            newRow['defaultToLocationCode'] = res
+            tableData.value.push(newRow)
+          })
+        })
+      }else if (formField == 'packQty'){
+        row['packQty'] = val[0]['packQty']
+        row['packUnit'] = val[0]['packUnit']
+      }else if(formField == 'defaultToLocationCode'){
+        row['defaultToLocationCode'] = val[0]['code']
+      }
+    } else {
+      const setV = {}
+      if(formField == 'supplierCode'){
+        setV['supplierCode'] = val[0]['code']
+      }else if(formField == 'poNumber') {
+        //新增--采购订单--
+        setV['supplierCode'] = val[0]['supplierCode']
+        setV['poNumber'] = val[0]['number']
+        const newRow = val[0]
+        newRow['poNumber'] = val[0]['number']
+        // 请求明细数据
+        getSearchTableData(val[0]['number'])
+        // tableData.value = [newRow]
+        // formRef.handleAddTable()
+      }
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    }
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    if(formField == 'itemCode') {
+      setV['itemCode'] = val[0]['code']
+    } else {
+      setV['poNumber'] = val[0]['number']
+      setV['poLine'] = val[0]['lineNumber']
+    }
+    formRef.setValues(setV)
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: PurchasereceiptRequestDetailApi.getPurchasereceiptRequestDetailPageOrderMType // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn(null), // 新增
+  defaultButtons.defaultImportBtn(null), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:purchasereceipt-request-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+]
+
+// 头部按钮事件
+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 isASNShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    if(row.sourceType == 'ASN_ExternalReceipt'){
+      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.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:purchasereceipt-request-main:reAdd'}), //重新添加
+    defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-request-main:submit'}), // 提交审批
+    defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-request-main:refused'}), // 驳回
+    defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-request-main:agree'}), // 审批通过
+    // defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-request-main:update'}), // 编辑
+    {
+      label: '生成标签',
+      name: 'ssbq',
+      hide: isASNShowMainButton(row, ['3']),
+      type: 'primary',
+      icon: '',
+      color: '',
+      hasPermi: '',
+      link: true // 文本展现按钮
+    },
+    defaultButtons.mainListPointBtn({ hide: isASNShowMainButton(row, ['3','8']) }), // 标签打印
+    defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:purchasereceipt-request-main:handle'}), // 处理
+    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:purchasereceipt-request-main:close'}), // 关闭
+    defaultButtons.mainListPlanCheckQualityReportBtn({}), // 查看质检报告
+      ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainClose') { // 关闭
+    handleClose(row.masterId)
+  } else if (val == 'mainReAdd') { // 重新添加
+    handleReAdd(row.masterId)
+  } else if (val == 'mainSubmit') { // 提交审批
+    handleSubmit(row.masterId)
+  } else if (val == 'mainTurnDown') { // 驳回
+    handleRefused(row.masterId)
+  } else if (val == 'mainApprove') { // 审批通过
+    handleAgree(row.masterId)
+  } else if (val == 'mainHandle') { // 处理
+    handleHandle(row.masterId)
+  } else if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if(val == 'ssbq'){ // 生成标签
+     // 生成标签
+     detatableData.params = {
+      masterId:row.masterId
+     }
+    genLabelId.value = row.masterId
+    await getDetailList()
+    formLabelRef.value.open('create', row, null,'createLabel')//创建标签页面 createLabel 标题
+  }else if (val == 'point') {
+    // 标签打印
+    labelPrint(row)
+  }else if(val == 'mainPlanCheckQualityReport'){
+    // 查看质检报告
+    checkQualityReport(row)
+  }
+}
+
+// 查看质检报告
+const showQualityReport = ref(false)
+const qualityReport = ref('')
+const checkQualityReport = async (row)=>{
+  showQualityReport.value = true
+  qualityReport.value = `${getReportUrl()}/purchasereceiptReport?asnNumber=${row.asnNumber}`
+}
+
+// 生成标签
+const isCreateLabel = ref(false)
+const formLabelRef = ref()
+const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({
+  getListApi: PurchasereceiptRequestDetailApi.getPurchasereceiptRequestDetailPage
+})
+const { getList:getDetailList } = detatableMethods
+
+// 生成标签按钮操作
+const submitFormLabel = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
+  try {
+    console.log("formType==",formType)
+    console.log("data==",data)
+    data.subList = detatableData.tableList
+    console.log("detatableData",detatableData)
+    await message.confirm(t('ts.是否为此数据生成标签？'))
+    await PurchasereceiptRequestMainApi.genLabel(data) //genLabelId.value
+    isCreateLabel.value = true
+    message.success('创建标签成功')
+  } finally {
+    formLabelRef.value.formLoading = false
+    formLabelRef.value.dialogVisible = false
+  }
+}
+
+const BASE_URL = getJmreportBaseUrl()
+const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+
+// 标签打印
+const searchTableRef = ref()
+const labelPrint = async (row) => {
+  tableObject.loading = true
+  const defaultParams = {'moduleName':'purchasereceipt_request','recordNumber':row.asnNumber}
+  const {tableObject:tableObjectPrint ,tableMethods} = useTable({
+    defaultParams,
+    getListApi: PackageApi.getLabelDetailPage  // 分页接口
+  })
+
+  // 获得表格的各种操作
+  const { getList:getListPrint } = tableMethods
+  getListPrint()
+  tableObject.loading = false
+  const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns
+  tableColumns.forEach((item) => {
+    item.width = item.table?.width || 150
+  })
+  searchTableRef.value.openData("标签信息",tableObjectPrint,{tableColumns},true)
+}
+
+// 批量打印---采购收货申请
+const searchTableSuccess1 = async (formField, searchField, val, formRef, type, row) => {
+  console.log('批量打印',val)
+  // let rows:any = []
+  // val.forEach(item=>{
+  //   rows = [...rows,...item.selectionRows.map(item1=>item1.number)]
+  // })
+  if(val.length == 0){
+    message.warning("请先选择要打印的数据!")
+    return
+  }
+  // window.open(src.value + '&asn_number=' + val.map(item1=>item1.number).join(','))
+
+  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('创建标签失败')
+  })
+}
+
+const updateTableData = (tableList)=>{
+  tableList.forEach(row=>{
+    //poNumber poLine itemCode batch
+    const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...row}))
+    newRow['poLine'] = row['lineNumber']
+    newRow['itemCode'] = row['itemCode']
+    newRow['uom'] = row['uom']
+    newRow['poNumber'] =row['number']
+    newRow['supplierCode'] =row['supplierCode']
+    //生产日期 到货日期 默认当天
+    newRow['produceDate'] = dayjs().valueOf()
+    newRow['arriveDate'] = dayjs().valueOf()
+    //批次
+    newRow['batch'] = formatDate(newRow['produceDate'],'YYYYMMDD');
+    newRow['defaultToLocationCode'] =row['defaultLocation']
+    if(!tableData.value.find((item:object)=>item.poNumber == newRow.poNumber&&item.itemCode == newRow.itemCode&&item.poLine == newRow.poLine&&item.batch == newRow.batch)){
+      tableData.value.push(newRow)
+    }
+  })
+}
+
+const getSearchTableData = async (number,isEnter=false)=>{
+  const {tableObject ,tableMethods} = useTable({
+    defaultParams:{number},
+    getListApi: PurchaseDetailApi.getPurchaseDetailPageWMS // 分页接口
+  })
+  // 获得表格的各种操作
+  const { getList:getList1 } = tableMethods
+  await getList1()
+  const tableColumns = PurchaseDetail.allSchemas.tableFormColumns
+  tableColumns.forEach((item) => {
+    item.width = item.table?.width || 150
+  })
+  tableData.value = []
+  updateTableData(tableObject.tableList)
+  const itemCodes = []
+  tableObject.tableList.forEach(row=>{
+    itemCodes.push(row['itemCode'])
+    if(isEnter){
+      //回车--供应商代码
+      const setV = {}
+      setV['poNumber'] = number
+      setV['supplierCode'] = row.supplierCode
+      formRef.value.formRef.setValues(setV)
+    }
+  })
+  //有效期
+  ItembasicApi.getItembasicPage({
+    code:itemCodes.join(',')
+  }).then((res)=>{
+    res.list.forEach((item,index)=>{
+      const findItem = tableData.value.find(item1=>item1['itemCode']==item['code'])
+      findItem['expireTime'] = item['expireTime']
+    })
+  })
+}
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  formRef.value.open(type, row)
+}
+
+
+// 子包装数据
+const detailParenPackingRef = ref()
+const { tableObject: packingDetatableData, tableMethods: packDetatableMethods } = useTable({
+  getListApi: PurchasereceiptRequestDetailApi.queryPurchaseceiptChildPackingNumber
+})
+const { getList:queryDetailList } = packDetatableMethods
+
+
+// 获取部门 用于详情 部门回显
+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
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'requestPurchasereceiptMain')
+}
+
+// 详情 table 操作扩展 按钮
+const buttondataTable = ref([{
+    label: '查看其他包装规格',
+    name: 'viewParentPickingNumber',
+    hide: false,
+    type: 'primary',
+    icon: '',
+    color: '',
+    hasPermi: '',
+    link: true, // 文本展现按钮
+  }])
+
+// 查看其他包装规格
+const tableFormButton = async (val , row) => {
+  if (val == 'viewParentPickingNumber') { //查看其他包装规格
+        packingDetatableData.params = {
+          masterId:row.masterId,
+          parentPackingNumber:row.packingNumber
+        }
+        await queryDetailList()
+        detailParenPackingRef.value.open('create', row, null,'viewDetail')//查看明细数据
+  }
+}
+
+/** 关闭按钮操作 */
+const handleClose = async (id: number) => {
+  try{
+    await message.confirm(t('common.confirmColse'))
+    tableObject.loading = true
+    await PurchasereceiptRequestMainApi.closePurchasereceiptRequestMain(id)
+    message.success(t('common.closeSuccess'))
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 重新添加按钮操作 */
+const handleReAdd = async (id: number) => {
+  try{
+    await message.confirm(t('common.confirmReAdd'))
+    tableObject.loading = true
+    await PurchasereceiptRequestMainApi.reAddPurchasereceiptRequestMain(id)
+    message.success(t('common.reAddSuccess'))
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 审批通过按钮操作 */
+const handleAgree = async (id: number) => {
+  try{
+    await message.confirm(t('common.confirmAgree'))
+    tableObject.loading = true
+    await PurchasereceiptRequestMainApi.agreePurchasereceiptRequestMain(id)
+    message.success(t('common.agreeSuccess'))
+    tableObject.loading = false
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 审批驳回按钮操作 */
+const handleRefused = async (id: number) => {
+  try{
+    await message.confirm(t('common.confirmRefused'))
+    tableObject.loading = true
+    await PurchasereceiptRequestMainApi.refusedPurchasereceiptRequestMain(id)
+    message.success(t('common.refusedSuccess'))
+    tableObject.loading = false
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 处理按钮操作 */
+const handleHandle = async (id: number) => {
+  try{
+    await message.confirm(t('common.confirmHandle'))
+    tableObject.loading = true
+    await PurchasereceiptRequestMainApi.handlePurchasereceiptRequestMain(id)
+    message.success(t('common.handleSuccess'))
+    tableObject.loading = false
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 提交按钮操作 */
+const handleSubmit = async (id: number) => {
+  try{
+    await message.confirm(t('common.confirmSubmit'))
+    tableObject.loading = true
+    await PurchasereceiptRequestMainApi.submitPurchasereceiptRequestMain(id)
+    message.success(t('common.submitSuccess'))
+    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 PurchasereceiptRequestMainApi.exportPurchasereceiptRequestMain(tableObject.params)
+    download.excel(data, '采购收货申请主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+PurchasereceiptRequestDetail.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 onEnter = async (field,value)=>{
+  console.log(field,value)
+  getSearchTableData(value,true)
+}
+// 主子数据 提交
+const submitForm = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
+  tableData.value.forEach((row, index) => {
+    row['expireDate'] = row['expireTime']?addDay(row['produceDate'],row['expireTime']).valueOf():dayjs('2099-12-31').valueOf()
+  })
+  data.subList = tableData.value // 拼接子表数据参数
+  try {
+    if (formType === 'create') {
+      await PurchasereceiptRequestMainApi.createPurchasereceiptRequestMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await PurchasereceiptRequestMainApi.updatePurchasereceiptRequestMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '采购收货申请主导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+// tabs 切换事件
+// const changeTabs = (data) =>{
+//   if(data.prop == 'receiptDetail'){
+//     apiPage.value = PurchasereceiptRequestDetailApi.getPurchasereceiptRequestDetailPage
+//     detailAllSchemas.value = PurchasereceiptRequestDetail.allSchemas    
+//   }else if(data.prop == 'scarceGoodsDetail'){
+//     apiPage.value = PurchasereceiptRequestDetailApi.getScarceGoodsDetailPage
+//     detailAllSchemas.value = PurchasereceiptRequestDetail.allSchemas    
+//   }
+// }
+
+const formFormDateChange = (field, val,row, index) => {
+  if(field == 'produceDate'){
+    let produceDateStr = formatDate(val,'YYYYMMDD');
+    row.batch = produceDateStr
+  }
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await PurchasereceiptRequestMainApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/purchasereceiptRequestMain.data.ts
new file mode 100644
index 000000000..19d1bb537
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/purchasereceiptRequestMain.data.ts
@@ -0,0 +1,2473 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+import * as SupplierApi from '@/api/wms/supplier'
+import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
+import * as PurchaseMainApi from '@/api/wms/purchaseMain'
+import * as PurchaseDetailApi from '@/api/wms/purchaseDetail'
+import * as LocationApi from '@/api/wms/location'
+import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
+import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
+import * as ItemPackageApi from '@/api/wms/itempackage/index'
+import { PurchaseDetail, PurchaseMain } from '../../supplierdeliver/purchaseMain/purchaseMain.data'
+import { useUserStore } from '@/store/modules/user'
+
+
+const { t } = useI18n() // 国际化
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'PurchaseReceiptRequest'
+}
+const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+const requestsettingData =data?.list[0]||{}
+
+
+// 获取当前操作人的部门
+const userStore = useUserStore()
+const userDept = userStore.userSelfInfo.dept
+// id 转str 否则form回显匹配不到
+userDept.id = userDept.id.toString()
+const userDeptArray:any = [userDept]
+
+/**
+ * @returns {Array} 采购收货申请主表
+ */
+export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    sortSearchDefault:1,
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '采购订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch:true,
+    sortTableDefault:4,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        enterSearch: true,
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择采购订单', // 输入框占位文本
+        searchField: 'number', // 查询弹窗赋值字段
+        searchTitle: '采购订单信息', // 查询弹窗标题
+        isConcatDetailSchemas:true,//是否是主子表合并 默认false
+        searchDetailSchemas:PurchaseDetail.allSchemas,
+        searchAllSchemas: PurchaseMain.allSchemas, // 查询弹窗所需类
+        searchPage: PurchaseDetailApi.getPurchaseDetailPageWMS, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'status',
+          value:'2',
+          message: '已发布状态',
+          isMainValue: false
+        },
+        {
+          key: 'status', // 查询列表中字段
+          value: '2', // 指查询具体值
+          action: '==', // 查询拼接条件
+          isSearch: true, // 使用自定义拼接条件
+          isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用
+        }]
+      }
+    },
+    isForm: true,
+  },
+  {
+    label: '发货单号',
+    field: 'asnNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch:true,
+    sortSearchDefault:3,
+    isForm: true,
+    sortTableDefault:2
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    sortTableDefault:1,
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    sortSearchDefault:2,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        disabled: true,
+        isSearchList: false, // 开启查询弹窗
+        searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '供应商信息', // 查询弹窗标题
+        searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
+        searchPage: SupplierApi.getSupplierPage // 查询弹窗所需分页方法
+      }
+    }
+  },
+  // {
+  //   label: '要货计划单号',
+  //   field: 'ppNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  //   form: {
+  //     // labelMessage: '信息提示说明！！！',
+  //     componentProps: {
+  //       isSearchList: true, // 开启查询弹窗
+  //       searchListPlaceholder: '请选择要货计划单号', // 输入框占位文本
+  //       searchField: 'number', // 查询弹窗赋值字段
+  //       searchTitle: '要货计划信息', // 查询弹窗标题
+  //       searchAllSchemas: PurchasePlanMain.allSchemas, // 查询弹窗所需类
+  //       searchPage: PurchasePlanMainApi.getPurchasePlanMainPage, // 查询弹窗所需分页方法
+  //       searchCondition: [
+  //         {
+  //           key: 'supplierCode',
+  //           value: 'supplierCode',
+  //           message: '请填写供应商代码！',
+  //           isMainValue: true
+  //         },
+  //         {
+  //           key: 'status',
+  //           value: 4,
+  //           isMainValue: false
+  //         },
+  //         {
+  //           key: 'available',
+  //           value: "TRUE",
+  //           isMainValue: false
+  //         }]
+  //     }
+  //   },
+  //   isForm: true,
+  // },
+  {
+    label: '承运商',
+    field: 'carrierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '运输方式',
+    field: 'transferMode',
+    dictType: DICT_TYPE.TRANSFER_MODE,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: false,
+  },
+  {
+    label: '车牌号',
+    field: 'vehiclePlateNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数据来源',
+    field: 'sourceType',
+    dictType: DICT_TYPE.PURCHASERECEIPT_SOURCE_TYPE,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: 'ASN_ExternalReceipt',
+      componentProps: {
+        disabled: true
+      }
+    },
+    isSearch: true,
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    isTable:false,
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    isTable:false,
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    isTable: false,
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    isTable: false,
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '到月台代码',
+    field: 'toDockCode',
+    sort: 'custom',
+    isTable: false,
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    isTable: false,
+    table: {
+      width: 150
+    },
+    form: {
+      value: 'PurchaseReceipt',
+      componentProps: {
+        disabled: true
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    isForm: false,
+    table: {
+      width: 180
+    },
+    formatter: dateFormatter,
+    detail: {
+      dateFormat : 'YYYY-MM-DD HH:mm:ss'
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    table: {
+      width: 130
+    },
+    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: 'requestTime',
+    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,
+    isTable: false,
+  },
+  // {
+  //   label: '截止时间',
+  //   field: 'dueTime',
+  //   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',
+  //     }
+  //   },
+  // },
+  // {
+  //   label: '部门',
+  //   field: 'departmentCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+  //     return userDeptArray.find((account) => account.id == cellValue)?.name
+  //   },
+  //   form: {
+  //     value: userDept.id,
+  //     component: 'Select',
+  //     api: () => userDeptArray,
+  //     componentProps: {
+  //       disabled: true,
+  //       optionsAlias: {
+  //         labelField: 'name',
+  //         valueField: 'id'
+  //       }
+  //     }
+  //   }
+  // },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: false,
+    isTable: true,
+    sortTableDefault:3,
+    isForm:false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    isForm:false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'FALSE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true,
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    isForm:false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'FALSE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true,
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    isForm:false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'FALSE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true,
+      }
+    }
+  },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isForm: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: "TRUE",
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+      }
+    }
+  },
+  {
+    label: '标签状态',
+    field: 'labelStatus',
+    sort: 'custom',
+    dictType: DICT_TYPE.LABEL_STATUS,
+    dictClass: 'string',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 400,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const PurchasereceiptRequestMainRules = reactive({
+  ppNumber: [
+    { required: true, message: '请输入采购订单', trigger: 'blur' }
+  ],
+  supplierCode: [
+    { required: true, message: '请输入供应商代码', trigger: 'blur' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请输入到仓库代码', trigger: 'blur' }
+  ],
+  toAreaTypes: [
+    { 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' }
+  ],
+  directCreateRecord: [
+    { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 采购收货申请子表
+ */
+export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+
+  {
+    label: '订单号',
+    field: 'poNumber',
+    hiddenInMain:true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:5,
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择订单号',
+      searchField: 'number',
+      searchTitle: '采购订单信息',
+      isConcatDetailSchemas:true,//是否是主子表合并 默认false
+      searchDetailSchemas:PurchaseDetail.allSchemas,
+      searchAllSchemas: PurchaseMain.allSchemas,
+      searchPage: PurchaseDetailApi.getPurchaseDetailPageWMS,
+      searchCondition: [
+      {
+        key:'number',
+        value:'poNumber',
+        action: '==', // 查询拼接条件
+        isSearch: true, // 使用自定义拼接条件
+        isFormModel:true,
+        isMainValue: false
+      },
+      {
+        key: 'status', // 查询列表中字段
+        value: '2', // 指查询具体值
+        action: '==', // 查询拼接条件
+        isSearch: true, // 使用自定义拼接条件
+        isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用
+      }]
+    },
+    form: {
+      labelMessage: '该订单号会影响订单行的选择',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择订单号',
+        searchField: 'number',
+        searchTitle: '采购订单信息',
+        searchDetailSchemas:PurchaseDetail.allSchemas,
+        searchAllSchemas: PurchaseMain.allSchemas,
+        searchPage: PurchaseDetailApi.getPurchaseDetailPageWMS,
+        searchCondition: [{
+          key:'supplierCode',
+          value:'supplierCode',
+          message: '请选择供应商！',
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: '订单类型',
+    field: 'type',
+    dictType: DICT_TYPE.WORK_ORDER_TYPE,
+    dictClass: 'string',
+    isSearch: false,
+    isTable: false,
+    isTableForm: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled:true
+    },
+    isForm: false,
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:5,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择订单行', // 输入框占位文本
+        searchField: 'lineNumber', // 查询弹窗赋值字段
+        searchTitle: '订单信息', // 查询弹窗标题
+        searchAllSchemas: PurchaseDetail.allSchemas, // 查询弹窗所需类
+        searchPage: PurchaseDetailApi.getPurchaseDetailPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'number',
+          value:'poNumber',
+          message: '请填写订单号！',
+          isMainValue: true
+        }]
+      }
+    },
+    tableForm:{
+      multiple:true,
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择订单行', // 输入框占位文本
+      searchField: 'lineNumber', // 查询弹窗赋值字段
+      searchTitle: '订单信息', // 查询弹窗标题
+      searchAllSchemas: PurchaseDetail.allSchemas, // 查询弹窗所需类
+      searchPage: PurchaseDetailApi.getPurchaseDetailPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key:'number',
+        value:'poNumber',
+        message: '请填写订单号！',
+        isMainValue: true
+      }]
+    }
+  },
+  {
+    label: '行类型',
+    field: 'poLineType',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    sortTableDefault:5,
+    hiddenInMain:true,
+    isForm: false,
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch:true,
+    sortTableDefault:6,
+    tableForm:{
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:7,
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:7,
+    hiddenInMain:true,
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:7,
+    hiddenInMain:true,
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain:true,
+    isTable:false,
+    isTableForm: false,
+    isForm: false
+  },
+  // {
+  //   label: '数量',
+  //   field: 'qty',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'InputNumber',
+  //     componentProps: {
+  //       min: 1,
+  //       precision: 6
+  //     },
+  //   },
+  //   tableForm: {
+  //     type: 'InputNumber',
+  //     min: 1,
+  //     precision: 6
+  //   }
+  // },
+  {
+    label: '订单数量',
+    field: 'orderQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      },
+    },
+    sortTableDefault:9,
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    }
+  },
+  {
+    label: '收货数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:9,
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      },
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:10,
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    }
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    hiddenInMain:true,
+    sortTableDefault:11,
+    isForm: false
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    dictClass: 'string',
+    isTable: true,
+    isTableForm: false,
+    sort: 'custom',
+    table: {
+      width: 150,
+      componentProps: {
+        disabled: true
+      }
+    },
+    sortTableDefault:11,
+    tableForm:{
+      disabled:true
+    },
+    isForm: true
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:11,
+    form: {
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择包装',
+        searchField: 'packQty',
+        searchTitle: '物品包装信息',
+        searchAllSchemas: Itempackaging.allSchemas,
+        searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
+        searchCondition: [
+          {
+            key: 'itemCode',
+            value: 'itemCode',
+            message: '请选择订单行',
+            isMainValue: true
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+
+        ]
+      }
+    },
+    tableForm: {
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择包装',
+      searchField: 'packQty',
+      searchTitle: '物品包装信息',
+      searchAllSchemas: Itempackaging.allSchemas,
+      searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
+      searchCondition: [
+        {
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请选择订单行',
+          isMainValue: true
+        },
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+    },
+    isTableForm: false,
+    isForm: true
+  },
+  {
+    label: '到库位代码',
+    field: 'defaultToLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:13,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库位信息', // 查询弹窗标题
+        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+        searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+      searchField: 'code', // 查询弹窗赋值字段
+      searchTitle: '库位信息', // 查询弹窗标题
+      searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+      searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    isTableForm: true,
+    isForm: false
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:13,
+    hiddenInMain:true,
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:13,
+    hiddenInMain:true,
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '供应商计量数量',
+    field: 'supplierPackQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:13,
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      },
+    },
+    hiddenInMain:true,
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '供应商计量单位',
+    field: 'supplierPackUnit',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:13,
+    hiddenInMain:true,
+    isTableForm: false,
+    isForm: false,
+    tableForm: {
+      type: 'Select'
+    }
+  },
+  {
+    label: '转换率',
+    field: 'convertRate',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:13,
+    hiddenInMain:true,
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0
+      },
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  // {
+  //   label: '替代批次',
+  //   field: 'altBatch',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTableForm: false,
+  //   isForm: false
+  // },
+  {
+    label: '到货日期',
+    field: 'arriveDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    sortTableDefault:11,
+    hiddenInMain:true,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm:{
+      type:'FormDate',
+      placeholder: '请选择到货日期',
+      valueFormat: 'x',
+    },
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    hiddenInMain:true,
+    sortTableDefault:11,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm:{
+      type:'FormDate',
+      placeholder: '请选择生产日期',
+      valueFormat: 'x',
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    sortTableDefault:8,
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    sortTableDefault:11,
+    table: {
+      width: 180
+    },
+    isTable:true,
+    hiddenInMain:true,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    // tableForm:{
+    //   type:'FormDate',
+    //   placeholder: '请选择过期日期',
+    //   valueFormat: 'x',
+    // },
+    tableForm:{
+      type: 'slot',
+      disabled: true
+    }
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:12,
+    hiddenInMain:true,
+    isTableForm: false,
+    isForm: false,
+    tableForm: {
+      type: 'Select'
+    }
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:12,
+    isTableForm: false,
+    isForm: false
+  },
+
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain:true,
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    hiddenInMain:true,
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain:true,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain:true,
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    hiddenInMain:true,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '操作',
+    hiddenInMain:true,
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+  }
+]))
+
+//表单校验
+export const PurchasereceiptRequestDetailRules = reactive({
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  produceDate: [
+    { required: true, message: '请输入生产日期', trigger: 'change' }
+  ],
+  arriveDate: [
+    { required: true, message: '请输入到货日期', trigger: 'change' }
+  ],
+  expireDate: [
+    { required: true, message: '请输入过期日期', trigger: 'change' }
+  ],
+  packQty: [
+    { required: true, message: '请输入包装数量', trigger: 'blur' }
+  ],
+  poNumber: [
+    { required: true, message: '请输入订单号', trigger: 'change' }
+  ],
+  poLine: [
+    { required: true, message: '请输入订单行', trigger: 'change' }
+  ],
+  packUnit: [
+    { required: true, message: '请选择包装规格', trigger: 'change' }
+  ],
+  convertRate: [
+    { required: true, message: '请输入转换率', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  itemCode: [
+    { required: true, message: '请输入物料代码', trigger: 'change' }
+  ],
+})
+
+/**
+ * @returns {Array} 采购收货申请子表--子包装号
+ */
+export const PurchasereceiptRequestDetailPackingNumber = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled:true,
+      isInpuFocusShow: false,
+      searchListPlaceholder: '请选择订单号',
+      searchField: 'number',
+      searchTitle: '采购订单信息',
+      searchAllSchemas: PurchaseMain.allSchemas,
+      searchPage: PurchaseMainApi.getPurchaseMainPage,
+      searchCondition: [{
+          key:'supplierCode',
+          value:'supplierCode',
+          message: '请选择供应商！',
+          isMainValue: true
+      }]
+    },
+    form: {
+      labelMessage: '该订单号会影响订单行的选择',
+      componentProps: {
+        disabled:true,
+        isSearchList: false,
+        searchListPlaceholder: '请选择订单号',
+        searchField: 'number',
+        searchTitle: '采购订单信息',
+        searchAllSchemas: PurchaseMain.allSchemas,
+        searchPage: PurchaseMainApi.getPurchaseMainPage,
+        searchCondition: [{
+          key:'supplierCode',
+          value:'supplierCode',
+          message: '请选择供应商！',
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        disabled:true,
+        isSearchList: false, // 开启查询弹窗
+        searchListPlaceholder: '请选择订单行', // 输入框占位文本
+        searchField: 'lineNumber', // 查询弹窗赋值字段
+        searchTitle: '订单信息', // 查询弹窗标题
+        searchAllSchemas: PurchaseDetail.allSchemas, // 查询弹窗所需类
+        searchPage: PurchaseDetailApi.getPurchaseDetailPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'number',
+          value:'poNumber',
+          message: '请填写订单号！',
+          isMainValue: true
+        }]
+      }
+    },
+    tableForm:{
+      disabled:true,
+      isInpuFocusShow: false,
+      searchListPlaceholder: '请选择订单行', // 输入框占位文本
+      searchField: 'lineNumber', // 查询弹窗赋值字段
+      searchTitle: '订单信息', // 查询弹窗标题
+      searchAllSchemas: PurchaseDetail.allSchemas, // 查询弹窗所需类
+      searchPage: PurchaseDetailApi.getPurchaseDetailPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key:'number',
+        value:'poNumber',
+        message: '请填写订单号！',
+        isMainValue: true
+      }]
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      },
+    },
+    tableForm: {
+      disabled: true,
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    }
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '默认到库位代码',
+    field: 'defaultToLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库位信息', // 查询弹窗标题
+        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+        searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
+    tableForm:{
+      disabled: true,
+      isInpuFocusShow: false,
+      searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+      searchField: 'code', // 查询弹窗赋值字段
+      searchTitle: '库位信息', // 查询弹窗标题
+      searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+      searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    isTableForm: true,
+    isForm: false
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        disabled:true,
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm:{
+      disabled: true,
+      type:'FormDate',
+      placeholder: '请选择生产日期',
+      valueFormat: 'x',
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '替代批次',
+    field: 'altBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '到货日期',
+    field: 'arriveDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        disabled:true,
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm:{
+      disabled: true,
+      type:'FormDate',
+      placeholder: '请选择到货日期',
+      valueFormat: 'x',
+    },
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        disabled:true,
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm:{
+      disabled: true,
+      type:'FormDate',
+      placeholder: '请选择过期日期',
+      valueFormat: 'x',
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    tableForm: {
+      type: 'Select',
+      disabled: true,
+    }
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择包装',
+        searchField: 'packQty',
+        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: false,
+      searchListPlaceholder: '请选择包装',
+      searchField: 'packQty',
+      searchTitle: '物品包装信息',
+      searchAllSchemas: Itempackaging.allSchemas,
+      searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
+      searchCondition: [
+        {
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请选择订单行',
+          isMainValue: true
+        },
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+    },
+    isTableForm: true,
+    isForm: true
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150,
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm:{
+      disabled:true
+    },
+    isTableForm: true,
+    isForm: true
+  },
+  {
+    label: '供应商计量数量',
+    field: 'supplierPackQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      },
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '供应商计量单位',
+    field: 'supplierPackUnit',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    tableForm: {
+      type: 'Select'
+    }
+  },
+  {
+    label: '转换率',
+    field: 'convertRate',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0
+      },
+    },
+    tableForm: {
+      disabled: true,
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    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
+  }
+]))
+
+
+export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true,
+      isInpuFocusShow: false,
+      searchListPlaceholder: '请选择订单号',
+      searchField: 'number',
+      searchTitle: '采购订单信息',
+      searchAllSchemas: PurchaseMain.allSchemas,
+      searchPage: PurchaseMainApi.getPurchaseMainPage,
+      searchCondition: [{
+          key:'supplierCode',
+          value:'supplierCode',
+          message: '请选择供应商！',
+          isMainValue: true
+      }]
+    },
+    form: {
+      labelMessage: '该订单号会影响订单行的选择',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择订单号',
+        searchField: 'number',
+        searchTitle: '采购订单信息',
+        searchAllSchemas: PurchaseMain.allSchemas,
+        searchPage: PurchaseMainApi.getPurchaseMainPage,
+        searchCondition: [{
+          key:'supplierCode',
+          value:'supplierCode',
+          message: '请选择供应商！',
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        disabled:true,
+        isSearchList: false, // 开启查询弹窗
+        searchListPlaceholder: '请选择订单行', // 输入框占位文本
+        searchField: 'lineNumber', // 查询弹窗赋值字段
+        searchTitle: '订单信息', // 查询弹窗标题
+        searchAllSchemas: PurchaseDetail.allSchemas, // 查询弹窗所需类
+        searchPage: PurchaseDetailApi.getPurchaseDetailPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'number',
+          value:'poNumber',
+          message: '请填写订单号！',
+          isMainValue: true
+        }]
+      }
+    },
+    tableForm:{
+      disabled:true,
+      isInpuFocusShow: false,
+      searchListPlaceholder: '请选择订单行', // 输入框占位文本
+      searchField: 'lineNumber', // 查询弹窗赋值字段
+      searchTitle: '订单信息', // 查询弹窗标题
+      searchAllSchemas: PurchaseDetail.allSchemas, // 查询弹窗所需类
+      searchPage: PurchaseDetailApi.getPurchaseDetailPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key:'number',
+        value:'poNumber',
+        message: '请填写订单号！',
+        isMainValue: true
+      }]
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled:true
+    },
+    isTableForm: true,
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled:true
+    },
+    isTableForm: true,
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled:true,
+        min: 1,
+        precision: 6
+      },
+    },
+    tableForm: {
+      disabled:true,
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    }
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '默认到库位代码',
+    field: 'defaultToLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        disabled:true,
+        isSearchList: false, // 开启查询弹窗
+        searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库位信息', // 查询弹窗标题
+        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+        searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
+    tableForm:{
+      disabled:true,
+      isInpuFocusShow: false,
+      searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+      searchField: 'code', // 查询弹窗赋值字段
+      searchTitle: '库位信息', // 查询弹窗标题
+      searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+      searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    isTableForm: true,
+    isForm: false
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        disabled:true,
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm:{
+      disabled:true,
+      type:'FormDate',
+      placeholder: '请选择生产日期',
+      valueFormat: 'x',
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '替代批次',
+    field: 'altBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '到货日期',
+    field: 'arriveDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        disabled: true,
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm:{
+      disabled: true,
+      type:'FormDate',
+      placeholder: '请选择到货日期',
+      valueFormat: 'x',
+    },
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        disabled: true,
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm:{
+      disabled: true,
+      type:'FormDate',
+      placeholder: '请选择过期日期',
+      valueFormat: 'x',
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    tableForm: {
+      type: 'Select'
+    }
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true,
+        isSearchList: true,
+        searchListPlaceholder: '请选择包装',
+        searchField: 'packQty',
+        searchTitle: '物品包装信息',
+        searchAllSchemas: Itempackaging.allSchemas,
+        searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
+        searchCondition: [
+          {
+            key: 'itemCode',
+            value: 'itemCode',
+            message: '请选择订单行',
+            isTableRowValue: true, //查询当前searchTable表中行数据的值
+            isMainValue: false
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+
+        ]
+      }
+    },
+    tableForm: {
+      disabled: true,
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择包装',
+      searchField: 'packQty',
+      searchTitle: '物品包装信息',
+      searchAllSchemas: Itempackaging.allSchemas,
+      searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
+      searchCondition: [
+        {
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请选择订单行',
+          isTableRowValue: true, //查询当前searchTable表中行数据的值
+          isMainValue: false
+        },
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+    },
+    isTableForm: true,
+    isForm: true
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150,
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm:{
+      disabled:true
+    },
+    isTableForm: true,
+    isForm: true
+  },
+  {
+    label: '供应商计量数量',
+    field: 'supplierPackQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled: true,
+        min: 1,
+        precision: 6
+      },
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '供应商计量单位',
+    field: 'supplierPackUnit',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    tableForm: {
+      type: 'Select'
+    }
+  },
+  {
+    label: '转换率',
+    field: 'convertRate',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled: true,
+        min: 0
+      },
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))

From 476adf6d71eaf12773665d4952a56753c5c55234 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 27 Jun 2024 17:07:41 +0800
Subject: [PATCH 032/408] =?UTF-8?q?=E5=8F=91=E6=96=99=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/issueManage/issue/issueRequestMain/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/issueManage/issue/issueRequestMain/index.vue b/src/views/wms/issueManage/issue/issueRequestMain/index.vue
index f71bba7c9..df3aa6188 100644
--- a/src/views/wms/issueManage/issue/issueRequestMain/index.vue
+++ b/src/views/wms/issueManage/issue/issueRequestMain/index.vue
@@ -207,7 +207,7 @@ const butttondata = (row,$index) => {
         defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:issue-request-main:submit'}), // 提交审批
         defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:issue-request-main:refused'}), // 驳回
         defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:issue-request-main:handle'}), // 审批通过
-        defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']), hasPermi:'wms:issue-request-main:update'}), // 处理
+        defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3','7']), hasPermi:'wms:issue-request-main:update'}), // 处理
         defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:issue-request-main:update'}), // 编辑
         // defaultButtons.mainListDeleteBtn({hasPermi:'wms:issue-request-main:delete'}), // 删除
     ]

From dec258c0b9f65713da536e3438df5458e199bd45 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Thu, 27 Jun 2024 17:12:24 +0800
Subject: [PATCH 033/408] =?UTF-8?q?M=E5=9E=8B=E8=AE=A2=E5=8D=95=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereceiptRequestMain.data.ts                    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/purchasereceiptRequestMain.data.ts
index 19d1bb537..2a7c4a340 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/purchasereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/purchasereceiptRequestMain.data.ts
@@ -48,7 +48,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     isSearch: true,
   },
   {
-    label: '采购订单号',
+    label: 'M型采购订单号',
     field: 'poNumber',
     sort: 'custom',
     table: {
@@ -80,6 +80,12 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
           action: '==', // 查询拼接条件
           isSearch: true, // 使用自定义拼接条件
           isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用
+        },{
+          key: 'po_line_type', // 查询列表中字段
+          value: 'M', // 指查询具体值
+          action: '==', // 查询拼接条件
+          isSearch: true, // 使用自定义拼接条件
+          isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用
         }]
       }
     },

From 12512a3f514d21d48c7fe3a0c705cac2603176fb Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Thu, 27 Jun 2024 17:22:16 +0800
Subject: [PATCH 034/408] =?UTF-8?q?EAM=20=E2=80=94=E2=80=94>=20=20?=
 =?UTF-8?q?=E5=B7=A1=E6=A3=80=E7=82=B9=E6=A3=80=20=20=E7=BB=B4=E4=BF=AE=20?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E8=81=94=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/disposition/defaultButtons.ts       | 13 ++++++++++
 .../eam/equipmentRepairJobMain/index.vue      | 25 +++++++++++++++++++
 .../SpotCheckOrderDetail.vue                  |  2 +-
 .../equipmentSpotCheckMain.data.ts            | 11 +++++---
 .../equipmentSpotCheckMain/finishForm1.vue    |  2 ++
 5 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts
index 9faec3f8c..0e13e51f7 100644
--- a/src/utils/disposition/defaultButtons.ts
+++ b/src/utils/disposition/defaultButtons.ts
@@ -415,6 +415,19 @@ export function mainListFinishBtn(option:any) {
   })
 }
 
+// 主列表-作废按钮
+export function mainListCancelBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: t(`ts.作废`).replace('ts.', ''),
+    name: 'cancel',
+    hide: false,
+    type: 'primary',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+
 // 主列表-验证按钮
 export function mainListValidateBtn(option:any) {
   return __defaultBtnOption(option,{
diff --git a/src/views/eam/equipmentRepairJobMain/index.vue b/src/views/eam/equipmentRepairJobMain/index.vue
index f92a39da0..214dddcf9 100644
--- a/src/views/eam/equipmentRepairJobMain/index.vue
+++ b/src/views/eam/equipmentRepairJobMain/index.vue
@@ -95,6 +95,7 @@ import {EquipmentAccounts} from "@/views/eam/equipmentAccounts/equipmentAccounts
 import * as EquipmentItemApi from "@/api/eam/equipmentAccounts";
 import {ToolAccounts} from "@/views/eam/toolAccounts/toolAccounts.data";
 import * as ToolItemApi from "@/api/eam/toolAccounts";
+import {mainListCancelBtn} from "@/utils/disposition/defaultButtons";
 
 defineOptions({ name: 'EquipmentRepairJobMain' })
 
@@ -188,6 +189,7 @@ const butttondata = (row) => {
     defaultButtons.mainListExecuteBtn({hide: isShowStatusButton(row,['4']),hasPermi:'eam:equipmentRepairJobMain:update'}), // 执行
     defaultButtons.mainListTransferBtn({hide: isShowStatusButton(row,['4']),hasPermi:'eam:equipmentRepairJobMain:update'}), // 转办
     defaultButtons.mainListFinishBtn({hide: isShowStatusButton(row,['5']),hasPermi:'eam:equipmentRepairJobMain:update'}), //完成
+    defaultButtons.mainListCancelBtn({hide: isShowStatusButton(row,['5']),hasPermi:'eam:equipmentRepairJobMain:update'}), //作废
     defaultButtons.mainListValidateRepairBtn({hide: isShowStatusButton(row,['6']),hasPermi:'eam:equipmentRepairJobMain:update'}), // 维修验证
     defaultButtons.mainListValidateReportBtn({hide: isShowBaoXiuButton(row),hasPermi:'eam:equipmentRepairJobMain:update'}), // 报修验证
   ]
@@ -205,6 +207,8 @@ const buttonTableClick = async (val, row) => {
     handleExecute(row.id)
   } else if (val == 'finish') { // 完成
     handleFinish(row)
+  } else if (val == 'cancel') { // 作废
+    handleCancel(row.id)
   } else if (val == 'validate_repair') { // 维修验证
     handleValidateRepair(row)
   } else if (val == 'validate_report') { // 报修验证
@@ -390,6 +394,27 @@ const handleReceive = async (id: number) => {
   } catch {}
 }
 
+
+/** 作废按钮操作 */
+const handleCancel = async (id: number) => {
+  try {
+    // 二次确认
+    await message.delConfirm('是否作废所选中任务？');
+    const params = ref({
+      id: '',
+      status:'',
+    })
+    params.value.id = id
+    params.value.status = '9'
+    // 发起
+    await EquipmentRepairJobMainApi.updateEquipmentRepairOrder(params.value)
+    message.success(t('执行成功'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+
 /** 执行按钮操作 */
 const handleExecute = async (id: number) => {
   try {
diff --git a/src/views/eam/equipmentSpotCheckMain/SpotCheckOrderDetail.vue b/src/views/eam/equipmentSpotCheckMain/SpotCheckOrderDetail.vue
index 6c175bcfc..a32c35280 100644
--- a/src/views/eam/equipmentSpotCheckMain/SpotCheckOrderDetail.vue
+++ b/src/views/eam/equipmentSpotCheckMain/SpotCheckOrderDetail.vue
@@ -917,7 +917,7 @@ const submitForm = async (formType, data) => {
     await getList()
     updateKey.value += 1
   } finally {
-    formRef.value.formLoading = false
+    //formRef.value.formLoading = false
   }
 }
 
diff --git a/src/views/eam/equipmentSpotCheckMain/equipmentSpotCheckMain.data.ts b/src/views/eam/equipmentSpotCheckMain/equipmentSpotCheckMain.data.ts
index 076f07400..f1581ad93 100644
--- a/src/views/eam/equipmentSpotCheckMain/equipmentSpotCheckMain.data.ts
+++ b/src/views/eam/equipmentSpotCheckMain/equipmentSpotCheckMain.data.ts
@@ -315,9 +315,14 @@ export const EquipmentSpotCheckMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
     dictType: DICT_TYPE.FALSE_OR_TRUE,
     dictClass: 'string',
-    form: {
-      component: 'Radio'
-    },
+  },
+  {
+    label: '是否需要维修',
+    field: 'isRepair',
+    sort: 'custom',
+    isSearch: true,
+    dictType: DICT_TYPE.FALSE_OR_TRUE,
+    dictClass: 'string',
   },
   {
     label: '流程状态',
diff --git a/src/views/eam/equipmentSpotCheckMain/finishForm1.vue b/src/views/eam/equipmentSpotCheckMain/finishForm1.vue
index 80434c83c..da8b44232 100644
--- a/src/views/eam/equipmentSpotCheckMain/finishForm1.vue
+++ b/src/views/eam/equipmentSpotCheckMain/finishForm1.vue
@@ -67,6 +67,7 @@ const formData = ref({
  // verifyer: '',
   verifyContent: '',
   verifyTime: '',
+  isRepair:"",
 })
 const formRules = reactive({
   // verifyer: [
@@ -92,6 +93,7 @@ const open = async (type: string, row?: object) => {
   //初始化数据
   formData.value.id = row.id
   formData.value.number = row.planNumber
+  formData.value.isRepair = row.isRepair
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 

From 052371890ee2a6caeb59e2899890b7b13a6e2e17 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 27 Jun 2024 17:32:38 +0800
Subject: [PATCH 035/408] =?UTF-8?q?=E5=8F=91=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../issue/issueRequestMain/index.vue          |  14 +-
 .../issueRequestMain/issueRequestMain.data.ts | 457 +++++++++++-------
 2 files changed, 291 insertions(+), 180 deletions(-)

diff --git a/src/views/wms/issueManage/issue/issueRequestMain/index.vue b/src/views/wms/issueManage/issue/issueRequestMain/index.vue
index df3aa6188..b70b6f50c 100644
--- a/src/views/wms/issueManage/issue/issueRequestMain/index.vue
+++ b/src/views/wms/issueManage/issue/issueRequestMain/index.vue
@@ -86,6 +86,7 @@ import { IssueRequestMain,IssueRequestMainRules,IssueRequestDetail,IssueRequestD
 import * as IssueRequestMainApi from '@/api/wms/issueRequestMain'
 import * as IssueRequestDetailApi from '@/api/wms/issueRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as WorkstationApi from '@/api/wms/workstation'
 
 // 发料申请
 defineOptions({ name: 'IssueRequestMain' })
@@ -105,7 +106,7 @@ const updataTableColumns = (val) => {
 
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
-  nextTick(() => {
+  nextTick(async() => {
     if (type == 'tableForm') {
       // 明细查询页赋值
       if (formField == 'itemCode') {
@@ -121,6 +122,17 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         setV['fromWarehouseCode'] = val[0]['code']
         setV['toWarehouseCode'] = val[0]['code']
       }
+      if (formField == 'productionLineCode') {
+        //生产线
+        let res = await WorkstationApi.getWorkstationPage({
+          productionLineCode: val[0][searchField],
+          pageSize: 20,
+          pageNo: 1
+        })
+        if(res&&res.list&&res.list.length>0){
+          setV['workStationCode'] = res.list[0].code
+        }
+      }
       formRef.setValues(setV)
     }
   })
diff --git a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
index 701d7a9ce..422092299 100644
--- a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
+++ b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
@@ -67,6 +67,7 @@ export const IssueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch:true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择车间代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
@@ -81,6 +82,104 @@ export const IssueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false,
+    hiddenInMain:true,
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+      searchField: 'code', // 查询弹窗赋值字段
+      searchTitle: '生产线信息', // 查询弹窗标题
+      searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
+      searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key:'workshopCode',
+        value:'workshopCode',
+        message: '请填写车间代码！',
+        isMainValue: true
+      },{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '生产线信息', // 查询弹窗标题
+        searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
+        searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'workshopCode',
+          value:'workshopCode',
+          message: '请填写车间代码！',
+          isMainValue: true
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '工位代码',
+    field: 'workStationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false,
+    hiddenInMain:true,
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择工位代码', // 输入框占位文本
+      searchField: 'code', // 查询弹窗赋值字段
+      searchTitle: '工位信息', // 查询弹窗标题
+      searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
+      searchPage: WorkstationApi.getWorkstationPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key:'productionLineCode',
+        value:'productionLineCode',
+        message: '请填写生产线代码！',
+        isMainValue: true
+      },{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择工位代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '工位信息', // 查询弹窗标题
+        searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
+        searchPage: WorkstationApi.getWorkstationPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'productionLineCode',
+          value:'productionLineCode',
+          message: '请填写生产线代码！',
+          isMainValue: true
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
   {
     label: '状态',
     field: 'status',
@@ -188,45 +287,45 @@ export const IssueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     isTable:false,
     isForm: false
   },
-  {
-    label: '从仓库代码',
-    field: 'fromWarehouseCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '仓库信息', // 查询弹窗标题
-        searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
-        searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
-      }
-    }
-  },
-  {
-    label: '到仓库代码',
-    field: 'toWarehouseCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
+  // {
+  //   label: '从仓库代码',
+  //   field: 'fromWarehouseCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTable:false,
+  //   form: {
+  //     // labelMessage: '信息提示说明！！！',
+  //     componentProps: {
+  //       isSearchList: true, // 开启查询弹窗
+  //       searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+  //       searchField: 'code', // 查询弹窗赋值字段
+  //       searchTitle: '仓库信息', // 查询弹窗标题
+  //       searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
+  //       searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
+  //       searchCondition: [{
+  //         key: 'available',
+  //         value: 'TRUE',
+  //         isMainValue: false
+  //       }]
+  //     }
+  //   }
+  // },
+  // {
+  //   label: '到仓库代码',
+  //   field: 'toWarehouseCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTable:false,
+  //   form: {
+  //     componentProps: {
+  //       disabled: true
+  //     }
+  //   }
+  // },
   {
     label: '业务类型',
     field: 'businessType',
@@ -461,9 +560,9 @@ export const IssueRequestMainRules = reactive({
   workshopCode: [
     { required: true, message: '请选择车间代码', trigger: 'change' }
   ],
-  fromWarehouseCode: [
-    { required: true, message: '请选择从仓库代码', trigger: 'change' }
-  ],
+  // fromWarehouseCode: [
+  //   { required: true, message: '请选择从仓库代码', trigger: 'change' }
+  // ],
   // dueTime: [
   //   { required: true, message: '请选择截止时间', trigger: 'change' }
   // ],
@@ -476,104 +575,104 @@ export const IssueRequestMainRules = reactive({
  * @returns {Array} 发料申请子表
  */
 export const IssueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '生产线代码',
-    field: 'productionLineCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    hiddenInMain:true,
-    tableForm:{
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
-      searchField: 'code', // 查询弹窗赋值字段
-      searchTitle: '生产线信息', // 查询弹窗标题
-      searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
-      searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
-      searchCondition: [{
-        key:'workshopCode',
-        value:'workshopCode',
-        message: '请填写车间代码！',
-        isMainValue: true
-      },{
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
-      }]
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '生产线信息', // 查询弹窗标题
-        searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
-        searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key:'workshopCode',
-          value:'workshopCode',
-          message: '请填写车间代码！',
-          isMainValue: true
-        },{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
-      }
-    }
-  },
-  {
-    label: '工位代码',
-    field: 'workStationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    hiddenInMain:true,
-    tableForm:{
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择工位代码', // 输入框占位文本
-      searchField: 'code', // 查询弹窗赋值字段
-      searchTitle: '工位信息', // 查询弹窗标题
-      searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
-      searchPage: WorkstationApi.getWorkstationPage, // 查询弹窗所需分页方法
-      searchCondition: [{
-        key:'productionLineCode',
-        value:'productionLineCode',
-        message: '请填写生产线代码！',
-        isMainValue: true
-      },{
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
-      }]
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择工位代码', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '工位信息', // 查询弹窗标题
-        searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
-        searchPage: WorkstationApi.getWorkstationPage, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key:'productionLineCode',
-          value:'productionLineCode',
-          message: '请填写生产线代码！',
-          isMainValue: true
-        },{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
-      }
-    }
-  },
+  // {
+  //   label: '生产线代码',
+  //   field: 'productionLineCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTable:false,
+  //   hiddenInMain:true,
+  //   tableForm:{
+  //     isInpuFocusShow: true,
+  //     searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+  //     searchField: 'code', // 查询弹窗赋值字段
+  //     searchTitle: '生产线信息', // 查询弹窗标题
+  //     searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
+  //     searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
+  //     searchCondition: [{
+  //       key:'workshopCode',
+  //       value:'workshopCode',
+  //       message: '请填写车间代码！',
+  //       isMainValue: true
+  //     },{
+  //       key: 'available',
+  //       value: 'TRUE',
+  //       isMainValue: false
+  //     }]
+  //   },
+  //   form: {
+  //     // labelMessage: '信息提示说明！！！',
+  //     componentProps: {
+  //       isSearchList: true, // 开启查询弹窗
+  //       searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+  //       searchField: 'code', // 查询弹窗赋值字段
+  //       searchTitle: '生产线信息', // 查询弹窗标题
+  //       searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
+  //       searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
+  //       searchCondition: [{
+  //         key:'workshopCode',
+  //         value:'workshopCode',
+  //         message: '请填写车间代码！',
+  //         isMainValue: true
+  //       },{
+  //         key: 'available',
+  //         value: 'TRUE',
+  //         isMainValue: false
+  //       }]
+  //     }
+  //   }
+  // },
+  // {
+  //   label: '工位代码',
+  //   field: 'workStationCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTable:false,
+  //   hiddenInMain:true,
+  //   tableForm:{
+  //     isInpuFocusShow: true,
+  //     searchListPlaceholder: '请选择工位代码', // 输入框占位文本
+  //     searchField: 'code', // 查询弹窗赋值字段
+  //     searchTitle: '工位信息', // 查询弹窗标题
+  //     searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
+  //     searchPage: WorkstationApi.getWorkstationPage, // 查询弹窗所需分页方法
+  //     searchCondition: [{
+  //       key:'productionLineCode',
+  //       value:'productionLineCode',
+  //       message: '请填写生产线代码！',
+  //       isMainValue: true
+  //     },{
+  //       key: 'available',
+  //       value: 'TRUE',
+  //       isMainValue: false
+  //     }]
+  //   },
+  //   form: {
+  //     // labelMessage: '信息提示说明！！！',
+  //     componentProps: {
+  //       isSearchList: true, // 开启查询弹窗
+  //       searchListPlaceholder: '请选择工位代码', // 输入框占位文本
+  //       searchField: 'code', // 查询弹窗赋值字段
+  //       searchTitle: '工位信息', // 查询弹窗标题
+  //       searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
+  //       searchPage: WorkstationApi.getWorkstationPage, // 查询弹窗所需分页方法
+  //       searchCondition: [{
+  //         key:'productionLineCode',
+  //         value:'productionLineCode',
+  //         message: '请填写生产线代码！',
+  //         isMainValue: true
+  //       },{
+  //         key: 'available',
+  //         value: 'TRUE',
+  //         isMainValue: false
+  //       }]
+  //     }
+  //   }
+  // },
   {
     label: '包装号',
     field: 'packingNumber',
@@ -628,17 +727,17 @@ export const IssueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isTableForm: false,
     isForm: false
   },
-  {
-    label: '从库位代码',
-    field: 'fromLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch: true,
-    hiddenInMain:true,
-    sortSearchDefault:6,
-  },
+  // {
+  //   label: '从库位代码',
+  //   field: 'fromLocationCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isSearch: true,
+  //   hiddenInMain:true,
+  //   sortSearchDefault:6,
+  // },
   {
     label: '到库位代码',
     field: 'toLocationCode',
@@ -658,7 +757,7 @@ export const IssueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'itemCode',
     sort: 'custom',
     table: {
-      width: 150
+      width: 250
     },
     isSearch:true,
     sortSearchDefault:2,
@@ -729,26 +828,26 @@ export const IssueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '采购订单号',
-    field: 'poNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    sortTableDefault:1,
-  },
-  {
-    label: '订单行',
-    field: 'poLine',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    sortTableDefault:2,
-  },
+  // {
+  //   label: '采购订单号',
+  //   field: 'poNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   hiddenInMain:true,
+  //   sortTableDefault:1,
+  // },
+  // {
+  //   label: '订单行',
+  //   field: 'poLine',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   hiddenInMain:true,
+  //   sortTableDefault:2,
+  // },
   {
     label: '单据号',
     field: 'number',
@@ -951,7 +1050,7 @@ export const IssueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isDetail: false,
     isForm: false ,
     table: {
-      width: 150,
+      width: 200,
       fixed: 'right'
     },
     isTableForm:false,
@@ -960,12 +1059,12 @@ export const IssueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
 
 //表单校验
 export const IssueRequestDetailRules = reactive({
-  productionLineCode: [
-    { required: true, message: '请选择生产线代码', trigger: 'change' }
-  ],
-  workStationCode: [
-    { required: true, message: '请选择工位代码', trigger: 'change' }
-  ],
+  // productionLineCode: [
+  //   { required: true, message: '请选择生产线代码', trigger: 'change' }
+  // ],
+  // workStationCode: [
+  //   { required: true, message: '请选择工位代码', trigger: 'change' }
+  // ],
   itemCode: [
     { required: true, message: '请选择物料代码', trigger: 'change' }
   ],

From 1266e1b4d5574b60ea587491ebe03a00f4f1855d Mon Sep 17 00:00:00 2001
From: bjang03 <259278618@qq.com>
Date: Thu, 27 Jun 2024 19:27:12 +0800
Subject: [PATCH 036/408] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D=201=E3=80=81?=
 =?UTF-8?q?=E7=9B=98=E7=82=B9=E4=BB=BB=E5=8A=A1=EF=BC=8C=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E8=BE=93=E5=85=A5=E7=9B=98=E7=82=B9=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=EF=BC=8C=E5=9C=A8=E5=AF=BC=E5=85=A5=EF=BC=8C=E6=8A=A5?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../countadjustRequestMain.data.ts                       | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
index 32cfaf266..a434768ee 100644
--- a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
+++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
@@ -90,8 +90,8 @@ export const CountadjustRequestMain = useCrudSchemas(<CrudSchema[]>([
     }
   },
   {
-    label: '仓库代码',
-    field: 'warehouseCode',
+    label: '库位代码',
+    field: 'locationCode',
     sort: 'custom',
     table: {
       width: 150
@@ -318,9 +318,6 @@ export const CountadjustRequestMainRules = reactive({
   // requestNumber: [
   //   { required: true, message: '请选择申请单号', trigger: 'change' }
   // ],
-  warehouseCode: [
-    { required: true, message: '请选择仓库代码', trigger: 'change' }
-  ],
   departmentCode: [
     { required: true, message: '请输入部门', trigger: 'blur' }
   ],
@@ -630,4 +627,4 @@ export const CountadjustRequestDetailRules = reactive({
   itemCode: [
     { required: true, message: '请选择物料代码', trigger: 'change' }
   ],
-})
\ No newline at end of file
+})

From a4f134781bf0c6c17e129b12a43f03486fa5a0fc Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 28 Jun 2024 08:33:06 +0800
Subject: [PATCH 037/408] =?UTF-8?q?=E5=8F=91=E7=A5=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/supplierinvoiceRequestMain/index.ts   |   4 +-
 src/components/BasicForm/src/BasicForm.vue    |   2 +-
 .../supplierinvoiceRecordMain.data.ts         |  55 ++-
 .../supplierinvoiceRequestMain/index.vue      | 254 ++++++--------
 .../supplierinvoiceRequestMain.data.ts        | 330 +++++++++++++-----
 5 files changed, 408 insertions(+), 237 deletions(-)

diff --git a/src/api/wms/supplierinvoiceRequestMain/index.ts b/src/api/wms/supplierinvoiceRequestMain/index.ts
index ec37ab88c..5358945de 100644
--- a/src/api/wms/supplierinvoiceRequestMain/index.ts
+++ b/src/api/wms/supplierinvoiceRequestMain/index.ts
@@ -89,8 +89,8 @@ export const invoiceSentOutSupplierinvoiceRequestMain = async (id: number) => {
 }
 
 // 财务--审批通过供应商发货申请主
-export const financeappSupplierinvoiceRequestMain = async (id: number) => {
-  return await request.post({ url: `/wms/supplierinvoice-request-main/financeApp?id=` + id })
+export const financeappSupplierinvoiceRequestMain = async (data) => {
+  return await request.post({ url: `/wms/supplierinvoice-request-main/financeApp`, data })
 }
 // 财务--驳回供应商发货申请主
 export const financerejSupplierinvoiceRequestMain = async (data) => {
diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 2df16c7e7..933b07128 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -494,7 +494,7 @@ watch(()=>props.tableData,() => {
 })
 watch(()=>unref(formRef)?.formModel,() => {
   if(props?.sumFormDataByForm&&unref(formRef)?.formModel){
-    props?.sumFormDataByForm(formRef,unref(formRef)?.formModel,props.tableData)
+    props?.sumFormDataByForm(formRef,unref(formRef)?.formModel,props.tableData,formType.value)
   }
 },{
   deep:true
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
index 175285f38..028abb8dc 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
@@ -318,7 +318,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     sortTableDefault:10
   },
   {
-    label: '过账时间',
+    label: '过账日期',
     field: 'postingDate',
     formatter: dateFormatter,
     detail: {
@@ -329,7 +329,17 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     table: {
       width: 180
-    }
+    },
+    isSearch: true,
+    search: {
+      value:[],
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD',
+        type: 'daterange',
+        defaultTime: [new Date('1 '), new Date('1 ')]
+      }
+    },
   },
   {
     label: '财务凭证号',
@@ -593,6 +603,47 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false,
   },
+  {
+    label: '凭证描述',
+    field: 'voucherNumberRemark',
+    isTable:true,
+    isTableForm:false,
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isForm: false,
+  },
+  {
+    label: '未税差额',
+    field: 'beforeTaxDiffAmount',
+    formatter: accountantFormart,
+    table: {
+      width: 150
+    },
+    isForm:false,
+    isTableForm:false
+  },
+  {
+    label: '税额差异',
+    field: 'taxAmountDiff',
+    formatter: accountantFormart,
+    table: {
+      width: 150
+    },
+    isForm:false,
+    isTableForm:false
+  },
+  {
+    label: '价税合计差额',
+    field: 'totalTaxDiffAmount',
+    formatter: accountantFormart,
+    table: {
+      width: 150
+    },
+    isForm:false,
+    isTableForm:false
+  },
 ]))
 
 //表单校验
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 21d03a373..cfdfb6c81 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -32,7 +32,7 @@
         </el-button>
       </template>
       <template #differencePrice="{row}">
-        <span :class="{'red-text':row.differencePrice!=0}">{{ Number(row.differencePrice).toFixed(5) }}</span>
+        <span :class="{'red-text':row.differencePrice!=0}">{{ Number(row.differencePrice).toFixed(2) }}</span>
       </template>
       <template #action="{ row,$index }">
         <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
@@ -53,19 +53,37 @@
     :tableAllSchemas="SupplierinvoiceRequestDetail.allSchemas" 
     :tableFormRules="SupplierinvoiceRequestDetailRules"
     :tableData="tableData" 
-    :sumFormDataByForm ="(formRef,formModel)=>{
-      const {taxRate=0,amount=0,taxAmount=0,adjustingTaxAmount=0} = formModel 
+    :sumFormDataByForm ="(formRef,formModel,tableData,formType)=>{
+      const {taxRate=0,amount=0,taxAmount=0,beforeTaxAmount=0,totalTaxAmount=0,discountAmount1=0,beforeTaxDiffAmount=0,taxAmountDiff=0} = formModel 
+      // 2、系统税额：每条数据的合同价格X可开票数量，计算结果取两位小数之后*税率的计算结果，再保留2位。所有子表数据再求和
+      let taxAmount_ = 0.00
+      if(formType=='update'){ // 编辑
+        taxAmount_ = taxAmount
+      }else if(formType=='create'){ // 新增
+        taxAmount_ = tableData.reduce((prev, item) => prev + Number(Number(taxRate*0.01*Number(Number(item['singlePrice']*item['invoicableQuantity']).toFixed(2))).toFixed(2)),0)
+      }
+      console.log('sumFormDataByForm',tableData)
+      console.log('taxAmount_',taxAmount_)
+
+      if(tableData)
       formRef.value.setValues({
-        taxAmount:taxRate*amount*0.01,
-        afterTaxAmount:amount+taxAmount
+        taxAmount:taxAmount_, 
+        afterTaxAmount:amount+taxAmount, // 3、系统价税合计：系统未税金额+系统税额
+        adTaxAmount:beforeTaxAmount+totalTaxAmount, //6、价税合计金额：未税金额+税额
+        beforeTaxDiffAmount:beforeTaxAmount-amount-discountAmount1,//未税差额：未税金额-系统未税金额-折扣金额
+        taxAmountDiff:totalTaxAmount-taxAmount,// 税额差异：税额-系统税额
+        totalTaxDiffAmount:beforeTaxDiffAmount+taxAmountDiff // 价税合计差额=未税差额+税额差异
       })
     }"
+    
     :sumFormDataByTableCustom ="(formRef,formModel,tableData)=>{
+        // 1、系统未税金额： 合同价格X可开票数量。每条数据的合同价格X可开票数量，计算结果取两位小数之后，求和
         const sumObject = {
-          amount:tableData.reduce((prev, item) => prev + (item['singlePrice']*item['invoicableQuantity']),0)
+          amount:tableData.reduce((prev, item) => prev + Number(Number(item['singlePrice']*item['invoicableQuantity']).toFixed(2)),0)
         }
         formRef.value.setValues(sumObject)
     }"
+    
     :apiUpdate="SupplierinvoiceRequestMainApi.updateSupplierinvoiceRequestMain"
     :apiCreate="SupplierinvoiceRequestMainApi.createSupplierinvoiceRequestMain" 
     :isBusiness="true"
@@ -76,16 +94,26 @@
     @searchTableSuccess="searchTableSuccess"
     @submitForm="submitForm"
   >      
-  <template #foorter>
+  <!-- <template #foorter>
     <div style="text-align: left">
       {{ basicFormFooter }}
     </div>
-  </template>
+  </template> -->
     <template v-slot="{row}">
-      <el-input :disabled="true" :class="{'is-red': row['singlePrice'] - row['purchasePrice'] > 0}" :modelValue="((row['singlePrice']) - (row['purchasePrice'])).toFixed(6)"/>
+      <el-input :disabled="true" :class="{'is-red': row['singlePrice'] - row['purchasePrice'] > 0}" :modelValue="((row['singlePrice']) - (row['purchasePrice'])).toFixed(2)"/>
     </template>
   </BasicForm>
 
+  <!-- 财务通过窗口 finance_mainPlanSub -->
+  <BasicForm 
+    ref="formFinanceRef" 
+    :rules="SupplierinvoiceRequestFinanceRules"
+    :formAllSchemas="SupplierinvoiceRequestFinance.allSchemas" 
+    :isBusiness="false"
+    :footButttondata="undefined"
+    @success="submitFormFinance" 
+  />
+
   <!-- 详情 -->
   <Detail
     ref="detailRef" 
@@ -137,7 +165,7 @@
     :sumFormDataByForm ="(formRef,formModel)=>{
       const {singlePrice=0,purchasePrice=0} = formModel
       formRef.value.setValues({
-        differencePrice:Number((Number(singlePrice)-Number(purchasePrice)).toFixed(6))
+        differencePrice:Number((Number(singlePrice)-Number(purchasePrice)).toFixed(2))
       })
     }"
     :isBasic="false" 
@@ -183,7 +211,10 @@
   import { SupplierinvoiceRequestMain, 
     SupplierinvoiceRequestMainRules, 
     SupplierinvoiceRequestDetail, 
-    SupplierinvoiceRequestDetailRules } from './supplierinvoiceRequestMain.data'
+    SupplierinvoiceRequestDetailRules,
+    SupplierinvoiceRequestFinance,
+    SupplierinvoiceRequestFinanceRules
+  } from './supplierinvoiceRequestMain.data'
   import * as SupplierinvoiceRequestMainApi from '@/api/wms/supplierinvoiceRequestMain'
   import * as SupplierinvoiceRequestDetailApi from '@/api/wms/supplierinvoiceRequestDetail'
   import * as defaultButtons from '@/utils/disposition/defaultButtons'
@@ -251,16 +282,16 @@ const searchTableSuccessDetail = async (formField, searchField, val, formRef,sea
   detailRef.value.updateList()
 }
 
-const basicFormFooter = computed(()=>{
-  let formModel = formRef.value?.formRef?.formModel
-  if(formModel){
-    let price1 = formModel.amount+formModel.discountAmount+formModel.discountAmount1
-    let price2 = formModel.taxAmount+formModel.adjustingTaxAmount
-    return `合计金额：未税金额=${accountantFormart(undefined,undefined,price1)}；税额=${accountantFormart(undefined,undefined,price2)}；价税合计金额=${accountantFormart(undefined,undefined,price1+price2)}；`
-  }
-  return `合计金额`
+// const basicFormFooter = computed(()=>{
+//   let formModel = formRef.value?.formRef?.formModel
+//   if(formModel){
+//     let price1 = formModel.amount+formModel.discountAmount+formModel.discountAmount1
+//     let price2 = formModel.taxAmount+formModel.adjustingTaxAmount
+//     return `合计金额：未税金额=${accountantFormart(undefined,undefined,price1)}；税额=${accountantFormart(undefined,undefined,price2)}；价税合计金额=${accountantFormart(undefined,undefined,price1+price2)}；`
+//   }
+//   return `合计金额`
 
-})
+// })
  
   // 查询页面返回
   const searchTableSuccess = (formField, searchField, val, searchFormRef, type, row) => {
@@ -461,7 +492,7 @@ const handleImport = () => {
     } else if (val == 'invoice_sent_out') { // 发票寄出确认
       handleInvoiceSentOut(row.id)
     } else if(val == 'finance_mainPlanSub'){ // 财务审批通过
-      handleFinanceApp(row.id)
+      handleFinanceApp(row)
     } else if(val == 'finance_mainPlanTur'){ //财务审批拒绝
       resonSubmit(val, row)
       // handleFinaceTur(row.masterId)
@@ -493,73 +524,27 @@ const handleImport = () => {
         if(item.field == 'orderType'){
           item.componentProps.disabled = true
         }
-        // 根据状态判断
-        if(row.status=='1'||row.status=='6'){
-          if(item.field == 'procurementCreator'){
-            // 采购价格审批人
-            item.componentProps.disabled = false
-          }
-          if(item.field == 'taxRate'){
-            // 税率
-            item.componentProps.disabled = false
-          }
-          // 调整价差
-          if(item.field == 'discountAmount'){
-            item.componentProps.disabled = false
-          }
-          // 调整税额
-          if(item.field == 'adjustingTaxAmount'){
-            item.componentProps.disabled = false
-          }
-          // 折扣金额
-          if(item.field == 'discountAmount1'){
-            item.componentProps.disabled = false
-          }
-          // 金税票号
-          if(item.field == 'goldenTaxInvoiceNumber'){
-            item.componentProps.disabled = false
-          }
-          // 开票日期
-          if(item.field == 'invoiceTime'){
+
+        // 编辑---taxRate税率\beforeTaxAmount未税金额\totalTaxAmount税额\goldenTaxInvoiceNumber金税票号\invoiceTime发票日期
+        if(item.field == 'taxRate'||item.field == 'beforeTaxAmount'||item.field == 'totalTaxAmount'||item.field == 'goldenTaxInvoiceNumber'||item.field == 'invoiceTime'){
+          if(row.status=='1'||row.status=='3'||row.status=='6'||row.status=='7'){
             item.componentProps.disabled = false
-          }
-        }else{
-          // 采购价格审批人
-          if(item.field == 'procurementCreator'){
+          }else{
             item.componentProps.disabled = true
           }
-          // 税率
-          if(item.field == 'taxRate'){
-            item.componentProps.disabled = true
-          }
-          // 调整价差
-          if(item.field == 'discountAmount'){
-            item.componentProps.disabled = true
-          }
-          // 调整税额
-          if(item.field == 'adjustingTaxAmount'){
-            item.componentProps.disabled = true
-          }
-          // 折扣金额
-          if(item.field == 'discountAmount1'){
-            item.componentProps.disabled = true
-          }
-          // 金税票号
-          if(item.field == 'goldenTaxInvoiceNumber'){
-            item.componentProps.disabled = true
-          }
-          // 开票日期
-          if(item.field == 'invoiceTime'){
+        }
+        // 编辑---procurementCreator采购审批人、discountAmount1折扣金额
+        if(item.field == 'procurementCreator'||item.field == 'discountAmount1'){
+          if(row.status=='1'||row.status=='6'){
+            item.componentProps.disabled = false
+          }else{
             item.componentProps.disabled = true
           }
         }
-        
       })
-      
     }else{
       // 新增
       SupplierinvoiceRequestMain.allSchemas.formSchema.forEach((item) => {
-        
         // 供应商代码
         if(item.field == 'supplierCode'){
           //默认供应商代码
@@ -571,44 +556,23 @@ const handleImport = () => {
         if(item.field == 'orderType'){
           item.componentProps.disabled = false
         }
-
-        //采购价格审批人
-        if(item.field == 'procurementCreator'){
-          item.componentProps.disabled = false
-        }
-        // 税率
-        if(item.field == 'taxRate'){
-          item.componentProps.disabled = false
-        }
-        // 调整价差
-        if(item.field == 'discountAmount'){
-          item.componentProps.disabled = false
-        }
-        // 调整税额
-        if(item.field == 'adjustingTaxAmount'){
-          item.componentProps.disabled = false
-        }
-        // 折扣金额
-        if(item.field == 'discountAmount1'){
-          item.componentProps.disabled = false
-        }
-        // 金税票号
-        if(item.field == 'goldenTaxInvoiceNumber'){
-          item.componentProps.disabled = false
-        }
-        // 开票日期
-        if(item.field == 'invoiceTime'){
+        // 税率 \采购价格审批人 \未税金额 \税额\金税票号\开票日期\折扣金额
+        if(item.field == 'taxRate'||item.field == 'procurementCreator'||item.field == 'beforeTaxAmount'||item.field == 'totalTaxAmount'||item.field == 'goldenTaxInvoiceNumber'||item.field == 'invoiceTime'||item.field == 'discountAmount1'){
           item.componentProps.disabled = false
         }
       })
     }
-    
     if(row && (row.status == '3' ||  row.status == '7')){
+      SupplierinvoiceRequestMainRules.beforeTaxAmount[0].required = true //未税金额
+      SupplierinvoiceRequestMainRules.totalTaxAmount[0].required = true //税额
+      SupplierinvoiceRequestMainRules.goldenTaxInvoiceNumber[0].required = true //金税票号
       SupplierinvoiceRequestMainRules.invoiceTime[0].required = true
-      SupplierinvoiceRequestMainRules.goldenTaxInvoiceNumber[0].required = true
+
     }else{
+      SupplierinvoiceRequestMainRules.beforeTaxAmount[0].required = false //未税金额
+      SupplierinvoiceRequestMainRules.totalTaxAmount[0].required = false //税额
+      SupplierinvoiceRequestMainRules.goldenTaxInvoiceNumber[0].required = false //金税票号
       SupplierinvoiceRequestMainRules.invoiceTime[0].required = false
-      SupplierinvoiceRequestMainRules.goldenTaxInvoiceNumber[0].required = false
     }
     if(row&&row.procurementCreator) row.procurementCreator = Number(row.procurementCreator)
     // 校验是否可以开票
@@ -662,10 +626,7 @@ const handleImport = () => {
     clicKRowId.value = row.id
 
     // 合同附件
-    if(roleList.value.indexOf('purchase')>-1&&row.status=='2'){
-      detailAnnexTable.value[0].hiddenDelete = false
-      detailAnnexTable.value[0].hiddenUpload = false
-    }else if(roleList.value.indexOf('supplier_operator')>-1&&(row.status=='1' || row.status=='6')){
+    if(row.status=='1'||row.status=='2'||row.status=='6'){
       detailAnnexTable.value[0].hiddenDelete = false
       detailAnnexTable.value[0].hiddenUpload = false
     }else{
@@ -673,7 +634,7 @@ const handleImport = () => {
       detailAnnexTable.value[0].hiddenUpload = true
     }
     // 发票附件
-    if(roleList.value.indexOf('supplier_operator')>-1&&(row.status=='3'||row.status=='7')){
+    if(row.status=='3'||row.status=='7'){
       detailAnnexTable.value[1].hiddenDelete = false
       detailAnnexTable.value[1].hiddenUpload = false
     }else{
@@ -787,21 +748,35 @@ const handleImport = () => {
   }
 
 
-  /** 审批通过按钮操作 */
-  const handleFinanceApp = async (id : number) => {
-    try {
-      // 审批通过的二次确认
-      await message.confirm(t('ts.是否审批通过所选中数据？'))
-      tableObject.loading = true
-      // 发起审批通过
-      await SupplierinvoiceRequestMainApi.financeappSupplierinvoiceRequestMain(id)
-      message.success(t('ts.审批通过成功!'))
-      tableObject.loading = false
-      // 刷新列表
-      await getList()
-    } catch { }finally{
-      tableObject.loading = false
-    }
+  /** 审批通过按钮操作 finance_mainPlanSub */
+  const formFinanceRef = ref()
+  const handleFinanceApp = async (row) => {
+    formFinanceRef.value.open('update', row,null,'财务通过','财务通过')
+  }
+
+  const submitFormFinance = async (formType, submitData) => {
+    let data = {...submitData}
+    console.log('submitFormFinance',data)
+    await SupplierinvoiceRequestMainApi.financeappSupplierinvoiceRequestMain({
+      id:data.id,
+      postingDate:data.postingDate,
+      voucherNumberRemark:data.voucherNumberRemark,
+    })
+    formFinanceRef.value.dialogVisible = false
+    getList()
+    // try {
+    //   // 审批通过的二次确认
+    //   await message.confirm(t('ts.是否审批通过所选中数据？'))
+    //   tableObject.loading = true
+    //   // 发起审批通过
+    //   await SupplierinvoiceRequestMainApi.financeappSupplierinvoiceRequestMain(id)
+    //   message.success(t('ts.审批通过成功!'))
+    //   tableObject.loading = false
+    //   // 刷新列表
+    //   await getList()
+    // } catch { }finally{
+    //   tableObject.loading = false
+    // }
   }
 
   /** 驳回按钮操作 */
@@ -967,18 +942,10 @@ const handleImport = () => {
   const submitForm = async (formType, submitData) => {
     let data = {...submitData}
     tableData.value.forEach((item) => {
-      item.differencePrice = Number((Number(item?.singlePrice)-Number(item?.purchasePrice)).toFixed(6))
+      item.differencePrice = Number((Number(item?.singlePrice)-Number(item?.purchasePrice)).toFixed(2))
     })
     data.subList = tableData.value // 拼接子表数据参数
-    if(data){
-      // 未税金额\价税合计金额\税额
-      let price1 = data.amount+data.discountAmount+data.discountAmount1
-      let price2 = data.taxAmount+data.adjustingTaxAmount
-      data.beforeTaxAmount = price1
-      data.totalTaxAmount = price2
-      data.adTaxAmount = price1+price2
-    }
-    
+    console.log('data',data)
     try {
       if (formType === 'create') {
         if(data.subList.length == 0){
@@ -1108,11 +1075,12 @@ const importSuccess = () => {
     }else{
       roleList.value = []
     }
-    if(roleList.value.indexOf('supplier_operator')>-1){
-      detailButtonIsShowAddStatusArray.value = ['1','6']
-    }else{
-      detailButtonIsShowAddStatusArray.value = []
-    }
+    detailButtonIsShowAddStatusArray.value = ['1','6']
+    // if(roleList.value.indexOf('supplier_operator')>-1){
+    //   detailButtonIsShowAddStatusArray.value = ['1','6']
+    // }else{
+    //   detailButtonIsShowAddStatusArray.value = []
+    // }
   }
  
   /** 初始化 **/
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index 179801fcc..b263eefc0 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -203,7 +203,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
-    sortTableDefault:6,
+    sortTableDefault:9,
     isSearch: true,
     form: {
       value: '1',
@@ -219,17 +219,17 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
-    sortTableDefault:5,
+    sortTableDefault:8,
     form: {
       component: 'InputNumber',
       componentProps: {
-        precision: 6,
+        precision: 2,
         disabled: true,
       }
     },
     tableForm: {
       type: 'InputNumber',
-      precision: 6,
+      precision: 2,
     }
   },
   {
@@ -245,39 +245,39 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   
-  {
-    label: '未税金额',
-    field: 'beforeTaxAmount',
-    formatter: accountantFormart,
-    table: {
-      width: 150
-    },
-    sortTableDefault:3,
-    isForm:false,
-    isTableForm:false
-  },
-  {
-    label: '税额',
-    field: 'totalTaxAmount',
-    formatter: accountantFormart,
-    table: {
-      width: 150
-    },
-    sortTableDefault:3,
-    isForm:false,
-    isTableForm:false
-  },
-  {
-    label: '价税合计金额',
-    field: 'adTaxAmount',
-    formatter: accountantFormart,
-    table: {
-      width: 150
-    },
-    sortTableDefault:3,
-    isForm:false,
-    isTableForm:false
-  },
+  // {
+  //   label: '未税金额',
+  //   field: 'beforeTaxAmount',
+  //   formatter: accountantFormart,
+  //   table: {
+  //     width: 150
+  //   },
+  //   sortTableDefault:3,
+  //   isForm:false,
+  //   isTableForm:false
+  // },
+  // {
+  //   label: '税额',
+  //   field: 'totalTaxAmount',
+  //   formatter: accountantFormart,
+  //   table: {
+  //     width: 150
+  //   },
+  //   sortTableDefault:3,
+  //   isForm:false,
+  //   isTableForm:false
+  // },
+  // {
+  //   label: '价税合计金额',
+  //   field: 'adTaxAmount',
+  //   formatter: accountantFormart,
+  //   table: {
+  //     width: 150
+  //   },
+  //   sortTableDefault:3,
+  //   isForm:false,
+  //   isTableForm:false
+  // },
   {
     label: '系统税额',
     field: 'taxAmount',
@@ -285,17 +285,17 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
-    sortTableDefault:3,
+    sortTableDefault:6,
     form: {
       component: 'InputNumber',
       componentProps: {
-        precision: 6,
+        precision: 2,
         disabled: true,
       }
     },
     tableForm: {
       type: 'InputNumber',
-      precision: 6,
+      precision: 2,
     }
   },
   {
@@ -305,18 +305,18 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
-    sortTableDefault:3,
+    sortTableDefault:7,
     form: {
       component: 'InputNumber',
       componentProps: {
-        precision: 6,
+        precision: 2,
         disabled: true,
       }
     },
     tableForm: {
       type: 'InputNumber',
       min: 0,
-      precision: 6,
+      precision: 2,
       disabled: true,
     }
   },
@@ -335,18 +335,57 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       component: 'InputNumber',
       componentProps: {
         min: 0,
-        precision: 6,
+        precision: 2,
       }
     },
     tableForm: {
       type: 'InputNumber',
       min: 0,
-      precision: 6,
+      precision: 2,
     }
   },
+  // {
+  //   label: '调整价差',
+  //   field: 'discountAmount',
+  //   formatter: accountantFormart,
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTable:false,
+  //   form: {
+  //     component: 'InputNumber',
+  //     componentProps: {
+  //       precision: 2,
+  //     }
+  //   },
+  //   tableForm: {
+  //     type: 'InputNumber',
+  //     min: 0,
+  //     precision: 2,
+  //   }
+  // },
+  // {
+  //   label: '调整税额',
+  //   field: 'adjustingTaxAmount',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTable:false,
+  //   form: {
+  //     component: 'InputNumber',
+  //     componentProps: {
+  //       precision: 2,
+  //     }
+  //   },
+  //   tableForm: {
+  //     type: 'InputNumber',
+  //     min: 0,
+  //     precision: 2,
+  //   }
+  // },
   {
-    label: '调整价差',
-    field: 'discountAmount',
+    label: '折扣金额',
+    field: 'discountAmount1',
     formatter: accountantFormart,
     table: {
       width: 150
@@ -355,53 +394,113 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     form: {
       component: 'InputNumber',
       componentProps: {
-        precision: 6,
+        precision: 2,
       }
     },
     tableForm: {
       type: 'InputNumber',
       min: 0,
-      precision: 6,
+      precision: 2,
     }
   },
   {
-    label: '调整税额',
-    field: 'adjustingTaxAmount',
+    label: '未税金额',
+    field: 'beforeTaxAmount',
+    formatter: accountantFormart,
     table: {
       width: 150
     },
-    isTable:false,
+    sortTableDefault:3,
     form: {
       component: 'InputNumber',
       componentProps: {
-        precision: 6,
+        precision: 2,
+        disabled: true,
       }
     },
-    tableForm: {
-      type: 'InputNumber',
-      min: 0,
-      precision: 6,
-    }
+    isTableForm:false,
   },
   {
-    label: '折扣金额',
-    field: 'discountAmount1',
+    label: '税额',
+    field: 'totalTaxAmount',
     formatter: accountantFormart,
     table: {
       width: 150
     },
-    isTable:false,
+    sortTableDefault:4,
     form: {
       component: 'InputNumber',
       componentProps: {
-        precision: 6,
+        precision: 2,
+        disabled: true,
+      }
+    },
+    isTableForm:false,
+  },
+  {
+    label: '价税合计金额',
+    field: 'adTaxAmount',
+    formatter: accountantFormart,
+    table: {
+      width: 150
+    },
+    sortTableDefault:5,
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        precision: 2,
+        disabled: true,
+      }
+    },
+    isTableForm:false,
+  },
+  {
+    label: '未税差额',
+    field: 'beforeTaxDiffAmount',
+    formatter: accountantFormart,
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        precision: 2,
+        disabled: true,
+      }
+    },
+    isTableForm:false,
+  },
+  {
+    label: '税额差异',
+    field: 'taxAmountDiff',
+    formatter: accountantFormart,
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        precision: 2,
+        disabled: true,
+      }
+    },
+    isTableForm:false,
+  },
+  {
+    label: '价税合计差额',
+    field: 'totalTaxDiffAmount',
+    formatter: accountantFormart,
+    table: {
+      width: 150
+    },
+    isTableForm:false,
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        precision: 2,
+        disabled: true,
       }
     },
-    tableForm: {
-      type: 'InputNumber',
-      min: 0,
-      precision: 6,
-    }
   },
   
   // {
@@ -415,13 +514,13 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
   //   form: {
   //     component: 'InputNumber',
   //     componentProps: {
-  //       precision: 6,
+  //       precision: 2,
   //     }
   //   },
   //   tableForm: {
   //     type: 'InputNumber',
   //     min: 0,
-  //     precision: 6,
+  //     precision: 2,
   //   }
   // },
   {
@@ -430,7 +529,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150,
     },
-    sortTableDefault:7,
+    sortTableDefault:10,
     form:{
       componentProps: {
         maxlength:23,
@@ -458,7 +557,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 180
     },
-    sortTableDefault:8,
+    sortTableDefault:11,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -481,7 +580,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     isTableForm: false,
     isForm:false,
     isSearch:false,
-    sortTableDefault:9
+    sortTableDefault:12
   },
   {
     label: '过账日期',
@@ -495,9 +594,11 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       width: 180
     },
     isTable:false,
+    isDetail:false,
     form: {
       component: 'DatePicker',
       componentProps: {
+        disabled: true,
         style: {width:'100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
@@ -505,6 +606,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       }
     },
   },
+  
   {
     label: '申请时间',
     field: 'requestTime',
@@ -647,12 +749,12 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       // }
     }
   },
-
+ 
   {
     label: '采购审批时间',
     field: 'procurementCreateTime',
     isTable: true,
-    sortTableDefault:10,
+    sortTableDefault:13,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -670,7 +772,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
-    sortTableDefault:11,
+    sortTableDefault:14,
     isForm: false,
   },
   {
@@ -679,7 +781,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 180
     },
-    sortTableDefault:14,
+    sortTableDefault:16,
     isTable: true,
     isSearch: false,
     isForm: false,
@@ -691,7 +793,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 180
     },
-    sortTableDefault:15,
+    sortTableDefault:17,
     isTable: true,
     isSearch: false,
     isForm: false,
@@ -701,7 +803,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     label: '财务审批时间',
     field: 'financialCreateTime',
     isTable: true,
-    sortTableDefault:12,
+    sortTableDefault:15,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -912,9 +1014,59 @@ export const SupplierinvoiceRequestMainRules = reactive({
   procurementCreator: [
     { required: true, message: '请选择采购员', trigger: 'change' }
   ],
+  beforeTaxAmount: [
+    { required: true, message: '请输入未税金额', trigger: 'change' }
+  ],
+  totalTaxAmount: [
+    { required: true, message: '请输入税额', trigger: 'change' }
+  ],
 })
 
+export const SupplierinvoiceRequestFinance = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '过账日期',
+    field: 'postingDate',
+    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',
+      }
+    },
+  },
+  {
+    label: '凭证描述',
+    field: 'voucherNumberRemark',
+    sort: 'custom',
+    isTable:false,
+    form: {
+      component: 'Input',
+      componentProps:{
+        type: 'textarea'
+      }
+    },
+  },
+]))
 
+export const SupplierinvoiceRequestFinanceRules = reactive({
+  postingDate: [
+    { required: true, message: '请选择过账日期', trigger: 'change' }
+  ],
+  voucherNumberRemark:  [
+    { max: 50, message: '不得超过40个字符', trigger: 'blur' }
+  ],
+})
 /**
  * @returns {Array} 供应商发票申请子表
  */
@@ -1022,13 +1174,13 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       component: 'InputNumber',
       componentProps: {
         min: 0,
-        precision: 6,
+        precision: 2,
       }
     },
     tableForm: {
       type: 'InputNumber',
       min: 0,
-      precision: 6,
+      precision: 2,
     }
   },
   {
@@ -1042,13 +1194,13 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       componentProps: {
         disabled: true,
         min: 0,
-        precision: 6,
+        precision: 2,
       }
     },
     tableForm:{
       disabled: true,
       min: 0,
-      precision: 6,
+      precision: 2,
     }
   },
   {
@@ -1062,14 +1214,14 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       componentProps: {
         disabled: true,
         min: 0,
-        precision: 6,
+        precision: 2,
       }
     },
     tableForm:{
       type: 'slot',
       disabled: true,
       min: 0,
-      precision: 6,
+      precision: 2,
     }
   },
   {
@@ -1219,7 +1371,7 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
   },
   
   {
-    label: '未税差额',
+    label: '未税差额',//子表数据
     field: 'untaxedDifference',
     formatter: accountantFormart,
     table: {
@@ -1228,13 +1380,13 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     form: {
       component: 'InputNumber',
       componentProps: {
-        precision: 6,
+        precision: 2,
       }
     },
     tableForm: {
       type: 'InputNumber',
       min: 0,
-      precision: 6,
+      precision: 2,
     }
   },
   {
@@ -1247,13 +1399,13 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     form: {
       component: 'InputNumber',
       componentProps: {
-        precision: 6,
+        precision: 2,
       }
     },
     tableForm: {
       type: 'InputNumber',
       min: 0,
-      precision: 6,
+      precision: 2,
     }
   },
   

From 55114074e6dd93aa37e01107543cd6c6cc035f3a Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 28 Jun 2024 09:45:23 +0800
Subject: [PATCH 038/408] =?UTF-8?q?=E7=9B=98=E7=82=B9=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/BasicFormWmsCount.vue      | 8 +++++---
 src/views/wms/countManage/count/countPlanMain/index.vue | 2 ++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/components/BasicForm/src/BasicFormWmsCount.vue b/src/components/BasicForm/src/BasicFormWmsCount.vue
index eb448b7e2..0f7e1b472 100644
--- a/src/components/BasicForm/src/BasicFormWmsCount.vue
+++ b/src/components/BasicForm/src/BasicFormWmsCount.vue
@@ -24,7 +24,7 @@
     >
       <template #crontab="formSchema1" v-if="fromeWhere == 'countPlan'">
       
-        <crontab v-model="formSchema1.crontab" :disabled="formSchema?.find(item=>item.field == 'crontab')?.componentProps?.disabled "/>
+        <crontab v-if="formSchema1.type=='CYCLE'"  v-model="formSchema1.crontab" :disabled="formSchema?.find(item=>item.field == 'crontab')?.componentProps?.disabled "/>
       </template>
       <template #type="formSchema" v-if="fromeWhere == 'countPlan'">
         <el-select
@@ -745,7 +745,8 @@ const submitForm = async () => {
       // 主子表——提交请求
       try {
         const data = unref(formRef)?.formModel
-        emit('submitForm', formType.value, data)
+        const data1 = unref(formRef1)?.formModel
+        emit('submitForm', formType.value, {...data,...data1})
       } finally {
         formLoading.value = false
       }
@@ -753,7 +754,8 @@ const submitForm = async () => {
       // 编辑
       try {
         const data = unref(formRef)?.formModel
-        emit('submitForm', formType.value, data)
+        const data1 = unref(formRef1)?.formModel
+        emit('submitForm', formType.value, {...data,...data1})
       } finally {
         formLoading.value = false
       }
diff --git a/src/views/wms/countManage/count/countPlanMain/index.vue b/src/views/wms/countManage/count/countPlanMain/index.vue
index 5ce419c45..06aed60fa 100644
--- a/src/views/wms/countManage/count/countPlanMain/index.vue
+++ b/src/views/wms/countManage/count/countPlanMain/index.vue
@@ -702,6 +702,7 @@ const selectChange = (field, val) => {
       CountPlanMain.allSchemas.formSchema.forEach((item) => {
         if (item.field == 'crontab') {
           item.componentProps.disabled = false
+          item.label = '执行周期'
         }
         if (item.field == 'limitedValue') {
           item.componentProps.disabled = true
@@ -713,6 +714,7 @@ const selectChange = (field, val) => {
       CountPlanMain.allSchemas.formSchema.forEach((item) => {
         if (item.field == 'crontab') {
           item.componentProps.disabled = true
+          item.label = ''
         }
         if (item.field == 'limitedValue') {
           item.componentProps.disabled = true

From 2ec5fd66bec51584e4273eb8279c7182f2f025ef Mon Sep 17 00:00:00 2001
From: bjang03 <259278618@qq.com>
Date: Fri, 28 Jun 2024 10:40:56 +0800
Subject: [PATCH 039/408] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D=201=E3=80=81?=
 =?UTF-8?q?=E7=9B=98=E7=82=B9=E8=AE=A1=E5=88=92=EF=BC=8C=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=9A=84=E7=89=A9=E6=96=99=E5=BF=BD=E7=95=A5=E5=90=8D=E5=8D=95?=
 =?UTF-8?q?=E3=80=81=E5=BA=93=E4=BD=8D=E5=BF=BD=E7=95=A5=E5=90=8D=E5=8D=95?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=9C=A8=E8=A1=A8=E5=A4=B4=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=EF=BC=8C=E5=B9=B6=E6=B7=BB=E5=8A=A0=E5=BF=BD=E7=95=A5=E7=9A=84?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E3=80=81=E5=BA=93=E4=BD=8D=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E5=BF=BD=E7=95=A5=E7=9B=98=E7=82=B9=EF=BC=8C=E5=BA=94=E5=BF=BD?=
 =?UTF-8?q?=E7=95=A5=E7=9B=98=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../count/countPlanMain/countPlanMain.data.ts | 76 +++++++++----------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
index fd38865bb..9cffbf23b 100644
--- a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
+++ b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
@@ -83,45 +83,45 @@ export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  // {
-  //   label: '物料忽略名单',
-  //   field: 'ignoreListOfItem',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   form: {
-  //     componentProps: {
-  //       isSearchList: true, // 开启查询弹窗
-  //       multiple:true,//是否可以多选
-  //       searchListPlaceholder: '请选择物料忽略名单', // 输入框占位文本
-  //       searchField: 'code', // 查询弹窗赋值字段
-  //       searchTitle: '物料信息', // 查询弹窗标题
-  //       searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
-  //       searchPage: ItembasicApi.getItembasicPage // 查询弹窗所需分页方法
-  //     }
-  //   }
-  // },
-  // {
-  //   label: '库位忽略名单',
-  //   field: 'ignoreListOfLocation',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   form: {
-  //     componentProps: {
-  //       isSearchList: true, // 开启查询弹窗
-  //       multiple:true,//是否可以多选
-  //       searchListPlaceholder: '请选择库位忽略名单', // 输入框占位文本
-  //       searchField: 'code', // 查询弹窗赋值字段
-  //       searchTitle: '库位信息', // 查询弹窗标题
-  //       searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
-  //       searchPage: LocationApi.getLocationPage // 查询弹窗所需分页方法
+  {
+    label: '物料忽略名单',
+    field: 'ignoreListOfItem',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        multiple:true,//是否可以多选
+        searchListPlaceholder: '请选择物料忽略名单', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '物料信息', // 查询弹窗标题
+        searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
+        searchPage: ItembasicApi.getItembasicPage // 查询弹窗所需分页方法
+      }
+    }
+  },
+  {
+    label: '库位忽略名单',
+    field: 'ignoreListOfLocation',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        multiple:true,//是否可以多选
+        searchListPlaceholder: '请选择库位忽略名单', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库位信息', // 查询弹窗标题
+        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+        searchPage: LocationApi.getLocationPage // 查询弹窗所需分页方法
         
-  //     }
-  //   }
-  // },
+      }
+    }
+  },
   // {
   //   label: '盘点范围列表',
   //   field: 'scopeList',

From d7d4f20033cab7091b6c5e9e8ceba121f6ce0e3a Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 28 Jun 2024 10:47:25 +0800
Subject: [PATCH 040/408] =?UTF-8?q?=E6=80=A7=E8=83=BD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/supplierinvoiceRequestDetail/index.ts |  8 +++-
 src/components/BasicForm/src/BasicForm.vue    |  8 +++-
 .../supplierinvoiceRecordMain.data.ts         | 48 +++++++++----------
 .../supplierinvoiceRequestMain/index.vue      | 11 ++---
 4 files changed, 42 insertions(+), 33 deletions(-)

diff --git a/src/api/wms/supplierinvoiceRequestDetail/index.ts b/src/api/wms/supplierinvoiceRequestDetail/index.ts
index 0dd4c5343..f20a6fe16 100644
--- a/src/api/wms/supplierinvoiceRequestDetail/index.ts
+++ b/src/api/wms/supplierinvoiceRequestDetail/index.ts
@@ -41,7 +41,13 @@ export const getPoNumber = async (params) => {
 
 // 查询供应商发票明细数据
 export const getPoNumberPoLineInfo = async (params) => {
-  return await request.get({ url: `/wms/supplierinvoice-request-detail/getPoNumberPoLineInfo`, params})
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: `/wms/supplierinvoice-request-detail/getPoNumbersenior`, data})
+  }else{
+    return await request.get({ url: `/wms/supplierinvoice-request-detail/getPoNumberPoLineInfo`, params})
+  }
 }
 
 
diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 933b07128..6ec7b387c 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -492,9 +492,13 @@ watch(()=>props.tableData,() => {
 },{
   deep:true
 })
-watch(()=>unref(formRef)?.formModel,() => {
+let originFormModel = {}
+const updateOriginFormModel = (data)=>{
+  originFormModel = JSON.parse(JSON.stringify(data))
+}
+watch(()=>unref(formRef)?.formModel,async () => {
   if(props?.sumFormDataByForm&&unref(formRef)?.formModel){
-    props?.sumFormDataByForm(formRef,unref(formRef)?.formModel,props.tableData,formType.value)
+    props?.sumFormDataByForm(formRef,unref(formRef)?.formModel,props.tableData,formType.value,originFormModel,updateOriginFormModel)
   }
 },{
   deep:true
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
index 028abb8dc..5314ed1dd 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
@@ -553,30 +553,30 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false,
   },
-  {
-    label: '采购驳回原因',
-    field: 'purchaseRejectCause',
-    table: {
-      width: 180
-    },
-    sortTableDefault:14,
-    isTable: true,
-    isSearch: false,
-    isForm: false,
-    isDetail:false,
-  },
-  {
-    label: '财务驳回原因',
-    field: 'financeRejectCause',
-    table: {
-      width: 180
-    },
-    sortTableDefault:15,
-    isTable: true,
-    isSearch: false,
-    isForm: false,
-    isDetail:false,
-  },
+  // {
+  //   label: '采购驳回原因',
+  //   field: 'purchaseRejectCause',
+  //   table: {
+  //     width: 180
+  //   },
+  //   sortTableDefault:14,
+  //   isTable: true,
+  //   isSearch: false,
+  //   isForm: false,
+  //   isDetail:false,
+  // },
+  // {
+  //   label: '财务驳回原因',
+  //   field: 'financeRejectCause',
+  //   table: {
+  //     width: 180
+  //   },
+  //   sortTableDefault:15,
+  //   isTable: true,
+  //   isSearch: false,
+  //   isForm: false,
+  //   isDetail:false,
+  // },
   {
     label: '供应商审批人代码',
     field: 'supplierCreator',
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index cfdfb6c81..fdbdb1e01 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -53,19 +53,18 @@
     :tableAllSchemas="SupplierinvoiceRequestDetail.allSchemas" 
     :tableFormRules="SupplierinvoiceRequestDetailRules"
     :tableData="tableData" 
-    :sumFormDataByForm ="(formRef,formModel,tableData,formType)=>{
+    :sumFormDataByForm ="(formRef,formModel,tableData,formType,originFormModel,updateOriginFormModel)=>{
       const {taxRate=0,amount=0,taxAmount=0,beforeTaxAmount=0,totalTaxAmount=0,discountAmount1=0,beforeTaxDiffAmount=0,taxAmountDiff=0} = formModel 
       // 2、系统税额：每条数据的合同价格X可开票数量，计算结果取两位小数之后*税率的计算结果，再保留2位。所有子表数据再求和
       let taxAmount_ = 0.00
       if(formType=='update'){ // 编辑
         taxAmount_ = taxAmount
       }else if(formType=='create'){ // 新增
-        taxAmount_ = tableData.reduce((prev, item) => prev + Number(Number(taxRate*0.01*Number(Number(item['singlePrice']*item['invoicableQuantity']).toFixed(2))).toFixed(2)),0)
+        if(taxRate!=originFormModel.taxRate){
+          taxAmount_ = tableData.reduce((prev, item) => prev + Number(Number(taxRate*0.01*Number(Number(item['singlePrice']*item['invoicableQuantity']).toFixed(2))).toFixed(2)),0)
+          updateOriginFormModel(formModel)
+        }
       }
-      console.log('sumFormDataByForm',tableData)
-      console.log('taxAmount_',taxAmount_)
-
-      if(tableData)
       formRef.value.setValues({
         taxAmount:taxAmount_, 
         afterTaxAmount:amount+taxAmount, // 3、系统价税合计：系统未税金额+系统税额

From 4985586660fd0dc4b4ee2a2504e5fc88eab8b5be Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 28 Jun 2024 10:51:43 +0800
Subject: [PATCH 041/408] =?UTF-8?q?=E4=B8=A4=E4=B8=AA=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/components/BasicForm/src/BasicFormWmsCount.vue b/src/components/BasicForm/src/BasicFormWmsCount.vue
index 0f7e1b472..97eccb7a1 100644
--- a/src/components/BasicForm/src/BasicFormWmsCount.vue
+++ b/src/components/BasicForm/src/BasicFormWmsCount.vue
@@ -662,6 +662,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
     try {
       nextTick(() => {
         formRef.value.setValues(row)
+        formRef1.value.setValues(row)
       })
     } finally {
       formLoading.value = false
@@ -670,6 +671,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
     if(row){
       nextTick(() => {
         formRef.value.setValues(row)
+        formRef1.value.setValues(row)
       })
     }
   }

From f18489adf4e97d1e0159c108ddbce4b22b5dce14 Mon Sep 17 00:00:00 2001
From: bjang03 <259278618@qq.com>
Date: Fri, 28 Jun 2024 10:52:47 +0800
Subject: [PATCH 042/408] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D=201=E3=80=81?=
 =?UTF-8?q?=E7=9B=98=E7=82=B9=E8=AE=A1=E5=88=92=EF=BC=8C=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=9A=84=E7=89=A9=E6=96=99=E5=BF=BD=E7=95=A5=E5=90=8D=E5=8D=95?=
 =?UTF-8?q?=E3=80=81=E5=BA=93=E4=BD=8D=E5=BF=BD=E7=95=A5=E5=90=8D=E5=8D=95?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=9C=A8=E8=A1=A8=E5=A4=B4=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=EF=BC=8C=E5=B9=B6=E6=B7=BB=E5=8A=A0=E5=BF=BD=E7=95=A5=E7=9A=84?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E3=80=81=E5=BA=93=E4=BD=8D=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E5=BF=BD=E7=95=A5=E7=9B=98=E7=82=B9=EF=BC=8C=E5=BA=94=E5=BF=BD?=
 =?UTF-8?q?=E7=95=A5=E7=9B=98=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../count/countPlanMain/countPlanMain.data.ts | 78 +++++++++----------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
index 9cffbf23b..3e0b98967 100644
--- a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
+++ b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
@@ -83,45 +83,45 @@ export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '物料忽略名单',
-    field: 'ignoreListOfItem',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        multiple:true,//是否可以多选
-        searchListPlaceholder: '请选择物料忽略名单', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '物料信息', // 查询弹窗标题
-        searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
-        searchPage: ItembasicApi.getItembasicPage // 查询弹窗所需分页方法
-      }
-    }
-  },
-  {
-    label: '库位忽略名单',
-    field: 'ignoreListOfLocation',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        multiple:true,//是否可以多选
-        searchListPlaceholder: '请选择库位忽略名单', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '库位信息', // 查询弹窗标题
-        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
-        searchPage: LocationApi.getLocationPage // 查询弹窗所需分页方法
-        
-      }
-    }
-  },
+  // {
+  //   label: '物料忽略名单',
+  //   field: 'ignoreListOfItem',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     componentProps: {
+  //       isSearchList: true, // 开启查询弹窗
+  //       multiple:true,//是否可以多选
+  //       searchListPlaceholder: '请选择物料忽略名单', // 输入框占位文本
+  //       searchField: 'code', // 查询弹窗赋值字段
+  //       searchTitle: '物料信息', // 查询弹窗标题
+  //       searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
+  //       searchPage: ItembasicApi.getItembasicPage // 查询弹窗所需分页方法
+  //     }
+  //   }
+  // },
+  // {
+  //   label: '库位忽略名单',
+  //   field: 'ignoreListOfLocation',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     componentProps: {
+  //       isSearchList: true, // 开启查询弹窗
+  //       multiple:true,//是否可以多选
+  //       searchListPlaceholder: '请选择库位忽略名单', // 输入框占位文本
+  //       searchField: 'code', // 查询弹窗赋值字段
+  //       searchTitle: '库位信息', // 查询弹窗标题
+  //       searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+  //       searchPage: LocationApi.getLocationPage // 查询弹窗所需分页方法
+  //
+  //     }
+  //   }
+  // },
   // {
   //   label: '盘点范围列表',
   //   field: 'scopeList',

From c41ff0fb3f18930d67f682587c1a6c4be8a8b62b Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Fri, 28 Jun 2024 11:33:05 +0800
Subject: [PATCH 043/408] =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BD=99=E9=A2=9D?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=95=B0=E6=8D=AE(=E5=8C=85=E6=8B=AC?=
 =?UTF-8?q?=E5=B7=B2=E5=86=BB=E7=BB=93=EF=BC=8C=E5=B7=B2=E5=A4=B1=E6=95=88?=
 =?UTF-8?q?=E7=9A=84=E7=89=A9=E6=96=99)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/balance/index.ts                    | 12 ++++++++++++
 src/views/wms/inventoryManage/balance/index.vue |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/api/wms/balance/index.ts b/src/api/wms/balance/index.ts
index 68161dc16..839ac877a 100644
--- a/src/api/wms/balance/index.ts
+++ b/src/api/wms/balance/index.ts
@@ -41,6 +41,18 @@ export const getBalancePage = async (params) => {
     return await request.get({ url: `/wms/balance/page`, params })
   }
 }
+
+// 查询库存余额列表(包括已冻结，已失效的物料)
+export const getBalancePageAll = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/balance/seniorAll', data })
+  } else {
+    return await request.get({ url: `/wms/balance/pageAll`, params })
+  }
+}
+
 // 查询库存余额列表
 export const getBalancePageReturn= async (params) => {
   if (params.isSearch) {
diff --git a/src/views/wms/inventoryManage/balance/index.vue b/src/views/wms/inventoryManage/balance/index.vue
index 8a372224e..595b8ceb1 100644
--- a/src/views/wms/inventoryManage/balance/index.vue
+++ b/src/views/wms/inventoryManage/balance/index.vue
@@ -88,7 +88,7 @@ const updataTableColumns = (val) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: BalanceApi.getBalancePage // 分页接口
+  getListApi: BalanceApi.getBalancePageAll // 分页接口
 })
 
 // 获得表格的各种操作

From 44633958749fb1609930edb28b9170f79d727d09 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 28 Jun 2024 11:43:29 +0800
Subject: [PATCH 044/408] pagesize

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

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
index 70ba54b7c..f5745626b 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
@@ -114,6 +114,7 @@ const openFormByCreate = async ( data ) => {
         defaultParams:{code:data['supplierCode']},
         getListApi: SupplierApi.getSupplierPage // 分页接口
     })
+    tableObject.pageSize = 500
     const { getList } = tableMethods
     await getList()
     if(tableObject.tableList.length>0){

From aef80865ccae340942fbd57a8fe5240a03f0c5b8 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 28 Jun 2024 11:48:09 +0800
Subject: [PATCH 045/408] =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoiceRequestMain/index.vue              | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index fdbdb1e01..72031bc2e 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -1074,12 +1074,11 @@ const importSuccess = () => {
     }else{
       roleList.value = []
     }
-    detailButtonIsShowAddStatusArray.value = ['1','6']
-    // if(roleList.value.indexOf('supplier_operator')>-1){
-    //   detailButtonIsShowAddStatusArray.value = ['1','6']
-    // }else{
-    //   detailButtonIsShowAddStatusArray.value = []
-    // }
+    if(roleList.value.indexOf('supplier_operator')>-1){
+      detailButtonIsShowAddStatusArray.value = ['1','6']
+    }else{
+      detailButtonIsShowAddStatusArray.value = []
+    }
   }
  
   /** 初始化 **/

From 2bb10d5f686e7afaf4b1454a46cd97e2379b86ac Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 28 Jun 2024 12:23:32 +0800
Subject: [PATCH 046/408] =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=96=87=E5=AD=97?=
 =?UTF-8?q?=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Annex/src/Annex.vue            |   6 +-
 src/components/Detail/src/Detail.vue          |   2 +
 .../supplierinvoiceRequestMain/index.vue      |  10 +-
 .../supplierinvoiceRequestMain.data.ts        | 108 +++++++++---------
 4 files changed, 68 insertions(+), 58 deletions(-)

diff --git a/src/components/Annex/src/Annex.vue b/src/components/Annex/src/Annex.vue
index 2c7f75bfe..a9f8b472b 100644
--- a/src/components/Annex/src/Annex.vue
+++ b/src/components/Annex/src/Annex.vue
@@ -3,7 +3,7 @@
   <div class="annex">
     <div class="title flex items-center">
       <!-- <div class="title-txt">附件</div> -->
-      <UploadFile :isShowFile="false" :isShowTip="false" :fileType="fileType" :title="t('ts.添加附件')" :upData="upData" :limit="10"
+      <UploadFile :isShowFile="false" :isShowTip="false" :fileType="fileType" :fileSize="fileSize" :title="t('ts.添加附件')" :upData="upData" :limit="10"
         @update:modelValue="handleAnnexSuccess" v-if="showAddBtn&&annexData.annexList.length<5"/>
     </div>
     <div class="list">
@@ -56,6 +56,10 @@ const props = defineProps({
       return ['apk','doc', 'xls', 'ppt', 'txt', 'pdf','png', 'jpg', 'jpeg']
     }
   },
+  fileSize:{
+    type:Number,
+    required: false,
+  },
   showPreview: {
     type: Boolean,
     required: false
diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue
index afd300ab9..07411ee65 100644
--- a/src/components/Detail/src/Detail.vue
+++ b/src/components/Detail/src/Detail.vue
@@ -108,6 +108,7 @@
               <Annex v-show="tabsList[current].label==annexItem.label"
                   :annexData="annexItem"
                   :fileType="annexItem.fileType"
+                  :fileSize="annexItem.fileSize"
                   :showAddBtn="!annexItem.hiddenUpload"
                   :showPreview="annexItem.showPreview"
                   :showDownload = "annexItem.showDownload"
@@ -525,6 +526,7 @@ const getAnnexFileList =  async (row) => {
         hasSubDetail:item.hasSubDetail||false,
         subDetailTableData:item.subDetailTableData,
         fileType:item.fileType||['apk','doc', 'xls', 'ppt', 'txt', 'pdf','png', 'jpg', 'jpeg'],
+        fileSize:item.fileSize||5,
         showPreview:item.showPreview||false, // 是否展示预览按钮
         showDownload:item.showDownload||false, // 是否展示下载按钮
         hiddenDelete:item.hiddenDelete || false, // 是否展示删除按钮
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 72031bc2e..20bf60358 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -607,17 +607,21 @@ const handleImport = () => {
     prop: 'Annex',
     tableName:'contract',
     hiddenDelete:false,
-    hiddenUpload:false
+    hiddenUpload:false,
+    fileSize:20
   },{
     label: t('ts.发票附件'),
     prop: 'Annex',
     tableName:'invoice',
     hiddenDelete:false,
-    hiddenUpload:false
+    hiddenUpload:false,
+    fileSize:20
+
   },{
     label: t('ts.货运单附件'),
     prop: 'Annex',
-    tableName:'waybill'
+    tableName:'waybill',
+    fileSize:20
   }])
   const openDetail = (row : any, titleName : any, titleValue : any) => {
     const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index b263eefc0..19d1e1e26 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -1204,7 +1204,7 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     }
   },
   {
-    label: '差额',
+    label: '单价差额',
     field: 'differencePrice',
     formatter: singlePriceFormart,
     table: {
@@ -1370,44 +1370,44 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     }
   },
   
-  {
-    label: '未税差额',//子表数据
-    field: 'untaxedDifference',
-    formatter: accountantFormart,
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        precision: 2,
-      }
-    },
-    tableForm: {
-      type: 'InputNumber',
-      min: 0,
-      precision: 2,
-    }
-  },
-  {
-    label: '含税差额',
-    field: 'taxInclusiveDifference',
-    formatter: accountantFormart,
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        precision: 2,
-      }
-    },
-    tableForm: {
-      type: 'InputNumber',
-      min: 0,
-      precision: 2,
-    }
-  },
+  // {
+  //   label: '未税差额',//子表数据
+  //   field: 'untaxedDifference',
+  //   formatter: accountantFormart,
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'InputNumber',
+  //     componentProps: {
+  //       precision: 2,
+  //     }
+  //   },
+  //   tableForm: {
+  //     type: 'InputNumber',
+  //     min: 0,
+  //     precision: 2,
+  //   }
+  // },
+  // {
+  //   label: '含税差额',
+  //   field: 'taxInclusiveDifference',
+  //   formatter: accountantFormart,
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'InputNumber',
+  //     componentProps: {
+  //       precision: 2,
+  //     }
+  //   },
+  //   tableForm: {
+  //     type: 'InputNumber',
+  //     min: 0,
+  //     precision: 2,
+  //   }
+  // },
   
  
     //仅是主列表页面的筛选搜索条件
@@ -1434,21 +1434,21 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     
   },
   
-  {
-    label: '货币',
-    field: 'currency',
-    table: {
-      width: 150
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    },
-    tableForm:{
-      disabled: true
-    }
-  },
+  // {
+  //   label: '货币',
+  //   field: 'currency',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     componentProps: {
+  //       disabled: true
+  //     }
+  //   },
+  //   tableForm:{
+  //     disabled: true
+  //   }
+  // },
   {
     label: '备注',
     field: 'remark',

From 918ee9b279f1411613f09eeac38ede74afbd264d Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 28 Jun 2024 13:41:22 +0800
Subject: [PATCH 047/408] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=99=84=E4=BB=B6?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoice/supplierinvoiceRequestMain/index.vue      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 20bf60358..77de5e34e 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -629,7 +629,7 @@ const handleImport = () => {
     clicKRowId.value = row.id
 
     // 合同附件
-    if(row.status=='1'||row.status=='2'||row.status=='6'){
+    if((roleList.value.indexOf('purchase')>-1&&row.status=='2')||(roleList.value.indexOf('supplier_operator')>-1&&(row.status=='1'||row.status=='6'))){
       detailAnnexTable.value[0].hiddenDelete = false
       detailAnnexTable.value[0].hiddenUpload = false
     }else{
@@ -637,7 +637,7 @@ const handleImport = () => {
       detailAnnexTable.value[0].hiddenUpload = true
     }
     // 发票附件
-    if(row.status=='3'||row.status=='7'){
+    if(roleList.value.indexOf('supplier_operator')>-1&&(row.status=='3'||row.status=='7')){
       detailAnnexTable.value[1].hiddenDelete = false
       detailAnnexTable.value[1].hiddenUpload = false
     }else{

From 286ce5bf6ff55efe02a2f529c53541972025025e Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 28 Jun 2024 14:09:15 +0800
Subject: [PATCH 048/408] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=EF=BC=8C=E7=89=A9=E6=96=99=E4=BB=A3=E7=A0=81=EF=BC=8C?=
 =?UTF-8?q?=E5=8C=85=E8=A3=85=EF=BC=8C=E8=A7=84=E6=A0=BC=EF=BC=8C=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E6=A1=86=E5=8F=AF=E4=BB=A5=E8=BE=93=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/balance/index.ts                  |   6 +-
 src/api/wms/business/business.ts              | 530 ++++++++++++++++++
 src/api/wms/customeritem/index.ts             |   7 +-
 src/api/wms/itembasic/index.ts                |   7 +-
 src/api/wms/itempackage/index.ts              |   4 +
 src/api/wms/packageunit/index.ts              |   5 +
 src/api/wms/productionlineitem/index.ts       |   5 +
 src/api/wms/supplier/index.ts                 |   6 +
 src/api/wms/supplieritem/index.ts             |   8 +-
 src/components/BasicForm/src/BasicForm.vue    |  50 +-
 src/components/Form/src/Form.vue              |  10 +-
 src/components/TableForm/src/TableForm.vue    |  54 +-
 .../itemwarehouse/itemwarehouse.data.ts       |   1 +
 .../callmaterials/callmaterials.data.ts       |   1 +
 .../supplierUser/supplierUser.data.ts         |   1 +
 .../customerreturnRequestMain.data.ts         |  12 +-
 .../customerreturnRequestMain/index.vue       |   2 +-
 .../inventoryinitRequestMain.data.ts          |   1 +
 .../packageoverRequestMain.data.ts            |   2 +
 .../scrapRequestMain/scrapRequestMain.data.ts |   1 +
 .../transferissueRequestMain.data.ts          |   1 +
 .../unplannedreceiptRequestMain.data.ts       |   1 +
 .../issueRequestMain/issueRequestMain.data.ts |   1 +
 .../productionreturnRequestMain.data.ts       |   1 +
 .../productionreturnRequestMainNo.data.ts     |   1 +
 .../repleinshRequestMain.data.ts              |   1 +
 .../inventorychangeRequestMain.data.ts        |   2 +
 .../inventorymoveRequestMain.data.ts          |   1 +
 .../processproductionRequestMain.data.ts      |   1 +
 .../productdismantleRequestMain.data.ts       |   1 +
 .../productionplan/productionMain/index.vue   |   2 +-
 .../productionMainAssemble/index.vue          |  15 +-
 .../productionMainAssemble.data.ts            |   1 +
 .../productionMainAssembleSparePart/index.vue |  17 +-
 .../productionMainAssembleSparePart.data.ts   |   1 +
 .../productionMainPredictSparePart/index.vue  |  15 +-
 .../productionMainPredictSparePart.data.ts    |   1 +
 .../productreceiptRequestMain.data.ts         |   3 +
 .../productreceiptAssembleRequestMain.data.ts |   1 +
 .../productreceiptscrapRequestMain.data.ts    |   2 +
 .../productscrapRequestMain.data.ts           |   2 +
 .../demandforecastingMain.data.ts             |   1 +
 .../purchaseMain/purchaseMain.data.ts         |   1 +
 .../supplierinvoiceRequestMain.data.ts        |   3 +-
 44 files changed, 736 insertions(+), 53 deletions(-)
 create mode 100644 src/api/wms/business/business.ts

diff --git a/src/api/wms/balance/index.ts b/src/api/wms/balance/index.ts
index 839ac877a..9dab845d5 100644
--- a/src/api/wms/balance/index.ts
+++ b/src/api/wms/balance/index.ts
@@ -189,4 +189,8 @@ export const getBalanceByBusinessTypeByItemType = async (params) => {
   } else {
     return await request.get({ url: `/wms/balance/pageBusinessTypeToBalance`, params })
   }
-}
\ No newline at end of file
+}
+// 根据code获取数据列表
+export const getBalanceItemListByCodes = async (data) => {
+    return await request.get({ url: `/wms/balance/listByCodes?itemCode=` +( data.itemCode?data.itemCode:'') +  '&batch='+(data.batch?data.batch:'')  +  '&locationCode='+(data.locationCode?data.locationCode:'' )  +  '&packingNumber='+(data.packingNumber?data.packingNumber:'') +  '&warehouseCode='+(data.warehouseCode?data.warehouseCode:'')   })
+  }
\ No newline at end of file
diff --git a/src/api/wms/business/business.ts b/src/api/wms/business/business.ts
new file mode 100644
index 000000000..2724d3120
--- /dev/null
+++ b/src/api/wms/business/business.ts
@@ -0,0 +1,530 @@
+// 获取供应商列表
+import { getSupplierListByCodes, importTemplate } from '@/api/wms/supplier'
+// 获取物料列表
+import { getItemListByCodes } from '@/api/wms/itembasic'
+// 获取供应商物料列表
+import { getSupplierItemListByCodes } from '@/api/wms/supplieritem'
+// 获取生产线物料
+import { getProductionLineCodelistByCodes } from '@/api/wms/productionlineitem'
+// 获取包装规格
+import { getPackageunitListByCodes } from '@/api/wms/packageunit'
+// 获取物料包装规格
+import { getItemPackageunitListByCodes } from '@/api/wms/itempackage'
+// 获取客户物料
+import { getCustomerItemListByCodes } from '@/api/wms/customeritem'
+// 获取库存余额
+import { getBalanceItemListByCodes } from '@/api/wms/balance'
+import { isString } from 'min-dash'
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+/**
+ * 业务组件
+ * tableFormBlur  表格表单失去焦点时候获取焦点
+ * FormBlur  表格失去焦点时候获取焦点
+ */
+export const tableFormBlurVer = async (headerItem, val, row, index,routeName,formRef,detailData,tableData,callback) => {
+  if (
+    headerItem.field == 'fromPackingNumber' ||
+    headerItem.field == 'packingNumber' ||
+    headerItem.field == 'itemCode' ||
+    headerItem.field == 'packUnit' ||
+    headerItem.field == 'secondPackUnit' ||
+    headerItem.field == 'fromPackUnit' ||
+    headerItem.field == 'toPackUnit'||
+    headerItem.field == 'toPackUnit'||
+    headerItem.field == 'supplierItemCode'
+    
+  ) {
+    let searchField = headerItem.field
+    let pageApi = ref()
+    let params = ref()
+
+    if (val && isString(val)) {
+      // const obj = props.tableAllSchemas.tableFormColumns.find((item) => item.field == headerItem.field)
+      if (val.indexOf(',') > -1) {
+        message.alert('该输入框只能输入一条数据')
+        row[headerItem.field] = ''
+        return
+      }
+      // 校验
+      let params = ref({})
+      let searchCondition1 = headerItem.tableForm.searchCondition //获取data.ts参数信息
+      // 循环参数设置参数为key：value格式
+      if (searchCondition1 && searchCondition1.length > 0) {
+        for (let i = 0; i < searchCondition1.length; i++) {
+          if (searchCondition1[i].isMainValue) {
+            params.value[searchCondition1[i].key] = formRef.formModel[
+              searchCondition1[i].value
+            ]
+              ? formRef.formModel[searchCondition1[i].value]
+              : detailData
+              ? detailData[searchCondition1[i].value]
+              : row
+              ? row[searchCondition1[i].value]
+              : ''
+            // 是否含有空参数情况
+            let isNull = false
+            if (
+              params.value[searchCondition1[i].key] == '' ||
+              params.value[searchCondition1[i].key] == undefined
+            ) {
+              isNull = true
+            }
+            if (isNull) {
+              message.warning(
+                searchCondition1[i].message ? searchCondition1[i].message : '前置条件未选择！'
+              )
+              row[headerItem.field] = ''
+              return
+            }
+          } else {
+            // 扩展 转换为筛选条件进行查询
+            if (searchCondition1[i].isSearch) {
+              if (searchCondition1[i].isFormModel) {
+                //用formModel中的值
+                if (searchCondition1[i].required) {
+                  if (
+                    formRef.formModel[searchCondition1[i].value] == '' ||
+                    formRef.formModel[searchCondition1[i].value] == undefined
+                  ) {
+                    message.warning(
+                      searchCondition1[i].message ? searchCondition1[i].message : '前置条件未选择！'
+                    )
+                    row[headerItem.field] = ''
+                    return
+                  }
+                }
+              }
+            } else {
+              params.value[searchCondition1[i].key] = searchCondition1[i].value
+            }
+          }
+        }
+      }
+      params.value[headerItem.field] = val?.trim()
+      // 判断改包装号是否已经添加
+      const seen = new Set()
+      const repeatCode = new Set()
+      let arr = tableData.map((item) => item[headerItem.field]?.trim())
+      arr.forEach((item) => {
+        if (seen.has(item)) {
+          repeatCode.add(item)
+        } else {
+          seen.add(item)
+        }
+      })
+      const arr1 = Array.from(repeatCode)
+      if (arr1.length > 0) {
+        message.warning(`${arr1.join(',')}${t('ts.已经存在')}`)
+        row[headerItem.field] = ''
+        return
+      }
+      if (
+        headerItem.field == 'fromPackingNumber' ||
+        headerItem.field == 'packingNumber' ||
+        headerItem.field == 'itemCode'
+      ) {
+        // 业务
+        // 采购退货申请，制品拆解,调拨出库,报废出库申请，合格转隔离,隔离转合格，隔离转报废，合格转报废，报废转隔离，库存移动申请，库存修改申请
+        if (
+          routeName == 'PurchasereturnRequestMain' ||
+          routeName == 'ProductdismantleRequestMain' ||
+          routeName == 'TransferissueRequestMain' ||
+          routeName == 'ScrapRequestMain' ||
+          routeName == 'OktoholdRequestMain' ||
+          routeName == 'HoldtookRequestMain' ||
+          routeName == 'HoldtoscrapRequestMain' ||
+          routeName == 'OktoscrapRequestMain' ||
+          routeName == 'ScraptoholdRequestMain' ||
+          routeName == 'InventorymoveRequestMain' ||
+          routeName == 'InventorychangeRequestMain'
+        ) {
+          //合格转隔离,隔离转合格，隔离转报废，合格转报废，报废转隔离，库存移动申请参数稍有不同
+          if (
+            routeName == 'OktoholdRequestMain' ||
+            routeName == 'HoldtookRequestMain' ||
+            routeName == 'HoldtoscrapRequestMain' ||
+            routeName == 'OktoscrapRequestMain' ||
+            routeName == 'ScraptoholdRequestMain' ||
+            routeName == 'InventorymoveRequestMain' ||
+            routeName == 'InventorychangeRequestMain'
+          ) {
+            searchField = 'packingNumber'
+            params.value.packingNumber = val?.trim()
+          }
+          pageApi.value = getBalanceItemListByCodes
+        } else if (
+          routeName == 'RepleinshRequestMain' ||
+          routeName == 'IssueRequestMain' ||
+          routeName == 'InventoryinitRequestMain'
+        ) {
+          // 补料申请业务
+          pageApi.value = getItemListByCodes
+          searchField = 'code'
+          params.value.codes = val?.trim()
+        } else if (
+          routeName == 'ProductionMainAssemble' ||
+          routeName == 'ProductionMainASparePart' ||
+          routeName == 'ProductionMainPredictSparePart' ||
+          routeName == 'ProductreceiptRequestMain' ||
+          routeName == 'ProductreceiptRequestMainA' ||
+          routeName == 'ProductreceiptscrapRequestMain' ||
+          routeName == 'ProductscrapRequestMain'
+        ) {
+          // 装配计划,裝配备件计划,预备产件计划，预生产收货申请,装配收货申请,报修收货申请,制品报废申请
+          pageApi.value = getProductionLineCodelistByCodes
+          params.value.productionLineCode=
+              formRef.formModel.productionLine || formRef.formModel.productionLineCode || row.productionLine || row.productionLineCode,
+              params.value.itemCodes=val?.trim()
+        }
+      } else if (
+        headerItem.field == 'packUnit' ||
+        headerItem.field == 'secondPackUnit' ||
+        headerItem.field == 'fromPackUnit' ||
+        headerItem.field == 'toPackUnit'
+      ) {
+        searchField = 'packUnit'
+        //包装规格
+        // 预生产收货申请,装配收货申请,报修收货申请,客户退货申请，计划外入库，计划外出库,翻包申请
+        if (
+          routeName == 'ProductreceiptRequestMain' ||
+          routeName == 'ProductreceiptRequestMainA' ||
+          routeName == 'ProductreceiptscrapRequestMain' ||
+          routeName == 'CustomerreturnRequestMain' ||
+          routeName == 'UnplannedreceiptRequestMain' ||
+          routeName == 'UnplannedissueJobMain' ||
+          routeName == 'PackageoverRequestMain'
+        ) {
+          params.value.itemCode= row.itemCode
+          params.value.packUnit= val?.trim()
+          pageApi.value = getItemPackageunitListByCodes
+        }
+      } else if (
+        headerItem.field == 'supplierItemCode' 
+      ) {
+        // 生产退料申请,隔离退料申请
+        if (
+          routeName == 'ProductionreturnRequestMain' ||
+          routeName == 'ProductionreturnRequestMainNo' 
+        ) {
+        searchField = 'supplierCode'
+          params.value.itemCodes= row.itemCode
+          params.value.supplierCode= val?.trim()
+          pageApi.value = getSupplierItemListByCodes
+        }
+      }
+      const list = ref()
+      // 调取包装接口
+     await pageApi.value(params.value).then(async (res) => {
+        list.value = res ? res : []
+        // 只查一条数据，多条数据查询默认显示不存在
+        if (res.length == 1) {
+          callback(searchField,list.value)
+        } else {
+          message.alert('代码' + row[headerItem.field] + '没有找到对应数据')
+          row[headerItem.field] = ''
+          return
+        }
+      })
+    }
+  }
+}
+export const FormBlur = async (formField, val,routeName,formRef,detailData,formSchema,callback) => {
+  let pageApi = ref()
+  let params = ref()
+  console.log(1111,val)
+  let setV = {}
+  setV[formField] = ''
+  if (val && isString(val)) {
+    if (
+      formField == 'supplierCode' ||
+      formField == 'itemCode' ||
+      formField == 'productItemCode' ||
+      formField == 'componentItemCode' ||
+      formField == 'packUnit' ||
+      formField == 'inPackUnit' ||
+      formField == 'fromPackingNumber'
+    ) {
+      let searchField = 'code'
+      if (formField == 'supplierCode') {
+        params.value = val?.trim()
+        pageApi.value = getSupplierListByCodes
+      } else if (
+        formField == 'itemCode' ||
+        formField == 'productItemCode' ||
+        formField == 'componentItemCode'
+      ) {
+        // 销售价格单
+        if (routeName == 'Saleprice') {
+          console.log(22222,formRef.formModel.customerCode)
+          params.value = {
+            customerCode: formRef.formModel.customerCode,
+            itemCodes: val?.trim()
+          }
+          pageApi.value = getCustomerItemListByCodes
+          searchField = 'itemCode'
+        }else  if (routeName == 'ProductscrapRequestMain') {
+          // 制品报废申请
+          params.value = {
+            productionLineCode:
+              detailData.productionLine || detailData.productionLineCode,
+            itemCodes: val?.trim()
+          }
+          pageApi.value = getProductionLineCodelistByCodes
+          searchField = 'itemCode'
+        }else {
+          // params.value = val.trim()
+          searchField = 'code'
+          
+          params.value={
+            codes:val?.trim()
+          }
+          pageApi.value = getItemListByCodes
+        }
+      } else if (formField == 'packUnit') {
+        if(routeName == 'Itemwarehouse'||routeName == 'Callmaterials'){//物料仓库默认配置,叫料标签
+          searchField = 'packUnit'
+          params.value = {
+            itemCode: formRef.formModel.itemCode,
+            packUnit: val?.trim()
+          }
+          pageApi.value = getItemPackageunitListByCodes
+        }else{
+         params.value = val?.trim()
+         pageApi.value = getPackageunitListByCodes
+        }
+      } else if (formField == 'inPackUnit') {
+        params.value = {
+          itemCode: formRef.formModel.itemCode,
+          packUnit: val.trim()
+        }
+        pageApi.value = getItemPackageunitListByCodes
+      } else if (formField == 'fromPackingNumber') {
+        params.value = {
+          packingNumber: val?.trim()
+        }
+        pageApi.value = getBalanceItemListByCodes
+      }
+      let obj = {}
+      let searchCondition1 = formSchema.find((item) => item.field == formField).componentProps
+        .searchCondition //获取data.ts参数信息
+      // 循环参数设置参数为key：value格式
+      if (searchCondition1 && searchCondition1.length > 0) {
+        for (let i = 0; i < searchCondition1.length; i++) {
+          if (searchCondition1[i].isMainValue) {
+            obj[searchCondition1[i].key] = formRef.formModel[searchCondition1[i].value]
+              ? formRef.formModel[searchCondition1[i].value]
+              : detailData
+              ? detailData[searchCondition1[i].value]
+              : ''
+            // 是否含有空参数情况
+            let isNull = false
+            if (obj[searchCondition1[i].key] == '' || obj[searchCondition1[i].key] == undefined) {
+              isNull = true
+            }
+            if (isNull) {
+              message.warning(
+                searchCondition1[i].message ? searchCondition1[i].message : '前置条件未选择！'
+              )
+              return
+            }
+          } else {
+            // 扩展 转换为筛选条件进行查询
+            if (searchCondition1[i].isSearch) {
+              if (searchCondition1[i].isFormModel) {
+                //用formModel中的值
+                if (searchCondition1[i].required) {
+                  if (
+                    formRef.formModel[searchCondition1[i].value] == '' ||
+                    formRef.formModel[searchCondition1[i].value] == undefined
+                  ) {
+                    message.warning(
+                      searchCondition1[i].message ? searchCondition1[i].message : '前置条件未选择！'
+                    )
+                    return
+                  }
+                }
+              }
+            } else {
+              obj[searchCondition1[i].key] = searchCondition1[i].value
+            }
+          }
+        }
+      }
+
+      let obj1 = formSchema.find((item) => item.field == formField)
+      if (!obj1.componentProps.multiple && val.indexOf(',') > -1) {
+        message.alert('该输入框只能输入一条数据')
+        formRef.setValues(setV)
+        return
+      }
+     await pageApi.value(params.value).then((res) => {
+        let arr1 = val.split(',')
+        let list = ref([])
+        list.value = res
+        if (list.value?.length == 0) {
+          message.alert('暂无数据')
+          formRef.setValues(setV)
+          return
+        }
+        if (arr1.length != list.value.length) {
+          let arr2 = list.value.map((item) => item.code)
+          let str = [
+            ...arr1.filter((item) => !arr2.includes(item)),
+            ...arr2.filter((item) => !arr1.includes(item))
+          ].join(',')
+          message.alert('代码' + str + '没有找到对应数据')
+          formRef.setValues(setV)
+          return
+        }
+        console.log(23232323)
+        // emit('searchTableSuccess', formField, searchField, list.value, formRef.value, 'form')
+        callback(searchField,list.value)
+      })
+    }
+  }
+}
+
+// 根据下方输入框失去焦点校验信息
+export const getListByBottonInput = async (headerItem, val,row,routeName,formRef,detailData,tableData,callback) => {
+  let pageApi = ref()
+  let params = ref({})
+  let list = ref([])
+  let field = 'itemCode'
+  // scp采购订单
+  if(!val)return;
+  if (routeName == 'PurchaseMain') {
+    pageApi.value = getSupplierItemListByCodes
+    params.value = {
+      supplierCode: formRef.formModel.supplierCode,
+      itemCodes: val?.trim(),
+      available: true
+    }
+  } else if (routeName == 'ProductionMain') {
+    pageApi.value = getProductionLineCodelistByCodes
+    params.value = {
+      productionLineCode: formRef.formModel.productionLine,
+      itemCodes: val?.trim()
+    }
+  } else if (
+    routeName == 'ZZBJDeliverPlanMain' ||
+    routeName == 'DeliverPlanMain' ||
+    routeName == 'DeliverRequestMain' ||
+    routeName == 'ZZBJDeliverRequestMain'
+  ) {
+    // 自制备件发货计划，发货计划，成品发货申请，自制备件发货申请
+    pageApi.value = getCustomerItemListByCodes
+    params.value = {
+      customerCode: formRef.formModel.customerCode,
+      itemCodes: val?.trim()
+    }
+  } else if (routeName == 'UnplannedissueRequestMain') {
+    // 计划外出库
+    pageApi.value = getBalanceItemListByCodes
+    params.value = {
+      packingNumber: val?.trim()
+    }
+    field = 'packingNumber'
+  } else {
+    params.value.codes = val?.trim()
+    pageApi.value = getItemListByCodes
+  }
+  let searchCondition1 = headerItem.tableForm.searchCondition //获取data.ts参数信息
+  console.log(98888,searchCondition1)
+  // 循环参数设置参数为key：value格式
+  if (searchCondition1 && searchCondition1.length > 0) {
+    for (let i = 0; i < searchCondition1.length; i++) {
+      if (searchCondition1[i].isMainValue) {
+        params.value[searchCondition1[i].key] = formRef.formModel[
+          searchCondition1[i].value
+        ]
+          ? formRef.formModel[searchCondition1[i].value]
+          : detailData
+          ? detailData[searchCondition1[i].value]
+          : ''
+        // 是否含有空参数情况
+        let isNull = false
+        if (
+          params.value[searchCondition1[i].key] == '' ||
+          params.value[searchCondition1[i].key] == undefined
+        ) {
+          isNull = true
+        }
+        if (isNull) {
+          message.warning(
+            searchCondition1[i].message ? searchCondition1[i].message : '前置条件未选择！'
+          )
+          return
+        }
+      } else if (searchCondition1[i].isTableRowValue) {
+        if (searchCondition1[i].required) {
+          if (row[searchCondition1[i].value] == '' || row[searchCondition1[i].value] == undefined) {
+            message.warning(
+              searchCondition1[i].message ? searchCondition1[i].message : '前置条件未选择！'
+            )
+            return
+          }
+        }
+        row[searchCondition1[i].value]
+        //查询当前table表数据的值
+        params.value[searchCondition1[i].key] = row[searchCondition1[i].value]
+      } else {
+        // 扩展 转换为筛选条件进行查询
+        if (searchCondition1[i].isSearch) {
+          if (searchCondition1[i].isFormModel) {
+            //用formModel中的值
+            if (searchCondition1[i].required) {
+              if (
+                formRef.formModel[searchCondition1[i].value] == '' ||
+                formRef.formModel[searchCondition1[i].value] == undefined
+              ) {
+                message.warning(
+                  searchCondition1[i].message ? searchCondition1[i].message : '前置条件未选择！'
+                )
+                return
+              }
+            }
+          }else {
+            params.value[searchCondition1[i].key] = searchCondition1[i].value
+          }
+        } else {
+          params.value[searchCondition1[i].key] = searchCondition1[i].value
+        }
+      }
+    }
+  }
+  console.log(788,params.value)
+  await pageApi.value(params.value).then(async (res) => {
+    list.value = res ? res : []
+    let arr1 = val.split(',').map(item=>item.trim())
+    console.log(res)
+    console.log(arr1)
+    if (arr1.length != res.length) {
+      let arr2 = res.map((item) => item[field])
+      console.log(arr2)
+      let str = [
+        ...arr1.filter((item) => !arr2.includes(item)),
+        ...arr2.filter((item) => !arr1.includes(item))
+      ].join(',')
+      console.log(str)
+      message.alert('代码' + str + '没有找到对应数据')
+      return
+    } else {
+      let repeatCode = []
+      if(tableData.length > 0){
+        tableData.forEach((item) => {
+          const findIndex = arr1.findIndex(valItem=>valItem==item[field]) 
+          if(findIndex > -1){
+            arr1.splice(findIndex,1)
+            repeatCode.push(item.itemCode)
+          }
+        })
+      }
+      if(repeatCode.length>0){
+        message.warning(`${t('ts.代码')}${repeatCode.join(',')}${t('ts.已经存在')}`);
+        return;
+      }
+      callback(list.value)
+    }
+  })
+}
diff --git a/src/api/wms/customeritem/index.ts b/src/api/wms/customeritem/index.ts
index c4c27e8a7..b9af7035d 100644
--- a/src/api/wms/customeritem/index.ts
+++ b/src/api/wms/customeritem/index.ts
@@ -72,4 +72,9 @@ export const getPageBusinessTypeToItemCode = async (params) => {
   } else {
     return await request.get({ url: `/wms/customeritem/pageBusinessTypeToItemCode`, params })
   }
-}
\ No newline at end of file
+}
+
+// 根据code获取数据列表
+export const getCustomerItemListByCodes = async (data) => {
+  return await request.get({ url: `/wms/customeritem/listByCodes?itemCodes=` + data.itemCodes +  '&customerCode='+data.customerCode +  '&businessType='+(data.businessType?data.businessType:'') })
+}
diff --git a/src/api/wms/itembasic/index.ts b/src/api/wms/itembasic/index.ts
index 25f3566ec..efd0319f0 100644
--- a/src/api/wms/itembasic/index.ts
+++ b/src/api/wms/itembasic/index.ts
@@ -113,4 +113,9 @@ export const selectConfigToItembasic = async (params) => {
 // 根据物料代码查计量单位
 export const getQueryItemCodeInfo = async (data) => {
   return await request.post({ url: 'wms/itembasic/queryItemCodeInfo', data })
-}
\ No newline at end of file
+}
+// 根据code获取数据列表
+export const getItemListByCodes = async (params) => {
+  return await request.get({ url: `/wms/itembasic/listByCodes`,params})
+}
+
diff --git a/src/api/wms/itempackage/index.ts b/src/api/wms/itempackage/index.ts
index 97eb8348e..555a174b0 100644
--- a/src/api/wms/itempackage/index.ts
+++ b/src/api/wms/itempackage/index.ts
@@ -86,3 +86,7 @@ export const exportItempackaging = async (params) => {
 export const importTemplate = () => {
   return request.download({ url: '/wms/itempackage/get-import-template' })
 }
+// 根据code获取数据列表
+export const getItemPackageunitListByCodes = async (data) => {
+  return await request.get({ url: `/wms/itempackage/listByCodes?itemCode=` + data.itemCode +  '&packUnit='+data.packUnit})
+}
diff --git a/src/api/wms/packageunit/index.ts b/src/api/wms/packageunit/index.ts
index 940fabef9..fa1718d35 100644
--- a/src/api/wms/packageunit/index.ts
+++ b/src/api/wms/packageunit/index.ts
@@ -69,3 +69,8 @@ export const exportPackageunit = async (params) => {
 export const importTemplate = () => {
   return request.download({ url: '/wms/packageunit/get-import-template' })
 }
+
+// 根据code获取数据列表
+export const getPackageunitListByCodes = async (codes: string) => {
+  return await request.get({ url: `/wms/packageunit/listByCodes?codes=` + codes })
+}
diff --git a/src/api/wms/productionlineitem/index.ts b/src/api/wms/productionlineitem/index.ts
index cc9716fe3..0b3b03e20 100644
--- a/src/api/wms/productionlineitem/index.ts
+++ b/src/api/wms/productionlineitem/index.ts
@@ -67,3 +67,8 @@ export const exportProductionlineitem = async (params) => {
 export const importTemplate = () => {
   return request.download({ url: '/wms/productionlineitem/get-import-template' })
 }
+
+
+export const getProductionLineCodelistByCodes = (data) => {
+  return request.get({ url: `/wms/productionlineitem/listByCodes?productionLineCode=`+data.productionLineCode +'&itemCodes='+data.itemCodes})
+}
diff --git a/src/api/wms/supplier/index.ts b/src/api/wms/supplier/index.ts
index 961d949a0..1287bea73 100644
--- a/src/api/wms/supplier/index.ts
+++ b/src/api/wms/supplier/index.ts
@@ -93,3 +93,9 @@ export const exportSupplierSCP = async (params) => {
 export const importTemplate = () => {
   return request.download({ url: '/wms/supplier/get-import-template' })
 }
+
+// 根据code获取数据列表
+export const getSupplierListByCodes = async (codes: string) => {
+  return await request.get({ url: `/wms/supplier/listByCodes?codes=` + codes })
+}
+
diff --git a/src/api/wms/supplieritem/index.ts b/src/api/wms/supplieritem/index.ts
index e6002d3c7..81cbf3d12 100644
--- a/src/api/wms/supplieritem/index.ts
+++ b/src/api/wms/supplieritem/index.ts
@@ -99,4 +99,10 @@ export const selectItembasicTypeToSupplieritem = async (params) => {
 
 export const getDefaultLocationCode = async(data: SupplieritemVO)=> {
   return await request.post({ url: `/wms/supplieritem/getDefaultLocationCode`, data })
-}
\ No newline at end of file
+}
+
+
+// 根据code获取数据列表
+export const getSupplierItemListByCodes = async (data) => {
+  return await request.get({ url: `/wms/supplieritem/listByCodes?supplierCode=`+data.supplierCode +'&itemCodes='+data.itemCodes })
+}
diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 6ec7b387c..2e94706f5 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -99,6 +99,8 @@
         @tableFormSelectOnBlur="tableFormSelectOnBlur"
         @formFormDateChange="formFormDateChange"
       @clearInput='clearInput'
+          @batchAdd="batchAdd"
+          :routeName="routeName"
       >
       <template v-slot="{row}">
         <slot :row="row"></slot>
@@ -132,9 +134,8 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import ButtonBase from '@/components/XButton/src/ButtonBase.vue'
 import TableForm from '@/components/TableForm/src/TableForm.vue'
 import TableFormCountPlan from '@/components/TableFormCountPlan/src/TableFormCountPlan.vue'
-import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
-import { debounce } from 'lodash-es'
 
+import { tableFormBlurVer,FormBlur,getListByBottonInput } from '@/api/wms/business/business'
 const props = defineProps({
   // 显示窗口宽度设置
   basicFormWidth: {
@@ -338,7 +339,11 @@ const formRef = ref() // 表单 Ref
 const formSchema = ref(props.formAllSchemas?.formSchema)
 const tableAllSchemas = ref(props.tableAllSchemas)
 const tableFormRules = ref(props.tableFormRules)
-console.log(111,formSchema)
+const route = useRoute() // 路由信息
+const routeName = ref('')
+routeName.value = route.name
+const isExecute = ref(true)//如果走失去焦点的方法只有为true的时候才能进行保存
+console.log(44332322, routeName.value)
 
 // 列表-按钮
 // const buttondata = [
@@ -758,11 +763,42 @@ const onChange = (field, cur) => {
 /**
  * 监听失焦事件
  * @param field 当前操作字段
- * @param e 
+ * @param e
  */
-const onBlur = (field, e) => {
+ const onBlur = async (field, e) => {
+  isExecute.value = false
+  await FormBlur(field, e,routeName.value,formRef.value,props.detailData,formSchema.value,(searchField, list)=>{
+    emit('searchTableSuccess', field, searchField, list, formRef.value, 'form')
+  })
+  isExecute.value = true
   emit('onBlur', field, e)
 }
+
+// 批量增加
+const batchAdd = async (val) => {
+  const row = {}
+    tableAllSchemas.value.tableFormColumns.forEach((item) => {
+      row[item.field] = item.default ? item.default : ''
+    })
+  const headerItem = tableAllSchemas.value.tableColumns.find((item) => item.field ==  props.fieldTableColumn)
+
+
+
+  await getListByBottonInput(headerItem, val,row,routeName.value,formRef.value,props.detailData,props.tableData,(list)=>{
+    emit('searchTableSuccess',headerItem.field,'itemCode',list, formRef.value,'tableForm',row)
+  })
+}
+
+const inputStringBlur = async (headerItem, val, row, index) => {
+  // isExecute.value = false
+ await  tableFormBlurVer(headerItem,val,row,index,routeName.value,formRef.value,props.detailData,props.tableData,(searchField, list)=>{
+      emit('searchTableSuccess',headerItem.field,searchField,list, formRef.value,'tableForm',row,'blur',index)
+    })
+    
+  // isExecute.value = true
+}
+
+
 /**
  * 回车事件
  * @param field 当前操作字段
@@ -791,9 +827,7 @@ const buttonOperationClick = (row, label, index)=> {
   emit("buttonOperationClick", row, label, index);
 }
 
-const inputStringBlur = (headerItem, row, index)=> {
-  emit("inputStringBlur", headerItem, row, index);
-}
+
 defineExpose({ open, formRef, opensearchTable, dialogVisible, formLoading ,handleAddTable,changeDialogWidth}) // 提供 open 方法，用于打开弹窗
 
 </script>
diff --git a/src/components/Form/src/Form.vue b/src/components/Form/src/Form.vue
index 479d9df73..6babae951 100644
--- a/src/components/Form/src/Form.vue
+++ b/src/components/Form/src/Form.vue
@@ -269,7 +269,10 @@ export default defineComponent({
                     //回车
                     emit('onEnter',item.field,formModel.value[item.field],event)
                   }
-              }} v-slots={{
+              }} 
+              
+              onBlur={(e)=>{onBlur(item.field, e)}}
+              v-slots={{
                   suffix: () => (
                     <ElButton type="text" icon={CircleClose} style="color:var(--el-button-text-color)" onClick={()=>{
                       if(Array.isArray(formModel.value[item.field])){
@@ -318,7 +321,10 @@ export default defineComponent({
                     //回车
                     emit('onEnter',item.field,formModel.value[item.field],event)
                   }
-              }} disabled={item?.componentProps?.enterSearch?false:true} v-slots={{
+              }}
+              
+              onBlur={(e)=>{onBlur(item.field,formModel.value[item.field])}}
+               disabled={item?.componentProps?.enterSearch?false:true} v-slots={{
                   suffix: () => (
                     <ElButton type="text" icon={CircleClose} style="color:var(--el-button-text-color)" onClick={()=>{
                       if(Array.isArray(formModel.value[item.field])){
diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue
index 703f5f630..5de9de0c5 100644
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@@ -66,9 +66,9 @@
               clearable
               :type="headerItem?.tableForm?.inputType"
               :placeholder="t(`ts.${headerItem?.tableForm?.placeholder || '请输入' + headerItem.label}`).replace('ts.','')"
-              :disabled="headerItem?.tableForm?.disabled ? true: headerItem?.tableForm?.isInpuFocusShow ? true : false" 
+              :disabled="disabledInput(headerItem)"
               style="flex:1" 
-              @blur="inputStringBlur(headerItem.field, row[headerItem.field], row)"
+              @blur="inputStringBlur(headerItem, row[headerItem.field], row,index)"
             />
             <Icon icon="ep:circle-close"  v-if="headerItem?.tableForm?.isInpuFocusShow && headerItem?.tableForm?.disabled&& headerItem?.tableForm?.clearable" style='position:absolute;right:50px;cursor: pointer;' @click="clearInput(headerItem.field,row,index)"/>
             <el-button  :key="headerItem.field+$index+'button'" v-if="headerItem?.tableForm?.isInpuFocusShow" @click="inpuFocus(headerItem,row,index)"><Icon icon="ep:search" size="14"/></el-button>
@@ -333,6 +333,10 @@
         <Icon icon="ep:delete" color="#409eff" size="26" style="cursor: pointer;" />
         <div>{{t('ts.批量删除')}}</div>
       </div>
+      <div class="p-12px" v-if="routeName == 'PurchaseMain'||routeName == 'ProductionMain'||routeName == 'ZZBJDeliverPlanMain'||routeName == 'DeliverPlanMain'||routeName == 'DeliverRequestMain'||routeName == 'ZZBJDeliverRequestMain'||routeName == 'UnplannedissueRequestMain'||routeName == 'UnplannedreceiptRequestMain'">
+        <el-input v-model="keyWord" style="width: 240px" placeholder="回车自动添加"/>
+        <el-button type="primary" style="margin-left: 10px" @click="batchAdd">{{t('批量添加')}}</el-button>
+      </div>
     </div>
   </div>
 </template>
@@ -408,7 +412,13 @@ const props = defineProps({
   tableFormRules: {
     type: Object,
     default: null
-  }
+  },
+  // 业务名称
+  routeName: {
+    type: String,
+    required: false,
+    default: ''
+  },
 })
 // 传递给父类
 const emit = defineEmits([
@@ -426,7 +436,8 @@ const emit = defineEmits([
   'inputStringBlur',
   'tableFormSelectOnBlur',
   'formFormDateChange',
-  'clearInput'
+  'clearInput',
+  'batchAdd'
 ])
 // 获取下拉列表 | type = radio | type = select
 const initSelectOptions = (item) => {
@@ -528,8 +539,8 @@ const inpuFocus = (headerItem, row, index)=>{
 }
 
 // input输入失去焦点事件
-const inputStringBlur = (field, val,row) => {
-  emit('inputStringBlur', field, val,row)
+const inputStringBlur = (headerItem, val,row,index) => {
+  emit('inputStringBlur', headerItem, val,row,index)
 }
 const clearInput= (field, row, index) => {
   emit('clearInput',field, row, index)
@@ -548,10 +559,39 @@ const showTableData = ()=>{
     return props.tableData
   }
 }
+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')
+  if(itemCodeFields){
+    field = itemCodeFields.field
+  }else {
+    if(itemCodeFields){
+      field = supplierFields.field
+    }
+  }
+console.log(field)
+  emit('batchAdd',keyWord.value)
+}
+const disabledInput=(headerItem)=>{
+   if(headerItem.tableForm?.isInpuFocusShow){
+    if(headerItem.tableForm?.enterSearch){
+      return false
+    }else{
+      return true
+    }
+  }else{
+   return headerItem?.tableForm?.disabled || true
+  }
+}
 // setup 语法糖 抛出方法
 defineExpose({
   TableBaseComponents_Ref,
-  validateForm
+  validateForm,
+  keyWord
 })
 
 </script>
diff --git a/src/views/wms/basicDataManage/itemManage/itemwarehouse/itemwarehouse.data.ts b/src/views/wms/basicDataManage/itemManage/itemwarehouse/itemwarehouse.data.ts
index 2a2c7ab1a..1f1c1c619 100644
--- a/src/views/wms/basicDataManage/itemManage/itemwarehouse/itemwarehouse.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itemwarehouse/itemwarehouse.data.ts
@@ -86,6 +86,7 @@ export const Itemwarehouse = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch:true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择物料包装代码', // 输入框占位文本
         searchField: 'packUnit', // 查询弹窗赋值字段
diff --git a/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts b/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts
index 14fc57a8d..1524849c4 100644
--- a/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts
+++ b/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts
@@ -78,6 +78,7 @@ export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch:true,
         isSearch:true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择包装规格', // 输入框占位文本
diff --git a/src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts b/src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts
index 7358be064..1e5c4a94e 100644
--- a/src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts
+++ b/src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts
@@ -125,6 +125,7 @@ export const SupplierUser = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch:true,
         isSearchList: true,
         searchListPlaceholder: '请选供应商信息',
         searchField: 'code',
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
index f9e3ac998..8f442d8b0 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
@@ -1290,8 +1290,8 @@ export const CustomerReturnRequestDetailLabel = useCrudSchemas(reactive<CrudSche
     }
   },
   {
-    label: '包装数量',
-    field: 'packQty',
+    label: '包装规格',
+    field: 'packUnit',
     sort: 'custom',
     table: {
       width: 150
@@ -1322,6 +1322,7 @@ export const CustomerReturnRequestDetailLabel = useCrudSchemas(reactive<CrudSche
       }
     },
     tableForm: {
+      enterSearch:true,
       disabled: true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择包装',
@@ -1346,16 +1347,13 @@ export const CustomerReturnRequestDetailLabel = useCrudSchemas(reactive<CrudSche
     isForm: true
   },
   {
-    label: '包装规格',
-    field: 'packUnit',
+    label: '包装数量',
+    field: 'packQty',
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
     table: {
       width: 150,
-      componentProps: {
-        disabled: true
-      }
     },
     tableForm:{
       disabled:true
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
index d0802749d..ee05590b4 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
@@ -189,7 +189,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         row['fromLocationCode'] = val[0]['locationCode']
         row['itemCode'] = val[0]['itemCode']
         row['uom'] = val[0]['uom']
-      }else if(formField == 'packQty'){
+      }else if(formField == 'packUnit'){
         row['packUnit'] = val[0]['packUnit']
         row['packQty'] = val[0]['packQty']
       }else if(formField == 'toLocationCode') {
diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
index 214889c66..8f7b40872 100644
--- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
@@ -394,6 +394,7 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
     tableForm:{
+      enterSearch:true,
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择物料代码',
       searchField: 'code',
diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts
index 68249d568..ad67b4e19 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts
@@ -561,6 +561,7 @@ export const PackageoverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 120
     },
     tableForm:{
+      enterSearch:true,
       isInpuFocusShow: true,
       isSearchList: true, // 开启查询弹窗
       searchListPlaceholder: '请选择包装规格', // 输入框占位文本
@@ -609,6 +610,7 @@ export const PackageoverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 120
     },
     tableForm:{
+      enterSearch:true,
       isInpuFocusShow: true,
       isSearchList: true, // 开启查询弹窗
       searchListPlaceholder: '请选择包装规格', // 输入框占位文本
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
index fe6c6a315..b50d7e642 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
@@ -480,6 +480,7 @@ export const ScrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     tableForm:{
+      enterSearch:true,
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择包装号',
       searchField: 'packingNumber',
diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
index dd7828519..35679ae33 100644
--- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
@@ -619,6 +619,7 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
     tableForm:{
+      enterSearch:true,
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择包装号',
       searchField: 'packingNumber',
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
index 437523698..bf1e6a7e4 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
@@ -1495,6 +1495,7 @@ export const UnplannedreceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSc
       }
     },
     tableForm: {
+      enterSearch:true,
       disabled: true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择包装',
diff --git a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
index 422092299..2c3743059 100644
--- a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
+++ b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
@@ -763,6 +763,7 @@ export const IssueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     sortSearchDefault:2,
     sortTableDefault:3,
     tableForm:{
+      enterSearch:true,
       isInpuFocusShow: true,
       isSearchList: true, // 开启查询弹窗
       searchListPlaceholder: '请选择物料代码', // 输入框占位文本
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
index e217520c7..60ce8db43 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
@@ -1130,6 +1130,7 @@ export const ProductionreturnRequestDetailLabel = useCrudSchemas(reactive<CrudSc
       width: 150
     },
     tableForm:{
+      enterSearch:true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
       searchField: 'supplierCode', // 查询弹窗赋值字段
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts
index bd405d0f8..1901bc019 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts
@@ -616,6 +616,7 @@ export const ProductionreturnRequestDetailNoLabel = useCrudSchemas(reactive<Crud
       width: 150
     },
     tableForm:{
+      enterSearch:true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
       searchField: 'supplierCode', // 查询弹窗赋值字段
diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
index 20712a925..f18f34c0d 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
@@ -606,6 +606,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     tableForm:{
+      enterSearch:true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择物料代码', // 输入框占位文本
       searchField: 'code', // 查询弹窗赋值字段
diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
index 74acc42bd..23b28a715 100644
--- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
@@ -383,6 +383,7 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       width: 150
     },
     tableForm:{
+      enterSearch:true,
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择从包装号',
       searchField: 'packingNumber',
@@ -400,6 +401,7 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch:true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择从包装号',
         searchField: 'packingNumber',
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
index 8a52a684d..e09581ffd 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
@@ -545,6 +545,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
     tableForm:{
+      enterSearch:true,
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择从包装号',
       searchField: 'packingNumber',
diff --git a/src/views/wms/productionManage/processproduction/processproductionRequest/processproductionRequestMain.data.ts b/src/views/wms/productionManage/processproduction/processproductionRequest/processproductionRequestMain.data.ts
index 091cc2b65..171aa15d8 100644
--- a/src/views/wms/productionManage/processproduction/processproductionRequest/processproductionRequestMain.data.ts
+++ b/src/views/wms/productionManage/processproduction/processproductionRequest/processproductionRequestMain.data.ts
@@ -53,6 +53,7 @@ export const ProcessproductionRequestMain = useCrudSchemas(reactive<CrudSchema[]
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch:true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择物料代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
index c40d77a5f..4c03cc5d0 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
@@ -605,6 +605,7 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
       width: 150
     },
     tableForm:{
+      enterSearch:true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择包装号',
       searchField: 'packingNumber',
diff --git a/src/views/wms/productionManage/productionplan/productionMain/index.vue b/src/views/wms/productionManage/productionplan/productionMain/index.vue
index ccf175c27..ef854e67a 100644
--- a/src/views/wms/productionManage/productionplan/productionMain/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMain/index.vue
@@ -118,7 +118,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       //   console.log(err);
       // })
       if(formField=='itemCode'){
-        row[formField] = val[0][searchField]
+        // row[formField] = val[0][searchField]
         val.forEach(item=>{
           if(tableData.value.find(item1=>item1['id'] == item['id'])) return
           const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
index 91b97e1da..d74384f20 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
@@ -107,14 +107,15 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
   nextTick(async() => {
     if (type == 'tableForm') {
       // 明细查询页赋值
-      await ItemBasicApi.getItembasicPage({
-        code: row['itemCode']
-      }).then(res => {
-        row['uom'] = res?.list[0].uom
-      }).catch(err =>{
-        console.log(err);
-      })
+      // await ItemBasicApi.getItembasicPage({
+      //   code: row['itemCode']
+      // }).then(res => {
+      //   row['uom'] = res?.list[0].uom
+      // }).catch(err =>{
+      //   console.log(err);
+      // })
       row[formField] = val[0][searchField]
+      row['uom'] = val[0]['uom']
     } else {
       const setV = {}
       if(formField == 'workshop'){
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
index 5c1b7b009..7ef13b457 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
@@ -626,6 +626,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     tableForm:{
+      enterSearch:true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择物料代码', // 输入框占位文本
       searchField: 'itemCode', // 查询弹窗赋值字段
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
index 468b425b1..1c8dc8bb6 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
@@ -106,15 +106,16 @@ const updataTableColumns = (val) => {
 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
   nextTick(async() => {
     if (type == 'tableForm') {
-      // 明细查询页赋值
-      await ItemBasicApi.getItembasicPage({
-        code: row['itemCode']
-      }).then(res => {
-        row['uom'] = res?.list[0].uom
-      }).catch(err =>{
-        console.log(err);
-      })
+      // // 明细查询页赋值
+      // await ItemBasicApi.getItembasicPage({
+      //   code: row['itemCode']
+      // }).then(res => {
+      //   row['uom'] = res?.list[0].uom
+      // }).catch(err =>{
+      //   console.log(err);
+      // })
       row[formField] = val[0][searchField]
+      row['uom'] = val[0]['uom']
     } else {
       const setV = {}
       if(formField == 'workshop'){
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
index b90683818..fb83717e3 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
@@ -626,6 +626,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     tableForm:{
+      enterSearch:true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择物料代码', // 输入框占位文本
       searchField: 'itemCode', // 查询弹窗赋值字段
diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
index 6d039de03..c9a6eb60f 100644
--- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
@@ -107,14 +107,15 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
   nextTick(async() => {
     if (type == 'tableForm') {
       // 明细查询页赋值
-      await ItemBasicApi.getItembasicPage({
-        code: row['itemCode']
-      }).then(res => {
-        row['uom'] = res?.list[0].uom
-      }).catch(err =>{
-        console.log(err);
-      })
+      // await ItemBasicApi.getItembasicPage({
+      //   code: row['itemCode']
+      // }).then(res => {
+      //   row['uom'] = res?.list[0].uom
+      // }).catch(err =>{
+      //   console.log(err);
+      // })
       row[formField] = val[0][searchField]
+      row['uom'] = val[0]['uom']
     } else {
       const setV = {}
       if(formField == 'workshop'){
diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
index 2ab4b578d..652609905 100644
--- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
@@ -627,6 +627,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     tableForm:{
+      enterSearch:true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择物料代码', // 输入框占位文本
       searchField: 'itemCode', // 查询弹窗赋值字段
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
index 512de06d6..eb64606c0 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
@@ -820,6 +820,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
     tableForm:{
+      enterSearch:true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择物料代码',
       searchField: 'itemCode',
@@ -1808,6 +1809,7 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
       }
     },
     tableForm: {
+      enterSearch:true,
       disabled: true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择包装',
@@ -1876,6 +1878,7 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
       }
     },
     tableForm: {
+      enterSearch:true,
       disabled: true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择包装',
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
index 3cef27943..9e01199c7 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
@@ -821,6 +821,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
     sortTableDefault:1003,
     tableForm:{
+      enterSearch:true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择物料代码',
       searchField: 'itemCode',
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
index 247650bce..2e93ad900 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
@@ -778,6 +778,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
     sortTableDefault:1003,
     tableForm:{
+      enterSearch:true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择物料代码',
       searchField: 'itemCode',
@@ -1789,6 +1790,7 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
       }
     },
     tableForm: {
+      enterSearch:true,
       disabled: true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择包装',
diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
index 9f367f2ab..5c7911793 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
@@ -634,6 +634,7 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch:true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择物料代码', // 输入框占位文本
         searchField: 'itemCode', // 查询弹窗赋值字段
@@ -653,6 +654,7 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     tableForm:{
+      enterSearch:true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择物料代码', // 输入框占位文本
       searchField: 'itemCode', // 查询弹窗赋值字段
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
index 674600562..471262417 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
@@ -35,6 +35,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       labelMessage: '影响明细中物料代码，需在供应商物料中维护',
       componentProps: {
+        enterSearch:true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
index 8908f8eda..23de01ea5 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
@@ -417,6 +417,7 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     tableForm:{
+      disabled:true,
       multiple:true,//多选
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择供应商物料',
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index 19d1e1e26..7cb5c65d7 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -161,7 +161,8 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     isSearch: true,
     form: {
       // labelMessage: '信息提示说明！！！',
-      componentProps: {
+      componentProps: {    
+        enterSearch:true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段

From b871e8ecbd729c6d79cd0ccee0427537a1d6fd7a Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 28 Jun 2024 14:15:14 +0800
Subject: [PATCH 049/408] =?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/api/wms/business/business.ts           | 9 ---------
 src/components/BasicForm/src/BasicForm.vue | 1 -
 2 files changed, 10 deletions(-)

diff --git a/src/api/wms/business/business.ts b/src/api/wms/business/business.ts
index 2724d3120..fa9deea44 100644
--- a/src/api/wms/business/business.ts
+++ b/src/api/wms/business/business.ts
@@ -232,7 +232,6 @@ export const tableFormBlurVer = async (headerItem, val, row, index,routeName,for
 export const FormBlur = async (formField, val,routeName,formRef,detailData,formSchema,callback) => {
   let pageApi = ref()
   let params = ref()
-  console.log(1111,val)
   let setV = {}
   setV[formField] = ''
   if (val && isString(val)) {
@@ -256,7 +255,6 @@ export const FormBlur = async (formField, val,routeName,formRef,detailData,formS
       ) {
         // 销售价格单
         if (routeName == 'Saleprice') {
-          console.log(22222,formRef.formModel.customerCode)
           params.value = {
             customerCode: formRef.formModel.customerCode,
             itemCodes: val?.trim()
@@ -377,7 +375,6 @@ export const FormBlur = async (formField, val,routeName,formRef,detailData,formS
           formRef.setValues(setV)
           return
         }
-        console.log(23232323)
         // emit('searchTableSuccess', formField, searchField, list.value, formRef.value, 'form')
         callback(searchField,list.value)
       })
@@ -430,7 +427,6 @@ export const getListByBottonInput = async (headerItem, val,row,routeName,formRef
     pageApi.value = getItemListByCodes
   }
   let searchCondition1 = headerItem.tableForm.searchCondition //获取data.ts参数信息
-  console.log(98888,searchCondition1)
   // 循环参数设置参数为key：value格式
   if (searchCondition1 && searchCondition1.length > 0) {
     for (let i = 0; i < searchCondition1.length; i++) {
@@ -493,20 +489,15 @@ export const getListByBottonInput = async (headerItem, val,row,routeName,formRef
       }
     }
   }
-  console.log(788,params.value)
   await pageApi.value(params.value).then(async (res) => {
     list.value = res ? res : []
     let arr1 = val.split(',').map(item=>item.trim())
-    console.log(res)
-    console.log(arr1)
     if (arr1.length != res.length) {
       let arr2 = res.map((item) => item[field])
-      console.log(arr2)
       let str = [
         ...arr1.filter((item) => !arr2.includes(item)),
         ...arr2.filter((item) => !arr1.includes(item))
       ].join(',')
-      console.log(str)
       message.alert('代码' + str + '没有找到对应数据')
       return
     } else {
diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 2e94706f5..82c91d1c7 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -343,7 +343,6 @@ const route = useRoute() // 路由信息
 const routeName = ref('')
 routeName.value = route.name
 const isExecute = ref(true)//如果走失去焦点的方法只有为true的时候才能进行保存
-console.log(44332322, routeName.value)
 
 // 列表-按钮
 // const buttondata = [

From 5258502597679b2234fa832ba36604ffbfe5fc2f Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Fri, 28 Jun 2024 14:44:58 +0800
Subject: [PATCH 050/408] =?UTF-8?q?EAM=20=E2=80=94=E2=80=94>=20=20?=
 =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E5=B7=A5=E5=8D=95=20=E6=A8=A1=E5=85=B7?=
 =?UTF-8?q?=E8=81=94=E5=8A=A8=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/eam/equipmentRepairJobMain/index.ts   |   5 +
 .../eam/equipmentReportRepairRequest/index.ts |   5 +
 .../equipmentRepairJobMain/finishForm1.vue    | 129 +++++-------------
 .../equipmentRepairJobMain/finishForm2.vue    |   6 +-
 .../equipmentRepairJobMain/finishForm3.vue    | 126 ++++-------------
 .../eam/equipmentRepairJobMain/index.vue      |  54 +++-----
 .../equipmentReportRepairRequest/audiForm.vue |  23 ++--
 7 files changed, 109 insertions(+), 239 deletions(-)

diff --git a/src/api/eam/equipmentRepairJobMain/index.ts b/src/api/eam/equipmentRepairJobMain/index.ts
index e06982c20..3e7cad2b0 100644
--- a/src/api/eam/equipmentRepairJobMain/index.ts
+++ b/src/api/eam/equipmentRepairJobMain/index.ts
@@ -69,6 +69,11 @@ export const createEquipmentRepairJobMain = async (data: EquipmentRepairJobMainV
   return await request.post({ url: `/eam/equipment-repair-job-main/create`, data })
 }
 
+// 维修验证更新工单主
+export const wxVerifyEquipmentRepairJobMain = async (data: EquipmentRepairJobMainVO) => {
+  return await request.post({ url: `/eam/equipment-repair-job-main/wxVerify`, data })
+}
+
 // 修改维修工单主
 export const updateEquipmentRepairJobMain = async (data: EquipmentRepairJobMainVO) => {
   return await request.put({ url: `/eam/equipment-repair-job-main/update`, data })
diff --git a/src/api/eam/equipmentReportRepairRequest/index.ts b/src/api/eam/equipmentReportRepairRequest/index.ts
index 10542bbf9..c804cc467 100644
--- a/src/api/eam/equipmentReportRepairRequest/index.ts
+++ b/src/api/eam/equipmentReportRepairRequest/index.ts
@@ -77,6 +77,11 @@ export const updateEquipmentReportRepairOrder = async (data: EquipmentReportRepa
   return await request.post({ url: `/eam/equipment-report-repair-request/updateOrder`, data  })
 }
 
+// 审核报修工单状态
+export const audiEquipmentReportRepairOrder = async (data: EquipmentReportRepairRequestVO) => {
+  return await request.post({ url: `/eam/equipment-report-repair-request/audiOrder`, data  })
+}
+
 // 完成并创建维修工单
 export const createEquipmentWeixiuOrder = async (data: EquipmentReportRepairRequestVO) => {
   return await request.post({ url: `/eam/equipment-report-repair-request/updateCreateOrder`, data  })
diff --git a/src/views/eam/equipmentRepairJobMain/finishForm1.vue b/src/views/eam/equipmentRepairJobMain/finishForm1.vue
index d0b042e01..4f42c446d 100644
--- a/src/views/eam/equipmentRepairJobMain/finishForm1.vue
+++ b/src/views/eam/equipmentRepairJobMain/finishForm1.vue
@@ -2,29 +2,29 @@
   <Dialog v-model="dialogVisible" :title="dialogTitle"  :close-on-click-modal="false">
     <el-form ref="basicFormRef" v-loading="formLoading" :model="formData" :rules="formRules" label-width="100px">
       <el-row>
-        <el-col :span="12">
-          <el-form-item label="维修验证人" prop="verifyerRepair">
-            <el-input v-model="formData.verifyerRepair" placeholder="请输入维修验证人" :disabled="isDisabled"/>
-          </el-form-item>
-        </el-col>
+<!--        <el-col :span="12">-->
+<!--          <el-form-item label="维修验证人" prop="verifyerRepair">-->
+<!--            <el-input v-model="formData.verifyerRepair" placeholder="请输入维修验证人" :disabled="isDisabled"/>-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
         <el-col :span="12">
           <el-form-item label="维修验证内容" prop="verifyContentRepair">
-            <el-input v-model="formData.verifyContentRepair" placeholder="请输入维修验证内容" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="维修验证时间" prop="verifyTimeRepair">
-            <el-date-picker
-              v-model="formData.verifyTimeRepair"
-              type="datetime"
-              value-format="x"
-              placeholder="选择维修验证时间">
-            </el-date-picker>
+            <el-input v-model="formData.verifyContentRepair" type="textarea" :input-style="{height:'100px'}" maxlength="300" placeholder="请输入维修验证内容" />
           </el-form-item>
         </el-col>
       </el-row>
+<!--      <el-row>-->
+<!--        <el-col :span="12">-->
+<!--          <el-form-item label="维修验证时间" prop="verifyTimeRepair">-->
+<!--            <el-date-picker-->
+<!--              v-model="formData.verifyTimeRepair"-->
+<!--              type="datetime"-->
+<!--              value-format="x"-->
+<!--              placeholder="选择维修验证时间">-->
+<!--            </el-date-picker>-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
+<!--      </el-row>-->
     </el-form>
     <template #footer>
       <el-button :disabled="formLoading" type="primary" @click="submitForm('success')">确 定</el-button>
@@ -41,7 +41,10 @@ import * as EquipmentMaintenanceMainApi from '@/api/eam/equipmentMaintenanceMain
 import { SearchTable } from '@/components/SearchTable'
 import {ElInput} from "element-plus";
 import * as EquipmentRepairJobMainApi from "@/api/eam/equipmentRepairJobMain";
-import {updateEquipmentRepairJobMain} from "@/api/eam/equipmentRepairJobMain";
+import {
+  updateEquipmentRepairJobMain,
+  wxVerifyEquipmentRepairJobMain
+} from "@/api/eam/equipmentRepairJobMain";
 
 defineOptions({ name: 'TeamForm' })
 
@@ -64,93 +67,25 @@ const formData = ref({
   id:'',
   number:'',
   sources:'',
-  verifyerRepair: '',
+  //verifyerRepair: '',
   verifyContentRepair: '',
-  verifyTimeRepair: '',
+  //verifyTimeRepair: '',
 })
 const formRules = reactive({
-  verifyerRepair: [
-    { required: true, message: '验证人不能为空', trigger: 'blur' },
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
-  ],
+  // verifyerRepair: [
+  //   { required: true, message: '验证人不能为空', trigger: 'blur' },
+  //   { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  // ],
   verifyContentRepair: [
     { required: true, message: '验证内容不能为空', trigger: 'blur' },
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
-  verifyTimeRepair: [
-    { required: true, message: '验证时间不能为空', trigger: 'blur' },
-  ],
+  // verifyTimeRepair: [
+  //   { required: true, message: '验证时间不能为空', trigger: 'blur' },
+  // ],
 })
 const basicFormRef = ref() // 表单 Ref
 
-// /** 弹窗相关参数 */
-// const searchTableRef = ref();
-// const _searchTableTitle = ref();
-// const _searchTableAllSchemas = ref();
-// const _searchTablePage = ref();
-// const _formField = ref();
-// const _searchField = ref();
-// const _multiple = ref();
-// const _type = ref();
-// const _row = ref();
-// const _searchCondition = ref({})
-//
-//
-// const addItem = () =>{
-//   addItemCommon(true,'xunJianItem')
-// }
-//
-// /** 选择巡检项弹窗 */
-// const addItemCommon = (multiple,field) => {
-//   _searchCondition.value = {}
-//   const filters: any[] = []
-//   filters.push({
-//     action: "==",
-//     column: 'available',
-//     value: 'TRUE'
-//   })
-//   // 参数整理
-//   _searchCondition.value.isSearch = true
-//   _searchCondition.value.filters = filters
-//   _searchTableTitle.value = '选择巡检项'
-//   _multiple.value = multiple
-//   _formField.value = field
-//   _searchField.value = field
-//   _searchTablePage.value = inspectionItemApi.getInspectionItemPage
-//   _searchTableAllSchemas.value = InspectionItem.allSchemas
-//   openCommon()
-// }
-//
-// /** 弹窗选择之后  回调函数 添加选择集 */
-// const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
-//   nextTick?.(() => {
-//       if (formField === 'xunJianItem') {
-//           val.forEach(item => {
-//             const isExist = tags.value.some(tag => tag.content === item.content);
-//             if (!isExist){
-//               const newItem = {};
-//               newItem['content'] = item.content;
-//               newItem['id'] = item.id;
-//               tags.value.push(newItem);
-//             }
-//           });
-//       }
-//   })
-// }
-// /*打开弹窗*/
-// const openCommon = () => {
-//   searchTableRef.value.open(
-//     _searchTableTitle.value,
-//     _searchTableAllSchemas.value,
-//     _searchTablePage.value,
-//     _formField.value,
-//     _searchField.value,
-//     _multiple.value,
-//     _type.value,
-//     _row.value,
-//     _searchCondition.value
-//   )
-// }
 /** 初始化弹窗 */
 const open = async (type: string, row?: object) => {
   dialogVisible.value = true
@@ -172,7 +107,7 @@ const submitForm = async (val) => {
    if (!valid) return
 
    //发送数据
-   await EquipmentRepairJobMainApi.updateEquipmentRepairJobMain(formData.value)
+   await EquipmentRepairJobMainApi.wxVerifyEquipmentRepairJobMain(formData.value)
    //把success函数传递到父页面
    emit('success',formData.value.id,formData.value.sources)
    dialogVisible.value = false
diff --git a/src/views/eam/equipmentRepairJobMain/finishForm2.vue b/src/views/eam/equipmentRepairJobMain/finishForm2.vue
index bbb3582d4..324b31d7d 100644
--- a/src/views/eam/equipmentRepairJobMain/finishForm2.vue
+++ b/src/views/eam/equipmentRepairJobMain/finishForm2.vue
@@ -76,7 +76,6 @@
 import * as EquipmentRepairJobMainApi from '@/api/eam/equipmentRepairJobMain'
 import { SearchTable } from '@/components/SearchTable'
 import {ElInput} from "element-plus";
-import {updateEquipmentRepairMain} from "@/api/eam/equipmentRepairJobMain";
 
 defineOptions({ name: 'TeamForm' })
 
@@ -104,7 +103,7 @@ const formData = ref({
   endTime:'',
   maintenancePhone:'',
   completeResult:'',
-  status:'5'
+  status:'6'
 })
 const formRules = reactive({
   maintenanceDesc: [
@@ -137,6 +136,7 @@ const open = async (type: string, row?: object) => {
   //初始化数据
   formData.value.id = row.id
   formData.value.number = row.number
+  formData.value.status = '5'
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
@@ -150,7 +150,7 @@ const submitForm = async (val) => {
    if (!valid) return
 
    //发送数据
-   await EquipmentRepairJobMainApi.updateEquipmentRepairMain(formData.value);
+   await EquipmentRepairJobMainApi.executeEquipmentRepairJobMain(formData.value);
 
    //把success函数传递到父页面
    emit('success',formData.value.id)
diff --git a/src/views/eam/equipmentRepairJobMain/finishForm3.vue b/src/views/eam/equipmentRepairJobMain/finishForm3.vue
index 41dbd233c..32e06d599 100644
--- a/src/views/eam/equipmentRepairJobMain/finishForm3.vue
+++ b/src/views/eam/equipmentRepairJobMain/finishForm3.vue
@@ -2,29 +2,29 @@
   <Dialog v-model="dialogVisible" :title="dialogTitle"  :close-on-click-modal="false">
     <el-form ref="basicFormRef" v-loading="formLoading" :model="formData" :rules="formRules" label-width="100px">
       <el-row>
-        <el-col :span="12">
-          <el-form-item label="报修验证人" prop="verifyerReport">
-            <el-input v-model="formData.verifyerReport" placeholder="请输入报修验证人" :disabled="isDisabled"/>
-          </el-form-item>
-        </el-col>
+<!--        <el-col :span="12">-->
+<!--          <el-form-item label="报修验证人" prop="verifyerReport">-->
+<!--            <el-input v-model="formData.verifyerReport" placeholder="请输入报修验证人" :disabled="isDisabled"/>-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
         <el-col :span="12">
           <el-form-item label="报修验证内容" prop="verifyContentReport">
-            <el-input v-model="formData.verifyContentReport" placeholder="请输入报修验证内容" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="报修验证时间" prop="verifyTimeReport">
-            <el-date-picker
-              v-model="formData.verifyTimeReport"
-              type="datetime"
-              value-format="x"
-              placeholder="选择报修验证时间">
-            </el-date-picker>
+            <el-input v-model="formData.verifyContentReport" type="textarea" :input-style="{height:'100px'}" maxlength="300" placeholder="请输入报修验证内容" />
           </el-form-item>
         </el-col>
       </el-row>
+<!--      <el-row>-->
+<!--        <el-col :span="12">-->
+<!--          <el-form-item label="报修验证时间" prop="verifyTimeReport">-->
+<!--            <el-date-picker-->
+<!--              v-model="formData.verifyTimeReport"-->
+<!--              type="datetime"-->
+<!--              value-format="x"-->
+<!--              placeholder="选择报修验证时间">-->
+<!--            </el-date-picker>-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
+<!--      </el-row>-->
     </el-form>
     <template #footer>
       <el-button :disabled="formLoading" type="primary" @click="submitForm('success')">确 定</el-button>
@@ -40,6 +40,7 @@
 import { SearchTable } from '@/components/SearchTable'
 import {ElInput} from "element-plus";
 import * as EquipmentRepairJobMainApi from "@/api/eam/equipmentRepairJobMain";
+import {bxVerifyEquipmentRepairJobMain} from "@/api/eam/equipmentRepairJobMain";
 
 defineOptions({ name: 'TeamForm' })
 
@@ -61,93 +62,25 @@ const InputRef = ref<InstanceType<typeof ElInput>>()
 const formData = ref({
   id:'',
   number:'',
-  verifyerReport: '',
+  //verifyerReport: '',
   verifyContentReport: '',
-  verifyTimeReport: '',
+  //verifyTimeReport: '',
 })
 const formRules = reactive({
-  verifyerReport: [
-    { required: true, message: '验证人不能为空', trigger: 'blur' },
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
-  ],
+  // verifyerReport: [
+  //   { required: true, message: '验证人不能为空', trigger: 'blur' },
+  //   { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  // ],
   verifyContentReport: [
     { required: true, message: '验证内容不能为空', trigger: 'blur' },
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
-  verifyTimeReport: [
-    { required: true, message: '验证时间不能为空', trigger: 'blur' },
-  ],
+  // verifyTimeReport: [
+  //   { required: true, message: '验证时间不能为空', trigger: 'blur' },
+  // ],
 })
 const basicFormRef = ref() // 表单 Ref
 
-// /** 弹窗相关参数 */
-// const searchTableRef = ref();
-// const _searchTableTitle = ref();
-// const _searchTableAllSchemas = ref();
-// const _searchTablePage = ref();
-// const _formField = ref();
-// const _searchField = ref();
-// const _multiple = ref();
-// const _type = ref();
-// const _row = ref();
-// const _searchCondition = ref({})
-//
-//
-// const addItem = () =>{
-//   addItemCommon(true,'xunJianItem')
-// }
-//
-// /** 选择巡检项弹窗 */
-// const addItemCommon = (multiple,field) => {
-//   _searchCondition.value = {}
-//   const filters: any[] = []
-//   filters.push({
-//     action: "==",
-//     column: 'available',
-//     value: 'TRUE'
-//   })
-//   // 参数整理
-//   _searchCondition.value.isSearch = true
-//   _searchCondition.value.filters = filters
-//   _searchTableTitle.value = '选择巡检项'
-//   _multiple.value = multiple
-//   _formField.value = field
-//   _searchField.value = field
-//   _searchTablePage.value = inspectionItemApi.getInspectionItemPage
-//   _searchTableAllSchemas.value = InspectionItem.allSchemas
-//   openCommon()
-// }
-//
-// /** 弹窗选择之后  回调函数 添加选择集 */
-// const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
-//   nextTick?.(() => {
-//       if (formField === 'xunJianItem') {
-//           val.forEach(item => {
-//             const isExist = tags.value.some(tag => tag.content === item.content);
-//             if (!isExist){
-//               const newItem = {};
-//               newItem['content'] = item.content;
-//               newItem['id'] = item.id;
-//               tags.value.push(newItem);
-//             }
-//           });
-//       }
-//   })
-// }
-// /*打开弹窗*/
-// const openCommon = () => {
-//   searchTableRef.value.open(
-//     _searchTableTitle.value,
-//     _searchTableAllSchemas.value,
-//     _searchTablePage.value,
-//     _formField.value,
-//     _searchField.value,
-//     _multiple.value,
-//     _type.value,
-//     _row.value,
-//     _searchCondition.value
-//   )
-// }
 /** 初始化弹窗 */
 const open = async (type: string, row?: object) => {
   dialogVisible.value = true
@@ -156,6 +89,7 @@ const open = async (type: string, row?: object) => {
   //初始化数据
   formData.value.id = row.id
   formData.value.number = row.number
+  formData.value.status = '8'
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
@@ -168,7 +102,7 @@ const submitForm = async (val) => {
    if (!valid) return
 
    //发送数据
-   await EquipmentRepairJobMainApi.updateEquipmentRepairJobMain(formData.value)
+   await EquipmentRepairJobMainApi.createEquipmentRepairNewOrder(formData.value)
    //把success函数传递到父页面
    emit('success',formData.value.id)
    dialogVisible.value = false
diff --git a/src/views/eam/equipmentRepairJobMain/index.vue b/src/views/eam/equipmentRepairJobMain/index.vue
index 214dddcf9..193bd4644 100644
--- a/src/views/eam/equipmentRepairJobMain/index.vue
+++ b/src/views/eam/equipmentRepairJobMain/index.vue
@@ -184,7 +184,7 @@ const isShowBaoXiuButton = (row) => {
 // 列表-操作按钮
 const butttondata = (row) => {
   return[
-    defaultButtons.mainListEditBtn({hasPermi:'eam:equipmentRepairJobMain:update'}), // 编辑
+    defaultButtons.mainListEditBtn({hide: isShowStatusButton(row,['3','4']),hasPermi:'eam:equipmentRepairJobMain:update'}), // 编辑
     defaultButtons.mainListReceiveOrderBtn({hide: isShowStatusButton(row,['3']),hasPermi:'eam:equipmentRepairJobMain:update'}), // 接单
     defaultButtons.mainListExecuteBtn({hide: isShowStatusButton(row,['4']),hasPermi:'eam:equipmentRepairJobMain:update'}), // 执行
     defaultButtons.mainListTransferBtn({hide: isShowStatusButton(row,['4']),hasPermi:'eam:equipmentRepairJobMain:update'}), // 转办
@@ -319,15 +319,8 @@ const finishForm3Ref = ref()
 const handleValidateReport = async (row) => {
   await message.delConfirm('是否验证所选中工单？');
   message.confirmPassword(t('')).then(async () => {
-    const params = ref({id: '', status:''})
-    params.value.id = row.id
-    params.value.status = '8'
-    //完结流转
-    await EquipmentRepairJobMainApi.createEquipmentRepairNewOrder(params.value)
-    message.success(t('工单已结束'))
-    // 刷新列表
-    await getList()
 
+      finishForm3Ref.value.open('update', row);
   }).catch (async (action: Action) => {
       if(action === 'cancel'){
         const params = ref({id: '', number:''})
@@ -460,18 +453,18 @@ const getClosed1=(val)=> {
 const getData1=(val1,val2)=> {
   nextTick?.(async () => {
       try {
-        const params = ref({
-          id: '',
-          status:'',
-        })
-        params.value.id = val1
-        if(val2 == '1'){
-          params.value.status = '8'
-        }
-        if(val2 == '0'){
-          params.value.status = '7'
-        }
-        await EquipmentRepairJobMainApi.updateEquipmentRepairOrder(params.value)
+        // const params = ref({
+        //   id: '',
+        //   status:'',
+        // })
+        // params.value.id = val1
+        // if(val2 == '1'){
+        //   params.value.status = '8'
+        // }
+        // if(val2 == '0'){
+        //   params.value.status = '7'
+        // }
+        // await EquipmentRepairJobMainApi.updateEquipmentRepairOrder(params.value)
         message.success(t('工单已流转'))
         // 刷新列表
         await getList()
@@ -520,20 +513,17 @@ const getClosed3=(val)=> {
 //finishForm3 提交按钮回传
 const getData3=(val)=> {
   nextTick?.(async () => {
-      console.log(val)
-      try {
-        const params = ref({
-          id: '',
-          status:'',
-        })
-        params.value.id = val
-        params.value.status = '7'
-        await EquipmentRepairJobMainApi.updateEquipmentRepairOrder(params.value)
+        //console.log(val)
+        // const params = ref({
+        //   id: '',
+        //   status:'',
+        // })
+        // params.value.id = val
+        // params.value.status = '7'
+        // await EquipmentRepairJobMainApi.updateEquipmentRepairOrder(params.value)
         message.success(t('工单已流转'))
         // 刷新列表
         await getList()
-      } catch {}
-
     }
   )
 }
diff --git a/src/views/eam/equipmentReportRepairRequest/audiForm.vue b/src/views/eam/equipmentReportRepairRequest/audiForm.vue
index 65526f310..fc2b0a742 100644
--- a/src/views/eam/equipmentReportRepairRequest/audiForm.vue
+++ b/src/views/eam/equipmentReportRepairRequest/audiForm.vue
@@ -2,11 +2,11 @@
   <Dialog v-model="dialogVisible" :title="dialogTitle"  :close-on-click-modal="false">
     <el-form ref="basicFormRef" v-loading="formLoading" :model="formData" :rules="formRules" label-width="100px">
       <el-row>
-        <el-col :span="12">
-          <el-form-item label="审核人" prop="approver">
-            <el-input v-model="formData.approver" placeholder="请输入审核人" :disabled="isDisabled"/>
-          </el-form-item>
-        </el-col>
+<!--        <el-col :span="12">-->
+<!--          <el-form-item label="审核人" prop="approver">-->
+<!--            <el-input v-model="formData.approver" placeholder="请输入审核人" :disabled="isDisabled"/>-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
         <el-col :span="12">
           <el-form-item label="审核内容" prop="approveContent">
             <el-input v-model="formData.approveContent" placeholder="请输入审核内容" />
@@ -40,6 +40,7 @@
 import { SearchTable } from '@/components/SearchTable'
 import {ElInput} from "element-plus";
 import * as EquipmentReportRepairRequestApi from "@/api/eam/equipmentReportRepairRequest";
+import {audiEquipmentReportRepairOrder} from "@/api/eam/equipmentReportRepairRequest";
 
 defineOptions({ name: 'TeamForm' })
 
@@ -61,15 +62,15 @@ const InputRef = ref<InstanceType<typeof ElInput>>()
 const formData = ref({
   id:'',
   number:'',
-  approver: '',
+  //approver: '',
   approveContent: '',
   approveTime: '',
 })
 const formRules = reactive({
-  approver: [
-    { required: true, message: '审核人不能为空', trigger: 'blur' },
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
-  ],
+  // approver: [
+  //   { required: true, message: '审核人不能为空', trigger: 'blur' },
+  //   { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  // ],
   approveContent: [
     { required: true, message: '审核内容不能为空', trigger: 'blur' },
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
@@ -102,7 +103,7 @@ const submitForm = async (val) => {
    if (!valid) return
 
    //发送数据
-   await EquipmentReportRepairRequestApi.updateEquipmentReportRepairRequest(formData.value)
+   await EquipmentReportRepairRequestApi.audiEquipmentReportRepairOrder(formData.value)
    dialogVisible.value = false
 }
 

From 662d1fc8e15761cb3a93796ca47fcb392929f88b Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Fri, 28 Jun 2024 14:46:17 +0800
Subject: [PATCH 051/408] =?UTF-8?q?M=E7=B1=BB=E5=9E=8B=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E6=94=B6=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereceiptRecordMain/index.vue       |  2 +-
 .../purchasereceiptRequestMain/index.vue      |  2 ++
 .../index.vue                                 | 26 ++++++++++---------
 .../purchasereceiptRequestMain.data.ts        |  4 +--
 .../sparereceiptRequestMain/index.vue         |  2 ++
 5 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
index 869231e59..f32d747da 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
@@ -173,7 +173,7 @@ const butttondata = (row,$index) => {
   return [
    defaultButtons.mainInspectRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请
    defaultButtons.mainPutawayRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createPutawayRequest',hide:row.putawayRequestFlag == "FALSE" }),// 生成采购上架申请
-   defaultButtons.mainListPlanCheckQualityReportBtn({}), // 查看质检报告
+   defaultButtons.mainListPlanCheckQualityReportBtn({hide:row.orderTypeM == "2"}), // 查看质检报告
   ]
 }
 
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
index 0f8416636..27b1a655d 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
@@ -729,9 +729,11 @@ const submitForm = async (formType, submitData) => {
   data.subList = tableData.value // 拼接子表数据参数
   try {
     if (formType === 'create') {
+      data.orderTypeM='1';
       await PurchasereceiptRequestMainApi.createPurchasereceiptRequestMain(data)
       message.success(t('common.createSuccess'))
     } else {
+      data.orderTypeM='1';
       await PurchasereceiptRequestMainApi.updatePurchasereceiptRequestMain(data)
       message.success(t('common.updateSuccess'))
     }
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue
index f93c5f128..8863f857d 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue
@@ -353,20 +353,20 @@ const butttondata = (row,$index) => {
     defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-request-main:refused'}), // 驳回
     defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-request-main:agree'}), // 审批通过
     // defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-request-main:update'}), // 编辑
-    {
-      label: '生成标签',
-      name: 'ssbq',
-      hide: isASNShowMainButton(row, ['3']),
-      type: 'primary',
-      icon: '',
-      color: '',
-      hasPermi: '',
-      link: true // 文本展现按钮
-    },
-    defaultButtons.mainListPointBtn({ hide: isASNShowMainButton(row, ['3','8']) }), // 标签打印
+    // {
+    //   label: '生成标签',
+    //   name: 'ssbq',
+    //   hide: isASNShowMainButton(row, ['3']),
+    //   type: 'primary',
+    //   icon: '',
+    //   color: '',
+    //   hasPermi: '',
+    //   link: true // 文本展现按钮
+    // },
+    // defaultButtons.mainListPointBtn({ hide: isASNShowMainButton(row, ['3','8']) }), // 标签打印
     defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:purchasereceipt-request-main:handle'}), // 处理
     defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:purchasereceipt-request-main:close'}), // 关闭
-    defaultButtons.mainListPlanCheckQualityReportBtn({}), // 查看质检报告
+    // defaultButtons.mainListPlanCheckQualityReportBtn({}), // 查看质检报告
       ]
 }
 
@@ -729,9 +729,11 @@ const submitForm = async (formType, submitData) => {
   data.subList = tableData.value // 拼接子表数据参数
   try {
     if (formType === 'create') {
+      data.orderTypeM='2';
       await PurchasereceiptRequestMainApi.createPurchasereceiptRequestMain(data)
       message.success(t('common.createSuccess'))
     } else {
+      data.orderTypeM='2';
       await PurchasereceiptRequestMainApi.updatePurchasereceiptRequestMain(data)
       message.success(t('common.updateSuccess'))
     }
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/purchasereceiptRequestMain.data.ts
index 2a7c4a340..5a46ecd78 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/purchasereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/purchasereceiptRequestMain.data.ts
@@ -535,6 +535,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       componentProps: {
         inactiveValue: 'FALSE',
         activeValue: 'TRUE',
+        disabled:true
       }
     }
   },
@@ -589,9 +590,6 @@ export const PurchasereceiptRequestMainRules = reactive({
   autoExecute: [
     { required: true, message: '请选择是否自动执行', trigger: 'change' }
   ],
-  directCreateRecord: [
-    { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
-  ],
   businessType: [
     { required: true, message: '请输入业务类型', trigger: 'blur' }
   ],
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
index f79b3655e..45c2359b6 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
@@ -590,9 +590,11 @@ const submitForm = async (formType, submitData) => {
   data.subList = tableData.value // 拼接子表数据参数
   try {
     if (formType === 'create') {
+      data.orderTypeM='1';
       await PurchasereceiptRequestMainApi.createPurchasereceiptRequestMainSpare(data)
       message.success(t('common.createSuccess'))
     } else {
+      data.orderTypeM='1';
       await PurchasereceiptRequestMainApi.updatePurchasereceiptRequestMain(data)
       message.success(t('common.updateSuccess'))
     }

From 753739ce057b63425ad6bb74f7149646644d4d0f Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Fri, 28 Jun 2024 14:50:09 +0800
Subject: [PATCH 052/408] =?UTF-8?q?WMS=E5=88=97=E8=A1=A8=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../issueRequestMain/issueRequestMain.data.ts |  4 +-
 .../productdismantleRecordMain.data.ts        |  4 +-
 .../productionMain/productionMain.data.ts     | 23 +++++-----
 .../productionMainAssemble.data.ts            | 23 +++++-----
 .../productionMainAssembleSparePart.data.ts   | 23 +++++-----
 .../productionMainPredictSparePart.data.ts    | 23 +++++-----
 .../qadProductionPlanMain.data.ts             | 31 +++++++++++++
 .../productreceiptRecordMain.data.ts          |  8 ++--
 .../productreceiptAssembleRecordMain.data.ts  |  4 +-
 .../productreceiptscrapRecordMain.data.ts     |  8 ++--
 .../productredressJobMain.data.ts             |  4 +-
 .../productredressRecordMain.data.ts          |  4 +-
 .../productredressRequestMain.data.ts         |  4 +-
 .../productrepairRequestMain.data.ts          |  4 +-
 .../purchasereturnRequestMain.data.ts         | 46 +++++++++----------
 15 files changed, 124 insertions(+), 89 deletions(-)

diff --git a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
index 2c3743059..4a7479093 100644
--- a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
+++ b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
@@ -745,7 +745,7 @@ export const IssueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isSearch: true,
+    isSearch: false,
     isTable:false,
     sortSearchDefault:6,
     sortTableDefault:1100,
@@ -864,7 +864,7 @@ export const IssueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  
+
   {
     label: '备注',
     field: 'remark',
diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts
index 75e6b0954..c4ec4ac11 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts
@@ -190,7 +190,7 @@ export const ProductdismantleRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
     label: '创建者',
     field: 'creator',
     sort: 'custom',
-    isTable: true,
+    isTable: false,
     table: {
       width: 150
     },
@@ -206,7 +206,7 @@ export const ProductdismantleRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 180
     },
-    isTable: true,
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
diff --git a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
index 8919838d3..abb9a9833 100644
--- a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
@@ -204,17 +204,17 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '物料代码',
-    field: 'detailItemCode',
-    sort: 'custom',
-    isSearch: true,
-    table: {
-      width: 150
-    },
-    isTable: false,
-    isForm: false
-  },
+  // {
+  //   label: '物料代码',
+  //   field: 'detailItemCode',
+  //   sort: 'custom',
+  //   isSearch: true,
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTable: false,
+  //   isForm: false
+  // },
   {
     label: '计划数量',
     field: 'detailPlanQty',
@@ -610,6 +610,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '物料代码',
     field: 'itemCode',
     sort: 'custom',
+    isSearch: true,
     table: {
       width: 150
     },
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
index 7ef13b457..345ed64c1 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
@@ -195,17 +195,17 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '物料代码',
-    field: 'detailItemCode',
-    sort: 'custom',
-    isSearch: true,
-    table: {
-      width: 150
-    },
-    isTable: false,
-    isForm: false
-  },
+  // {
+  //   label: '物料代码',
+  //   field: 'detailItemCode',
+  //   sort: 'custom',
+  //   isSearch: true,
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTable: false,
+  //   isForm: false
+  // },
   {
     label: '计划数量',
     field: 'detailPlanQty',
@@ -601,6 +601,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '物料代码',
     field: 'itemCode',
     sort: 'custom',
+    isSearch: true,
     table: {
       width: 150
     },
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
index fb83717e3..7b01b6b20 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
@@ -195,17 +195,17 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '物料代码',
-    field: 'detailItemCode',
-    sort: 'custom',
-    isSearch: true,
-    table: {
-      width: 150
-    },
-    isTable: false,
-    isForm: false
-  },
+  // {
+  //   label: '物料代码',
+  //   field: 'detailItemCode',
+  //   sort: 'custom',
+  //   isSearch: true,
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTable: false,
+  //   isForm: false
+  // },
   {
     label: '计划数量',
     field: 'detailPlanQty',
@@ -601,6 +601,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '物料代码',
     field: 'itemCode',
     sort: 'custom',
+    isSearch: true,
     table: {
       width: 150
     },
diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
index 652609905..4ad8db37b 100644
--- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
@@ -196,17 +196,17 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
 
-  {
-    label: '物料代码',
-    field: 'detailItemCode',
-    sort: 'custom',
-    isSearch: true,
-    table: {
-      width: 150
-    },
-    isTable: false,
-    isForm: false
-  },
+  // {
+  //   label: '物料代码',
+  //   field: 'detailItemCode',
+  //   sort: 'custom',
+  //   isSearch: true,
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTable: false,
+  //   isForm: false
+  // },
   {
     label: '计划数量',
     field: 'detailPlanQty',
@@ -602,6 +602,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '物料代码',
     field: 'itemCode',
     sort: 'custom',
+    isSearch: true,
     table: {
       width: 150
     },
diff --git a/src/views/wms/productionManage/productionplan/qadproductionplan/qadProductionPlanMain.data.ts b/src/views/wms/productionManage/productionplan/qadproductionplan/qadProductionPlanMain.data.ts
index 93884b7a8..e9de6fa60 100644
--- a/src/views/wms/productionManage/productionplan/qadproductionplan/qadProductionPlanMain.data.ts
+++ b/src/views/wms/productionManage/productionplan/qadproductionplan/qadProductionPlanMain.data.ts
@@ -1,5 +1,6 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter2 } from '@/utils/formatTime'
+import { dateFormatter } from '@/utils/formatTime'
 
 // 表单校验
 export const QadProductionPlanMainRules = reactive({
@@ -71,6 +72,36 @@ export const QadProductionPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'SelectV2'
     },
   },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    isForm: false,
+    table: {
+      width: 180
+    },
+    formatter: dateFormatter,
+    detail: {
+      dateFormat : 'YYYY-MM-DD HH:mm:ss'
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    table: {
+      width: 130
+    },
+    isForm: false,
+    isTable: true
+  },
   // {
   //   label: '备注',
   //   field: 'remark',
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts
index fcbbb78e5..7253d12da 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts
@@ -229,7 +229,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isTable: true,
+    isTable: false,
   },
   {
     label: '创建时间',
@@ -238,7 +238,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 180
@@ -671,7 +671,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 180
     },
-    isTable: false,
+    isTable: true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -688,7 +688,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
-    isTable: false,
+    isTable: true,
   },
   // {
   //   label: '任务明细ID',
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts
index 2c9ade555..f447fd858 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts
@@ -676,7 +676,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 180
     },
-    isTable: false,
+    isTable: true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -693,7 +693,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
-    isTable: false,
+    isTable: true,
   },
   // {
   //   label: '任务明细ID',
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/productreceiptscrapRecordMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/productreceiptscrapRecordMain.data.ts
index 26ad1fd50..745ceb9fb 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/productreceiptscrapRecordMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/productreceiptscrapRecordMain.data.ts
@@ -217,7 +217,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isTable: true,
+    isTable: false,
   },
   {
     label: '创建时间',
@@ -230,7 +230,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isTable: true,
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -665,7 +665,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 180
     },
-    isTable: false,
+    isTable: true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -682,7 +682,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
-    isTable: false,
+    isTable: true,
   },
 
   // {
diff --git a/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts b/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts
index 7f65ffdc9..e797d3192 100644
--- a/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts
+++ b/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts
@@ -659,7 +659,7 @@ export const ProductredressJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isTable:false,
+    isTable:true,
     hiddenInMain:true,
   },
   {
@@ -673,7 +673,7 @@ export const ProductredressJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isTable:false,
+    isTable:true,
     hiddenInMain:true,
     form: {
       component: 'DatePicker',
diff --git a/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts b/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts
index 6f5459c3d..43672b0b5 100644
--- a/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts
+++ b/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts
@@ -568,7 +568,7 @@ export const ProductredressRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
-    isTable:false,
+    isTable:true,
     hiddenInMain: true,
   },
   {
@@ -592,7 +592,7 @@ export const ProductredressRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
       }
     },
     isForm: false,
-    isTable:false,
+    isTable:true,
     hiddenInMain: true,
   },
   {
diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
index 038b6e892..eab66118f 100644
--- a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
+++ b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
@@ -575,7 +575,7 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
     isTableForm: false,
     isForm: false,
-    isTable:false,
+    isTable:true,
     hiddenInMain:true
   },
   {
@@ -589,7 +589,7 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 180
     },
-    isTable:false,
+    isTable:true,
     hiddenInMain:true,
     form: {
       component: 'DatePicker',
diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
index 7c7f9db37..45a183c70 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
+++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
@@ -809,7 +809,7 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
       width: 180
     },
     hiddenInMain: true,
-    isTable: false,
+    isTable: true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -830,7 +830,7 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
     hiddenInMain: true,
-    isTable: false,
+    isTable: true,
     isTableForm: false,
     isForm: false
   },
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
index a4eb4c14b..1358415e2 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
@@ -1279,29 +1279,29 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     isTableForm:false,
     isForm:false
   },
-  {
-    label: '接口类型',
-    field: 'interfaceType',
-    dictType: DICT_TYPE.INTERFACE_TYPE,
-    dictClass: 'string',
-    isSearch: true,
-    isTable: true,
-    hiddenInMain: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm:{
-      disabled:true
-    },
-    isForm:false,
-    isTableForm:false,
-    form: {
-      componentProps:{
-        disabled:true
-      }
-    },
-  },
+  // {
+  //   label: '接口类型',
+  //   field: 'interfaceType',
+  //   dictType: DICT_TYPE.INTERFACE_TYPE,
+  //   dictClass: 'string',
+  //   isSearch: true,
+  //   isTable: true,
+  //   hiddenInMain: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   tableForm:{
+  //     disabled:true
+  //   },
+  //   isForm:false,
+  //   isTableForm:false,
+  //   form: {
+  //     componentProps:{
+  //       disabled:true
+  //     }
+  //   },
+  // },
   {
     label: '备注',
     field: 'remark',

From f562aacf2137e986f515cda283ec2f5b4e61ab44 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 28 Jun 2024 15:05:34 +0800
Subject: [PATCH 053/408] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/supplierinvoiceRequestMain/index.ts   |  5 ++
 src/components/BasicForm/src/BasicForm.vue    |  9 +++-
 .../supplierinvoiceRequestMain/index.vue      | 53 ++++++++++++++-----
 3 files changed, 53 insertions(+), 14 deletions(-)

diff --git a/src/api/wms/supplierinvoiceRequestMain/index.ts b/src/api/wms/supplierinvoiceRequestMain/index.ts
index 5358945de..338cd176e 100644
--- a/src/api/wms/supplierinvoiceRequestMain/index.ts
+++ b/src/api/wms/supplierinvoiceRequestMain/index.ts
@@ -147,3 +147,8 @@ export const getLoginUserRoleList = async () => {
   
 }
 
+// 编辑的时候计算主表系统税额
+export const getTaxAmount = async ({id,taxRate}) => {
+  return await request.get({ url: `/wms/supplierinvoice-request-main/computeById?id=${id}&taxRate=${taxRate}`})
+  
+}
\ No newline at end of file
diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 82c91d1c7..5444c2218 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -500,9 +500,13 @@ let originFormModel = {}
 const updateOriginFormModel = (data)=>{
   originFormModel = JSON.parse(JSON.stringify(data))
 }
+const sumFormDataHandle1 = ()=>{
+  emit('sumFormDataHandle',formRef,unref(formRef)?.formModel,props.tableData,formType.value,originFormModel,updateOriginFormModel)
+}
+
 watch(()=>unref(formRef)?.formModel,async () => {
   if(props?.sumFormDataByForm&&unref(formRef)?.formModel){
-    props?.sumFormDataByForm(formRef,unref(formRef)?.formModel,props.tableData,formType.value,originFormModel,updateOriginFormModel)
+    props?.sumFormDataByForm(formRef,unref(formRef)?.formModel,props.tableData,formType.value,originFormModel,updateOriginFormModel,sumFormDataHandle1)
   }
 },{
   deep:true
@@ -678,7 +682,8 @@ const emit = defineEmits([
   'formFormDateChange',
   'footButtonClick',
   'clearSearchInput',
-  'clearInput'
+  'clearInput',
+  'sumFormDataHandle'
 ])
 //普通下拉改变事件
 const formSelectChange = (field, val, row) => {
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 77de5e34e..a43eff0e3 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -53,26 +53,42 @@
     :tableAllSchemas="SupplierinvoiceRequestDetail.allSchemas" 
     :tableFormRules="SupplierinvoiceRequestDetailRules"
     :tableData="tableData" 
-    :sumFormDataByForm ="(formRef,formModel,tableData,formType,originFormModel,updateOriginFormModel)=>{
-      const {taxRate=0,amount=0,taxAmount=0,beforeTaxAmount=0,totalTaxAmount=0,discountAmount1=0,beforeTaxDiffAmount=0,taxAmountDiff=0} = formModel 
+    :sumFormDataByForm ="(formRef,formModel,tableData,formType,originFormModel,updateOriginFormModel,sumFormDataHandle1)=>{
+      const {taxRate=0,amount=0,taxAmount=0,beforeTaxAmount=0,totalTaxAmount=0,discountAmount1=0,beforeTaxDiffAmount=0,taxAmountDiff=0} = formModel
       // 2、系统税额：每条数据的合同价格X可开票数量，计算结果取两位小数之后*税率的计算结果，再保留2位。所有子表数据再求和
-      let taxAmount_ = 0.00
       if(formType=='update'){ // 编辑
-        taxAmount_ = taxAmount
+        console.log('taxRate',taxRate)
+        console.log('originFormModel',originFormModel.taxRate)
+        console.log('taxAmount',taxAmount)
+        if(taxRate!=originFormModel.taxRate){
+          if(originFormModel){
+            sumFormDataHandle1()
+          }
+          updateOriginFormModel(formModel)
+        }
+        formRef.value.setValues({
+          afterTaxAmount:amount+taxAmount, // 3、系统价税合计：系统未税金额+系统税额
+          adTaxAmount:beforeTaxAmount+totalTaxAmount, //6、价税合计金额：未税金额+税额
+          beforeTaxDiffAmount:beforeTaxAmount-amount-discountAmount1,//未税差额：未税金额-系统未税金额-折扣金额
+          taxAmountDiff:totalTaxAmount-taxAmount,// 税额差异：税额-系统税额
+          totalTaxDiffAmount:beforeTaxDiffAmount+taxAmountDiff // 价税合计差额=未税差额+税额差异
+        })
       }else if(formType=='create'){ // 新增
+        let taxAmount_ = taxAmount
         if(taxRate!=originFormModel.taxRate){
           taxAmount_ = tableData.reduce((prev, item) => prev + Number(Number(taxRate*0.01*Number(Number(item['singlePrice']*item['invoicableQuantity']).toFixed(2))).toFixed(2)),0)
           updateOriginFormModel(formModel)
         }
+        formRef.value.setValues({
+          taxAmount:taxAmount_, 
+          afterTaxAmount:amount+taxAmount, // 3、系统价税合计：系统未税金额+系统税额
+          adTaxAmount:beforeTaxAmount+totalTaxAmount, //6、价税合计金额：未税金额+税额
+          beforeTaxDiffAmount:beforeTaxAmount-amount-discountAmount1,//未税差额：未税金额-系统未税金额-折扣金额
+          taxAmountDiff:totalTaxAmount-taxAmount,// 税额差异：税额-系统税额
+          totalTaxDiffAmount:beforeTaxDiffAmount+taxAmountDiff // 价税合计差额=未税差额+税额差异
+        })
       }
-      formRef.value.setValues({
-        taxAmount:taxAmount_, 
-        afterTaxAmount:amount+taxAmount, // 3、系统价税合计：系统未税金额+系统税额
-        adTaxAmount:beforeTaxAmount+totalTaxAmount, //6、价税合计金额：未税金额+税额
-        beforeTaxDiffAmount:beforeTaxAmount-amount-discountAmount1,//未税差额：未税金额-系统未税金额-折扣金额
-        taxAmountDiff:totalTaxAmount-taxAmount,// 税额差异：税额-系统税额
-        totalTaxDiffAmount:beforeTaxDiffAmount+taxAmountDiff // 价税合计差额=未税差额+税额差异
-      })
+      
     }"
     
     :sumFormDataByTableCustom ="(formRef,formModel,tableData)=>{
@@ -92,6 +108,7 @@
     @tableSelectionDelete="tableSelectionDelete"
     @searchTableSuccess="searchTableSuccess"
     @submitForm="submitForm"
+    @sumFormDataHandle="sumFormDataHandle"
   >      
   <!-- <template #foorter>
     <div style="text-align: left">
@@ -279,6 +296,7 @@ const searchTableSuccessDetail = async (formField, searchField, val, formRef,sea
     subList:val
   })
   detailRef.value.updateList()
+  getList()
 }
 
 // const basicFormFooter = computed(()=>{
@@ -941,6 +959,17 @@ const handleImport = () => {
     tableData.value = tableData.value.filter(item => !selection.includes(item))
   }
 
+  const sumFormDataHandle =  async (formRef1,formModel,tableData,formType,originFormModel,updateOriginFormModel)=>{
+    if(formType=='update'){
+      if(formModel&&formModel.id&&formModel.taxRate&&originFormModel){
+        let res = await SupplierinvoiceRequestMainApi.getTaxAmount({id:formModel.id,taxRate:formModel.taxRate})
+        console.log('更新taxAmount',res)
+        formRef1.value.setValues({
+          taxAmount:res
+        })
+      }
+    }
+  }
   // 主子数据 提交
   const submitForm = async (formType, submitData) => {
     let data = {...submitData}

From b823f98806ce1a2eb81bb07b69c918da499ce163 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 28 Jun 2024 15:12:37 +0800
Subject: [PATCH 054/408] =?UTF-8?q?=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoice/supplierinvoiceRequestMain/index.vue      | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index a43eff0e3..e966810ae 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -202,6 +202,7 @@
     @tableFormButton="tableFormButton"
     :mainSubmitCreateApi="true"
     @searchTableSuccessDetail="searchTableSuccessDetail"
+    @handleMainFefresh="handleMainFefresh"
   >
     <template #differencePrice="{row}">
       <span :class="{'red-text':row.differencePrice!=0}">{{ row.differencePrice }}</span>
@@ -284,6 +285,9 @@ const getSelectionRows = (currentPage,currentPageSelectionRows) => {
     })
   }
 }
+const handleMainFefresh = ()=>{
+  getList()
+}
 
 const searchTableSuccessDetail = async (formField, searchField, val, formRef,searchTableFormModel)=>{
   console.log('详情',formField, searchField, val, formRef,searchTableFormModel)

From 7e481a2c44d3d1310fea871a555344e159eb2eee Mon Sep 17 00:00:00 2001
From: bjang03 <259278618@qq.com>
Date: Fri, 28 Jun 2024 15:20:08 +0800
Subject: [PATCH 055/408] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D=201=E3=80=81?=
 =?UTF-8?q?=E7=9B=98=E7=82=B9=E8=AE=A1=E5=88=92=EF=BC=8C=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=9A=84=E7=89=A9=E6=96=99=E5=BF=BD=E7=95=A5=E5=90=8D=E5=8D=95?=
 =?UTF-8?q?=E3=80=81=E5=BA=93=E4=BD=8D=E5=BF=BD=E7=95=A5=E5=90=8D=E5=8D=95?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=9C=A8=E8=A1=A8=E5=A4=B4=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=EF=BC=8C=E5=B9=B6=E6=B7=BB=E5=8A=A0=E5=BF=BD=E7=95=A5=E7=9A=84?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E3=80=81=E5=BA=93=E4=BD=8D=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E5=BF=BD=E7=95=A5=E7=9B=98=E7=82=B9=EF=BC=8C=E5=BA=94=E5=BF=BD?=
 =?UTF-8?q?=E7=95=A5=E7=9B=98=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../count/countPlanMain/countPlanMain.data.ts | 78 +++++++++----------
 .../countManage/count/countPlanMain/index.vue |  3 +-
 2 files changed, 40 insertions(+), 41 deletions(-)

diff --git a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
index 3e0b98967..e7fe06072 100644
--- a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
+++ b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
@@ -83,45 +83,45 @@ export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  // {
-  //   label: '物料忽略名单',
-  //   field: 'ignoreListOfItem',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   form: {
-  //     componentProps: {
-  //       isSearchList: true, // 开启查询弹窗
-  //       multiple:true,//是否可以多选
-  //       searchListPlaceholder: '请选择物料忽略名单', // 输入框占位文本
-  //       searchField: 'code', // 查询弹窗赋值字段
-  //       searchTitle: '物料信息', // 查询弹窗标题
-  //       searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
-  //       searchPage: ItembasicApi.getItembasicPage // 查询弹窗所需分页方法
-  //     }
-  //   }
-  // },
-  // {
-  //   label: '库位忽略名单',
-  //   field: 'ignoreListOfLocation',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   form: {
-  //     componentProps: {
-  //       isSearchList: true, // 开启查询弹窗
-  //       multiple:true,//是否可以多选
-  //       searchListPlaceholder: '请选择库位忽略名单', // 输入框占位文本
-  //       searchField: 'code', // 查询弹窗赋值字段
-  //       searchTitle: '库位信息', // 查询弹窗标题
-  //       searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
-  //       searchPage: LocationApi.getLocationPage // 查询弹窗所需分页方法
-  //
-  //     }
-  //   }
-  // },
+  {
+    label: '物料忽略名单',
+    field: 'ignoreListOfItem',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        multiple:true,//是否可以多选
+        searchListPlaceholder: '请选择物料忽略名单', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '物料信息', // 查询弹窗标题
+        searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
+        searchPage: ItembasicApi.getItembasicPage // 查询弹窗所需分页方法
+      }
+    }
+  },
+  {
+    label: '库位忽略名单',
+    field: 'ignoreListOfLocation',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        multiple:true,//是否可以多选
+        searchListPlaceholder: '请选择库位忽略名单', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库位信息', // 查询弹窗标题
+        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+        searchPage: LocationApi.getLocationPage // 查询弹窗所需分页方法
+
+      }
+    }
+  },
   // {
   //   label: '盘点范围列表',
   //   field: 'scopeList',
diff --git a/src/views/wms/countManage/count/countPlanMain/index.vue b/src/views/wms/countManage/count/countPlanMain/index.vue
index 06aed60fa..5d7c2ecb9 100644
--- a/src/views/wms/countManage/count/countPlanMain/index.vue
+++ b/src/views/wms/countManage/count/countPlanMain/index.vue
@@ -54,7 +54,6 @@
     :formAllSchemas="CountPlanMain.allSchemas"
     :tableAllSchemas="CountPlanDetail.allSchemas"
     :tableFormRules="CountPlanDetailRules"
-    :CountPlanMain1FormAllSchemas="CountPlanMain1.allSchemas"
     :tableData="tableData"
     :apiUpdate="CountPlanMainApi.updateCountPlanMain"
     :apiCreate="CountPlanMainApi.createCountPlanMain"
@@ -113,7 +112,7 @@ import {
   CountPlanMainRules,
   CountPlanDetail,
   CountPlanDetailRules,
-  CountPlanMain1
+  // CountPlanMain1
 } from './countPlanMain.data'
 import * as CountPlanMainApi from '@/api/wms/countPlanMain'
 import * as CountPlanDetailApi from '@/api/wms/countPlanDetail'

From 53a5613a103e37243b90b7943f867d5b255fb825 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 28 Jun 2024 15:37:29 +0800
Subject: [PATCH 056/408] =?UTF-8?q?=E8=BF=87=E8=B4=A6=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoice/supplierinvoiceRequestMain/index.vue        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index e966810ae..354b5ed15 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -222,6 +222,7 @@
 
 </template>
 <script setup lang="ts">
+import dayjs from 'dayjs'
 // 供应商发票申请
   import download from '@/utils/download'
   import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
@@ -776,6 +777,7 @@ const handleImport = () => {
   /** 审批通过按钮操作 finance_mainPlanSub */
   const formFinanceRef = ref()
   const handleFinanceApp = async (row) => {
+    row.postingDate = dayjs().valueOf()
     formFinanceRef.value.open('update', row,null,'财务通过','财务通过')
   }
 

From 37a480c67dd3abf8db8ef32cea9db0a9e46a84c1 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 28 Jun 2024 15:44:42 +0800
Subject: [PATCH 057/408] =?UTF-8?q?=E7=9B=98=E7=82=B9=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../countManage/count/countPlanMain/countPlanMain.data.ts    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
index e7fe06072..b8c7cfaed 100644
--- a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
+++ b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
@@ -43,10 +43,13 @@ export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    form: {
+      value:'MANUAL',
+    },
     isSearch: true
   },
   {
-    label: '执行周期',
+    label: '',//执行周期
     field: 'crontab',
     sort: 'custom',
     table: {

From 9e24028919caa58bd61418710263f0eb7fbeba8a Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Fri, 28 Jun 2024 15:52:00 +0800
Subject: [PATCH 058/408] =?UTF-8?q?EAM=20=E2=80=94=E2=80=94>=20=20?=
 =?UTF-8?q?=E7=82=B9=E6=A3=80=E5=B7=A1=E6=A3=80=E4=BF=9D=E5=85=BB=20?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E4=BD=9C=E5=BA=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../eam/equipmentInspectionMain/index.vue     | 26 ++++++++++++++++++-
 .../eam/equipmentMaintenanceMain/index.vue    | 25 +++++++++++++++++-
 .../eam/equipmentSpotCheckMain/index.vue      | 25 +++++++++++++++++-
 src/views/eam/planInspection/index.vue        |  2 +-
 src/views/eam/planSpotCheck/index.vue         |  2 +-
 5 files changed, 75 insertions(+), 5 deletions(-)

diff --git a/src/views/eam/equipmentInspectionMain/index.vue b/src/views/eam/equipmentInspectionMain/index.vue
index ddf2c7985..8148ea401 100644
--- a/src/views/eam/equipmentInspectionMain/index.vue
+++ b/src/views/eam/equipmentInspectionMain/index.vue
@@ -94,6 +94,7 @@ import {EquipmentAccounts} from "@/views/eam/equipmentAccounts/equipmentAccounts
 import * as EquipmentItemApi from "@/api/eam/equipmentAccounts";
 import {ToolAccounts} from "@/views/eam/toolAccounts/toolAccounts.data";
 import * as ToolItemApi from "@/api/eam/toolAccounts";
+import * as EquipmentSpotCheckMainApi from "@/api/eam/equipmentSpotCheckMain";
 
 
 defineOptions({ name: 'EquipmentInspectionMain' })
@@ -189,9 +190,10 @@ const isShowEditStatusButton = (row) => {
 // 列表-操作按钮
 const butttondata = (row) => {
   return [
-    defaultButtons.mainListEditBtn({hide: isShowEditStatusButton(row),hasPermi:'eam:equipmentInspectionMain:update'}), // 编辑
+    defaultButtons.mainListEditBtn({hide: isShowStatusButton(row,['3','4']),hasPermi:'eam:equipmentInspectionMain:update'}), // 编辑
     defaultButtons.mainListReceiveOrderBtn({hide: isShowStatusButton(row,['3']),hasPermi:'eam:equipmentInspectionMain:update'}), // 接单
     defaultButtons.mainListExecuteBtn({hide: isShowStatusButton(row,['4']),hasPermi:'eam:equipmentInspectionMain:update'}), // 执行
+    defaultButtons.mainListCancelBtn({hide: isShowStatusButton(row,['5']),hasPermi:'eam:equipmentInspectionMain:update'}), //作废
     defaultButtons.mainListFinishBtn({hide: isShowStatusButton(row,['5']),hasPermi:'eam:equipmentInspectionMain:update'}), // 完成巡检
     defaultButtons.mainListValidateBtn({hide: isShowStatusButton(row,['6']),hasPermi:'eam:equipmentInspectionMain:update'}), // 验证
     //defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'eam:equipmentInspectionMain:update'}),
@@ -213,6 +215,8 @@ const buttonTableClick = async (val, row) => {
     handleFinish(row)
   } else if (val == 'validate') { // 验证
     handleValidate(row)
+  } else if (val == 'cancel') { // 作废
+    handleCancel(row.id)
   }
 }
 
@@ -392,6 +396,26 @@ const handleValidate = async (row) => {
 }
 
 
+/** 作废按钮操作 */
+const handleCancel = async (id: number) => {
+  try {
+    // 二次确认
+    await message.delConfirm('是否作废所选中任务？');
+    const params = ref({
+      id: '',
+      status:'',
+    })
+    params.value.id = id
+    params.value.status = '8'
+    // 发起
+    await EquipmentInspectionMainApi.updateEquipmentInspectionOrder(params.value)
+    message.success(t('执行成功'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+
 const detailBasicFormOnChange = (field, item) => {
   //未完成
   if(field == 'result' && item == '1'){
diff --git a/src/views/eam/equipmentMaintenanceMain/index.vue b/src/views/eam/equipmentMaintenanceMain/index.vue
index 07d7bb31c..08c0f18ec 100644
--- a/src/views/eam/equipmentMaintenanceMain/index.vue
+++ b/src/views/eam/equipmentMaintenanceMain/index.vue
@@ -104,6 +104,7 @@ import {EquipmentAccounts} from "@/views/eam/equipmentAccounts/equipmentAccounts
 import * as EquipmentItemApi from "@/api/eam/equipmentAccounts";
 import {ToolAccounts} from "@/views/eam/toolAccounts/toolAccounts.data";
 import * as ToolItemApi from "@/api/eam/toolAccounts";
+import * as EquipmentInspectionMainApi from "@/api/eam/equipmentInspectionMain";
 
 defineOptions({ name: 'EquipmentMaintenanceMain' })
 
@@ -197,9 +198,10 @@ const isShowEditStatusButton = (row) => {
 // 列表-操作按钮
 const butttondata = (row) => {
   return [
-    defaultButtons.mainListEditBtn({hide: isShowEditStatusButton(row),hasPermi:'eam:equipmentMaintenanceMain:update'}), // 编辑
+    defaultButtons.mainListEditBtn({hide: isShowStatusButton(row,['3','4']),hasPermi:'eam:equipmentMaintenanceMain:update'}), // 编辑
     defaultButtons.mainListReceiveOrderBtn({hide: isShowStatusButton(row,['3']),hasPermi:'eam:equipmentMaintenanceMain:update'}), // 接单
     defaultButtons.mainListExecuteBtn({hide: isShowStatusButton(row,['4']),hasPermi:'eam:equipmentMaintenanceMain:update'}), // 执行
+    defaultButtons.mainListCancelBtn({hide: isShowStatusButton(row,['5']),hasPermi:'eam:equipmentMaintenanceMain:update'}), //作废
     defaultButtons.mainListFinishBtn({hide: isShowStatusButton(row,['5']),hasPermi:'eam:equipmentMaintenanceMain:update'}), // 完成保养
     defaultButtons.mainListValidateBtn({hide: isShowStatusButton(row,['6']),hasPermi:'eam:equipmentMaintenanceMain:update'}), // 验证
     defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'eam:equipmentMaintenanceMain:update'}),
@@ -221,6 +223,8 @@ const buttonTableClick = async (val, row) => {
     handleFinish(row)
   } else if (val == 'validate') { // 验证
     handleValidate(row)
+  } else if (val == 'cancel') { // 作废
+    handleCancel(row.id)
   }
 }
 
@@ -391,6 +395,25 @@ const handleValidate = async (row) => {
 
 }
 
+/** 作废按钮操作 */
+const handleCancel = async (id: number) => {
+  try {
+    // 二次确认
+    await message.delConfirm('是否作废所选中任务？');
+    const params = ref({
+      id: '',
+      status:'',
+    })
+    params.value.id = id
+    params.value.status = '8'
+    // 发起
+    await EquipmentMaintenanceMainApi.updateMaintenanceOrder(params.value)
+    message.success(t('执行成功'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
 /** 启用 */
 const handleEnable = async (id: number) => {
   try {
diff --git a/src/views/eam/equipmentSpotCheckMain/index.vue b/src/views/eam/equipmentSpotCheckMain/index.vue
index 3b076c62b..3c3026348 100644
--- a/src/views/eam/equipmentSpotCheckMain/index.vue
+++ b/src/views/eam/equipmentSpotCheckMain/index.vue
@@ -93,6 +93,7 @@ import {EquipmentAccounts} from "@/views/eam/equipmentAccounts/equipmentAccounts
 import * as EquipmentItemApi from "@/api/eam/equipmentAccounts";
 import {ToolAccounts} from "@/views/eam/toolAccounts/toolAccounts.data";
 import * as ToolItemApi from "@/api/eam/toolAccounts";
+import * as EquipmentRepairJobMainApi from "@/api/eam/equipmentRepairJobMain";
 
 defineOptions({ name: 'EquipmentSpotCheckMain' })
 
@@ -187,9 +188,10 @@ const isShowEditStatusButton = (row) => {
 // 列表-操作按钮
 const butttondata = (row) => {
   return [
-    defaultButtons.mainListEditBtn({hide: isShowEditStatusButton(row),hasPermi:'eam:equipmentSpotCheckMain:update'}), // 编辑
+    defaultButtons.mainListEditBtn({hide: isShowStatusButton(row,['3','4']),hasPermi:'eam:equipmentSpotCheckMain:update'}), // 编辑
     defaultButtons.mainListReceiveOrderBtn({hide: isShowStatusButton(row,['3']),hasPermi:'eam:equipmentSpotCheckMain:update'}), // 接单
     defaultButtons.mainListExecuteBtn({hide: isShowStatusButton(row,['4']),hasPermi:'eam:equipmentSpotCheckMain:update'}), // 执行
+    defaultButtons.mainListCancelBtn({hide: isShowStatusButton(row,['5']),hasPermi:'eam:equipmentSpotCheckMain:update'}), //作废
     defaultButtons.mainListFinishBtn({hide: isShowStatusButton(row,['5']),hasPermi:'eam:equipmentSpotCheckMain:update'}), // 完成点检
     defaultButtons.mainListValidateBtn({hide: isShowStatusButton(row,['6']),hasPermi:'eam:equipmentSpotCheckMain:update'}), // 验证
     //defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'eam:equipmentSpotCheckMain:update'}),
@@ -211,6 +213,8 @@ const buttonTableClick = async (val, row) => {
     handleFinish(row)
   } else if (val == 'validate') { // 验证
     handleValidate(row)
+  } else if (val == 'cancel') { // 作废
+    handleCancel(row.id)
   }
 }
 
@@ -389,6 +393,25 @@ const handleValidate = async (row) => {
 
 }
 
+/** 作废按钮操作 */
+const handleCancel = async (id: number) => {
+  try {
+    // 二次确认
+    await message.delConfirm('是否作废所选中任务？');
+    const params = ref({
+      id: '',
+      status:'',
+    })
+    params.value.id = id
+    params.value.status = '8'
+    // 发起
+    await EquipmentSpotCheckMainApi.updateEquipmentSpotCheckOrder(params.value)
+    message.success(t('执行成功'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
 
 const detailBasicFormOnChange = (field, item) => {
   //异常
diff --git a/src/views/eam/planInspection/index.vue b/src/views/eam/planInspection/index.vue
index 1eef0e612..237c839f1 100644
--- a/src/views/eam/planInspection/index.vue
+++ b/src/views/eam/planInspection/index.vue
@@ -159,7 +159,7 @@ const isShowStatusButton = (row,val) => {
 // 列表-操作按钮
 const butttondata = (row) => {
   return [
-    defaultButtons.mainListEditBtn({hasPermi:'eam:planInspection:update'}), // 编辑
+    defaultButtons.mainListEditBtn({hide: isShowStatusButton(row,['0']),hasPermi:'eam:planInspection:update'}), // 编辑
     defaultButtons.mainListAuditingBtn({hide: isShowStatusButton(row,['0']),hasPermi:'eam:planInspection:update'}), // 审核
     defaultButtons.mainListFinishBtn({hide: isShowStatusButton(row,['3']),hasPermi:'eam:planInspection:update'}), // 完成
     defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'eam:planInspection:update'}),
diff --git a/src/views/eam/planSpotCheck/index.vue b/src/views/eam/planSpotCheck/index.vue
index 9dae3f7bd..af5403b82 100644
--- a/src/views/eam/planSpotCheck/index.vue
+++ b/src/views/eam/planSpotCheck/index.vue
@@ -160,7 +160,7 @@ const isShowStatusButton = (row,val) => {
 // 列表-操作按钮
 const butttondata = (row) => {
   return [
-    defaultButtons.mainListEditBtn({hasPermi:'eam:planSpotCheck:update'}), // 编辑
+    defaultButtons.mainListEditBtn({hide: isShowStatusButton(row,['0']),hasPermi:'eam:planSpotCheck:update'}), // 编辑
     defaultButtons.mainListAuditingBtn({hide: isShowStatusButton(row,['0']),hasPermi:'eam:planSpotCheck:update'}), // 审核
     defaultButtons.mainListFinishBtn({hide: isShowStatusButton(row,['3']),hasPermi:'eam:planSpotCheck:update'}), // 完成
     defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'eam:planSpotCheck:update'}),

From f219e4c1959f66056d5220e9ce24f5a4d0668196 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 28 Jun 2024 16:01:51 +0800
Subject: [PATCH 059/408] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoiceRecordMain.data.ts         | 67 ++++++++++---------
 .../supplierinvoiceRequestMain.data.ts        |  3 +
 2 files changed, 39 insertions(+), 31 deletions(-)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
index 5314ed1dd..b330cc01c 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
@@ -99,6 +99,39 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     sortTableDefault:5,
     isSearch: true
   },
+  {
+    label: '未税差额',
+    field: 'beforeTaxDiffAmount',
+    formatter: accountantFormart,
+    table: {
+      width: 150
+    },
+    sortTableDefault:5,
+    isForm:false,
+    isTableForm:false
+  },
+  {
+    label: '税额差异',
+    field: 'taxAmountDiff',
+    formatter: accountantFormart,
+    table: {
+      width: 150
+    },
+    sortTableDefault:5,
+    isForm:false,
+    isTableForm:false
+  },
+  {
+    label: '价税合计差额',
+    field: 'totalTaxDiffAmount',
+    formatter: accountantFormart,
+    table: {
+      width: 150
+    },
+    sortTableDefault:5,
+    isForm:false,
+    isTableForm:false
+  },
   {
     label: '系统税额',
     field: 'taxAmount',
@@ -335,7 +368,8 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       value:[],
       component: 'DatePicker',
       componentProps: {
-        valueFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+        dateFormat: 'YYYY-MM-DD',
         type: 'daterange',
         defaultTime: [new Date('1 '), new Date('1 ')]
       }
@@ -614,36 +648,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false,
   },
-  {
-    label: '未税差额',
-    field: 'beforeTaxDiffAmount',
-    formatter: accountantFormart,
-    table: {
-      width: 150
-    },
-    isForm:false,
-    isTableForm:false
-  },
-  {
-    label: '税额差异',
-    field: 'taxAmountDiff',
-    formatter: accountantFormart,
-    table: {
-      width: 150
-    },
-    isForm:false,
-    isTableForm:false
-  },
-  {
-    label: '价税合计差额',
-    field: 'totalTaxDiffAmount',
-    formatter: accountantFormart,
-    table: {
-      width: 150
-    },
-    isForm:false,
-    isTableForm:false
-  },
+  
 ]))
 
 //表单校验
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index 7cb5c65d7..d2935dfe0 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -462,6 +462,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    sortTableDefault:5,
     form: {
       component: 'InputNumber',
       componentProps: {
@@ -478,6 +479,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    sortTableDefault:5,
     form: {
       component: 'InputNumber',
       componentProps: {
@@ -494,6 +496,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    sortTableDefault:5,
     isTableForm:false,
     form: {
       component: 'InputNumber',

From 57a128e154945175f7796e2efc3f1e81bdbb6f32 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 28 Jun 2024 16:11:04 +0800
Subject: [PATCH 060/408] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=8D=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index ae6ec243e..c1de69762 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@@ -185,6 +185,7 @@ const getSearchTableData = async (number,formField,searchField)=>{
     defaultParams:{number},
     getListApi: PurchaseDetailApi.getPurchaseDetailPagePoNumber // 分页接口
   })
+  tableObject.pageSize = 500
   // 获得表格的各种操作
   const { getList:getList1 } = tableMethods
   await getList1()

From c4e6dbf5a73304d89515b1c87be0d08f8bb7e1c0 Mon Sep 17 00:00:00 2001
From: bjang03 <259278618@qq.com>
Date: Fri, 28 Jun 2024 16:50:36 +0800
Subject: [PATCH 061/408] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8D=E7=9B=98?=
 =?UTF-8?q?=E7=82=B9=E8=AE=A1=E5=88=92=E7=BC=96=E8=BE=91=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=B2=A1=E6=9C=89=E4=BF=AE=E6=94=B9=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AEBUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicFormWmsCount.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/BasicForm/src/BasicFormWmsCount.vue b/src/components/BasicForm/src/BasicFormWmsCount.vue
index 97eccb7a1..9b7543781 100644
--- a/src/components/BasicForm/src/BasicFormWmsCount.vue
+++ b/src/components/BasicForm/src/BasicFormWmsCount.vue
@@ -757,7 +757,7 @@ const submitForm = async () => {
       try {
         const data = unref(formRef)?.formModel
         const data1 = unref(formRef1)?.formModel
-        emit('submitForm', formType.value, {...data,...data1})
+        emit('submitForm', formType.value, {...data})
       } finally {
         formLoading.value = false
       }

From ec0e85d799bde7458f5db6dff542141db08dddde Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 28 Jun 2024 17:11:33 +0800
Subject: [PATCH 062/408] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E4=BD=99=E9=A2=9D=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/balance/index.ts                  |  2 +-
 src/api/wms/business/business.ts              | 59 ++++++++++---------
 src/components/TableForm/src/TableForm.vue    |  2 +-
 .../eam/equipmentRepairRecordMain/index.vue   |  2 +-
 .../scrapRequestMain/scrapRequestMain.data.ts |  1 -
 .../transferissueRequestMain.data.ts          |  1 -
 .../inventorychangeRequestMain.data.ts        |  2 -
 .../inventorymoveRequestMain.data.ts          |  1 -
 .../productdismantleRequestMain.data.ts       |  1 -
 9 files changed, 34 insertions(+), 37 deletions(-)

diff --git a/src/api/wms/balance/index.ts b/src/api/wms/balance/index.ts
index 9dab845d5..fbca93edf 100644
--- a/src/api/wms/balance/index.ts
+++ b/src/api/wms/balance/index.ts
@@ -192,5 +192,5 @@ export const getBalanceByBusinessTypeByItemType = async (params) => {
 }
 // 根据code获取数据列表
 export const getBalanceItemListByCodes = async (data) => {
-    return await request.get({ url: `/wms/balance/listByCodes?itemCode=` +( data.itemCode?data.itemCode:'') +  '&batch='+(data.batch?data.batch:'')  +  '&locationCode='+(data.locationCode?data.locationCode:'' )  +  '&packingNumber='+(data.packingNumber?data.packingNumber:'') +  '&warehouseCode='+(data.warehouseCode?data.warehouseCode:'')   })
+    return await request.get({ url: `/wms/balance/listByCodes`,data })
   }
\ No newline at end of file
diff --git a/src/api/wms/business/business.ts b/src/api/wms/business/business.ts
index fa9deea44..6329afa0b 100644
--- a/src/api/wms/business/business.ts
+++ b/src/api/wms/business/business.ts
@@ -139,20 +139,20 @@ export const tableFormBlurVer = async (headerItem, val, row, index,routeName,for
           routeName == 'InventorymoveRequestMain' ||
           routeName == 'InventorychangeRequestMain'
         ) {
-          //合格转隔离,隔离转合格，隔离转报废，合格转报废，报废转隔离，库存移动申请参数稍有不同
-          if (
-            routeName == 'OktoholdRequestMain' ||
-            routeName == 'HoldtookRequestMain' ||
-            routeName == 'HoldtoscrapRequestMain' ||
-            routeName == 'OktoscrapRequestMain' ||
-            routeName == 'ScraptoholdRequestMain' ||
-            routeName == 'InventorymoveRequestMain' ||
-            routeName == 'InventorychangeRequestMain'
-          ) {
-            searchField = 'packingNumber'
-            params.value.packingNumber = val?.trim()
-          }
-          pageApi.value = getBalanceItemListByCodes
+          // //合格转隔离,隔离转合格，隔离转报废，合格转报废，报废转隔离，库存移动申请参数稍有不同
+          // if (
+          //   routeName == 'OktoholdRequestMain' ||
+          //   routeName == 'HoldtookRequestMain' ||
+          //   routeName == 'HoldtoscrapRequestMain' ||
+          //   routeName == 'OktoscrapRequestMain' ||
+          //   routeName == 'ScraptoholdRequestMain' ||
+          //   routeName == 'InventorymoveRequestMain' ||
+          //   routeName == 'InventorychangeRequestMain'
+          // ) {
+          //   searchField = 'packingNumber'
+          //   params.value.packingNumber = val?.trim()
+          // }
+          // pageApi.value = getBalanceItemListByCodes
         } else if (
           routeName == 'RepleinshRequestMain' ||
           routeName == 'IssueRequestMain' ||
@@ -297,12 +297,13 @@ export const FormBlur = async (formField, val,routeName,formRef,detailData,formS
           packUnit: val.trim()
         }
         pageApi.value = getItemPackageunitListByCodes
-      } else if (formField == 'fromPackingNumber') {
-        params.value = {
-          packingNumber: val?.trim()
-        }
-        pageApi.value = getBalanceItemListByCodes
-      }
+      } 
+      // else if (formField == 'fromPackingNumber') {
+      //   params.value = {
+      //     packingNumber: val?.trim()
+      //   }
+      //   pageApi.value = getBalanceItemListByCodes
+      // }
       let obj = {}
       let searchCondition1 = formSchema.find((item) => item.field == formField).componentProps
         .searchCondition //获取data.ts参数信息
@@ -415,14 +416,16 @@ export const getListByBottonInput = async (headerItem, val,row,routeName,formRef
       customerCode: formRef.formModel.customerCode,
       itemCodes: val?.trim()
     }
-  } else if (routeName == 'UnplannedissueRequestMain') {
-    // 计划外出库
-    pageApi.value = getBalanceItemListByCodes
-    params.value = {
-      packingNumber: val?.trim()
-    }
-    field = 'packingNumber'
-  } else {
+  } 
+  // else if (routeName == 'UnplannedissueRequestMain') {
+  //   // 计划外出库
+  //   pageApi.value = getBalanceItemListByCodes
+  //   params.value = {
+  //     packingNumber: val?.trim()
+  //   }
+  //   field = 'packingNumber'
+  // } 
+  else {
     params.value.codes = val?.trim()
     pageApi.value = getItemListByCodes
   }
diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue
index 5de9de0c5..c72d90387 100644
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@@ -333,7 +333,7 @@
         <Icon icon="ep:delete" color="#409eff" size="26" style="cursor: pointer;" />
         <div>{{t('ts.批量删除')}}</div>
       </div>
-      <div class="p-12px" v-if="routeName == 'PurchaseMain'||routeName == 'ProductionMain'||routeName == 'ZZBJDeliverPlanMain'||routeName == 'DeliverPlanMain'||routeName == 'DeliverRequestMain'||routeName == 'ZZBJDeliverRequestMain'||routeName == 'UnplannedissueRequestMain'||routeName == 'UnplannedreceiptRequestMain'">
+      <div class="p-12px" v-if="routeName == 'PurchaseMain'||routeName == 'ProductionMain'||routeName == 'ZZBJDeliverPlanMain'||routeName == 'DeliverPlanMain'||routeName == 'DeliverRequestMain'||routeName == 'ZZBJDeliverRequestMain'||routeName == 'UnplannedreceiptRequestMain'">
         <el-input v-model="keyWord" style="width: 240px" placeholder="回车自动添加"/>
         <el-button type="primary" style="margin-left: 10px" @click="batchAdd">{{t('批量添加')}}</el-button>
       </div>
diff --git a/src/views/eam/equipmentRepairRecordMain/index.vue b/src/views/eam/equipmentRepairRecordMain/index.vue
index 91aa00756..61a18bc9b 100644
--- a/src/views/eam/equipmentRepairRecordMain/index.vue
+++ b/src/views/eam/equipmentRepairRecordMain/index.vue
@@ -240,7 +240,7 @@ const openRepairExperience = (type: string, row?: any) => {
 const repairExperienceFormsSuccess = async (formType, data) => {
   console.log(data)
   const data1 = {
-    repairNumber: data.number,
+    repairRecordNumber: data.recordNo,
     name: data.name,
     content: data.content,
     masterId: data.id,
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
index b50d7e642..fe6c6a315 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
@@ -480,7 +480,6 @@ export const ScrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     tableForm:{
-      enterSearch:true,
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择包装号',
       searchField: 'packingNumber',
diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
index 35679ae33..dd7828519 100644
--- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
@@ -619,7 +619,6 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
     tableForm:{
-      enterSearch:true,
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择包装号',
       searchField: 'packingNumber',
diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
index 23b28a715..74acc42bd 100644
--- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
@@ -383,7 +383,6 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       width: 150
     },
     tableForm:{
-      enterSearch:true,
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择从包装号',
       searchField: 'packingNumber',
@@ -401,7 +400,6 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
-        enterSearch:true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择从包装号',
         searchField: 'packingNumber',
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
index e09581ffd..8a52a684d 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
@@ -545,7 +545,6 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
     tableForm:{
-      enterSearch:true,
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择从包装号',
       searchField: 'packingNumber',
diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
index 4c03cc5d0..c40d77a5f 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
@@ -605,7 +605,6 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
       width: 150
     },
     tableForm:{
-      enterSearch:true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择包装号',
       searchField: 'packingNumber',

From 2c16f88085a21ce716b2708ad63ab46071ea9416 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Fri, 28 Jun 2024 19:26:50 +0800
Subject: [PATCH 063/408] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E5=9C=A8=E9=83=A8=E5=88=86=E5=AE=8C=E6=88=90=E6=97=B6=E5=85=81?=
 =?UTF-8?q?=E8=AE=B8=E6=98=BE=E7=A4=BA=E2=80=98=E5=A4=84=E7=90=86=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
index 6ca2b1e18..f46c3e11d 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
@@ -290,7 +290,7 @@ const butttondata = (row,$index) => {
         defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:deliver-request-main:submit'}), // 提交审批
         defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:deliver-request-main:refused'}), // 驳回
         defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:deliver-request-main:agree'}), // 审批通过
-        defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:deliver-request-main:handle'}), // 处理
+        defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3','7']),hasPermi:'wms:deliver-request-main:handle'}), // 处理
         defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:deliver-request-main:update'}), // 编辑
         // defaultButtons.mainListDeleteBtn({hasPermi:'wms:deliver-request-main:delete'}), // 删除
     ]

From 82a108c0acb8dd48b8a755e418fad8687595ad0d Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Fri, 28 Jun 2024 19:43:00 +0800
Subject: [PATCH 064/408] =?UTF-8?q?=E6=8B=92=E6=94=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/purchasereceiptRecordMain.data.ts
index fb416087b..952a908bc 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/purchasereceiptRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/purchasereceiptRecordMain.data.ts
@@ -776,7 +776,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:1004
   },
   {
-    label: '收货数量',
+    label: '拒收数量',
     field: 'qty',
     sort: 'custom',
     table: {

From 45a18c6e66a7715292be7e041942a19b334de76b Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Fri, 28 Jun 2024 19:56:43 +0800
Subject: [PATCH 065/408] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processproductionRecordMain.data.ts       | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/productionManage/processproduction/processproductionRecord/processproductionRecordMain.data.ts b/src/views/wms/productionManage/processproduction/processproductionRecord/processproductionRecordMain.data.ts
index 85ab46da6..ba0c04612 100644
--- a/src/views/wms/productionManage/processproduction/processproductionRecord/processproductionRecordMain.data.ts
+++ b/src/views/wms/productionManage/processproduction/processproductionRecord/processproductionRecordMain.data.ts
@@ -53,7 +53,16 @@ export const ProcessproductionRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
-    isTable:false,
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
   },
   {
     label: '备注',
@@ -318,6 +327,16 @@ export const ProcessproductionRecordDetail = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 150
     },
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
   },
   {
     label: '备注',

From e18d75a904e0b222a30a1e2e99cf28be0986d242 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Fri, 28 Jun 2024 20:18:34 +0800
Subject: [PATCH 066/408] =?UTF-8?q?=E9=9A=90=E8=97=8F=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E5=BA=93=E5=8C=BA=E9=85=8D=E7=BD=AE=E5=87=BA=E5=85=A5=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E8=BD=AC=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../itemManage/itemarea/itemarea.data.ts      | 80 +++++++++----------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
index f74b10159..d68758f60 100644
--- a/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
@@ -290,46 +290,46 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
  
-  {
-    label: '入库自动转为出库包装规格',
-    field: 'newlyToOutpackunit',
-    sort: 'custom',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    // colorType: 'danger',
-    isTable: true,
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
-      }
-    },
-  },
-  {
-    label: '出库自动转为出库包装规格',
-    field: 'surplusToOutpackunit',
-    sort: 'custom',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    // colorType: 'danger',
-    isTable: true,
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
-      }
-    },
-  },
+  // {
+  //   label: '入库自动转为出库包装规格',
+  //   field: 'newlyToOutpackunit',
+  //   sort: 'custom',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   // colorType: 'danger',
+  //   isTable: true,
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: 'TRUE',
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE'
+  //     }
+  //   },
+  // },
+  // {
+  //   label: '出库自动转为出库包装规格',
+  //   field: 'surplusToOutpackunit',
+  //   sort: 'custom',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   // colorType: 'danger',
+  //   isTable: true,
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: 'TRUE',
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE'
+  //     }
+  //   },
+  // },
   {
     label: '需要接收确认',
     field: 'needReceive',

From 60f3739fd6db8b6629ea9b9d132746d45f7b555d Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Sat, 29 Jun 2024 11:18:47 +0800
Subject: [PATCH 067/408] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E8=80=85=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E6=97=B6=E9=97=B4=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../countManage/count/countJobMain/countJobMain.data.ts    | 4 ++--
 .../countManage/count/countPlanMain/countPlanMain.data.ts  | 7 ++++---
 .../scrap/scrapJobMain/scrapJobMain.data.ts                | 4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts b/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts
index 1c28a6796..5768ef3fb 100644
--- a/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts
+++ b/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts
@@ -476,7 +476,7 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isTable:false,
+    isTable:true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -493,7 +493,7 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isTable:false,
+    isTable:true,
   },
   {
     label: '操作',
diff --git a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
index b8c7cfaed..c38290b92 100644
--- a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
+++ b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
@@ -280,7 +280,7 @@ export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isTable:false,
+    isTable:true,
     isForm: false,
   },
   {
@@ -303,7 +303,7 @@ export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
-    isTable:false,
+    isTable:true,
     isForm: false,
   },
   {
@@ -462,6 +462,7 @@ export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     isForm: false,
+    isTable: false,
   },
   {
     label: '最后更新者',
@@ -828,7 +829,7 @@ export const CountPlanMain1 = useCrudSchemas(reactive<CrudSchema[]>([
         searchTitle: '库位信息', // 查询弹窗标题
         searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
         searchPage: LocationApi.getLocationPage // 查询弹窗所需分页方法
-        
+
       }
     }
   },
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
index 4e83e7b06..d98bb5715 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
@@ -730,7 +730,7 @@ export const ScrapJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
-    isTable: false,
+    isTable: true,
   },
   {
     label: '创建者',
@@ -739,7 +739,7 @@ export const ScrapJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isTable: false,
+    isTable: true,
   },
 ]))
 

From 0e8ae183ef1c4b01cb3bd51b3371c57e64ec9126 Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Sat, 29 Jun 2024 11:19:35 +0800
Subject: [PATCH 068/408] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sparepartsrequisitionRecordMain/index.vue              | 1 +
 .../sparepartsrequisitionRequestMain/index.vue             | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue
index f3fa14b88..327a991b8 100644
--- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue
@@ -155,6 +155,7 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    tableObject.params.detailDataType = 2
     const data = await UnplannedissueRecordMainApi.exportUnplannedissueRecordMain(tableObject.params)
     download.excel(data, '计划外出库记录主.xlsx')
   } catch {
diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
index deda16647..bc3ae5443 100644
--- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
@@ -80,7 +80,7 @@
   />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/wms/unplannedissue-request-main/importSpare" :importTemplateData="importTemplateData" 
+  <ImportForm ref="importFormRef" url="/wms/unplannedissue-request-main/importSpare" :importTemplateData="importTemplateData"
   @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
 </template>
 
@@ -343,7 +343,7 @@ const openForm =async (type: string, row?: number) => {
         item.componentProps.isSearchList = false
         item.componentProps.disabled = true
       }
-      
+
     }else{
       if (item.field == 'costCenterCode') {
         //成本中心代码
@@ -393,6 +393,7 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    tableObject.params.detailDataType = 2
     const data = await UnplannedissueRequestMainApi.exportUnplannedissueRequestMain(tableObject.params)
     download.excel(data, '备件领用申请.xlsx')
   } catch {
@@ -426,7 +427,7 @@ const tableSelectionDelete = (selection) => {
 }
 // 主子数据 提交
 const submitForm = async (formType, submitData) => {
- 
+
   let data = {...submitData}
   if(data.masterId){
     data.id = data.masterId

From adb1c5ca7b59c9fc3faf8e17fa3bb9203356f090 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Sat, 29 Jun 2024 11:56:13 +0800
Subject: [PATCH 069/408] =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=20=E6=98=BE=E7=A4=BA=E5=8C=85=E8=A3=85?=
 =?UTF-8?q?=E8=A7=84=E6=A0=BC=E5=8F=8A=E5=8C=85=E8=A3=85=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productputawayJobMain.data.ts             | 32 +++++++++----------
 .../productputawayRecordMain.data.ts          | 32 +++++++++----------
 .../productputawayAssembleJobMain.data.ts     | 32 +++++++++----------
 .../productputawayAssembleRecordMain.data.ts  | 32 +++++++++----------
 4 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts
index bed4de6a6..ddf7b4a66 100644
--- a/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts
+++ b/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts
@@ -688,22 +688,22 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  // {
-  //   label: '包装规格',
-  //   field: 'packUnit',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
-  // {
-  //   label: '包装数量',
-  //   field: 'packQty',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '计量单位',
     field: 'uom',
diff --git a/src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts
index f3dea059e..e75ab2f4b 100644
--- a/src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts
+++ b/src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts
@@ -456,22 +456,22 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     // },
     sortTableDefault:3,
   },
-  // {
-  //   label: '包装规格',
-  //   field: 'packUnit',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
-  // {
-  //   label: '包装数量',
-  //   field: 'packQty',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '计量单位',
     field: 'uom',
diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/productputawayAssembleJobMain.data.ts b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/productputawayAssembleJobMain.data.ts
index ed167fa55..0a0b7420b 100644
--- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/productputawayAssembleJobMain.data.ts
+++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/productputawayAssembleJobMain.data.ts
@@ -658,22 +658,22 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  // {
-  //   label: '包装规格',
-  //   field: 'packUnit',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
-  // {
-  //   label: '包装数量',
-  //   field: 'packQty',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '计量单位',
     field: 'uom',
diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/productputawayAssembleRecordMain.data.ts b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/productputawayAssembleRecordMain.data.ts
index cfbb71516..97e3193eb 100644
--- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/productputawayAssembleRecordMain.data.ts
+++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/productputawayAssembleRecordMain.data.ts
@@ -456,22 +456,22 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     },
     sortTableDefault:3,
   },
-  // {
-  //   label: '包装规格',
-  //   field: 'packUnit',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
-  // {
-  //   label: '包装数量',
-  //   field: 'packQty',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '计量单位',
     field: 'uom',

From 8361634d21966e66e954765f023a8f23067d0ac4 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Sat, 29 Jun 2024 13:01:38 +0800
Subject: [PATCH 070/408] =?UTF-8?q?=E5=8D=95=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts
index 3024c7a55..8b51c9881 100644
--- a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts
@@ -495,7 +495,7 @@ export const rules = reactive({
     { required: true, message: '请选择计量单位', trigger: 'change' },
   ],
   altUom:  [
-    { required: true, message: '请选择替代计量单位', trigger: 'change' },
+    { required: false, message: '请选择替代计量单位', trigger: 'change' },
   ],
   isStdPack:  [
     { required: true, message: '请选择是否标包', trigger: 'change' },

From b28721739bc29ce2b99180358f7011e707bd3832 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Sat, 29 Jun 2024 13:54:55 +0800
Subject: [PATCH 071/408] =?UTF-8?q?=E8=AE=A1=E5=88=92=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

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

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
index f5745626b..b89fe91d3 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
@@ -104,9 +104,11 @@ const openFormByCreate = async ( data ) => {
 
     // 设置计划到货时间
     let beginTime =  data['endTime']
-    let deliveryDate =  formatDate(data['deliveryDate'],'YYYY-MM-DD')
-    planArriveTimeStr.value = deliveryDate + ' '+ beginTime+":00"
-    setV['planArriveTime']= new Date(planArriveTimeStr.value).valueOf();
+    if(data['deliveryDate']){
+      let deliveryDate =  formatDate(data['deliveryDate'],'YYYY-MM-DD')
+      planArriveTimeStr.value = deliveryDate + ' '+ beginTime+":00"
+      setV['planArriveTime']= new Date(planArriveTimeStr.value).valueOf();
+    }
     formRef.value.open('create', null)
 
     // 根据供应商代码获取联系人信息

From 2f5b4e5487159560eaead8c0723a0c20c2ebf468 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Sat, 29 Jun 2024 14:54:43 +0800
Subject: [PATCH 072/408] =?UTF-8?q?=E5=8F=91=E7=A5=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Detail/src/Detail.vue            | 17 +++++++++++++----
 .../supplierinvoiceRecordMain/index.vue         | 14 ++++++++++++++
 .../supplierinvoiceRecordMain.data.ts           | 14 +++++++++++++-
 .../supplierinvoiceRequestMain/index.vue        |  6 ++++++
 .../supplierinvoiceRequestMain.data.ts          |  2 +-
 5 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue
index 07411ee65..52b781867 100644
--- a/src/components/Detail/src/Detail.vue
+++ b/src/components/Detail/src/Detail.vue
@@ -135,7 +135,7 @@
 
         </div>
         <!-- 附件/备注/变更记录 -->
-        <ContentWrap class="w-[100%]" v-show="tabsList[current].label==annexAlias.label" :style="{height:remarkHeight+'px'}">
+        <ContentWrap v-if="!annexAlias.hidden" class="w-[100%]" v-show="tabsList[current].label==annexAlias.label" :style="{height:remarkHeight+'px'}">
           <!-- 附件组件 -->
           <ElScrollbar ref="scrollbar" :style="{height:(remarkHeight-40)+'px'}">
             <Annex
@@ -150,7 +150,6 @@
           </ElScrollbar> 
         </ContentWrap>
         <ContentWrap class="w-[100%]" v-show="tabsList[current].label=='备注'" :style="{height:remarkHeight+'px'}">
-          <!-- 附件组件 -->
           <ElScrollbar ref="scrollbar" :style="{height:(remarkHeight-40)+'px'}">
             <!-- 备注组件 -->
             <Remarks
@@ -162,7 +161,6 @@
           </ElScrollbar> 
         </ContentWrap>
         <ContentWrap class="w-[100%]" v-show="tabsList[current].label=='变更记录'" :style="{height:remarkHeight+'px'}">
-          <!-- 附件组件 -->
           <ElScrollbar ref="scrollbar" :style="{height:(remarkHeight-40)+'px'}">
             <!-- 变更记录组件 -->
             <ChangeRecord :changeRecordData="changeRecordData" class="mt-20px"  :key="count"/>
@@ -240,6 +238,7 @@ const props = defineProps({
     type: Object,
     required: false,
     default: ()=>({
+      hidden:false,
       label: '附件',
       showDownload:false,
       showPreview:false,
@@ -433,7 +432,8 @@ if (props.isBasic == true) {
   }
 }
 
-const otherList = [...props.annexTable,{
+
+let otherList = [...props.annexTable,{
     label:props.annexAlias.label,
     prop:'Annex'
   },{
@@ -443,6 +443,15 @@ const otherList = [...props.annexTable,{
     label:'变更记录',
     prop:'ChangeRecord'
 }]
+if(props.annexAlias.hidden){
+  otherList = [...props.annexTable,{
+      label:'备注',
+      prop:'Remarks'
+    },{
+      label:'变更记录',
+      prop:'ChangeRecord'
+  }]
+}
 tabsList.value = [...tabsList?.value,...otherList]
 
 if (!tabsList.value || tabsList.value && tabsList.value.length == otherList.length) {
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
index 4f7eb706c..91eabd141 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
@@ -88,8 +88,19 @@
         queryField:'tableId',
         rowField:'annexMasterId',
       }],
+    },{
+      label: t('ts.其他附件'),
+      prop: 'Annex',
+      tableName:'invoiceOther',
+      showDownload:true,
+      hiddenDelete:true,
+      queryParams:[{
+        queryField:'tableId',
+        rowField:'annexMasterId',
+      }],
     }]"
     :annexAlias="{
+      hidden:true,
       label:t('ts.其他附件'),
       showDownload:true,
       hiddenDelete:true
@@ -224,6 +235,9 @@ const openDetail = async (row: any, titleName: any, titleValue: any) => {
   detailRef.value.openDetail(row, titleName, titleValue)
 }
 const searchList = (model)=>{
+  if(model.postingDate){
+    model.postingDate[1] = model.postingDate[1].replace('00:00:00','23:59:59')
+  }
   selectionRows.value = []
   setSearchParams(model)
 }
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
index b330cc01c..a0db79bc5 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
@@ -14,6 +14,18 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180,
       fixed: 'left'
     },
+    isSearch: false
+  },
+  {
+    label: '发票申请单号',
+    field:'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    sortSearchDefault:1,
+    sortTableDefault:1,
     isSearch: true
   },
   {
@@ -368,7 +380,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       value:[],
       component: 'DatePicker',
       componentProps: {
-        valueFormat: 'x',
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
         dateFormat: 'YYYY-MM-DD',
         type: 'daterange',
         defaultTime: [new Date('1 '), new Date('1 ')]
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 354b5ed15..fc389e9d7 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -137,6 +137,7 @@
     fieldTableColumn="poLine"
     :annexTable="detailAnnexTable"
     :annexAlias="{
+      hidden:true,
       label:t('ts.其他附件')
     }"
     :otherHeadButttonData="[{
@@ -645,6 +646,11 @@ const handleImport = () => {
     prop: 'Annex',
     tableName:'waybill',
     fileSize:20
+  },{
+    label: t('ts.其他附件'),
+    prop: 'Annex',
+    tableName:'invoiceOther',
+    fileSize:20
   }])
   const openDetail = (row : any, titleName : any, titleValue : any) => {
     const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index d2935dfe0..60cf625fb 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -1045,7 +1045,7 @@ export const SupplierinvoiceRequestFinance = useCrudSchemas(reactive<CrudSchema[
         style: {width:'100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
       }
     },
   },

From 35d34745950f32e1901d80cf1f6223db17df37d0 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Sat, 29 Jun 2024 14:58:53 +0800
Subject: [PATCH 073/408] =?UTF-8?q?=E6=9D=A8=E7=8E=89=E7=A6=8F=E6=8F=90?=
 =?UTF-8?q?=E7=9A=84=E6=94=B9=E7=9A=84=E5=90=8D=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index 60cf625fb..a7b0900af 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -385,7 +385,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
   //   }
   // },
   {
-    label: '折扣金额',
+    label: '调整价差',
     field: 'discountAmount1',
     formatter: accountantFormart,
     table: {

From 44af11e6ffab07993d79bc51ac5a1ed74dd80cd4 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Sat, 29 Jun 2024 15:14:56 +0800
Subject: [PATCH 074/408] =?UTF-8?q?=E8=B4=A7=E5=B8=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoiceRecordMain/index.vue       |  4 +--
 .../supplierinvoiceRequestMain/index.vue      |  2 ++
 .../supplierinvoiceRequestMain.data.ts        | 36 ++++++++++---------
 3 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
index 91eabd141..1a15570de 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
@@ -225,9 +225,7 @@ const openDetail = async (row: any, titleName: any, titleValue: any) => {
   requestTableObject.params.number = row.requestNumber
   await requestGetList()
   if(requestTableObject.tableList.length>0){
-    // row.annexMasterId = requestTableObject.tableList[0].masterId
-    row.annexMasterId = row.id
-
+    row.annexMasterId = requestTableObject.tableList[0].masterId
   }
 
 
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index fc389e9d7..003d4a688 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -342,6 +342,8 @@ const searchTableSuccessDetail = async (formField, searchField, val, formRef,sea
             newRow['deliveryDate'] = item['prhRcpDate']
             newRow['arrivalQty'] = item['prhRcvd']
             newRow['id'] = item['id']
+            newRow['currency'] = item['currency']
+            
           }
           tableData.value.push(newRow)
         })
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index a7b0900af..265581d6c 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -117,6 +117,10 @@ export const PurchaseReceiptOrReturnRecordDetail = useCrudSchemas(reactive<CrudS
     label: '可开票数量',
     field: 'invoicableQuantity'
   },
+  {
+    label: '货币',
+    field: 'currency',
+  },
   {
     label: '物料代码',
     field: 'itemCode'
@@ -385,7 +389,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
   //   }
   // },
   {
-    label: '调整价差',
+    label: '折扣金额',
     field: 'discountAmount1',
     formatter: accountantFormart,
     table: {
@@ -1438,21 +1442,21 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     
   },
   
-  // {
-  //   label: '货币',
-  //   field: 'currency',
-  //   table: {
-  //     width: 150
-  //   },
-  //   form: {
-  //     componentProps: {
-  //       disabled: true
-  //     }
-  //   },
-  //   tableForm:{
-  //     disabled: true
-  //   }
-  // },
+  {
+    label: '货币',
+    field: 'currency',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
   {
     label: '备注',
     field: 'remark',

From 1d9582031affebd50042a979757b5eff3a21d860 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Sat, 29 Jun 2024 16:17:10 +0800
Subject: [PATCH 075/408] length

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

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
index 1a15570de..607b1656b 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
@@ -233,7 +233,7 @@ const openDetail = async (row: any, titleName: any, titleValue: any) => {
   detailRef.value.openDetail(row, titleName, titleValue)
 }
 const searchList = (model)=>{
-  if(model.postingDate){
+  if(model.postingDate&&model.postingDate.length>1){
     model.postingDate[1] = model.postingDate[1].replace('00:00:00','23:59:59')
   }
   selectionRows.value = []

From 559ce1c773331d68b08f195b7a3350c82eee3860 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Sat, 29 Jun 2024 16:38:25 +0800
Subject: [PATCH 076/408] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=A8=8E=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoice/supplierinvoiceRequestMain/index.vue      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 003d4a688..ffa39066f 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -93,8 +93,10 @@
     
     :sumFormDataByTableCustom ="(formRef,formModel,tableData)=>{
         // 1、系统未税金额： 合同价格X可开票数量。每条数据的合同价格X可开票数量，计算结果取两位小数之后，求和
+        const {taxRate=0} = formModel
         const sumObject = {
-          amount:tableData.reduce((prev, item) => prev + Number(Number(item['singlePrice']*item['invoicableQuantity']).toFixed(2)),0)
+          amount:tableData.reduce((prev, item) => prev + Number(Number(item['singlePrice']*item['invoicableQuantity']).toFixed(2)),0),
+          taxAmount:tableData.reduce((prev, item) => prev + Number(Number(taxRate*0.01*Number(Number(item['singlePrice']*item['invoicableQuantity']).toFixed(2))).toFixed(2)),0)
         }
         formRef.value.setValues(sumObject)
     }"

From f84817c3a133f7f620006b99b8ca63361a0e0b7a Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 1 Jul 2024 09:42:34 +0800
Subject: [PATCH 077/408] =?UTF-8?q?=E7=9B=98=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../count/countPlanMain/countPlanMain.data.ts     | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
index c38290b92..124281f36 100644
--- a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
+++ b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
@@ -55,6 +55,21 @@ export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
+    form:{
+      componentProps:{
+        disabled:true
+      }
+    }
+  },
+  {
+    label: '执行周期',//执行周期
+    field: 'crontab',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm:false,
     form:{
       componentProps:{
         disabled:true

From 04153295810de16496f18836d7f263c9f8e56d52 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Mon, 1 Jul 2024 10:33:00 +0800
Subject: [PATCH 078/408] =?UTF-8?q?=E5=A4=87=E8=B4=A7=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
index e62e7f75e..7cd4f747d 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
@@ -611,7 +611,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
       searchField: 'code',
       searchTitle: '物料基础信息',
       searchAllSchemas: Itembasic.allSchemas,
-      searchPage: ItemBasicApi.getItembasicPage,
+      searchPage: ItemBasicApi.selectItembasicPageToFgAndSemibasicPage,
       searchCondition: [{
         key: 'available',
         value: 'TRUE',
@@ -625,7 +625,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
         searchField: 'itemCode',
         searchTitle: '物料基础信息',
         searchAllSchemas: Itembasic.allSchemas,
-        searchPage: ItemBasicApi.getItembasicPage,
+        searchPage: ItemBasicApi.selectItembasicPageToFgAndSemibasicPage,
         searchCondition: [{
           key: 'available',
           value: 'TRUE',

From 5b627d555717e68ad76c1734eda5abf2553cf43b Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Mon, 1 Jul 2024 10:46:51 +0800
Subject: [PATCH 079/408] =?UTF-8?q?=E7=94=9F=E6=88=90=E4=BF=9D=E5=85=BB?=
 =?UTF-8?q?=E7=BB=8F=E9=AA=8C=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=8C=E7=BB=84=E4=BB=B6=E4=B8=8D=E5=8F=AF=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/eam/repairExperience/index.ts         |  2 +-
 src/components/TableForm/src/TableForm.vue    |  7 +++--
 .../equipmentMaintenanceRecordMain/index.vue  | 29 +++++++++++++------
 .../eam/equipmentRepairRecordMain/index.vue   | 28 +++++++++++++-----
 4 files changed, 46 insertions(+), 20 deletions(-)

diff --git a/src/api/eam/repairExperience/index.ts b/src/api/eam/repairExperience/index.ts
index 5433a47c8..b0fe57f6b 100644
--- a/src/api/eam/repairExperience/index.ts
+++ b/src/api/eam/repairExperience/index.ts
@@ -4,7 +4,7 @@ export interface RepairExperienceVO {
   id: number
   name: string
   content: string
-  repairNumber: string
+  repairRecordNumber: string
 }
 
 // 查询维修经验记录列表
diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue
index c72d90387..778cdba15 100644
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@@ -66,7 +66,7 @@
               clearable
               :type="headerItem?.tableForm?.inputType"
               :placeholder="t(`ts.${headerItem?.tableForm?.placeholder || '请输入' + headerItem.label}`).replace('ts.','')"
-              :disabled="disabledInput(headerItem)"
+              :disabled="disabledInput(headerItem,row)"
               style="flex:1" 
               @blur="inputStringBlur(headerItem, row[headerItem.field], row,index)"
             />
@@ -576,7 +576,7 @@ const batchAdd = ()=>{
 console.log(field)
   emit('batchAdd',keyWord.value)
 }
-const disabledInput=(headerItem)=>{
+const disabledInput=(headerItem,row)=>{
    if(headerItem.tableForm?.isInpuFocusShow){
     if(headerItem.tableForm?.enterSearch){
       return false
@@ -584,9 +584,10 @@ const disabledInput=(headerItem)=>{
       return true
     }
   }else{
-   return headerItem?.tableForm?.disabled || true
+   return headerItem?.tableForm?.disabled || Boolean(row.disabled) || Boolean(row['disabled_' + headerItem.field]) ||false
   }
 }
+
 // setup 语法糖 抛出方法
 defineExpose({
   TableBaseComponents_Ref,
diff --git a/src/views/eam/equipmentMaintenanceRecordMain/index.vue b/src/views/eam/equipmentMaintenanceRecordMain/index.vue
index 228b3f7e9..1495f5c68 100644
--- a/src/views/eam/equipmentMaintenanceRecordMain/index.vue
+++ b/src/views/eam/equipmentMaintenanceRecordMain/index.vue
@@ -32,8 +32,8 @@
           <span>{{ row.recordNo }}</span>
         </el-button>
       </template>
-      <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      <template #action="{ row,$index }">
+        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -154,13 +154,24 @@ const buttonBaseClick = (val, item) => {
   }
 }
 
-// 列表-操作按钮
-const butttondata = [
-  //defaultButtons.mainListEditBtn({hasPermi:'eam:equipmentMaintenanceRecordMain:update'}), // 编辑
-  //defaultButtons.mainListDeleteBtn({hasPermi:'eam:equipmentMaintenanceRecordMain:delete'}), // 删除
-  defaultButtons.maintainExperienceBtn({ hasPermi: 'eam:equipmentMaintenanceRecordMain:maintainExperience' }) // 生成保养经验
-]
-
+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.repairExperienceBtn({ hide:isShowMainButton(row,['0']),hasPermi: 'eam:equipmentMaintenanceRecordMain:maintainExperience' }) // 生成维修经验
+    ]
+}
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  console.log(row.isExperience)
+  if (val.indexOf(row.isExperience) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
   if (val == 'edit') { // 编辑
diff --git a/src/views/eam/equipmentRepairRecordMain/index.vue b/src/views/eam/equipmentRepairRecordMain/index.vue
index 61a18bc9b..811f65fea 100644
--- a/src/views/eam/equipmentRepairRecordMain/index.vue
+++ b/src/views/eam/equipmentRepairRecordMain/index.vue
@@ -36,8 +36,8 @@
           <span>{{ row.number }}</span>
         </el-button>
       </template>
-      <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, row)" />
+      <template #action="{ row,$index }">
+        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event, row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -176,12 +176,26 @@ const buttonBaseClick = (val, item) => {
 }
 
 // 列表-操作按钮
-const butttondata = [
-  // defaultButtons.mainListEditBtn({hasPermi:'eam:equipmentRepairRecordMain:update'}), // 编辑
-  // defaultButtons.mainListDeleteBtn({hasPermi:'eam:equipmentRepairRecordMain:delete'}), // 删除
-  defaultButtons.repairExperienceBtn({ hasPermi: 'eam:equipmentRepairRecordMain:repairExperience' }) // 生成维修经验
-]
 
+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.repairExperienceBtn({ hide:isShowMainButton(row,['0']),hasPermi: 'eam:equipmentRepairRecordMain:repairExperience' }) // 生成维修经验
+    ]
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  console.log(row.isExperience)
+  if (val.indexOf(row.isExperience) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
   if (val == 'edit') {

From 1e61bf324312968a92c9e38e8663df46c976c868 Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Mon, 1 Jul 2024 11:02:17 +0800
Subject: [PATCH 080/408] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=9C=88=E5=8F=B0?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E6=9F=A5=E8=AF=A2=E4=B8=BB=E8=A1=A8=E7=9A=84?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=9B=A0=E4=B8=BA=E5=AD=90=E8=A1=A8?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=9C=88=E5=8F=B0=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deliverPlanMain/deliverPlanMain.data.ts   | 91 ++++++++++---------
 1 file changed, 46 insertions(+), 45 deletions(-)

diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
index 5bd2fd65c..753350d31 100644
--- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
@@ -100,6 +100,7 @@ export const DeliverPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTableForm: false,
     isForm: true,
+    isSearch: true,
     // tableForm:{
     //   isInpuFocusShow: true, // 开启查询弹窗
     //   searchListPlaceholder: '请选择客户月台代码',
@@ -537,51 +538,51 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '客户月台',
-    field: 'customerDockCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain: true,
-    isTableForm: false,
-    tableForm:{
-      isInpuFocusShow: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择客户月台代码',
-      searchField: 'code',
-      searchTitle: '客户月台基础信息',
-      searchAllSchemas: Customerdock.allSchemas,
-      searchPage: CustomerDockApi.pageCustomerCodeToCustomerDock,
-      searchCondition: [{
-        key: 'available',
-        value: 'TRUE',
-      },{
-        key: 'customerCode',
-        value: 'customerCode',
-        isMainValue: true
-    }]
-    },
-    form: {
-      componentProps: {
-        isSearchList: true,
-        searchListPlaceholder: '请选择客户月台代码',
-        searchField: 'code',
-        searchTitle: '客户月台基础信息',
-        searchAllSchemas: Customerdock.allSchemas,
-        searchPage: CustomerDockApi.pageCustomerCodeToCustomerDock,
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        },{
-          key: 'customerCode',
-          value: 'customerCode',
-          isMainValue: true
-        }]
-      }
-    },
-  },
+  // {
+  //   label: '客户月台',
+  //   field: 'customerDockCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   hiddenInMain: true,
+  //   isTableForm: false,
+  //   tableForm:{
+  //     isInpuFocusShow: true, // 开启查询弹窗
+  //     searchListPlaceholder: '请选择客户月台代码',
+  //     searchField: 'code',
+  //     searchTitle: '客户月台基础信息',
+  //     searchAllSchemas: Customerdock.allSchemas,
+  //     searchPage: CustomerDockApi.pageCustomerCodeToCustomerDock,
+  //     searchCondition: [{
+  //       key: 'available',
+  //       value: 'TRUE',
+  //     },{
+  //       key: 'customerCode',
+  //       value: 'customerCode',
+  //       isMainValue: true
+  //   }]
+  //   },
+  //   form: {
+  //     componentProps: {
+  //       isSearchList: true,
+  //       searchListPlaceholder: '请选择客户月台代码',
+  //       searchField: 'code',
+  //       searchTitle: '客户月台基础信息',
+  //       searchAllSchemas: Customerdock.allSchemas,
+  //       searchPage: CustomerDockApi.pageCustomerCodeToCustomerDock,
+  //       searchCondition: [{
+  //         key: 'available',
+  //         value: 'TRUE',
+  //         isMainValue: false
+  //       },{
+  //         key: 'customerCode',
+  //         value: 'customerCode',
+  //         isMainValue: true
+  //       }]
+  //     }
+  //   },
+  // },
   {
     label: '物料代码',
     field: 'itemCode',

From 36d891660f77f926942baf354705c8895f50de40 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 1 Jul 2024 11:08:12 +0800
Subject: [PATCH 081/408] =?UTF-8?q?bug=EF=BC=9A=E8=A6=81=E8=B4=A7=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E6=96=B0=E5=A2=9E=E4=BF=9D=E5=AD=98=E6=8A=A5=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliver/purchasePlanMain/index.vue    |  1 +
 .../purchasePlanMain/purchasePlanMain.data.ts     | 15 +++++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index c1de69762..905708139 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@@ -201,6 +201,7 @@ const getSearchTableData = async (number,formField,searchField)=>{
     newRow['itemCode'] = row['itemCode']
     newRow['poNumber'] = row['number']
     newRow['poLine'] = row['lineNumber']
+    newRow['planQty'] = 0 // 默认值
     if (formField == 'poLine') {
       newRow['itemCode'] = row['itemCode']
       newRow['uom'] = row['uom']
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
index 33d42c12c..b4938d19e 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
@@ -596,13 +596,11 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     tableForm: {
       type: 'InputNumber',
-      min: 1,
       precision: 6
     },
     form: {
       component: 'InputNumber',
       componentProps: {
-        min: 1,
         precision: 6
       }
     }
@@ -716,7 +714,15 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isTableForm: false,
   }
 ]))
-
+const validatePlanQty = (rule, value, callback) => {
+  console.log('validatePlanQty',value)
+  const numReg = /^[\d]+$/
+  if (numReg.test(value)&&value>0) {
+      callback()
+  } else {
+      callback(new Error('计划数量不能为0'))
+  }
+}
 //表单校验
 export const PurchasePlanDetailRules = reactive({
   // available: [
@@ -729,7 +735,8 @@ export const PurchasePlanDetailRules = reactive({
     { required: true, message: '请选择计量单位', trigger: 'change' }
   ],
   planQty: [
-    { required: true, message: '请输入计划数量', trigger: 'blur' }
+    { required: true, message: '请输入计划数量', trigger: 'blur' },
+    { validator:validatePlanQty, message: '计划数量不能为0', trigger: 'blur'}
   ],
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }

From d14af95077ec675c999b6c190977c19f7ebd1e1d Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 1 Jul 2024 11:26:24 +0800
Subject: [PATCH 082/408] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92-?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=9C=BA=E5=8F=B0=E5=92=8C=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionMain/productionMain.data.ts     | 28 +++++++------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
index abb9a9833..1994190d0 100644
--- a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
@@ -118,15 +118,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '机台',
-    field: 'abc',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: true
-  },
+  
   {
     label: '生产线',
     field: 'productionLine',
@@ -308,15 +300,15 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
 
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
+  // {
+  //   label: '备注',
+  //   field: 'remark',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTable: false,
+  // },
   {
     label: '是否可用',
     field: 'available',

From 274c746c818dcda50cdc469df0b44154b1ff8750 Mon Sep 17 00:00:00 2001
From: songguoqiang <765017469@qq.com>
Date: Mon, 1 Jul 2024 11:27:18 +0800
Subject: [PATCH 083/408] =?UTF-8?q?=20=E5=8F=91=E7=A5=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoiceRecordMain.data.ts         |  2 +
 .../supplierinvoiceRequestMain.data.ts        | 46 +++++++++++++------
 .../supplierinvoiceInvoiced.data.ts           |  2 +
 3 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
index a0db79bc5..1501942e8 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
@@ -730,6 +730,8 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '单据类型',
     field: 'billType',
+    dictType: DICT_TYPE.BILL_TYPE,
+    dictClass: 'string',
     sort: 'custom',
     table: {
       width: 150
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index 265581d6c..e4ab779b8 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -576,20 +576,20 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       }
     },
   },
-  {
-    label: '采购审批人',
-    field: 'procurementCreatorName',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable:true,
-    isDetail: false,
-    isTableForm: false,
-    isForm:false,
-    isSearch:false,
-    sortTableDefault:12
-  },
+  // {
+  //   label: '采购审批人',
+  //   field: 'procurementCreatorName',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  //   isTable:true,
+  //   isDetail: true,
+  //   isTableForm: false,
+  //   isForm:false,
+  //   isSearch:false,
+  //   sortTableDefault:12
+  // },
   {
     label: '过账日期',
     field: 'postingDate',
@@ -730,6 +730,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     },
     isForm: true,
     isTable:false,
+    isDetail:false,
     form: {
       component: 'Select',
       api: () => procurementCreators.list,
@@ -757,6 +758,21 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       // }
     }
   },
+
+  {
+    label: '采购审批人',
+    field: 'procurementCreatorName',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTable:true,
+    isDetail: true,
+    isTableForm: false,
+    isForm:false,
+    isSearch:false,
+    sortTableDefault:12
+  },
  
   {
     label: '采购审批时间',
@@ -1334,6 +1350,8 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
   {
     label: '单据类型',
     field: 'billType',
+    dictType: DICT_TYPE.BILL_TYPE,
+    dictClass: 'string',
     table: {
       width: 150
     },
diff --git a/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts b/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts
index d6da58d98..90bc1fa9e 100644
--- a/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts
@@ -112,6 +112,8 @@ export const SupplierinvoiceInvoiced = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '单据类型',
     field: 'billType',
+    dictType: DICT_TYPE.BILL_TYPE,
+    dictClass: 'string',
     sort: 'custom',
     form: {
       component: 'SelectV2'

From b303726d65c465a5d9df403082327572e30698a9 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 1 Jul 2024 13:48:05 +0800
Subject: [PATCH 084/408] =?UTF-8?q?bug:WMS=E3=80=81SCP=E4=B8=AD=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=E5=BC=B9=E5=87=BA=E9=A1=B5=E6=9C=80=E5=A4=A7=E5=8C=96?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E5=AE=BD=E5=BA=A6=E5=92=8C=E9=AB=98=E5=BA=A6?=
 =?UTF-8?q?=E9=83=BD=E8=A6=81=E5=B1=95=E7=A4=BA=E5=88=B0=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=99=A8=E7=9A=84=E6=9C=80=E5=A4=A7=E5=AE=BD=E5=BA=A6=E5=92=8C?=
 =?UTF-8?q?=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicForm.vue | 7 ++++++-
 src/components/Dialog/src/Dialog.vue       | 5 +++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 5444c2218..8fdf5e7e3 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -5,10 +5,11 @@
     :width="dialogWidth"
     :close-on-click-modal="false"
     :vLoading="formLoading"
+    @updateFullscreen="updateFullscreen"
   >
   
   <div 
-    style="max-height: 60vh;overflow-y: auto;">
+    style="overflow-y: auto;" :style="{'height':formHeight}">
     <Form
       ref="formRef"
       :rules="rules"
@@ -329,6 +330,10 @@ if (props.basicFormWidth) {
 } else {
   dialogWidth.value = props.isBusiness ? '60%' : '40%'
 }
+const formHeight = ref('60vh')
+const updateFullscreen = (isFullscreen)=>{
+  formHeight.value = isFullscreen?'auto':'60vh'
+}
 
 const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
diff --git a/src/components/Dialog/src/Dialog.vue b/src/components/Dialog/src/Dialog.vue
index 0d52642de..8ad2e6a52 100644
--- a/src/components/Dialog/src/Dialog.vue
+++ b/src/components/Dialog/src/Dialog.vue
@@ -3,6 +3,10 @@ import { propTypes } from '@/utils/propTypes'
 import { isNumber } from '@/utils/is'
 defineOptions({ name: 'Dialog' })
 
+// 传递给父类
+const emit = defineEmits([
+  'updateFullscreen'
+])
 const slots = useSlots()
 
 const props = defineProps({
@@ -32,6 +36,7 @@ const isFullscreen = ref(false)
 
 const toggleFull = () => {
   isFullscreen.value = !unref(isFullscreen)
+  emit('updateFullscreen',isFullscreen.value)
 }
 
 const dialogHeight = ref(isNumber(props.maxHeight) ? `${props.maxHeight}px` : props.maxHeight)

From 67324b93078f3614f5ad4b4cc4f66275ade7209c Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Mon, 1 Jul 2024 15:41:58 +0800
Subject: [PATCH 085/408] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/inspectionScheme/addForm.vue   | 320 +++++++++++++------
 src/views/qms/inspectionTemplate/addForm.vue |   7 +-
 2 files changed, 217 insertions(+), 110 deletions(-)

diff --git a/src/views/qms/inspectionScheme/addForm.vue b/src/views/qms/inspectionScheme/addForm.vue
index c96d8ffa4..cfbc54c4c 100644
--- a/src/views/qms/inspectionScheme/addForm.vue
+++ b/src/views/qms/inspectionScheme/addForm.vue
@@ -42,10 +42,10 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-            <el-form-item label="描述" prop="description">
-              <el-input v-model="data.description" placeholder="请填写描述" />
-            </el-form-item>
-          </el-col>
+              <el-form-item label="描述" prop="description">
+                <el-input v-model="data.description" placeholder="请填写描述" />
+              </el-form-item>
+            </el-col>
             <el-col :span="12">
               <el-form-item label="版本" prop="version">
                 <el-input v-model="data.version" placeholder="请填写版本" />
@@ -169,7 +169,7 @@
                 </el-select>
               </el-form-item>
             </el-col> -->
-            <el-col :span="12" v-if="isShowField !=0">
+            <el-col :span="12" v-if="isShowField != 0">
               <el-form-item label="aql" prop="aql">
                 <el-select v-model="data.aql" placeholder="请选择aql">
                   <el-option
@@ -181,7 +181,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="12" v-if="isShowField!=0">
+            <el-col :span="12" v-if="isShowField != 0">
               <el-form-item label="检验水平" prop="inspectionLevel">
                 <el-select v-model="data.inspectionLevel" placeholder="请选择检验水平">
                   <el-option
@@ -195,7 +195,11 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="每份样品量" prop="samplePieceSize">
-                <el-input v-model="data.samplePieceSize" placeholder="请填写每份样品量" :disabled='isSamplePieceSizeDisabled'/>
+                <el-input
+                  v-model="data.samplePieceSize"
+                  placeholder="请填写每份样品量"
+                  :disabled="isSamplePieceSizeDisabled"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -229,6 +233,7 @@
         </el-form>
         <el-tabs
           v-model="editableTabsValue"
+          editable
           class="demo-tabs"
           @edit="handleTabsEdit"
           type="border-card"
@@ -241,7 +246,7 @@
             :label="item.description"
             :name="item.name"
           >
-          <!-- <el-col :span="12">
+            <!-- <el-col :span="12">
               <el-form-item label="动态修改规则" prop="dynamicUpdateCode">
                 <div style="display: flex; width: 100%">
                   <el-input
@@ -447,7 +452,7 @@
                     <el-select
                       v-model="item.inspectionCharacteristicsBaseVO.featureType"
                       placeholder="请选择特征类型"
-                      @change="changeFeatureType($event,item)"
+                      @change="changeFeatureType($event, item)"
                       :disabled="!item.inspectionCharacteristicsBaseVO.isCanUpdate"
                     >
                       <el-option
@@ -461,11 +466,8 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
-                <el-col :span="12"  v-if="item.inspectionCharacteristicsBaseVO.featureType == 0">
-                  <el-form-item
-                    label="计量单位"
-                    prop="inspectionCharacteristicsBaseVO.quantifyUom"
-                  >
+                <el-col :span="12" v-if="item.inspectionCharacteristicsBaseVO.featureType == 0">
+                  <el-form-item label="计量单位" prop="inspectionCharacteristicsBaseVO.quantifyUom">
                     <el-input
                       v-model="item.inspectionCharacteristicsBaseVO.quantifyUom"
                       :disabled="!item.inspectionCharacteristicsBaseVO.isCanUpdate"
@@ -490,7 +492,7 @@
                   >
                     <el-switch
                       v-model="item.inspectionCharacteristicsBaseVO.quantifyIsCapping"
-                      @change="changeIsCapping($event,item)"
+                      @change="changeIsCapping($event, item)"
                       :disabled="!item.inspectionCharacteristicsBaseVO.isCanUpdate"
                     />
                   </el-form-item>
@@ -502,24 +504,30 @@
                   >
                     <el-switch
                       v-model="item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit"
-                      @change="changeLowlimit($event,item)"
+                      @change="changeLowlimit($event, item)"
                       :disabled="!item.inspectionCharacteristicsBaseVO.isCanUpdate"
                     />
                   </el-form-item>
                 </el-col>
-                <el-col :span="12"  v-if="item.inspectionCharacteristicsBaseVO.featureType == 0">
+                <el-col :span="12" v-if="item.inspectionCharacteristicsBaseVO.featureType == 0">
                   <el-form-item
                     prop="inspectionCharacteristicsBaseVO.quantifyIsTarget"
                     label="是否设定目标值"
                   >
                     <el-switch
                       v-model="item.inspectionCharacteristicsBaseVO.quantifyIsTarget"
-                      @change="changeIsTarget($event,item)"
+                      @change="changeIsTarget($event, item)"
                       :disabled="!item.inspectionCharacteristicsBaseVO.isCanUpdate"
                     />
                   </el-form-item>
                 </el-col>
-                <el-col :span="12" v-if="item.inspectionCharacteristicsBaseVO.featureType == 0 && item.inspectionCharacteristicsBaseVO. quantifyIsCapping">
+                <el-col
+                  :span="12"
+                  v-if="
+                    item.inspectionCharacteristicsBaseVO.featureType == 0 &&
+                    item.inspectionCharacteristicsBaseVO.quantifyIsCapping
+                  "
+                >
                   <el-form-item
                     label="上限值"
                     prop="inspectionCharacteristicsBaseVO.quantifyCapping"
@@ -527,11 +535,18 @@
                     <el-input
                       v-model="item.inspectionCharacteristicsBaseVO.quantifyCapping"
                       :disabled="!item.inspectionCharacteristicsBaseVO.isCanUpdate"
+                      type="number"
                     />
                   </el-form-item>
                 </el-col>
-                
-                <el-col :span="12" v-if="item.inspectionCharacteristicsBaseVO.featureType == 0 && item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit">
+
+                <el-col
+                  :span="12"
+                  v-if="
+                    item.inspectionCharacteristicsBaseVO.featureType == 0 &&
+                    item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit
+                  "
+                >
                   <el-form-item
                     label="下限值"
                     prop="inspectionCharacteristicsBaseVO.quantifyLowlimit"
@@ -539,11 +554,18 @@
                     <el-input
                       v-model="item.inspectionCharacteristicsBaseVO.quantifyLowlimit"
                       :disabled="!item.inspectionCharacteristicsBaseVO.isCanUpdate"
+                      type="number"
                     />
                   </el-form-item>
                 </el-col>
-                
-                <el-col :span="12" v-if="item.inspectionCharacteristicsBaseVO.featureType == 0 && item.inspectionCharacteristicsBaseVO. quantifyIsTarget">
+
+                <el-col
+                  :span="12"
+                  v-if="
+                    item.inspectionCharacteristicsBaseVO.featureType == 0 &&
+                    item.inspectionCharacteristicsBaseVO.quantifyIsTarget
+                  "
+                >
                   <el-form-item
                     label="目标值"
                     prop="inspectionCharacteristicsBaseVO.quantifyTarget"
@@ -551,16 +573,15 @@
                     <el-input
                       v-model="item.inspectionCharacteristicsBaseVO.quantifyTarget"
                       :disabled="!item.inspectionCharacteristicsBaseVO.isCanUpdate"
+                      type="number"
                     />
                   </el-form-item>
                 </el-col>
 
-                
                 <el-col :span="12" v-if="item.inspectionCharacteristicsBaseVO.featureType == 1">
                   <el-form-item
                     label="选定集"
                     prop="inspectionCharacteristicsBaseVO.quantifyQuantifyCode"
-                    
                   >
                     <div style="display: flex; width: 100%">
                       <el-input
@@ -648,7 +669,7 @@ import * as DynamicRuleApi from '@/api/qms/dynamicRule' //动态修改规则
 import { DynamicRule } from '@/views/qms/dynamicRule/dynamicRule.data' //动态修改规则
 import * as SelectedSetApi from '@/api/qms/selectedSet' //选择集
 import { SelectedSet } from '@/views/qms/selectedSet/selectedSet.data' //选择集
-import {validateTwoNum} from '@/utils/validator'
+import { validateInteger, validateMaxNumber5, validateTwoNum } from '@/utils/validator'
 
 const message = useMessage() // 消息弹窗
 
@@ -698,7 +719,7 @@ const data = ref({
   code: '',
   itemCode: '',
   version: '',
-  inspectionType:'',
+  inspectionType: '',
   programmeTemplateCode: '',
   splitRule: '',
   aql: '',
@@ -707,9 +728,9 @@ const data = ref({
   expirationDate: '',
   available: 'TRUE',
   dynamicUpdateCode: '',
-  description:'',
-  samplePieceSize:'',
-  uom:'',
+  description: '',
+  samplePieceSize: '',
+  uom: '',
   process: []
 })
 
@@ -730,20 +751,21 @@ const rules = ref({
   programmeTemplateCode: [
     { required: true, message: '请选择检验模板', trigger: ['blur', 'change'] }
   ],
-  description: [
-    { required: true, message: '请选择描述', trigger: 'blur' }
-  ],
+  description: [{ required: true, message: '请选择描述', trigger: 'blur' }],
   // splitRule: [{ required: true, message: '请选择拆分规则', trigger: ['blur', 'change'] }],
   aql: [{ required: true, message: '请选择aql', trigger: ['blur', 'change'] }],
-  inspectionLevel: [
-    { required: true, message: '请选择检验水平', trigger: ['blur', 'change'] },
-  ],
+  inspectionLevel: [{ required: true, message: '请选择检验水平', trigger: ['blur', 'change'] }],
   samplePieceSize: [
-    { required: true, message: '请输入每份样品量', trigger: ['blur', 'change']},
-    { validator:validateTwoNum, message: '小数点后最多2位', trigger: 'blur'},
+    { required: true, message: '请输入每份样品量', trigger: ['blur', 'change'] },
+    { validator: validateTwoNum, message: '小数点后最多2位', trigger: 'blur' }
   ],
+
   effectiveDate: [{ required: true, message: '请选择生效时间', trigger: ['blur', 'change'] }],
   expirationDate: [{ required: true, message: '请选择失效时间', trigger: ['blur', 'change'] }],
+  sequenceCode: [
+    { required: true, message: '请填写顺序号', trigger: 'blur' },
+    { validator: validateInteger, message: '请输入正确的整数', trigger: 'blur' }
+  ],
   'inspectionCharacteristicsBaseVO.description': [
     { required: true, message: '请填写描述', trigger: ['blur', 'change'] }
   ],
@@ -766,7 +788,7 @@ const rules = ref({
     { required: true, message: '请输入目标值', trigger: 'blur' }
   ],
   'inspectionCharacteristicsBaseVO.quantifyCapping': [
-    { required: true, message: '请输入上限值', trigger: ['blur','change'] }
+    { required: true, message: '请输入上限值', trigger: ['blur', 'change'] }
   ],
   'inspectionCharacteristicsBaseVO.quantifyLowlimit': [
     { required: true, message: '请输入下限值', trigger: 'blur' }
@@ -775,13 +797,15 @@ const rules = ref({
     { required: true, message: '请选择计量单位', trigger: 'blur' }
   ],
   'inspectionCharacteristicsBaseVO.quantifyDecimal': [
-    { required: true, message: '请输入小数位', trigger: 'blur' }
+    { required: true, message: '请输入小数位', trigger: 'blur' },
+    { validator: validateInteger, message: '请输入正确的整数', trigger: 'blur' },
+    { validator: validateMaxNumber5, message: '不能大于5', trigger: 'blur' }
   ],
   'inspectionCharacteristicsBaseVO.quantifyQuantifyCode': [
     { required: true, message: '请输入选定集', trigger: 'blur' }
   ]
 })
-const isShowField = ref(0)//是否显示aql和检验水平字段 0隐藏 大于0显示
+const isShowField = ref(0) //是否显示aql和检验水平字段 0隐藏 大于0显示
 /** 打开弹窗 */
 let tabIndex = 1
 const open = async (type: string, row?: any, masterParmas?: any, titleName?: any) => {
@@ -792,7 +816,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
     dialogTitle.value = t('action.' + type)
   }
   formType.value = type
-  isShowField.value=0//设置isShowField == 0隐藏aql和检验水平字段
+  isShowField.value = 0 //设置isShowField == 0隐藏aql和检验水平字段
   if (row) {
     data.value = JSON.parse(JSON.stringify(row))
     let list = []
@@ -802,34 +826,37 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
       list = await InspectionProcessPageApi.getListByTempleteCode(row.programmeTemplateCode)
     }
     rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = false
-      rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = false
-      rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = false
-      list.forEach((item, index) => {
-        editableTabsValue.value = index+1
-        item.name = index + 1
-        // rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = true
-        // 编辑判断上限下限目标值是否必填
-        if (item.inspectionCharacteristicsBaseVO.featureType == 0 && item.inspectionCharacteristicsBaseVO.quantifyIsCapping) {
-          rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = true
-        } 
-        if (item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit) {
-          rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = true
-        } 
-        if (item.inspectionCharacteristicsBaseVO.quantifyIsTarget) {
-          rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = true
-        } 
-        if(item.inspectionCharacteristicsBaseVO.sampleType == 4){
-          isShowField.value+=1//设置isShowField > 0显示aql和检验水平字段
-        }
-      })
-      // 显示aql和检验水平字段的时候添加必填规则
-      if( isShowField.value>0){
-       rules.value.aql[0].required = true
-       rules.value.aql[0].required = true
-      }else{
-        rules.value.aql[0].required = false
-       rules.value.aql[0].required = false
+    rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = false
+    rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = false
+    list.forEach((item, index) => {
+      editableTabsValue.value = index + 1
+      item.name = index + 1
+      // rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = true
+      // 编辑判断上限下限目标值是否必填
+      if (
+        item.inspectionCharacteristicsBaseVO.featureType == 0 &&
+        item.inspectionCharacteristicsBaseVO.quantifyIsCapping
+      ) {
+        rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = true
       }
+      if (item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit) {
+        rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = true
+      }
+      if (item.inspectionCharacteristicsBaseVO.quantifyIsTarget) {
+        rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = true
+      }
+      if (item.inspectionCharacteristicsBaseVO.sampleType == 4) {
+        isShowField.value += 1 //设置isShowField > 0显示aql和检验水平字段
+      }
+    })
+    // 显示aql和检验水平字段的时候添加必填规则
+    if (isShowField.value > 0) {
+      rules.value.aql[0].required = true
+      rules.value.aql[0].required = true
+    } else {
+      rules.value.aql[0].required = false
+      rules.value.aql[0].required = false
+    }
     data.value.process = list
   } else {
     data.value = {
@@ -844,10 +871,10 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
       effectiveDate: '',
       expirationDate: '',
       available: 'TRUE',
-      dynamicUpdateCode:'',
-      description:"",
-      samplePieceSize:"",
-      uom:"",
+      dynamicUpdateCode: '',
+      description: '',
+      samplePieceSize: '',
+      uom: '',
       process: []
     }
   }
@@ -894,20 +921,20 @@ const buttonBaseClick1 = (val) => {
           name: newTabName,
           inspectionCode: '',
           sequenceCode: '',
-          dynamicUpdateCode:'',
+          dynamicUpdateCode: '',
           inspectionCharCode: '',
           inspectionCharacteristicsBaseVO: {
             describe: '',
             inspectionMethodCode: '',
             dynamicUpdateCode: '',
             inspectionMethod: '',
-            isCanUpdate: '',
+            isCanUpdate: true,
             isDestructionInspection: '',
             resultEntryMethod: '',
             featureType: '',
-            quantifyIsCapping: '',
-            quantifyIsLowlimit: '',
-            quantifyIsTarget: '',
+            quantifyIsCapping: false,
+            quantifyIsLowlimit: false,
+            quantifyIsTarget: false,
             quantifyTarget: '',
             quantifyCapping: '',
             quantifyLowlimit: '',
@@ -954,10 +981,29 @@ const validateForm = (formRef) => {
       return false
     })
 }
+// 判断对象数组是否有相同属性 相同：true \ 不相同：false
+const hasDuplicates = (array) => {
+  const seen = new Set()
+  const repeatCode = new Set()
+  let arr = array.map((item) => parseInt(item.sequenceCode))
+  arr.forEach((item) => {
+    if (seen.has(item)) {
+      repeatCode.add(item)
+    } else {
+      seen.add(item)
+    }
+  })
+  const arr1 = Array.from(repeatCode)
+  if (arr1.length > 0) {
+    return true
+  } else {
+    return false
+  }
+}
 
 const submitForm = async () => {
   try {
-    const aa = await getStrDictOptions(DICT_TYPE.SPLIT_RULES);//拆分规则隐藏默认给第一字典值
+    const aa = await getStrDictOptions(DICT_TYPE.SPLIT_RULES) //拆分规则隐藏默认给第一字典值
     data.value.splitRule = aa[0].value
     const validateForm1 = await validateForm(formProcessRef.value)
     await formMainRef.value.validate()
@@ -965,6 +1011,11 @@ const submitForm = async () => {
       message.error(`请添加工序`)
       return
     }
+    // debugger
+    if (hasDuplicates(data.value.process)) {
+      message.error(`检验工序顺序号不能相同`)
+      return
+    }
     const bol1 = await validateForm(formProcessRef.value)
     const bol2 = await validateForm(formFeaturesRef.value)
     if (!bol1 || !bol2) {
@@ -984,8 +1035,65 @@ const submitForm = async () => {
       message.error(`${str}是否设定上线,是否设定下限,是否是定目标值至少一项为是`)
       return
     }
+    // 检验上限值,下限值,目标值小数位数不可以大于小数位
+    console.log(data.value.process)
+    const arr1 = data.value.process.filter(
+      (item) =>
+        ((item.inspectionCharacteristicsBaseVO.quantifyIsCapping &&
+          String(item.inspectionCharacteristicsBaseVO.quantifyCapping).split('.')[1]?.length >
+            Number(item.inspectionCharacteristicsBaseVO.quantifyDecimal)) ||
+          (item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit &&
+            String(item.inspectionCharacteristicsBaseVO.quantifyLowlimit).split('.')[1]?.length >
+              Number(item.inspectionCharacteristicsBaseVO.quantifyDecimal)) ||
+          (item.inspectionCharacteristicsBaseVO.quantifyIsTarget &&
+            String(item.inspectionCharacteristicsBaseVO.quantifyTarget).split('.')[1]?.length >
+              Number(item.inspectionCharacteristicsBaseVO.quantifyDecimal))) &&
+        item.inspectionCharacteristicsBaseVO.featureType == 0
+    )
+    if (arr1 && arr1.length > 0) {
+      const str = arr1.map((item) => item.description).join(',')
+      message.error(`${str}工序上限值,下限值,目标值小数位数不可以大于小数位`)
+      return
+    }
+    // 检验上限值应大目标值大于下限值
+    const arr2 = data.value.process.filter((item) => {
+      // 上限值存在并且下限值存在时,目标值不存在，上限值应大于下限值
+      return (
+        (item.inspectionCharacteristicsBaseVO.quantifyIsCapping &&
+          item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit &&
+          !item.inspectionCharacteristicsBaseVO.quantifyIsTarget &&
+          parseFloat(item.inspectionCharacteristicsBaseVO.quantifyCapping) <=
+            parseFloat(item.inspectionCharacteristicsBaseVO.quantifyLowlimit)) ||
+        // 上限值存在并且目标值存在时，下限值不存在，上限值应大于目标值
+        (item.inspectionCharacteristicsBaseVO.quantifyIsCapping &&
+          item.inspectionCharacteristicsBaseVO.quantifyIsTarget &&
+          !item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit &&
+          parseFloat(item.inspectionCharacteristicsBaseVO.quantifyCapping) <=
+            parseFloat(item.inspectionCharacteristicsBaseVO.quantifyTarget)) ||
+        // 下限值存在并且目标值存在时，上限值不存在，下限值应小于目标值
+        (item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit &&
+          item.inspectionCharacteristicsBaseVO.quantifyIsTarget &&
+          !item.inspectionCharacteristicsBaseVO.quantifyIsCapping &&
+          parseFloat(item.inspectionCharacteristicsBaseVO.quantifyLowlimit) >=
+            parseFloat(item.inspectionCharacteristicsBaseVO.quantifyTarget)) ||
+        // 上限值，下限值，目标值都存在时，上限值应大于目标值大于下限值
+        (item.inspectionCharacteristicsBaseVO.quantifyIsCapping &&
+          item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit &&
+          item.inspectionCharacteristicsBaseVO.quantifyIsTarget &&
+          (parseFloat(item.inspectionCharacteristicsBaseVO.quantifyCapping) <=
+            parseFloat(item.inspectionCharacteristicsBaseVO.quantifyLowlimit) ||
+            parseFloat(item.inspectionCharacteristicsBaseVO.quantifyCapping) <=
+              parseFloat(item.inspectionCharacteristicsBaseVO.quantifyTarget) ||
+            parseFloat(item.inspectionCharacteristicsBaseVO.quantifyLowlimit) >=
+              parseFloat(item.inspectionCharacteristicsBaseVO.quantifyTarget)))
+      )
+    })
+    if (arr2 && arr2.length > 0) {
+      const str = arr2.map((item) => item.description).join(',')
+      message.error(`${str}工序上限值应大于目标值大于下限值`)
+      return
+    }
     if (formType.value == 'create') {
-      
       // 主子表——提交请求
       emit('submitForm', formType.value, data.value)
     } else {
@@ -1007,15 +1115,15 @@ if (props.footButttondata) {
   ]
 }
 // 选择特征类型
-const changeFeatureType = (e,item) => {
+const changeFeatureType = (e, item) => {
   item.inspectionCharacteristicsBaseVO.quantifyIsCapping = false
   item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit = false
   item.inspectionCharacteristicsBaseVO.quantifyIsTarget = false
   item.inspectionCharacteristicsBaseVO.quantifyCapping = ''
   item.inspectionCharacteristicsBaseVO.quantifyLowlimit = ''
-  item.inspectionCharacteristicsBaseVO.quantifyTarget= ''
-  item.inspectionCharacteristicsBaseVO.quantifyQuantifyCode= ''
-  item.inspectionCharacteristicsBaseVO.quantifyQuantifyName= ''
+  item.inspectionCharacteristicsBaseVO.quantifyTarget = ''
+  item.inspectionCharacteristicsBaseVO.quantifyQuantifyCode = ''
+  item.inspectionCharacteristicsBaseVO.quantifyQuantifyName = ''
   console.log(e)
   if (e) {
     rules.value['inspectionCharacteristicsBaseVO.quantifyQuantifyCode'][0].required = true
@@ -1098,7 +1206,7 @@ const opensearchTable = (
     _searchCondition
   )
 }
-const isSamplePieceSizeDisabled = ref(false)//判断每份样品朗是否可输入
+const isSamplePieceSizeDisabled = ref(false) //判断每份样品朗是否可输入
 // 弹层确定返回所选数据
 // val ： 弹层列表row 数据
 const searchTableSuccess = async (formField, searchField, val, type, row) => {
@@ -1120,17 +1228,17 @@ const searchTableSuccess = async (formField, searchField, val, type, row) => {
     if (formField == 'itemCode') {
       data.value.itemName = val[0].name
       data.value.uom = val[0].uom
-      if(data.value.uom == 'EA'){
+      if (data.value.uom == 'EA') {
         data.value.samplePieceSize = 1
         isSamplePieceSizeDisabled.value = true
-      }else{
+      } else {
         data.value.samplePieceSize = ''
         isSamplePieceSizeDisabled.value = false
       }
     } else if (formField == 'inspectionType') {
       data.value.testTypeName = val[0].description
     } else if (formField == 'programmeTemplateCode') {
-      isShowField.value=0//设置isShowField == 0隐藏aql和检验水平字段
+      isShowField.value = 0 //设置isShowField == 0隐藏aql和检验水平字段
       data.value.programmeTemplateName = val[0].description
       data.value['dynamicUpdateCode'] = val[0].dynamicUpdateCode
       data.value.dynamicUpdateName = val[0].dynamicUpdateName
@@ -1139,33 +1247,36 @@ const searchTableSuccess = async (formField, searchField, val, type, row) => {
       rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = false
       rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = false
       list.forEach((item, index) => {
-        editableTabsValue.value = index+1
+        editableTabsValue.value = index + 1
         item.name = index + 1
         // rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = true
         // 编辑判断上限下限目标值是否必填
-        if (item.inspectionCharacteristicsBaseVO.featureType == 0 && item.inspectionCharacteristicsBaseVO.quantifyIsCapping) {
+        if (
+          item.inspectionCharacteristicsBaseVO.featureType == 0 &&
+          item.inspectionCharacteristicsBaseVO.quantifyIsCapping
+        ) {
           rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = true
-        } 
+        }
         if (item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit) {
           rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = true
-        } 
+        }
         if (item.inspectionCharacteristicsBaseVO.quantifyIsTarget) {
           rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = true
-        } 
-        if(item.inspectionCharacteristicsBaseVO.sampleType == 4){
-          isShowField.value+=1//设置isShowField > 0显示aql和检验水平字段
+        }
+        if (item.inspectionCharacteristicsBaseVO.sampleType == 4) {
+          isShowField.value += 1 //设置isShowField > 0显示aql和检验水平字段
         }
       })
       // 显示aql和检验水平字段的时候添加必填规则
-      if( isShowField.value>0){
-       rules.value.aql[0].required = true
-       rules.value.aql[0].required = true
-      }else{
+      if (isShowField.value > 0) {
+        rules.value.aql[0].required = true
+        rules.value.aql[0].required = true
+      } else {
+        rules.value.aql[0].required = false
         rules.value.aql[0].required = false
-       rules.value.aql[0].required = false
       }
       data.value.process = list
-    }else if (formField == 'dynamicUpdateCode') {
+    } else if (formField == 'dynamicUpdateCode') {
       data.value[formField] = val[0].code
       data.value.dynamicUpdateName = val[0].description
     }
@@ -1174,17 +1285,16 @@ const searchTableSuccess = async (formField, searchField, val, type, row) => {
   // emit('searchTableSuccess', formField, searchField, val, formRef.value, type, row)
 }
 // 选择是否设定上限值
-const changeIsCapping = (e,item) => {
+const changeIsCapping = (e, item) => {
   item.inspectionCharacteristicsBaseVO.quantifyCapping = ''
   if (e) {
     rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = true
   } else {
     rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = false
   }
-  
 }
 // 选择是否设定下限值
-const changeLowlimit = (e,item) => {
+const changeLowlimit = (e, item) => {
   item.inspectionCharacteristicsBaseVO.quantifyLowlimit = ''
   if (e) {
     rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = true
@@ -1193,7 +1303,7 @@ const changeLowlimit = (e,item) => {
   }
 }
 // 选择是否设定目标值
-const changeIsTarget = (e,item) => {
+const changeIsTarget = (e, item) => {
   item.inspectionCharacteristicsBaseVO.quantifyTarget = ''
   if (e) {
     rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = true
diff --git a/src/views/qms/inspectionTemplate/addForm.vue b/src/views/qms/inspectionTemplate/addForm.vue
index 2affd912a..e3e983539 100644
--- a/src/views/qms/inspectionTemplate/addForm.vue
+++ b/src/views/qms/inspectionTemplate/addForm.vue
@@ -297,7 +297,8 @@
                   prop="inspectionCharacteristicsBaseVO.quantifyDecimal"
                   v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
                 >
-                  <el-input v-model="item.inspectionCharacteristicsBaseVO.quantifyDecimal" />
+                  <el-input v-model="item.inspectionCharacteristicsBaseVO.quantifyDecimal" 
+                  type="number"/>
                 </el-form-item>
               </el-col>
               <el-col :span="12" v-if="item.inspectionCharacteristicsBaseVO.featureType == 0">
@@ -822,10 +823,6 @@ const submitForm = async () => {
     console.log(data.value.process)
     const arr1 = data.value.process.filter(
       (item) =>
-    //   {
-    //    console.log(String(item.inspectionCharacteristicsBaseVO.quantifyCapping).split('.')[1]?.length)
-    //    console.log(Number(item.inspectionCharacteristicsBaseVO.quantifyDecimal))
-    // }
       ((item.inspectionCharacteristicsBaseVO.quantifyIsCapping && (String(item.inspectionCharacteristicsBaseVO.quantifyCapping).split('.')[1]?.length>Number(item.inspectionCharacteristicsBaseVO.quantifyDecimal)))||
       (item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit && (String(item.inspectionCharacteristicsBaseVO.quantifyLowlimit).split('.')[1]?.length>Number(item.inspectionCharacteristicsBaseVO.quantifyDecimal)))||
       (item.inspectionCharacteristicsBaseVO.quantifyIsTarget && (String(item.inspectionCharacteristicsBaseVO.quantifyTarget).split('.')[1]?.length>Number(item.inspectionCharacteristicsBaseVO.quantifyDecimal)))) &&

From cdca3a674f0322b7cf0ffe73334749901fa5182a Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 1 Jul 2024 16:27:53 +0800
Subject: [PATCH 086/408] =?UTF-8?q?=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 8fdf5e7e3..5fa0fbd9a 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -9,7 +9,7 @@
   >
   
   <div 
-    style="overflow-y: auto;" :style="{'height':formHeight}">
+    style="overflow-y: auto;" :style="{'max-height':formHeight}">
     <Form
       ref="formRef"
       :rules="rules"

From ae5fe7f768ffbd251a130bb5ee32a2f75bf8aa8a Mon Sep 17 00:00:00 2001
From: songguoqiang <765017469@qq.com>
Date: Mon, 1 Jul 2024 16:45:55 +0800
Subject: [PATCH 087/408] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoiceRecordMain.data.ts         | 121 +++++++++++++-----
 .../supplierinvoiceRequestMain/index.vue      |   1 +
 .../supplierinvoiceRequestMain.data.ts        |  50 +++++++-
 3 files changed, 136 insertions(+), 36 deletions(-)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
index 1501942e8..36cd58443 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
@@ -82,16 +82,16 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '申请单号',
-    field: 'requestNumber',
-    sort: 'custom',
-    table: {
-      width: 180,
-    },
-    isTable: false,
-    isSearch: true
-  },
+  // {
+  //   label: '申请单号',
+  //   field: 'requestNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180,
+  //   },
+  //   isTable: false,
+  //   isSearch: true
+  // },
   {
     label: '订单号',
     field: 'poNumber',
@@ -262,6 +262,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isDetail:false,
     isTable: false,
     form: {
       component: 'InputNumber',
@@ -272,6 +273,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'adjustingTaxAmount',
     formatter: accountantFormart,
     sort: 'custom',
+    isDetail:false,
     table: {
       width: 150
     },
@@ -342,26 +344,35 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
-    sortTableDefault:4,
-    sort: 'custom',
-    table: {
-      width: 180
+    form:{
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD',//YYYY-MM-DD
+        valueFormat: 'x',//数据转成时间戳
+      }
     },
-  },
-  {
-    label: '采购审批人',
-    field: 'procurementCreatorName',
+    sortTableDefault:4,
     sort: 'custom',
     table: {
       width: 180
     },
-    isTable:true,
-    isDetail: false,
-    isTableForm: false,
-    isForm:false,
-    isSearch:false,
-    sortTableDefault:10
   },
+  // {
+  //   label: '采购审批人',
+  //   field: 'procurementCreatorName',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  //   isTable:true,
+  //   isDetail: true,
+  //   isTableForm: false,
+  //   isForm:false,
+  //   isSearch:false,
+  //   sortTableDefault:10
+  // },
   {
     label: '过账日期',
     field: 'postingDate',
@@ -369,6 +380,15 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
+    form:{
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD',//YYYY-MM-DD
+        valueFormat: 'x',//数据转成时间戳
+      }
+    },
     isTable: true,
     sortTableDefault:6,
     sort: 'custom',
@@ -404,6 +424,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isTable:false,
     isTableForm:false,
+    isDetail:false,
     table: {
       width: 150
     },
@@ -414,6 +435,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isTable:false,
     isTableForm:false,
+    isDetail:false,
     table: {
       width: 150
     },
@@ -423,6 +445,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'inTransactionType',
     isTable:false,
     isTableForm:false,
+    isDetail:false,
     sort: 'custom',
     table: {
       width: 150
@@ -499,6 +522,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'code',
     isTable:false,
     isTableForm:false,
+    isDetail:false,
     sort: 'custom',
     table: {
       width: 150
@@ -510,6 +534,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.INTERFACE_TYPE,
     dictClass: 'string',
     isTable:false,
+    isDetail:false,
     isTableForm:false,
     sort: 'custom',
     table: {
@@ -549,16 +574,30 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '采购审批人代码',
-    field: 'procurementCreator',
-    sortTableDefault:1002,
+    label: '采购审批人',
+    field: 'procurementCreatorName',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
-    isTable: false,
-    isForm: false,
+    isTable:true,
+    isDetail: true,
+    isTableForm: false,
+    isForm:false,
+    isSearch:false,
+    sortTableDefault:10
   },
+  // {
+  //   label: '采购审批人代码',
+  //   field: 'procurementCreator',
+  //   sortTableDefault:1002,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTable: false,
+  //   isForm: false,
+  // },
   {
     label: '采购审批时间',
     field: 'procurementCreateTime',
@@ -568,6 +607,15 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
+    form:{
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',//YYYY-MM-DD
+        valueFormat: 'x',//数据转成时间戳
+      }
+    },
     sort: 'custom',
     table: {
       width: 180
@@ -593,6 +641,15 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
+    form:{
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',//YYYY-MM-DD
+        valueFormat: 'x',//数据转成时间戳
+      }
+    },
     sort: 'custom',
     table: {
       width: 180
@@ -624,8 +681,8 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   //   isDetail:false,
   // },
   {
-    label: '供应商审批人代码',
-    field: 'supplierCreator',
+    label: '供应商审批人',
+    field: 'supplierCreatorName',
     sort: 'custom',
     isTable:false,
     isTableForm:false,
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index ffa39066f..269f1367e 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -788,6 +788,7 @@ const handleImport = () => {
   const formFinanceRef = ref()
   const handleFinanceApp = async (row) => {
     row.postingDate = dayjs().valueOf()
+    row.voucherNumberRemark = '收到'+row.supplierName+'发票'+row.goldenTaxInvoiceNumber
     formFinanceRef.value.open('update', row,null,'财务通过','财务通过')
   }
 
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index e4ab779b8..a493d1bdc 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -783,6 +783,15 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
+    form:{
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',//YYYY-MM-DD
+        valueFormat: 'x',//数据转成时间戳
+      }
+    },
     sort: 'custom',
     table: {
       width: 180
@@ -832,6 +841,15 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
+    form:{
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',//YYYY-MM-DD
+        valueFormat: 'x',//数据转成时间戳
+      }
+    },
     sort: 'custom',
     table: {
       width: 180
@@ -843,6 +861,21 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'supplierCreator',
     sort: 'custom',
     isTable:false,
+    isTable:false,
+    isDetail:false,
+    sortTableDefault:1006,
+    table: {
+      width: 180
+    },
+    isForm: false,
+  },
+  {
+    label: '供应商审批人',
+    field: 'supplierCreatorName',
+    sort: 'custom',
+    isTable:false,
+    isTable:false,
+    isDetail:true,
     sortTableDefault:1006,
     table: {
       width: 180
@@ -857,6 +890,15 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
+    form:{
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',//YYYY-MM-DD
+        valueFormat: 'x',//数据转成时间戳
+      }
+    },
     sort: 'custom',
     table: {
       width: 180
@@ -1065,7 +1107,7 @@ export const SupplierinvoiceRequestFinance = useCrudSchemas(reactive<CrudSchema[
         style: {width:'100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
       }
     },
   },
@@ -1087,9 +1129,9 @@ export const SupplierinvoiceRequestFinanceRules = reactive({
   postingDate: [
     { required: true, message: '请选择过账日期', trigger: 'change' }
   ],
-  voucherNumberRemark:  [
-    { max: 50, message: '不得超过40个字符', trigger: 'blur' }
-  ],
+  // voucherNumberRemark:  [
+  //   { max: 50, message: '不得超过40个字符', trigger: 'blur' }
+  // ],
 })
 /**
  * @returns {Array} 供应商发票申请子表

From 377e3ac45cc55557cbbfe0ac72051002ceb292b4 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Tue, 2 Jul 2024 09:05:14 +0800
Subject: [PATCH 088/408] =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BD=99=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/inventoryManage/balance/index.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/inventoryManage/balance/index.vue b/src/views/wms/inventoryManage/balance/index.vue
index 595b8ceb1..5ca4ea0ea 100644
--- a/src/views/wms/inventoryManage/balance/index.vue
+++ b/src/views/wms/inventoryManage/balance/index.vue
@@ -30,8 +30,8 @@
       @getSelectionRows="getSelectionRows"
     >
       <template #itemCode="{row}">
-        <el-button type="primary" link @click="openDetail(row, '物料代码', row.itemCode)">
-          <span>{{ row.itemCode }}</span>
+        <el-button :type="row.frozen=='TRUE'||row.expireDate<dayjs().valueOf()?'danger':'primary'" link @click="openDetail(row, '物料代码', row.itemCode)">
+          <span >{{ row.itemCode }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
@@ -59,6 +59,7 @@
 </template>
 
 <script setup lang="ts">
+import dayjs from 'dayjs'
 import download from '@/utils/download'
 import * as BalanceApi from '@/api/wms/balance'
 import * as PackageApi from '@/api/wms/package'

From 27443c77cec9bf10bb36c64bbd82531cd80259e2 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Tue, 2 Jul 2024 09:55:32 +0800
Subject: [PATCH 089/408] =?UTF-8?q?=E7=89=A9=E6=96=99=E4=BB=93=E5=BA=93?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9=E9=99=90=E5=88=B6=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../itemManage/itemwarehouse/index.vue        | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/src/views/wms/basicDataManage/itemManage/itemwarehouse/index.vue b/src/views/wms/basicDataManage/itemManage/itemwarehouse/index.vue
index 72a299855..6ec0e6347 100644
--- a/src/views/wms/basicDataManage/itemManage/itemwarehouse/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/itemwarehouse/index.vue
@@ -149,6 +149,29 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
+  if(type == "update"){
+    Itemwarehouse.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'itemCode') {
+              item.componentProps.disabled = true
+              item.componentProps.isSearchList = false
+            }
+            if (item.field == 'warehouseCode') {
+              item.componentProps.disabled = true
+              item.componentProps.isSearchList = false
+            }
+          })       
+  }else {
+    Itemwarehouse.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'itemCode') {
+        item.componentProps.disabled = false
+        item.componentProps.isSearchList = true
+      }
+       if (item.field == 'warehouseCode') {
+              item.componentProps.disabled = false
+              item.componentProps.isSearchList = true
+            }
+    })  
+  }
   basicFormRef.value.open(type, row)
 }
 

From f383ecbbe86bd958cf52aa5b64bf43f5ef016b8a Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 2 Jul 2024 10:00:06 +0800
Subject: [PATCH 090/408] =?UTF-8?q?=E7=94=9F=E6=88=90=E4=BF=9D=E5=85=BB?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E7=AD=9B=E9=80=89=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/eam/maintainExperience/index.vue | 2 +-
 src/views/eam/repairExperience/index.vue   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/eam/maintainExperience/index.vue b/src/views/eam/maintainExperience/index.vue
index d1b8c1620..5b77720e4 100644
--- a/src/views/eam/maintainExperience/index.vue
+++ b/src/views/eam/maintainExperience/index.vue
@@ -115,7 +115,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:maintainExperience:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:maintainExperience:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
-  defaultButtons.defaultFilterBtn(null), // 筛选
+  // defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
diff --git a/src/views/eam/repairExperience/index.vue b/src/views/eam/repairExperience/index.vue
index b393435de..9fefecd19 100644
--- a/src/views/eam/repairExperience/index.vue
+++ b/src/views/eam/repairExperience/index.vue
@@ -118,7 +118,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:repairExperience:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:repairExperience:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
-  defaultButtons.defaultFilterBtn(null), // 筛选
+  // defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',

From e29621fb8257c0282cb93cf9072bf56eeeae474d Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 2 Jul 2024 10:38:22 +0800
Subject: [PATCH 091/408] =?UTF-8?q?=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/locales/en-US.ts                               |  3 ++-
 src/locales/zh-CN.ts                               |  3 ++-
 .../supplierinvoiceRequestMain/index.vue           | 14 ++++++++++++--
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index 19f98f6c5..21468aa23 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',
+    查看明细:'View details'
   },
   
 
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 3b9c17161..1a76b0971 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -1138,7 +1138,8 @@ export default {
     批量发布:'批量发布',
     '重新生成标签会删除上次生成的标签，是否确认继续？':'重新生成标签会删除上次生成的标签，是否确认继续？',
     '确 认':'确 认',
-    请输入拒收原因:'请输入拒收原因'
+    请输入拒收原因:'请输入拒收原因',
+    查看明细:'查看明细'
   },
 
 }
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 269f1367e..3bc63fc85 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -428,7 +428,15 @@ const searchTableSuccessDetail = async (formField, searchField, val, formRef,sea
     return [
       defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['9']) ,hasPermi: 'wms:supplierinvoice-request-main:open'}), // 打开
       defaultButtons.mainListPlanSubBtn({ hide: isShowMainButton(row, ['1','6']),hasPermi: 'wms:supplierinvoice-request-main:sub' }), // 提交审批
-      {
+       {
+        label: t('ts.查看明细'),
+        name: 'open_detail',
+        type: 'primary',
+        icon: '',
+        color: '',
+        hasPermi: 'wms:supplierinvoice-request-main:view-detail',
+        link: true, // 文本展现按钮
+      },{
         label: t('ts.采购通过'),
         name: 'purchase_mainPlanSub',
         hide: !(!isShowMainButton(row, ['2']) && row.currentIsProcurementCreator==true),
@@ -511,7 +519,9 @@ const handleImport = () => {
       handleClo(row.id)
     } else if (val == 'mainPlanSub') { // 提交审批
       handleSub(row.id)
-    } else if (val == 'purchase_mainPlanSub') { // 采购审批通过
+    }  else if (val == 'open_detail') { // 查看明细
+      openDetail(row, '单据号', row.number)
+    }else if (val == 'purchase_mainPlanSub') { // 采购审批通过
       handleApp(row.id)
     } else if (val == 'purchase_mainPlanTur') { // 采购驳回按钮
       resonSubmit(val, row)

From a035e5c635dbd81d13ae73dd3aac6acc5268ce2a Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Tue, 2 Jul 2024 11:29:37 +0800
Subject: [PATCH 092/408] =?UTF-8?q?=E9=9A=90=E8=97=8F=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E5=8C=85=E8=A3=85=E4=BF=A1=E6=81=AF=E5=88=A0=E9=99=A4=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/basicDataManage/itemManage/itempackage/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/basicDataManage/itemManage/itempackage/index.vue b/src/views/wms/basicDataManage/itemManage/itempackage/index.vue
index 4f25372ad..729bc4b8b 100644
--- a/src/views/wms/basicDataManage/itemManage/itempackage/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/itempackage/index.vue
@@ -153,7 +153,7 @@ const buttonBaseClick = (val, item) => {
 // 列表-操作按钮
 const butttondata = [
   defaultButtons.mainListEditBtn({ hasPermi: 'wms:itempackage:update' }), // 编辑
-  defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:itempackage:delete' }) // 删除
+  // defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:itempackage:delete' }) // 删除
 ]
 
 // 列表-操作按钮事件

From 06c4e1aaeba3f1090296ffac2010dff5a87a58ef Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 2 Jul 2024 13:27:57 +0800
Subject: [PATCH 093/408] =?UTF-8?q?tableForm=E7=BB=84=E4=BB=B6=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=BB=9A=E5=8A=A8=E6=9D=A1?=
 =?UTF-8?q?=EF=BC=8C=E8=BF=99=E4=B8=80=E4=B8=AA=E6=95=B0=E6=8D=AE=E6=97=B6?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4checkbox=E9=BB=98=E8=AE=A4=E9=80=89=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SearchTable/src/SearchTable.vue           | 172 +++--
 src/components/Table/src/Table.vue            |  32 +-
 src/components/TableForm/src/TableForm.vue    | 686 ++++++++++--------
 src/components/XButton/src/ButtonBase.vue     |   2 +-
 4 files changed, 525 insertions(+), 367 deletions(-)

diff --git a/src/components/SearchTable/src/SearchTable.vue b/src/components/SearchTable/src/SearchTable.vue
index edbac8a4a..688012602 100644
--- a/src/components/SearchTable/src/SearchTable.vue
+++ b/src/components/SearchTable/src/SearchTable.vue
@@ -1,5 +1,5 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="searchDialogVisible" :width="dialogWidth" >
+  <Dialog :title="dialogTitle" v-model="searchDialogVisible" :width="dialogWidth">
     <!-- 搜索工作栏 -->
     <ContentWrap v-if="searchQuery">
       <Search :schema="searchSchema" @search="setSearchParamsRef" @reset="setSearchParamsRef" />
@@ -14,7 +14,8 @@
       :allSchemas="allSchemasRef"
     />
     <ContentWrap>
-      <Table v-clientSearchTable
+      <Table
+        v-clientSearchTable
         ref="searchTableRef"
         :columns="tableColumns"
         :data="tableObjectRef.tableList"
@@ -30,13 +31,14 @@
         :selectionTotal="multipleBol"
         :reserveSelection="true"
         row-key="id"
+        @rowClick="rowClick"
       />
     </ContentWrap>
     <template #footer>
       <div class="flex items-center">
         <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
         <el-button @click="searchDialogVisible = false">取 消</el-button>
-         
+
         <slot name="actions"></slot>
       </div>
     </template>
@@ -45,7 +47,7 @@
 <script setup lang="ts">
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 const props = defineProps({
-  showSearchTableQueryFields:{
+  showSearchTableQueryFields: {
     type: Array,
     required: false,
     default: []
@@ -63,23 +65,25 @@ const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const multipleBol = ref(false)
 
-
 // 列表头部按钮
-const HeadButttondata = ref(multipleBol.value?
-[
-  defaultButtons.defaultWhenPageBtn(null), // 选择当页
-  defaultButtons.defaultUnselectPageBtn(null), // 反选当页
-  // defaultButtons.defaultDeselectAllBtn(null), // 取消全选
-  defaultButtons.defaultFilterBtn(null), // 筛选
-]:[
-  defaultButtons.defaultFilterBtn(null) // 筛选
-])
+const HeadButttondata = ref(
+  multipleBol.value
+    ? [
+        defaultButtons.defaultWhenPageBtn(null), // 选择当页
+        defaultButtons.defaultUnselectPageBtn(null), // 反选当页
+        // defaultButtons.defaultDeselectAllBtn(null), // 取消全选
+        defaultButtons.defaultFilterBtn(null) // 筛选
+      ]
+    : [
+        defaultButtons.defaultFilterBtn(null) // 筛选
+      ]
+)
 
 /** 打开弹窗 */
 const getListRef = ref()
 const setSearchParamsRef = ref()
 const tableObjectRef = ref()
-const getPage:any = ref()
+const getPage: any = ref()
 const searchSchema = ref()
 const tableColumns = ref()
 const formFieldRef = ref()
@@ -88,67 +92,88 @@ const typeRef = ref()
 const rowRef = ref()
 const allSchemasRef = ref()
 const searchConditionRef = ref()
-const searchTableSelectionsList = ref()//表格弹窗回显的列表
+const searchTableSelectionsList = ref() //表格弹窗回显的列表
 const searchQuery = ref(false)
-const openData = (titleName: any, tableObject:any ,allSchemas: any,multiple: any) => {
+const openData = (titleName: any, tableObject: any, allSchemas: any, multiple: any) => {
   dialogWidth.value = '80%'
   multipleBol.value = multiple
-  HeadButttondata.value = multiple?[
-    defaultButtons.defaultWhenPageBtn(null), // 选择当页
-    defaultButtons.defaultUnselectPageBtn(null), // 反选当页
-    // defaultButtons.defaultDeselectAllBtn(null), // 取消全选
-    defaultButtons.defaultFilterBtn(null), // 筛选
-  ]:[
-    defaultButtons.defaultFilterBtn(null), // 筛选
-  ]
-  dialogTitle.value = t(`ts.${titleName}`).replace('ts.','')
+  HeadButttondata.value = multiple
+    ? [
+        defaultButtons.defaultWhenPageBtn(null), // 选择当页
+        defaultButtons.defaultUnselectPageBtn(null), // 反选当页
+        // defaultButtons.defaultDeselectAllBtn(null), // 取消全选
+        defaultButtons.defaultFilterBtn(null) // 筛选
+      ]
+    : [
+        defaultButtons.defaultFilterBtn(null) // 筛选
+      ]
+  dialogTitle.value = t(`ts.${titleName}`).replace('ts.', '')
   tableObjectRef.value = tableObject
   searchDialogVisible.value = true
   allSchemasRef.value = allSchemas
   searchSchema.value = allSchemas.searchSchema
   tableColumns.value = allSchemas.tableColumns
 }
-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
+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
   dialogWidth.value = '80%'
   multipleBol.value = multiple
-  HeadButttondata.value = multiple?[
-    defaultButtons.defaultWhenPageBtn(null), // 选择当页
-    defaultButtons.defaultUnselectPageBtn(null), // 反选当页
-    // defaultButtons.defaultDeselectAllBtn(null), // 取消全选
-    defaultButtons.defaultFilterBtn(null), // 筛选
-  ]:
-  [
-    defaultButtons.defaultFilterBtn(null), // 筛选
-  ]
+  HeadButttondata.value = multiple
+    ? [
+        defaultButtons.defaultWhenPageBtn(null), // 选择当页
+        defaultButtons.defaultUnselectPageBtn(null), // 反选当页
+        // defaultButtons.defaultDeselectAllBtn(null), // 取消全选
+        defaultButtons.defaultFilterBtn(null) // 筛选
+      ]
+    : [
+        defaultButtons.defaultFilterBtn(null) // 筛选
+      ]
   searchDialogVisible.value = true
   formFieldRef.value = formField
   searchFieldRef.value = searchField
   allSchemasRef.value = allSchemas
   searchSchema.value = allSchemas.searchSchema
-  if(isConcatDetailSchemas){
+  if (isConcatDetailSchemas) {
     //主子表合并
-    console.log('detailSchemas',detailSchemas)
-    tableColumns.value = [...allSchemas?.tableColumns,...detailSchemas?.tableMainColumns].filter(item => (item.field !== 'action'))
-  }else{
-    tableColumns.value = allSchemas?.tableColumns.filter(item => (item.field !== 'action'))
+    console.log('detailSchemas', detailSchemas)
+    tableColumns.value = [...allSchemas?.tableColumns, ...detailSchemas?.tableMainColumns].filter(
+      (item) => item.field !== 'action'
+    )
+  } else {
+    tableColumns.value = allSchemas?.tableColumns.filter((item) => item.field !== 'action')
   }
   getPage.value = getApiPage
   typeRef.value = type
   rowRef.value = row
   // dialogTitle.value = t('action.' + type)
-  dialogTitle.value = t(`ts.${titleName}`).replace('ts.','')
+  dialogTitle.value = t(`ts.${titleName}`).replace('ts.', '')
   searchTableSelectionsList.value = searchTableSelections
 
-  const {tableObject, tableMethods } = useTable({
+  const { tableObject, tableMethods } = useTable({
     getListApi: getPage.value // 分页接口
   })
   tableObjectRef.value = tableObject
   searchConditionRef.value = searchCondition
-  if (searchCondition) tableObjectRef.value.params = searchCondition;
+  if (searchCondition) tableObjectRef.value.params = searchCondition
 
   // 获得表格的各种操作
-  const { getList , setSearchParams } = tableMethods
+  const { getList, setSearchParams } = tableMethods
   setSearchParamsRef.value = setSearchParams
   getListRef.value = getList
   getList()
@@ -157,7 +182,7 @@ const dialogWidth = ref('80%')
 const changeDialogWidth = (width: any) => {
   dialogWidth.value = width
 }
-const hiddenFilterButton = ()=>{
+const hiddenFilterButton = () => {
   HeadButttondata.value = []
 }
 
@@ -166,34 +191,34 @@ const searchFormClick = (searchData) => {
   console.log(99, rowRef.value)
   console.log(100, searchData)
   console.log(101, searchConditionRef.value)
-  // 20240104 修改 判断 当前弹窗 是否有条件 如果有条件 需拼接到 筛选中 searchData.filters 
+  // 20240104 修改 判断 当前弹窗 是否有条件 如果有条件 需拼接到 筛选中 searchData.filters
   // 20240321 修改 判断 searchData 是否有条件 如果有 拼接
   if (searchData.filters) {
     if (searchConditionRef.value.filters) {
-      Object.keys(searchConditionRef.value.filters).forEach(key => {
+      Object.keys(searchConditionRef.value.filters).forEach((key) => {
         searchData.filters.push(searchConditionRef.value.filters[key])
-      });
+      })
     } else {
-      Object.keys(searchConditionRef.value).forEach(key => {
+      Object.keys(searchConditionRef.value).forEach((key) => {
         searchData.filters.push({
-          action: "==",
+          action: '==',
           column: key,
           value: searchConditionRef.value[key]
         })
-      });
+      })
     }
   } else {
     if (searchConditionRef.value.filters) {
       searchData.filters = searchConditionRef.value.filters
     } else {
       searchData.filters = []
-      Object.keys(searchConditionRef.value).forEach(key => {
+      Object.keys(searchConditionRef.value).forEach((key) => {
         searchData.filters.push({
-          action: "==",
+          action: '==',
           column: key,
           value: searchConditionRef.value[key]
         })
-      });
+      })
     }
   }
   tableObjectRef.value.params = {
@@ -203,7 +228,7 @@ const searchFormClick = (searchData) => {
   getListRef.value() // 刷新当前列表
 }
 const buttonBaseClick = (val, item) => {
-  // 设置按钮 
+  // 设置按钮
   if (val == 'DeselectAll') {
     // 取消全选
     searchTableRef.value.clearSelection()
@@ -216,8 +241,7 @@ const buttonBaseClick = (val, item) => {
   }
 }
 
-
-defineExpose({ open,openData,hiddenFilterButton ,changeDialogWidth}) // 提供 open 方法，用于打开弹窗
+defineExpose({ open, openData, hiddenFilterButton, changeDialogWidth }) // 提供 open 方法，用于打开弹窗
 
 // Table 组件 ref
 const searchTableRef = ref()
@@ -229,29 +253,47 @@ const submitForm = async () => {
   formLoading.value = true
   const selections = searchTableRef.value.selections
   // 如果不是多选的
-  if(!multipleBol.value){
-    if(selections.length > 1 || selections.length == 0) {
+  if (!multipleBol.value) {
+    if (selections.length > 1 || selections.length == 0) {
       message.warning('请选择一条数据！')
       formLoading.value = false
       return
     }
     // 多选
-  }else{
-    if(selections.length == 0) {
+  } else {
+    if (selections.length == 0) {
       message.warning('至少选择一条数据！')
       formLoading.value = false
       return
     }
   }
- 
+
   try {
     searchDialogVisible.value = false
     // 发送操作成功的事件
-    emit('searchTableSuccess', formFieldRef.value, searchFieldRef.value, selections, typeRef.value, rowRef.value)
+    emit(
+      'searchTableSuccess',
+      formFieldRef.value,
+      searchFieldRef.value,
+      selections,
+      typeRef.value,
+      rowRef.value
+    )
   } finally {
     formLoading.value = false
   }
 }
+const rowClick = (row: any, column: any, event: Event) => {
+  const selected = searchTableRef.value?.elTableRef
+    ?.getSelectionRows()
+    .some((item) => item.id === row.id)
+  if (!selected) {
+    searchTableRef.value?.elTableRef?.toggleRowSelection(row, true)
+  } else {
+    // 取消
+    searchTableRef.value?.elTableRef?.toggleRowSelection(row, false)
+  }
+}
 </script>
 <style scoped lang="scss">
 </style>
\ No newline at end of file
diff --git a/src/components/Table/src/Table.vue b/src/components/Table/src/Table.vue
index 7fb9ee6cf..590b64baa 100644
--- a/src/components/Table/src/Table.vue
+++ b/src/components/Table/src/Table.vue
@@ -63,7 +63,7 @@ export default defineComponent({
     searchTableSelectionsList:[],//回显列表
     selectionColor: propTypes.bool.def(false),
   },
-  emits: ['update:pageSize', 'update:currentPage', 'register', 'update:sort','getSelectionRows'],
+  emits: ['update:pageSize', 'update:currentPage', 'register', 'update:sort','getSelectionRows','rowClick'],
   setup(props, { attrs, slots, emit, expose }) {
     const elTableRef = ref<ComponentRef<typeof ElTable>>()
 
@@ -120,12 +120,24 @@ export default defineComponent({
     const sortRef = ref()
     // 选中某行
     const selectRow  = ()=>{
+      console.log(currentPageRef.value,elTableRef.value?.getSelectionRows())
       emit('getSelectionRows', currentPageRef.value,elTableRef.value?.getSelectionRows())
     }
     //全选回调
     const selectAll  = ()=>{
       emit('getSelectionRows', currentPageRef.value,elTableRef.value?.getSelectionRows())
     }
+    const rowClick  = (row: any, column: any, event: Event)=>{
+      // const selected = elTableRef.value?.getSelectionRows().some(item => item.id === row.id)
+      // if (!selected) {
+      //     elTableRef.value?.toggleRowSelection(row, true);
+      //  } else {
+      //     // 取消
+      //   elTableRef.value?.toggleRowSelection(row, false);
+      // }
+      // console.log(elTableRef.value?.getSelectionRows())
+      emit('rowClick',row,column,event)
+    }
     //反选
     const togglePageSelection = ()=>{
       unref(getProps).data.forEach(row=>{
@@ -165,7 +177,8 @@ export default defineComponent({
       selectAll,
       toggleAllSelection,
       togglePageSelection,
-      clearSelection
+      clearSelection,
+      elTableRef
     })
 
     const pagination = computed(() => {
@@ -388,6 +401,7 @@ export default defineComponent({
           onSelect-all={selectAll}
           onSelection-change={selectionChange}
           onSort-change={sortChange}
+          onRow-click={rowClick}
           {...unref(getBindValue)} 
         >
           {{
@@ -397,7 +411,7 @@ export default defineComponent({
           }}
         </ElTable>
         {unref(getProps).selectionTotal ? (
-          <div class="mt-5px">已选{selections.value.length}条数据</div>
+          <div class="mt-15px float-left" style='height:32px;line-height:32px'>已选{selections.value.length}条数据</div>
         ):undefined}
         {unref(getProps).pagination ? (
           // update by 芋艿：保持和 Pagination 组件一致
@@ -416,18 +430,17 @@ export default defineComponent({
 </script>
 
 <style lang="scss">
-.expandTable .el-table .tableHeader{
+.expandTable .el-table .tableHeader {
   --el-table-header-bg-color: #f5f5f5;
-}  
-.expandTable .el-table .tableRow{
+}
+.expandTable .el-table .tableRow {
   --el-table-tr-bg-color: #f5f5f5;
-  --el-bg-color:#f5f5f5;
+  --el-bg-color: #f5f5f5;
 }
 
-.el-table .selectionRow{
+.el-table .selectionRow {
   --el-table-tr-bg-color: var(--el-color-primary-light-9);
 }
-
 </style>
 <style lang="scss" scoped>
 :deep(.el-button.is-text) {
@@ -439,5 +452,4 @@ export default defineComponent({
   padding: 8px 4px;
   margin-left: 0;
 }
-
 </style>
diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue
index 778cdba15..e73b602aa 100644
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@@ -1,341 +1,420 @@
 <!-- 附件组件 -->
 <template>
   <div class="table-form">
-    <el-table class="multipleTableComponents"
-      ref="TableBaseComponents_Ref" 
-      v-loading="tableLoading" 
+    <el-table
+      class="multipleTableComponents"
+      ref="TableBaseComponents_Ref"
+      v-loading="tableLoading"
       :data="showTableData()"
       :max-height="maxHeight"
-      row-key="id" 
-      :border="border" 
+      row-key="id"
+      :border="border"
       @selection-change="tableSelectionChange"
-      @sort-change="tableSortChange" 
+      @sort-change="tableSortChange"
       @row-click="handleTableSelect"
     >
       <!-- 删除按钮多选 -->
-      <el-table-column fixed="left" type="selection" width="50" v-if="isShowReduceButtonSelection"  :reserve-selection="true" />
+      <el-table-column
+        fixed="left"
+        type="selection"
+        width="50"
+        v-if="isShowReduceButtonSelection"
+        :reserve-selection="true"
+      />
       <!-- 删除按钮 -->
       <el-table-column
-        fixed="left" 
-        :width="50" 
-        v-else-if="isShowReduceButton" 
+        fixed="left"
+        :width="50"
+        v-else-if="isShowReduceButton"
         v-slot="{ row, $index }"
       >
-        <Icon icon="ep:remove" color="#757575" :size="26" style="cursor: pointer;margin-top: -16px;" @click="handleDeleteTable (row, $index)" />
+        <Icon
+          icon="ep:remove"
+          color="#757575"
+          :size="26"
+          style="cursor: pointer; margin-top: -16px"
+          @click.stop="handleDeleteTable(row, $index)"
+        />
       </el-table-column>
       <!-- 多选 -->
-      <el-table-column 
-        fixed="left" 
+      <el-table-column
+        fixed="left"
         v-if="selectionTable"
-        :reserve-selection="true" 
-        type="selection" 
-        :width="50" 
-        
+        :reserve-selection="true"
+        type="selection"
+        :width="50"
       />
       <!-- 序号 -->
-      <el-table-column 
-        type="index" 
-        fixed="left" 
-        :label="t(`ts.序号`)" 
-        width="80" 
-        :align="'center'" 
-        v-if="isShowIndex" 
+      <el-table-column
+        type="index"
+        fixed="left"
+        :label="t(`ts.序号`)"
+        width="80"
+        :align="'center'"
+        v-if="isShowIndex"
       />
-      <el-table-column 
-        v-slot="{ row, $index }" 
-        v-for="(headerItem) in tableFields.filter(item=>(!item.hidden))" 
+      <el-table-column
+        v-slot="{ row, $index }"
+        v-for="headerItem in tableFields.filter((item) => !item.hidden)"
         :key="headerItem"
-        :fixed="headerItem.tableForm?.fixed" 
-        :label="t(`ts.${headerItem.label}`).replace('ts.','')" :prop="headerItem.field"
-        :align="headerItem?.tableForm?.align || 'center'" 
+        :fixed="headerItem.tableForm?.fixed"
+        :label="t(`ts.${headerItem.label}`).replace('ts.', '')"
+        :prop="headerItem.field"
+        :align="headerItem?.tableForm?.align || 'center'"
         :sortable="headerItem?.tableForm?.sortable || false"
-        :width="headerItem?.tableForm?.width || '200px'" 
-        :min-width="headerItem?.tableForm?.minWidth || 'auto'">
-        <el-form 
-          ref="TableBaseForm_Ref" 
-          :model="row" 
-          style="width: 100%;" 
+        :width="headerItem?.tableForm?.width || '200px'"
+        :min-width="headerItem?.tableForm?.minWidth || 'auto'"
+      >
+        <el-form
+          ref="TableBaseForm_Ref"
+          :model="row"
+          style="width: 100%"
           :rules="tableFormRules"
-          :class="tableFormRules ? '' : 'noRulesForm'">
+          :class="tableFormRules ? '' : 'noRulesForm'"
+          @click.stop=""
+        >
           <!-- 字符串输入框 -->
           <el-form-item
             v-if="!headerItem?.tableForm?.type || headerItem?.tableForm?.type == 'InputString'"
-            :prop="headerItem.field" style="display: flex;align-items: center;">
-            <el-input  :key="headerItem.field+$index"
+            :prop="headerItem.field"
+            style="display: flex; align-items: center"
+          >
+            <el-input
+              :key="headerItem.field + $index"
               v-model="row[headerItem.field]"
               clearable
               :type="headerItem?.tableForm?.inputType"
-              :placeholder="t(`ts.${headerItem?.tableForm?.placeholder || '请输入' + headerItem.label}`).replace('ts.','')"
-              :disabled="disabledInput(headerItem,row)"
-              style="flex:1" 
-              @blur="inputStringBlur(headerItem, row[headerItem.field], row,index)"
+              :placeholder="
+                t(
+                  `ts.${headerItem?.tableForm?.placeholder || '请输入' + headerItem.label}`
+                ).replace('ts.', '')
+              "
+              :disabled="disabledInput(headerItem, row)"
+              style="flex: 1"
+              @blur.stop="inputStringBlur(headerItem, row[headerItem.field], row, index)"
+            />
+            <Icon
+              icon="ep:circle-close"
+              v-if="
+                headerItem?.tableForm?.isInpuFocusShow &&
+                headerItem?.tableForm?.disabled &&
+                headerItem?.tableForm?.clearable
+              "
+              style="position: absolute; right: 50px; cursor: pointer"
+              @click.stop="clearInput(headerItem.field, row, index)"
             />
-            <Icon icon="ep:circle-close"  v-if="headerItem?.tableForm?.isInpuFocusShow && headerItem?.tableForm?.disabled&& headerItem?.tableForm?.clearable" style='position:absolute;right:50px;cursor: pointer;' @click="clearInput(headerItem.field,row,index)"/>
-            <el-button  :key="headerItem.field+$index+'button'" v-if="headerItem?.tableForm?.isInpuFocusShow" @click="inpuFocus(headerItem,row,index)"><Icon icon="ep:search" size="14"/></el-button>
+            <el-button
+              :key="headerItem.field + $index + 'button'"
+              v-if="headerItem?.tableForm?.isInpuFocusShow"
+              @click.stop="inpuFocus(headerItem, row, index)"
+              ><Icon icon="ep:search" size="14"
+            /></el-button>
           </el-form-item>
-          <el-form-item  v-if="headerItem?.tableForm?.type == 'slot'">
+          <el-form-item v-if="headerItem?.tableForm?.type == 'slot'">
             <slot :row="row"></slot>
           </el-form-item>
           <!-- 金额输入框 -->
-            <el-form-item 
-              v-if="headerItem?.tableForm?.type == 'number'"
-              :prop="headerItem.field">
-              <el-input :key="headerItem.field+$index"
-                v-model="row[headerItem.field]"
-                clearable
-                type="number"
-                :placeholder="headerItem?.tableForm?.placeholder || '请输入' + headerItem.label"
-                :disabled="itemIsDisabled(headerItem, row)" 
-                style="width: 100%;" 
-                @input="row[headerItem.field] = row[headerItem.field].replace(/[^\d\.-]/g, '')"
-              />
-            </el-form-item>
+          <el-form-item v-if="headerItem?.tableForm?.type == 'number'" :prop="headerItem.field" >
+            <el-input
+              :key="headerItem.field + $index"
+              v-model="row[headerItem.field]"
+              clearable
+              type="number"
+              :placeholder="headerItem?.tableForm?.placeholder || '请输入' + headerItem.label"
+              :disabled="itemIsDisabled(headerItem, row)"
+              style="width: 100%"
+              @input.stop="row[headerItem.field] = row[headerItem.field].replace(/[^\d\.-]/g, '')"
+              @click.stop=""
+              @focus.stop=""
+            />
+          </el-form-item>
           <!-- 数字输入框 -->
-          <el-form-item 
-            v-if="headerItem?.tableForm?.type == 'InputNumber'" 
-            :prop="headerItem.field">
-            <el-input-number 
-              style="width: 100%;" 
-              :key="headerItem.field+$index"
-              v-model="row[headerItem.field]" 
+          <el-form-item
+            v-if="headerItem?.tableForm?.type == 'InputNumber'"
+            :prop="headerItem.field"
+          >
+            <el-input-number
+              style="width: 100%"
+              :key="headerItem.field + $index"
+              v-model="row[headerItem.field]"
               :max="headerItem?.tableForm?.max"
-              :min="headerItem?.tableForm?.min" 
-              :precision="headerItem?.tableForm?.precision" 
-              :disabled="itemIsDisabled(headerItem, row)" 
-              @change="(e)=>{inputNumberChange(headerItem.field, $index, row, e)}"
+              :min="headerItem?.tableForm?.min"
+              :precision="headerItem?.tableForm?.precision"
+              :disabled="itemIsDisabled(headerItem, row)"
+              @change.stop="
+                (e) => {
+                  inputNumberChange(headerItem.field, $index, row, e)
+                }
+              "
             />
           </el-form-item>
           <!-- 下拉框 -->
-          <el-form-item 
-            v-if="headerItem?.tableForm?.type == 'Select'" 
-            :prop="headerItem.field">
-            <el-select :key="headerItem.field+$index"
-              v-model="row[headerItem.field]" 
+          <el-form-item v-if="headerItem?.tableForm?.type == 'Select'" :prop="headerItem.field">
+            <el-select
+              :key="headerItem.field + $index"
+              v-model="row[headerItem.field]"
               :clearable="headerItem?.tableForm.clearable || true"
-              :multiple="headerItem?.tableForm.multiple" 
-              :size="headerItem?.tableForm.size" 
-              :collapse-tags ="headerItem?.tableForm.collapseTags" 
-              :collapse-tags-tooltip ="headerItem?.tableForm.collapseTagsTooltip" 
-              :multiple-limit ="headerItem?.tableForm.multipleLimit" 
+              :multiple="headerItem?.tableForm.multiple"
+              :size="headerItem?.tableForm.size"
+              :collapse-tags="headerItem?.tableForm.collapseTags"
+              :collapse-tags-tooltip="headerItem?.tableForm.collapseTagsTooltip"
+              :multiple-limit="headerItem?.tableForm.multipleLimit"
               :disabled="itemIsDisabled(headerItem, row)"
-              :filterable="headerItem?.tableForm.filterable" 
+              :filterable="headerItem?.tableForm.filterable"
               :allow-create="headerItem?.tableForm.allowCreate"
-              style="width: 100%" 
+              style="width: 100%"
               :placeholder="headerItem?.tableForm?.placeholder || '请选择' + headerItem.label"
-              @change="formSelectChange(headerItem.field, $event,row)"
-              @blur="tableFormSelectOnBlur(headerItem.field, $event,row, $index)">
-              <el-option 
-                v-for="op in initSelectOptions(headerItem)" 
-                :label="t(`ts.${op.label}`).replace('ts.','')" 
+              @change.stop="formSelectChange(headerItem.field, $event, row)"
+              @blur.stop="tableFormSelectOnBlur(headerItem.field, $event, row, $index)"
+            >
+              <el-option
+                v-for="op in initSelectOptions(headerItem)"
+                :label="t(`ts.${op.label}`).replace('ts.', '')"
                 :value="op.value"
-                :key="op.value" />
+                :key="op.value"
+              />
             </el-select>
           </el-form-item>
           <!-- 下拉框 -->
-          <el-form-item 
-            v-if="headerItem?.tableForm?.type == 'SelectGroup'" 
-            :prop="headerItem.field">
-            <el-select :key="headerItem.field+$index"
-              v-model="row[headerItem.field]" 
+          <el-form-item
+            v-if="headerItem?.tableForm?.type == 'SelectGroup'"
+            :prop="headerItem.field"
+          >
+            <el-select
+              :key="headerItem.field + $index"
+              v-model="row[headerItem.field]"
               :clearable="headerItem?.tableForm.clearable || true"
-              :multiple="headerItem?.tableForm.multiple" 
-              :size="headerItem?.tableForm.size" 
-              :collapse-tags ="headerItem?.tableForm.collapseTags" 
-              :collapse-tags-tooltip ="headerItem?.tableForm.collapseTagsTooltip" 
-              :multiple-limit ="headerItem?.tableForm.multipleLimit" 
+              :multiple="headerItem?.tableForm.multiple"
+              :size="headerItem?.tableForm.size"
+              :collapse-tags="headerItem?.tableForm.collapseTags"
+              :collapse-tags-tooltip="headerItem?.tableForm.collapseTagsTooltip"
+              :multiple-limit="headerItem?.tableForm.multipleLimit"
               :disabled="itemIsDisabled(headerItem, row)"
-              :filterable="headerItem?.tableForm.filterable" 
+              :filterable="headerItem?.tableForm.filterable"
               :allow-create="headerItem?.tableForm.allowCreate"
-              style="width: 100%" 
+              style="width: 100%"
               :placeholder="headerItem?.tableForm?.placeholder || '请选择' + headerItem.label"
-              @change="formSelectChange(headerItem.field, $event,row)"
-              @blur="tableFormSelectOnBlur(headerItem.field, $event,row, $index)">
-               <el-option-group
-                  v-for="group in initSelectOptions(headerItem)"
-                  :key="group.type"
-                  :label="t(`ts.${group.name}`).replace('ts.','')"
-                >
-                  <el-option
-                    v-for="item in group.options"
-                    :key="item.value"
-                    :label="t(`ts.${item.label}`).replace('ts.','')"
-                    :value="item.value"
-                  />
-                </el-option-group>
+              @change.stop="formSelectChange(headerItem.field, $event, row)"
+              @blur.stop="tableFormSelectOnBlur(headerItem.field, $event, row, $index)"
+            >
+              <el-option-group
+                v-for="group in initSelectOptions(headerItem)"
+                :key="group.type"
+                :label="t(`ts.${group.name}`).replace('ts.', '')"
+              >
+                <el-option
+                  v-for="item in group.options"
+                  :key="item.value"
+                  :label="t(`ts.${item.label}`).replace('ts.', '')"
+                  :value="item.value"
+                />
+              </el-option-group>
             </el-select>
           </el-form-item>
           <!-- 时间选择器 -->
-          <el-form-item 
-            v-if="headerItem?.tableForm?.type == 'FormTime'" 
-            :prop="headerItem.field">
-            <el-time-picker :key="headerItem.field+$index"
-              v-model="row[headerItem.field]" 
+          <el-form-item v-if="headerItem?.tableForm?.type == 'FormTime'" :prop="headerItem.field">
+            <el-time-picker
+              :key="headerItem.field + $index"
+              v-model="row[headerItem.field]"
               :clearable="true"
               :placeholder="headerItem?.tableForm?.placeholder || '选择时间'"
-              style="width: 100%" :disabled="itemIsDisabled(headerItem, row)"
+              style="width: 100%"
+              :disabled="itemIsDisabled(headerItem, row)"
               :format="headerItem?.tableForm?.format || 'HH:mm:ss'"
-              :value-format="headerItem?.tableForm?.valueFormat || 'HH:mm:ss'" />
+              :value-format="headerItem?.tableForm?.valueFormat || 'HH:mm:ss'"
+            />
           </el-form-item>
           <!-- 日期选择器 -->
-          <el-form-item 
-            v-if="headerItem?.tableForm?.type == 'FormDate'" 
-            :prop="headerItem.field">
+          <el-form-item v-if="headerItem?.tableForm?.type == 'FormDate'" :prop="headerItem.field">
             <el-date-picker
-            :key="headerItem.field+$index" 
-              v-model="row[headerItem.field]" 
+              :key="headerItem.field + $index"
+              v-model="row[headerItem.field]"
               :clearable="true"
               style="width: 100%"
-              :disabled="itemIsDisabled(headerItem, row)" 
+              :disabled="itemIsDisabled(headerItem, row)"
               :placeholder="headerItem?.tableForm?.placeholder || '选择日期'"
               :format="headerItem?.tableForm?.format || 'YYYY-MM-DD'"
               :value-format="headerItem?.tableForm?.valueFormat || 'YYYY-MM-DD'"
-              @change="formFormDateChange(headerItem.field, $event,row, $index)" />
+              @change.stop="formFormDateChange(headerItem.field, $event, row, $index)"
+            />
           </el-form-item>
           <!-- 日期时间选择器 -->
-          <el-form-item 
-            v-if="headerItem?.tableForm?.type == 'FormDateTime'" 
-            :prop="headerItem.field">
-            <el-date-picker 
-              :key="headerItem.field+$index"
+          <el-form-item
+            v-if="headerItem?.tableForm?.type == 'FormDateTime'"
+            :prop="headerItem.field"
+          >
+            <el-date-picker
+              :key="headerItem.field + $index"
               type="datetime"
               :clearable="true"
               v-model="row[headerItem.field]"
-              :placeholder="headerItem?.tableForm?.placeholder || '选择日期时间'" 
+              :placeholder="headerItem?.tableForm?.placeholder || '选择日期时间'"
               style="width: 100%"
               :format="headerItem?.tableForm?.format || 'YYYY-MM-DD HH:mm:ss'"
               :value-format="headerItem?.tableForm?.valueFormat || 'YYYY-MM-DDTHH:mm:ss'"
-              :disabled="itemIsDisabled(headerItem, row)" />
+              :disabled="itemIsDisabled(headerItem, row)"
+            />
           </el-form-item>
           <!--开始时间结束时间选择器 (原类型datetimerange已弃用 使用type+timeType结合方式)-->
-          <el-form-item 
-            v-if="headerItem?.tableForm?.type == 'FormTimerange'" 
-            :prop="headerItem.field">
-            <el-date-picker :key="headerItem.field+$index"
+          <el-form-item
+            v-if="headerItem?.tableForm?.type == 'FormTimerange'"
+            :prop="headerItem.field"
+          >
+            <el-date-picker
+              :key="headerItem.field + $index"
               v-model="row[headerItem.field]"
               :clearable="true"
               :disabled="itemIsDisabled(headerItem, row)"
               :type="headerItem?.tableForm?.timeType || 'datetimerange'"
-              range-separator="至" 
+              range-separator="至"
               start-placeholder="开始日期"
-              end-placeholder="结束日期" 
+              end-placeholder="结束日期"
               :format="headerItem?.tableForm?.format || 'YYYY-MM-DD HH:mm:ss'"
-              :value-format="headerItem?.tableForm?.valueFormat || 'YYYY-MM-DDTHH:mm:ss'" />
+              :value-format="headerItem?.tableForm?.valueFormat || 'YYYY-MM-DDTHH:mm:ss'"
+            />
           </el-form-item>
           <!-- Switch 开关 -->
-          <el-form-item 
-            v-if="headerItem?.tableForm?.type == 'Switch'" 
-            :prop="headerItem.field">
-            <el-switch  :key="headerItem.field+$index"
-              v-model="row[headerItem.field]" 
+          <el-form-item v-if="headerItem?.tableForm?.type == 'Switch'" :prop="headerItem.field">
+            <el-switch
+              :key="headerItem.field + $index"
+              v-model="row[headerItem.field]"
               :disabled="itemIsDisabled(headerItem, row)"
-              :loading="headerItem?.tableForm?.loading" 
+              :loading="headerItem?.tableForm?.loading"
               :size="headerItem?.tableForm?.size"
-              :active-icon="headerItem?.tableForm?.activeIcon" 
+              :active-icon="headerItem?.tableForm?.activeIcon"
               :inactive-icon="headerItem?.tableForm?.inactiveIcon"
-              :active-text="headerItem?.tableForm?.activeText" 
+              :active-text="headerItem?.tableForm?.activeText"
               :inactive-text="headerItem?.tableForm?.inactiveText"
-              :active-value="headerItem?.tableForm?.activeValue" 
+              :active-value="headerItem?.tableForm?.activeValue"
               :inactive-value="headerItem?.tableForm?.inactiveValue"
               :active-color="headerItem?.tableForm?.inactiveColor"
-              :inactive-color="headerItem?.tableForm?.inactiveColor" />
+              :inactive-color="headerItem?.tableForm?.inactiveColor"
+            />
           </el-form-item>
           <!-- Radio  单选-->
-          <el-form-item 
-            v-if="headerItem?.tableForm?.type == 'Radio'" 
-            :prop="headerItem.field">
-            <el-radio-group :key="headerItem.field+$index"
-              v-model="row[headerItem.field]" 
+          <el-form-item v-if="headerItem?.tableForm?.type == 'Radio'" :prop="headerItem.field">
+            <el-radio-group
+              :key="headerItem.field + $index"
+              v-model="row[headerItem.field]"
               :size="headerItem?.tableForm?.size"
-              :disabled="itemIsDisabled(headerItem, row)" 
+              :disabled="itemIsDisabled(headerItem, row)"
               :text-color="headerItem?.tableForm?.textColor"
-              :fill="headerItem?.tableForm?.fill" 
-              :name="headerItem?.tableForm?.name" 
-              :id="headerItem?.tableForm?.id">
-              <el-radio 
-                v-for="(item, index) in initSelectOptions(headerItem)" 
-                :key="index" 
-                :label="t(`ts.${item.value}`).replace('ts.','')"
-                :size="headerItem?.tableForm?.size" 
+              :fill="headerItem?.tableForm?.fill"
+              :name="headerItem?.tableForm?.name"
+              :id="headerItem?.tableForm?.id"
+            >
+              <el-radio
+                v-for="(item, index) in initSelectOptions(headerItem)"
+                :key="index"
+                :label="t(`ts.${item.value}`).replace('ts.', '')"
+                :size="headerItem?.tableForm?.size"
                 :disabled="itemIsDisabled(headerItem, row)"
-                :border="headerItem?.tableForm?.border">
+                :border="headerItem?.tableForm?.border"
+              >
                 {{ item.label }}
               </el-radio>
             </el-radio-group>
           </el-form-item>
           <!-- Checkbox  多选-->
-          <el-form-item 
-            v-if="headerItem?.tableForm?.type == 'Checkbox'" 
-            :prop="headerItem.field">
-            <el-checkbox-group :key="headerItem.field+$index"
-              v-model="row[headerItem.field]" 
+          <el-form-item v-if="headerItem?.tableForm?.type == 'Checkbox'" :prop="headerItem.field">
+            <el-checkbox-group
+              :key="headerItem.field + $index"
+              v-model="row[headerItem.field]"
               :disabled="itemIsDisabled(headerItem, row)"
-              :size="headerItem?.tableForm?.size" 
-              :min="headerItem?.tableForm?.min" 
+              :size="headerItem?.tableForm?.size"
+              :min="headerItem?.tableForm?.min"
               :max="headerItem?.tableForm?.max"
-              :text-color="headerItem?.tableForm?.textColor" 
-              :fill="headerItem?.tableForm?.fill">
-              <el-checkbox 
-                v-for="(item, index) in initSelectOptions(headerItem)" 
-                :key="index" 
-                :label="t(`ts.${item.value}`).replace('ts.','')"
-                :disabled="itemIsDisabled(headerItem, row)" 
-                :true-label="t(`ts.${headerItem?.tableForm?.trueLabel}`).replace('ts.','')"
-                :false-label="t(`ts.${headerItem?.tableForm?.falseLabel}`).replace('ts.','')" 
+              :text-color="headerItem?.tableForm?.textColor"
+              :fill="headerItem?.tableForm?.fill"
+            >
+              <el-checkbox
+                v-for="(item, index) in initSelectOptions(headerItem)"
+                :key="index"
+                :label="t(`ts.${item.value}`).replace('ts.', '')"
+                :disabled="itemIsDisabled(headerItem, row)"
+                :true-label="t(`ts.${headerItem?.tableForm?.trueLabel}`).replace('ts.', '')"
+                :false-label="t(`ts.${headerItem?.tableForm?.falseLabel}`).replace('ts.', '')"
                 :border="headerItem?.tableForm?.border"
-                :size="headerItem?.tableForm?.size" 
+                :size="headerItem?.tableForm?.size"
                 :name="headerItem?.tableForm?.name"
-                :checked="headerItem?.tableForm?.checked">
+                :checked="headerItem?.tableForm?.checked"
+              >
                 {{ item.label }}
               </el-checkbox>
             </el-checkbox-group>
           </el-form-item>
           <!-- table表添加操作列 -->
           <!-- <el-form-item> -->
-            <div v-if="headerItem?.tableForm?.type == 'action'" :key="headerItem.field+$index">
-              <el-button
-                v-for="(itemButton, indexButton) in headerItem?.tableForm?.buttonText.split('|')"
-                :key="indexButton"
-                type="text"
-                style="padding-top: 0px;align-items:unsafe;"
-                @click="buttonOperationClick(row, headerItem?.tableForm?.buttonName.split('|')[indexButton], $index)"
-              >{{itemButton}}</el-button>
-            </div>
+          <div v-if="headerItem?.tableForm?.type == 'action'" :key="headerItem.field + $index">
+            <el-button
+              v-for="(itemButton, indexButton) in headerItem?.tableForm?.buttonText.split('|')"
+              :key="indexButton"
+              type="text"
+              style="padding-top: 0px; align-items: unsafe"
+              @click.stop="
+                buttonOperationClick(
+                  row,
+                  headerItem?.tableForm?.buttonName.split('|')[indexButton],
+                  $index
+                )
+              "
+              >{{ itemButton }}</el-button
+            >
+          </div>
           <!-- </el-form-item> -->
         </el-form>
       </el-table-column>
       <!-- 删除按钮 -->
       <el-table-column
-        fixed="right" 
+        fixed="right"
         :label="t('ts.操作')"
         align="center"
-        :width="60" 
-        v-if="isShowReduceButtonSelection" 
+        :width="60"
+        v-if="isShowReduceButtonSelection"
         v-slot="{ row, $index }"
       >
-        <ButtonBase :Butttondata="[defaultButtons.mainListDeleteBtn(),]" @button-base-click="handleDeleteTable (row, $index)" />
+        <ButtonBase
+          :Butttondata="[defaultButtons.mainListDeleteBtn()]"
+          @button-base-click="handleDeleteTable(row, $index)"
+        />
       </el-table-column>
     </el-table>
     <!-- :page-sizes="[ 10,20, 30, 50, 100]" sizes-->
-    <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"
-        />
-    <div class="button flex" v-if="isShowButton||isShowReduceButtonSelection">
-      <div class="p-12px" v-if="isShowButton" @click="handleAddTable">
-        <Icon icon="ep:circle-plus" color="#409eff" size="26" style="cursor: pointer;" />
-        <div>{{t('ts.添加明细')}}</div>
+    <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"
+    />
+    <div class="button flex" v-if="isShowButton || isShowReduceButtonSelection">
+      <div class="p-12px" v-if="isShowButton" @click.stop="handleAddTable">
+        <Icon icon="ep:circle-plus" color="#409eff" size="26" style="cursor: pointer" />
+        <div>{{ t('ts.添加明细') }}</div>
       </div>
-      <div class="p-12px" v-if="isShowReduceButtonSelection" @click="handleSelectionDelete">
-        <Icon icon="ep:delete" color="#409eff" size="26" style="cursor: pointer;" />
-        <div>{{t('ts.批量删除')}}</div>
+      <div class="p-12px" v-if="isShowReduceButtonSelection" @click.stop="handleSelectionDelete">
+        <Icon icon="ep:delete" color="#409eff" size="26" style="cursor: pointer" />
+        <div>{{ t('ts.批量删除') }}</div>
       </div>
-      <div class="p-12px" v-if="routeName == 'PurchaseMain'||routeName == 'ProductionMain'||routeName == 'ZZBJDeliverPlanMain'||routeName == 'DeliverPlanMain'||routeName == 'DeliverRequestMain'||routeName == 'ZZBJDeliverRequestMain'||routeName == 'UnplannedreceiptRequestMain'">
-        <el-input v-model="keyWord" style="width: 240px" placeholder="回车自动添加"/>
-        <el-button type="primary" style="margin-left: 10px" @click="batchAdd">{{t('批量添加')}}</el-button>
+      <div
+        class="p-12px"
+        v-if="
+          routeName == 'PurchaseMain' ||
+          routeName == 'ProductionMain' ||
+          routeName == 'ZZBJDeliverPlanMain' ||
+          routeName == 'DeliverPlanMain' ||
+          routeName == 'DeliverRequestMain' ||
+          routeName == 'ZZBJDeliverRequestMain' ||
+          routeName == 'UnplannedreceiptRequestMain'
+        "
+      >
+        <el-input v-model="keyWord" style="width: 240px" placeholder="回车自动添加" />
+        <el-button type="primary" style="margin-left: 10px" @click.stop="batchAdd">{{
+          t('批量添加')
+        }}</el-button>
       </div>
     </div>
   </div>
@@ -349,46 +428,46 @@ const props = defineProps({
   // 是否显示添加按钮
   isShowButton: {
     type: Boolean,
-    default: true,
+    default: true
   },
   // 是否显示选择框 :custom="headerItem.sortable?headerItem.sortable:false"
   selectionTable: {
     type: Boolean,
-    default: false,
+    default: false
   },
   // 是否显示序号
   isShowIndex: {
     type: Boolean,
-    default: false,
+    default: false
   },
   // 是否显示删除按钮--多选
-  isShowReduceButtonSelection:{
+  isShowReduceButtonSelection: {
     type: Boolean,
-    default: false,
+    default: false
   },
   // 是否显示删除按钮
-  isShowReduceButton:{
+  isShowReduceButton: {
     type: Boolean,
-    default: true,
+    default: true
   },
   // 加载状态
   tableLoading: {
     type: Boolean,
-    default: false,
+    default: false
   },
   // 列表数据
   tableData: {
     type: Array,
     default: () => {
       return []
-    },
+    }
   },
   // 列表头定义
   tableFields: {
     type: Array,
     default: () => {
       return []
-    },
+    }
   },
   // table高度
   height: {
@@ -396,7 +475,7 @@ const props = defineProps({
     default: () => {
       return '200'
     }
-  }, 
+  },
   maxHeight: {
     type: [Number, String],
     default: () => {
@@ -406,7 +485,7 @@ const props = defineProps({
   // 是否有边框（可拖拽）
   border: {
     type: Boolean,
-    default: false,
+    default: false
   },
   // table输入表单的rules
   tableFormRules: {
@@ -418,7 +497,7 @@ const props = defineProps({
     type: String,
     required: false,
     default: ''
-  },
+  }
 })
 // 传递给父类
 const emit = defineEmits([
@@ -444,16 +523,16 @@ const initSelectOptions = (item) => {
   return item.dictType ? getStrDictOptions(item.dictType) : item.tableForm.initOptions
 }
 //普通下拉改变事件
-const formSelectChange = (field, val,row) => {
-  emit('formSelectChange', field, val,row)
+const formSelectChange = (field, val, row) => {
+  emit('formSelectChange', field, val, row)
 }
 // 日期改变事件
-const formFormDateChange = (field, val,row, index) => {
-  emit('formFormDateChange', field, val,row, index)
+const formFormDateChange = (field, val, row, index) => {
+  emit('formFormDateChange', field, val, row, index)
 }
 // 普通下拉失焦事件
-const tableFormSelectOnBlur = (field, val,row,index) => {
-  emit('tableFormSelectOnBlur', field, val,row,index)
+const tableFormSelectOnBlur = (field, val, row, index) => {
+  emit('tableFormSelectOnBlur', field, val, row, index)
 }
 // 数字输入-改变事件
 const inputNumberChange = (field, index, row, e) => {
@@ -465,18 +544,18 @@ const deleteTableData = ref([])
 
 // 点击selection框
 const tableSelectionChange = (val) => {
-  if(props.isShowReduceButtonSelection){
-    //勾选删除 
+  if (props.isShowReduceButtonSelection) {
+    //勾选删除
     deleteTableData.value = val
-  }else{
+  } else {
     emit('tableSelectionChange', val)
   }
 }
-const handleSelectionDelete = ()=>{
+const handleSelectionDelete = () => {
   emit('tableSelectionDelete', deleteTableData.value)
-  nextTick(()=>{
-    deleteTableData.value.forEach(row=>{
-      TableBaseComponents_Ref.value!.toggleRowSelection(row,false)
+  nextTick(() => {
+    deleteTableData.value.forEach((row) => {
+      TableBaseComponents_Ref.value!.toggleRowSelection(row, false)
     })
   })
 }
@@ -491,12 +570,25 @@ const tableSortChange = (column, prop, order) => {
 
 // 行点击
 const handleTableSelect = (row, column, event) => {
+  const selected = TableBaseComponents_Ref.value
+    ?.getSelectionRows()
+    .some((item) => item.id === row.id)
+  if (!selected) {
+    TableBaseComponents_Ref.value?.toggleRowSelection(row, true)
+  } else {
+    // 取消
+    TableBaseComponents_Ref.value?.toggleRowSelection(row, false)
+  }
   emit('handleTableSelect', row, column, event)
 }
 
 // 某个item是否禁用
 const itemIsDisabled = (colum, row) => {
-  return Boolean(colum.tableForm?.disabled) || Boolean(row.disabled) || Boolean(row['disabled_' + colum.field])
+  return (
+    Boolean(colum.tableForm?.disabled) ||
+    Boolean(row.disabled) ||
+    Boolean(row['disabled_' + colum.field])
+  )
 }
 
 // const { t } = useI18n() // 国际化
@@ -506,25 +598,27 @@ const TableBaseComponents_Ref = ref()
 const TableBaseForm_Ref = ref()
 
 /**
-   * 验证表单是否符合rules
-   * @param {*} success 如果验证【成功】走的方法
-   * @param {*} error 如果验证【不成功】走的方法
-   */
+ * 验证表单是否符合rules
+ * @param {*} success 如果验证【成功】走的方法
+ * @param {*} error 如果验证【不成功】走的方法
+ */
 
 const validateForm = () => {
   console.log(TableBaseForm_Ref.value)
-  let _lists = TableBaseForm_Ref.value?.map(v => v.validate())
-  return Promise.all(_lists).then(() => {
-    return true
-  }).catch(() => {
-    return false
-  })
+  let _lists = TableBaseForm_Ref.value?.map((v) => v.validate())
+  return Promise.all(_lists)
+    .then(() => {
+      return true
+    })
+    .catch(() => {
+      return false
+    })
 }
 // 删除数据
 const handleDeleteTable = (row, index) => {
   emit('handleDeleteTable', row, index)
-  nextTick(()=>{
-    TableBaseComponents_Ref.value!.toggleRowSelection(row,false)
+  nextTick(() => {
+    TableBaseComponents_Ref.value!.toggleRowSelection(row, false)
   })
 }
 // 添加数据
@@ -532,59 +626,67 @@ const handleAddTable = () => {
   emit('handleAddTable')
 }
 // 输入框聚焦
-const inpuFocus = (headerItem, row, index)=>{
-  if(headerItem?.tableForm?.isInpuFocusShow){
-   emit('inpuFocus', headerItem, row, index)
+const inpuFocus = (headerItem, row, index) => {
+  if (headerItem?.tableForm?.isInpuFocusShow) {
+    emit('inpuFocus', headerItem, row, index)
   }
 }
 
 // input输入失去焦点事件
-const inputStringBlur = (headerItem, val,row,index) => {
-  emit('inputStringBlur', headerItem, val,row,index)
+const inputStringBlur = (headerItem, val, row, index) => {
+  emit('inputStringBlur', headerItem, val, row, index)
 }
-const clearInput= (field, row, index) => {
-  emit('clearInput',field, row, index)
+const clearInput = (field, row, index) => {
+  emit('clearInput', field, row, index)
 }
 //点击table操作列按钮
-const buttonOperationClick = (row, label, index)=> {
-  emit("buttonOperationClick", row, label, index);
+const buttonOperationClick = (row, label, index) => {
+  emit('buttonOperationClick', row, label, index)
 }
 
-const currentPage =ref(1)
+const currentPage = ref(1)
 const pageSize = ref(10)
-const showTableData = ()=>{
-  if(props.tableData.length>10){
-    return props.tableData.slice((currentPage.value-1)*pageSize.value,currentPage.value*pageSize.value)
-  }else{
+const showTableData = () => {
+  if (props.tableData.length > 10) {
+    return props.tableData.slice(
+      (currentPage.value - 1) * pageSize.value,
+      currentPage.value * pageSize.value
+    )
+  } else {
     return props.tableData
   }
 }
 const keyWord = ref('')
-console.log(9999,props.tableFields)
-const batchAdd = ()=>{
+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')
-  if(itemCodeFields){
+  const itemCodeFields = props.tableFields.find((item) => item.field == 'itemCode')
+  const supplierFields = props.tableFields.find((item) => item.field == 'supplierCode')
+  if (itemCodeFields) {
     field = itemCodeFields.field
-  }else {
-    if(itemCodeFields){
+  } else {
+    if (itemCodeFields) {
       field = supplierFields.field
     }
   }
-console.log(field)
-  emit('batchAdd',keyWord.value)
+  console.log(field)
+  emit('batchAdd', keyWord.value)
 }
-const disabledInput=(headerItem,row)=>{
-   if(headerItem.tableForm?.isInpuFocusShow){
-    if(headerItem.tableForm?.enterSearch){
+const disabledInput = (headerItem, row) => {
+  if (headerItem.tableForm?.isInpuFocusShow) {
+    if (headerItem.tableForm?.enterSearch) {
       return false
-    }else{
+    } else {
       return true
     }
-  }else{
-   return headerItem?.tableForm?.disabled || Boolean(row.disabled) || Boolean(row['disabled_' + headerItem.field]) ||false
+  } else {
+    return (
+      headerItem?.tableForm?.disabled ||
+      Boolean(row.disabled) ||
+      Boolean(row['disabled_' + headerItem.field]) ||
+      false
+    )
   }
 }
 
@@ -594,13 +696,12 @@ defineExpose({
   validateForm,
   keyWord
 })
-
 </script>
 
 
 <style scoped lang="scss">
-::v-deep(.el-table__body){
-  padding:10px 0px
+::v-deep(.el-table__body) {
+  padding: 10px 0px;
 }
 ::v-deep(.el-table--default .el-table__cell) {
   padding: 2px 0px;
@@ -623,20 +724,23 @@ defineExpose({
   display: block;
 }
 
+.table-form ::v-deep(.is-horizontal) {
+  height: 12px !important;
+  display: block !important;
+}
+
 .button {
-  >div {
+  > div {
     display: flex;
     align-items: center;
     justify-content: center;
     cursor: pointer;
 
-    >div {
+    > div {
       margin-left: 6px;
       text-decoration: underline;
       color: #409eff;
     }
   }
-
-
 }
 </style>
diff --git a/src/components/XButton/src/ButtonBase.vue b/src/components/XButton/src/ButtonBase.vue
index 5741536c4..4aa3d3700 100644
--- a/src/components/XButton/src/ButtonBase.vue
+++ b/src/components/XButton/src/ButtonBase.vue
@@ -8,7 +8,7 @@
       :disabled="item.disabled"
       v-hasPermi="[item.hasPermi] || []"
       v-if="item.name != 'set'"
-      @click="buttonBaseClick(item.name, item, $event)"
+      @click.stop="buttonBaseClick(item.name, item, $event)"
     >
       <Icon v-if="item.icon" :icon="item.icon" class="mr-1px" />
       <span :style="{width:item.width+'px'||'auto'}" :class="[item.width?'ellipsis':'']">{{ item.label }}</span>

From 050e600b64b4bdb03abb7c75acef11354ff770de Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 2 Jul 2024 14:21:04 +0800
Subject: [PATCH 094/408] =?UTF-8?q?WMS=E3=80=81SCP=E4=B8=AD=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=E5=BC=B9=E5=87=BA=E9=A1=B5=E6=9C=80=E5=A4=A7=E5=8C=96?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E5=AE=BD=E5=BA=A6=E5=92=8C=E9=AB=98=E5=BA=A6?=
 =?UTF-8?q?=E9=83=BD=E8=A6=81=E5=B1=95=E7=A4=BA=E5=88=B0=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=99=A8=E7=9A=84=E6=9C=80=E5=A4=A7=E5=AE=BD=E5=BA=A6=E5=92=8C?=
 =?UTF-8?q?=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../strategy/arrivalInspectionStrategy/AddForm.vue           | 4 ++--
 .../strategySetting/strategy/batchStrategy/AddForm.vue       | 4 ++--
 .../strategySetting/strategy/downShelfStrategy/AddForm.vue   | 4 ++--
 .../strategySetting/strategy/inspectStrategy/AddForm.vue     | 4 ++--
 .../strategy/manageAccuracyStrategy/AddForm.vue              | 4 ++--
 .../strategy/purchaseReceiptStrategy/AddForm.vue             | 4 ++--
 .../strategy/repairMaterialStrategy/AddForm.vue              | 4 ++--
 .../strategy/storageCapacityStrategy/AddForm.vue             | 4 ++--
 .../strategy/supplieDeliveryStrategy/AddForm.vue             | 4 ++--
 .../strategySetting/strategy/upShelfStrategy/AddForm.vue     | 4 ++--
 .../strategy/utensilCapacityStrategy/AddForm.vue             | 4 ++--
 .../strategy/warehouseStorageStrategy/AddForm.vue            | 4 ++--
 .../purchasereceipt/purchasereceiptRequestMain/index.vue     | 4 ++--
 .../supplierdeliver/supplierdeliverRequestMain/index.vue     | 4 ++--
 .../supplierdeliverRequestMain.data.ts                       | 5 -----
 15 files changed, 28 insertions(+), 33 deletions(-)

diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue
index 1998ec241..e234111d0 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue
@@ -1,7 +1,7 @@
 <!-- 到货验货任务拆分策略弹出层 -->
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px">
-    <div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto">
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="700px">
+    <div class="p-20px m--10px" style="max-height: 80vh; overflow-y: auto">
       <!-- 规则 -->
       <el-form
         ref="formRef"
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue
index d3c0436e3..c6a57b807 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue
@@ -1,7 +1,7 @@
 <!-- 批次策略弹窗 -->
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 800px">
-    <div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto">
+  <Dialog :title="dialogTitle" v-model="dialogVisible"  width="800px">
+    <div class="p-20px m--10px" style="max-height: 80vh; overflow-y: auto">
       <el-form
         ref="formRef"
         :model="formData"
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
index d78685b60..7034e3a20 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
@@ -1,7 +1,7 @@
 <!-- 下架策略弹窗 -->
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px">
-    <div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto">
+  <Dialog :title="dialogTitle" v-model="dialogVisible"  width="700px">
+    <div class="p-20px m--10px" style="max-height: 80vh; overflow-y: auto">
       <el-form
         ref="formRef"
         :model="formData"
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue
index 243fb7e38..4aa292de6 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue
@@ -1,8 +1,8 @@
 
 <!-- 检验策略弹窗 -->
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 800px">
-    <div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto">
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="800px" >
+    <div class="p-20px m--10px" style="max-height: 80vh; overflow-y: auto">
       <el-form
         ref="formRef"
         :model="formData"
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue
index 7e348f673..bf650795a 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue
@@ -1,7 +1,7 @@
 <!-- 管理精度策略弹窗 -->
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px">
-    <div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto">
+  <Dialog :title="dialogTitle" v-model="dialogVisible"  width="700px">
+    <div class="p-20px m--10px" style="max-height: 80vh; overflow-y: auto">
       <el-form
         ref="formRef"
         :model="formData"
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue
index 8803a29f9..53ba2e1e5 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue
@@ -1,8 +1,8 @@
 
 <!-- 采购收货任务拆分策略弹出层 -->
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px">
-    <div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto">
+  <Dialog :title="dialogTitle" v-model="dialogVisible"  width="700px">
+    <div class="p-20px m--10px" style="max-height: 80vh; overflow-y: auto">
       <!-- 规则 -->
       <el-form
         ref="formRef"
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue
index 92c82e6bb..425e9de1b 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue
@@ -1,7 +1,7 @@
 <!-- 补料策略弹窗 -->
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px">
-    <div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto">
+  <Dialog :title="dialogTitle" v-model="dialogVisible"  width="700px">
+    <div class="p-20px m--10px" style="max-height: 80vh; overflow-y: auto">
       <el-form
         ref="formRef"
         :model="formData"
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue
index bf94f6038..e1345aa07 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue
@@ -1,7 +1,7 @@
 <!-- 存储容量策略弹窗 -->
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px">
-    <div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto">
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="700px">
+    <div class="p-20px m--10px" style="max-height: 80vh; overflow-y: auto">
       <el-form
         ref="formRef"
         :model="formData"
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue
index c5c0335e4..9f88fa00e 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue
@@ -1,8 +1,8 @@
 
 <!-- 采购计划策略弹出层 -->
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 800px">
-    <div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto">
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="800px">
+    <div class="p-20px m--10px" style="max-height: 80vh; overflow-y: auto">
       <el-form
         ref="formRef"
         :model="formData"
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
index 25caa4ea5..df5e5630c 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
@@ -1,7 +1,7 @@
 <!-- 上架策略弹窗 -->
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px">
-    <div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto">
+  <Dialog :title="dialogTitle" v-model="dialogVisible"  width="700px">
+    <div class="p-20px m--10px" style="max-height: 80vh; overflow-y: auto">
       <el-form
         ref="formRef"
         :model="formData"
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue
index 499539ab3..9daeab9a7 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue
@@ -1,7 +1,7 @@
 <!-- 器具容量策略弹窗 -->
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px">
-    <div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto">
+  <Dialog :title="dialogTitle" v-model="dialogVisible"  width="700px">
+    <div class="p-20px m--10px" style="max-height: 80vh; overflow-y: auto">
       <el-form
         ref="formRef"
         :model="formData"
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue
index 2dcd7642c..6ccb3627a 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue
@@ -1,7 +1,7 @@
 <!-- 库位存储策略弹窗弹窗 -->
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px">
-    <div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto">
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="700px">
+    <div class="p-20px m--10px" style="max-height: 80vh; overflow-y: auto">
       <el-form
         ref="formRef"
         :model="formData"
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
index 27b1a655d..7e3031b00 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
@@ -127,7 +127,7 @@
     :isShowFooterButtton="false"
   />
   <!-- 标签打印 -->
-  <SearchTable style="width:905px" ref="searchTableRef" @searchTableSuccess="searchTableSuccess1" />
+  <SearchTable width="905px" ref="searchTableRef" @searchTableSuccess="searchTableSuccess1" />
   <el-dialog
       v-model="showQualityReport"
       :title="t('质检明细')"
@@ -459,7 +459,7 @@ const labelPrint = async (row) => {
   tableObject.loading = false
   const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns
   tableColumns.forEach((item) => {
-    item.width = item.table?.width || 150
+    item.width = item.table?.width
   })
   searchTableRef.value.openData("标签信息",tableObjectPrint,{tableColumns},true)
 }
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index e3dd21a14..da4d98c40 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -154,7 +154,7 @@
   </BasicForm>
 
   <!-- 标签打印 -->
-  <SearchTable style="width:905px" ref="searchTableRef" @searchTableSuccess="searchTableSuccess1" >
+  <SearchTable width="905px" ref="searchTableRef" @searchTableSuccess="searchTableSuccess1" >
     <!-- <template #actions>
       <el-button type="primary" @click="printAllClick">打印全部</el-button>
     </template> -->
@@ -894,7 +894,7 @@ const labelPrint = async (row) => {
   tableObject.loading = false
   const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns
   tableColumns.forEach((item) => {
-    item.width = item.table?.width || 150
+    item.width = item.table?.width
   })
   searchTableRef.value.openData(t('ts.标签信息'),tableObjectPrint,{tableColumns},true)
 }
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index a1c199d2f..12e3371d4 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -1694,7 +1694,6 @@ export const SupplierdeliverRequestPackage = useCrudSchemas(reactive<CrudSchema[
     sort: 'custom',
     isSearch: true,
     table: {
-      width: 180,
       fixed: 'left'
     },
   },
@@ -1704,7 +1703,6 @@ export const SupplierdeliverRequestPackage = useCrudSchemas(reactive<CrudSchema[
     sort: 'custom',
     isSearch: true,
     table: {
-      width: 150,
     },
   },
 {
@@ -1713,7 +1711,6 @@ export const SupplierdeliverRequestPackage = useCrudSchemas(reactive<CrudSchema[
     sort: 'custom',
     isSearch: true,
     table: {
-      width: 150,
     },
   },
   {
@@ -1721,7 +1718,6 @@ export const SupplierdeliverRequestPackage = useCrudSchemas(reactive<CrudSchema[
     field: 'qty',
     sort: 'custom',
     table: {
-      width: 150,
     },
   },
   {
@@ -1734,7 +1730,6 @@ export const SupplierdeliverRequestPackage = useCrudSchemas(reactive<CrudSchema[
       component: 'SelectV2'
     },
     table: {
-      width: 150,
     },
   },
 

From d25fabec42e63bc7c7be4a5de18627d39ae69b1b Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Tue, 2 Jul 2024 14:53:57 +0800
Subject: [PATCH 095/408] =?UTF-8?q?=E5=A4=87=E6=96=99=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E7=8F=AD=E6=AC=A1/=E7=8F=AD=E7=BB=84=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../preparetoissueMain/preparetoissueMain.data.ts    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts
index 5eb6c75f2..ddf2e9d2c 100644
--- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts
+++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts
@@ -442,12 +442,12 @@ export const PreparetoissueMainRules = reactive({
   prodLine: [
     {required: true, message: '请选择生产线', trigger: 'change'}
   ],
-  shift: [
-    {required: true, message: '请选择班次', trigger: 'change'}
-  ],
-  team: [
-    {required: true, message: '请选择班组', trigger: 'change'}
-  ],
+  // shift: [
+  //   {required: true, message: '请选择班次', trigger: 'change'}
+  // ],
+  // team: [
+  //   {required: true, message: '请选择班组', trigger: 'change'}
+  // ],
   planDate: [
     {required: true, message: '请输入计划日期', trigger: 'change'}
   ],

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 096/408] =?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 097/408] =?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 eca2457c22c1df27df55f7da3f5a918e98128e1c Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 2 Jul 2024 15:51:21 +0800
Subject: [PATCH 098/408] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/user/index.vue | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 632aa0442..44b6e5f7a 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -90,9 +90,10 @@
   </el-row>
 
   <!-- 添加或修改用户对话框 -->
-  <UserForm ref="formRef" @success="getList" />
-  <!-- 用户导入对话框 -->
-  <UserImportForm ref="importFormRef" @success="getList" />
+  <!-- <UserForm ref="formRef" @success="getList" /> -->
+   <!-- 导入 -->
+   <ImportForm ref="importFormRef" url="/system/user/import" :updateIsDisable='true' :coverIsDisable='true'  :mode='2' :importTemplateData="importTemplateData" @success="importSuccess" />
+
   <!-- 分配角色 -->
   <UserAssignRoleForm ref="assignRoleFormRef" @success="getList" />
 </template>
@@ -105,6 +106,7 @@ import { CommonStatusEnum } from '@/utils/constants'
 import * as UserApi from '@/api/system/user'
 import UserForm from './UserForm.vue'
 import UserImportForm from './UserImportForm.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import UserAssignRoleForm from './UserAssignRoleForm.vue'
 import DeptTree from './DeptTree.vue'
 
@@ -168,7 +170,11 @@ const importFormRef = ref()
 const handleImport = () => {
   importFormRef.value.open()
 }
-
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '用户导入模版.xlsx'
+})
 /** 修改用户状态 */
 const handleStatusChange = async (row: UserApi.UserVO) => {
   try {
@@ -252,9 +258,14 @@ const assignRoleFormRef = ref()
 const handleRole = (row: UserApi.UserVO) => {
   assignRoleFormRef.value.open(row)
 }
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
 
 /** 初始化 */
-onMounted(() => {
+onMounted(async() => {
   getList()
+  importTemplateData.templateUrl = await UserApi.importUserTemplate()
 })
 </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 099/408] =?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 02aa3b162f89dd4f7427d0d76825be74747d21bf Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Tue, 2 Jul 2024 17:40:37 +0800
Subject: [PATCH 100/408] =?UTF-8?q?EAM=20=E2=80=94=E2=80=94>=20=20?=
 =?UTF-8?q?=E5=B7=A1=E6=A3=80=20=E7=82=B9=E6=A3=80=20=E4=BF=9D=E5=85=BB?=
 =?UTF-8?q?=E6=96=B9=E6=A1=88=20=E5=A2=9E=E5=8A=A0=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/eam/classTypeRole/index.ts            |  8 ++-
 src/api/eam/inspectionItemSelectSet/index.ts  | 10 ++++
 src/api/eam/maintenanceItemSelectSet/index.ts | 12 +++-
 src/api/eam/spotCheckSelectSet/index.ts       | 11 ++++
 .../itemSelectSetForm.vue                     | 38 +++++-------
 .../itemSelectSetForm.vue                     | 31 +++++-----
 .../itemSelectSetForm.vue                     | 27 ++++++---
 src/views/eam/classTypeRole/index.vue         | 58 +++++++++++++++++--
 .../equipmentManufacturer.data.ts             |  2 +-
 .../eam/inspectionItem/inspectionItem.data.ts | 23 ++++++--
 src/views/eam/item/index.vue                  |  2 +-
 .../maintenanceItem/maintenanceItem.data.ts   | 19 +++++-
 .../itemSelectSetForm.vue                     |  6 +-
 .../eam/spotCheckItem/spotCheckItem.data.ts   | 23 ++++++--
 14 files changed, 199 insertions(+), 71 deletions(-)

diff --git a/src/api/eam/classTypeRole/index.ts b/src/api/eam/classTypeRole/index.ts
index 506a8abe3..c6dd9393c 100644
--- a/src/api/eam/classTypeRole/index.ts
+++ b/src/api/eam/classTypeRole/index.ts
@@ -61,4 +61,10 @@ export const exportClassTypeRole = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/eam/basic/class-type-role/get-import-template' })
-}
\ No newline at end of file
+}
+
+
+// 启用 / 禁用
+export const updateEnableCode = async (data: ClassTypeRoleVO) => {
+  return await request.post({ url: `/eam/basic/class-type-role/ables` , data })
+}
diff --git a/src/api/eam/inspectionItemSelectSet/index.ts b/src/api/eam/inspectionItemSelectSet/index.ts
index c3e897706..f02a16672 100644
--- a/src/api/eam/inspectionItemSelectSet/index.ts
+++ b/src/api/eam/inspectionItemSelectSet/index.ts
@@ -58,3 +58,13 @@ export const importTemplate = () => {
 export const updateEnableCode = async (data: InspectionItemSelectSetVO) => {
   return await request.post({ url: `/eam/basic/inspection-item-select-set/ables` , data })
 }
+
+// 查询巡检项选择集列表
+export const getInspectionItemSelectSetList = async (params) => {
+  return  await request.get({ url: `/eam/basic/inspection-item/getList`, params })
+}
+
+// 查询巡检方案项列表
+export const getRalInspectionOptionItemList = async (params) => {
+  return  await request.get({url: `/eam/relation-inspection-option-item/getList?optionCode=` + params})
+}
diff --git a/src/api/eam/maintenanceItemSelectSet/index.ts b/src/api/eam/maintenanceItemSelectSet/index.ts
index 35f0c9817..b3a67ce24 100644
--- a/src/api/eam/maintenanceItemSelectSet/index.ts
+++ b/src/api/eam/maintenanceItemSelectSet/index.ts
@@ -56,5 +56,15 @@ export const importTemplate = () => {
 
 // 启用 / 禁用
 export const updateEnableCode = async (data: MaintenanceItemSelectSetVO) => {
-  return await request.post({ url: `/eam/basic/inspection-item-select-set/ables` , data })
+  return await request.post({ url: `/eam/basic/maintenance-item-select-set/ables` , data })
+}
+
+// 查询保养项选择集列表
+export const getMaintenanceItemSelectSetList = async (params) => {
+  return  await request.get({ url: `/eam/basic/maintenance-item/getList`, params })
+}
+
+// 查询保养方案项列表
+export const getRalMaintenanceOptionItemList = async (params) => {
+  return  await request.get({url: `/eam/relation-maintenance-option-item/getList?optionCode=` + params})
 }
diff --git a/src/api/eam/spotCheckSelectSet/index.ts b/src/api/eam/spotCheckSelectSet/index.ts
index be9a0ccb3..dd6a604fa 100644
--- a/src/api/eam/spotCheckSelectSet/index.ts
+++ b/src/api/eam/spotCheckSelectSet/index.ts
@@ -59,3 +59,14 @@ export const importTemplate = () => {
 export const updateEnableCode = async (data: BasicSpotCheckSelectSetVO) => {
   return await request.post({ url: `/eam/basic/spot-check-select-set/ables` , data })
 }
+
+
+// 查询点检项选择集列表
+export const getSpotCheckSelectSetList = async (params) => {
+  return  await request.get({ url: `/eam/basic/spot-check-item/getList`, params })
+}
+
+// 查询点检方案项列表
+export const getRalSpotCheckOptionItemList = async (params) => {
+  return  await request.get({url: `/eam/relation-spotCheck-option-item/getList?optionCode=` + params})
+}
diff --git a/src/views/eam/basicInspectionOption/itemSelectSetForm.vue b/src/views/eam/basicInspectionOption/itemSelectSetForm.vue
index 357c89e66..98b843924 100644
--- a/src/views/eam/basicInspectionOption/itemSelectSetForm.vue
+++ b/src/views/eam/basicInspectionOption/itemSelectSetForm.vue
@@ -65,7 +65,7 @@
         </el-col>
       </el-row>
     </el-form>
-    <el-table :data="inspectionItemData" style="width: 100%; height: 80%">
+    <el-table :data="inspectionItemData" style="width: 100%; height: 200px">
       <el-table-column prop="itemCode" label="巡检项ID" />
       <el-table-column prop="itemName" label="巡检名称" />
       <el-table-column prop="isSelectd" label="" width="150" >
@@ -83,15 +83,6 @@
         </template>
       </el-table-column>
     </el-table>
-    <el-pagination
-      small
-      :page-size="3"
-      background
-      layout="prev, pager, next"
-      :total="5"
-      class="mt-4"
-      @current-change="handleGroupPageChange"
-    />
     <template #footer>
       <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
@@ -109,6 +100,7 @@ import { SearchTable } from '@/components/SearchTable'
 import { InspectionItemSelectSet} from "@/views/eam/inspectionItemSelectSet/inspectionItemSelectSet.data";
 import * as inspectionItemItemSelectSetApi from "@/api/eam/inspectionItemSelectSet";
 import {ElInput} from "element-plus";
+import {ref} from "vue";
 
 
 defineOptions({ name: 'TeamForm' })
@@ -128,6 +120,7 @@ const isDisabled = ref(false)
 const InputRef = ref<InstanceType<typeof ElInput>>()
 //巡检项相关参数
 const inspectionItemData = ref([])
+const itemsId = ref('')
 
 const itemData = ref({
   id: '',
@@ -216,7 +209,6 @@ const addItemCommon = (multiple,field) => {
 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
   nextTick?.(async () => {
     if (formField === 'xunJianItem') {
-      let itemsId = '';
       //选择集ID赋值
       val.forEach(item => {
         const isExist = tags.value.some(tag => tag.id === item.id);
@@ -227,19 +219,22 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           tags.value = [];
           tags.value.push(newItem);
         }
-        itemsId = item.itemCode;
+        itemsId.value = item.itemCode;
       });
+      inspectionItemData.value = [];
+      let query = {
+        itemsId: itemsId.value
+      }
+      let res = await inspectionItemItemSelectSetApi.getInspectionItemSelectSetList(query)
+
       //巡检项赋值
       try {
           formLoading.value = true;
-          inspectionItemData.value = [];
-          for (const item of itemsId.split(",")) {
-            let res = await request.get({url: `/eam/basic/inspection-item/get?id=` + item})
-            console.log(res)
+          for (const item of res) {
             const newItem = {};
-            newItem['itemCode'] = res.id;
-            newItem['itemName'] = res.name;
-            newItem['equipmentParts'] = res.equipmentParts;
+            newItem['itemCode'] = item.id;
+            newItem['itemName'] = item.name;
+            newItem['equipmentParts'] = item.equipmentParts;
             newItem['isSelectd'] = true;
             inspectionItemData.value.push(newItem);
           }
@@ -285,7 +280,7 @@ const open = async (type: string, row?: object) => {
         formLoading.value = false
     }
     //添加巡检项
-    let res = await request.get({url: `/eam/relation-inspection-option-item/getList?optionCode=` + row.code})
+    let res = await inspectionItemItemSelectSetApi.getRalInspectionOptionItemList(row.code)
     try {
         inspectionItemData.value = [];
         formLoading.value = true;
@@ -320,7 +315,6 @@ const submitForm = async () => {
     message.warning('巡检项最多10个');
     return
   }
-
   //赋值 巡检选择集ID
   formData.value.selectId = tags.value[0].selectId
   // 提交请求
@@ -328,7 +322,7 @@ const submitForm = async () => {
   try {
     if (formType.value === 'create') {
         for (var i = 0; i < inspectionItemData.value.length; i++) {
-          inspectionItemData.value[i].optionCode = formData.value.code
+            inspectionItemData.value[i].optionCode = formData.value.code
         }
         formData.value.optionItem = inspectionItemData.value
         //新增巡检方案 及 方案与项关系
diff --git a/src/views/eam/basicMaintenanceOption/itemSelectSetForm.vue b/src/views/eam/basicMaintenanceOption/itemSelectSetForm.vue
index 884691790..11c5fbdeb 100644
--- a/src/views/eam/basicMaintenanceOption/itemSelectSetForm.vue
+++ b/src/views/eam/basicMaintenanceOption/itemSelectSetForm.vue
@@ -65,10 +65,9 @@
         </el-col>
       </el-row>
     </el-form>
-    <el-table :data="maintenanceItemData" style="width: 100%; height: 80%">
+    <el-table :data="maintenanceItemData" style="width: 100%; height: 200px">
       <el-table-column prop="itemCode" label="保养项ID" />
       <el-table-column prop="itemName" label="保养名称" />
-<!--      <el-table-column prop="equipmentParts" label="保养部位" />-->
       <el-table-column prop="isSelectd" label="" width="150" >
         <template #header>
           <span>是否必选（默认是）</span>
@@ -101,6 +100,11 @@ import { SearchTable } from '@/components/SearchTable'
 import { BasicMaintenanceItemSelectSet} from "@/views/eam/maintenanceItemSelectSet/maintenanceItemSelectSet.data";
 import * as maintenanceItemSelectSetApi from "@/api/eam/maintenanceItemSelectSet";
 import {ElInput} from "element-plus";
+import {ref} from "vue";
+import {
+  getMaintenanceItemSelectSetList,
+  getRalMaintenanceOptionItemList
+} from "@/api/eam/maintenanceItemSelectSet";
 
 defineOptions({ name: 'TeamForm' })
 
@@ -119,6 +123,7 @@ const isDisabled = ref(false)
 const InputRef = ref<InstanceType<typeof ElInput>>()
 //保养项相关参数
 const maintenanceItemData = ref([])
+const itemsId = ref('')
 
 const itemData = ref({
   id: '',
@@ -159,8 +164,6 @@ const basicFormRef = ref() // 表单 Ref
 
 /** 删除巡检项 */
 const handleClose = (id: string) => {
-  console.log(id)
-  console.log(tags)
   const index = tags.value.findIndex(tag => tag.selectId === id);
   if (index !== -1) {
     tags.value.splice(index, 1);
@@ -209,7 +212,6 @@ const addItemCommon = (multiple,field) => {
 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
   nextTick?.(async () => {
     if (formField === 'baoYangItem') {
-      let itemsId = '';
       //选择集ID赋值
       val.forEach(item => {
         const isExist = tags.value.some(tag => tag.id === item.id);
@@ -220,18 +222,21 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           tags.value = [];
           tags.value.push(newItem);
         }
-        itemsId = item.itemCode;
+        itemsId.value = item.itemCode;
       });
+      maintenanceItemData.value = []
+      let query = {
+        itemsId: itemsId.value
+      }
+      let res = await maintenanceItemSelectSetApi.getMaintenanceItemSelectSetList(query);
       //保养项赋值
       try {
           formLoading.value = true;
-          maintenanceItemData.value = [];
-          for (const item of itemsId.split(",")) {
-            let res = await request.get({url: `/eam/basic/maintenance-item/get?id=` + item})
+          for (const item of res) {
             const newItem = {};
-            newItem['itemCode'] = res.id;
-            newItem['itemName'] = res.name;
-            newItem['equipmentParts'] = res.equipmentParts;
+            newItem['itemCode'] = item.id;
+            newItem['itemName'] = item.name;
+            newItem['equipmentParts'] = item.equipmentParts;
             newItem['isSelectd'] = true;
             maintenanceItemData.value.push(newItem);
           }
@@ -277,7 +282,7 @@ const open = async (type: string, row?: object) => {
         formLoading.value = false
     }
     //添加保养项
-    let res = await request.get({url: `/eam/relation-maintenance-option-item/getList?optionCode=` + row.code})
+    let res = await maintenanceItemSelectSetApi.getRalMaintenanceOptionItemList(row.code);
     try {
         maintenanceItemData.value = [];
         formLoading.value = true;
diff --git a/src/views/eam/basicSpotCheckOption/itemSelectSetForm.vue b/src/views/eam/basicSpotCheckOption/itemSelectSetForm.vue
index 8791031d3..cf6c18e27 100644
--- a/src/views/eam/basicSpotCheckOption/itemSelectSetForm.vue
+++ b/src/views/eam/basicSpotCheckOption/itemSelectSetForm.vue
@@ -65,7 +65,7 @@
         </el-col>
       </el-row>
     </el-form>
-    <el-table :data="spotCheckItemData" style="width: 100%; height: 80%">
+    <el-table :data="spotCheckItemData" style="width: 100%; height: 200px">
       <el-table-column prop="itemCode" label="点检项ID" />
       <el-table-column prop="itemName" label="点检名称" />
       <el-table-column prop="isSelectd" label="" width="150" >
@@ -100,6 +100,11 @@ import { BasicSpotCheckSelectSet} from "@/views/eam/spotCheckSelectSet/spotCheck
 import * as SpotCheckSelectSetApi from "@/api/eam/spotCheckSelectSet";
 import * as BasicSpotCheckOptionApi from "@/api/eam/basicSpotCheckOption";
 import {ElInput} from "element-plus";
+import {
+  getRalSpotCheckOptionItemList,
+  getSpotCheckSelectSetList
+} from "@/api/eam/spotCheckSelectSet";
+import {ref} from "vue";
 
 
 defineOptions({ name: 'TeamForm' })
@@ -119,6 +124,7 @@ const isDisabled = ref(false)
 const InputRef = ref<InstanceType<typeof ElInput>>()
 //点检项相关参数
 const spotCheckItemData = ref([])
+const itemsId = ref('')
 
 const itemData = ref({
   id: '',
@@ -209,7 +215,6 @@ const addItemCommon = (multiple,field) => {
 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
   nextTick?.(async () => {
     if (formField === 'dianJianItem') {
-      let itemsId = '';
       //选择集ID赋值
       val.forEach(item => {
         const isExist = tags.value.some(tag => tag.id === item.id);
@@ -220,18 +225,22 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           tags.value = [];
           tags.value.push(newItem);
         }
-        itemsId = item.itemCode;
+        itemsId.value = item.itemCode;
       });
+      spotCheckItemData.value = [];
+      let query = {
+        itemsId: itemsId.value
+      }
+      let res = await SpotCheckSelectSetApi.getSpotCheckSelectSetList(query);
       //点检项赋值
       try {
           formLoading.value = true;
           spotCheckItemData.value = [];
-          for (const item of itemsId.split(",")) {
-            let res = await request.get({url: `/eam/basic/spot-check-item/get?id=` + item})
+          for (const item of res) {
             const newItem = {};
-            newItem['itemCode'] = res.id;
-            newItem['itemName'] = res.name;
-            newItem['equipmentParts'] = res.equipmentParts;
+            newItem['itemCode'] = item.id;
+            newItem['itemName'] = item.name;
+            newItem['equipmentParts'] = item.equipmentParts;
             newItem['isSelectd'] = true;
             spotCheckItemData.value.push(newItem);
           }
@@ -277,7 +286,7 @@ const open = async (type: string, row?: object) => {
         formLoading.value = false
     }
     //添加点检项
-    let res = await request.get({url: `/eam/relation-spotCheck-option-item/getList?optionCode=` + row.code})
+    let res = await SpotCheckSelectSetApi.getRalSpotCheckOptionItemList(row.code);
     try {
         spotCheckItemData.value = [];
         formLoading.value = true;
diff --git a/src/views/eam/classTypeRole/index.vue b/src/views/eam/classTypeRole/index.vue
index e5e1645b1..8ac96d67b 100644
--- a/src/views/eam/classTypeRole/index.vue
+++ b/src/views/eam/classTypeRole/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -69,6 +69,7 @@ import * as roleApi from '@/api/system/role'
 import { Role } from '@/views/system/role/role.data'
 import * as WorkshopApi from '@/api/wms/workshop'
 import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data'
+import * as InspectionItemSelectSetApi from "@/api/eam/inspectionItemSelectSet";
 
 
 defineOptions({ name: 'ClassTypeRole' })
@@ -144,11 +145,23 @@ const buttonBaseClick = (val, item) => {
   }
 }
 
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.available) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
 // 列表-操作按钮
-const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'eam:class-type-role:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'eam:class-type-role:delete'}), // 删除
-]
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListEditBtn({hasPermi:'eam:class-type-role:update'}), // 编辑
+    defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'eam:class-type-role:update'}),
+    defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'eam:class-type-role:update'}),
+    // defaultButtons.mainListDeleteBtn({hasPermi:'eam:inspection-item:delete'}), // 删除
+  ]
+}
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
@@ -156,6 +169,10 @@ const buttonTableClick = async (val, row) => {
     openForm('update', row)
   } else if (val == 'delete') { // 删除
     handleDelete(row.id)
+  } else if (val == 'enable') {
+    handleEnable(row.id)
+  } else if (val == 'disable') {
+    handleDisable(row.id)
   }
 }
 
@@ -215,6 +232,37 @@ const handleDelete = async (id: number) => {
   } catch {}
 }
 
+/** 启用 */
+const handleEnable = async (id: number) => {
+  try {
+    const params = ref({
+      id: '',
+      available:'',
+    })
+    params.value.id = id
+    params.value.available = 'TRUE'
+    await ClassTypeRoleApi.updateEnableCode(params.value)
+    message.success(t('common.updateSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+/** 禁用 */
+const handleDisable = async (id: number) => {
+  try {
+    const params = ref({
+      id: '',
+      available:'',
+    })
+    params.value.id = id
+    params.value.available = 'FALSE'
+    await ClassTypeRoleApi.updateEnableCode(params.value)
+    message.success(t('common.updateSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
 /** 导出按钮操作 */
 const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
diff --git a/src/views/eam/equipmentManufacturer/equipmentManufacturer.data.ts b/src/views/eam/equipmentManufacturer/equipmentManufacturer.data.ts
index 0be8d0a86..e4c46ca4e 100644
--- a/src/views/eam/equipmentManufacturer/equipmentManufacturer.data.ts
+++ b/src/views/eam/equipmentManufacturer/equipmentManufacturer.data.ts
@@ -17,7 +17,7 @@ export const EquipmentManufacturerRules = reactive({
 export const EquipmentManufacturer = useCrudSchemas(reactive<CrudSchema[]>([
   
   {
-    label: '设备厂商编号',
+    label: '生产商编号',
     field: 'number',
     sort: 'custom',
     isSearch: true,
diff --git a/src/views/eam/inspectionItem/inspectionItem.data.ts b/src/views/eam/inspectionItem/inspectionItem.data.ts
index be37928b8..42ae531b2 100644
--- a/src/views/eam/inspectionItem/inspectionItem.data.ts
+++ b/src/views/eam/inspectionItem/inspectionItem.data.ts
@@ -11,17 +11,28 @@ deptList.value = handleTreeToComponentOptions(await DeptApi.getSimpleDeptList())
 export const InspectionItemRules = reactive({
   content: [required],
   serialNumber: [required],
-  concurrencyStamp: [required],
   type: [required],
+  name: [required],
 })
 
 export const InspectionItem = useCrudSchemas(reactive<CrudSchema[]>([
-  
+  {
+    label: 'id',
+    field: 'id',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+  },
   {
     label: '序号',
     field: 'serialNumber',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
     fixed: 'left',
     form: {
       component:'InputNumber'
@@ -72,10 +83,10 @@ export const InspectionItem = useCrudSchemas(reactive<CrudSchema[]>([
     label: '部门',
     field: 'departmentCode',
     sort: 'custom',
-    isTable: false,
-    isDetail: false,
     isSearch: false,
-    isTableForm: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
     form: {
       component: 'TreeSelect',
       componentProps: { // 假设deptList是部门数据列表
diff --git a/src/views/eam/item/index.vue b/src/views/eam/item/index.vue
index 614474248..c0df9c35b 100644
--- a/src/views/eam/item/index.vue
+++ b/src/views/eam/item/index.vue
@@ -174,7 +174,7 @@ const butttondata = (row) => {
   return [
     defaultButtons.mainListEditBtn({ hasPermi: 'basic:item:update' }), // 编辑
     // defaultButtons.chooseDeviceBtn({ hasPermi: 'basic:item:choose' }), //备件
-    defaultButtons.selectQrCodeBtn(null), //二维码
+    //defaultButtons.selectQrCodeBtn(null), //二维码
     defaultButtons.mainListDeleteBtn({ hasPermi: 'basic:item:delete' }), // 删除
     defaultButtons.viewBtn({ hide: !(row.filePathList != null && row.filePathList.length != 0) })
   ]
diff --git a/src/views/eam/maintenanceItem/maintenanceItem.data.ts b/src/views/eam/maintenanceItem/maintenanceItem.data.ts
index b3ec64f41..4232aa2ab 100644
--- a/src/views/eam/maintenanceItem/maintenanceItem.data.ts
+++ b/src/views/eam/maintenanceItem/maintenanceItem.data.ts
@@ -10,16 +10,28 @@ deptList.value = handleTreeToComponentOptions(await DeptApi.getSimpleDeptList())
 export const MaintenanceItemRules = reactive({
   content: [required],
   serialNumber: [required],
-  concurrencyStamp: [required]
+  name: [required],
 })
 
 export const MaintenanceItem = useCrudSchemas(reactive<CrudSchema[]>([
-  
+
+  {
+    label: 'id',
+    field: 'id',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+  },
   {
     label: '序号',
     field: 'serialNumber',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
     fixed: 'left',
     form: {
       component:'InputNumber'
@@ -61,6 +73,7 @@ export const MaintenanceItem = useCrudSchemas(reactive<CrudSchema[]>([
     isDetail: false,
     isSearch: false,
     isTableForm: false,
+    isForm: false,
     form: {
       component: 'TreeSelect',
       componentProps: { // 假设deptList是部门数据列表
diff --git a/src/views/eam/maintenanceItemSelectSet/itemSelectSetForm.vue b/src/views/eam/maintenanceItemSelectSet/itemSelectSetForm.vue
index 16b3a4b11..dfe3606af 100644
--- a/src/views/eam/maintenanceItemSelectSet/itemSelectSetForm.vue
+++ b/src/views/eam/maintenanceItemSelectSet/itemSelectSetForm.vue
@@ -25,7 +25,7 @@
           <el-form-item label="保养项" prop="items">
             <div class="tag-container flex gap-2">
               <el-tag v-for="ent in tags" :key="ent.content" closable :disable-transitions="false"  @close="handleClose(ent.id)">
-                {{ ent.content}}
+                {{ ent.name}}
               </el-tag>
               <el-input v-if="inputVisible" ref="InputRef" v-model="inputValue" class="w-20" size="small"/>
               <el-button v-else class="button-new-tag" size="small" @click="addItem">
@@ -145,10 +145,10 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
   nextTick?.(() => {
       if (formField === 'baoYangItem') {
           val.forEach(item => {
-            const isExist = tags.value.some(tag => tag.content === item.content);
+            const isExist = tags.value.some(tag => tag.name === item.name);
             if (!isExist){
               const newItem = {};
-              newItem['content'] = item.content;
+              newItem['name'] = item.name;
               newItem['id'] = item.id;
               tags.value.push(newItem);
             }
diff --git a/src/views/eam/spotCheckItem/spotCheckItem.data.ts b/src/views/eam/spotCheckItem/spotCheckItem.data.ts
index 51edbbba5..9f9cd7278 100644
--- a/src/views/eam/spotCheckItem/spotCheckItem.data.ts
+++ b/src/views/eam/spotCheckItem/spotCheckItem.data.ts
@@ -1,5 +1,4 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
 import { handleTreeToComponentOptions } from '@/utils/tree'
 import * as DeptApi from '@/api/system/dept'
 const deptList = ref<Tree[]>([]) // 树形结构
@@ -11,16 +10,28 @@ deptList.value = handleTreeToComponentOptions(await DeptApi.getSimpleDeptList())
 export const SpotCheckItemRules = reactive({
   content: [required],
   serialNumber: [required],
-  concurrencyStamp: [required],
   type: [required],
+  name: [required],
 })
 
 export const SpotCheckItem = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: 'id',
+    field: 'id',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+  },
   {
     label: '序号',
     field: 'serialNumber',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
     fixed: 'left',
     form: {
       component:'InputNumber'
@@ -65,10 +76,10 @@ export const SpotCheckItem = useCrudSchemas(reactive<CrudSchema[]>([
     label: '部门',
     field: 'departmentCode',
     sort: 'custom',
-    isTable: false,
-    isDetail: false,
     isSearch: false,
-    isTableForm: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
     form: {
       component: 'TreeSelect',
       componentProps: { // 假设deptList是部门数据列表

From 1b9b8cdc7b878db35e288e0316613b24911ce09c Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 3 Jul 2024 10:14:49 +0800
Subject: [PATCH 101/408] =?UTF-8?q?=E6=89=B9=E6=AC=A1=E5=9B=9E=E6=98=BE?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TableForm/src/TableForm.vue | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue
index e73b602aa..28db8d9a7 100644
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@@ -91,7 +91,7 @@
               "
               :disabled="disabledInput(headerItem, row)"
               style="flex: 1"
-              @blur.stop="inputStringBlur(headerItem, row[headerItem.field], row, index)"
+              @blur="inputStringBlur(headerItem, row[headerItem.field], row, index)"
             />
             <Icon
               icon="ep:circle-close"
@@ -101,12 +101,12 @@
                 headerItem?.tableForm?.clearable
               "
               style="position: absolute; right: 50px; cursor: pointer"
-              @click.stop="clearInput(headerItem.field, row, index)"
+              @click="clearInput(headerItem.field, row, index)"
             />
             <el-button
               :key="headerItem.field + $index + 'button'"
               v-if="headerItem?.tableForm?.isInpuFocusShow"
-              @click.stop="inpuFocus(headerItem, row, index)"
+              @click="inpuFocus(headerItem, row, index)"
               ><Icon icon="ep:search" size="14"
             /></el-button>
           </el-form-item>
@@ -123,9 +123,7 @@
               :placeholder="headerItem?.tableForm?.placeholder || '请输入' + headerItem.label"
               :disabled="itemIsDisabled(headerItem, row)"
               style="width: 100%"
-              @input.stop="row[headerItem.field] = row[headerItem.field].replace(/[^\d\.-]/g, '')"
-              @click.stop=""
-              @focus.stop=""
+              @input="row[headerItem.field] = row[headerItem.field].replace(/[^\d\.-]/g, '')"
             />
           </el-form-item>
           <!-- 数字输入框 -->
@@ -141,7 +139,7 @@
               :min="headerItem?.tableForm?.min"
               :precision="headerItem?.tableForm?.precision"
               :disabled="itemIsDisabled(headerItem, row)"
-              @change.stop="
+              @change="
                 (e) => {
                   inputNumberChange(headerItem.field, $index, row, e)
                 }
@@ -164,8 +162,8 @@
               :allow-create="headerItem?.tableForm.allowCreate"
               style="width: 100%"
               :placeholder="headerItem?.tableForm?.placeholder || '请选择' + headerItem.label"
-              @change.stop="formSelectChange(headerItem.field, $event, row)"
-              @blur.stop="tableFormSelectOnBlur(headerItem.field, $event, row, $index)"
+              @change="formSelectChange(headerItem.field, $event, row)"
+              @blur="tableFormSelectOnBlur(headerItem.field, $event, row, $index)"
             >
               <el-option
                 v-for="op in initSelectOptions(headerItem)"
@@ -194,8 +192,8 @@
               :allow-create="headerItem?.tableForm.allowCreate"
               style="width: 100%"
               :placeholder="headerItem?.tableForm?.placeholder || '请选择' + headerItem.label"
-              @change.stop="formSelectChange(headerItem.field, $event, row)"
-              @blur.stop="tableFormSelectOnBlur(headerItem.field, $event, row, $index)"
+              @change="formSelectChange(headerItem.field, $event, row)"
+              @blur="tableFormSelectOnBlur(headerItem.field, $event, row, $index)"
             >
               <el-option-group
                 v-for="group in initSelectOptions(headerItem)"
@@ -235,7 +233,7 @@
               :placeholder="headerItem?.tableForm?.placeholder || '选择日期'"
               :format="headerItem?.tableForm?.format || 'YYYY-MM-DD'"
               :value-format="headerItem?.tableForm?.valueFormat || 'YYYY-MM-DD'"
-              @change.stop="formFormDateChange(headerItem.field, $event, row, $index)"
+              @change="formFormDateChange(headerItem.field, $event, row, $index)"
             />
           </el-form-item>
           <!-- 日期时间选择器 -->

From 37e37d7530f835494cf4d87d0d4ba71c45e1a0fb Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Wed, 3 Jul 2024 13:37:15 +0800
Subject: [PATCH 102/408] =?UTF-8?q?=E5=88=B6=E5=93=81=E6=8A=A5=E5=BA=9F?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E7=8F=AD=E7=BB=84/=E7=8F=AD=E6=AC=A1?=
 =?UTF-8?q?=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productreceiptscrapRequestMain.data.ts           | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
index 2e93ad900..7896c89eb 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
@@ -485,12 +485,12 @@ export const ProductreceiptRequestMainRules = reactive({
   workshopCode: [
     { required: true, message: '请选择车间代码', trigger: 'change' }
   ],
-  team: [
-    { required: true, message: '请选择班组代码', trigger: 'change' }
-  ],
-  shift: [
-    { required: true, message: '请选择班次代码', trigger: 'change' }
-  ],
+  // team: [
+  //   { required: true, message: '请选择班组代码', trigger: 'change' }
+  // ],
+  // shift: [
+  //   { required: true, message: '请选择班次代码', trigger: 'change' }
+  // ],
   dueTime: [
     { required: true, message: '请选择截止时间', trigger: 'blur' }
   ],

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 103/408] =?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 104/408] =?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 105/408] =?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 106/408] =?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 107/408] =?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 44b7ab299c7951e76e08511c202f94c1f10aa7e9 Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Wed, 3 Jul 2024 15:35:16 +0800
Subject: [PATCH 108/408] =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=92=8C=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E5=A4=84=E7=90=86=20=E5=88=9B=E5=BB=BA=E4=BA=BA=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../saleShipmentMain.data.ts                  | 34 +++++++++++++
 .../stockupMainRequest.data.ts                | 34 +++++++++++++
 .../inventoryManage/balance/balance.data.ts   |  4 +-
 .../containerMainRequest.data.ts              | 46 +++++++++++++++++
 .../containerRecordMain.data.ts               | 34 +++++++++++++
 .../initialContainerMainRequest.data.ts       | 49 +++++++++++++++++++
 .../scrapContainerMainRequest.data.ts         | 36 +++++++++++++-
 .../packagemergeMain/packagemergeMain.data.ts | 11 ++++-
 .../packageoverJobMain.data.ts                | 10 +++-
 .../packageoverRecordMain.data.ts             |  4 +-
 .../packageoverRetrospect.data.ts             |  4 +-
 .../packagesplitMain/packagesplitMain.data.ts | 11 ++++-
 .../scrap/scrapJobMain/scrapJobMain.data.ts   |  2 +
 .../scrapRecordMain/scrapRecordMain.data.ts   | 35 +++++++++++++
 .../sparepartsrequisitionRecordMain.data.ts   | 42 ++++++++++++++--
 .../transferissueRecordMain.data.ts           | 33 +++++++++++++
 .../unplannedissueRecordMain.data.ts          | 38 +++++++++++++-
 .../unplannedreceiptRecordMain.data.ts        | 36 +++++++++++++-
 .../issue/issueJobMain/issueJobMain.data.ts   |  2 +-
 .../pick/pickJobMain/pickJobMain.data.ts      |  2 +-
 .../productionreceiptJobMain.data.ts          |  2 +-
 .../productionreceiptRecordMain.data.ts       | 10 ++--
 .../repleinshJobMain/repleinshJobMain.data.ts |  2 +-
 .../inventorychangeRecordMain.data.ts         | 34 +++++++++++++
 .../productionMain/productionMain.data.ts     |  2 +
 .../qadProductionPlanMain.data.ts             |  3 ++
 .../productputawayJobMain.data.ts             |  2 +-
 27 files changed, 498 insertions(+), 24 deletions(-)

diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts
index 947bdb2c0..00186c67c 100644
--- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts
+++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts
@@ -249,6 +249,40 @@ export const SaleShipmentMain = useCrudSchemas(reactive<CrudSchema[]>([
     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: 'action',
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
index 7cd4f747d..acdc78077 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
@@ -191,6 +191,40 @@ export const StockupMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
     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: 'deliverDate',
diff --git a/src/views/wms/inventoryManage/balance/balance.data.ts b/src/views/wms/inventoryManage/balance/balance.data.ts
index df4d67408..ed21c8de7 100644
--- a/src/views/wms/inventoryManage/balance/balance.data.ts
+++ b/src/views/wms/inventoryManage/balance/balance.data.ts
@@ -412,6 +412,7 @@ export const Balance = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     isForm: false,
+    isTable: false
   },
   {
     label: '最后更新者',
@@ -421,6 +422,7 @@ export const Balance = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isForm: false,
+    isTable: false
   },
   // TODO: 临时添加 方便操作
   {
@@ -455,4 +457,4 @@ export const BalanceRules = reactive({
   produceDate: [
     { required: true, message: '请选择生产日期', trigger: 'change' }
   ],
-})
\ No newline at end of file
+})
diff --git a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts
index 980fdaed0..ed1f59bfd 100644
--- a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts
+++ b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts
@@ -212,6 +212,9 @@ export const ContainerMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'createTime',
     sort: 'custom',
     formatter: dateFormatter,
+    detail: {
+      dateFormat : 'YYYY-MM-DD HH:mm:ss'
+    },
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -220,8 +223,51 @@ export const ContainerMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
+    isTable: true,
+    isForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    table: {
+      width: 130
+    },
+    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: '扩展属性',
diff --git a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts
index 4428b0768..e63799675 100644
--- a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts
@@ -146,6 +146,40 @@ export const ContainerRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     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: 'action',
diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts
index e15a50fe0..42a132c15 100644
--- a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts
+++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts
@@ -216,6 +216,9 @@ export const ContainerMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'createTime',
     sort: 'custom',
     formatter: dateFormatter,
+    detail: {
+      dateFormat : 'YYYY-MM-DD HH:mm:ss'
+    },
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -227,6 +230,49 @@ export const ContainerMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
     isTable:false,
     isForm: false,
   },
+  {
+    label: '创建者',
+    field: 'creator',
+    table: {
+      width: 130
+    },
+    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: 'extraProperties',
@@ -414,6 +460,9 @@ export const ContainerDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'createTime',
     sort: 'custom',
     formatter: dateFormatter,
+    detail: {
+      dateFormat : 'YYYY-MM-DD HH:mm:ss'
+    },
     search: {
       component: 'DatePicker',
       componentProps: {
diff --git a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts
index 5f91c6d30..804623d5e 100644
--- a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts
+++ b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts
@@ -226,7 +226,7 @@ export const ContainerMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
-    isTable: false,
+    isTable: true,
     isForm: false,
   },
   {
@@ -238,6 +238,40 @@ export const ContainerMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
     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: 'extraProperties',
diff --git a/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/packagemergeMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/packagemergeMain.data.ts
index a63d7609e..0dfcb1ee0 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/packagemergeMain.data.ts
+++ b/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/packagemergeMain.data.ts
@@ -195,7 +195,16 @@ export const PackagemergeMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     isForm: false
-  }
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    table: {
+      width: 130
+    },
+    isForm: false,
+    isTable: true
+  },
 ]))
 
 // 表单校验
diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts
index c8a795eeb..6ba16b567 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts
@@ -470,6 +470,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false
   },
   {
     label: '创建时间',
@@ -490,14 +491,16 @@ export const PackageoverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    isTable: false
   },
   {
     label: '最后更新者',
-    field: 'update',
+    field: 'updater',
     sort: 'custom',
     table: {
       width: 150
     },
+    isTable: false
   },
   {
     label: '最后更新时间',
@@ -518,6 +521,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    isTable: false
   },
   // {
   //   label: '操作',
@@ -778,11 +782,12 @@ export const PackageoverJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '最后更新者',
-    field: 'update',
+    field: 'updater',
     sort: 'custom',
     table: {
       width: 150
     },
+    isTable: false
   },
   {
     label: '最后更新时间',
@@ -795,6 +800,7 @@ export const PackageoverJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts
index 0cdb5f1f4..247744996 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts
@@ -206,11 +206,12 @@ export const PackageoverMain = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '最后更新者',
-    field: 'update',
+    field: 'updater',
     sort: 'custom',
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '最后更新时间',
@@ -231,6 +232,7 @@ export const PackageoverMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    isTable: false,
   },
   {
     label: '操作',
diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/packageoverRetrospect.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/packageoverRetrospect.data.ts
index 4f1f27fb9..1939227f8 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/packageoverRetrospect.data.ts
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/packageoverRetrospect.data.ts
@@ -380,11 +380,12 @@ export const PackageoverRetrospect = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '最后更新者',
-    field: 'update',
+    field: 'updater',
     sort: 'custom',
     table: {
       width: 150
     },
+    isTable: false
   },
   {
     label: '最后更新时间',
@@ -405,6 +406,7 @@ export const PackageoverRetrospect = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    isTable: false
   },
   {
     label: '操作',
diff --git a/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/packagesplitMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/packagesplitMain.data.ts
index 858b188df..7ea57ca7b 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/packagesplitMain.data.ts
+++ b/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/packagesplitMain.data.ts
@@ -196,7 +196,16 @@ export const PackagesplitMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     isForm: false
-  }
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    table: {
+      width: 130
+    },
+    isForm: false,
+    isTable: true
+  },
 ]))
 
 
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
index d98bb5715..feef35d09 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
@@ -454,6 +454,7 @@ export const ScrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    isTable: false
   },
   {
     label: '创建者',
@@ -462,6 +463,7 @@ export const ScrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false
   },
   {
     label: '最后更新时间',
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
index 2116cd297..995244733 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
@@ -223,6 +223,41 @@ export const ScrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+
+  {
+    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: 'code',
diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/sparepartsrequisitionRecordMain.data.ts b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/sparepartsrequisitionRecordMain.data.ts
index 103ae41fa..7c91283a9 100644
--- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/sparepartsrequisitionRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/sparepartsrequisitionRecordMain.data.ts
@@ -388,6 +388,7 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    isTable:false,
   },
   {
     label: '创建者',
@@ -396,6 +397,41 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
+  },
+  {
+    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: '代码',
@@ -484,7 +520,7 @@ export const UnplannedissueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     label: '单据号',
     field: 'number',
     sort: 'custom',
-    hiddenInMain:true, 
+    hiddenInMain:true,
     table: {
       width: 180
     },
@@ -672,7 +708,7 @@ export const UnplannedissueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     sort: 'custom',
     table: {
       width: 150
-    }, 
+    },
   },
   // {
   //   label: '任务明细ID',
@@ -752,4 +788,4 @@ export const UnplannedissueRecordDetailRules = reactive({
   creator: [
     { required: true, message: '请输入创建者', trigger: 'blur' }
   ],
-})
\ No newline at end of file
+})
diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts b/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts
index 817185d6b..ed12072bb 100644
--- a/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts
@@ -287,6 +287,39 @@ export const TransferissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    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',
+      }
+    },
+    isTable:false,
+    isForm: false,
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false,
+    isForm: false,
+  },
   {
     label: '是否可用',
     field: 'available',
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts
index 0952ec3d1..3564cd088 100644
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts
@@ -409,6 +409,40 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    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: 'code',
@@ -701,7 +735,7 @@ export const UnplannedissueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     sort: 'custom',
     table: {
       width: 150
-    }, 
+    },
   },
   // {
   //   label: '任务明细ID',
@@ -781,4 +815,4 @@ export const UnplannedissueRecordDetailRules = reactive({
   creator: [
     { required: true, message: '请输入创建者', trigger: 'blur' }
   ],
-})
\ No newline at end of file
+})
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
index 94435be74..35573b9bb 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
@@ -387,6 +387,40 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
   },
+  {
+    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: 'code',
@@ -833,4 +867,4 @@ export const UnplannedreceiptRecordDetailRules = reactive({
   expireDate: [
     { required: true, message: '请选择过期日期', trigger: 'change' }
   ]
-})
\ No newline at end of file
+})
diff --git a/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts b/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts
index 0cca5fb3e..8c9d6859b 100644
--- a/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts
+++ b/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts
@@ -178,7 +178,7 @@ export const IssueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '最后更新者',
-    field: 'update',
+    field: 'updater',
     sort: 'custom',
     table: {
       width: 150
diff --git a/src/views/wms/issueManage/pick/pickJobMain/pickJobMain.data.ts b/src/views/wms/issueManage/pick/pickJobMain/pickJobMain.data.ts
index 0a50534e2..9c05d2389 100644
--- a/src/views/wms/issueManage/pick/pickJobMain/pickJobMain.data.ts
+++ b/src/views/wms/issueManage/pick/pickJobMain/pickJobMain.data.ts
@@ -122,7 +122,7 @@ export const PickJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '最后更新者',
-    field: 'update',
+    field: 'updater',
     sort: 'custom',
     table: {
       width: 150
diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts
index d4a23798e..427fdf8e1 100644
--- a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts
+++ b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts
@@ -146,7 +146,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '最后更新者',
-    field: 'update',
+    field: 'updater',
     sort: 'custom',
     table: {
       width: 150
diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts
index 3aca32bcf..734aa714d 100644
--- a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts
+++ b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts
@@ -77,7 +77,7 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     label: '执行时间',
     field: 'executeTime',
     formatter: dateFormatter,
-    detai: {
+    detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     sort: 'custom',
@@ -98,7 +98,7 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     label: '生效日期',
     field: 'activeDate',
     formatter: dateFormatter2,
-    detai: {
+    detail: {
       dateFormat: 'YYYY-MM-DD'
     },
     isTable: false,
@@ -120,7 +120,7 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     label: '申请时间',
     field: 'requestTime',
     formatter: dateFormatter,
-    detai: {
+    detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     sort: 'custom',
@@ -141,7 +141,7 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     label: '截止时间',
     field: 'dueTime',
     formatter: dateFormatter,
-    detai: {
+    detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     sort: 'custom',
@@ -200,7 +200,7 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     label: '创建时间',
     field: 'createTime',
     formatter: dateFormatter,
-    detai: {
+    detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     sort: 'custom',
diff --git a/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts
index a7edac51c..a24e43277 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts
@@ -558,7 +558,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '最后更新者',
-    field: 'update',
+    field: 'updater',
     sort: 'custom',
     table: {
       width: 150
diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts b/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts
index b33d5b3ff..d0e08da04 100644
--- a/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts
+++ b/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts
@@ -194,6 +194,40 @@ export const InventorychangeRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTable: false
   },
+  {
+    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: 'code',
diff --git a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
index 1994190d0..81fbd9a61 100644
--- a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
@@ -796,6 +796,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
     hiddenInMain: true,
     isTableForm: false,
     isForm: false,
+    isTable: true
   },
   {
     label: '创建时间',
@@ -820,6 +821,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTableForm: false,
     isForm: false,
+    isTable: true,
   },
   {
     label: '是否可用',
diff --git a/src/views/wms/productionManage/productionplan/qadproductionplan/qadProductionPlanMain.data.ts b/src/views/wms/productionManage/productionplan/qadproductionplan/qadProductionPlanMain.data.ts
index e9de6fa60..21f5e26ea 100644
--- a/src/views/wms/productionManage/productionplan/qadproductionplan/qadProductionPlanMain.data.ts
+++ b/src/views/wms/productionManage/productionplan/qadproductionplan/qadProductionPlanMain.data.ts
@@ -48,6 +48,9 @@ export const QadProductionPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'planDate',
     sort: 'custom',
     formatter: dateFormatter2,
+    detail: {
+      dateFormat : 'YYYY-MM-DD'
+    },
     form: {
       component: 'DatePicker',
       componentProps: {
diff --git a/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts
index ddf7b4a66..a3386256a 100644
--- a/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts
+++ b/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts
@@ -148,7 +148,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '最后更新者',
-    field: 'update',
+    field: 'updater',
     sort: 'custom',
     table: {
       width: 150

From 8e934624716853283e73310e80d324eea1c133b6 Mon Sep 17 00:00:00 2001
From: bjang03 <259278618@qq.com>
Date: Wed, 3 Jul 2024 17:24:12 +0800
Subject: [PATCH 109/408] =?UTF-8?q?1=E3=80=81=E7=9B=98=E7=82=B9=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E5=A2=9E=E5=8A=A0=E4=BB=BB=E5=8A=A1=E6=8B=86=E5=88=86?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/countPlanMain/index.ts              |  1 +
 src/utils/dict.ts                               |  1 +
 .../count/countPlanMain/countPlanMain.data.ts   | 17 +++++++++++++++++
 3 files changed, 19 insertions(+)

diff --git a/src/api/wms/countPlanMain/index.ts b/src/api/wms/countPlanMain/index.ts
index 69cc8d502..e292f6d42 100644
--- a/src/api/wms/countPlanMain/index.ts
+++ b/src/api/wms/countPlanMain/index.ts
@@ -8,6 +8,7 @@ export interface CountPlanMainVO {
   ignoreListOfItem: string
   ignoreListOfLocation: string
   scopeList: string
+  countSplitType: string
   number: string
   businessType: string
   remark: string
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index d7a5442ae..c94fbd934 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -224,6 +224,7 @@ export enum DICT_TYPE {
   REQEUST_MODE = 'reqeust_mode', // 申请模式
   TIME_UNIT = 'time_unit', // 时间单位
   COUNT_TYPE = 'count_type', // 盘点类型
+  COUNT_SPLIT_TYPE = 'count_split_type', // 盘点拆分方式
   COUNT_SCOPE_TYPE = 'count_scope_type', // 盘点范围类型
   BARCODE_PREFIX = 'barcode_prefix', // 条码前缀
   SETTLEMENT_TYPE = 'settlement_type', // 结算类型
diff --git a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
index 124281f36..c7a00e435 100644
--- a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
+++ b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
@@ -48,6 +48,20 @@ export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true
   },
+  {
+    label: '任务拆分方式',
+    field: 'countSplitType',
+    dictType: DICT_TYPE.COUNT_SPLIT_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value:'LOCATION_CODE',
+    }
+  },
   {
     label: '',//执行周期
     field: 'crontab',
@@ -506,6 +520,9 @@ export const CountPlanMainRules = reactive({
   type: [
     { required: true, message: '请选择盘点类型', trigger: 'change' }
   ],
+  countSplitType: [
+    { required: true, message: '请选择任务拆分方式', trigger: 'change' }
+  ],
   crontab: [
     { required: false, message: '请填写执行周期', trigger:  ['change','blur'] },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],

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 110/408] =?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 d5cd87ad2a10e983bdbb1fd8238934f9a887b406 Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Wed, 3 Jul 2024 17:31:09 +0800
Subject: [PATCH 111/408] =?UTF-8?q?EAM=20=E2=80=94=E2=80=94>=20=20?=
 =?UTF-8?q?=E5=B7=A1=E6=A3=80=20=E7=82=B9=E6=A3=80=20=E4=BF=9D=E5=85=BB?=
 =?UTF-8?q?=E6=96=B9=E6=A1=88=20=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equipmentMaintenanceMain.data.ts          | 47 +++++++++---
 .../eam/equipmentMaintenanceMain/index.vue    |  6 +-
 .../equipmentMaintenanceRecordMain.data.ts    |  8 +++
 .../equipmentMaintenanceRecordMain/index.vue  | 30 ++++----
 .../equipmentRepairJobMain.data.ts            | 25 ++++++-
 .../equipmentRepairJobMain/finishForm2.vue    | 16 ++---
 .../eam/equipmentRepairJobMain/index.vue      | 10 +--
 .../equipmentRepairRecordMain.data.ts         |  8 +++
 .../eam/equipmentRepairRecordMain/index.vue   | 29 +++-----
 .../equipmentReportRepairRequest/audiForm.vue | 72 ++++++++++---------
 .../equipmentReportRepairRequest.data.ts      | 12 +++-
 .../equipmentReportRepairRequest/index.vue    | 38 +++-------
 .../eam/inspectionItem/inspectionItem.data.ts |  5 +-
 src/views/eam/maintainExperience/index.vue    | 10 +--
 .../maintainExperience.data.ts                |  8 ++-
 .../eam/planInspection/planInspection.data.ts |  8 ++-
 src/views/eam/repairExperience/index.vue      | 10 +--
 .../repairExperience/repairExperience.data.ts | 14 ++--
 .../eam/spotCheckItem/spotCheckItem.data.ts   |  5 +-
 19 files changed, 206 insertions(+), 155 deletions(-)

diff --git a/src/views/eam/equipmentMaintenanceMain/equipmentMaintenanceMain.data.ts b/src/views/eam/equipmentMaintenanceMain/equipmentMaintenanceMain.data.ts
index 33839e0b6..a0573e9e3 100644
--- a/src/views/eam/equipmentMaintenanceMain/equipmentMaintenanceMain.data.ts
+++ b/src/views/eam/equipmentMaintenanceMain/equipmentMaintenanceMain.data.ts
@@ -99,7 +99,10 @@ export const EquipmentMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '故障类型',
     field: 'faultType',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
     form: {
       componentProps: {
         isSearchList: true, // 开启查询弹窗
@@ -151,6 +154,9 @@ export const EquipmentMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     formatter: dateFormatter,
     isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -173,6 +179,9 @@ export const EquipmentMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     formatter: dateFormatter,
     isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -195,7 +204,9 @@ export const EquipmentMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     formatter: dateFormatter,
     isSearch: false,
-    isForm:false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -218,7 +229,9 @@ export const EquipmentMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     formatter: dateFormatter,
     isSearch: false,
-    isForm:false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -369,6 +382,9 @@ export const EquipmentMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'directCreateRecord',
     sort: 'custom',
     isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
   },
   {
     label: '所属厂区编号',
@@ -382,6 +398,9 @@ export const EquipmentMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'workshopCode',
     sort: 'custom',
     isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
     required: true,
     form: {
       componentProps: {
@@ -597,26 +616,38 @@ export const EquipmentMaintenanceDetail = useCrudSchemas(reactive<CrudSchema[]>(
     label: '人数',
     field: 'peoples',
     sort: 'custom',
-    isSearch: true,
-    isForm: true,
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
   },
   {
     label: '预计分钟',
     field: 'estimatedMinutes',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+
   },
   {
     label: '实际分钟',
     field: 'actualMinutes',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
   },
   {
     label: '责任人多选',
     field: 'chargePeoples',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
   },
   {
     label: '完成时间',
diff --git a/src/views/eam/equipmentMaintenanceMain/index.vue b/src/views/eam/equipmentMaintenanceMain/index.vue
index 08c0f18ec..1950e07be 100644
--- a/src/views/eam/equipmentMaintenanceMain/index.vue
+++ b/src/views/eam/equipmentMaintenanceMain/index.vue
@@ -198,14 +198,14 @@ const isShowEditStatusButton = (row) => {
 // 列表-操作按钮
 const butttondata = (row) => {
   return [
-    defaultButtons.mainListEditBtn({hide: isShowStatusButton(row,['3','4']),hasPermi:'eam:equipmentMaintenanceMain:update'}), // 编辑
+    //defaultButtons.mainListEditBtn({hide: isShowStatusButton(row,['3','4']),hasPermi:'eam:equipmentMaintenanceMain:update'}), // 编辑
     defaultButtons.mainListReceiveOrderBtn({hide: isShowStatusButton(row,['3']),hasPermi:'eam:equipmentMaintenanceMain:update'}), // 接单
     defaultButtons.mainListExecuteBtn({hide: isShowStatusButton(row,['4']),hasPermi:'eam:equipmentMaintenanceMain:update'}), // 执行
     defaultButtons.mainListCancelBtn({hide: isShowStatusButton(row,['5']),hasPermi:'eam:equipmentMaintenanceMain:update'}), //作废
     defaultButtons.mainListFinishBtn({hide: isShowStatusButton(row,['5']),hasPermi:'eam:equipmentMaintenanceMain:update'}), // 完成保养
     defaultButtons.mainListValidateBtn({hide: isShowStatusButton(row,['6']),hasPermi:'eam:equipmentMaintenanceMain:update'}), // 验证
-    defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'eam:equipmentMaintenanceMain:update'}),
-    defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'eam:equipmentMaintenanceMain:update'}),
+    //defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'eam:equipmentMaintenanceMain:update'}),
+    //defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'eam:equipmentMaintenanceMain:update'}),
   ]
 }
 
diff --git a/src/views/eam/equipmentMaintenanceRecordMain/equipmentMaintenanceRecordMain.data.ts b/src/views/eam/equipmentMaintenanceRecordMain/equipmentMaintenanceRecordMain.data.ts
index 3541eeece..699400b36 100644
--- a/src/views/eam/equipmentMaintenanceRecordMain/equipmentMaintenanceRecordMain.data.ts
+++ b/src/views/eam/equipmentMaintenanceRecordMain/equipmentMaintenanceRecordMain.data.ts
@@ -273,6 +273,14 @@ export const EquipmentMaintenanceRecordMain = useCrudSchemas(reactive<CrudSchema
     dictType: DICT_TYPE.EAM_ORDER_STATUS,
     dictClass: 'string',
   },
+  {
+    label: '保养经验',
+    field: 'isExperience',
+    sort: 'custom',
+    isSearch: true,
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+  },
   // {
   //   label: '自动接单',
   //   field: 'autoOrder',
diff --git a/src/views/eam/equipmentMaintenanceRecordMain/index.vue b/src/views/eam/equipmentMaintenanceRecordMain/index.vue
index 1495f5c68..230d20ae4 100644
--- a/src/views/eam/equipmentMaintenanceRecordMain/index.vue
+++ b/src/views/eam/equipmentMaintenanceRecordMain/index.vue
@@ -32,8 +32,8 @@
           <span>{{ row.recordNo }}</span>
         </el-button>
       </template>
-      <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -88,6 +88,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'
+import {maintainExperienceBtn} from "@/utils/disposition/defaultButtons";
 
 defineOptions({ name: 'EquipmentMaintenanceRecordMain' })
 
@@ -154,21 +155,16 @@ const buttonBaseClick = (val, item) => {
   }
 }
 
-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.repairExperienceBtn({ hide:isShowMainButton(row,['0']),hasPermi: 'eam:equipmentMaintenanceRecordMain:maintainExperience' }) // 生成维修经验
-    ]
+const butttondata = (row) => {
+  return [
+    defaultButtons.maintainExperienceBtn({ hide:isShowMainButton(row),hasPermi: 'eam:equipmentMaintenanceRecordMain:maintainExperience' }) // 生成保养经验
+  ]
 }
-// 根据状态返回该按钮是否显示
-const isShowMainButton = (row,val) => {
-  console.log(row.isExperience)
-  if (val.indexOf(row.isExperience) > -1) {
+// 根据经验状态返回该按钮是否显示
+const isShowMainButton = (row) => {
+  if (row.isExperience === 'FALSE') {
     return false
-  } else {
+  } else{
     return true
   }
 }
@@ -189,7 +185,7 @@ const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
   basicFormRef.value.open(type, row)
 }
-//打开维修经验坦诚
+//打开维修经验弹窗
 const maintainExperienceFormRef = ref()
 const openMaintainExperience = (type: string, row?: any) => {
   maintainExperienceFormRef.value.open(type, row)
@@ -225,7 +221,6 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 // 新增生成维修经验
 const maintainExperienceFormsSuccess = async (formType, data) => {
-  console.log(data)
   const data1 = {
     maintainRecordNumber: data.recordNo,
     name: data.name,
@@ -233,7 +228,6 @@ const maintainExperienceFormsSuccess = async (formType, data) => {
     masterId: data.id,
     orderType: 'MAINTAIN',
   }
-  console.log(data1)
   try {
     await MaintainExperienceApi.createMaintainExperience(data1)
     message.success(t('common.createSuccess'))
diff --git a/src/views/eam/equipmentRepairJobMain/equipmentRepairJobMain.data.ts b/src/views/eam/equipmentRepairJobMain/equipmentRepairJobMain.data.ts
index 076dc0a7b..cccee5da7 100644
--- a/src/views/eam/equipmentRepairJobMain/equipmentRepairJobMain.data.ts
+++ b/src/views/eam/equipmentRepairJobMain/equipmentRepairJobMain.data.ts
@@ -90,7 +90,10 @@ export const EquipmentRepairJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     dictType: DICT_TYPE.EAM_MAINTENANCE_LEVEL,
     dictClass: 'string',
-    isSearch: true,
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
   },
   {
     label: '设备编号',
@@ -123,7 +126,10 @@ export const EquipmentRepairJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     dictType: DICT_TYPE.INFRA_BOOLEAN_STRING,
     dictClass: 'string',
-    isSearch: true,
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
     form: {
       component: 'Radio'
     }
@@ -407,6 +413,12 @@ export const EquipmentRepairJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
+  {
+    label: '故障描述',
+    field: 'faultDesc',
+    sort: 'custom',
+    isSearch: false
+  },
   {
     label: '流程状态',
     field: 'status',
@@ -438,12 +450,18 @@ export const EquipmentRepairJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'directCreateRecord',
     sort: 'custom',
     isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
   },
   {
     label: '班组类型',
     field: 'classType',
     sort: 'custom',
     isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
   },
   // {
   //   label: '所属厂区编号',
@@ -456,6 +474,9 @@ export const EquipmentRepairJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'workshopCode',
     sort: 'custom',
     isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
     required: true,
     form: {
       componentProps: {
diff --git a/src/views/eam/equipmentRepairJobMain/finishForm2.vue b/src/views/eam/equipmentRepairJobMain/finishForm2.vue
index 324b31d7d..dec383f38 100644
--- a/src/views/eam/equipmentRepairJobMain/finishForm2.vue
+++ b/src/views/eam/equipmentRepairJobMain/finishForm2.vue
@@ -45,11 +45,11 @@
 <!--            <el-input v-model="formData.maintenancer" placeholder="请输入执行人"/>-->
 <!--          </el-form-item>-->
 <!--        </el-col>-->
-        <el-col :span="12">
-          <el-form-item label="维修人电话" prop="maintenancePhone">
-            <el-input v-model="formData.maintenancePhone" placeholder="请输入维修人电话" />
-          </el-form-item>
-        </el-col>
+<!--        <el-col :span="12">-->
+<!--          <el-form-item label="维修人电话" prop="maintenancePhone">-->
+<!--            <el-input v-model="formData.maintenancePhone" placeholder="请输入维修人电话" />-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
       </el-row>
       <el-row>
         <el-col :span="12">
@@ -101,9 +101,8 @@ const formData = ref({
   level: '',
   startTime:'',
   endTime:'',
-  maintenancePhone:'',
   completeResult:'',
-  status:'6'
+  status:'5'
 })
 const formRules = reactive({
   maintenanceDesc: [
@@ -118,9 +117,6 @@ const formRules = reactive({
   endTime: [
     { required: true, message: '结束时间不能为空', trigger: 'blur' },
   ],
-  maintenancePhone: [
-    { required: true, message: '维修人电话不能为空', trigger: 'blur' },
-  ],
   completeResult: [
     { required: true, message: '结果不能为空', trigger: 'blur' },
   ],
diff --git a/src/views/eam/equipmentRepairJobMain/index.vue b/src/views/eam/equipmentRepairJobMain/index.vue
index 193bd4644..f8746d3d6 100644
--- a/src/views/eam/equipmentRepairJobMain/index.vue
+++ b/src/views/eam/equipmentRepairJobMain/index.vue
@@ -184,7 +184,7 @@ const isShowBaoXiuButton = (row) => {
 // 列表-操作按钮
 const butttondata = (row) => {
   return[
-    defaultButtons.mainListEditBtn({hide: isShowStatusButton(row,['3','4']),hasPermi:'eam:equipmentRepairJobMain:update'}), // 编辑
+    //defaultButtons.mainListEditBtn({hide: isShowStatusButton(row,['3','4']),hasPermi:'eam:equipmentRepairJobMain:update'}), // 编辑
     defaultButtons.mainListReceiveOrderBtn({hide: isShowStatusButton(row,['3']),hasPermi:'eam:equipmentRepairJobMain:update'}), // 接单
     defaultButtons.mainListExecuteBtn({hide: isShowStatusButton(row,['4']),hasPermi:'eam:equipmentRepairJobMain:update'}), // 执行
     defaultButtons.mainListTransferBtn({hide: isShowStatusButton(row,['4']),hasPermi:'eam:equipmentRepairJobMain:update'}), // 转办
@@ -486,14 +486,6 @@ const getClosed2=(val)=> {
 //finishForm2 提交按钮回传
 const getData2=(val)=> {
   nextTick?.(async () => {
-    // const params = ref({
-    //   id: '',
-    //   status: '',
-    // })
-    // params.value.id = val
-    // params.value.status = '5'
-    // // 发起
-    // await EquipmentRepairJobMainApi.executeEquipmentRepairJobMain(params.value)
     message.success(t('工单已完成'))
     // 刷新列表
     await getList()
diff --git a/src/views/eam/equipmentRepairRecordMain/equipmentRepairRecordMain.data.ts b/src/views/eam/equipmentRepairRecordMain/equipmentRepairRecordMain.data.ts
index c21187fa8..31ac33e65 100644
--- a/src/views/eam/equipmentRepairRecordMain/equipmentRepairRecordMain.data.ts
+++ b/src/views/eam/equipmentRepairRecordMain/equipmentRepairRecordMain.data.ts
@@ -316,6 +316,14 @@ export const EquipmentRepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictClass: 'string',
     isSearch: true,
   },
+  {
+    label: '维修经验',
+    field: 'isExperience',
+    sort: 'custom',
+    isSearch: true,
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+  },
   {
     label: '自动接单',
     field: 'autoOrder',
diff --git a/src/views/eam/equipmentRepairRecordMain/index.vue b/src/views/eam/equipmentRepairRecordMain/index.vue
index 811f65fea..981a8f384 100644
--- a/src/views/eam/equipmentRepairRecordMain/index.vue
+++ b/src/views/eam/equipmentRepairRecordMain/index.vue
@@ -36,8 +36,8 @@
           <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}">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event, row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -103,6 +103,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'
+import {repairExperienceBtn} from "@/utils/disposition/defaultButtons";
 
 defineOptions({ name: 'EquipmentRepairRecordMain' })
 
@@ -176,23 +177,17 @@ const buttonBaseClick = (val, item) => {
 }
 
 // 列表-操作按钮
-
-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.repairExperienceBtn({ hide:isShowMainButton(row,['0']),hasPermi: 'eam:equipmentRepairRecordMain:repairExperience' }) // 生成维修经验
-    ]
+const butttondata = (row) => {
+  return [
+    defaultButtons.repairExperienceBtn({ hide:isShowMainButton(row),hasPermi: 'eam:equipmentMaintenanceRecordMain:maintainExperience' }) // 生成维修经验
+  ]
 }
 
-// 根据状态返回该按钮是否显示
-const isShowMainButton = (row,val) => {
-  console.log(row.isExperience)
-  if (val.indexOf(row.isExperience) > -1) {
+// 根据经验状态返回该按钮是否显示
+const isShowMainButton = (row) => {
+  if (row.isExperience === 'FALSE') {
     return false
-  } else {
+  } else{
     return true
   }
 }
@@ -252,7 +247,6 @@ const openRepairExperience = (type: string, row?: any) => {
 }
 // 新增生成维修经验
 const repairExperienceFormsSuccess = async (formType, data) => {
-  console.log(data)
   const data1 = {
     repairRecordNumber: data.recordNo,
     name: data.name,
@@ -260,7 +254,6 @@ const repairExperienceFormsSuccess = async (formType, data) => {
     masterId: data.id,
     orderType: 'REPAIR',
   }
-  console.log(data1)
   try {
     await RepairExperienceApi.createRepairExperience(data1)
     message.success(t('common.createSuccess'))
diff --git a/src/views/eam/equipmentReportRepairRequest/audiForm.vue b/src/views/eam/equipmentReportRepairRequest/audiForm.vue
index fc2b0a742..cdbeb226f 100644
--- a/src/views/eam/equipmentReportRepairRequest/audiForm.vue
+++ b/src/views/eam/equipmentReportRepairRequest/audiForm.vue
@@ -2,29 +2,24 @@
   <Dialog v-model="dialogVisible" :title="dialogTitle"  :close-on-click-modal="false">
     <el-form ref="basicFormRef" v-loading="formLoading" :model="formData" :rules="formRules" label-width="100px">
       <el-row>
-<!--        <el-col :span="12">-->
-<!--          <el-form-item label="审核人" prop="approver">-->
-<!--            <el-input v-model="formData.approver" placeholder="请输入审核人" :disabled="isDisabled"/>-->
-<!--          </el-form-item>-->
-<!--        </el-col>-->
         <el-col :span="12">
           <el-form-item label="审核内容" prop="approveContent">
-            <el-input v-model="formData.approveContent" placeholder="请输入审核内容" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="审核时间" prop="approveTime">
-            <el-date-picker
-              v-model="formData.approveTime"
-              type="datetime"
-              value-format="x"
-              placeholder="选择审核时间">
-            </el-date-picker>
+            <el-input v-model="formData.approveContent" type="textarea" :input-style="{height:'100px'}" maxlength="300" placeholder="请输入审核内容" />
           </el-form-item>
         </el-col>
       </el-row>
+<!--      <el-row>-->
+<!--        <el-col :span="12">-->
+<!--          <el-form-item label="审核时间" prop="approveTime">-->
+<!--            <el-date-picker-->
+<!--              v-model="formData.approveTime"-->
+<!--              type="datetime"-->
+<!--              value-format="x"-->
+<!--              placeholder="选择审核时间">-->
+<!--            </el-date-picker>-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
+<!--      </el-row>-->
     </el-form>
     <template #footer>
       <el-button :disabled="formLoading" type="primary" @click="submitForm('success')">确 定</el-button>
@@ -40,7 +35,6 @@
 import { SearchTable } from '@/components/SearchTable'
 import {ElInput} from "element-plus";
 import * as EquipmentReportRepairRequestApi from "@/api/eam/equipmentReportRepairRequest";
-import {audiEquipmentReportRepairOrder} from "@/api/eam/equipmentReportRepairRequest";
 
 defineOptions({ name: 'TeamForm' })
 
@@ -50,7 +44,7 @@ const message = useMessage() // 消息弹窗
 const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formType = ref('') // 表单的类型：passed - 通过；noPassed - 不通过
 const tags=ref([])
 
 const inputValue = ref('')
@@ -62,22 +56,17 @@ const InputRef = ref<InstanceType<typeof ElInput>>()
 const formData = ref({
   id:'',
   number:'',
-  //approver: '',
   approveContent: '',
-  approveTime: '',
+  status:'',
 })
 const formRules = reactive({
-  // approver: [
-  //   { required: true, message: '审核人不能为空', trigger: 'blur' },
-  //   { max: 50, message: '不得超过50个字符', trigger: 'blur' }
-  // ],
   approveContent: [
     { required: true, message: '审核内容不能为空', trigger: 'blur' },
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
-  approveTime: [
-    { required: true, message: '审核时间不能为空', trigger: 'blur' },
-  ],
+  // approveTime: [
+  //   { required: true, message: '审核时间不能为空', trigger: 'blur' },
+  // ],
 })
 const basicFormRef = ref() // 表单 Ref
 
@@ -85,7 +74,7 @@ const basicFormRef = ref() // 表单 Ref
 /** 初始化弹窗 */
 const open = async (type: string, row?: object) => {
   dialogVisible.value = true
-  dialogTitle.value = t('action.' + type)
+  dialogTitle.value = t('编辑')
   formType.value = type
   //初始化数据
   formData.value.id = row.id
@@ -95,16 +84,29 @@ defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
 /** 提交表单 */
 const submitForm = async (val) => {
-   //把success函数传递到父页面
-   emit('success',formData.value.id)
    // 校验表单
    if (!basicFormRef) return
    const valid = await basicFormRef.value.validate()
    if (!valid) return
 
-   //发送数据
-   await EquipmentReportRepairRequestApi.audiEquipmentReportRepairOrder(formData.value)
-   dialogVisible.value = false
+
+   if(formType.value == 'passed'){
+     formData.value.status = '3'
+     //发送数据
+     await EquipmentReportRepairRequestApi.audiEquipmentReportRepairOrder(formData.value)
+     dialogVisible.value = false
+   }else if(formType.value == 'noPassed'){
+     formData.value.status  = '4'
+     //发送数据
+     await EquipmentReportRepairRequestApi.audiEquipmentReportRepairOrder(formData.value)
+     dialogVisible.value = false
+   }else{
+     console.log("error")
+   }
+
+  //把success函数传递到父页面
+  emit('success')
+
 }
 
 const handleClose=(val)=>{
diff --git a/src/views/eam/equipmentReportRepairRequest/equipmentReportRepairRequest.data.ts b/src/views/eam/equipmentReportRepairRequest/equipmentReportRepairRequest.data.ts
index 538e9e130..6973d7943 100644
--- a/src/views/eam/equipmentReportRepairRequest/equipmentReportRepairRequest.data.ts
+++ b/src/views/eam/equipmentReportRepairRequest/equipmentReportRepairRequest.data.ts
@@ -105,7 +105,10 @@ export const EquipmentReportRepairRequest = useCrudSchemas(reactive<CrudSchema[]
     sort: 'custom',
     dictType: DICT_TYPE.INFRA_BOOLEAN_STRING,
     dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    isSearch: true,
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
     form: {
       component: 'Radio'
     }
@@ -140,6 +143,9 @@ export const EquipmentReportRepairRequest = useCrudSchemas(reactive<CrudSchema[]
     field: 'workshopCode',
     sort: 'custom',
     isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
     required: true,
     form: {
       componentProps: {
@@ -162,12 +168,14 @@ export const EquipmentReportRepairRequest = useCrudSchemas(reactive<CrudSchema[]
     field: 'repairmaner',
     sort: 'custom',
     isSearch: false,
+    isForm: false,
   },
   {
     label: '报修人联系电话',
     field: 'repairPhone',
     sort: 'custom',
-    isSearch: false
+    isSearch: false,
+    isForm: false,
   },
   {
     label: '报修状态',
diff --git a/src/views/eam/equipmentReportRepairRequest/index.vue b/src/views/eam/equipmentReportRepairRequest/index.vue
index c36ce19fb..7cabe2eab 100644
--- a/src/views/eam/equipmentReportRepairRequest/index.vue
+++ b/src/views/eam/equipmentReportRepairRequest/index.vue
@@ -162,7 +162,7 @@ const butttondata = (row) => {
     defaultButtons.mainListAuditedBtn({ hide: isShowStatusButton(row, ['2']), hasPermi: 'eam:equipmentReportRepairRequest:update' }), // 审核完成
     defaultButtons.mainListRevokeBtn({ hide: isShowStatusButton(row, ['0']), hasPermi: 'eam:equipmentReportRepairRequest:update' }), // 撤回
     defaultButtons.mainListFinishBtn({ hide: isShowStatusButton(row, ['3']), hasPermi: 'eam:equipmentReportRepairRequest:update' }),
-    defaultButtons.mainListDeleteBtn({ hasPermi: 'eam:equipmentReportRepairRequest:update' }), // 删除
+    //defaultButtons.mainListDeleteBtn({ hasPermi: 'eam:equipmentReportRepairRequest:update' }), // 删除
   ]
 }
 
@@ -281,20 +281,12 @@ const handleFinish = async (id: number) => {
 //审核完成按钮
 const handleAudited = async (row) => {
   message.confirmAudi(t('')).then(async () => {
-    //打开提交表单
-    audiFormRef.value.open('update', row);
+    //审核通过打开提交表单
+    audiFormRef.value.open('passed', row);
   }).catch(async (action: Action) => {
+    //审核不通过打开提交表单
     if (action === 'cancel') {
-      const params = ref({
-        id: '',
-        status: '',
-      })
-      params.value.id = row.id
-      params.value.status = '4'
-      await EquipmentReportRepairRequestApi.updateEquipmentReportRepairOrder(params.value)
-      message.success(t('common.updateSuccess'))
-      // 刷新列表
-      await getList()
+      audiFormRef.value.open('noPassed', row);
     }
   })
 }
@@ -387,23 +379,9 @@ const getClosed = (val) => {
 
 //audiForm 提交按钮回传
 const getData = (val) => {
-  nextTick?.(async () => {
-
-    try {
-      const params = ref({
-        id: '',
-        status: '',
-      })
-      params.value.id = val
-      params.value.status = '3'
-      await EquipmentReportRepairRequestApi.updateEquipmentReportRepairOrder(params.value)
-      message.success(t('工单已流转'))
-      // 刷新列表
-      await getList()
-    } catch { }
-
-  }
-  )
+  nextTick?.(() => {
+    getList()
+  })
 }
 
 
diff --git a/src/views/eam/inspectionItem/inspectionItem.data.ts b/src/views/eam/inspectionItem/inspectionItem.data.ts
index 42ae531b2..225954fe1 100644
--- a/src/views/eam/inspectionItem/inspectionItem.data.ts
+++ b/src/views/eam/inspectionItem/inspectionItem.data.ts
@@ -74,7 +74,10 @@ export const InspectionItem = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     dictType: DICT_TYPE.DEVICE_TYPE,
     dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    isSearch: true,
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
     form: {
       component: 'Select'
     }
diff --git a/src/views/eam/maintainExperience/index.vue b/src/views/eam/maintainExperience/index.vue
index 5b77720e4..458f528f6 100644
--- a/src/views/eam/maintainExperience/index.vue
+++ b/src/views/eam/maintainExperience/index.vue
@@ -111,9 +111,9 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:maintainExperience:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:maintainExperience:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'wms:maintainExperience:export'}), // 导出
+  defaultButtons.defaultAddBtn({hasPermi:'eam:maintainExperience:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'eam:maintainExperience:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'eam:maintainExperience:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   // defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -145,8 +145,8 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'wms:maintainExperience:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'wms:maintainExperience:delete'}), // 删除
+  defaultButtons.mainListEditBtn({hasPermi:'eam:maintainExperience:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'eam:maintainExperience:delete'}), // 删除
 ]
 
 // 列表-操作按钮事件
diff --git a/src/views/eam/maintainExperience/maintainExperience.data.ts b/src/views/eam/maintainExperience/maintainExperience.data.ts
index 48c468fbc..bb30f7e2c 100644
--- a/src/views/eam/maintainExperience/maintainExperience.data.ts
+++ b/src/views/eam/maintainExperience/maintainExperience.data.ts
@@ -8,7 +8,11 @@ export const MaintainExperienceRules = reactive({
 })
 
 export const MaintainExperience = useCrudSchemas(reactive<CrudSchema[]>([
-
+  {
+    label: 'id',
+    field: 'id',
+    sort: 'custom',
+  },
   {
     label: '经验标题',
     field: 'name',
@@ -19,7 +23,7 @@ export const MaintainExperience = useCrudSchemas(reactive<CrudSchema[]>([
     label: '经验内容',
     field: 'content',
     sort: 'custom',
-    isTable:false,
+    isTable:true,
     form: {
       componentProps: {
         type: 'textarea',
diff --git a/src/views/eam/planInspection/planInspection.data.ts b/src/views/eam/planInspection/planInspection.data.ts
index 84bd0d6b6..5befab5e2 100644
--- a/src/views/eam/planInspection/planInspection.data.ts
+++ b/src/views/eam/planInspection/planInspection.data.ts
@@ -222,6 +222,9 @@ export const PlanInspection = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'directCreateRecord',
     sort: 'custom',
     isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
   },
   {
     label: '所属厂区编号',
@@ -237,7 +240,10 @@ export const PlanInspection = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'workshopCode',
     sort: 'custom',
     isSearch: false,
-    required: true,
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
     form: {
       componentProps: {
         isSearchList: true, // 开启查询弹窗
diff --git a/src/views/eam/repairExperience/index.vue b/src/views/eam/repairExperience/index.vue
index 9fefecd19..94a9d463b 100644
--- a/src/views/eam/repairExperience/index.vue
+++ b/src/views/eam/repairExperience/index.vue
@@ -114,9 +114,9 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:repairExperience:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:repairExperience:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'wms:repairExperience:export'}), // 导出
+  defaultButtons.defaultAddBtn({hasPermi:'eam:repairExperience:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'eam:repairExperience:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'eam:repairExperience:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   // defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -148,8 +148,8 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'wms:repairExperience:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'wms:repairExperience:delete'}), // 删除
+  defaultButtons.mainListEditBtn({hasPermi:'eam:repairExperience:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'eam:repairExperience:delete'}), // 删除
 ]
 
 // 列表-操作按钮事件
diff --git a/src/views/eam/repairExperience/repairExperience.data.ts b/src/views/eam/repairExperience/repairExperience.data.ts
index 87237d404..3f0e48465 100644
--- a/src/views/eam/repairExperience/repairExperience.data.ts
+++ b/src/views/eam/repairExperience/repairExperience.data.ts
@@ -8,7 +8,12 @@ export const RepairExperienceRules = reactive({
 })
 
 export const RepairExperience = useCrudSchemas(reactive<CrudSchema[]>([
- 
+
+  {
+    label: 'id',
+    field: 'id',
+    sort: 'custom',
+  },
   {
     label: '经验标题',
     field: 'name',
@@ -27,7 +32,6 @@ export const RepairExperience = useCrudSchemas(reactive<CrudSchema[]>([
     label: '经验内容',
     field: 'content',
     sort: 'custom',
-    isTable:false,
     isSearch:false,
     form: {
       component: 'Input',
@@ -86,8 +90,6 @@ export const RepairExperience = useCrudSchemas(reactive<CrudSchema[]>([
     label: '故障类型',
     field: 'faultType',
     sort: 'custom',
-    dictType: DICT_TYPE.FAILURE_REASON,
-    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
     isSearch: false,
     isForm:false
   },
@@ -96,7 +98,9 @@ export const RepairExperience = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'createTime',
     sort: 'custom',
     isSearch:false,
-    isForm:false
+    isForm:false,
+    isTable:false,
+    isDetail:false
   },
   {
     label: '创建时间',
diff --git a/src/views/eam/spotCheckItem/spotCheckItem.data.ts b/src/views/eam/spotCheckItem/spotCheckItem.data.ts
index 9f9cd7278..7ed9e583d 100644
--- a/src/views/eam/spotCheckItem/spotCheckItem.data.ts
+++ b/src/views/eam/spotCheckItem/spotCheckItem.data.ts
@@ -67,7 +67,10 @@ export const SpotCheckItem = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     dictType: DICT_TYPE.DEVICE_TYPE,
     dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    isSearch: true,
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
     form: {
       component: 'Select'
     }

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 112/408] =?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 8357e83f39d009feb3cbf3a590c2d58cf86a8f89 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 3 Jul 2024 19:56:24 +0800
Subject: [PATCH 113/408] =?UTF-8?q?=E4=B8=8B=E4=B8=80=E6=AD=A5=E4=B8=AD?=
 =?UTF-8?q?=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                    |  1 +
 src/locales/zh-CN.ts                    |  1 +
 src/utils/disposition/defaultButtons.ts | 13 +++++++++++++
 3 files changed, 15 insertions(+)

diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index 21468aa23..fa9b06e33 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 1a76b0971..3f54d814a 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..145a6d9fb 100644
--- a/src/utils/disposition/defaultButtons.ts
+++ b/src/utils/disposition/defaultButtons.ts
@@ -237,6 +237,19 @@ export function formStagingBtn(option:any) {
   })
 }
 
+// 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) {

From 477a30483235857d1a4e14e981f5bbe5323310f8 Mon Sep 17 00:00:00 2001
From: bjang03 <259278618@qq.com>
Date: Thu, 4 Jul 2024 08:42:40 +0800
Subject: [PATCH 114/408] =?UTF-8?q?1=E3=80=81=E7=9B=98=E7=82=B9=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E5=A2=9E=E5=8A=A0=E4=BB=BB=E5=8A=A1=E6=8B=86=E5=88=86?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../count/countPlanMain/countPlanMain.data.ts | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
index c7a00e435..dd626bb8b 100644
--- a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
+++ b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
@@ -48,20 +48,6 @@ export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true
   },
-  {
-    label: '任务拆分方式',
-    field: 'countSplitType',
-    dictType: DICT_TYPE.COUNT_SPLIT_TYPE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      value:'LOCATION_CODE',
-    }
-  },
   {
     label: '',//执行周期
     field: 'crontab',
@@ -90,6 +76,22 @@ export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '任务拆分方式',
+    field: 'countSplitType',
+    dictType: DICT_TYPE.COUNT_SPLIT_TYPE,
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false,
+    isForm: true,
+    form: {
+      value: 'LOCATION_CODE'
+    }
+
+  },
   {
     label: '维度',
     field: 'dimension',

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 115/408] =?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 b47c0d5db669fa0ddda1c9c9528634a43f001635 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 4 Jul 2024 10:22:05 +0800
Subject: [PATCH 116/408] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E7=9C=8B=E6=98=8E=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoiceRecordMain/index.vue           | 15 ++++++++++++++-
 .../supplierinvoiceRecordMain.data.ts             | 11 ++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
index 607b1656b..c0e71a452 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
@@ -204,11 +204,24 @@ const handleSelectionPoint = async ()=>{
 }
 // 列表-操作按钮
 const butttondata = (row,$index) => {
-  return []
+  return [
+  {
+        label: t('ts.查看明细'),
+        name: 'open_detail',
+        type: 'primary',
+        icon: '',
+        color: '',
+        hasPermi: 'wms:supplierinvoice-request-main:view-detail',
+        link: true, // 文本展现按钮
+      }
+  ]
 }
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
+  if (val == 'open_detail') { // 查看明细
+      openDetail(row, '单据号', row.number)
+    }
 }
 // 获取部门 用于详情 部门回显
 const { wsCache } = useCache()
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
index 36cd58443..7ef6dcaf1 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
@@ -717,7 +717,16 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false,
   },
-  
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+  }
 ]))
 
 //表单校验

From 459ca7599b76aa523316b1ec8fc5723f34fc6962 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 4 Jul 2024 10:28:35 +0800
Subject: [PATCH 117/408] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoice/supplierinvoiceRecordMain/index.vue         | 2 +-
 .../supplierinvoice/supplierinvoiceRequestMain/index.vue        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
index c0e71a452..d2ea9d461 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
@@ -211,7 +211,7 @@ const butttondata = (row,$index) => {
         type: 'primary',
         icon: '',
         color: '',
-        hasPermi: 'wms:supplierinvoice-request-main:view-detail',
+        hasPermi: '',
         link: true, // 文本展现按钮
       }
   ]
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 3bc63fc85..1e036417e 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -434,7 +434,7 @@ const searchTableSuccessDetail = async (formField, searchField, val, formRef,sea
         type: 'primary',
         icon: '',
         color: '',
-        hasPermi: 'wms:supplierinvoice-request-main:view-detail',
+        hasPermi: '',
         link: true, // 文本展现按钮
       },{
         label: t('ts.采购通过'),

From 2eeefcc18a0c9edea4189a2c3fd1fc12bad34d06 Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Thu, 4 Jul 2024 11:25:32 +0800
Subject: [PATCH 118/408] =?UTF-8?q?EAM=20=E2=80=94=E2=80=94>=20=20?=
 =?UTF-8?q?=E5=B7=A1=E6=A3=80=20=E7=82=B9=E6=A3=80=20=E4=BF=9D=E5=85=BB=20?=
 =?UTF-8?q?=E7=BB=B4=E4=BF=AE=20=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/eam/equipmentInspectionMain/index.ts  |   6 +-
 src/api/eam/equipmentMaintenanceMain/index.ts |   6 +-
 src/api/eam/equipmentSpotCheckMain/index.ts   |   6 +-
 .../equipmentInspectionMain.data.ts           |   6 +-
 .../equipmentInspectionMain/finishForm1.vue   |  27 ++---
 .../equipmentInspectionMain/finishForm2.vue   |  18 +--
 .../eam/equipmentInspectionMain/index.vue     |  30 +----
 .../equipmentInspectionRecordMain.data.ts     |   5 +-
 .../equipmentMaintenanceMain/finishForm1.vue  | 103 ++----------------
 .../equipmentMaintenanceMain/finishForm2.vue  |  18 +--
 .../eam/equipmentMaintenanceMain/index.vue    |  30 +----
 .../equipmentSpotCheckMain.data.ts            |   5 +-
 .../equipmentSpotCheckMain/finishForm1.vue    |  34 +-----
 .../equipmentSpotCheckMain/finishForm2.vue    |  18 +--
 .../eam/equipmentSpotCheckMain/index.vue      |  11 +-
 .../equipmentSpotCheckRecordMain.data.ts      |   5 +-
 16 files changed, 80 insertions(+), 248 deletions(-)

diff --git a/src/api/eam/equipmentInspectionMain/index.ts b/src/api/eam/equipmentInspectionMain/index.ts
index 5ea08a095..6f2550029 100644
--- a/src/api/eam/equipmentInspectionMain/index.ts
+++ b/src/api/eam/equipmentInspectionMain/index.ts
@@ -68,9 +68,9 @@ export const updateEquipmentInspectionMain = async (data: EquipmentInspectionMai
   return await request.put({ url: `/eam/equipment-inspection-main/update`, data })
 }
 
-// 修改巡检工单主
-export const updateEquipmentInspection = async (data: EquipmentInspectionMainVO) => {
-  return await request.post({ url: `/eam/equipment-inspection-main/updateOrders`, data })
+// 验证巡检工单主
+export const verifyEquipmentInspectionMain = async (data: EquipmentInspectionMainVO) => {
+  return await request.post({ url: `/eam/equipment-inspection-main/verifyOrder`, data })
 }
 
 // 删除巡检工单主
diff --git a/src/api/eam/equipmentMaintenanceMain/index.ts b/src/api/eam/equipmentMaintenanceMain/index.ts
index e257dd16a..e8b449834 100644
--- a/src/api/eam/equipmentMaintenanceMain/index.ts
+++ b/src/api/eam/equipmentMaintenanceMain/index.ts
@@ -70,9 +70,9 @@ export const updateEquipmentMaintenanceMain = async (data: EquipmentMaintenanceM
   return await request.put({ url: `/eam/equipment-maintenance-main/update`, data })
 }
 
-// 修改设备保养工单主
-export const updateEquipmentMaintenance = async (data: EquipmentMaintenanceMainVO) => {
-  return await request.post({ url: `/eam/equipment-maintenance-main/updateOrders`, data })
+// 验证设备保养工单主
+export const verifyEquipmentMaintenanceMain = async (data: EquipmentMaintenanceMainVO) => {
+  return await request.post({ url: `/eam/equipment-maintenance-main/verifyOrder`, data })
 }
 
 // 删除设备保养工单主
diff --git a/src/api/eam/equipmentSpotCheckMain/index.ts b/src/api/eam/equipmentSpotCheckMain/index.ts
index c7c0fe718..bd0c0d547 100644
--- a/src/api/eam/equipmentSpotCheckMain/index.ts
+++ b/src/api/eam/equipmentSpotCheckMain/index.ts
@@ -66,9 +66,9 @@ export const updateEquipmentSpotCheckMain = async (data: EquipmentSpotCheckMainV
   return await request.put({ url: `/eam/equipment-spot-check-main/update`, data })
 }
 
-// 完成点检工单主
-export const updateEquipmentSpotCheck = async (data: EquipmentSpotCheckMainVO) => {
-  return await request.post({ url: `/eam/equipment-spot-check-main/updateOrders`, data })
+// 验证点检工单主
+export const verifyEquipmentSpotCheckMain = async (data: EquipmentSpotCheckMainVO) => {
+  return await request.post({ url: `/eam/equipment-spot-check-main/verifyOrder`, data })
 }
 
 // 删除点检工单主
diff --git a/src/views/eam/equipmentInspectionMain/equipmentInspectionMain.data.ts b/src/views/eam/equipmentInspectionMain/equipmentInspectionMain.data.ts
index 433e9dbb1..a5d413d53 100644
--- a/src/views/eam/equipmentInspectionMain/equipmentInspectionMain.data.ts
+++ b/src/views/eam/equipmentInspectionMain/equipmentInspectionMain.data.ts
@@ -94,8 +94,10 @@ export const EquipmentInspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '是否拍照',
     field: 'isPictures',
     sort: 'custom',
-    isSearch: true,
-    isForm: true,
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
     dictType: DICT_TYPE.FALSE_OR_TRUE,
     dictClass: 'string',
     form: {
diff --git a/src/views/eam/equipmentInspectionMain/finishForm1.vue b/src/views/eam/equipmentInspectionMain/finishForm1.vue
index 8be7d99b4..c9722f5c5 100644
--- a/src/views/eam/equipmentInspectionMain/finishForm1.vue
+++ b/src/views/eam/equipmentInspectionMain/finishForm1.vue
@@ -13,18 +13,6 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="验证时间" prop="verifyTime">
-            <el-date-picker
-              v-model="formData.verifyTime"
-              type="datetime"
-              value-format="x"
-              placeholder="选择验证时间">
-            </el-date-picker>
-          </el-form-item>
-        </el-col>
-      </el-row>
     </el-form>
     <template #footer>
       <el-button :disabled="formLoading" type="primary" @click="submitForm('success')">确 定</el-button>
@@ -41,7 +29,10 @@ import * as EquipmentMaintenanceMainApi from '@/api/eam/equipmentMaintenanceMain
 import * as EquipmentInspectionMainApi from '@/api/eam/equipmentInspectionMain'
 import { SearchTable } from '@/components/SearchTable'
 import {ElInput} from "element-plus";
-import {updateEquipmentInspection} from "@/api/eam/equipmentInspectionMain";
+import {
+  updateEquipmentInspection,
+  verifyEquipmentInspectionMain
+} from "@/api/eam/equipmentInspectionMain";
 
 defineOptions({ name: 'TeamForm' })
 
@@ -63,9 +54,8 @@ const InputRef = ref<InstanceType<typeof ElInput>>()
 const formData = ref({
   id:'',
   number:'',
-  //verifyer: '',
   verifyContent: '',
-  verifyTime: '',
+  status:''
 })
 const formRules = reactive({
   // verifyer: [
@@ -76,9 +66,6 @@ const formRules = reactive({
     { required: true, message: '验证内容不能为空', trigger: 'blur' },
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
-  verifyTime: [
-    { required: true, message: '验证时间不能为空', trigger: 'blur' },
-  ],
 })
 const basicFormRef = ref() // 表单 Ref
 
@@ -102,8 +89,10 @@ const submitForm = async (val) => {
    const valid = await basicFormRef.value.validate()
    if (!valid) return
 
+   formData.value.status = '7'
+
    //发送数据
-   await EquipmentInspectionMainApi.updateEquipmentInspection(formData.value)
+   await EquipmentInspectionMainApi.verifyEquipmentInspectionMain(formData.value)
    //把success函数传递到父页面
    emit('success',formData.value.id)
    dialogVisible.value = false
diff --git a/src/views/eam/equipmentInspectionMain/finishForm2.vue b/src/views/eam/equipmentInspectionMain/finishForm2.vue
index f06d450c5..1755c28a7 100644
--- a/src/views/eam/equipmentInspectionMain/finishForm2.vue
+++ b/src/views/eam/equipmentInspectionMain/finishForm2.vue
@@ -7,11 +7,11 @@
 <!--            <el-input v-model="formData.maintenancer" placeholder="请输入巡检人" :disabled="isDisabled"/>-->
 <!--          </el-form-item>-->
 <!--        </el-col>-->
-        <el-col :span="12">
-          <el-form-item label="巡检人电话" prop="maintenancePhone">
-            <el-input v-model="formData.maintenancePhone" placeholder="请输入巡检人电话" />
-          </el-form-item>
-        </el-col>
+<!--        <el-col :span="12">-->
+<!--          <el-form-item label="巡检人电话" prop="maintenancePhone">-->
+<!--            <el-input v-model="formData.maintenancePhone" placeholder="请输入巡检人电话" />-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
       </el-row>
       <el-row>
         <el-col :span="12">
@@ -72,14 +72,16 @@ const InputRef = ref<InstanceType<typeof ElInput>>()
 const formData = ref({
   id:'',
   number:'',
-  maintenancePhone: '',
   startTime:'',
   endTime:'',
   status:'5',
 })
 const formRules = reactive({
-  maintenancePhone: [
-    { required: true, message: '巡检人电话不能为空', trigger: 'blur' },
+  startTime: [
+    { required: true, message: '巡检开始时间不能为空', trigger: 'blur' },
+  ],
+  endTime: [
+    { required: true, message: '巡检结束时间不能为空', trigger: 'blur' },
   ],
 })
 const basicFormRef = ref() // 表单 Ref
diff --git a/src/views/eam/equipmentInspectionMain/index.vue b/src/views/eam/equipmentInspectionMain/index.vue
index 8148ea401..13573deec 100644
--- a/src/views/eam/equipmentInspectionMain/index.vue
+++ b/src/views/eam/equipmentInspectionMain/index.vue
@@ -190,7 +190,7 @@ const isShowEditStatusButton = (row) => {
 // 列表-操作按钮
 const butttondata = (row) => {
   return [
-    defaultButtons.mainListEditBtn({hide: isShowStatusButton(row,['3','4']),hasPermi:'eam:equipmentInspectionMain:update'}), // 编辑
+    //defaultButtons.mainListEditBtn({hide: isShowStatusButton(row,['3','4']),hasPermi:'eam:equipmentInspectionMain:update'}), // 编辑
     defaultButtons.mainListReceiveOrderBtn({hide: isShowStatusButton(row,['3']),hasPermi:'eam:equipmentInspectionMain:update'}), // 接单
     defaultButtons.mainListExecuteBtn({hide: isShowStatusButton(row,['4']),hasPermi:'eam:equipmentInspectionMain:update'}), // 执行
     defaultButtons.mainListCancelBtn({hide: isShowStatusButton(row,['5']),hasPermi:'eam:equipmentInspectionMain:update'}), //作废
@@ -480,20 +480,8 @@ const getClosed1=(val)=> {
 const getData1=(val)=> {
   nextTick?.(async () => {
       console.log(val)
-
-      try {
-        const params = ref({
-          id: '',
-          status:'',
-        })
-        params.value.id = val
-        params.value.status = '7'
-        await EquipmentInspectionMainApi.updateEquipmentInspectionOrder(params.value)
-        message.success(t('工单已流转'))
-        // 刷新列表
-        await getList()
-      } catch {}
-
+      // 刷新列表
+      await getList()
     }
   )
 }
@@ -501,7 +489,6 @@ const getData1=(val)=> {
 //finishForm2 关闭按钮回传
 const getClosed2=(val)=> {
   nextTick?.(() => {
-    console.log(val)
     getList()
   })
 }
@@ -509,17 +496,6 @@ const getClosed2=(val)=> {
 //finishForm2 提交按钮回传
 const getData2=(val)=> {
   nextTick?.(async () => {
-    console.log(val)
-    // const params = ref({
-    //   id: '',
-    //   status: '',
-    // })
-    // params.value.id = val
-    // params.value.status = '5'
-    // // 发起
-    // await EquipmentInspectionMainApi.executeEquipmentInspectionOrder(params.value)
-    //message.success(t('工单已完成'))
-    // 刷新列表
     await getList()
   })
 }
diff --git a/src/views/eam/equipmentInspectionRecordMain/equipmentInspectionRecordMain.data.ts b/src/views/eam/equipmentInspectionRecordMain/equipmentInspectionRecordMain.data.ts
index 6b740619b..ceeed384c 100644
--- a/src/views/eam/equipmentInspectionRecordMain/equipmentInspectionRecordMain.data.ts
+++ b/src/views/eam/equipmentInspectionRecordMain/equipmentInspectionRecordMain.data.ts
@@ -50,7 +50,10 @@ export const EquipmentInspectionRecordMain = useCrudSchemas(reactive<CrudSchema[
     sort: 'custom',
     dictType: DICT_TYPE.INFRA_BOOLEAN_STRING,
     dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    isSearch: true,
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
     form: {
       component: 'Radio'
     }
diff --git a/src/views/eam/equipmentMaintenanceMain/finishForm1.vue b/src/views/eam/equipmentMaintenanceMain/finishForm1.vue
index 025d5aaff..7562df2c5 100644
--- a/src/views/eam/equipmentMaintenanceMain/finishForm1.vue
+++ b/src/views/eam/equipmentMaintenanceMain/finishForm1.vue
@@ -2,26 +2,9 @@
   <Dialog v-model="dialogVisible" :title="dialogTitle"  :close-on-click-modal="false">
     <el-form ref="basicFormRef" v-loading="formLoading" :model="formData" :rules="formRules" label-width="100px">
       <el-row>
-        <el-col :span="12">
-          <el-form-item label="验证人" prop="verifyer">
-            <el-input v-model="formData.verifyer" placeholder="请输入验证人" :disabled="isDisabled"/>
-          </el-form-item>
-        </el-col>
         <el-col :span="12">
           <el-form-item label="验证内容" prop="verifyContent">
-            <el-input v-model="formData.verifyContent" placeholder="请输入验证内容" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="验证时间" prop="verifyTime">
-            <el-date-picker
-              v-model="formData.verifyTime"
-              type="datetime"
-              value-format="x"
-              placeholder="选择验证时间">
-            </el-date-picker>
+            <el-input v-model="formData.verifyContent" type="textarea" :input-style="{height:'100px'}" maxlength="300" placeholder="请输入验证内容" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -40,6 +23,7 @@
 import * as EquipmentMaintenanceMainApi from '@/api/eam/equipmentMaintenanceMain'
 import { SearchTable } from '@/components/SearchTable'
 import {ElInput} from "element-plus";
+import {verifyEquipmentMaintenanceMain} from "@/api/eam/equipmentMaintenanceMain";
 
 defineOptions({ name: 'TeamForm' })
 
@@ -61,93 +45,18 @@ const InputRef = ref<InstanceType<typeof ElInput>>()
 const formData = ref({
   id:'',
   number:'',
-  verifyer: '',
   verifyContent: '',
-  verifyTime: '',
+  status:''
 })
 const formRules = reactive({
-  verifyer: [
-    { required: true, message: '验证人不能为空', trigger: 'blur' },
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
-  ],
   verifyContent: [
     { required: true, message: '验证内容不能为空', trigger: 'blur' },
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
-  verifyTime: [
-    { required: true, message: '验证时间不能为空', trigger: 'blur' },
-  ],
 })
 const basicFormRef = ref() // 表单 Ref
 
-// /** 弹窗相关参数 */
-// const searchTableRef = ref();
-// const _searchTableTitle = ref();
-// const _searchTableAllSchemas = ref();
-// const _searchTablePage = ref();
-// const _formField = ref();
-// const _searchField = ref();
-// const _multiple = ref();
-// const _type = ref();
-// const _row = ref();
-// const _searchCondition = ref({})
-//
-//
-// const addItem = () =>{
-//   addItemCommon(true,'xunJianItem')
-// }
-//
-// /** 选择巡检项弹窗 */
-// const addItemCommon = (multiple,field) => {
-//   _searchCondition.value = {}
-//   const filters: any[] = []
-//   filters.push({
-//     action: "==",
-//     column: 'available',
-//     value: 'TRUE'
-//   })
-//   // 参数整理
-//   _searchCondition.value.isSearch = true
-//   _searchCondition.value.filters = filters
-//   _searchTableTitle.value = '选择巡检项'
-//   _multiple.value = multiple
-//   _formField.value = field
-//   _searchField.value = field
-//   _searchTablePage.value = inspectionItemApi.getInspectionItemPage
-//   _searchTableAllSchemas.value = InspectionItem.allSchemas
-//   openCommon()
-// }
-//
-// /** 弹窗选择之后  回调函数 添加选择集 */
-// const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
-//   nextTick?.(() => {
-//       if (formField === 'xunJianItem') {
-//           val.forEach(item => {
-//             const isExist = tags.value.some(tag => tag.content === item.content);
-//             if (!isExist){
-//               const newItem = {};
-//               newItem['content'] = item.content;
-//               newItem['id'] = item.id;
-//               tags.value.push(newItem);
-//             }
-//           });
-//       }
-//   })
-// }
-// /*打开弹窗*/
-// const openCommon = () => {
-//   searchTableRef.value.open(
-//     _searchTableTitle.value,
-//     _searchTableAllSchemas.value,
-//     _searchTablePage.value,
-//     _formField.value,
-//     _searchField.value,
-//     _multiple.value,
-//     _type.value,
-//     _row.value,
-//     _searchCondition.value
-//   )
-// }
+
 /** 初始化弹窗 */
 const open = async (type: string, row?: object) => {
   dialogVisible.value = true
@@ -167,8 +76,10 @@ const submitForm = async (val) => {
    const valid = await basicFormRef.value.validate()
    if (!valid) return
 
+   formData.value.status = '7'
+
    //发送数据
-   await EquipmentMaintenanceMainApi.updateEquipmentMaintenanceMain(formData.value)
+   await EquipmentMaintenanceMainApi.verifyEquipmentMaintenanceMain(formData.value)
    //把success函数传递到父页面
    emit('success',formData.value.id)
    dialogVisible.value = false
diff --git a/src/views/eam/equipmentMaintenanceMain/finishForm2.vue b/src/views/eam/equipmentMaintenanceMain/finishForm2.vue
index 1e6c7b358..d62716ac9 100644
--- a/src/views/eam/equipmentMaintenanceMain/finishForm2.vue
+++ b/src/views/eam/equipmentMaintenanceMain/finishForm2.vue
@@ -7,11 +7,11 @@
 <!--            <el-input v-model="formData.maintenancer" placeholder="请输入保养人" :disabled="isDisabled"/>-->
 <!--          </el-form-item>-->
 <!--        </el-col>-->
-        <el-col :span="12">
-          <el-form-item label="保养人电话" prop="maintenancePhone">
-            <el-input v-model="formData.maintenancePhone" placeholder="请输入保养人电话" />
-          </el-form-item>
-        </el-col>
+<!--        <el-col :span="12">-->
+<!--          <el-form-item label="保养人电话" prop="maintenancePhone">-->
+<!--            <el-input v-model="formData.maintenancePhone" placeholder="请输入保养人电话" />-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
       </el-row>
       <el-row>
         <el-col :span="12">
@@ -71,14 +71,16 @@ const InputRef = ref<InstanceType<typeof ElInput>>()
 const formData = ref({
   id:'',
   number:'',
-  maintenancePhone: '',
   startTime:'',
   endTime:'',
   status:'5',
 })
 const formRules = reactive({
-  maintenancePhone: [
-    { required: true, message: '保养人电话不能为空', trigger: 'blur' },
+  startTime: [
+    { required: true, message: '保养开始时间不能为空', trigger: 'blur' },
+  ],
+  endTime: [
+    { required: true, message: '保养结束时间不能为空', trigger: 'blur' },
   ],
 })
 const basicFormRef = ref() // 表单 Ref
diff --git a/src/views/eam/equipmentMaintenanceMain/index.vue b/src/views/eam/equipmentMaintenanceMain/index.vue
index 1950e07be..4c13406f2 100644
--- a/src/views/eam/equipmentMaintenanceMain/index.vue
+++ b/src/views/eam/equipmentMaintenanceMain/index.vue
@@ -539,7 +539,6 @@ const searchFormClick = (searchData) => {
 //finishForm1 关闭按钮回传
 const getClosed1=(val)=> {
   nextTick?.(() => {
-    console.log(val)
     getList()
   })
 }
@@ -547,23 +546,8 @@ const getClosed1=(val)=> {
 //finishForm1 提交按钮回传
 const getData1=(val)=> {
     nextTick?.(async () => {
-      console.log(val)
-
-      try {
-          const params = ref({
-            id: '',
-            status:'',
-          })
-          params.value.id = val
-          params.value.status = '7'
-          await EquipmentMaintenanceMainApi.updateMaintenanceOrder(params.value)
-          message.success(t('工单已流转'))
-          // 刷新列表
-          await getList()
-      } catch {}
-
-      }
-    )
+      await getList()
+    })
 }
 
 //finishForm2 关闭按钮回传
@@ -577,16 +561,6 @@ const getClosed2=(val)=> {
 //finishForm2 提交按钮回传
 const getData2=(val)=> {
     nextTick?.(async () => {
-        console.log(val)
-        // const params = ref({
-        //   id: '',
-        //   status: '',
-        // })
-        // params.value.id = val
-        // params.value.status = '5'
-        // // 发起
-        // await EquipmentMaintenanceMainApi.executeMaintenanceOrder(params.value)
-        //message.success(t('工单已完成'))
         // 刷新列表
         await getList()
     })
diff --git a/src/views/eam/equipmentSpotCheckMain/equipmentSpotCheckMain.data.ts b/src/views/eam/equipmentSpotCheckMain/equipmentSpotCheckMain.data.ts
index f1581ad93..f4a4f08a8 100644
--- a/src/views/eam/equipmentSpotCheckMain/equipmentSpotCheckMain.data.ts
+++ b/src/views/eam/equipmentSpotCheckMain/equipmentSpotCheckMain.data.ts
@@ -312,7 +312,10 @@ export const EquipmentSpotCheckMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '是否拍照',
     field: 'isPictures',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
     dictType: DICT_TYPE.FALSE_OR_TRUE,
     dictClass: 'string',
   },
diff --git a/src/views/eam/equipmentSpotCheckMain/finishForm1.vue b/src/views/eam/equipmentSpotCheckMain/finishForm1.vue
index da8b44232..7e96adfdc 100644
--- a/src/views/eam/equipmentSpotCheckMain/finishForm1.vue
+++ b/src/views/eam/equipmentSpotCheckMain/finishForm1.vue
@@ -2,29 +2,12 @@
   <Dialog v-model="dialogVisible" :title="dialogTitle"  :close-on-click-modal="false">
     <el-form ref="basicFormRef" v-loading="formLoading" :model="formData" :rules="formRules" label-width="100px">
       <el-row>
-<!--        <el-col :span="12">-->
-<!--          <el-form-item label="验证人" prop="verifyer">-->
-<!--            <el-input v-model="formData.verifyer" placeholder="请输入验证人" :disabled="isDisabled"/>-->
-<!--          </el-form-item>-->
-<!--        </el-col>-->
         <el-col :span="12">
           <el-form-item label="验证内容" prop="verifyContent">
             <el-input v-model="formData.verifyContent" type="textarea" :input-style="{height:'100px'}" maxlength="300" placeholder="请输入验证内容" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="验证时间" prop="verifyTime">
-            <el-date-picker
-              v-model="formData.verifyTime"
-              type="datetime"
-              value-format="x"
-              placeholder="选择验证时间">
-            </el-date-picker>
-          </el-form-item>
-        </el-col>
-      </el-row>
     </el-form>
     <template #footer>
       <el-button :disabled="formLoading" type="primary" @click="submitForm('success')">确 定</el-button>
@@ -37,12 +20,9 @@
 
 </template>
 <script lang="ts" setup>
-import * as EquipmentMaintenanceMainApi from '@/api/eam/equipmentMaintenanceMain'
-import * as EquipmentInspectionMainApi from '@/api/eam/equipmentInspectionMain'
 import { SearchTable } from '@/components/SearchTable'
 import {ElInput} from "element-plus";
 import * as EquipmentSpotCheckMainApi from "@/api/eam/equipmentSpotCheckMain";
-import {updateEquipmentSpotCheck} from "@/api/eam/equipmentSpotCheckMain";
 
 defineOptions({ name: 'TeamForm' })
 
@@ -64,23 +44,15 @@ const InputRef = ref<InstanceType<typeof ElInput>>()
 const formData = ref({
   id:'',
   number:'',
- // verifyer: '',
   verifyContent: '',
-  verifyTime: '',
+  status : '',
   isRepair:"",
 })
 const formRules = reactive({
-  // verifyer: [
-  //   { required: true, message: '验证人不能为空', trigger: 'blur' },
-  //   { max: 50, message: '不得超过50个字符', trigger: 'blur' }
-  // ],
   verifyContent: [
     { required: true, message: '验证内容不能为空', trigger: 'blur' },
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
-  verifyTime: [
-    { required: true, message: '验证时间不能为空', trigger: 'blur' },
-  ],
 })
 const basicFormRef = ref() // 表单 Ref
 
@@ -105,8 +77,10 @@ const submitForm = async (val) => {
    const valid = await basicFormRef.value.validate()
    if (!valid) return
 
+   formData.value.status = '7'
+
    //发送数据
-   await EquipmentSpotCheckMainApi.updateEquipmentSpotCheck(formData.value)
+   await EquipmentSpotCheckMainApi.verifyEquipmentSpotCheckMain(formData.value)
    //把success函数传递到父页面
    emit('success',formData.value.id)
    dialogVisible.value = false
diff --git a/src/views/eam/equipmentSpotCheckMain/finishForm2.vue b/src/views/eam/equipmentSpotCheckMain/finishForm2.vue
index 242e63158..b9bf1555b 100644
--- a/src/views/eam/equipmentSpotCheckMain/finishForm2.vue
+++ b/src/views/eam/equipmentSpotCheckMain/finishForm2.vue
@@ -7,11 +7,11 @@
 <!--            <el-input v-model="formData.maintenancer" placeholder="请输入巡检人" :disabled="isDisabled"/>-->
 <!--          </el-form-item>-->
 <!--        </el-col>-->
-        <el-col :span="12">
-          <el-form-item label="巡检人电话" prop="maintenancePhone">
-            <el-input v-model="formData.maintenancePhone" placeholder="请输入巡检人电话" />
-          </el-form-item>
-        </el-col>
+<!--        <el-col :span="12">-->
+<!--          <el-form-item label="巡检人电话" prop="maintenancePhone">-->
+<!--            <el-input v-model="formData.maintenancePhone" placeholder="请输入巡检人电话" />-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
       </el-row>
       <el-row>
         <el-col :span="12">
@@ -73,14 +73,16 @@ const InputRef = ref<InstanceType<typeof ElInput>>()
 const formData = ref({
   id:'',
   number:'',
-  maintenancePhone: '',
   startTime:'',
   endTime:'',
   status:'5',
 })
 const formRules = reactive({
-  maintenancePhone: [
-    { required: true, message: '巡检人电话不能为空', trigger: 'blur' },
+  startTime: [
+    { required: true, message: '点检开始时间不能为空', trigger: 'blur' },
+  ],
+  endTime: [
+    { required: true, message: '点检结束时间不能为空', trigger: 'blur' },
   ],
 })
 const basicFormRef = ref() // 表单 Ref
diff --git a/src/views/eam/equipmentSpotCheckMain/index.vue b/src/views/eam/equipmentSpotCheckMain/index.vue
index 3c3026348..1c1bd0fac 100644
--- a/src/views/eam/equipmentSpotCheckMain/index.vue
+++ b/src/views/eam/equipmentSpotCheckMain/index.vue
@@ -188,7 +188,7 @@ const isShowEditStatusButton = (row) => {
 // 列表-操作按钮
 const butttondata = (row) => {
   return [
-    defaultButtons.mainListEditBtn({hide: isShowStatusButton(row,['3','4']),hasPermi:'eam:equipmentSpotCheckMain:update'}), // 编辑
+    //defaultButtons.mainListEditBtn({hide: isShowStatusButton(row,['3','4']),hasPermi:'eam:equipmentSpotCheckMain:update'}), // 编辑
     defaultButtons.mainListReceiveOrderBtn({hide: isShowStatusButton(row,['3']),hasPermi:'eam:equipmentSpotCheckMain:update'}), // 接单
     defaultButtons.mainListExecuteBtn({hide: isShowStatusButton(row,['4']),hasPermi:'eam:equipmentSpotCheckMain:update'}), // 执行
     defaultButtons.mainListCancelBtn({hide: isShowStatusButton(row,['5']),hasPermi:'eam:equipmentSpotCheckMain:update'}), //作废
@@ -507,15 +507,6 @@ const getClosed2=(val)=> {
 const getData2=(val)=> {
   nextTick?.(async () => {
     console.log(val)
-    // const params = ref({
-    //   id: '',
-    //   status: '',
-    // })
-    // params.value.id = val
-    // params.value.status = '5'
-    // 发起
-    //await EquipmentSpotCheckMainApi.executeEquipmentSpotCheckOrder(params.value)
-    //message.success(t('工单已完成'))
     // 刷新列表
     await getList()
   })
diff --git a/src/views/eam/equipmentSpotCheckRecordMain/equipmentSpotCheckRecordMain.data.ts b/src/views/eam/equipmentSpotCheckRecordMain/equipmentSpotCheckRecordMain.data.ts
index 0a868ee9a..880f9ded5 100644
--- a/src/views/eam/equipmentSpotCheckRecordMain/equipmentSpotCheckRecordMain.data.ts
+++ b/src/views/eam/equipmentSpotCheckRecordMain/equipmentSpotCheckRecordMain.data.ts
@@ -250,7 +250,10 @@ export const EquipmentSpotCheckRecordMain = useCrudSchemas(reactive<CrudSchema[]
     sort: 'custom',
     dictType: DICT_TYPE.INFRA_BOOLEAN_STRING,
     dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    isSearch: true,
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
     form: {
       component: 'Radio'
     }

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 119/408] =?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 120/408] =?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 21340805a7928dff96e2d510f2fd2d63ff365101 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 4 Jul 2024 14:22:28 +0800
Subject: [PATCH 121/408] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?=
 =?UTF-8?q?=E7=A5=A8=E6=9C=89=E4=BB=B7=E5=B7=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoiceRecordMain.data.ts         | 27 ++++++++++
 .../supplierinvoiceRequestMain/index.vue      | 32 +++++++++---
 .../supplierinvoiceRequestMain.data.ts        | 52 ++++++++++++++++++-
 3 files changed, 103 insertions(+), 8 deletions(-)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
index 7ef6dcaf1..03b7ecd70 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
@@ -144,6 +144,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     isForm:false,
     isTableForm:false
   },
+  
   {
     label: '系统税额',
     field: 'taxAmount',
@@ -190,6 +191,32 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     isForm:false,
     isTableForm:false
   },
+  {
+    label: '是否有价差',
+    field: 'balanceStatementStatus',
+    dictType: DICT_TYPE.INVOICE_BALANCE_STATEMENT_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    isForm:false,
+    isSearch:false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:3,
+  },
+  {
+    label: '价差说明',
+    field: 'balanceStatement',
+    isTable: false,
+    isForm:false,
+    isSearch:false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:5,
+  },
   {
     label: '系统价税合计',//税后金额
     field: 'afterTaxAmount',
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 1e036417e..850836e95 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -131,7 +131,15 @@
     :footButttondata="undefined"
     @success="submitFormFinance" 
   />
-
+<!-- 采购通过窗口-->
+<BasicForm 
+    ref="formPurchasePassRef" 
+    :rules="PurchasePassRules"
+    :formAllSchemas="PurchasePass.allSchemas" 
+    :isBusiness="false"
+    :footButttondata="undefined"
+    @success="submitPurchasePass" 
+  />
   <!-- 详情 -->
   <Detail
     ref="detailRef" 
@@ -234,7 +242,9 @@ import dayjs from 'dayjs'
     SupplierinvoiceRequestDetail, 
     SupplierinvoiceRequestDetailRules,
     SupplierinvoiceRequestFinance,
-    SupplierinvoiceRequestFinanceRules
+    SupplierinvoiceRequestFinanceRules,
+    PurchasePass,
+    PurchasePassRules
   } from './supplierinvoiceRequestMain.data'
   import * as SupplierinvoiceRequestMainApi from '@/api/wms/supplierinvoiceRequestMain'
   import * as SupplierinvoiceRequestDetailApi from '@/api/wms/supplierinvoiceRequestDetail'
@@ -270,7 +280,7 @@ import dayjs from 'dayjs'
       searchTablePage: SupplierApi.getSupplierPage
     }
   ])
-
+const formPurchasePassRef = ref()
 const searchList = (model)=>{
   selectionRows.value = []
   setSearchParams(model)
@@ -522,7 +532,12 @@ const handleImport = () => {
     }  else if (val == 'open_detail') { // 查看明细
       openDetail(row, '单据号', row.number)
     }else if (val == 'purchase_mainPlanSub') { // 采购审批通过
-      handleApp(row.id)
+      // handleApp(row.id)
+      if(row.balanceStatementStatus){
+         formPurchasePassRef.value.open('update', row,null,'采购审批通过','采购审批通过')
+      }else{
+      submitPurchasePass(row.id)
+      }
     } else if (val == 'purchase_mainPlanTur') { // 采购驳回按钮
       resonSubmit(val, row)
       // handleTur(row.id)
@@ -777,15 +792,20 @@ const handleImport = () => {
   }
 
   /** 采购审批通过按钮操作 */
-  const handleApp = async (id : number) => {
+  const submitPurchasePass = async (id, submitData) => {
+  console.log(submitData)
+  const id1  =submitData?.id ||  id
+  
+  console.log(id1)
     try {
       // 审批通过的二次确认
       await message.confirm(t('ts.是否审批通过所选中数据？'))
       tableObject.loading = true
       // 发起审批通过
-      await SupplierinvoiceRequestMainApi.appSupplierinvoiceRequestMain(id)
+      await SupplierinvoiceRequestMainApi.appSupplierinvoiceRequestMain(id1,submitData?.balanceStatement)
       message.success(t('ts.审批通过成功!'))
       tableObject.loading = false
+    formPurchasePassRef.value.dialogVisible = false
       // 刷新列表
       await getList()
     } catch { }finally{
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index a493d1bdc..234035685 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -459,6 +459,32 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     },
     isTableForm:false,
   },
+  {
+    label: '是否有价差',
+    field: 'balanceStatementStatus',
+    dictType: DICT_TYPE.INVOICE_BALANCE_STATEMENT_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    isForm:false,
+    isSearch:false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:5,
+  },
+  {
+    label: '价差说明',
+    field: 'balanceStatement',
+    isTable: false,
+    isForm:false,
+    isSearch:false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:5,
+  },
   {
     label: '未税差额',
     field: 'beforeTaxDiffAmount',
@@ -861,7 +887,6 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'supplierCreator',
     sort: 'custom',
     isTable:false,
-    isTable:false,
     isDetail:false,
     sortTableDefault:1006,
     table: {
@@ -874,7 +899,6 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'supplierCreatorName',
     sort: 'custom',
     isTable:false,
-    isTable:false,
     isDetail:true,
     sortTableDefault:1006,
     table: {
@@ -1576,3 +1600,27 @@ export const SupplierinvoiceRequestDetailRules = reactive({
     { validator: validateSinglePrice, trigger: 'change' }
   ],
 })
+// 采购通过
+export const PurchasePass = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '价差通过说明',
+    field: 'balanceStatement',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTable:false,
+    form: {
+      componentProps:{
+        type:'textarea'
+      }
+    },
+  },
+]))
+//表单校验
+export const PurchasePassRules = reactive({
+  balanceStatement: [
+    { required: true, message: '请输入价差通过说明', trigger: 'blur'},
+    { max: 100, message: '最多100字符', trigger: 'blur'}
+  ],
+})

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 122/408] =?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 123/408] =?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 79134fc7eb67ff763425c6f314a5c661617441d5 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 4 Jul 2024 14:59:52 +0800
Subject: [PATCH 124/408] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BB=B7=E5=B7=AE=E8=AF=B4=E6=98=8E=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/supplierinvoiceRequestMain/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/api/wms/supplierinvoiceRequestMain/index.ts b/src/api/wms/supplierinvoiceRequestMain/index.ts
index 338cd176e..f9dbf4ee8 100644
--- a/src/api/wms/supplierinvoiceRequestMain/index.ts
+++ b/src/api/wms/supplierinvoiceRequestMain/index.ts
@@ -75,8 +75,8 @@ export const subSupplierinvoiceRequestMain = async (id: number) => {
   return await request.post({ url: `/wms/supplierinvoice-request-main/sub?id=` + id })
 }
 // 采购--审批通过供应商发货申请主
-export const appSupplierinvoiceRequestMain = async (id: number) => {
-  return await request.post({ url: `/wms/supplierinvoice-request-main/app?id=` + id })
+export const appSupplierinvoiceRequestMain = async (id: number,balanceStatement:any) => {
+  return await request.post({ url: `/wms/supplierinvoice-request-main/app?id=` + id+ (balanceStatement?'&balanceStatement=' + balanceStatement:'')})
 }
 // 采购--驳回供应商发货申请主
 export const rejSupplierinvoiceRequestMain = async (data) => {

From 4494a31f37b065e59effbe80b4f793e3cb11eaab Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 4 Jul 2024 15:01:14 +0800
Subject: [PATCH 125/408] =?UTF-8?q?=E6=9C=89=E4=BB=B7=E5=B7=AE=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/dict.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index c94fbd934..a6b8966d5 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -283,6 +283,7 @@ export enum DICT_TYPE {
   DELIVER_TYPE = 'deliver_type', //发货类型
   BILL_TYPE = 'bill_type', // 发票类型
   CONTAIN_MANAGE_TYPE = 'contain_menage_type', //器具管理类型
+  INVOICE_BALANCE_STATEMENT_STATUS = 'invoice_balance_statement_status', //是否有价差
 
   // ========== 业务 - mes ==========
   MESDO_STATUS = 'mes_do_status', // 工单执行状态

From c7d29b1b626d2e33eaa82fe59a318e12aaad01b3 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 4 Jul 2024 15:15:42 +0800
Subject: [PATCH 126/408] =?UTF-8?q?=E5=AD=97=E5=85=B8=E7=A9=BA=E7=BD=AE?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DictTag/src/DictTag.vue | 30 ++++++++++++++------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/components/DictTag/src/DictTag.vue b/src/components/DictTag/src/DictTag.vue
index 35920d91e..947f5037f 100644
--- a/src/components/DictTag/src/DictTag.vue
+++ b/src/components/DictTag/src/DictTag.vue
@@ -45,20 +45,22 @@ export default defineComponent({
       // 添加标签的文字颜色为白色，解决自定义背景颜色时标签文字看不清的问题
       // 根据 dictDataList 进行区分 是否多个
       if (dictDataList.length == 0) {
-        return (
-            <ElTag
-              style={dictData.value?.cssClass ? 'color: #fff' : ''}
-              type={dictData.value?.colorType}
-              color={
-                dictData.value?.cssClass && isHexColor(dictData.value?.cssClass)
-                  ? dictData.value?.cssClass
-                  : ''
-              }
-              disableTransitions={true}
-            >
-              {t(`ts.${dictData.value?.label}`).replace('ts.', '')}
-          </ElTag>
-        )
+          if(dictData.value?.label !== '' && dictData.value?.label !== undefined){
+            return (<ElTag
+                  style={dictData.value?.cssClass ? 'color: #fff' : ''}
+                  type={dictData.value?.colorType}
+                  color={
+                    dictData.value?.cssClass && isHexColor(dictData.value?.cssClass)
+                      ? dictData.value?.cssClass
+                      : ''
+                  }
+                  disableTransitions={true}
+                >
+                  {t(`ts.${dictData.value?.label}`).replace('ts.', '')}
+              </ElTag>
+            )
+          }
+          
       } else {
         return (
           dictDataList.map(item => {

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 127/408] =?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 03f5d97e29d0a064c27431cfe2ee714a654f272e Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Thu, 4 Jul 2024 15:45:59 +0800
Subject: [PATCH 128/408] =?UTF-8?q?=E9=A2=84=E7=94=9F=E4=BA=A7=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E5=92=8C=E8=A3=85=E9=85=8D=E8=AE=A1=E5=88=92=E6=8C=89?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=97=A5=E6=9C=9F=E7=AD=9B=E9=80=89=E7=9A=84?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionMain/productionMain.data.ts             | 11 ++++++++++-
 .../productionMainAssemble.data.ts                    |  9 +++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
index 81fbd9a61..d5dfe2dc2 100644
--- a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
@@ -118,7 +118,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  
+
   {
     label: '生产线',
     field: 'productionLine',
@@ -228,6 +228,15 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 120
     },
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isSearch: true,
     sortTableDefault:1000,
     form: {
       component: 'DatePicker',
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
index 345ed64c1..a210540f2 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
@@ -227,6 +227,15 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 120
     },
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isSearch: true,
     sortTableDefault:1000,
     form: {
       component: 'DatePicker',

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 129/408] =?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 e3bbe56daf012947202695c8824c72542e9f9011 Mon Sep 17 00:00:00 2001
From: zhaoyiran <zhaoyrd@yonyou.com>
Date: Thu, 4 Jul 2024 16:10:44 +0800
Subject: [PATCH 130/408] =?UTF-8?q?=E5=AE=9A=E9=87=8F=E7=9A=84=E4=B8=8A?=
 =?UTF-8?q?=E9=99=90=E5=80=BC=E3=80=81=E4=B8=8B=E9=99=90=E5=80=BC=E3=80=81?=
 =?UTF-8?q?=E7=9B=AE=E6=A0=87=E5=80=BC=EF=BC=8C=E9=9C=80=E8=A6=81=E5=9C=A8?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1=E6=97=B6?=
 =?UTF-8?q?=E5=80=99=E6=98=BE=E7=A4=BA=E5=87=BA=E6=9D=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/inspectionJob/addForm.vue | 53 +++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/src/views/qms/inspectionJob/addForm.vue b/src/views/qms/inspectionJob/addForm.vue
index 06ecd6095..cc24ae084 100644
--- a/src/views/qms/inspectionJob/addForm.vue
+++ b/src/views/qms/inspectionJob/addForm.vue
@@ -108,6 +108,59 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
+
+
+                <el-col :span="12" v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0">
+                  <el-form-item
+                    label="是否设定上限"
+                    prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
+                  >
+                    <el-switch v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping" :disabled="true" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12" v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 && item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping">
+                  <el-form-item
+                    label="上限值"
+                    prop="inspectionCharacteristicsBaseVO.quantifyCapping"
+                  >
+                    <el-input v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping" :disabled="true" />
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="12" v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0">
+                  <el-form-item
+                    label="是否设定下限"
+                    prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
+                  >
+                    <el-switch v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit" :disabled="true" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12" v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 && item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit">
+                  <el-form-item
+                    label="下限值"
+                    prop="inspectionCharacteristicsBaseVO.quantifyCapping"
+                  >
+                    <el-input v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit" :disabled="true" />
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="12" v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0">
+                  <el-form-item
+                    label="是否设定目标值"
+                    prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
+                  >
+                    <el-switch v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget" :disabled="true" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12" v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 && item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget">
+                  <el-form-item
+                    label="目标值"
+                    prop="inspectionCharacteristicsBaseVO.quantifyCapping"
+                  >
+                    <el-input v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget" :disabled="true" />
+                  </el-form-item>
+                </el-col>
+
                 <el-col :span="12">
                   <el-form-item label="开始时间" prop="inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime">
                     <el-date-picker v-model="item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime"

From ba417001098b102abcabc92d60cf4509888a7545 Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Thu, 4 Jul 2024 16:25:00 +0800
Subject: [PATCH 131/408] =?UTF-8?q?=E9=AB=98=E7=BA=A7=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=A1=E5=88=92=E6=97=A5=E6=9C=9F=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionMain/productionMain.data.ts     | 31 +++++++++++++++++++
 .../productionMainAssemble.data.ts            | 31 +++++++++++++++++++
 2 files changed, 62 insertions(+)

diff --git a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
index d5dfe2dc2..bc469c5ad 100644
--- a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
@@ -711,6 +711,37 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }]
     },
   },
+  {
+    label: '计划日期',
+    field: 'planDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 120
+    },
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isSearch: true,
+    sortTableDefault:1000,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
   {
     label: '计划数量',
     field: 'planQty',
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
index a210540f2..466d2a4e5 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
@@ -710,6 +710,37 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }]
     },
   },
+  {
+    label: '计划日期',
+    field: 'planDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 120
+    },
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isSearch: true,
+    sortTableDefault:1000,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
   {
     label: '计划数量',
     field: 'planQty',

From eb8d7cdc98e334c92792300aa4b10d4dabd2ce10 Mon Sep 17 00:00:00 2001
From: zhaoyiran <zhaoyrd@yonyou.com>
Date: Thu, 4 Jul 2024 16:25:30 +0800
Subject: [PATCH 132/408] =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E4=B8=BB=E6=95=B0=E6=8D=AE=E5=B8=A6=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/inspectionScheme/addForm.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/qms/inspectionScheme/addForm.vue b/src/views/qms/inspectionScheme/addForm.vue
index cfbc54c4c..7d07f2ba6 100644
--- a/src/views/qms/inspectionScheme/addForm.vue
+++ b/src/views/qms/inspectionScheme/addForm.vue
@@ -1235,6 +1235,7 @@ const searchTableSuccess = async (formField, searchField, val, type, row) => {
         data.value.samplePieceSize = ''
         isSamplePieceSizeDisabled.value = false
       }
+      data.value.description = val[0].desc1
     } else if (formField == 'inspectionType') {
       data.value.testTypeName = val[0].description
     } else if (formField == 'programmeTemplateCode') {

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 133/408] =?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 a74d4a6fd76d04b04c204244cebdfa3dca0fb206 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com>
Date: Thu, 4 Jul 2024 16:46:56 +0800
Subject: [PATCH 134/408] =?UTF-8?q?EAM=E5=A4=87=E4=BB=B6=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/eam/sparePartsApplyDetail/index.ts    |  63 ++
 src/api/eam/sparePartsApplyMain/index.ts      |  87 ++
 .../eam/sparePartsInLocationDetail/index.ts   |  58 ++
 src/api/eam/sparePartsInLocationMain/index.ts |  91 ++
 .../sparePartsInLocationRecordDetail/index.ts |  58 ++
 .../sparePartsInLocationRecordMain/index.ts   |  72 ++
 .../eam/sparePartsOutLocationDetail/index.ts  |  61 ++
 .../eam/sparePartsOutLocationMain/index.ts    |  81 ++
 .../index.ts                                  |  72 ++
 .../sparePartsOutLocationDetailRecord.js      |  54 +
 .../sparePartsOutLocationRecordMain/index.ts  |  71 ++
 src/utils/dict.ts                             |   2 +
 src/utils/disposition/defaultButtons.ts       | 527 +++++-----
 .../eam/SparePartsOutLocationRecord/index.vue | 374 +++++++
 src/views/eam/applicationRecord/index.vue     | 527 +++++-----
 .../countadjustPlan/countadjustPlan.data.ts   | 127 ++-
 src/views/eam/countadjustWork/index.vue       | 540 +++++-----
 src/views/eam/item/item.data.ts               |   5 -
 src/views/eam/itemAccounts/index.vue          |  51 +-
 .../eam/itemAccounts/itemAccounts.data.ts     |  89 +-
 src/views/eam/location/location.data.ts       |   2 +-
 .../eam/locationArea/locationArea.data.ts     | 135 +--
 src/views/eam/maintenance/maintenance.data.ts | 969 +++++++++---------
 .../SparePartsApply.data.ts                   | 365 +++++++
 src/views/eam/sparePartsApplyMain/index.vue   | 511 +++++++++
 .../eam/sparePartsInLocationRecord/index.vue  | 137 +++
 .../sparePartsInLocationRecordMain.data.ts    | 258 +++++
 src/views/eam/sparepartsinlocation/index.vue  | 472 +++++++++
 .../sparePartsInLocationMain.data.ts          | 298 ++++++
 .../SparePartsOutLocation.data.ts             | 344 +++++++
 src/views/eam/sparepartsoutlocation/index.vue | 399 ++++++++
 src/views/eam/transaction/index.vue           |  86 +-
 src/views/eam/transaction/transaction.data.ts | 160 +--
 33 files changed, 5658 insertions(+), 1488 deletions(-)
 create mode 100644 src/api/eam/sparePartsApplyDetail/index.ts
 create mode 100644 src/api/eam/sparePartsApplyMain/index.ts
 create mode 100644 src/api/eam/sparePartsInLocationDetail/index.ts
 create mode 100644 src/api/eam/sparePartsInLocationMain/index.ts
 create mode 100644 src/api/eam/sparePartsInLocationRecordDetail/index.ts
 create mode 100644 src/api/eam/sparePartsInLocationRecordMain/index.ts
 create mode 100644 src/api/eam/sparePartsOutLocationDetail/index.ts
 create mode 100644 src/api/eam/sparePartsOutLocationMain/index.ts
 create mode 100644 src/api/eam/sparePartsOutLocationRecordDetail/index.ts
 create mode 100644 src/api/eam/sparePartsOutLocationRecordDetail/sparePartsOutLocationDetailRecord.js
 create mode 100644 src/api/eam/sparePartsOutLocationRecordMain/index.ts
 create mode 100644 src/views/eam/SparePartsOutLocationRecord/index.vue
 create mode 100644 src/views/eam/sparePartsApplyMain/SparePartsApply.data.ts
 create mode 100644 src/views/eam/sparePartsApplyMain/index.vue
 create mode 100644 src/views/eam/sparePartsInLocationRecord/index.vue
 create mode 100644 src/views/eam/sparePartsInLocationRecord/sparePartsInLocationRecordMain.data.ts
 create mode 100644 src/views/eam/sparepartsinlocation/index.vue
 create mode 100644 src/views/eam/sparepartsinlocation/sparePartsInLocationMain.data.ts
 create mode 100644 src/views/eam/sparepartsoutlocation/SparePartsOutLocation.data.ts
 create mode 100644 src/views/eam/sparepartsoutlocation/index.vue

diff --git a/src/api/eam/sparePartsApplyDetail/index.ts b/src/api/eam/sparePartsApplyDetail/index.ts
new file mode 100644
index 000000000..ae94831de
--- /dev/null
+++ b/src/api/eam/sparePartsApplyDetail/index.ts
@@ -0,0 +1,63 @@
+import request from '@/config/axios'
+
+export interface SparePartsApplyDetailVO {
+  id: number
+  number: string
+  masterId: number
+  sparePartsCode: string
+  isRadeIn: string
+  applyQty: number
+  currentQty: number
+  type: string
+  currentSinglePrice: number
+  equipmentCode: byte[]
+  jobNumber: byte[]
+  departmentCode: string
+  remark: string
+  siteId: string
+  available: string
+  deletionTime: Date
+  deleterId: byte[]
+  concurrencyStamp: number
+}
+
+// 查询备件领用申请子列表
+export const getSparePartsApplyDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/eam/spare-parts-apply-detail/senior', data })
+  } else {
+    return await request.get({ url: `/eam/spare-parts-apply-detail/page`, params })
+  }
+}
+
+// 查询备件领用申请子详情
+export const getSparePartsApplyDetail = async (id: number) => {
+  return await request.get({ url: `/eam/spare-parts-apply-detail/get?id=` + id })
+}
+
+// 新增备件领用申请子
+export const createSparePartsApplyDetail = async (data: SparePartsApplyDetailVO) => {
+  return await request.post({ url: `/eam/spare-parts-apply-detail/create`, data })
+}
+
+// 修改备件领用申请子
+export const updateSparePartsApplyDetail = async (data: SparePartsApplyDetailVO) => {
+  return await request.put({ url: `/eam/spare-parts-apply-detail/update`, data })
+}
+
+// 删除备件领用申请子
+export const deleteSparePartsApplyDetail = async (id: number) => {
+  return await request.delete({ url: `/eam/spare-parts-apply-detail/delete?id=` + id })
+}
+
+// 导出备件领用申请子 Excel
+export const exportSparePartsApplyDetail = async (params) => {
+  return await request.download({ url: `/eam/spare-parts-apply-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/eam/spare-parts-apply-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/eam/sparePartsApplyMain/index.ts b/src/api/eam/sparePartsApplyMain/index.ts
new file mode 100644
index 000000000..80288a681
--- /dev/null
+++ b/src/api/eam/sparePartsApplyMain/index.ts
@@ -0,0 +1,87 @@
+import request from '@/config/axios'
+
+export interface SparePartsApplyMainVO {
+  id: number
+  number: string
+  description: string
+  applyDeptId: string
+  sumVal: number
+  status: string
+  applyer: string
+  approver: number
+  approveContent: string
+  approveTime: Date
+  autoExamine: string
+  autoAgree: string
+  directCreateRecord: string
+  departmentCode: string
+  remark: string
+  siteId: string
+  available: string
+  deletionTime: Date
+  deleterId: byte[]
+  concurrencyStamp: number
+}
+
+// 查询备件领用申请列表
+export const getSparePartsApplyMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = { ...params }
+    return await request.post({ url: '/eam/spare-parts-apply-main/senior', data })
+  } else {
+    return await request.get({ url: `/eam/spare-parts-apply-main/page`, params })
+  }
+}
+
+// 查询备件领用申请详情
+export const getSparePartsApplyMain = async (id: number) => {
+  return await request.get({ url: `/eam/spare-parts-apply-main/get?id=` + id })
+}
+
+// 新增备件领用申请
+export const createSparePartsApplyMain = async (data: SparePartsApplyMainVO) => {
+  return await request.post({ url: `/eam/spare-parts-apply-main/create`, data })
+}
+
+// 修改备件领用申请
+export const updateSparePartsApplyMain = async (data: SparePartsApplyMainVO) => {
+  return await request.put({ url: `/eam/spare-parts-apply-main/update`, data })
+}
+
+// 删除备件领用申请
+export const deleteSparePartsApplyMain = async (id: number) => {
+  return await request.delete({ url: `/eam/spare-parts-apply-main/delete?id=` + id })
+}
+
+// 导出备件领用申请 Excel
+export const exportSparePartsApplyMain = async (params) => {
+  return await request.download({ url: `/eam/spare-parts-apply-main/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/eam/spare-parts-apply-main/get-import-template' })
+}
+
+// 撤回
+export const cancelSparePartsApplyMain = async (id) => {
+  return await request.get({ url: `/eam/spare-parts-apply-main/cancel?id=` + id })
+}
+// 审核
+export const submitSparePartsApplyMain = async (id) => {
+  return await request.get({ url: `/eam/spare-parts-apply-main/submitExamine?id=` + id })
+}
+// 审核驳回
+export const rejectSparePartsApplyMain = async (id) => {
+  return await request.get({ url: `/eam/spare-parts-apply-main/reject?id=` + id })
+}
+// 审核通过
+export const approveSparePartsApplyMain = async (data) => {
+  return await request.post({ url: `/eam/spare-parts-apply-main/approve`, data })
+}
+
+// 完成
+export const finishSparePartsApplyMain = async (id) => {
+  return await request.post({ url: `/eam/spare-parts-apply-main/finish?id=` + id })
+}
diff --git a/src/api/eam/sparePartsInLocationDetail/index.ts b/src/api/eam/sparePartsInLocationDetail/index.ts
new file mode 100644
index 000000000..827687a36
--- /dev/null
+++ b/src/api/eam/sparePartsInLocationDetail/index.ts
@@ -0,0 +1,58 @@
+import request from '@/config/axios'
+
+export interface SparePartsInLocationDetailVO {
+  id: number
+  number: string
+  masterId: number
+  sparePartsCode: string
+  isRadeIn: string
+  applyQty: number
+  departmentCode: string
+  remark: string
+  siteId: string
+  available: string
+  deletionTime: Date
+  deleterId: byte[]
+  concurrencyStamp: number
+}
+
+// 查询备件入库记录子列表
+export const getSparePartsInLocationDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/eam/spare-parts-in-location-detail/senior', data })
+  } else {
+    return await request.get({ url: `/eam/spare-parts-in-location-detail/page`, params })
+  }
+}
+
+// 查询备件入库记录子详情
+export const getSparePartsInLocationDetail = async (id: number) => {
+  return await request.get({ url: `/eam/spare-parts-in-location-detail/get?id=` + id })
+}
+
+// 新增备件入库记录子
+export const createSparePartsInLocationDetail = async (data: SparePartsInLocationDetailVO) => {
+  return await request.post({ url: `/eam/spare-parts-in-location-detail/create`, data })
+}
+
+// 修改备件入库记录子
+export const updateSparePartsInLocationDetail = async (data: SparePartsInLocationDetailVO) => {
+  return await request.put({ url: `/eam/spare-parts-in-location-detail/update`, data })
+}
+
+// 删除备件入库记录子
+export const deleteSparePartsInLocationDetail = async (id: number) => {
+  return await request.delete({ url: `/eam/spare-parts-in-location-detail/delete?id=` + id })
+}
+
+// 导出备件入库记录子 Excel
+export const exportSparePartsInLocationDetail = async (params) => {
+  return await request.download({ url: `/eam/spare-parts-in-location-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/eam/spare-parts-in-location-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/eam/sparePartsInLocationMain/index.ts b/src/api/eam/sparePartsInLocationMain/index.ts
new file mode 100644
index 000000000..687d99a67
--- /dev/null
+++ b/src/api/eam/sparePartsInLocationMain/index.ts
@@ -0,0 +1,91 @@
+import request from '@/config/axios'
+
+export interface SparePartsInLocationMainVO {
+  id: number
+  number: string
+  theme: string
+  status: string
+  applyer: string
+  approver: number
+  approveContent: string
+  approveTime: Date
+  autoExamine: string
+  autoAgree: string
+  directCreateRecord: string
+  areaCode: string
+  locationCode: string
+  departmentCode: string
+  remark: string
+  siteId: string
+  available: string
+  deletionTime: Date
+  deleterId: byte[]
+  concurrencyStamp: number
+}
+
+// 查询备件入库记录主列表
+export const getSparePartsInLocationMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/eam/spare-parts-in-location-main/senior', data })
+  } else {
+    return await request.get({ url: `/eam/spare-parts-in-location-main/page`, params })
+  }
+}
+
+// 查询备件入库记录主详情
+export const getSparePartsInLocationMain = async (id: number) => {
+  return await request.get({ url: `/eam/spare-parts-in-location-main/get?id=` + id })
+}
+
+// 新增备件入库记录主
+export const createSparePartsInLocationMain = async (data: SparePartsInLocationMainVO) => {
+  return await request.post({ url: `/eam/spare-parts-in-location-main/create`, data })
+}
+
+// 修改备件入库记录主
+export const updateSparePartsInLocationMain = async (data: SparePartsInLocationMainVO) => {
+  return await request.put({ url: `/eam/spare-parts-in-location-main/update`, data })
+}
+
+// 删除备件入库记录主
+export const deleteSparePartsInLocationMain = async (id: number) => {
+  return await request.delete({ url: `/eam/spare-parts-in-location-main/delete?id=` + id })
+}
+
+// 导出备件入库记录主 Excel
+export const exportSparePartsInLocationMain = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/eam/spare-parts-in-location-main/export-excel-senior`, data })
+  }else{
+    return await request.download({ url: `/eam/spare-parts-in-location-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/eam/spare-parts-in-location-main/get-import-template' })
+}
+
+// 撤回
+export const cancelSparePartsInLocation = async (id) => {
+  return await request.get({ url: `/eam/spare-parts-in-location-main/cancel?id=` + id  })
+}
+// 审核
+export const submitExamineSparePartsInLocation = async (id) => {
+  return await request.get({ url: `/eam/spare-parts-in-location-main/submitExamine?id=` + id  })
+}
+// 审核驳回
+export const rejectSparePartsInLocation = async (id) => {
+  return await request.get({ url: `/eam/spare-parts-in-location-main/reject?id=` + id  })
+}
+// 审核通过
+export const approveSparePartsInLocation = async (data) => {
+  return await request.post({ url: `/eam/spare-parts-in-location-main/approve`,data })
+}
+// 完成
+export const finishSparePartsInLocation = async (id) => {
+  return await request.post({ url: `/eam/spare-parts-in-location-main/finish?id=` + id  })
+}
\ No newline at end of file
diff --git a/src/api/eam/sparePartsInLocationRecordDetail/index.ts b/src/api/eam/sparePartsInLocationRecordDetail/index.ts
new file mode 100644
index 000000000..9e4df6997
--- /dev/null
+++ b/src/api/eam/sparePartsInLocationRecordDetail/index.ts
@@ -0,0 +1,58 @@
+import request from '@/config/axios'
+
+export interface SparePartsInLocationDetailRecordVO {
+  id: number
+  number: string
+  masterId: number
+  sparePartsCode: string
+  isRadeIn: string
+  applyQty: number
+  departmentCode: string
+  remark: string
+  siteId: string
+  available: string
+  deletionTime: Date
+  deleterId: byte[]
+  concurrencyStamp: number
+}
+
+// 查询备件入库记录子列表
+export const getSparePartsInLocationRecordDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/eam/spare-parts-in-location-detail-record/senior', data })
+  } else {
+    return await request.get({ url: `/eam/spare-parts-in-location-detail-record/page`, params })
+  }
+}
+
+// 查询备件入库记录子详情
+export const getSparePartsInLocationRecordDetail = async (id: number) => {
+  return await request.get({ url: `/eam/spare-parts-in-location-detail-record/get?id=` + id })
+}
+
+// 新增备件入库记录子
+export const createSparePartsInLocationRecordDetail= async (data: SparePartsInLocationDetailRecordVO) => {
+  return await request.post({ url: `/eam/spare-parts-in-location-detail-record/create`, data })
+}
+
+// 修改备件入库记录子
+export const updateSparePartsInLocationRecordDetail = async (data: SparePartsInLocationDetailRecordVO) => {
+  return await request.put({ url: `/eam/spare-parts-in-location-detail-record/update`, data })
+}
+
+// 删除备件入库记录子
+export const deleteSparePartsInLocationRecordDetail = async (id: number) => {
+  return await request.delete({ url: `/eam/spare-parts-in-location-detail-record/delete?id=` + id })
+}
+
+// 导出备件入库记录子 Excel
+export const exportSparePartsInLocationRecordDetail = async (params) => {
+  return await request.download({ url: `/eam/spare-parts-in-location-detail-record/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/eam/spare-parts-in-location-detail-record/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/eam/sparePartsInLocationRecordMain/index.ts b/src/api/eam/sparePartsInLocationRecordMain/index.ts
new file mode 100644
index 000000000..42c7616fe
--- /dev/null
+++ b/src/api/eam/sparePartsInLocationRecordMain/index.ts
@@ -0,0 +1,72 @@
+import request from '@/config/axios'
+
+export interface SparePartsInLocationMainRecordVO {
+  id: number
+  number: string
+  theme: string
+  status: string
+  applyer: string
+  approver: number
+  approveContent: string
+  approveTime: Date
+  autoExamine: string
+  autoAgree: string
+  directCreateRecord: string
+  areaCode: string
+  locationCode: string
+  departmentCode: string
+  remark: string
+  siteId: string
+  available: string
+  deletionTime: Date
+  deleterId: byte[]
+  concurrencyStamp: number
+}
+
+// 查询备件入库记录主列表
+export const getSparePartsInLocationRecordMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = { ...params }
+    return await request.post({ url: '/eam/spare-parts-in-location-main-record/senior', data })
+  } else {
+    return await request.get({ url: `/eam/spare-parts-in-location-main-record/page`, params })
+  }
+}
+
+// 查询备件入库记录主详情
+export const getSparePartsInLocationRecordMain = async (id: number) => {
+  return await request.get({ url: `/eam/spare-parts-in-location-main-record/get?id=` + id })
+}
+
+// 新增备件入库记录主
+export const createSparePartsInLocationRecordMain = async (
+  data: SparePartsInLocationMainRecordVO
+) => {
+  return await request.post({ url: `/eam/spare-parts-in-location-main-record/create`, data })
+}
+
+// 修改备件入库记录主
+export const updateSparePartsInLocationRecordMain = async (
+  data: SparePartsInLocationMainRecordVO
+) => {
+  return await request.put({ url: `/eam/spare-parts-in-location-main-record/update`, data })
+}
+
+// 删除备件入库记录主
+export const deleteSparePartsInLocationRecordMain= async (id: number) => {
+  return await request.delete({ url: `/eam/spare-parts-in-location-main-record/delete?id=` + id })
+}
+
+// 导出备件入库记录主 Excel
+export const exportSparePartsInLocationRecordMain = async (params) => {
+  return await request.download({
+    url: `/eam/spare-parts-in-location-main-record/export-excel`,
+    params
+  })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/eam/spare-parts-in-location-main-record/get-import-template' })
+}
diff --git a/src/api/eam/sparePartsOutLocationDetail/index.ts b/src/api/eam/sparePartsOutLocationDetail/index.ts
new file mode 100644
index 000000000..16b9fe4cc
--- /dev/null
+++ b/src/api/eam/sparePartsOutLocationDetail/index.ts
@@ -0,0 +1,61 @@
+import request from '@/config/axios'
+
+export interface SparePartsOutLocationDetailVO {
+  id: number
+  number: string
+  masterId: number
+  sparePartsCode: string
+  isRadeIn: string
+  applyQty: number
+  departmentCode: string
+  remark: string
+  siteId: string
+  available: string
+  deletionTime: Date
+  deleterId: byte[]
+  concurrencyStamp: number
+}
+
+// 查询备件入库记录子列表
+export const getSparePartsOutLocationDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = { ...params }
+    return await request.post({ url: '/eam/spare-parts-out-location-detail/senior', data })
+  } else {
+    return await request.get({ url: `/eam/spare-parts-out-location-detail/page`, params })
+  }
+}
+
+// 查询备件入库记录子详情
+export const getSparePartsOutLocationDetail = async (id: number) => {
+  return await request.get({ url: `/eam/spare-parts-out-location-detail/get?id=` + id })
+}
+
+// 新增备件入库记录子
+export const createSparePartsOutLocationDetail = async (data: SparePartsOutLocationDetailVO) => {
+  return await request.post({ url: `/eam/spare-parts-out-location-detail/create`, data })
+}
+
+// 修改备件入库记录子
+export const updateSparePartsOutLocationDetail = async (data: SparePartsOutLocationDetailVO) => {
+  return await request.put({ url: `/eam/spare-parts-out-location-detail/update`, data })
+}
+
+// 删除备件入库记录子
+export const deleteSparePartsOutLocationDetail = async (id: number) => {
+  return await request.delete({ url: `/eam/spare-parts-out-location-detail/delete?id=` + id })
+}
+
+// 导出备件入库记录子 Excel
+export const exportSparePartsOutLocationDetail = async (params) => {
+  return await request.download({
+    url: `/eam/spare-parts-out-location-detail/export-excel`,
+    params
+  })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/eam/spare-parts-out-location-detail/get-import-template' })
+}
diff --git a/src/api/eam/sparePartsOutLocationMain/index.ts b/src/api/eam/sparePartsOutLocationMain/index.ts
new file mode 100644
index 000000000..1eeccf471
--- /dev/null
+++ b/src/api/eam/sparePartsOutLocationMain/index.ts
@@ -0,0 +1,81 @@
+import request from '@/config/axios'
+
+export interface SparePartsOutLocationMainVO {
+  id: number
+  number: string
+  theme: string
+  status: string
+  applyer: string
+  approver: number
+  approveContent: string
+  approveTime: Date
+  autoExamine: string
+  autoAgree: string
+  directCreateRecord: string
+  areaCode: string
+  locationCode: string
+  departmentCode: string
+  remark: string
+  siteId: string
+  available: string
+  deletionTime: Date
+  deleterId: byte[]
+  concurrencyStamp: number
+}
+
+// 查询备件入库记录主列表
+export const getSparePartsOutLocationMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = { ...params }
+    return await request.post({ url: '/eam/spare-parts-out-location-main/senior', data })
+  } else {
+    return await request.get({ url: `/eam/spare-parts-out-location-main/page`, params })
+  }
+}
+
+// 查询备件入库记录主详情
+export const getSparePartsOutLocationMain = async (id: number) => {
+  return await request.get({ url: `/eam/spare-parts-out-location-main/get?id=` + id })
+}
+
+// 新增备件入库记录主
+export const createSparePartsOutLocationMain = async (data: SparePartsOutLocationMainVO) => {
+  return await request.post({ url: `/eam/spare-parts-out-location-main/create`, data })
+}
+
+// 修改备件入库记录主
+export const updateSparePartsOutLocationMain = async (data: SparePartsOutLocationMainVO) => {
+  return await request.put({ url: `/eam/spare-parts-out-location-main/update`, data })
+}
+
+// 删除备件入库记录主
+export const deleteSparePartsOutLocationMain = async (id: number) => {
+  return await request.delete({ url: `/eam/spare-parts-out-location-main/delete?id=` + id })
+}
+
+// 出库
+export const outSparePartsOutLocationMain = async (id) => {
+  return await request.get({ url: `/eam/spare-parts-out-location-main/out?id=` + id })
+}
+
+// 导出备件入库记录主 Excel
+export const exportSparePartsOutLocationMain = async (params) => {
+  if (params.isSearch) {
+    const data = { ...params }
+    return await request.downloadPost({
+      url: `/eam/spare-parts-out-location-main/export-excel-senior`,
+      data
+    })
+  } else {
+    return await request.download({
+      url: `/eam/spare-parts-out-location-main/export-excel`,
+      params
+    })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/eam/spare-parts-out-location-main/get-import-template' })
+}
diff --git a/src/api/eam/sparePartsOutLocationRecordDetail/index.ts b/src/api/eam/sparePartsOutLocationRecordDetail/index.ts
new file mode 100644
index 000000000..c4ea46811
--- /dev/null
+++ b/src/api/eam/sparePartsOutLocationRecordDetail/index.ts
@@ -0,0 +1,72 @@
+import request from '@/config/axios'
+
+export interface SparePartsOutLocationRecordDetailVO {
+  id: number
+  number: string
+  theme: string
+  status: string
+  applyer: string
+  approver: number
+  approveContent: string
+  approveTime: Date
+  autoExamine: string
+  autoAgree: string
+  directCreateRecord: string
+  areaCode: string
+  locationCode: string
+  departmentCode: string
+  remark: string
+  siteId: string
+  available: string
+  deletionTime: Date
+  deleterId: byte[]
+  concurrencyStamp: number
+}
+
+// 查询备件入库记录主列表
+export const getSparePartsOutLocationDetailRecordPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = { ...params }
+    return await request.post({ url: '/eam/spare-parts-in-location-main-record/senior', data })
+  } else {
+    return await request.get({ url: `/eam/spare-parts-in-location-main-record/page`, params })
+  }
+}
+
+// 查询备件入库记录主详情
+export const getSparePartsOutLocationDetailRecord = async (id: number) => {
+  return await request.get({ url: `/eam/spare-parts-in-location-main-record/get?id=` + id })
+}
+
+// 新增备件入库记录主
+export const createSparePartsOutLocationDetailRecord = async (
+  data: SparePartsInLocationMainRecordVO
+) => {
+  return await request.post({ url: `/eam/spare-parts-in-location-main-record/create`, data })
+}
+
+// 修改备件入库记录主
+export const updateSparePartsOutLocationDetailRecord = async (
+  data: SparePartsInLocationMainRecordVO
+) => {
+  return await request.put({ url: `/eam/spare-parts-in-location-main-record/update`, data })
+}
+
+// 删除备件入库记录主
+export const deleteSparePartsOutLocationDetailRecord = async (id: number) => {
+  return await request.delete({ url: `/eam/spare-parts-in-location-main-record/delete?id=` + id })
+}
+
+// 导出备件入库记录主 Excel
+export const exportSparePartsOutLocationDetailRecord = async (params) => {
+  return await request.download({
+    url: `/eam/spare-parts-in-location-main-record/export-excel`,
+    params
+  })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/eam/spare-parts-in-location-main-record/get-import-template' })
+}
diff --git a/src/api/eam/sparePartsOutLocationRecordDetail/sparePartsOutLocationDetailRecord.js b/src/api/eam/sparePartsOutLocationRecordDetail/sparePartsOutLocationDetailRecord.js
new file mode 100644
index 000000000..4e84a9429
--- /dev/null
+++ b/src/api/eam/sparePartsOutLocationRecordDetail/sparePartsOutLocationDetailRecord.js
@@ -0,0 +1,54 @@
+import request from '@/config/axios'
+
+// 创建领用出库记录子
+export function createSparePartsOutLocationRecordDetail(data) {
+  return request({
+    url: '/eam/spare-parts-out-location-detail-record/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新领用出库记录子
+export function updateSparePartsOutLocationRecordDetail(data) {
+  return request({
+    url: '/eam/spare-parts-out-location-detail-record/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除领用出库记录子
+export function deleteSparePartsOutLocationRecordDetail(id) {
+  return request({
+    url: '/eam/spare-parts-out-location-detail-record/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得领用出库记录子
+export function getSparePartsOutLocationRecordDetail(id) {
+  return request({
+    url: '/eam/spare-parts-out-location-detail-record/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得领用出库记录子分页
+export function getSparePartsOutLocationRecordDetailPage(query) {
+  return request({
+    url: '/eam/spare-parts-out-location-detail-record/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出领用出库记录子 Excel
+export function exportSparePartsOutLocationRecordDetailExcel(query) {
+  return request({
+    url: '/eam/spare-parts-out-location-detail-record/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
diff --git a/src/api/eam/sparePartsOutLocationRecordMain/index.ts b/src/api/eam/sparePartsOutLocationRecordMain/index.ts
new file mode 100644
index 000000000..4f075cce1
--- /dev/null
+++ b/src/api/eam/sparePartsOutLocationRecordMain/index.ts
@@ -0,0 +1,71 @@
+import request from '@/config/axios'
+
+export interface SparePartsOutLocationRecordMainVO {
+  id: number
+  number: string
+  theme: string
+  applyer: string
+  approver: number
+  approveContent: string
+  approveTime: Date
+  autoExamine: string
+  autoAgree: string
+  directCreateRecord: string
+  areaCode: string
+  locationCode: string
+  departmentCode: string
+  remark: string
+  siteId: string
+  available: string
+  deletionTime: Date
+  deleterId: byte[]
+  concurrencyStamp: number
+}
+
+// 查询领用出库记录主列表
+export const getSparePartsOutLocationRecordMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = { ...params }
+    return await request.post({ url: '/eam/spare-parts-out-location-main-record/senior', data })
+  } else {
+    return await request.get({ url: `/eam/spare-parts-out-location-main-record/page`, params })
+  }
+}
+
+// 查询领用出库记录主详情
+export const getSparePartsOutLocationRecordMain = async (id: number) => {
+  return await request.get({ url: `/eam/spare-parts-out-location-main-record/get?id=` + id })
+}
+
+// 新增领用出库记录主
+export const createSparePartsOutLocationRecordMain = async (
+  data: SparePartsOutLocationRecordMainVO
+) => {
+  return await request.post({ url: `/eam/spare-parts-out-location-main-record/create`, data })
+}
+
+// 修改领用出库记录主
+export const updateSparePartsOutLocationRecordMain = async (
+  data: SparePartsOutLocationRecordMainVO
+) => {
+  return await request.put({ url: `/eam/spare-parts-out-location-main-record/update`, data })
+}
+
+// 删除领用出库记录主
+export const deleteSparePartsOutLocationRecordMain = async (id: number) => {
+  return await request.delete({ url: `/eam/spare-parts-out-location-main-record/delete?id=` + id })
+}
+
+// 导出领用出库记录主 Excel
+export const exportSparePartsOutLocationRecordMain = async (params) => {
+  return await request.download({
+    url: `/eam/spare-parts-out-location-main-record/export-excel`,
+    params
+  })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/eam/spare-parts-out-location-main-record/get-import-template' })
+}
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index a6b8966d5..fe86384be 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -230,6 +230,8 @@ export enum DICT_TYPE {
   SETTLEMENT_TYPE = 'settlement_type', // 结算类型
   FROZEN_REASON = 'frozen_reason', // 冻结原因
   INVENTORY_ACTION = 'inventory_action', // 库存动作
+  EAM_INVENTORY_ACTION = 'EAM_inventory_action', // EAM库存动作
+  EAM_TRANSACTION_TYPE = 'EAM_transaction_Type', // EAM库存类型
   CONTAINER_TYPE = 'container_type', // 器具类型
   CONTAINER_CONTENT_TYPE = 'container_content_type', // 器具内容类型
   RESET_PERIOD = 'reset_period', // 重置周期
diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts
index 145a6d9fb..edb8b8d7e 100644
--- a/src/utils/disposition/defaultButtons.ts
+++ b/src/utils/disposition/defaultButtons.ts
@@ -1,27 +1,27 @@
 // 页面基础按钮样式
 /**
  * 如果需要更改配置，格式如：defaultExportBtn({label:'自定义'})
- * @param {*} option 
- * @returns 
+ * @param {*} option
+ * @returns
  */
 const { t } = useI18n()
 
 // 新增按钮
-export function defaultAddBtn(option:any) {
-    return __defaultBtnOption(option,{
-      label: t(`ts.新增`).replace('ts.', ''),
-      name: 'add',
-      hide: false,
-      type: 'primary',
-      icon: 'ep:plus',
-      color: '',
-      hasPermi: ''
-    })
+export function defaultAddBtn(option: any) {
+  return __defaultBtnOption(option, {
+    label: t(`ts.新增`).replace('ts.', ''),
+    name: 'add',
+    hide: false,
+    type: 'primary',
+    icon: 'ep:plus',
+    color: '',
+    hasPermi: ''
+  })
 }
 
 // 导入按钮
-export function defaultImportBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function defaultImportBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.导入`).replace('ts.', ''),
     name: 'import',
     hide: false,
@@ -33,8 +33,8 @@ export function defaultImportBtn(option:any) {
 }
 
 // 导出按钮
-export function defaultExportBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function defaultExportBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.导出`).replace('ts.', ''),
     name: 'export',
     hide: false,
@@ -77,183 +77,183 @@ export function defaultExportBtn(option:any) {
 // }
 
 // 刷新按钮
-export function defaultFreshBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function defaultFreshBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.刷新`).replace('ts.', ''),
     name: 'refresh',
     hide: false,
     type: 'primary',
     icon: 'ep:refresh',
     color: '',
-    float:'right',
+    float: 'right',
     hasPermi: ''
   })
 }
 
 // 重置按钮
-export function defaultResetBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function defaultResetBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.重置`).replace('ts.', ''),
     name: 'reset',
     hide: false,
     type: 'info',
     icon: '',
     color: '',
-    float:'right',
+    float: 'right',
     hasPermi: ''
   })
 }
 
 // 字段设置
-export function defaultSetBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function defaultSetBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.设置`).replace('ts.', ''),
     name: 'set',
     hide: false,
     type: 'info',
     icon: 'ep:setting',
     color: '',
-    float:'right',
+    float: 'right',
     hasPermi: ''
   })
 }
 
 // 筛选按钮
-export function defaultFilterBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function defaultFilterBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.筛选`).replace('ts.', ''),
     name: 'filtrate',
     hide: false,
     type: 'info',
     icon: 'ep:operation',
     color: '',
-    float:'right',
+    float: 'right',
     hasPermi: ''
   })
 }
 
 // 筛选——查询按钮
-export function defaultSearchBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function defaultSearchBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.搜索`).replace('ts.', ''),
     name: 'search',
     hide: false,
     type: 'primary',
     icon: '',
     color: '',
-    float:'right',
+    float: 'right',
     hasPermi: ''
   })
 }
 
 // 筛选——重置按钮
-export function defaultSearchResetBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function defaultSearchResetBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.重置`).replace('ts.', ''),
     name: 'searchReset',
     hide: false,
     type: 'info',
     icon: '',
     color: '',
-    float:'right',
+    float: 'right',
     hasPermi: ''
   })
 }
 // 选择当页
-export function defaultWhenPageBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function defaultWhenPageBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.选择当页`).replace('ts.', ''),
     name: 'WhenPage',
     hide: false,
     type: 'primary',
     color: '',
-    float:'right',
+    float: 'right',
     link: false, // 文本展现按钮
     hasPermi: ''
   })
 }
 // 反选当页
-export function defaultUnselectPageBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function defaultUnselectPageBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.反选当页`).replace('ts.', ''),
     name: 'UnselectPage',
     hide: false,
     type: 'primary',
     color: '',
-    float:'right',
+    float: 'right',
     link: false, // 文本展现按钮
     hasPermi: ''
   })
 }
 // 取消全选
-export function defaultDeselectAllBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function defaultDeselectAllBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.取消全选`).replace('ts.', ''),
     name: 'DeselectAll',
     hide: false,
     type: 'primary',
     color: '',
-    float:'right',
+    float: 'right',
     link: false, // 文本展现按钮
     hasPermi: ''
   })
 }
 // form表单-保存按钮
-export function formSaveBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function formSaveBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.保存`).replace('ts.', ''),
     name: 'save',
     hide: false,
     type: 'primary',
     icon: 'ep:select',
     color: '',
-    float:'right',
+    float: 'right',
     hasPermi: ''
   })
 }
 
 // form表单-关闭按钮
-export function formCloseBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function formCloseBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.关闭`).replace('ts.', ''),
     name: 'close',
     hide: false,
     icon: 'ep:close',
     color: '',
-    float:'right',
+    float: 'right',
     hasPermi: ''
   })
 }
 
 // form表单-关闭按钮
-export function formStagingBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function formStagingBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`btn.暂存`).replace('btn.', ''),
     name: 'staging',
     hide: false,
     color: 'green',
-    float:'right',
+    float: 'right',
     hasPermi: ''
   })
 }
 
 // form表单-下一步按钮
-export function formNextStepBtn(option:any) {
-  return __defaultBtnOption(option,{
+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',
+    float: 'right',
     hasPermi: ''
   })
 }
 
 // drawer抽屉头部-编辑按钮
-export function drawerEditBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function drawerEditBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.编辑`).replace('ts.', ''),
     name: 'edit',
     hide: false,
@@ -265,8 +265,8 @@ export function drawerEditBtn(option:any) {
 }
 
 // drawer抽屉头部-删除按钮
-export function drawerDeleteBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function drawerDeleteBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.删除`).replace('ts.', ''),
     name: 'delete',
     hide: false,
@@ -291,8 +291,8 @@ export function drawerDeleteBtn(option:any) {
 // }
 
 // 主列表-编辑按钮
-export function mainListEditBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainListEditBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.编辑`).replace('ts.', ''),
     name: 'edit',
     hide: false,
@@ -304,8 +304,8 @@ export function mainListEditBtn(option:any) {
 }
 
 // 主列表-删除按钮
-export function mainListDeleteBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainListDeleteBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.删除`).replace('ts.', ''),
     name: 'delete',
     hide: false,
@@ -315,8 +315,8 @@ export function mainListDeleteBtn(option:any) {
     hasPermi: ''
   })
 }
-export function mainListEnableBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainListEnableBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.启用`).replace('ts.', ''),
     name: 'enable',
     hide: false,
@@ -326,8 +326,8 @@ export function mainListEnableBtn(option:any) {
     hasPermi: ''
   })
 }
-export function mainListDisableBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainListDisableBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.禁用`).replace('ts.', ''),
     name: 'disable',
     hide: false,
@@ -338,9 +338,9 @@ export function mainListDisableBtn(option:any) {
   })
 }
 // 主列表-中止按钮1
-export function mainListSuspend1Btn(option:any) {
-  return __defaultBtnOption(option,{
-    label: t(`ts.中止`).replace('ts.',''),
+export function mainListSuspend1Btn(option: any) {
+  return __defaultBtnOption(option, {
+    label: t(`ts.中止`).replace('ts.', ''),
     name: 'suspend',
     hide: false,
     type: 'danger',
@@ -351,8 +351,8 @@ export function mainListSuspend1Btn(option:any) {
 }
 
 // 主列表-中止按钮2
-export function mainListSuspend2Btn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainListSuspend2Btn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.中止`).replace('ts.', ''),
     name: 'suspend',
     hide: false,
@@ -364,8 +364,8 @@ export function mainListSuspend2Btn(option:any) {
 }
 
 // 主列表-领取按钮
-export function mainListReceiveBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainListReceiveBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.领取`).replace('ts.', ''),
     name: 'receive',
     hide: false,
@@ -377,8 +377,8 @@ export function mainListReceiveBtn(option:any) {
 }
 
 // 主列表-接单按钮
-export function mainListReceiveOrderBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainListReceiveOrderBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.接单`).replace('ts.', ''),
     name: 'receive',
     hide: false,
@@ -390,8 +390,8 @@ export function mainListReceiveOrderBtn(option:any) {
 }
 
 // 主列表-执行按钮
-export function mainListExecuteBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainListExecuteBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.执行`).replace('ts.', ''),
     name: 'execute',
     hide: false,
@@ -403,8 +403,8 @@ export function mainListExecuteBtn(option:any) {
 }
 
 // 主列表-转办按钮
-export function mainListTransferBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainListTransferBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.转办`).replace('ts.', ''),
     name: 'transfer',
     hide: false,
@@ -416,8 +416,8 @@ export function mainListTransferBtn(option:any) {
 }
 
 // 主列表-完成按钮
-export function mainListFinishBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainListFinishBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.完成`).replace('ts.', ''),
     name: 'finish',
     hide: false,
@@ -429,8 +429,8 @@ export function mainListFinishBtn(option:any) {
 }
 
 // 主列表-作废按钮
-export function mainListCancelBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainListCancelBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.作废`).replace('ts.', ''),
     name: 'cancel',
     hide: false,
@@ -442,8 +442,8 @@ export function mainListCancelBtn(option:any) {
 }
 
 // 主列表-验证按钮
-export function mainListValidateBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainListValidateBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.验证`).replace('ts.', ''),
     name: 'validate',
     hide: false,
@@ -455,8 +455,8 @@ export function mainListValidateBtn(option:any) {
 }
 
 // 主列表-报修验证按钮
-export function mainListValidateReportBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainListValidateReportBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.报修验证`).replace('ts.', ''),
     name: 'validate_report',
     hide: false,
@@ -468,8 +468,8 @@ export function mainListValidateReportBtn(option:any) {
 }
 
 // 主列表-维修验证按钮
-export function mainListValidateRepairBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainListValidateRepairBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.维修验证`).replace('ts.', ''),
     name: 'validate_repair',
     hide: false,
@@ -480,8 +480,8 @@ export function mainListValidateRepairBtn(option:any) {
   })
 }
 // 主列表-预览按钮
-export function viewBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function viewBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: '预览',
     name: 'view',
     hide: false,
@@ -493,8 +493,8 @@ export function viewBtn(option:any) {
 }
 
 // 主列表-审核按钮
-export function mainListAuditingBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainListAuditingBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.审核`).replace('ts.', ''),
     name: 'auditing',
     hide: false,
@@ -506,8 +506,8 @@ export function mainListAuditingBtn(option:any) {
 }
 
 // 主列表-审核完成按钮
-export function mainListAuditedBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainListAuditedBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.审核完成`).replace('ts.', ''),
     name: 'audited',
     hide: false,
@@ -519,8 +519,8 @@ export function mainListAuditedBtn(option:any) {
 }
 
 // 主列表-撤回按钮
-export function mainListRevokeBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainListRevokeBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.撤回`).replace('ts.', ''),
     name: 'revoke',
     hide: false,
@@ -532,8 +532,8 @@ export function mainListRevokeBtn(option:any) {
 }
 
 // 主列表-绑定
-export function mainListBindBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainListBindBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.绑定`).replace('ts.', ''),
     name: 'bind',
     hide: false,
@@ -544,8 +544,8 @@ export function mainListBindBtn(option:any) {
   })
 }
 // 主列表-申请流程-关闭按钮
-export function mainListCloseBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainListCloseBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.关闭`).replace('ts.', ''),
     name: 'mainClose',
     hide: false,
@@ -557,8 +557,8 @@ export function mainListCloseBtn(option:any) {
 }
 
 // 主列表-申请流程-重新添加按钮
-export function mainListReAddBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainListReAddBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.重新添加`).replace('ts.', ''),
     name: 'mainReAdd',
     hide: false,
@@ -570,8 +570,8 @@ export function mainListReAddBtn(option:any) {
 }
 
 // 主列表-申请流程-提交审批按钮
-export function mainListSubmitBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainListSubmitBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.提交审批`).replace('ts.', ''),
     name: 'mainSubmit',
     hide: false,
@@ -583,8 +583,8 @@ export function mainListSubmitBtn(option:any) {
 }
 
 // 主列表-申请流程-驳回按钮
-export function mainListTurnDownBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainListTurnDownBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.驳回`).replace('ts.', ''),
     name: 'mainTurnDown',
     hide: false,
@@ -596,8 +596,8 @@ export function mainListTurnDownBtn(option:any) {
 }
 
 // 主列表-申请流程-审批通过按钮
-export function mainListApproveBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainListApproveBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.审批通过`).replace('ts.', ''),
     name: 'mainApprove',
     hide: false,
@@ -609,8 +609,8 @@ export function mainListApproveBtn(option:any) {
 }
 
 // 主列表-申请流程-处理按钮
-export function mainListHandleBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainListHandleBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.处理`).replace('ts.', ''),
     name: 'mainHandle',
     hide: false,
@@ -622,8 +622,8 @@ export function mainListHandleBtn(option:any) {
 }
 
 // 主列表-订单流程-发布按钮
-export function mainListOrderPubBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainListOrderPubBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.发布`).replace('ts.', ''),
     name: 'mainOrderPub',
     hide: false,
@@ -634,21 +634,21 @@ export function mainListOrderPubBtn(option:any) {
   })
 }
 // 主列表-订单流程-批量发布按钮
-export function mainListSelectionOrderPubBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainListSelectionOrderPubBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.批量发布`).replace('ts.', ''),
     name: 'mainOrderSelectionPub',
     hide: false,
     type: 'primary',
     color: '',
-    float:'left',
+    float: 'left',
     link: false, // 文本展现按钮
     hasPermi: ''
   })
 }
 // 主列表-订单流程-关闭按钮
-export function mainListOrderCloBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainListOrderCloBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.关闭`).replace('ts.', ''),
     name: 'mainOrderClo',
     hide: false,
@@ -660,8 +660,8 @@ export function mainListOrderCloBtn(option:any) {
 }
 
 // 主列表-订单流程-打开按钮
-export function mainListOrderOpeBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainListOrderOpeBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.打开`).replace('ts.', ''),
     name: 'mainOrderOpe',
     hide: false,
@@ -673,8 +673,8 @@ export function mainListOrderOpeBtn(option:any) {
 }
 
 // 主列表-订单流程-下架按钮
-export function mainListOrderWitBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainListOrderWitBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.下架`).replace('ts.', ''),
     name: 'mainOrderWit',
     hide: false,
@@ -686,8 +686,8 @@ export function mainListOrderWitBtn(option:any) {
 }
 
 // 主列表-计划流程-打开按钮
-export function mainListPlanOpeBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainListPlanOpeBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.打开`).replace('ts.', ''),
     name: 'mainPlanOpe',
     hide: false,
@@ -699,8 +699,8 @@ export function mainListPlanOpeBtn(option:any) {
 }
 
 // 主列表-计划流程-关闭按钮
-export function mainListPlanCloBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainListPlanCloBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.关闭`).replace('ts.', ''),
     name: 'mainPlanClo',
     hide: false,
@@ -712,20 +712,20 @@ export function mainListPlanCloBtn(option:any) {
 }
 
 // 主列表-上传质量报告
-export function mainListPlanUploadQualityReportBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainListPlanUploadQualityReportBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.上传质量报告`).replace('ts.', ''),
     name: 'mainPlanUploadQualityReport',
     hide: false,
     type: 'primary',
-    width:86,
+    width: 86,
     color: '',
     link: true, // 文本展现按钮
     hasPermi: ''
   })
 }
-export function mainListPlanCheckQualityReportBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainListPlanCheckQualityReportBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.查看质检报告`).replace('ts.', ''),
     name: 'mainPlanCheckQualityReport',
     hide: false,
@@ -737,8 +737,8 @@ export function mainListPlanCheckQualityReportBtn(option:any) {
 }
 
 // 主列表-计划流程-提交审批按钮
-export function mainListPlanSubBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainListPlanSubBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.提交审批`).replace('ts.', ''),
     name: 'mainPlanSub',
     hide: false,
@@ -750,8 +750,8 @@ export function mainListPlanSubBtn(option:any) {
 }
 
 // 主列表-计划流程-驳回按钮
-export function mainListPlanTurBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainListPlanTurBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.驳回`).replace('ts.', ''),
     name: 'mainPlanTur',
     hide: false,
@@ -763,8 +763,8 @@ export function mainListPlanTurBtn(option:any) {
 }
 
 // 主列表-计划流程-重置按钮
-export function mainListPlanResBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainListPlanResBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.重置`).replace('ts.', ''),
     name: 'mainPlanRes',
     hide: false,
@@ -776,8 +776,8 @@ export function mainListPlanResBtn(option:any) {
 }
 
 // 主列表-计划流程-审批通过按钮
-export function mainListPlanAppBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainListPlanAppBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.审批通过`).replace('ts.', ''),
     name: 'mainPlanApp',
     hide: false,
@@ -789,8 +789,8 @@ export function mainListPlanAppBtn(option:any) {
 }
 
 // 主列表-计划流程-发布按钮
-export function mainListPlanPubBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainListPlanPubBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.发布`).replace('ts.', ''),
     name: 'mainPlanPub',
     hide: false,
@@ -802,8 +802,8 @@ export function mainListPlanPubBtn(option:any) {
 }
 
 // 主列表-计划流程-执行按钮
-export function mainListPlanComBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainListPlanComBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.执行`).replace('ts.', ''),
     name: 'mainPlanCom',
     hide: false,
@@ -815,8 +815,8 @@ export function mainListPlanComBtn(option:any) {
 }
 
 // 主列表-要货计划流程-修改按钮
-export function mainListPurchasePlanModBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainListPurchasePlanModBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.修改`).replace('ts.', ''),
     name: 'mainPurPlanMod',
     hide: false,
@@ -828,9 +828,9 @@ export function mainListPurchasePlanModBtn(option:any) {
 }
 
 // 主列表-要货计划流程-下架按钮
-export function mainListPurchasePlanWitBtn(option:any) {
-  return __defaultBtnOption(option,{
-    label: t(`ts.下架`).replace('ts.',''),
+export function mainListPurchasePlanWitBtn(option: any) {
+  return __defaultBtnOption(option, {
+    label: t(`ts.下架`).replace('ts.', ''),
     name: 'mainPurPlanWit',
     hide: false,
     type: 'danger',
@@ -841,8 +841,8 @@ export function mainListPurchasePlanWitBtn(option:any) {
 }
 
 // 主列表-要货计划流程-不接受按钮
-export function mainListPurchasePlanRejBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainListPurchasePlanRejBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.不接受`).replace('ts.', ''),
     name: 'mainPurPlanRej',
     hide: false,
@@ -854,8 +854,8 @@ export function mainListPurchasePlanRejBtn(option:any) {
 }
 
 // 主列表-要货计划流程-接受按钮
-export function mainListPurchasePlanAccBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainListPurchasePlanAccBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.接受`).replace('ts.', ''),
     name: 'mainPurPlanAcc',
     hide: false,
@@ -867,8 +867,8 @@ export function mainListPurchasePlanAccBtn(option:any) {
 }
 
 // 主列表-要货计划流程-发布按钮
-export function mainListPurchasePlanPubBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainListPurchasePlanPubBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.发布`).replace('ts.', ''),
     name: 'mainPurPlanPub',
     hide: false,
@@ -880,8 +880,8 @@ export function mainListPurchasePlanPubBtn(option:any) {
 }
 
 // 主列表-要货计划流程-关闭按钮
-export function mainListPurchasePlanCloBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainListPurchasePlanCloBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.关闭`).replace('ts.', ''),
     name: 'mainPurPlanClo',
     hide: false,
@@ -893,8 +893,8 @@ export function mainListPurchasePlanCloBtn(option:any) {
 }
 
 // 主列表-要货计划流程-打开按钮
-export function mainListPurchasePlanOpeBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainListPurchasePlanOpeBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.打开`).replace('ts.', ''),
     name: 'mainPurPlanOpe',
     hide: false,
@@ -906,8 +906,8 @@ export function mainListPurchasePlanOpeBtn(option:any) {
 }
 
 // 主列表-任务流程-承接按钮
-export function mainListJobAccBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainListJobAccBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.承接`).replace('ts.', ''),
     name: 'mainJobAcc',
     hide: false,
@@ -919,8 +919,8 @@ export function mainListJobAccBtn(option:any) {
 }
 
 // 主列表-任务流程-关闭按钮
-export function mainListJobCloBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainListJobCloBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.关闭`).replace('ts.', ''),
     name: 'mainJobClo',
     hide: false,
@@ -932,8 +932,8 @@ export function mainListJobCloBtn(option:any) {
 }
 
 // 主列表-任务流程-放弃按钮
-export function mainListJobAbaBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainListJobAbaBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.取消承接`).replace('ts.', ''),
     name: 'mainJobAba',
     hide: false,
@@ -945,8 +945,8 @@ export function mainListJobAbaBtn(option:any) {
 }
 
 // 主列表-任务流程-执行按钮
-export function mainListJobExeBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainListJobExeBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.执行`).replace('ts.', ''),
     name: 'mainJobExe',
     hide: false,
@@ -958,8 +958,8 @@ export function mainListJobExeBtn(option:any) {
 }
 
 // 主列表-任务流程-执行按钮(与执行按钮一致   只是名改叫'收货'而已)
-export function mainListJobRecBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainListJobRecBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.收货`).replace('ts.', ''),
     name: 'mainJobExe',
     hide: false,
@@ -970,8 +970,8 @@ export function mainListJobRecBtn(option:any) {
   })
 }
 // 主列表-包装按钮
-export function mainListPackageBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainListPackageBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.包装`).replace('ts.', ''),
     name: 'mainPackage',
     hide: false,
@@ -982,8 +982,8 @@ export function mainListPackageBtn(option:any) {
   })
 }
 // 主列表-打印
-export function mainListPointBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainListPointBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.打印标签`).replace('ts.', ''),
     name: 'point',
     hide: false,
@@ -994,34 +994,34 @@ export function mainListPointBtn(option:any) {
   })
 }
 // 主列表-批量打印
-export function mainLisSelectiontPointBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainLisSelectiontPointBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.批量打印`).replace('ts.', ''),
     name: 'selection_point',
     hide: false,
     type: 'primary',
     icon: 'ep:download',
     color: '',
-    float:'left',
+    float: 'left',
     hasPermi: ''
   })
 }
 // 主列表-批量删除
-export function mainLisSelectiontDeleteBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainLisSelectiontDeleteBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.批量删除`).replace('ts.', ''),
     name: 'selection_delete',
     hide: false,
     type: 'primary',
     icon: 'ep:download',
     color: '',
-    float:'left',
+    float: 'left',
     hasPermi: ''
   })
 }
 // 主列表-生成采购收货申请
-export function mainListGenerateApplicationBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainListGenerateApplicationBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.生成采购收货申请`).replace('ts.', ''),
     name: 'generateApplication',
     hide: false,
@@ -1032,8 +1032,8 @@ export function mainListGenerateApplicationBtn(option:any) {
   })
 }
 // 主列表-打印
-export function mainListDocumentPrintBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainListDocumentPrintBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.单据打印`).replace('ts.', ''),
     name: 'documentPrint',
     hide: false,
@@ -1044,8 +1044,8 @@ export function mainListDocumentPrintBtn(option:any) {
   })
 }
 // 主列表-生成到货检验申请
-export function mainInspectRequestBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainInspectRequestBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.发送到货检验申请`).replace('ts.', ''),
     name: 'inspectRequest',
     hide: false,
@@ -1056,8 +1056,8 @@ export function mainInspectRequestBtn(option:any) {
   })
 }
 // 主列表-生成采购上架申请
-export function mainPutawayRequestBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainPutawayRequestBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.生成采购上架申请`).replace('ts.', ''),
     name: 'putawayRequest',
     hide: false,
@@ -1068,8 +1068,8 @@ export function mainPutawayRequestBtn(option:any) {
   })
 }
 // 主列表-生成盘点调整申请
-export function mainCountAdjustRequesttBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainCountAdjustRequesttBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.生成盘点调整申请`).replace('ts.', ''),
     name: 'countAdjustRequest',
     hide: false,
@@ -1080,8 +1080,8 @@ export function mainCountAdjustRequesttBtn(option:any) {
   })
 }
 // 主列表-重盘
-export function mainReCountBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainReCountBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.重盘`).replace('ts.', ''),
     name: 'mainReCount',
     hide: false,
@@ -1092,8 +1092,8 @@ export function mainReCountBtn(option:any) {
   })
 }
 // 主列表-监盘
-export function mainSuperviseCountBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainSuperviseCountBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.监盘`).replace('ts.', ''),
     name: 'mainSuperviseCount',
     hide: false,
@@ -1104,8 +1104,8 @@ export function mainSuperviseCountBtn(option:any) {
   })
 }
 // 主列表-解冻
-export function mainThawRequesttBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainThawRequesttBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.解冻`).replace('ts.', ''),
     name: 'mainThaw',
     hide: false,
@@ -1116,8 +1116,8 @@ export function mainThawRequesttBtn(option:any) {
   })
 }
 // 主列表-更新检验记录
-export function mainUpdataRecodeBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainUpdataRecodeBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.更新检验记录`).replace('ts.', ''),
     name: 'updataRecode',
     hide: false,
@@ -1128,8 +1128,8 @@ export function mainUpdataRecodeBtn(option:any) {
   })
 }
 // 主列表-使用决策
-export function mainApplyDecisionBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainApplyDecisionBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: t(`ts.使用决策`).replace('ts.', ''),
     name: 'applyDecision',
     hide: false,
@@ -1140,8 +1140,8 @@ export function mainApplyDecisionBtn(option:any) {
   })
 }
 // 主列表-复制
-export function mainCopyBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function mainCopyBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: '复制',
     name: 'copy',
     hide: false,
@@ -1152,8 +1152,8 @@ export function mainCopyBtn(option:any) {
   })
 }
 // 主列表-部件
-export function componentBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function componentBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: '部件',
     name: 'component',
     hide: false,
@@ -1164,8 +1164,8 @@ export function componentBtn(option:any) {
   })
 }
 // 主列表-备件
-export function sparePartBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function sparePartBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: '备件',
     name: 'sparePart',
     hide: false,
@@ -1176,8 +1176,8 @@ export function sparePartBtn(option:any) {
   })
 }
 // 主列表-生成维修经验
-export function repairExperienceBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function repairExperienceBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: '生成维修经验',
     name: 'repairExperience',
     hide: false,
@@ -1188,8 +1188,8 @@ export function repairExperienceBtn(option:any) {
   })
 }
 // 主列表-生成保养经验
-export function maintainExperienceBtn(option:any) {
-  return __defaultBtnOption(option,{
+export function maintainExperienceBtn(option: any) {
+  return __defaultBtnOption(option, {
     label: '生成保养经验',
     name: 'maintainExperience',
     hide: false,
@@ -1199,26 +1199,97 @@ export function maintainExperienceBtn(option:any) {
     hasPermi: ''
   })
 }
+// 主列表-撤销
+export function backoutBtn(option: any) {
+  return __defaultBtnOption(option, {
+    label: '撤销',
+    name: 'backout',
+    hide: false,
+    type: 'danger',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+// 主列表-盘点导出
+export function mainExport(option: any) {
+  return __defaultBtnOption(option, {
+    label: '导出',
+    name: 'mainExport',
+    hide: false,
+    type: 'primary',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+// 主列表-盘点导入
+export function mainAdjustImport(option: any) {
+  return __defaultBtnOption(option, {
+    label: '导入',
+    name: 'mainAdjustImport',
+    hide: false,
+    type: 'primary',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+// 主列表-备件
+export function replaceLocation(option: any) {
+  return __defaultBtnOption(option, {
+    label: '更换库位',
+    name: 'replaceLocation',
+    hide: false,
+    type: 'primary',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+// 主列表-撤销
+export function approveBtn(option: any) {
+  return __defaultBtnOption(option, {
+    label: '审批',
+    name: 'approve',
+    hide: false,
+    type: 'danger',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+// 主列表-出库
+export function outBtn(option: any) {
+  return __defaultBtnOption(option, {
+    label: '出库',
+    name: 'out',
+    hide: false,
+    type: 'danger',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
 // 默认按钮规则
-function __defaultBtnOption(option:any,specific:any){
+function __defaultBtnOption(option: any, specific: any) {
   return {
-      type:option && option.type ? option.type : specific.type,
-      disabled:option && option.disabled ? option.disabled : specific.disabled,
-      plain:option && option.plain ? option.plain : specific.plain,
-      icon:option && option.icon ? option.icon : specific.icon,
-      label:option && option.label ? option.label : specific.label,
-      name:option && option.name ? option.name : specific.name,
-      size:option && option.size ? option.size : specific.size,
-      float:option && option.float ? option.float : (specific.float || null),
-      url:option && option.url ? option.url : (specific.url || null),
-      background:option && option.background ? option.background : (specific.background || null),
-      class:option && option.class ? option.class : specific.class,
-      color:option && option.color ? option.color : specific.color,
-      hide:option && option.hide ? option.hide : specific.hide,
-      link:option && option.link ? option.link : specific.link,
-      hasPermi:option && option.hasPermi ? option.hasPermi : specific.hasPermi,
-      width:option && option.width ? option.width : specific.width,
-      ...option
+    type: option && option.type ? option.type : specific.type,
+    disabled: option && option.disabled ? option.disabled : specific.disabled,
+    plain: option && option.plain ? option.plain : specific.plain,
+    icon: option && option.icon ? option.icon : specific.icon,
+    label: option && option.label ? option.label : specific.label,
+    name: option && option.name ? option.name : specific.name,
+    size: option && option.size ? option.size : specific.size,
+    float: option && option.float ? option.float : specific.float || null,
+    url: option && option.url ? option.url : specific.url || null,
+    background: option && option.background ? option.background : specific.background || null,
+    class: option && option.class ? option.class : specific.class,
+    color: option && option.color ? option.color : specific.color,
+    hide: option && option.hide ? option.hide : specific.hide,
+    link: option && option.link ? option.link : specific.link,
+    hasPermi: option && option.hasPermi ? option.hasPermi : specific.hasPermi,
+    width: option && option.width ? option.width : specific.width,
+    ...option
   }
 }
-
diff --git a/src/views/eam/SparePartsOutLocationRecord/index.vue b/src/views/eam/SparePartsOutLocationRecord/index.vue
new file mode 100644
index 000000000..35ed57fbc
--- /dev/null
+++ b/src/views/eam/SparePartsOutLocationRecord/index.vue
@@ -0,0 +1,374 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search
+      :schema="SparePartsOutLocationRecordMain.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="SparePartsOutLocationRecordMain.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 #number="{ row }">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase
+          :Butttondata="butttondata(row)"
+          @button-base-click="buttonTableClick($event, row)"
+        />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="SparePartsOutLocationRecordMainRules"
+    :formAllSchemas="SparePartsOutLocationRecordMain.allSchemas"
+    :tableAllSchemas="SparePartsOutLocationRecordDetail.allSchemas"
+    :tableFormRules="SparePartsOutLocationRecordDetailRules"
+    :tableData="tableData"
+    :apiUpdate="SparePartsOutLocationRecordMainApi.updateSparePartsOutLocationRecordMain"
+    :apiCreate="SparePartsOutLocationRecordMainApi.createSparePartsOutLocationRecordMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="SparePartsOutLocationRecordMain.allSchemas"
+    :detailAllSchemas="SparePartsOutLocationRecordDetail.allSchemas"
+    :detailAllSchemasRules="SparePartsOutLocationRecordDetailRules"
+    :apiCreate="SparePartsOutLocationRecordDetailApi.createSparePartsOutLocationRecordDetail"
+    :apiUpdate="SparePartsOutLocationRecordDetailApi.updateSparePartsOutLocationRecordDetail"
+    :apiPage="SparePartsOutLocationRecordDetailApi.getSparePartsOutLocationRecordDetailPage"
+    :apiDelete="SparePartsOutLocationRecordDetailApi.deleteSparePartsOutLocationRecordDetail"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+    :isShowAddBtn="false"
+    :detailButtonIsShow="true"
+  />
+
+  <!-- 导入 -->
+  <ImportForm
+    ref="importFormRef"
+    url="/eam/sparePartsOutLocationRecordDetail/import"
+    :importTemplateData="importTemplateData"
+    @success="importSuccess"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import {
+  SparePartsOutLocationRecordMain,
+  SparePartsOutLocationRecordMainRules,
+  SparePartsOutLocationRecordDetail,
+  SparePartsOutLocationRecordDetailRules
+} from './sparePartsOutLocationRecord.data'
+import * as SparePartsOutLocationRecordMainApi from '@/api/eam/sparePartsOutLocationRecordMain/index'
+import * as SparePartsOutLocationRecordDetailApi from '@/api/eam/sparePartsOutLocationRecordDetail/index'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+
+// 采购订单
+defineOptions({ name: 'SparePartsOutLocationRecord' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(SparePartsOutLocationRecordMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
+  nextTick(() => {
+    nextTick(() => {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      if (formField == 'sparePartsCode') {
+        row['sparePartsCode'] = val[0].itemNumber
+        row['currentQty'] = val[0].qty
+      }
+      if (formField == 'equipmentCode') {
+        row['equipmentCode'] = val[0].code
+      }
+      formRef.setValues(setV)
+    })
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
+  nextTick(async () => {
+    const setV = {}
+    // if(formField == 'itemCode'){
+    //     await ItembasicApi.getItembasicPage({
+    //       code: setV['itemCode']
+    //     }).then(res => {
+    //       setV['uom'] = res.list[0].uom
+    //       setV[formField] = val[0][searchField]
+    //     })
+    //   }
+    formRef.setValues(setV)
+  })
+}
+
+// 子表新增的时候选择表格之后需要会显得字段
+const Echo = []
+const { tableObject, tableMethods } = useTable({
+  getListApi: SparePartsOutLocationRecordMainApi.getSparePartsOutLocationRecordMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn(null), // 新增
+  // defaultButtons.defaultImportBtn(null), // 导入
+  // defaultButtons.defaultExportBtn(null), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null) // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') {
+    // 新增
+    openForm('create')
+  } else if (val == 'import') {
+    // 导入
+    handleImport()
+  } else if (val == 'export') {
+    // 导出
+    handleExport()
+  } else if (val == 'refresh') {
+    // 刷新
+    getList()
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row, val) => {
+  if (val.indexOf(row.available) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    // defaultButtons.mainAdjust(null),// 盘点调整
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') {
+    // 编辑
+    openForm('update', row)
+  }
+  // else if (val == 'mainOrderClo') {
+  //   // 关闭
+  //   handleClose(row.id)
+  // }
+  else if (val == 'delete') {
+    // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  formRef.value.open(type, row)
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicSparePartsOutLocationRecordMain')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await SparePartsOutLocationRecordMainApi.deleteSparePartsOutLocationRecordMain(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 列表导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleMainExport = async (id: number) => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await SparePartsOutLocationRecordMainApi.exportSparePartsOutLocationRecordMain(id)
+    download.excel(data, '盘点工单.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 关闭按钮操作 */
+// const handleClose = async (id: number) => {
+//   try {
+//     // 关闭的二次确认
+//     await message.confirm('是否关闭所选中数据？')
+//     // 发起关闭
+//     await SparePartsOutLocationRecordMainApi.closeSparePartsOutLocationRecordMain(id)
+//     message.success(t('关闭成功!'))
+//     // 刷新列表
+//     await getList()
+//   } catch {}
+// }
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await SparePartsOutLocationRecordMainApi.exportSparePartsOutLocationRecordMain(
+      tableObject.params
+    )
+    download.excel(data, '备件申领记录主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+ * tableForm方法
+ */
+const tableFormKeys = {}
+SparePartsOutLocationRecordDetail.allSchemas.tableFormColumns.forEach((item) => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  try {
+    if (formType === 'create') {
+      await SparePartsOutLocationRecordMainApi.createSparePartsOutLocationRecordMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await SparePartsOutLocationRecordMainApi.updateSparePartsOutLocationRecordMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '采购订单主导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await SparePartsOutLocationRecordMainApi.importTemplate()
+})
+</script>
diff --git a/src/views/eam/applicationRecord/index.vue b/src/views/eam/applicationRecord/index.vue
index a661723ef..236597418 100644
--- a/src/views/eam/applicationRecord/index.vue
+++ b/src/views/eam/applicationRecord/index.vue
@@ -1,51 +1,83 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="ApplicationRecordMain.allSchemas.searchSchema" @search="setSearchParams"
-      @reset="setSearchParams" />
+    <Search
+      :schema="ApplicationRecordMain.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
   </ContentWrap>
 
   <!-- 列表头部 -->
-  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
-    @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick"
-    :allSchemas="ApplicationRecordMain.allSchemas" />
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="ApplicationRecordMain.allSchemas"
+  />
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
         total: tableObject.total
-      }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
-      v-model:sort="tableObject.sort">
-      <template #number="{row}">
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{ row }">
         <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
           <span>{{ row.number }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBase
+          :Butttondata="butttondata(row)"
+          @button-base-click="buttonTableClick($event, row)"
+        />
       </template>
     </Table>
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <BasicForm ref="formRef" @success="getList" :rules="ApplicationRecordMainRules"
-    :formAllSchemas="ApplicationRecordMain.allSchemas" :tableAllSchemas="ApplicationRecordDetail.allSchemas"
-    :tableFormRules="ApplicationRecordDetailRules" :tableData="tableData"
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="ApplicationRecordMainRules"
+    :formAllSchemas="ApplicationRecordMain.allSchemas"
+    :tableAllSchemas="ApplicationRecordDetail.allSchemas"
+    :tableFormRules="ApplicationRecordDetailRules"
+    :tableData="tableData"
     :apiUpdate="ApplicationRecordMainApi.updateApplicationRecordMain"
-    :apiCreate="ApplicationRecordMainApi.createApplicationRecordMain" :isBusiness="true"
-    @handleAddTable="handleAddTable" @handleDeleteTable="handleDeleteTable" @searchTableSuccess="searchTableSuccess"
-    @submitForm="submitForm" />
+    :apiCreate="ApplicationRecordMainApi.createApplicationRecordMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+  />
 
   <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="false" :allSchemas="ApplicationRecordMain.allSchemas"
-    :detailAllSchemas="ApplicationRecordDetail.allSchemas" :detailAllSchemasRules="ApplicationRecordDetailRules"
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ApplicationRecordMain.allSchemas"
+    :detailAllSchemas="ApplicationRecordDetail.allSchemas"
+    :detailAllSchemasRules="ApplicationRecordDetailRules"
     :apiCreate="ApplicationRecordDetailApi.createApplicationRecordDetail"
     :apiUpdate="ApplicationRecordDetailApi.updateApplicationRecordDetail"
     :apiPage="ApplicationRecordDetailApi.getApplicationRecordDetailPage"
     :apiDelete="ApplicationRecordDetailApi.deleteApplicationRecordDetail"
-    @searchTableSuccessDetail="searchTableSuccessDetail" 
+    @searchTableSuccessDetail="searchTableSuccessDetail"
     :isShowAddBtn="false"
-    :detailButtonIsShow="true" />
+    :detailButtonIsShow="true"
+  />
   <!-- 审批详情 -->
   <!-- <approveDetail ref="detailRef1" :isBasic="false" :allSchemas="ApplicationRecordMain.allSchemas"
     :detailAllSchemas="ApplicationRecordDetail.allSchemas" :detailAllSchemasRules="ApplicationRecordDetailRules"
@@ -55,255 +87,280 @@
     @searchTableSuccessDetail="searchTableSuccessDetail" 
     @agree="getList"/> -->
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/wms/purchase-main/import" :importTemplateData="importTemplateData"
-    @success="importSuccess" :isShowOut="true" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
+  <ImportForm
+    ref="importFormRef"
+    url="/wms/purchase-main/import"
+    :importTemplateData="importTemplateData"
+    @success="importSuccess"
+    :isShowOut="true"
+    :updateIsDisable="true"
+    :coverIsDisable="true"
+    :mode="2"
+  />
 </template>
 
 <script setup lang="ts">
-  import download from '@/utils/download'
-  import { ApplicationRecordMain, ApplicationRecordMainRules, ApplicationRecordDetail, ApplicationRecordDetailRules } from './applicationRecordMain.data'
-  import * as ApplicationRecordMainApi from '@/api/eam/applicationRecordMain'
-  import * as ApplicationRecordDetailApi from '@/api/eam/applicationRecordDetail'
-  import * as defaultButtons from '@/utils/disposition/defaultButtons'
-  import TableHead from '@/components/TableHead/src/TableHead.vue'
-  import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-  //import approveDetail from '@/components/Detail/src/approveDetail.vue'
+import download from '@/utils/download'
+import {
+  ApplicationRecordMain,
+  ApplicationRecordMainRules,
+  ApplicationRecordDetail,
+  ApplicationRecordDetailRules
+} from './applicationRecordMain.data'
+import * as ApplicationRecordMainApi from '@/api/eam/applicationRecordMain'
+import * as ApplicationRecordDetailApi from '@/api/eam/applicationRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+//import approveDetail from '@/components/Detail/src/approveDetail.vue'
 
-  // 采购订单
-  defineOptions({ name: 'ApplicationRecord' })
+// 采购订单
+defineOptions({ name: 'ApplicationRecord' })
 
-  const message = useMessage() // 消息弹窗
-  const { t } = useI18n() // 国际化
-  const route = useRoute() // 路由信息
-  const routeName = ref()
-  routeName.value = route.name
-  const tableColumns = ref(ApplicationRecordMain.allSchemas.tableColumns)
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ApplicationRecordMain.allSchemas.tableColumns)
 
-  // 字段设置 更新主列表字段
-  const updataTableColumns = (val) => {
-    tableColumns.value = val
-  }
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
 
-  // 查询页面返回
-  const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
-    nextTick(async () => {
-      if (type == 'tableForm') {
-        // 明细查询页赋值
-        row[formField] = val[0][searchField]
-        row['itemNumber'] = val[0]['number']
-        row['isRadeIn'] = val[0]['isRadeIn']
-        row['available'] = val[0]['available']
-      } else {
-        const setV = {}
-        setV[formField] = val[0][searchField]
-        formRef.setValues(setV)
-      }
-    })
-  }
-  // 查询页面返回——详情
-  const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
-    nextTick(async () => {
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
+  nextTick(async () => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      row[formField] = val[0][searchField]
+      row['itemNumber'] = val[0]['number']
+      row['isRadeIn'] = val[0]['isRadeIn']
+      row['available'] = val[0]['available']
+    } else {
       const setV = {}
-      // if(formField == 'itemCode'){
-      //     await ItembasicApi.getItembasicPage({
-      //       code: setV['itemCode']
-      //     }).then(res => {
-      //       setV['uom'] = res.list[0].uom
-      //       setV[formField] = val[0][searchField]
-      //     })
-      //   }
+      setV[formField] = val[0][searchField]
       formRef.setValues(setV)
-    })
-  }
+    }
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
+  nextTick(async () => {
+    const setV = {}
+    // if(formField == 'itemCode'){
+    //     await ItembasicApi.getItembasicPage({
+    //       code: setV['itemCode']
+    //     }).then(res => {
+    //       setV['uom'] = res.list[0].uom
+    //       setV[formField] = val[0][searchField]
+    //     })
+    //   }
+    formRef.setValues(setV)
+  })
+}
 
-  // 子表新增的时候选择表格之后需要会显得字段
-  // const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
-  const Echo = []
+// 子表新增的时候选择表格之后需要会显得字段
+// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+const Echo = []
 
-  const { tableObject, tableMethods } = useTable({
-    getListApi: ApplicationRecordMainApi.getApplicationRecordMainPage // 分页接口
-  })
+const { tableObject, tableMethods } = useTable({
+  getListApi: ApplicationRecordMainApi.getApplicationRecordMainPage // 分页接口
+})
 
-  // 获得表格的各种操作
-  const { getList, setSearchParams } = tableMethods
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
 
-  // 列表头部按钮
-  const HeadButttondata = [
-    // defaultButtons.defaultAddBtn(null), // 新增
-    // defaultButtons.defaultImportBtn(null), // 导入
-    // defaultButtons.defaultExportBtn(null), // 导出
-    defaultButtons.defaultFreshBtn(null), // 刷新
-    defaultButtons.defaultFilterBtn(null), // 筛选
-    defaultButtons.defaultSetBtn(null), // 设置
-    // {
-    //   label: '自定义扩展按钮',
-    //   name: 'zdy',
-    //   hide: false,
-    //   type: 'primary',
-    //   icon: 'Select',
-    //   color: ''
-    // },
-  ]
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn(null), // 新增
+  // defaultButtons.defaultImportBtn(null), // 导入
+  // defaultButtons.defaultExportBtn(null), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null) // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
 
-  // 头部按钮事件
-  const buttonBaseClick = (val, item) => {
-    if (val == 'add') { // 新增
-      openForm('create')
-    } else if (val == 'import') { // 导入
-      handleImport()
-    } else if (val == 'export') { // 导出
-      handleExport()
-    } else if (val == 'refresh') { // 刷新
-      getList()
-    } else if (val == 'filtrate') { // 筛选
-    } else { // 其他按钮
-      console.log('其他按钮', item)
-    }
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') {
+    // 新增
+    openForm('create')
+  } else if (val == 'import') {
+    // 导入
+    handleImport()
+  } else if (val == 'export') {
+    // 导出
+    handleExport()
+  } else if (val == 'refresh') {
+    // 刷新
+    getList()
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
+    console.log('其他按钮', item)
   }
+}
 
-  // 根据状态返回该按钮是否显示
-  const isShowMainButton = (row, val) => {
-    if (val.indexOf(row.status) > -1) {
-      return false
-    } else {
-      return true
-    }
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row, val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
   }
+}
 
-  // 列表-操作按钮
-  const butttondata = (row) => {
-    return [
-      defaultButtons.approveBtn({ hide: isShowMainButton(row, ['0']) ,hasPermi:'item:itemApplyMain:approve'}), // 审批
-      // defaultButtons.mainListEditBtn(null), // 编辑
-      // defaultButtons.mainListDeleteBtn(null), // 删除
-    ]
-  }
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.approveBtn({
+      hide: isShowMainButton(row, ['0']),
+      hasPermi: 'item:itemApplyMain:approve'
+    }) // 审批
+    // defaultButtons.mainListEditBtn(null), // 编辑
+    // defaultButtons.mainListDeleteBtn(null), // 删除
+  ]
+}
 
-  // 列表-操作按钮事件
-  const buttonTableClick = async (val, row) => {
-    if (val == 'edit') { // 编辑
-      openForm('update', row)
-    } else if (val == 'approve') { // 审批
-      handleApprove(row, '单据号', row.number)
-    } else if (val == 'delete') { // 删除
-      handleDelete(row.id)
-    }
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') {
+    // 编辑
+    openForm('update', row)
+  } else if (val == 'approve') {
+    // 审批
+    handleApprove(row, '单据号', row.number)
+  } else if (val == 'delete') {
+    // 删除
+    handleDelete(row.id)
   }
+}
 
-  /** 添加/修改操作 */
-  const formRef = ref()
-  const openForm = async (type : string, row ?: number) => {
-    tableData.value = [] // 重置明细数据
-    formRef.value.open(type, row)
-  }
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  formRef.value.open(type, row)
+}
 
-  /** 详情操作 */
-  const detailRef = ref()
-  const openDetail = (row : any, titleName : any, titleValue : any) => {
-    detailRef.value.openDetail(row, titleName, titleValue, 'basicApplicationRecordMain')
-  }
-  const detailRef1 = ref()
-  const handleApprove = (row : any, titleName : any, titleValue : any) => {
-    detailRef1.value.openDetail(row, titleName, titleValue, 'basicApplicationRecordMain')
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicApplicationRecordMain')
+}
+const detailRef1 = ref()
+const handleApprove = (row: any, titleName: any, titleValue: any) => {
+  detailRef1.value.openDetail(row, titleName, titleValue, 'basicApplicationRecordMain')
+  // 刷新列表
+  getList()
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await ApplicationRecordMainApi.deleteApplicationRecordMain(id)
+    message.success(t('common.delSuccess'))
     // 刷新列表
-     getList()
-  }
+    await getList()
+  } catch {}
+}
 
-  /** 删除按钮操作 */
-  const handleDelete = async (id : number) => {
-    try {
-      // 删除的二次确认
-      await message.delConfirm()
-      // 发起删除
-      await ApplicationRecordMainApi.deleteApplicationRecordMain(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 ApplicationRecordMainApi.exportApplicationRecordMain(tableObject.params)
+    download.excel(data, '备件申领记录主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
   }
+}
 
-  /** 导出按钮操作 */
-  const exportLoading = ref(false) // 导出的加载中
-  const handleExport = async () => {
-    try {
-      // 导出的二次确认
-      await message.exportConfirm()
-      // 发起导出
-      exportLoading.value = true
-      const data = await ApplicationRecordMainApi.exportApplicationRecordMain(tableObject.params)
-      download.excel(data, '备件申领记录主.xlsx')
-    } catch {
-    } finally {
-      exportLoading.value = false
-    }
-  }
+/**
+ * tableForm方法
+ */
+const tableFormKeys = {}
+ApplicationRecordDetail.allSchemas.tableFormColumns.forEach((item) => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
 
-  /**
-    * tableForm方法
-  */
-  const tableFormKeys = {}
-  ApplicationRecordDetail.allSchemas.tableFormColumns.forEach(item => {
-    tableFormKeys[item.field] = item.default ? item.default : ''
-  })
-  const tableData = ref([])
-
-  // 添加明细
-  const handleAddTable = () => {
-    tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
-  }
-  // 删除明细
-  const handleDeleteTable = (item, index) => {
-    tableData.value.splice(index, 1)
-  }
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
 
-  // 主子数据 提交
-  const submitForm = async (formType, data) => {
-    data.subList = tableData.value // 拼接子表数据参数
-    try {
-      if (formType === 'create') {
-        await ApplicationRecordMainApi.createApplicationRecordMain(data)
-        message.success(t('common.createSuccess'))
-      } else {
-        await ApplicationRecordMainApi.updateApplicationRecordMain(data)
-        message.success(t('common.updateSuccess'))
-      }
-      formRef.value.dialogVisible = false
-      // 刷新当前列表
-      getList()
-    } finally {
-      formRef.value.formLoading = false
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  try {
+    if (formType === 'create') {
+      await ApplicationRecordMainApi.createApplicationRecordMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ApplicationRecordMainApi.updateApplicationRecordMain(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 importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
 
-  // 导入附件弹窗所需的参数
-  const importTemplateData = reactive({
-    templateUrl: '',
-    templateTitle: '采购订单主导入模版.xlsx'
-  })
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '采购订单主导入模版.xlsx'
+})
 
-  // 导入成功之后
-  const importSuccess = () => {
-    getList()
-  }
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
 
-  // 筛选提交
-  const searchFormClick = (searchData) => {
-    tableObject.params = {
-      isSearch: true,
-      filters: searchData.filters
-    }
-    getList() // 刷新当前列表
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
   }
+  getList() // 刷新当前列表
+}
 
-  /** 初始化 **/
-  onMounted(async () => {
-    getList()
-    importTemplateData.templateUrl = await ApplicationRecordMainApi.importTemplate()
-  })
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await ApplicationRecordMainApi.importTemplate()
+})
 </script>
diff --git a/src/views/eam/countadjustPlan/countadjustPlan.data.ts b/src/views/eam/countadjustPlan/countadjustPlan.data.ts
index c1e5d3c95..4c796b88c 100644
--- a/src/views/eam/countadjustPlan/countadjustPlan.data.ts
+++ b/src/views/eam/countadjustPlan/countadjustPlan.data.ts
@@ -4,75 +4,74 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 export const CountadjustPlanRules = reactive({
   number: [required],
   name: [required],
-  classification: [
-    { required: true, message: '请选择盘点类型', trigger: 'blur' }
-  ],
-  
+  classification: [{ required: true, message: '请选择盘点类型', trigger: 'blur' }]
 })
 
-export const CountadjustPlan = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '计划编号',
-    field: 'number',
-    sort: 'custom',
-    isSearch: true,
-    isForm: false,
-  },
-  {
-    label: '名称',
-    field: 'name',
-    sort: 'custom',
-    isSearch: true,
-  },
-  {
-    label: '盘点类型',
-    field: 'classification',
-    sort: 'custom',
-    dictType: DICT_TYPE.CLASSIFICATION,
-    dictClass: 'string',
-    isSearch: false,
-    isTable: true,
-    isForm: true,
-    table: {
-      width: 150
+export const CountadjustPlan = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '计划编号',
+      field: 'number',
+      sort: 'custom',
+      isSearch: true,
+      isForm: false
     },
-    tableForm: {
-      type: 'Select',
-      disabled: false
-    }
-  },
-  {
-    label: '是否账内库',
-    field: 'isInAccount',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isSearch: false,
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 140
+    {
+      label: '名称',
+      field: 'name',
+      sort: 'custom',
+      isSearch: true
     },
-    tableForm: {
-      type: 'Select',
-      inactiveValue: 'FALSE',
-      disabled: true
+    {
+      label: '盘点类型',
+      field: 'classification',
+      sort: 'custom',
+      dictType: DICT_TYPE.PART_CLASS,
+      dictClass: 'string',
+      isSearch: false,
+      isTable: true,
+      isForm: true,
+      table: {
+        width: 150
+      },
+      tableForm: {
+        type: 'Select',
+        disabled: false
+      }
     },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
+    {
+      label: '是否账内库',
+      field: 'isInAccount',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isSearch: false,
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 140
+      },
+      tableForm: {
+        type: 'Select',
         inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+        disabled: true
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
+      }
+    },
+    {
+      label: '操作',
+      field: 'action',
+      isForm: false,
+      table: {
+        width: 150,
+        fixed: 'right'
       }
     }
-  },
-  {
-    label: '操作',
-    field: 'action',
-    isForm: false,
-    table: {
-      width: 150,
-      fixed: 'right'
-    }
-  }
-]))
+  ])
+)
diff --git a/src/views/eam/countadjustWork/index.vue b/src/views/eam/countadjustWork/index.vue
index 65c87d3bc..43cda52ff 100644
--- a/src/views/eam/countadjustWork/index.vue
+++ b/src/views/eam/countadjustWork/index.vue
@@ -1,306 +1,360 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="CountJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search
+      :schema="CountJobMain.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
   </ContentWrap>
 
   <!-- 列表头部 -->
-  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
-    @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick" :allSchemas="CountJobMain.allSchemas" />
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="CountJobMain.allSchemas"
+  />
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
         total: tableObject.total
-      }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
-      v-model:sort="tableObject.sort">
-      <template #number="{row}">
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{ row }">
         <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
           <span>{{ row.number }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBase
+          :Butttondata="butttondata(row)"
+          @button-base-click="buttonTableClick($event, row)"
+        />
       </template>
     </Table>
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <BasicForm ref="formRef" @success="getList" :rules="CountJobMainRules" :formAllSchemas="CountJobMain.allSchemas"
-    :tableAllSchemas="CountJobDetail.allSchemas" :tableFormRules="CountJobDetailRules" :tableData="tableData"
-    :apiUpdate="CountJobMainApi.updateCountJobMain" :apiCreate="CountJobMainApi.createCountJobMain" :isBusiness="true"
-    @handleAddTable="handleAddTable" @handleDeleteTable="handleDeleteTable" @searchTableSuccess="searchTableSuccess"
-    @submitForm="submitForm" />
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="CountJobMainRules"
+    :formAllSchemas="CountJobMain.allSchemas"
+    :tableAllSchemas="CountJobDetail.allSchemas"
+    :tableFormRules="CountJobDetailRules"
+    :tableData="tableData"
+    :apiUpdate="CountJobMainApi.updateCountJobMain"
+    :apiCreate="CountJobMainApi.createCountJobMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+  />
 
   <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="false" :allSchemas="CountJobMain.allSchemas"
-    :detailAllSchemas="CountJobDetail.allSchemas" :detailAllSchemasRules="CountJobDetailRules"
-    :apiCreate="CountJobDetailApi.createCountJobDetail" :apiUpdate="CountJobDetailApi.updateCountJobDetail"
-    :apiPage="CountJobDetailApi.getCountJobDetailPage" :apiDelete="CountJobDetailApi.deleteCountJobDetail"
-    @searchTableSuccessDetail="searchTableSuccessDetail" 
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="CountJobMain.allSchemas"
+    :detailAllSchemas="CountJobDetail.allSchemas"
+    :detailAllSchemasRules="CountJobDetailRules"
+    :apiCreate="CountJobDetailApi.createCountJobDetail"
+    :apiUpdate="CountJobDetailApi.updateCountJobDetail"
+    :apiPage="CountJobDetailApi.getCountJobDetailPage"
+    :apiDelete="CountJobDetailApi.deleteCountJobDetail"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
     :isShowAddBtn="false"
-    :detailButtonIsShow="true"/>
+    :detailButtonIsShow="true"
+  />
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/eam/countJobDetail/import" :importTemplateData="importTemplateData"
-    @success="importSuccess" :isShow="false"/>
+  <ImportForm
+    ref="importFormRef"
+    url="/eam/countJobDetail/import"
+    :importTemplateData="importTemplateData"
+    @success="importSuccess"
+    :isShow="false"
+  />
 </template>
 
 <script setup lang="ts">
-  import download from '@/utils/download'
-  import { CountJobMain, CountJobMainRules, CountJobDetail, CountJobDetailRules } from './countadjustWork.data'
-  import * as CountJobMainApi from '@/api/eam/countJobMain'
-  import * as CountJobDetailApi from '@/api/eam/countJobDetail'
-  import * as defaultButtons from '@/utils/disposition/defaultButtons'
-  import TableHead from '@/components/TableHead/src/TableHead.vue'
-  import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import download from '@/utils/download'
+import {
+  CountJobMain,
+  CountJobMainRules,
+  CountJobDetail,
+  CountJobDetailRules
+} from './countadjustWork.data'
+import * as CountJobMainApi from '@/api/eam/countJobMain'
+import * as CountJobDetailApi from '@/api/eam/countJobDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 
-  // 采购订单
-  defineOptions({ name: 'CountadjustWork' })
+// 采购订单
+defineOptions({ name: 'CountadjustWork' })
 
-  const message = useMessage() // 消息弹窗
-  const { t } = useI18n() // 国际化
-  const route = useRoute() // 路由信息
-  const routeName = ref()
-  routeName.value = route.name
-  const tableColumns = ref(CountJobMain.allSchemas.tableColumns)
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(CountJobMain.allSchemas.tableColumns)
 
-  // 字段设置 更新主列表字段
-  const updataTableColumns = (val) => {
-    tableColumns.value = val
-  }
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
 
-  // 查询页面返回
-  const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
-    nextTick(async () => {
-      if (type == 'tableForm') {
-        // 明细查询页赋值
-        row[formField] = val[0][searchField]
-        row['itemNumber'] = val[0]['number']
-        row['isRadeIn'] = val[0]['isRadeIn']
-        row['available'] = val[0]['available']
-      } else {
-        const setV = {}
-        setV[formField] = val[0][searchField]
-        formRef.setValues(setV)
-      }
-    })
-  }
-  // 查询页面返回——详情
-  const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
-    nextTick(async () => {
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
+  nextTick(async () => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      row[formField] = val[0][searchField]
+      row['itemNumber'] = val[0]['number']
+      row['isRadeIn'] = val[0]['isRadeIn']
+      row['available'] = val[0]['available']
+    } else {
       const setV = {}
-      // if(formField == 'itemCode'){
-      //     await ItembasicApi.getItembasicPage({
-      //       code: setV['itemCode']
-      //     }).then(res => {
-      //       setV['uom'] = res.list[0].uom
-      //       setV[formField] = val[0][searchField]
-      //     })
-      //   }
+      setV[formField] = val[0][searchField]
       formRef.setValues(setV)
-    })
-  }
-
-  // 子表新增的时候选择表格之后需要会显得字段
-  const Echo = []
-  const { tableObject, tableMethods } = useTable({
-    getListApi: CountJobMainApi.getCountJobMainPage // 分页接口
+    }
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
+  nextTick(async () => {
+    const setV = {}
+    // if(formField == 'itemCode'){
+    //     await ItembasicApi.getItembasicPage({
+    //       code: setV['itemCode']
+    //     }).then(res => {
+    //       setV['uom'] = res.list[0].uom
+    //       setV[formField] = val[0][searchField]
+    //     })
+    //   }
+    formRef.setValues(setV)
   })
+}
 
-  // 获得表格的各种操作
-  const { getList, setSearchParams } = tableMethods
+// 子表新增的时候选择表格之后需要会显得字段
+const Echo = []
+const { tableObject, tableMethods } = useTable({
+  getListApi: CountJobMainApi.getCountJobMainPage // 分页接口
+})
 
-  // 列表头部按钮
-  const HeadButttondata = [
-    // defaultButtons.defaultAddBtn(null), // 新增
-    // defaultButtons.defaultImportBtn(null), // 导入
-    // defaultButtons.defaultExportBtn(null), // 导出
-    defaultButtons.defaultFreshBtn(null), // 刷新
-    defaultButtons.defaultFilterBtn(null), // 筛选
-    defaultButtons.defaultSetBtn(null), // 设置
-    // {
-    //   label: '自定义扩展按钮',
-    //   name: 'zdy',
-    //   hide: false,
-    //   type: 'primary',
-    //   icon: 'Select',
-    //   color: ''
-    // },
-  ]
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
 
-  // 头部按钮事件
-  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 HeadButttondata = [
+  // defaultButtons.defaultAddBtn(null), // 新增
+  // defaultButtons.defaultImportBtn(null), // 导入
+  // defaultButtons.defaultExportBtn(null), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null) // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
 
-  // 根据状态返回该按钮是否显示
-  const isShowMainButton = (row, val) => {
-    if (val.indexOf(row.available) > -1) {
-      return false
-    } else {
-      return true
-    }
+// 头部按钮事件
+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 = (row) => {
-    return [
-      defaultButtons.mainExport({hasPermi:'item:countadjustWork:export'}),// 导出
-      defaultButtons.mainAdjustImport({hasPermi:'item:countadjustWork:import'}),// 导入
-    ]
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row, val) => {
+  if (val.indexOf(row.available) > -1) {
+    return false
+  } else {
+    return true
   }
+}
 
-  // 列表-操作按钮事件
-  const buttonTableClick = async (val, row) => {
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainExport({ hasPermi: 'item:countadjustWork:export' }), // 导出
+    defaultButtons.mainAdjustImport({ hasPermi: 'item:countadjustWork:import' }) // 导入
+  ]
+}
 
-    if (val == 'edit') { // 编辑
-      openForm('update', row)
-    }
-    else if (val == 'mainExport') { // 导出
-      handleMainExport(row.id)
-    }
-    else if (val == 'mainAdjustImport') { // 导入
-      handleImport()
-    }
-    else if (val == 'delete') { // 删除
-      handleDelete(row.id)
-    }
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') {
+    // 编辑
+    openForm('update', row)
+  } else if (val == 'mainExport') {
+    // 导出
+    handleMainExport(row.id)
+  } else if (val == 'mainAdjustImport') {
+    // 导入
+    handleImport()
+  } else if (val == 'delete') {
+    // 删除
+    handleDelete(row.id)
   }
+}
 
-  /** 添加/修改操作 */
-  const formRef = ref()
-  const openForm = async (type : string, row ?: number) => {
-    tableData.value = [] // 重置明细数据
-    formRef.value.open(type, row)
-  }
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  formRef.value.open(type, row)
+}
 
-  /** 详情操作 */
-  const detailRef = ref()
-  const openDetail = (row : any, titleName : any, titleValue : any) => {
-    detailRef.value.openDetail(row, titleName, titleValue, 'basicCountJobMain')
-  }
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicCountJobMain')
+}
 
-  /** 删除按钮操作 */
-  const handleDelete = async (id : number) => {
-    try {
-      // 删除的二次确认
-      await message.delConfirm()
-      // 发起删除
-      await CountJobMainApi.deleteCountJobMain(id)
-      message.success(t('common.delSuccess'))
-      // 刷新列表
-      await getList()
-    } catch { }
-  }
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await CountJobMainApi.deleteCountJobMain(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
 
-  /** 列表导出按钮操作 */
-  const exportLoading = ref(false) // 导出的加载中
-  const handleMainExport = async (id : number) => {
-    try {
-      // 导出的二次确认
-      await message.exportConfirm()
-      // 发起导出
-      exportLoading.value = true
-      const data = await CountJobMainApi.handleMainExport(id)
-      download.excel(data, '盘点工单.xlsx')
-    } catch {
-    } finally {
-      exportLoading.value = false
-    }
+/** 列表导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleMainExport = async (id: number) => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await CountJobMainApi.handleMainExport(id)
+    download.excel(data, '盘点工单.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
   }
+}
 
-  /** 导出按钮操作 */
-  const handleExport = async () => {
-    try {
-      // 导出的二次确认
-      await message.exportConfirm()
-      // 发起导出
-      exportLoading.value = true
-      const data = await CountJobMainApi.exportCountJobMain(tableObject.params)
-      download.excel(data, '备件申领记录主.xlsx')
-    } catch {
-    } finally {
-      exportLoading.value = false
-    }
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await CountJobMainApi.exportCountJobMain(tableObject.params)
+    download.excel(data, '备件申领记录主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
   }
+}
 
-  /**
-    * tableForm方法
-  */
-  const tableFormKeys = {}
-  CountJobDetail.allSchemas.tableFormColumns.forEach(item => {
-    tableFormKeys[item.field] = item.default ? item.default : ''
-  })
-  const tableData = ref([])
+/**
+ * tableForm方法
+ */
+const tableFormKeys = {}
+CountJobDetail.allSchemas.tableFormColumns.forEach((item) => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
 
-  // 添加明细
-  const handleAddTable = () => {
-    tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
-  }
-  // 删除明细
-  const handleDeleteTable = (item, index) => {
-    tableData.value.splice(index, 1)
-  }
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
 
-  // 主子数据 提交
-  const submitForm = async (formType, data) => {
-    data.subList = tableData.value // 拼接子表数据参数
-    try {
-      if (formType === 'create') {
-        await CountJobMainApi.createCountJobMain(data)
-        message.success(t('common.createSuccess'))
-      } else {
-        await CountJobMainApi.updateCountJobMain(data)
-        message.success(t('common.updateSuccess'))
-      }
-      formRef.value.dialogVisible = false
-      // 刷新当前列表
-      getList()
-    } finally {
-      formRef.value.formLoading = false
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  try {
+    if (formType === 'create') {
+      await CountJobMainApi.createCountJobMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await CountJobMainApi.updateCountJobMain(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 importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
 
-  // 导入附件弹窗所需的参数
-  const importTemplateData = reactive({
-    templateUrl: '',
-    templateTitle: '采购订单主导入模版.xlsx'
-  })
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '采购订单主导入模版.xlsx'
+})
 
-  // 导入成功之后
-  const importSuccess = () => {
-    getList()
-  }
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
 
-  // 筛选提交
-  const searchFormClick = (searchData) => {
-    tableObject.params = {
-      isSearch: true,
-      filters: searchData.filters
-    }
-    getList() // 刷新当前列表
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
   }
+  getList() // 刷新当前列表
+}
 
-  /** 初始化 **/
-  onMounted(async () => {
-    getList()
-    importTemplateData.templateUrl = await CountJobMainApi.importTemplate()
-  })
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await CountJobMainApi.importTemplate()
+})
 </script>
diff --git a/src/views/eam/item/item.data.ts b/src/views/eam/item/item.data.ts
index 59c5a6f36..09f5da46a 100644
--- a/src/views/eam/item/item.data.ts
+++ b/src/views/eam/item/item.data.ts
@@ -133,11 +133,6 @@ export const Item = useCrudSchemas(
         type: 'Select'
       }
     },
-    // {
-    //   label: '单价',
-    //   field: 'singlePrice',
-    //   sort: 'custom',
-    // },
     {
       label: '重采购点',
       field: 'reprocurement',
diff --git a/src/views/eam/itemAccounts/index.vue b/src/views/eam/itemAccounts/index.vue
index c361e4578..2369ba9cb 100644
--- a/src/views/eam/itemAccounts/index.vue
+++ b/src/views/eam/itemAccounts/index.vue
@@ -120,6 +120,30 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
   nextTick(() => {
     const setV = {}
     setV[formField] = val[0][searchField]
+    if (formField == 'locationNumber') {
+      setV['locationNumber'] = val[0].number
+      setV['areaNumber'] = val[0].areaNumber
+    }
+    if (formField == 'itemNumber') {
+      setV['itemNumber'] = val[0].number
+      setV['name'] = val[0].name
+      setV['brand'] = val[0].brand
+      setV['specifications'] = val[0].specifications
+      setV['isOverall'] = val[0].isOverall
+      setV['subject'] = val[0].subject
+      setV['subjectCode'] = val[0].subjectCode
+      setV['type'] = val[0].type
+      setV['region'] = val[0].region
+      setV['classification'] = val[0].classification
+      setV['uom'] = val[0].uom
+      setV['manufacturer'] = val[0].manufacturer
+      setV['minInventory'] = val[0].minInventory
+      setV['maxInventory'] = val[0].maxInventory
+      setV['replacementCycle'] = val[0].replacementCycle
+      setV['storageLocation'] = val[0].storageLocation
+      setV['remark'] = val[0].remark
+      setV['available'] = val[0].available
+    }
     formRef.setValues(setV)
   })
 }
@@ -176,18 +200,23 @@ const buttonBaseClick = (val, item) => {
   }
 }
 
-// 列表-操作按钮
-// const butttondata = [
-//   defaultButtons.mainListEditBtn({ hasPermi: 'item:itemAccounts:update' }), // 编辑
-//   defaultButtons.replaceLocation({ hasPermi: 'item:itemAccounts:replaceLocation' }), //更换库位
-//   defaultButtons.mainListDeleteBtn({ hasPermi: 'item:itemAccounts:delete' }) // 删除
-// ]
+// 根据状态返回该按钮是否显示
+// const isShowMainButton = (row) => {
+//   if (row.qty === 0) {
+//     return false
+//   } else {
+//     return true
+//   }
+// }
 
 // 列表-操作按钮
 const butttondata = (row) => {
   return [
     defaultButtons.mainListEditBtn({ hasPermi: 'item:itemAccounts:update' }), // 编辑
-    defaultButtons.replaceLocation({ hasPermi: 'item:itemAccounts:replaceLocation' }), //更换库位
+    // defaultButtons.replaceLocation({
+    //   hide: isShowMainButton(row),
+    //   hasPermi: 'item:itemAccounts:replaceLocation'
+    // }), //更换库位
     defaultButtons.mainListDeleteBtn({ hasPermi: 'item:itemAccounts:delete' }), // 删除
     defaultButtons.viewBtn({ hide: !(row.filePathList != null && row.filePathList.length != 0) })
     //defaultButtons.backoutBtn({hasPermi:'eam:device-repair-request:cancel', hide: !(row.result == 'PENDING' && row.declarer == userStore.getUser.id )}), // 撤销
@@ -207,9 +236,11 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'delete') {
     // 删除
     handleDelete(row.id)
-  } else if (val == 'replaceLocation') {
-    openItem(row.locationNumber, row.id)
-  } else if (val == 'view') {
+  }
+  // else if (val == 'replaceLocation') {
+  //   openItem(row.locationNumber, row.id)
+  // }
+  else if (val == 'view') {
     // 图片预览
     openForm('view', row)
   }
diff --git a/src/views/eam/itemAccounts/itemAccounts.data.ts b/src/views/eam/itemAccounts/itemAccounts.data.ts
index ba8aa6b17..630a73339 100644
--- a/src/views/eam/itemAccounts/itemAccounts.data.ts
+++ b/src/views/eam/itemAccounts/itemAccounts.data.ts
@@ -1,11 +1,18 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
 
+import * as ItemApi from '@/api/eam/item'
+import { Item } from '../item/item.data'
+
+import * as LocationApi from '@/api/eam/location'
+import { Location } from '../location/location.data'
+
 // 表单校验
 export const ItemAccountsRules = reactive({
   itemNumber: [required],
-  areaNumber: [required],
-  concurrencyStamp: [required]
+  locationNumber: [required],
+  singlePrice: [required],
+  qty: [required]
 })
 
 export const ItemAccounts = useCrudSchemas(
@@ -15,43 +22,72 @@ export const ItemAccounts = useCrudSchemas(
       field: 'itemNumber',
       sort: 'custom',
       isSearch: true,
-      table: {
-        width: 180,
-        fixed: 'left'
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择备件编号', // 输入框占位文本
+          searchField: 'number', // 查询弹窗赋值字段
+          searchTitle: '备件信息', // 查询弹窗标题
+          searchAllSchemas: Item.allSchemas, // 查询弹窗所需类
+          searchPage: ItemApi.getItemPage, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            }
+          ]
+        }
       }
     },
-
     {
-      label: '库位编号',
-      field: 'locationNumber',
+      label: '备件名称',
+      field: 'name',
       sort: 'custom',
       table: {
         width: 110
-      }
+      },
+      isSearch: false
     },
     {
-      label: '库区编号',
-      field: 'areaNumber',
+      label: '库位编号',
+      field: 'locationNumber',
       sort: 'custom',
-      table: {
-        width: 110
+      isSearch: true,
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择库区编号', // 输入框占位文本
+          searchField: 'number', // 查询弹窗赋值字段
+          searchTitle: '库区信息', // 查询弹窗标题
+          searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+          searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            }
+          ]
+        }
       }
     },
     {
-      label: '备件名称',
-      field: 'name',
+      label: '库区编号',
+      field: 'areaNumber',
       sort: 'custom',
+      required: true,
       table: {
         width: 110
-      },
-      isSearch: false
+      }
     },
     {
-      label: '规格',
-      field: 'specifications',
+      label: '单价',
+      field: 'singlePrice',
       sort: 'custom'
     },
-
     {
       label: '库存数量',
       field: 'qty',
@@ -60,6 +96,11 @@ export const ItemAccounts = useCrudSchemas(
         width: 110
       }
     },
+    {
+      label: '规格',
+      field: 'specifications',
+      sort: 'custom'
+    },
     {
       label: '是否账内库',
       field: 'isInAccount',
@@ -178,11 +219,7 @@ export const ItemAccounts = useCrudSchemas(
         type: 'Select'
       }
     },
-    // {
-    //   label: '单价',
-    //   field: 'singlePrice',
-    //   sort: 'custom',
-    // },
+
     {
       label: '重采购点',
       field: 'reprocurement',
@@ -308,7 +345,7 @@ export const ItemAccounts = useCrudSchemas(
       field: 'action',
       isForm: false,
       table: {
-        width: 150,
+        width: 180,
         fixed: 'right'
       }
     }
diff --git a/src/views/eam/location/location.data.ts b/src/views/eam/location/location.data.ts
index 319422c2b..c03e4529f 100644
--- a/src/views/eam/location/location.data.ts
+++ b/src/views/eam/location/location.data.ts
@@ -63,7 +63,7 @@ export const Location = useCrudSchemas(
     {
       label: '类型',
       field: 'type',
-      dictType: DICT_TYPE.LOCATION_AREA_TYPE,
+      dictType: DICT_TYPE.AREA_TYPE,
       dictClass: 'string',
       sort: 'custom',
       isSearch: false,
diff --git a/src/views/eam/locationArea/locationArea.data.ts b/src/views/eam/locationArea/locationArea.data.ts
index 498dfe033..ecc0dec7f 100644
--- a/src/views/eam/locationArea/locationArea.data.ts
+++ b/src/views/eam/locationArea/locationArea.data.ts
@@ -4,97 +4,74 @@ import { dateFormatter } from '@/utils/formatTime'
 // 表单校验
 export const LocationAreaRules = reactive({
   number: [
-    { required: true, message: '请输入库区编号', trigger: 'blur' }, 
+    { required: true, message: '请输入库区编号', trigger: 'blur' },
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
   name: [
-    { required: true, message: '请输入库区名称', trigger: 'blur' }, 
+    { required: true, message: '请输入库区名称', trigger: 'blur' },
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
-  ],
+  ]
 })
 
-export const LocationArea = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '库区编号',
-    field: 'number',
-    sort: 'custom',
-    isSearch: true,
-    isForm: true,
-    table: {
-      width: 180,
-      fixed: 'left'
+export const LocationArea = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '库区编号',
+      field: 'number',
+      sort: 'custom',
+      isSearch: true,
+      isForm: true,
+      table: {
+        width: 180,
+        fixed: 'left'
+      }
+    },
+    {
+      label: '库区名称',
+      field: 'name',
+      sort: 'custom',
+      isSearch: true
     },
-  },
-  {
-    label: '库区名称',
-    field: 'name',
-    sort: 'custom',
-    isSearch: true,
-  },
 
-  {
-    label: '类型',
-    field: 'type',
-    dictType: DICT_TYPE.LOCATION_AREA_TYPE,
-    dictClass: 'string',
-    sort: 'custom',
-    isSearch: false,
-    form: {
-      component: 'Select'
+    {
+      label: '类型',
+      field: 'type',
+      dictType: DICT_TYPE.AREA_TYPE,
+      dictClass: 'string',
+      sort: 'custom',
+      isSearch: false,
+      form: {
+        component: 'Select'
+      }
     },
-  },
-  // {
-  //   label: '是否可用',
-  //   field: 'available',
-  //   dictType: DICT_TYPE.TRUE_FALSE,
-  //   dictClass: 'string',
-  //   isSearch: false,
-  //   isTable: true,
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   tableForm: {
-  //     type: 'Select',
-  //     inactiveValue: 'FALSE',
-  //     disabled: true
-  //   },
-  //   form: {
-  //     component: 'Switch',
-  //     value: 'TRUE',
-  //     componentProps: {
-  //       inactiveValue: 'FALSE',
-  //       activeValue: 'TRUE'
-  //     }
-  //   }
-  // },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isForm: false,
+    {
+      label: '创建时间',
+      field: 'createTime',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isForm: false,
       table: {
         width: 170
-      },
-  },
+      }
+    },
 
-  {
-    label: '描述',
-    field: 'description',
-    sort: 'custom',
-    table: {
-      width: 150
+    {
+      label: '描述',
+      field: 'description',
+      sort: 'custom',
+      table: {
+        width: 150
+      }
     },
-  },
 
-  {
-    label: '操作',
-    field: 'action',
-    isForm: false,
-    table: {
-      width: 150,
-      fixed: 'right'
+    {
+      label: '操作',
+      field: 'action',
+      isForm: false,
+      table: {
+        width: 150,
+        fixed: 'right'
+      }
     }
-  }
-]))
+  ])
+)
diff --git a/src/views/eam/maintenance/maintenance.data.ts b/src/views/eam/maintenance/maintenance.data.ts
index 706334af0..49dc8b628 100644
--- a/src/views/eam/maintenance/maintenance.data.ts
+++ b/src/views/eam/maintenance/maintenance.data.ts
@@ -1,11 +1,11 @@
-import type {CrudSchema} from '@/hooks/web/useCrudSchemas'
-import {dateFormatter} from '@/utils/formatTime'
-import { EquipmentAccounts } from "@/views/eam/equipmentAccounts/equipmentAccounts.data";
-import * as EquipmentItemApi from "@/api/eam/equipmentAccounts";
-import { BasicMaintenanceOption } from "@/views/eam/basicMaintenanceOption/basicMaintenanceOption.data";
-import * as MaintenanceOptionApi from "@/api/eam/basicMaintenanceOption";
-import {BasicEamWorkshop} from "@/views/eam/basicEamWorkshop/basicEamWorkshop.data";
-import * as WorkshopApi from "@/api/eam/basicEamWorkshop";
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+import { EquipmentAccounts } from '@/views/eam/equipmentAccounts/equipmentAccounts.data'
+import * as EquipmentItemApi from '@/api/eam/equipmentAccounts'
+import { BasicMaintenanceOption } from '@/views/eam/basicMaintenanceOption/basicMaintenanceOption.data'
+import * as MaintenanceOptionApi from '@/api/eam/basicMaintenanceOption'
+import { BasicEamWorkshop } from '@/views/eam/basicEamWorkshop/basicEamWorkshop.data'
+import * as WorkshopApi from '@/api/eam/basicEamWorkshop'
 
 // 表单校验
 export const MaintenanceRules = reactive({
@@ -16,509 +16,518 @@ export const MaintenanceRules = reactive({
   cycle: [required],
   startTime: [required],
   endTime: [required],
-  workshopCode: [required],
+  workshopCode: [required]
 })
 
-export const Maintenance = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: 'id',
-    field: 'id',
-    sort: 'custom',
-    isSearch: false,
-    isTable: false,
-    isForm: false,
-    isDetail:false,
-  },
-  {
-    label: '计划编号',
-    field: 'number',
-    sort: 'custom',
-    isSearch: true,
-    isForm: false,
-    isDetail:true,
-  },
-  {
-    label: '计划名称',
-    field: 'name',
-    sort: 'custom',
-    isSearch: true,
-  },
-  {
-    label: '设备类别',
-    field: 'type',
-    dictType: DICT_TYPE.DEVICE_TYPE,
-    dictClass: 'string',
-    sort: 'custom',
-    isSearch: false,
-  },
-  {
-    label: '设备工装编号',
-    field: 'equipmentCode',
-    sort: 'custom',
-    isSearch: true,
-    isForm: true,
-    form: {
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchTitle: '设备信息', // 查询弹窗标题
-        searchListPlaceholder: '请选择 设备编号', // 输入框占位文本
-        searchAllSchemas: EquipmentAccounts.allSchemas, // 查询弹窗所需类
-        searchField: 'code', // 查询弹窗赋值字段
-        searchPage: EquipmentItemApi.getEquipmentAccountsPage, // 查询弹窗所需分页方法
-        multiple:true,
-        searchCondition: [{
-          key: 'status',
-          value: 'NORMAL',
-          action: '==',
-          isSearch: true,
-          isMainValue: false
-        }]
-      }
-    }
-  },
-  {
-    label: '方案编号',
-    field: 'optionCode',
-    sort: 'custom',
-    isSearch: true,
-    isForm: true,
-    form: {
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchTitle: '保养方案信息', // 查询弹窗标题
-        searchListPlaceholder: '请选择保养方案', // 输入框占位文本
-        searchAllSchemas: BasicMaintenanceOption.allSchemas, // 查询弹窗所需类
-        searchField: 'code', // 查询弹窗赋值字段
-        searchPage: MaintenanceOptionApi.getBasicMaintenanceOptionPage, // 查询弹窗所需分页方法
-        multiple:true,
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          action: '==',
-          isSearch: true,
-          isMainValue: false
-        }]
-      }
-    }
-  },
-  {
-    label: '周期',
-    field: 'cycle',
-    dictType: DICT_TYPE.MAINTENANCE_CYCLE,
-    dictClass: 'string',
-    sort: 'custom',
-    isSearch: true,
-  },
-  {
-    label: '计划开始时间',
-    field: 'startTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: false,
-    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')]
-      }
+export const Maintenance = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: 'id',
+      field: 'id',
+      sort: 'custom',
+      isSearch: false,
+      isTable: false,
+      isForm: false,
+      isDetail: false
     },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
-      }
+    {
+      label: '计划编号',
+      field: 'number',
+      sort: 'custom',
+      isSearch: true,
+      isForm: false,
+      isDetail: true
+    },
+    {
+      label: '计划名称1',
+      field: 'name',
+      sort: 'custom',
+      isSearch: true
     },
-  },
-  {
-    label: '计划结束时间',
-    field: 'endTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: false,
-    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: 'type',
+      dictType: DICT_TYPE.DEVICE_TYPE,
+      dictClass: 'string',
+      sort: 'custom',
+      isSearch: false
+    },
+    {
+      label: '设备工装编号',
+      field: 'equipmentCode',
+      sort: 'custom',
+      isSearch: true,
+      isForm: true,
+      form: {
+        componentProps: {
+          isSearchList: true, // 开启查询弹窗
+          searchTitle: '设备信息', // 查询弹窗标题
+          searchListPlaceholder: '请选择 设备编号', // 输入框占位文本
+          searchAllSchemas: EquipmentAccounts.allSchemas, // 查询弹窗所需类
+          searchField: 'code', // 查询弹窗赋值字段
+          searchPage: EquipmentItemApi.getEquipmentAccountsPage, // 查询弹窗所需分页方法
+          multiple: true,
+          searchCondition: [
+            {
+              key: 'status',
+              value: 'NORMAL',
+              action: '==',
+              isSearch: true,
+              isMainValue: false
+            }
+          ]
+        }
       }
     },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
+    {
+      label: '方案编号',
+      field: 'optionCode',
+      sort: 'custom',
+      isSearch: true,
+      isForm: true,
+      form: {
+        componentProps: {
+          isSearchList: true, // 开启查询弹窗
+          searchTitle: '保养方案信息', // 查询弹窗标题
+          searchListPlaceholder: '请选择保养方案', // 输入框占位文本
+          searchAllSchemas: BasicMaintenanceOption.allSchemas, // 查询弹窗所需类
+          searchField: 'code', // 查询弹窗赋值字段
+          searchPage: MaintenanceOptionApi.getBasicMaintenanceOptionPage, // 查询弹窗所需分页方法
+          multiple: true,
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              action: '==',
+              isSearch: true,
+              isMainValue: false
+            }
+          ]
+        }
       }
     },
-  },
-  {
-    label: '状态',
-    field: 'status',
-    sort: 'custom',
-    isSearch: true,
-    dictType: DICT_TYPE.EAM_PLAN_STATUS,
-    dictClass: 'string',
-  },
-  {
-    label: '审核人',
-    field: 'approver',
-    sort: 'custom',
-    isSearch: false,
-    isForm: false,
-  },
-  {
-    label: '审核内容',
-    field: 'approveContent',
-    sort: 'custom',
-    isSearch: false,
-    isForm: false,
-  },
-  {
-    label: '审核时间',
-    field: 'approveTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: false,
-    isForm: false,
-    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: 'cycle',
+      dictType: DICT_TYPE.MAINTENANCE_CYCLE,
+      dictClass: 'string',
+      sort: 'custom',
+      isSearch: true
+    },
+    {
+      label: '计划开始时间',
+      field: 'startTime',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isSearch: false,
+      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'
+        }
       }
     },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
+    {
+      label: '计划结束时间',
+      field: 'endTime',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isSearch: false,
+      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: 'autoExamine',
-    sort: 'custom',
-    isSearch: false,
-    isTable: false,
-    isForm: false,
-    isDetail:false,
-  },
-  {
-    label: '自动通过',
-    field: 'autoAgree',
-    sort: 'custom',
-    isSearch: false,
-    isTable: false,
-    isForm: false,
-    isDetail:false,
-  },
-  {
-    label: '直接生成记录',
-    field: 'directCreateRecord',
-    sort: 'custom',
-    isSearch: false,
-  },
-  {
-    label: '所属厂区编号',
-    field: 'factoryAreaCode',
-    sort: 'custom',
-    isSearch: false,
-    isTable: false,
-    isForm: false,
-    isDetail:false,
-  },
-  {
-    label: '车间代码',
-    field: 'workshopCode',
-    sort: 'custom',
-    isSearch: false,
-    required: true,
-    form: {
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '车间', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '车间信息', // 查询弹窗标题
-        searchAllSchemas: BasicEamWorkshop.allSchemas, // 查询弹窗所需类
-        searchPage: WorkshopApi.getBasicEamWorkshopPage, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
+    {
+      label: '状态',
+      field: 'status',
+      sort: 'custom',
+      isSearch: true,
+      dictType: DICT_TYPE.EAM_PLAN_STATUS,
+      dictClass: 'string'
+    },
+    {
+      label: '审核人',
+      field: 'approver',
+      sort: 'custom',
+      isSearch: false,
+      isForm: false
+    },
+    {
+      label: '审核内容',
+      field: 'approveContent',
+      sort: 'custom',
+      isSearch: false,
+      isForm: false
+    },
+    {
+      label: '审核时间',
+      field: 'approveTime',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isSearch: false,
+      isForm: false,
+      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: 'createTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: false,
-    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: 'autoExamine',
+      sort: 'custom',
+      isSearch: false,
+      isTable: false,
+      isForm: false,
+      isDetail: false
+    },
+    {
+      label: '自动通过',
+      field: 'autoAgree',
+      sort: 'custom',
+      isSearch: false,
+      isTable: false,
+      isForm: false,
+      isDetail: false
+    },
+    {
+      label: '直接生成记录',
+      field: 'directCreateRecord',
+      sort: 'custom',
+      isSearch: false
+    },
+    {
+      label: '所属厂区编号',
+      field: 'factoryAreaCode',
+      sort: 'custom',
+      isSearch: false,
+      isTable: false,
+      isForm: false,
+      isDetail: false
+    },
+    {
+      label: '车间代码',
+      field: 'workshopCode',
+      sort: 'custom',
+      isSearch: false,
+      required: true,
+      form: {
+        componentProps: {
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '车间', // 输入框占位文本
+          searchField: 'code', // 查询弹窗赋值字段
+          searchTitle: '车间信息', // 查询弹窗标题
+          searchAllSchemas: BasicEamWorkshop.allSchemas, // 查询弹窗所需类
+          searchPage: WorkshopApi.getBasicEamWorkshopPage, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            }
+          ]
+        }
       }
     },
-    isForm: false,
-  },
-  {
-    label: '部门id',
-    field: 'departmentCode',
-    sort: 'custom',
-    isSearch: false,
-    isTable: false,
-    isForm: false,
-    isDetail:false,
-  },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    isSearch: false,
-  },
-  {
-    label: '地点ID',
-    field: 'siteId',
-    sort: 'custom',
-    isSearch: false,
-    isTable: false,
-    isForm: false,
-    isDetail:false,
-  },
-  {
-    label: '是否可用',
-    field: 'available',
-    sort: 'custom',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    isTable: true,
-    isDetail: false,
-    isSearch: true,
-    isTableForm: false,
-    isForm: false,
-  },
-  {
-    label: '删除时间',
-    field: 'deletionTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: false,
-    isTable: false,
-    isForm: false,
-    isDetail:false,
-    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: 'createTime',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isSearch: false,
+      search: {
+        component: 'DatePicker',
+        componentProps: {
+          valueFormat: 'YYYY-MM-DD HH:mm:ss',
+          type: 'daterange',
+          defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+        }
+      },
+      isForm: false
+    },
+    {
+      label: '部门id',
+      field: 'departmentCode',
+      sort: 'custom',
+      isSearch: false,
+      isTable: false,
+      isForm: false,
+      isDetail: false
+    },
+    {
+      label: '备注',
+      field: 'remark',
+      sort: 'custom',
+      isSearch: false
+    },
+    {
+      label: '地点ID',
+      field: 'siteId',
+      sort: 'custom',
+      isSearch: false,
+      isTable: false,
+      isForm: false,
+      isDetail: false
+    },
+    {
+      label: '是否可用',
+      field: 'available',
+      sort: 'custom',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+      isTable: true,
+      isDetail: false,
+      isSearch: true,
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '删除时间',
+      field: 'deletionTime',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isSearch: false,
+      isTable: false,
+      isForm: false,
+      isDetail: false,
+      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'
+        }
       }
     },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
+    {
+      label: '删除人id',
+      field: 'deleterId',
+      sort: 'custom',
+      isSearch: false,
+      isTable: false,
+      isForm: false,
+      isDetail: false
+    },
+    {
+      label: '并发乐观锁',
+      field: 'concurrencyStamp',
+      sort: 'custom',
+      isSearch: false,
+      isTable: false,
+      isForm: false,
+      isDetail: false,
+      form: {
+        component: 'InputNumber',
+        value: 0
       }
     },
-  },
-  {
-    label: '删除人id',
-    field: 'deleterId',
-    sort: 'custom',
-    isSearch: false,
-    isTable: false,
-    isForm: false,
-    isDetail:false,
-  },
-  {
-    label: '并发乐观锁',
-    field: 'concurrencyStamp',
-    sort: 'custom',
-    isSearch: false,
-    isTable: false,
-    isForm: false,
-    isDetail:false,
-    form: {
-      component: 'InputNumber',
-      value: 0
-    },
-  },
-  {
-    label: '操作',
-    field: 'action',
-    isForm: false,
-    table: {
-      width: 150,
-      fixed: 'right'
+    {
+      label: '操作',
+      field: 'action',
+      isForm: false,
+      table: {
+        width: 150,
+        fixed: 'right'
+      }
     }
-  }
-]))
-
+  ])
+)
 
 // 表单校验
 export const RelationMaintenancePlanItemRules = reactive({
   planNumber: [required],
   itemCode: [required],
-  itemName: [required],
+  itemName: [required]
 })
 
-export const RelationMaintenancePlanItem = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: 'id',
-    field: 'id',
-    sort: 'custom',
-    isSearch: false,
-    isTable: false,
-    isForm: false,
-    isDetail:false,
-  },
-  {
-    label: '计划编号',
-    field: 'planNumber',
-    sort: 'custom',
-    isSearch: true,
-  },
-  {
-    label: '项编号',
-    field: 'itemCode',
-    sort: 'custom',
-    isSearch: true,
-  },
-  {
-    label: '保养名称',
-    field: 'itemName',
-    sort: 'custom',
-    isSearch: true,
-  },
-  {
-    label: '是否必选',
-    field: 'isSelectd',
-    sort: 'custom',
-    isSearch: true,
-    dictType: DICT_TYPE.FALSE_OR_TRUE,
-    dictClass: 'string',
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: false,
-    isTable: false,
-    isForm: false,
-    isDetail:false,
-    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')]
-      }
+export const RelationMaintenancePlanItem = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: 'id',
+      field: 'id',
+      sort: 'custom',
+      isSearch: false,
+      isTable: false,
+      isForm: false,
+      isDetail: false
+    },
+    {
+      label: '计划编号',
+      field: 'planNumber',
+      sort: 'custom',
+      isSearch: true
+    },
+    {
+      label: '项编号',
+      field: 'itemCode',
+      sort: 'custom',
+      isSearch: true
     },
-    isForm: false,
-  },
-  {
-    label: '部门id',
-    field: 'departmentCode',
-    sort: 'custom',
-    isSearch: false,
-    isTable: false,
-    isForm: false,
-    isDetail:false,
-  },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    isSearch: false,
-    isTable: false,
-    isForm: false,
-    isDetail:false,
-  },
-  {
-    label: '地点ID',
-    field: 'siteId',
-    sort: 'custom',
-    isSearch: false,
-    isTable: false,
-    isForm: false,
-    isDetail:false,
-  },
-  {
-    label: '是否可用默认TRUE',
-    field: 'available',
-    sort: 'custom',
-    isSearch: false,
-    isTable: false,
-    isForm: false,
-    isDetail:false,
-  },
-  {
-    label: '删除时间',
-    field: 'deletionTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: false,
-    isTable: false,
-    isForm: false,
-    isDetail:false,
-    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: 'itemName',
+      sort: 'custom',
+      isSearch: true
+    },
+    {
+      label: '是否必选',
+      field: 'isSelectd',
+      sort: 'custom',
+      isSearch: true,
+      dictType: DICT_TYPE.FALSE_OR_TRUE,
+      dictClass: 'string'
+    },
+    {
+      label: '创建时间',
+      field: 'createTime',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isSearch: false,
+      isTable: false,
+      isForm: false,
+      isDetail: false,
+      search: {
+        component: 'DatePicker',
+        componentProps: {
+          valueFormat: 'YYYY-MM-DD HH:mm:ss',
+          type: 'daterange',
+          defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+        }
+      },
+      isForm: false
+    },
+    {
+      label: '部门id',
+      field: 'departmentCode',
+      sort: 'custom',
+      isSearch: false,
+      isTable: false,
+      isForm: false,
+      isDetail: false
+    },
+    {
+      label: '备注',
+      field: 'remark',
+      sort: 'custom',
+      isSearch: false,
+      isTable: false,
+      isForm: false,
+      isDetail: false
+    },
+    {
+      label: '地点ID',
+      field: 'siteId',
+      sort: 'custom',
+      isSearch: false,
+      isTable: false,
+      isForm: false,
+      isDetail: false
+    },
+    {
+      label: '是否可用默认TRUE',
+      field: 'available',
+      sort: 'custom',
+      isSearch: false,
+      isTable: false,
+      isForm: false,
+      isDetail: false
+    },
+    {
+      label: '删除时间',
+      field: 'deletionTime',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isSearch: false,
+      isTable: false,
+      isForm: false,
+      isDetail: false,
+      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'
+        }
       }
     },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
+    {
+      label: '删除人id',
+      field: 'deleterId',
+      sort: 'custom',
+      isSearch: false,
+      isTable: false,
+      isForm: false,
+      isDetail: false
+    },
+    {
+      label: '并发乐观锁',
+      field: 'concurrencyStamp',
+      sort: 'custom',
+      isSearch: false,
+      isTable: false,
+      isForm: false,
+      isDetail: false,
+      form: {
+        component: 'InputNumber',
+        value: 0
       }
     },
-  },
-  {
-    label: '删除人id',
-    field: 'deleterId',
-    sort: 'custom',
-    isSearch: false,
-    isTable: false,
-    isForm: false,
-    isDetail:false,
-  },
-  {
-    label: '并发乐观锁',
-    field: 'concurrencyStamp',
-    sort: 'custom',
-    isSearch: false,
-    isTable: false,
-    isForm: false,
-    isDetail:false,
-    form: {
-      component: 'InputNumber',
-      value: 0
-    },
-  },
-  {
-    label: '操作',
-    field: 'action',
-    isSearch: false,
-    isTable: false,
-    isForm: false,
-    isDetail:false,
-    table: {
-      width: 150,
-      fixed: 'right'
+    {
+      label: '操作',
+      field: 'action',
+      isSearch: false,
+      isTable: false,
+      isForm: false,
+      isDetail: false,
+      table: {
+        width: 150,
+        fixed: 'right'
+      }
     }
-  }
-]))
+  ])
+)
diff --git a/src/views/eam/sparePartsApplyMain/SparePartsApply.data.ts b/src/views/eam/sparePartsApplyMain/SparePartsApply.data.ts
new file mode 100644
index 000000000..287a1e917
--- /dev/null
+++ b/src/views/eam/sparePartsApplyMain/SparePartsApply.data.ts
@@ -0,0 +1,365 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+
+import * as ItemAccountsApi from '@/api/eam/itemAccounts'
+import { ItemAccounts } from '@/views/eam/itemAccounts/itemAccounts.data'
+
+import { EquipmentAccounts } from '@/views/eam/equipmentAccounts/equipmentAccounts.data'
+import * as EquipmentItemApi from '@/api/eam/equipmentAccounts'
+
+import { dateFormatter } from '@/utils/formatTime'
+
+export const SparePartsApplyMain = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '申请编号',
+      field: 'number',
+      sort: 'custom',
+      isSearch: true,
+      isForm: false
+    },
+    {
+      label: '出库类型',
+      field: 'outType',
+      dictType: DICT_TYPE.EAM_OUT_TYPE,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      isSearch: false,
+      table: {
+        width: 150
+      },
+      tableForm: {
+        type: 'Select'
+      }
+    },
+    {
+      label: '关联工单',
+      field: 'workNumber',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          isSearchList: true, // 开启查询弹窗
+          searchTitle: '设备信息', // 查询弹窗标题
+          searchListPlaceholder: '请选择 设备编号', // 输入框占位文本
+          searchAllSchemas: EquipmentAccounts.allSchemas, // 查询弹窗所需类
+          searchField: 'code', // 查询弹窗赋值字段
+          searchPage: EquipmentItemApi.getEquipmentAccountsPage, // 查询弹窗所需分页方法
+          multiple: true,
+          searchCondition: [
+            {
+              key: 'status',
+              value: 'NORMAL',
+              action: '==',
+              isSearch: true,
+              isMainValue: false
+            }
+          ]
+        }
+      },
+      tableForm: {
+        isInpuFocusShow: true,
+        searchListPlaceholder: '请选择备件编号', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '备件信息', // 查询弹窗标题
+        searchAllSchemas: EquipmentAccounts.allSchemas, // 查询弹窗所需类
+        searchPage: EquipmentItemApi.getEquipmentAccountsPage, // 查询弹窗所需分页方法
+        searchCondition: [
+          {
+            key: 'status',
+            value: 'NORMAL',
+            action: '==',
+            isSearch: true,
+            isMainValue: false
+          }
+        ]
+      }
+    },
+
+    {
+      label: '出库主题',
+      field: 'theme',
+      sort: 'custom',
+      isSearch: true
+    },
+    {
+      label: '描述',
+      field: 'description',
+      sort: 'custom',
+      isSearch: false,
+      isTable: false,
+      isForm: false
+    },
+    {
+      label: '申领备件总价',
+      field: 'sumVal',
+      sort: 'custom',
+      isSearch: false,
+      isTable: false,
+      isForm: false
+    },
+    {
+      label: '流程状态',
+      field: 'status',
+      sort: 'custom',
+      dictType: DICT_TYPE.SPAREPARTS_APPLY_STATUS_ENUM,
+      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+      isSearch: true,
+      isTable: true,
+      isForm: false,
+      form: {
+        component: 'Select'
+      }
+    },
+    {
+      label: '申请人',
+      field: 'applyer',
+      sort: 'custom',
+      isSearch: false,
+      isTable: false,
+      isForm: false
+    },
+    {
+      label: '审核人',
+      field: 'approver',
+      sort: 'custom',
+      isSearch: false,
+      isTable: false,
+      isForm: false,
+      form: {
+        component: 'InputNumber',
+        value: 0
+      }
+    },
+    {
+      label: '审核内容',
+      field: 'approveContent',
+      sort: 'custom',
+      isSearch: true,
+      isTable: false,
+      isForm: false
+    },
+    {
+      label: '审核时间',
+      field: 'approveTime',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isSearch: false,
+      isTable: false,
+      isForm: false,
+      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: 'autoExamine',
+      sort: 'custom',
+      isSearch: false,
+      isTable: false,
+      isForm: false
+    },
+    {
+      label: '自动通过',
+      field: 'autoAgree',
+      sort: 'custom',
+      isSearch: false,
+      isTable: false,
+      isForm: false
+    },
+    {
+      label: '直接生成记录',
+      field: 'directCreateRecord',
+      sort: 'custom',
+      isSearch: false,
+      isTable: false,
+      isForm: false
+    },
+    {
+      label: '创建时间',
+      field: 'createTime',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isSearch: false,
+      isTable: false,
+      search: {
+        component: 'DatePicker',
+        componentProps: {
+          valueFormat: 'YYYY-MM-DD HH:mm:ss',
+          type: 'daterange',
+          defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+        }
+      },
+      isForm: false
+    },
+    {
+      label: '操作11',
+      field: 'action',
+      isForm: false,
+      table: {
+        width: 180,
+        fixed: 'right'
+      }
+    }
+  ])
+)
+
+//表单校验
+export const SparePartsApplyMainRules = reactive({
+  outType: [{ required: true, message: '请输入出库类型', trigger: 'blur' }],
+  theme: [{ required: true, message: '请输入出库主题', trigger: 'blur' }]
+})
+/**
+ * @returns {Array} 备件申请子表
+ */
+export const SparePartsApplyDetail = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '库位编号',
+      field: 'locationCode',
+      sort: 'custom',
+      isSearch: false,
+      form: {
+        componentProps: {
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择库位编号', // 输入框占位文本
+          searchField: 'code', // 查询弹窗赋值字段
+          searchTitle: '库位信息', // 查询弹窗标题
+
+          searchAllSchemas: ItemAccounts.allSchemas, // 查询弹窗所需类
+          searchPage: ItemAccountsApi.getItemAccountsPage, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            }
+          ]
+        }
+      },
+      tableForm: {
+        isInpuFocusShow: true,
+        searchListPlaceholder: '请选择备件编号', // 输入框占位文本
+        searchField: 'itemNumber', // 查询弹窗赋值字段
+        searchTitle: '备件信息', // 查询弹窗标题
+
+        searchAllSchemas: ItemAccounts.allSchemas, // 查询弹窗所需类
+        searchPage: ItemAccountsApi.getItemAccountsPage, // 查询弹窗所需分页方法
+        searchCondition: [
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+        ]
+      }
+    },
+    {
+      label: '库区编号',
+      field: 'areaCode',
+      sort: 'custom',
+      isSearch: false,
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
+      tableForm: {
+        disabled: true
+      }
+    },
+    {
+      label: '备件编号',
+      field: 'sparePartsCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
+      tableForm: {
+        disabled: true
+      }
+    },
+    {
+      label: '库存数量',
+      field: 'currentQty',
+      sort: 'custom',
+      isSearch: false,
+      tableForm: {
+        disabled: true
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
+      isDetail: false,
+      isTable: false
+    },
+    {
+      label: '申领数量',
+      field: 'applyQty',
+      sort: 'custom',
+      isSearch: false
+    },
+    {
+      label: '备注',
+      field: 'remark',
+      sort: 'custom',
+      isSearch: false
+    },
+    {
+      label: '操作',
+      field: 'action',
+      isDetail: false,
+      isForm: false,
+      table: {
+        width: 150,
+        fixed: 'right'
+      },
+      isTableForm: false
+    }
+  ])
+)
+
+//表单校验
+export const SparePartsApplyDetailRules = reactive({
+  applyQty: [{ required: true, message: '请输入标包数量', trigger: 'blur' }]
+})
+
+// 审核完成字段
+export const SparePartsApplyExamine = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '审核内容',
+      field: 'approveContent',
+      sort: 'custom',
+      isSearch: false,
+      form: {
+        component: 'Input',
+        componentProps: {
+          type: 'textarea'
+        }
+      }
+    }
+  ])
+)
diff --git a/src/views/eam/sparePartsApplyMain/index.vue b/src/views/eam/sparePartsApplyMain/index.vue
new file mode 100644
index 000000000..ddb76807f
--- /dev/null
+++ b/src/views/eam/sparePartsApplyMain/index.vue
@@ -0,0 +1,511 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search
+      :schema="SparePartsApplyMain.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="SparePartsApplyMain.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 #number="{ row }">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase
+          :Butttondata="butttondata(row)"
+          @button-base-click="buttonTableClick($event, row)"
+        />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="SparePartsApplyMainRules"
+    :formAllSchemas="SparePartsApplyMain.allSchemas"
+    :tableAllSchemas="SparePartsApplyDetail.allSchemas"
+    :tableFormRules="SparePartsApplyDetailRules"
+    :tableData="tableData"
+    :apiUpdate="SparePartsApplyMainApi.updateSparePartsApplyMain"
+    :apiCreate="SparePartsApplyMainApi.createSparePartsApplyMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+    @onChange="onChange"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="SparePartsApplyMain.allSchemas"
+    :detailAllSchemas="SparePartsApplyDetail.allSchemas"
+    :detailAllSchemasRules="SparePartsApplyDetailRules"
+    :apiCreate="SparePartsApplyDetailApi.createSparePartsApplyDetail"
+    :apiUpdate="SparePartsApplyDetailApi.updateSparePartsApplyDetail"
+    :apiPage="SparePartsApplyDetailApi.getSparePartsApplyDetailPage"
+    :apiDelete="SparePartsApplyDetailApi.deleteSparePartsApplyDetail"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+    :isShowAddBtn="false"
+    :detailButtonIsShow="true"
+  />
+
+  <!-- 审核页面 -->
+  <!-- <AudiForm ref="audiFormRef" @success="handleApprove"/> -->
+  <BasicForm
+    ref="formRefApproved"
+    :rules="SparePartsApplyMainRules"
+    :formAllSchemas="SparePartsApplyExamine.allSchemas"
+    @submitForm="approveSparePartsApplyMain"
+    :isCol="false"
+  />
+
+  <!-- 导入 -->
+  <ImportForm
+    ref="importFormRef"
+    url="/eam/sparePartsApplyDetail/import"
+    :importTemplateData="importTemplateData"
+    @success="importSuccess"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import {
+  SparePartsApplyMain,
+  SparePartsApplyMainRules,
+  SparePartsApplyDetail,
+  SparePartsApplyDetailRules,
+  SparePartsApplyExamine
+} from './SparePartsApply.data'
+import * as SparePartsApplyMainApi from '@/api/eam/sparePartsApplyMain'
+import * as SparePartsApplyDetailApi from '@/api/eam/sparePartsApplyDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+
+// 采购订单
+defineOptions({ name: 'SparePartsApply' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(SparePartsApplyMain.allSchemas.tableColumns)
+const formRefApproved = ref()
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    console.log(11, val[0])
+    if (type == 'tableForm') {
+      if (formField == 'locationCode') {
+        row['locationCode'] = val[0].locationNumber
+        row['areaCode'] = val[0].areaNumber
+        row['sparePartsCode'] = val[0].itemNumber
+        row['currentQty'] = val[0].qty
+        row['isRadeIn'] = val[0].isRadeIn
+      }
+    } else {
+      if (formField == 'locationCode') {
+        setV['locationCode'] = val[0].locationNumber
+        setV['areaCode'] = val[0].areaNumber
+        setV['sparePartsCode'] = val[0].itemNumber
+        setV['currentQty'] = val[0].qty
+        setV['isRadeIn'] = val[0].isRadeIn
+      }
+    }
+    formRef.setValues(setV)
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
+  nextTick(async () => {
+    const setV = {}
+    // if(formField == 'itemCode'){
+    //     await ItembasicApi.getItembasicPage({
+    //       code: setV['itemCode']
+    //     }).then(res => {
+    //       setV['uom'] = res.list[0].uom
+    //       setV[formField] = val[0][searchField]
+    //     })
+    //   }
+    formRef.setValues(setV)
+  })
+}
+
+// 子表新增的时候选择表格之后需要会显得字段
+const Echo = []
+const { tableObject, tableMethods } = useTable({
+  getListApi: SparePartsApplyMainApi.getSparePartsApplyMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn(null), // 新增
+  // defaultButtons.defaultImportBtn(null), // 导入
+  // defaultButtons.defaultExportBtn(null), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null) // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') {
+    // 新增
+    openForm('create')
+  } else if (val == 'import') {
+    // 导入
+    handleImport()
+  } else if (val == 'export') {
+    // 导出
+    handleExport()
+  } else if (val == 'refresh') {
+    // 刷新
+    getList()
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+const isShowStatusButton = (row, val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListEditBtn({
+      hide: isShowStatusButton(row, ['0']),
+      hasPermi: 'eam:spare-parts-in-location-main:update'
+    }), // 编辑
+    defaultButtons.mainListDeleteBtn({
+      hide: isShowStatusButton(row, ['0']),
+      hasPermi: 'eam:spare-parts-in-location-main:delete'
+    }), // 删除
+    defaultButtons.mainListAuditingBtn({
+      hide: isShowStatusButton(row, ['0']),
+      hasPermi: 'eam:spare-parts-in-location-main:examine'
+    }), //审核
+    defaultButtons.mainListRevokeBtn({
+      hide: isShowStatusButton(row, ['3']),
+      hasPermi: 'eam:spare-parts-in-location-main:cancel'
+    }), // 撤回
+    defaultButtons.mainListTurnDownBtn({
+      hide: isShowStatusButton(row, ['3']),
+      hasPermi: 'eam:spare-parts-in-location-main:rejecte'
+    }), //驳回
+    defaultButtons.mainListApproveBtn({
+      hide: isShowStatusButton(row, ['3']),
+      hasPermi: 'eam:spare-parts-in-location-main:approve'
+    }), //审批通过
+    defaultButtons.mainListFinishBtn({
+      hide: isShowStatusButton(row, ['4']),
+      hasPermi: 'eam:spare-parts-in-location-main:finish'
+    }) //完成
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') {
+    // 编辑
+    openForm('update', row)
+  } else if (val == 'auditing') {
+    //审核
+    handleSubmitExamine(row.id)
+  } else if (val == 'mainTurnDown') {
+    //驳回
+    handleRejecte(row.id)
+  } else if (val == 'mainApprove') {
+    //审核通过
+    formRefApproved.value.open('update', row, { masterId: row.id }, 'auditing')
+  } else if (val == 'revoke') {
+    // 撤回
+    handleCancel(row.id)
+  } else if (val == 'finish') {
+    // 完成
+    handleFinish(row.id)
+  } else if (val == 'delete') {
+    // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  formRef.value.open(type, row)
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicSparePartsApplyMain')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await SparePartsApplyMainApi.deleteSparePartsApplyMain(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 列表导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleMainExport = async (id: number) => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await SparePartsApplyMainApi.exportSparePartsApplyMain(id)
+    download.excel(data, '盘点工单.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 关闭按钮操作 */
+// const handleClose = async (id: number) => {
+//   try {
+//     // 关闭的二次确认
+//     await message.confirm('是否关闭所选中数据？')
+//     // 发起关闭
+//     await SparePartsApplyMainApi.closeSparePartsApplyMain(id)
+//     message.success(t('关闭成功!'))
+//     // 刷新列表
+//     await getList()
+//   } catch {}
+// }
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await SparePartsApplyMainApi.exportSparePartsApplyMain(tableObject.params)
+    download.excel(data, '备件申领记录主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+ * tableForm方法
+ */
+const tableFormKeys = {}
+SparePartsApplyDetail.allSchemas.tableFormColumns.forEach((item) => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  console.log(formRef.value)
+  formRef.value.formLoading = true
+  let isHave = data.subList.some((item) => item.applyQty > item.currentQty)
+  if (isHave) {
+    message.warning('申领数量不能大于库存数量')
+    return
+  }
+  try {
+    if (formType === 'create') {
+      await SparePartsApplyMainApi.createSparePartsApplyMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await SparePartsApplyMainApi.updateSparePartsApplyMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '采购订单主导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+const onChange = (field, item) => {
+  if (field == 'outType') {
+    if (item == '3') {
+      SparePartsApplyMain.allSchemas.formSchema.forEach((item) => {
+        if (item.field == 'workNumber') {
+          item.componentProps.disabled = true
+          item.componentProps.isSearchList = false
+        }
+      })
+    } else {
+      SparePartsApplyMain.allSchemas.formSchema.forEach((item) => {
+        if (item.field == 'workNumber') {
+          item.componentProps.disabled = true
+          item.componentProps.isSearchList = true
+        }
+      })
+    }
+  }
+}
+
+// 审核
+const handleSubmitExamine = async (id: number) => {
+  await message.delConfirm(t('ts.是否提交审核？'))
+  try {
+    await SparePartsApplyMainApi.submitSparePartsApplyMain(id)
+    message.success(t('ts.提交审批成功!'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+/** 撤回按钮操作 */
+const handleCancel = async (id: number) => {
+  await message.delConfirm(t('ts.是否撤回所选中数据？'))
+  try {
+    await SparePartsApplyMainApi.cancelSparePartsApplyMain(id)
+    message.success(t('ts.撤回成功!'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+//审核驳回按钮
+const handleRejecte = async (id: number) => {
+  await message.delConfirm(t('ts.是否驳回所选中数据？'))
+  try {
+    await SparePartsApplyMainApi.rejectSparePartsApplyMain(id)
+    message.success(t('ts.驳回成功!'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+// 审核通过
+const approveSparePartsApplyMain = async (formType, data) => {
+  try {
+    await SparePartsApplyMainApi.approveSparePartsApplyMain(data)
+    message.success(t('ts.审核通过!'))
+    // 刷新列表
+    formRefApproved.value.dialogVisible = false
+    await getList()
+  } finally {
+    formRefApproved.value.formLoading = false
+  }
+}
+
+//审核驳回按钮
+const handleFinish = async (id: number) => {
+  await message.delConfirm(t('ts.是否完成所选中数据？'))
+  try {
+    await SparePartsApplyMainApi.finishSparePartsApplyMain(id)
+    message.success(t('ts.完成成功!'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await SparePartsApplyMainApi.importTemplate()
+})
+</script>
diff --git a/src/views/eam/sparePartsInLocationRecord/index.vue b/src/views/eam/sparePartsInLocationRecord/index.vue
new file mode 100644
index 000000000..86aefd08e
--- /dev/null
+++ b/src/views/eam/sparePartsInLocationRecord/index.vue
@@ -0,0 +1,137 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search
+      :schema="SparePartsInLocationRecordMain.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="SparePartsInLocationRecordMain.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 #number="{ row }">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase
+          :Butttondata="butttondata(row)"
+          @button-base-click="buttonTableClick($event, row)"
+        />
+      </template>
+    </Table>
+  </ContentWrap>
+  
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="SparePartsInLocationRecordMain.allSchemas"
+    :detailAllSchemas="SparePartsInLocationRecordDetail.allSchemas"
+    :detailAllSchemasRules="SparePartsInLocationRecordDetailRules"
+    :apiPage="SparePartsInLocationRecordDetailApi.getSparePartsInLocationRecordDetailPage"
+    :isShowAddBtn="false"
+    :detailButtonIsShowAdd="false"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import {
+  SparePartsInLocationRecordMain,
+  SparePartsInLocationRecordDetail,
+  SparePartsInLocationRecordDetailRules
+} from './sparePartsInLocationRecordMain.data'
+import * as SparePartsInLocationRecordMainApi from '@/api/eam/sparePartsInLocationRecordMain'
+import * as SparePartsInLocationRecordDetailApi from '@/api/eam/sparePartsInLocationRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+
+// 采购订单
+defineOptions({ name: 'SparepartsinlocationRecord' })
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(SparePartsInLocationRecordMain.allSchemas.tableColumns)
+// const audiFormRef = ref()
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+// 子表新增的时候选择表格之后需要会显得字段
+const Echo = []
+const { tableObject, tableMethods } = useTable({
+  getListApi: SparePartsInLocationRecordMainApi.getSparePartsInLocationRecordMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn({ hasPermi: 'eam:spare-parts-in-location-main:create' }), // 新增
+  // defaultButtons.defaultImportBtn({ hasPermi: 'eam:spare-parts-in-location-main:import' }), // 导入
+  // defaultButtons.defaultExportBtn({ hasPermi: 'eam:spare-parts-in-location-main:export' }), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null) // 设置
+
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+if (val == 'refresh') {
+    // 刷新
+    getList()
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicSparePartsApplyMain')
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/eam/sparePartsInLocationRecord/sparePartsInLocationRecordMain.data.ts b/src/views/eam/sparePartsInLocationRecord/sparePartsInLocationRecordMain.data.ts
new file mode 100644
index 000000000..c0d7b7b30
--- /dev/null
+++ b/src/views/eam/sparePartsInLocationRecord/sparePartsInLocationRecordMain.data.ts
@@ -0,0 +1,258 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+import * as ItemAccountsApi from '@/api/eam/itemAccounts'
+import { ItemAccounts } from '@/views/eam/itemAccounts/itemAccounts.data'
+
+
+// 表单校验
+export const SparePartsInLocationRecordMainRules = reactive({
+  number: [required],
+  theme: [required],
+  type: [required],
+})
+// 备件入库主表
+export const SparePartsInLocationRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: 'id',
+    field: 'id',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+  },
+  {
+    label: '编号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false,
+  },
+  {
+    label: '入库主题',
+    field: 'theme',
+    sort: 'custom',
+    isSearch: true,
+  },{
+    label: '入库类型',
+    field: 'type',
+    sort: 'custom',
+    dictType: DICT_TYPE.PUT_IN_TYPE,
+    dictClass: 'string',
+   
+  },
+  {
+    label: '流程状态',
+    field: 'status',
+    sort: 'custom',
+    isSearch: false,
+    isForm:false,
+    
+    dictType: DICT_TYPE.SPAREPARTS_APPLY_STATUS_ENUM,
+    dictClass: 'string',
+   
+  },
+  {
+    label: '入库申请人',
+    field: 'applyer',
+    sort: 'custom',
+    isSearch: false,
+  },
+  {
+    label: '审核人',
+    field: 'approver',
+    sort: 'custom',
+    isSearch: false,
+    isForm:false
+  },
+  {
+    label: '审核内容',
+    field: 'approveContent',
+    sort: 'custom',
+    isSearch: false,
+    isForm:false
+  },
+  {
+    label: '审核时间',
+    field: 'approveTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    isForm:false,
+    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'
+      }
+    },
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+  },
+  {
+    label: '入库时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+  },
+
+  
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isSearch: false,
+  },
+]))
+// 备件入库子表
+export const SparePartsInLocationRecordDetailRules = reactive({
+  number: [required],
+  masterId: [required],
+  locationCode: [required],
+  areaCode: [required],
+  sparePartsCode: [required],
+  applyQty: [required],
+})
+
+export const SparePartsInLocationRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '库位编号',
+    field: 'locationCode',
+    sort: 'custom',
+    isSearch: false,
+    form: {
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库位编号', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库位信息', // 查询弹窗标题
+       
+      searchAllSchemas: ItemAccounts.allSchemas, // 查询弹窗所需类
+      searchPage: ItemAccountsApi.getItemAccountsPage, // 查询弹窗所需分页方法
+        searchCondition: [
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+        ]
+      }
+    },
+    tableForm: {
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择备件编号', // 输入框占位文本
+      searchField: 'itemNumber', // 查询弹窗赋值字段
+      searchTitle: '备件信息', // 查询弹窗标题
+    
+      searchAllSchemas: ItemAccounts.allSchemas, // 查询弹窗所需类
+      searchPage: ItemAccountsApi.getItemAccountsPage, // 查询弹窗所需分页方法
+      searchCondition: [
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }
+      ]
+    }
+  },
+  {
+    label: '库区编号',
+    field: 'areaCode',
+    sort: 'custom',
+    isSearch: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '备件编号',
+    field: 'sparePartsCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '库存数量',
+    field: 'currentQty',
+    sort: 'custom',
+    isSearch: false,
+    tableForm: {
+      disabled: true
+    },
+    form:{
+     componentProps:{
+      disabled: true
+     }
+    },
+    isDetail:false,
+    isTable:false
+  },
+  {
+    label: '申领数量',
+    field: 'applyQty',
+    sort: 'custom',
+    isSearch: false
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+    isTableForm:false
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isSearch: true,
+  },
+ 
+]))
+
+
diff --git a/src/views/eam/sparepartsinlocation/index.vue b/src/views/eam/sparepartsinlocation/index.vue
new file mode 100644
index 000000000..ed9ee8067
--- /dev/null
+++ b/src/views/eam/sparepartsinlocation/index.vue
@@ -0,0 +1,472 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search
+      :schema="SparePartsInLocationMain.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="SparePartsInLocationMain.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 #number="{ row }">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase
+          :Butttondata="butttondata(row)"
+          @button-base-click="buttonTableClick($event, row)"
+        />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="SparePartsInLocationMainRules"
+    :formAllSchemas="SparePartsInLocationMain.allSchemas"
+    :tableAllSchemas="SparePartsInLocationDetail.allSchemas"
+    :tableFormRules="SparePartsInLocationDetailRules"
+    :tableData="tableData"
+    :apiUpdate="SparePartsInLocationMainApi.updateSparePartsApplyMain"
+    :apiCreate="SparePartsInLocationMainApi.createSparePartsApplyMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="SparePartsInLocationMain.allSchemas"
+    :detailAllSchemas="SparePartsInLocationDetail.allSchemas"
+    :detailAllSchemasRules="SparePartsInLocationDetailRules"
+    :apiCreate="SparePartsInLocationDetailApi.createSparePartsInLocationDetail"
+    :apiUpdate="SparePartsInLocationDetailApi.updateSparePartsInLocationDetail"
+    :apiPage="SparePartsInLocationDetailApi.getSparePartsInLocationDetailPage"
+    :apiDelete="SparePartsInLocationDetailApi.deleteSparePartsInLocationDetail"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+    :isShowAddBtn="true"
+    :detailButtonIsShowAdd="true"
+    :detailButtonIsShowAddStatusArray="['0']"
+  />
+  <!-- 审核页面 -->
+  <!-- <AudiForm ref="audiFormRef" @success="handleApprove"/> -->
+  <BasicForm
+    ref="formRefApproved"
+    :rules="SparePartsInLocationMainRules"
+    :formAllSchemas="SparePartsInLocationExamine.allSchemas"
+    @submitForm="approveSparePartsInLocation"
+    :isCol="false"
+  />
+  <!-- 导入 -->
+  <ImportForm
+    ref="importFormRef"
+    url="/eam/spare-parts-in-location-main/import"
+    :importTemplateData="importTemplateData"
+    @success="importSuccess"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import {
+  SparePartsInLocationMain,
+  SparePartsInLocationMainRules,
+  SparePartsInLocationDetail,
+  SparePartsInLocationDetailRules,
+  SparePartsInLocationExamine
+} from './sparePartsInLocationMain.data'
+import * as SparePartsInLocationMainApi from '@/api/eam/sparePartsInLocationMain'
+import * as SparePartsInLocationDetailApi from '@/api/eam/sparePartsInLocationDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+// import AudiForm from '@/views/eam/sparepartsinlocation/audiForm.vue'
+
+// 采购订单
+defineOptions({ name: 'SparePartsApply' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const formRef = ref()
+const formRefApproved = ref()
+const tableColumns = ref(SparePartsInLocationMain.allSchemas.tableColumns)
+// const audiFormRef = ref()
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
+    nextTick(() => {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      console.log(11, val[0])
+      if (type == 'tableForm') {
+        if (formField == 'locationCode') {
+          row['locationCode'] = val[0].locationNumber
+          row['areaCode'] = val[0].areaNumber
+          row['sparePartsCode'] = val[0].itemNumber
+          row['currentQty'] = val[0].qty
+          row['isRadeIn'] = val[0].isRadeIn
+        }
+      } else {
+        if (formField == 'locationCode') {
+          setV['locationCode'] = val[0].locationNumber
+          setV['areaCode'] = val[0].areaNumber
+          setV['sparePartsCode'] = val[0].itemNumber
+          setV['currentQty'] = val[0].qty
+          setV['isRadeIn'] = val[0].isRadeIn
+        }
+      }
+      formRef.setValues(setV)
+    })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
+  nextTick(async () => {
+    const setV = {}
+    if (formField == 'locationCode') {
+      setV['locationCode'] = val[0].locationNumber
+      setV['areaCode'] = val[0].areaNumber
+      setV['sparePartsCode'] = val[0].itemNumber
+      setV['currentQty'] = val[0].qty
+      setV['isRadeIn'] = val[0].isRadeIn
+    }
+    formRef.setValues(setV)
+  })
+}
+
+// 子表新增的时候选择表格之后需要会显得字段
+const Echo = []
+const { tableObject, tableMethods } = useTable({
+  getListApi: SparePartsInLocationMainApi.getSparePartsInLocationMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({ hasPermi: 'eam:spare-parts-in-location-main:create' }), // 新增
+  defaultButtons.defaultImportBtn({ hasPermi: 'eam:spare-parts-in-location-main:import' }), // 导入
+  defaultButtons.defaultExportBtn({ hasPermi: 'eam:spare-parts-in-location-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') {
+    // 刷新
+    getList()
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row, val) => {
+  if (val.indexOf(row.available) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListEditBtn({
+      hide: isShowStatusButton(row, ['0']),
+      hasPermi: 'eam:spare-parts-in-location-main:update'
+    }), // 编辑
+    defaultButtons.mainListDeleteBtn({
+      hide: isShowStatusButton(row, ['0']),
+      hasPermi: 'eam:spare-parts-in-location-main:delete'
+    }), // 删除
+    defaultButtons.mainListAuditingBtn({
+      hide: isShowStatusButton(row, ['0']),
+      hasPermi: 'eam:spare-parts-in-location-main:examine'
+    }), //审核
+    defaultButtons.mainListRevokeBtn({
+      hide: isShowStatusButton(row, ['3']),
+      hasPermi: 'eam:spare-parts-in-location-main:cancel'
+    }), // 撤回
+    defaultButtons.mainListTurnDownBtn({
+      hide: isShowStatusButton(row, ['3']),
+      hasPermi: 'eam:spare-parts-in-location-main:rejecte'
+    }), //驳回
+    defaultButtons.mainListApproveBtn({
+      hide: isShowStatusButton(row, ['3']),
+      hasPermi: 'eam:spare-parts-in-location-main:approve'
+    }), //审批通过
+    defaultButtons.mainListFinishBtn({
+      hide: isShowStatusButton(row, ['4']),
+      hasPermi: 'eam:spare-parts-in-location-main:finish'
+    }) //完成
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') {
+    // 编辑
+    openForm('update', row)
+  } else if (val == 'auditing') {
+    //审核
+    handleSubmitExamine(row.id)
+  } else if (val == 'mainTurnDown') {
+    //驳回
+    handleRejecte(row.id)
+  } else if (val == 'mainApprove') {
+    //审核通过
+    formRefApproved.value.open('update', row, { masterId: row.id }, 'auditing')
+  } else if (val == 'revoke') {
+    // 撤回
+    handleCancel(row.id)
+  } else if (val == 'finish') {
+    // 完成
+    handleFinish(row.id)
+  } else if (val == 'delete') {
+    // 删除
+    handleDelete(row.id)
+  }
+}
+
+const isShowStatusButton = (row, val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+/** 添加/修改操作 */
+const openForm = async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  formRef.value.open(type, row)
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicSparePartsApplyMain')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await SparePartsInLocationMainApi.deleteSparePartsInLocationMain(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 SparePartsInLocationMainApi.exportSparePartsInLocationMain(
+      tableObject.params
+    )
+    download.excel(data, '备件申领记录主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+ * tableForm方法
+ */
+const tableFormKeys = {}
+SparePartsInLocationDetail.allSchemas.tableFormColumns.forEach((item) => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  console.log(formRef.value)
+  formRef.value.formLoading = true
+  let isHave = data.subList.some(item=>item.applyQty>item.currentQty)
+  if(isHave){
+    message.warning('申领数量不能大于库存数量')
+    return
+  }
+  try {
+    if (formType === 'create') {
+      await SparePartsInLocationMainApi.createSparePartsInLocationMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await SparePartsInLocationMainApi.updateSparePartsInLocationMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '备件入库记录导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+// 审核
+const handleSubmitExamine = async (id: number) => {
+  await message.delConfirm(t('ts.是否提交审核？'))
+  try {
+    await SparePartsInLocationMainApi.submitExamineSparePartsInLocation(id)
+    message.success(t('ts.提交审批成功!'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+/** 撤回按钮操作 */
+const handleCancel = async (id: number) => {
+  await message.delConfirm(t('ts.是否撤回所选中数据？'))
+  try {
+    await SparePartsInLocationMainApi.cancelSparePartsInLocation(id)
+    message.success(t('ts.撤回成功!'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+//审核驳回按钮
+const handleRejecte = async (id: number) => {
+  await message.delConfirm(t('ts.是否驳回所选中数据？'))
+  try {
+    await SparePartsInLocationMainApi.rejectSparePartsInLocation(id)
+    message.success(t('ts.驳回成功!'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+// 审核通过
+const approveSparePartsInLocation = async (formType, data) => {
+  try {
+    await SparePartsInLocationMainApi.approveSparePartsInLocation(data)
+    message.success(t('ts.审核通过!'))
+    // 刷新列表
+    formRefApproved.value.dialogVisible = false
+    await getList()
+  } finally {
+    formRefApproved.value.formLoading = false
+  }
+}
+
+//审核驳回按钮
+const handleFinish = async (id: number) => {
+  await message.delConfirm(t('ts.是否完成所选中数据？'))
+  try {
+    await SparePartsInLocationMainApi.finishSparePartsInLocation(id)
+    message.success(t('ts.完成成功!'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await SparePartsInLocationMainApi.importTemplate()
+})
+</script>
diff --git a/src/views/eam/sparepartsinlocation/sparePartsInLocationMain.data.ts b/src/views/eam/sparepartsinlocation/sparePartsInLocationMain.data.ts
new file mode 100644
index 000000000..eef186df0
--- /dev/null
+++ b/src/views/eam/sparepartsinlocation/sparePartsInLocationMain.data.ts
@@ -0,0 +1,298 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+import * as ItemAccountsApi from '@/api/eam/itemAccounts'
+import { ItemAccounts } from '@/views/eam/itemAccounts/itemAccounts.data'
+
+
+// 表单校验
+export const SparePartsInLocationMainRules = reactive({
+  number: [required],
+  theme: [required],
+  type: [required],
+})
+// 备件入库主表
+export const SparePartsInLocationMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: 'id',
+    field: 'id',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+  },
+  {
+    label: '编号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false,
+  },
+  {
+    label: '入库主题',
+    field: 'theme',
+    sort: 'custom',
+    isSearch: true,
+  },{
+    label: '入库类型',
+    field: 'type',
+    sort: 'custom',
+    dictType: DICT_TYPE.PUT_IN_TYPE,
+    dictClass: 'string',
+   
+  },
+  {
+    label: '流程状态',
+    field: 'status',
+    sort: 'custom',
+    isSearch: false,
+    isForm:false,
+    
+    dictType: DICT_TYPE.SPAREPARTS_APPLY_STATUS_ENUM,
+    dictClass: 'string',
+   
+  },
+  {
+    label: '入库申请人',
+    field: 'applyer',
+    sort: 'custom',
+    isSearch: false,
+  },
+  {
+    label: '审核人',
+    field: 'approver',
+    sort: 'custom',
+    isSearch: false,
+    isForm:false
+  },
+  {
+    label: '审核内容',
+    field: 'approveContent',
+    sort: 'custom',
+    isSearch: false,
+    isForm:false
+  },
+  {
+    label: '审核时间',
+    field: 'approveTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    isForm:false,
+    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'
+      }
+    },
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+  },
+  {
+    label: '入库时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+  },
+
+  
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isSearch: false,
+  },
+
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 220,
+      fixed: 'right'
+    },
+    isDetail:false
+  }
+]))
+// 备件入库子表
+export const SparePartsInLocationDetailRules = reactive({
+  number: [required],
+  masterId: [required],
+  locationCode: [required],
+  areaCode: [required],
+  sparePartsCode: [required],
+  applyQty: [required],
+})
+
+export const SparePartsInLocationDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '库位编号',
+    field: 'locationCode',
+    sort: 'custom',
+    isSearch: false,
+    form: {
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库位编号', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库位信息', // 查询弹窗标题
+       
+      searchAllSchemas: ItemAccounts.allSchemas, // 查询弹窗所需类
+      searchPage: ItemAccountsApi.getItemAccountsPage, // 查询弹窗所需分页方法
+        searchCondition: [
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+        ]
+      }
+    },
+    tableForm: {
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择备件编号', // 输入框占位文本
+      searchField: 'itemNumber', // 查询弹窗赋值字段
+      searchTitle: '备件信息', // 查询弹窗标题
+    
+      searchAllSchemas: ItemAccounts.allSchemas, // 查询弹窗所需类
+      searchPage: ItemAccountsApi.getItemAccountsPage, // 查询弹窗所需分页方法
+      searchCondition: [
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }
+      ]
+    }
+  },
+  {
+    label: '库区编号',
+    field: 'areaCode',
+    sort: 'custom',
+    isSearch: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '备件编号',
+    field: 'sparePartsCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '库存数量',
+    field: 'currentQty',
+    sort: 'custom',
+    isSearch: false,
+    tableForm: {
+      disabled: true
+    },
+    form:{
+     componentProps:{
+      disabled: true
+     }
+    },
+    isDetail:false,
+    isTable:false
+  },
+  {
+    label: '申领数量',
+    field: 'applyQty',
+    sort: 'custom',
+    isSearch: false
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+    isTableForm:false
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+    
+  }
+]))
+export const SparePartsInLocationExamineRules = reactive({
+  approver: [required],
+  approveContent: [required],
+  sparePartsCode: [required],
+})
+// 审核完成字段
+export const SparePartsInLocationExamine = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '审核内容',
+    field: 'approveContent',
+    sort: 'custom',
+    isSearch: false,
+    form:{
+      component: 'Input',
+      componentProps: {
+        type: 'textarea'
+      }
+    }
+  },
+]))
+
diff --git a/src/views/eam/sparepartsoutlocation/SparePartsOutLocation.data.ts b/src/views/eam/sparepartsoutlocation/SparePartsOutLocation.data.ts
new file mode 100644
index 000000000..2041ab575
--- /dev/null
+++ b/src/views/eam/sparepartsoutlocation/SparePartsOutLocation.data.ts
@@ -0,0 +1,344 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+
+import * as ItemAccountsApi from '@/api/eam/itemAccounts'
+import { ItemAccounts } from '@/views/eam/itemAccounts/itemAccounts.data'
+
+import { EquipmentAccounts } from '@/views/eam/equipmentAccounts/equipmentAccounts.data'
+import * as EquipmentItemApi from '@/api/eam/equipmentAccounts'
+
+import { dateFormatter } from '@/utils/formatTime'
+
+export const SparePartsOutLocationMain = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '编号',
+      field: 'number',
+      sort: 'custom',
+      isSearch: true,
+      isForm: false
+    },
+    {
+      label: '申请编号',
+      field: 'applyNumber',
+      sort: 'custom',
+      isSearch: true,
+      isForm: false
+    },
+    {
+      label: '出库类型',
+      field: 'outType',
+      dictType: DICT_TYPE.EAM_OUT_TYPE,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      isSearch: false,
+      table: {
+        width: 150
+      },
+      tableForm: {
+        type: 'Select'
+      }
+    },
+    {
+      label: '关联工单',
+      field: 'workNumber',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          isSearchList: true, // 开启查询弹窗
+          searchTitle: '设备信息', // 查询弹窗标题
+          searchListPlaceholder: '请选择 设备编号', // 输入框占位文本
+          searchAllSchemas: EquipmentAccounts.allSchemas, // 查询弹窗所需类
+          searchField: 'code', // 查询弹窗赋值字段
+          searchPage: EquipmentItemApi.getEquipmentAccountsPage, // 查询弹窗所需分页方法
+          multiple: true,
+          searchCondition: [
+            {
+              key: 'status',
+              value: 'NORMAL',
+              action: '==',
+              isSearch: true,
+              isMainValue: false
+            }
+          ]
+        }
+      },
+      tableForm: {
+        isInpuFocusShow: true,
+        searchListPlaceholder: '请选择备件编号', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '备件信息', // 查询弹窗标题
+        searchAllSchemas: EquipmentAccounts.allSchemas, // 查询弹窗所需类
+        searchPage: EquipmentItemApi.getEquipmentAccountsPage, // 查询弹窗所需分页方法
+        searchCondition: [
+          {
+            key: 'status',
+            value: 'NORMAL',
+            action: '==',
+            isSearch: true,
+            isMainValue: false
+          }
+        ]
+      }
+    },
+
+    {
+      label: '出库主题',
+      field: 'theme',
+      sort: 'custom',
+      isSearch: true
+    },
+    {
+      label: '流程状态',
+      field: 'status',
+      sort: 'custom',
+      isSearch: false,
+      isForm: false,
+
+      dictType: DICT_TYPE.EAM_OUT_STATUS,
+      dictClass: 'string'
+    },
+    {
+      label: '申请人',
+      field: 'applyer',
+      sort: 'custom',
+      isSearch: false,
+      isTable: false,
+      isForm: false
+    },
+    {
+      label: '审核人',
+      field: 'approver',
+      sort: 'custom',
+      isSearch: false,
+      isTable: false,
+      isForm: false,
+      form: {
+        component: 'InputNumber',
+        value: 0
+      }
+    },
+    {
+      label: '审核内容',
+      field: 'approveContent',
+      sort: 'custom',
+      isSearch: true,
+      isTable: false,
+      isForm: false
+    },
+    {
+      label: '审核时间',
+      field: 'approveTime',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isSearch: false,
+      isTable: false,
+      isForm: false,
+      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: 'autoExamine',
+      sort: 'custom',
+      isSearch: false,
+      isTable: false,
+      isForm: false
+    },
+    {
+      label: '自动通过',
+      field: 'autoAgree',
+      sort: 'custom',
+      isSearch: false,
+      isTable: false,
+      isForm: false
+    },
+    {
+      label: '直接生成记录',
+      field: 'directCreateRecord',
+      sort: 'custom',
+      isSearch: false,
+      isTable: false,
+      isForm: false
+    },
+    {
+      label: '创建时间',
+      field: 'createTime',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isSearch: false,
+      isTable: false,
+      search: {
+        component: 'DatePicker',
+        componentProps: {
+          valueFormat: 'YYYY-MM-DD HH:mm:ss',
+          type: 'daterange',
+          defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+        }
+      },
+      isForm: false
+    },
+    {
+      label: '操作',
+      field: 'action',
+      isForm: false,
+      table: {
+        width: 150,
+        fixed: 'right'
+      }
+    }
+  ])
+)
+
+//表单校验
+export const SparePartsOutLocationMainRules = reactive({
+  description: [{ required: true, message: '描述不能为空', trigger: 'change' }]
+})
+/**
+ * @returns {Array} 备件申请子表
+ */
+export const SparePartsOutLocationDetail = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '库位编号',
+      field: 'locationCode',
+      sort: 'custom',
+      isSearch: false,
+      form: {
+        componentProps: {
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择库位编号', // 输入框占位文本
+          searchField: 'code', // 查询弹窗赋值字段
+          searchTitle: '库位信息', // 查询弹窗标题
+
+          searchAllSchemas: ItemAccounts.allSchemas, // 查询弹窗所需类
+          searchPage: ItemAccountsApi.getItemAccountsPage, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            }
+          ]
+        }
+      },
+      tableForm: {
+        isInpuFocusShow: true,
+        searchListPlaceholder: '请选择备件编号', // 输入框占位文本
+        searchField: 'itemNumber', // 查询弹窗赋值字段
+        searchTitle: '备件信息', // 查询弹窗标题
+
+        searchAllSchemas: ItemAccounts.allSchemas, // 查询弹窗所需类
+        searchPage: ItemAccountsApi.getItemAccountsPage, // 查询弹窗所需分页方法
+        searchCondition: [
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+        ]
+      }
+    },
+    {
+      label: '库区编号',
+      field: 'areaCode',
+      sort: 'custom',
+      isSearch: false,
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
+      tableForm: {
+        disabled: true
+      }
+    },
+    {
+      label: '备件编号',
+      field: 'sparePartsCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
+      tableForm: {
+        disabled: true
+      }
+    },
+    {
+      label: '库存数量',
+      field: 'currentQty',
+      sort: 'custom',
+      isSearch: false,
+      tableForm: {
+        disabled: true
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
+      isDetail: false,
+      isTable: false
+    },
+    {
+      label: '申领数量',
+      field: 'applyQty',
+      sort: 'custom',
+      isSearch: false
+    },
+    {
+      label: '流程状态',
+      field: 'status',
+      sort: 'custom',
+      isSearch: false,
+      isForm: false,
+
+      dictType: DICT_TYPE.EAM_OUT_STATUS,
+      dictClass: 'string'
+    },
+    {
+      label: '备注',
+      field: 'remark',
+      sort: 'custom',
+      isSearch: false
+    },
+    {
+      label: '操作',
+      field: 'action',
+      isDetail: false,
+      isForm: false,
+      table: {
+        width: 150,
+        fixed: 'right'
+      },
+      isTableForm: false
+    }
+  ])
+)
+
+//表单校验
+export const SparePartsOutLocationDetailRules = reactive({
+  applyQty: [{ required: true, message: '请输入标包数量', trigger: 'blur' }]
+})
diff --git a/src/views/eam/sparepartsoutlocation/index.vue b/src/views/eam/sparepartsoutlocation/index.vue
new file mode 100644
index 000000000..64c25a0f0
--- /dev/null
+++ b/src/views/eam/sparepartsoutlocation/index.vue
@@ -0,0 +1,399 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search
+      :schema="SparePartsOutLocationMain.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="SparePartsOutLocationMain.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 #number="{ row }">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase
+          :Butttondata="butttondata(row)"
+          @button-base-click="buttonTableClick($event, row)"
+        />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="SparePartsOutLocationMainRules"
+    :formAllSchemas="SparePartsOutLocationMain.allSchemas"
+    :tableAllSchemas="SparePartsOutLocationDetail.allSchemas"
+    :tableFormRules="SparePartsOutLocationDetailRules"
+    :tableData="tableData"
+    :apiUpdate="SparePartsOutLocationMainApi.updateSparePartsOutLocationMain"
+    :apiCreate="SparePartsOutLocationMainApi.createSparePartsOutLocationMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="SparePartsOutLocationMain.allSchemas"
+    :detailAllSchemas="SparePartsOutLocationDetail.allSchemas"
+    :detailAllSchemasRules="SparePartsOutLocationDetailRules"
+    :apiCreate="SparePartsOutLocationDetailApi.createSparePartsOutLocationDetail"
+    :apiUpdate="SparePartsOutLocationDetailApi.updateSparePartsOutLocationDetail"
+    :apiPage="SparePartsOutLocationDetailApi.getSparePartsOutLocationDetailPage"
+    :apiDelete="SparePartsOutLocationDetailApi.deleteSparePartsOutLocationDetail"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+    :isShowAddBtn="false"
+    :detailButtonIsShow="true"
+  />
+
+  <!-- 导入 -->
+  <ImportForm
+    ref="importFormRef"
+    url="/eam/sparePartsOutLocationDetail/import"
+    :importTemplateData="importTemplateData"
+    @success="importSuccess"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import {
+  SparePartsOutLocationMain,
+  SparePartsOutLocationMainRules,
+  SparePartsOutLocationDetail,
+  SparePartsOutLocationDetailRules
+} from './SparePartsOutLocation.data.ts'
+import * as SparePartsOutLocationMainApi from '@/api/eam/sparePartsOutLocationMain'
+import * as SparePartsOutLocationDetailApi from '@/api/eam/sparePartsOutLocationDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+
+// 采购订单
+defineOptions({ name: 'SparePartsOutLocation' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(SparePartsOutLocationMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
+  nextTick(() => {
+    nextTick(() => {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      if (formField == 'sparePartsCode') {
+        row['sparePartsCode'] = val[0].itemNumber
+        row['currentQty'] = val[0].qty
+      }
+      if (formField == 'equipmentCode') {
+        row['equipmentCode'] = val[0].code
+      }
+      formRef.setValues(setV)
+    })
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
+  nextTick(async () => {
+    const setV = {}
+    // if(formField == 'itemCode'){
+    //     await ItembasicApi.getItembasicPage({
+    //       code: setV['itemCode']
+    //     }).then(res => {
+    //       setV['uom'] = res.list[0].uom
+    //       setV[formField] = val[0][searchField]
+    //     })
+    //   }
+    formRef.setValues(setV)
+  })
+}
+
+// 子表新增的时候选择表格之后需要会显得字段
+const Echo = []
+const { tableObject, tableMethods } = useTable({
+  getListApi: SparePartsOutLocationMainApi.getSparePartsOutLocationMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn(null), // 新增
+  // defaultButtons.defaultImportBtn(null), // 导入
+  // defaultButtons.defaultExportBtn(null), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null) // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') {
+    // 新增
+    openForm('create')
+  } else if (val == 'import') {
+    // 导入
+    handleImport()
+  } else if (val == 'export') {
+    // 导出
+    handleExport()
+  } else if (val == 'refresh') {
+    // 刷新
+    getList()
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row, val) => {
+  if (val.indexOf(row.available) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+const isShowStatusButton = (row) => {
+  if (row.status === '1') {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    // defaultButtons.mainAdjust(null),// 盘点调整
+    defaultButtons.outBtn({
+      hide: isShowStatusButton(row)
+    }) //出库
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') {
+    // 编辑
+    openForm('update', row)
+  }
+  // else if (val == 'mainOrderClo') {
+  //   // 关闭
+  //   handleClose(row.id)
+  // }
+  else if (val == 'out') {
+    //出库
+    handleOut(row.id)
+  } else if (val == 'delete') {
+    // 删除
+    handleDelete(row.id)
+  }
+}
+
+//审核驳回按钮
+const handleOut = async (id: number) => {
+  await message.delConfirm(t('是否出库所选中数据？'))
+  try {
+    await SparePartsOutLocationMainApi.outSparePartsOutLocationMain(id)
+    message.success(t('出库成功!'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  formRef.value.open(type, row)
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicSparePartsOutLocationMain')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await SparePartsOutLocationMainApi.deleteSparePartsOutLocationMain(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 列表导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleMainExport = async (id: number) => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await SparePartsOutLocationMainApi.exportSparePartsOutLocationMain(id)
+    download.excel(data, '盘点工单.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 关闭按钮操作 */
+// const handleClose = async (id: number) => {
+//   try {
+//     // 关闭的二次确认
+//     await message.confirm('是否关闭所选中数据？')
+//     // 发起关闭
+//     await SparePartsOutLocationMainApi.closeSparePartsOutLocationMain(id)
+//     message.success(t('关闭成功!'))
+//     // 刷新列表
+//     await getList()
+//   } catch {}
+// }
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await SparePartsOutLocationMainApi.exportSparePartsOutLocationMain(
+      tableObject.params
+    )
+    download.excel(data, '备件申领记录主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+ * tableForm方法
+ */
+const tableFormKeys = {}
+SparePartsOutLocationDetail.allSchemas.tableFormColumns.forEach((item) => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  try {
+    if (formType === 'create') {
+      await SparePartsOutLocationMainApi.createSparePartsOutLocationMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await SparePartsOutLocationMainApi.updateSparePartsOutLocationMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '采购订单主导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await SparePartsOutLocationMainApi.importTemplate()
+})
+</script>
diff --git a/src/views/eam/transaction/index.vue b/src/views/eam/transaction/index.vue
index c9857a614..1c248a84d 100644
--- a/src/views/eam/transaction/index.vue
+++ b/src/views/eam/transaction/index.vue
@@ -1,18 +1,22 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="Transaction.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search
+      :schema="Transaction.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
   </ContentWrap>
 
-    <!-- 列表头部 -->
-    <TableHead
-      :HeadButttondata="HeadButttondata"
-      @button-base-click="buttonBaseClick"
-      :routeName="routeName"
-      @updataTableColumns="updataTableColumns"
-      @searchFormClick="searchFormClick"
-      :allSchemas="Transaction.allSchemas"
-    />
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="Transaction.allSchemas"
+  />
 
   <!-- 列表 -->
   <ContentWrap>
@@ -27,13 +31,13 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #code="{row}">
+      <template #code="{ row }">
         <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
           <span>{{ row.code }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -52,12 +56,11 @@
 
   <!-- 详情 -->
   <Detail ref="detailRef" :isBasic="true" :allSchemas="Transaction.allSchemas" />
-
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { Transaction,Rules } from './transaction.data'
+import { Transaction, Rules } from './transaction.data'
 import * as TransactionApi from '@/api/eam/transaction'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
@@ -97,12 +100,12 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'item:transaction:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'item:transaction:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'item:transaction:export'}), // 导出
+  defaultButtons.defaultAddBtn({ hasPermi: 'item:transaction:create' }), // 新增
+  defaultButtons.defaultImportBtn({ hasPermi: 'item:transaction:import' }), // 导入
+  defaultButtons.defaultExportBtn({ hasPermi: 'item:transaction:export' }), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
-  defaultButtons.defaultSetBtn(null), // 设置
+  defaultButtons.defaultSetBtn(null) // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',
@@ -115,31 +118,39 @@ const HeadButttondata = [
 
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
-  if (val == 'add') { // 新增
+  if (val == 'add') {
+    // 新增
     openForm('create')
-  } else if (val == 'import') { // 导入
+  } else if (val == 'import') {
+    // 导入
     handleImport()
-  } else if (val == 'export') { // 导出
+  } else if (val == 'export') {
+    // 导出
     handleExport()
-  } else if (val == 'refresh') { // 刷新
+  } else if (val == 'refresh') {
+    // 刷新
     getList()
-  } else if (val == 'filtrate') { // 筛选
-  } else { // 其他按钮
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
     console.log('其他按钮', item)
   }
 }
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'item:transaction:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'item:transaction:delete'}), // 删除
+  // defaultButtons.mainListEditBtn({hasPermi:'item:transaction:update'}), // 编辑
+  // defaultButtons.mainListDeleteBtn({hasPermi:'item:transaction:delete'}), // 删除
 ]
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
-  if (val == 'edit') { // 编辑
+  if (val == 'edit') {
+    // 编辑
     openForm('update', row)
-  } else if (val == 'delete') { // 删除
+  } else if (val == 'delete') {
+    // 删除
     handleDelete(row.id)
   }
 }
@@ -151,18 +162,18 @@ const openForm = (type: string, row?: any) => {
 }
 
 // form表单提交
-const formsSuccess = async (formType,data) => {
-  var isHave =Transaction.allSchemas.formSchema.some(function (item) {
-    return item.field === 'activeTime' || item.field === 'expireTime';
-  });
-  if(isHave){
-    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+const formsSuccess = async (formType, data) => {
+  var isHave = Transaction.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;
+      return
     }
   }
-  if(data.activeTime==0)data.activeTime = null;
-  if(data.expireTime==0)data.expireTime = null;
+  if (data.activeTime == 0) data.activeTime = null
+  if (data.expireTime == 0) data.expireTime = null
   if (formType === 'create') {
     await TransactionApi.createTransaction(data)
     message.success(t('common.createSuccess'))
@@ -237,5 +248,4 @@ const searchFormClick = (searchData) => {
 onMounted(async () => {
   getList()
 })
-
 </script>
diff --git a/src/views/eam/transaction/transaction.data.ts b/src/views/eam/transaction/transaction.data.ts
index f75af8ac6..5f14a5a2a 100644
--- a/src/views/eam/transaction/transaction.data.ts
+++ b/src/views/eam/transaction/transaction.data.ts
@@ -6,89 +6,91 @@ export const Rules = reactive({
   locationNumber: [required],
   inventoryAction: [required],
   businessType: [required],
-  uom: [required],
+  uom: [required]
 })
 
-export const Transaction = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '备件编号',
-    field: 'itemNumber',
-    sort: 'custom',
-    isSearch: true,
-  },
-  {
-    label: '库位编码',
-    field: 'locationNumber',
-    sort: 'custom',
-    isSearch: true,
-  },
-  {
-    label: '事务类型',
-    field: 'transactionType',
-    sort: 'custom',
-    dictType: DICT_TYPE.TRANSACTION_TYPE,
-    dictClass: 'string',
-    isSearch: false,
-    isTable: true,
-    table: {
-      width: 150
+export const Transaction = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '备件编号',
+      field: 'itemNumber',
+      sort: 'custom',
+      isSearch: true
     },
-    tableForm: {
-      type: 'Select'
-    }
-  },
-  {
-    label: '库存动作',
-    field: 'inventoryAction',
-    sort: 'custom',
-    dictType: DICT_TYPE.INVENTORY_ACTION,
-    dictClass: 'string',
-    isSearch: false,
-    isTable: true,
-    table: {
-      width: 150
+    {
+      label: '库位编码',
+      field: 'locationNumber',
+      sort: 'custom',
+      isSearch: true
     },
-    tableForm: {
-      type: 'Select'
-    }
-  },
-  {
-    label: '库存状态',
-    field: 'inventoryStatus',
-    sort: 'custom',
-    isSearch: false,
-    form: {
-      component: 'Radio'
+    {
+      label: '事务类型',
+      field: 'transactionType',
+      sort: 'custom',
+      dictType: DICT_TYPE.EAM_TRANSACTION_TYPE,
+      dictClass: 'string',
+      isSearch: false,
+      isTable: true,
+      table: {
+        width: 150
+      },
+      tableForm: {
+        type: 'Select'
+      }
+    },
+    {
+      label: '库存动作',
+      field: 'inventoryAction',
+      sort: 'custom',
+      dictType: DICT_TYPE.EAM_INVENTORY_ACTION,
+      dictClass: 'string',
+      isSearch: false,
+      isTable: true,
+      table: {
+        width: 150
+      },
+      tableForm: {
+        type: 'Select'
+      }
+    },
+    {
+      label: '库存状态',
+      field: 'inventoryStatus',
+      sort: 'custom',
+      isSearch: false,
+      form: {
+        component: 'Radio'
+      }
+    },
+    {
+      label: '关联单号',
+      field: 'associatedNumber',
+      sort: 'custom',
+      isSearch: false,
+      form: {
+        component: 'Radio'
+      }
     },
-  },
-  {
-    label: '关联单号',
-    field: 'associatedNumber',
-    sort: 'custom',
-    isSearch: false,
-    form: {
-      component: 'Radio'
+    {
+      label: '计量单位',
+      field: 'uom',
+      sort: 'custom',
+      isSearch: false
     },
-  },
-  {
-    label: '计量单位',
-    field: 'uom',
-    sort: 'custom',
-    isSearch: false,
-  },
-  {
-    label: '数量',
-    field: 'qty',
-    sort: 'custom',
-    isSearch: false,
-  },
-  {
-    label: '操作',
-    field: 'action',
-    isForm: false,
-    table: {
-      width: 150,
-      fixed: 'right'
+    {
+      label: '数量',
+      field: 'qty',
+      sort: 'custom',
+      isSearch: false
     }
-  }
-]))
+    // {
+    //   label: '操作',
+    //   field: 'action',
+    //   isForm: false,
+    //   table: {
+    //     width: 150,
+    //     fixed: 'right'
+    //   }
+    // }
+  ])
+)

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 135/408] 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 136/408] =?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 03bfb8bba035e984262e481df70e673e32da6f97 Mon Sep 17 00:00:00 2001
From: zhaoyiran <zhaoyrd@yonyou.com>
Date: Thu, 4 Jul 2024 17:24:22 +0800
Subject: [PATCH 137/408] =?UTF-8?q?=E6=AF=8F=E4=BB=BD=E6=A0=B7=E5=93=81?=
 =?UTF-8?q?=E9=87=8F=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/inspectionScheme/addForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/qms/inspectionScheme/addForm.vue b/src/views/qms/inspectionScheme/addForm.vue
index 7d07f2ba6..e0c398eb2 100644
--- a/src/views/qms/inspectionScheme/addForm.vue
+++ b/src/views/qms/inspectionScheme/addForm.vue
@@ -1232,7 +1232,7 @@ const searchTableSuccess = async (formField, searchField, val, type, row) => {
         data.value.samplePieceSize = 1
         isSamplePieceSizeDisabled.value = true
       } else {
-        data.value.samplePieceSize = ''
+        data.value.samplePieceSize = 1
         isSamplePieceSizeDisabled.value = false
       }
       data.value.description = val[0].desc1

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 138/408] =?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 139/408] =?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 3bafe325b1e9255a4af90beaa6736b94dfacf1dd Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Thu, 4 Jul 2024 17:36:15 +0800
Subject: [PATCH 140/408] =?UTF-8?q?EAM=20=E2=80=94=E2=80=94>=20=20?=
 =?UTF-8?q?=E5=B7=A1=E6=A3=80=20=E7=82=B9=E6=A3=80=20=E4=BF=9D=E5=85=BB=20?=
 =?UTF-8?q?=E7=BB=B4=E4=BF=AE=20=E9=97=AE=E9=A2=98=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/disposition/defaultButtons.ts          |  4 ++--
 .../equipmentAccounts/equipmentAccounts.data.ts  |  8 +++++++-
 src/views/eam/equipmentAccounts/index.vue        | 16 +++++++++++++++-
 .../equipmentSigning/equipmentSigning.data.ts    |  9 ++++++---
 src/views/eam/equipmentSigning/index.vue         |  4 ++--
 src/views/eam/equipmentTransferRecord/index.vue  |  6 +++---
 6 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts
index 145a6d9fb..896e1b77c 100644
--- a/src/utils/disposition/defaultButtons.ts
+++ b/src/utils/disposition/defaultButtons.ts
@@ -1154,7 +1154,7 @@ export function mainCopyBtn(option:any) {
 // 主列表-部件
 export function componentBtn(option:any) {
   return __defaultBtnOption(option,{
-    label: '部件',
+    label: '关联部件',
     name: 'component',
     hide: false,
     type: 'primary',
@@ -1166,7 +1166,7 @@ export function componentBtn(option:any) {
 // 主列表-备件
 export function sparePartBtn(option:any) {
   return __defaultBtnOption(option,{
-    label: '备件',
+    label: '关联备件',
     name: 'sparePart',
     hide: false,
     type: 'primary',
diff --git a/src/views/eam/equipmentAccounts/equipmentAccounts.data.ts b/src/views/eam/equipmentAccounts/equipmentAccounts.data.ts
index e8e9609dd..2c9115f5e 100644
--- a/src/views/eam/equipmentAccounts/equipmentAccounts.data.ts
+++ b/src/views/eam/equipmentAccounts/equipmentAccounts.data.ts
@@ -62,6 +62,12 @@ export const EquipmentAccounts = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: false
   },
+  {
+    label: '出厂编号',
+    field: 'factoryCode',
+    sort: 'custom',
+    isSearch: false
+  },
   {
     label: '设备类型',
     field: 'type',
@@ -625,7 +631,7 @@ export const EquipmentAccounts = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'action',
     isForm: false,
     table: {
-      width: 150,
+      width: 200,
       fixed: 'right'
     }
   }
diff --git a/src/views/eam/equipmentAccounts/index.vue b/src/views/eam/equipmentAccounts/index.vue
index 08cac0893..e17ae39a8 100644
--- a/src/views/eam/equipmentAccounts/index.vue
+++ b/src/views/eam/equipmentAccounts/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBase  :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)"/>
       </template>
     </Table>
   </ContentWrap>
@@ -250,6 +250,20 @@ const openForm = async (type: string, row?: any) => {
     row.lineName = productionlineNoPage?.find(item=>item.code == row.lineCode)?.name
     row.manufactureName = equipmentManufacturerNoPage?.find(item=>item.number == row.manufactureCode)?.name
     row.supplierName = equipmentSupplierNoPage?.find(item=>item.number == row.supplierCode)?.name
+
+    EquipmentAccounts.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'status') {
+        item.componentProps.disabled = false
+
+      }
+    })
+  }else{
+    EquipmentAccounts.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'status') {
+        item.componentProps.disabled = true
+        item.value = 'TOACCEPT'
+      }
+    })
   }
   basicFormRef.value.open(type, row)
 }
diff --git a/src/views/eam/equipmentSigning/equipmentSigning.data.ts b/src/views/eam/equipmentSigning/equipmentSigning.data.ts
index 2eb131ff6..b5d9eb86c 100644
--- a/src/views/eam/equipmentSigning/equipmentSigning.data.ts
+++ b/src/views/eam/equipmentSigning/equipmentSigning.data.ts
@@ -136,19 +136,22 @@ export const EquipmentSigning = useCrudSchemas(reactive<CrudSchema[]>([
     label: '供应商编号',
     field: 'supplierCode',
     sort: 'custom',
-    isSearch: true
+    isSearch: true,
+    isForm: false
   },
   {
     label: '供应商联系人',
     field: 'supplierPeople',
     sort: 'custom',
-    isSearch: true
+    isSearch: true,
+    isForm: false
   },
   {
     label: '供应商联系方式',
     field: 'supplierTelephone',
     sort: 'custom',
-    isSearch: false
+    isSearch: false,
+    isForm: false,
   },
   // {
   //   label: '流程状态',
diff --git a/src/views/eam/equipmentSigning/index.vue b/src/views/eam/equipmentSigning/index.vue
index d2968ff35..479a60349 100644
--- a/src/views/eam/equipmentSigning/index.vue
+++ b/src/views/eam/equipmentSigning/index.vue
@@ -140,8 +140,8 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'eam:equipment-signing:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'eam:equipment-signing:delete'}), // 删除
+  // defaultButtons.mainListEditBtn({hasPermi:'eam:equipment-signing:update'}), // 编辑
+  // defaultButtons.mainListDeleteBtn({hasPermi:'eam:equipment-signing:delete'}), // 删除
 ]
 
 // 列表-操作按钮事件
diff --git a/src/views/eam/equipmentTransferRecord/index.vue b/src/views/eam/equipmentTransferRecord/index.vue
index e1b220f06..c3fd5c72e 100644
--- a/src/views/eam/equipmentTransferRecord/index.vue
+++ b/src/views/eam/equipmentTransferRecord/index.vue
@@ -113,7 +113,7 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'eam:equipment-transfer-record:create'}), // 新增
+  //defaultButtons.defaultAddBtn({hasPermi:'eam:equipment-transfer-record:create'}), // 新增
   // defaultButtons.defaultImportBtn({hasPermi:'eam:equipment-transfer-record:import'}), // 导入
   // defaultButtons.defaultExportBtn({hasPermi:'eam:equipment-transfer-record:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
@@ -147,8 +147,8 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'eam:equipment-transfer-record:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'eam:equipment-transfer-record:delete'}), // 删除
+  //defaultButtons.mainListEditBtn({hasPermi:'eam:equipment-transfer-record:update'}), // 编辑
+  //defaultButtons.mainListDeleteBtn({hasPermi:'eam:equipment-transfer-record:delete'}), // 删除
 ]
 
 // 列表-操作按钮事件

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 141/408] =?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 3ba001020b203ee2917fc816a71c3945cab4abd8 Mon Sep 17 00:00:00 2001
From: bjang03 <259278618@qq.com>
Date: Thu, 4 Jul 2024 18:11:44 +0800
Subject: [PATCH 142/408] =?UTF-8?q?1=E3=80=81=E7=9B=98=E7=82=B9=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E5=A2=9E=E5=8A=A0=E4=BB=BB=E5=8A=A1=E6=8B=86=E5=88=86?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../count/countJobMain/countJobMain.data.ts   | 32 +++++++++----------
 .../count/countPlanMain/countPlanMain.data.ts |  2 +-
 .../countRecordMain/countRecordMain.data.ts   | 18 +++++------
 .../countRequestMain/countRequestMain.data.ts | 27 ++++++----------
 4 files changed, 35 insertions(+), 44 deletions(-)

diff --git a/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts b/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts
index 5768ef3fb..c81addf77 100644
--- a/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts
+++ b/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts
@@ -56,22 +56,22 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '仓库代码',
-    field: 'warehouseCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '库位代码',
-    field: 'locationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  // {
+  //   label: '仓库代码',
+  //   field: 'warehouseCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '库位代码',
+  //   field: 'locationCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
     label: '申请时间',
     field: 'requestTime',
diff --git a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
index dd626bb8b..25c3b062f 100644
--- a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
+++ b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
@@ -88,7 +88,7 @@ export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     isTable:false,
     isForm: true,
     form: {
-      value: 'LOCATION_CODE'
+      value: 'locationCode'
     }
 
   },
diff --git a/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts b/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts
index 65250f6f8..8b5029d6d 100644
--- a/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts
+++ b/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts
@@ -40,14 +40,14 @@ export const CountRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '仓库代码',
-    field: 'warehouseCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  // {
+  //   label: '仓库代码',
+  //   field: 'warehouseCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
     label: '阶段',
     field: 'stage',
@@ -615,4 +615,4 @@ export const CountRecordDetailRules = reactive({
   creator: [
     { required: true, message: '请输入创建者', trigger: 'blur' }
   ],
-})
\ No newline at end of file
+})
diff --git a/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts b/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts
index 5143949d2..53a9b2930 100644
--- a/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts
+++ b/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts
@@ -54,15 +54,6 @@ export const CountRequestMain = useCrudSchemas(<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '申请单号',
-    field: 'requestNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false,
-  },
   {
     label: '计划单号',
     field: 'planNumber',
@@ -99,15 +90,15 @@ export const CountRequestMain = useCrudSchemas(<CrudSchema[]>([
     },
     isSearch: true,
   },
-  {
-    label: '仓库代码',
-    field: 'warehouseCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch: true,
-  },
+  // {
+  //   label: '仓库代码',
+  //   field: 'warehouseCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isSearch: true,
+  // },
   {
     label: '申请时间',
     field: 'requestTime',

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 143/408] =?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 144/408] =?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 145/408] =?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 146/408] =?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 1c07be91b1b204a18e6c6b8d897ff817076f4f78 Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Fri, 5 Jul 2024 10:25:06 +0800
Subject: [PATCH 147/408] =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AD=97=E6=AE=B5=E9=87=8D=E5=A4=8D=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionplan/productionMain/productionMain.data.ts         | 1 -
 .../productionMainAssemble/productionMainAssemble.data.ts        | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
index bc469c5ad..0a638064b 100644
--- a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
@@ -236,7 +236,6 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
-    isSearch: true,
     sortTableDefault:1000,
     form: {
       component: 'DatePicker',
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
index 466d2a4e5..0933ae0a5 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
@@ -235,7 +235,6 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
-    isSearch: true,
     sortTableDefault:1000,
     form: {
       component: 'DatePicker',

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 148/408] =?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 1834914da05f1c3e84fbbb8f8b7498a716a31031 Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Fri, 5 Jul 2024 10:38:28 +0800
Subject: [PATCH 149/408] =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AD=97=E6=AE=B5=E9=87=8D=E5=A4=8D=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionplan/productionMain/productionMain.data.ts       | 3 +++
 .../productionMainAssemble/productionMainAssemble.data.ts      | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
index 0a638064b..d3f6e0e3e 100644
--- a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
@@ -730,6 +730,9 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     isSearch: true,
+    isTableForm: false,
+    isForm: false,
+    // hiddenInMain: true,
     sortTableDefault:1000,
     form: {
       component: 'DatePicker',
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
index 0933ae0a5..b6b85d8b5 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
@@ -729,6 +729,9 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     isSearch: true,
+    isTableForm: false,
+    isForm: false,
+    // hiddenInMain: true,
     sortTableDefault:1000,
     form: {
       component: 'DatePicker',

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 150/408] =?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 2b3e9d0308152ffb58670a93389c19b45ad9ecef Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Fri, 5 Jul 2024 10:47:45 +0800
Subject: [PATCH 151/408] =?UTF-8?q?=E4=BA=A7=E5=93=81=E7=B1=BB=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=89=8D=E7=AB=AF=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/mstr/index.ts                     |  56 +++++
 .../basicDataManage/subject/mstr/index.vue    | 236 ++++++++++++++++++
 .../basicDataManage/subject/mstr/mstr.data.ts |  67 +++++
 3 files changed, 359 insertions(+)
 create mode 100644 src/api/wms/mstr/index.ts
 create mode 100644 src/views/wms/basicDataManage/subject/mstr/index.vue
 create mode 100644 src/views/wms/basicDataManage/subject/mstr/mstr.data.ts

diff --git a/src/api/wms/mstr/index.ts b/src/api/wms/mstr/index.ts
new file mode 100644
index 000000000..f34bc2a89
--- /dev/null
+++ b/src/api/wms/mstr/index.ts
@@ -0,0 +1,56 @@
+import request from '@/config/axios'
+
+export interface MstrVO {
+  id: number
+  hflccHflcd: string
+  plProdLine: string
+  plDesc: string
+  plMvarAcct: string
+  plCchgAcct: string
+  type: string
+  remark: string
+  extraProperties: string
+  concurrencyStamp: number
+  siteId: string
+}
+
+// 查询产品类信息列表
+export const getMstrPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/mstr/senior', data })
+  } else {
+    return await request.get({ url: `/wms/mstr/page`, params })
+  }
+}
+
+// 查询产品类信息详情
+export const getMstr = async (id: number) => {
+  return await request.get({ url: `/wms/mstr/get?id=` + id })
+}
+
+// 新增产品类信息
+export const createMstr = async (data: MstrVO) => {
+  return await request.post({ url: `/wms/mstr/create`, data })
+}
+
+// 修改产品类信息
+export const updateMstr = async (data: MstrVO) => {
+  return await request.put({ url: `/wms/mstr/update`, data })
+}
+
+// 删除产品类信息
+export const deleteMstr = async (id: number) => {
+  return await request.delete({ url: `/wms/mstr/delete?id=` + id })
+}
+
+// 导出产品类信息 Excel
+export const exportMstr = async (params) => {
+  return await request.download({ url: `/wms/mstr/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/mstr/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/subject/mstr/index.vue b/src/views/wms/basicDataManage/subject/mstr/index.vue
new file mode 100644
index 000000000..67ea231af
--- /dev/null
+++ b/src/views/wms/basicDataManage/subject/mstr/index.vue
@@ -0,0 +1,236 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Mstr.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="Mstr.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="MstrRules"
+    :formAllSchemas="Mstr.allSchemas"
+    :apiUpdate="MstrApi.updateMstr"
+    :apiCreate="MstrApi.createMstr"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Mstr.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/mstr/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { Mstr,MstrRules } from './mstr.data'
+import * as MstrApi from '@/api/wms/mstr'
+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: 'Mstr' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Mstr.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: MstrApi.getMstrPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:mstr:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:mstr:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:mstr: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:mstr:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:mstr: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 =Mstr.allSchemas.formSchema.some(function (item) {
+    return item.field === 'activeTime' || item.field === 'expireTime';
+  });
+  if (formType === 'create') {
+    await MstrApi.createMstr(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await MstrApi.updateMstr(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, 'basicMstr')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await MstrApi.deleteMstr(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 MstrApi.exportMstr(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 MstrApi.importTemplate()
+})
+
+</script>
diff --git a/src/views/wms/basicDataManage/subject/mstr/mstr.data.ts b/src/views/wms/basicDataManage/subject/mstr/mstr.data.ts
new file mode 100644
index 000000000..da3628962
--- /dev/null
+++ b/src/views/wms/basicDataManage/subject/mstr/mstr.data.ts
@@ -0,0 +1,67 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const MstrRules = reactive({
+  hflccHflcd: [required],
+  plProdLine: [required],
+  plMvarAcct: [required],
+  plCchgAcct: [required],
+  concurrencyStamp: [required],
+})
+
+export const Mstr = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '域代码',
+    field: 'hflccHflcd',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '产品类',
+    field: 'plProdLine',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '产品描述',
+    field: 'plDesc',
+    sort: 'custom',
+  },
+  {
+    label: '物料差异账户',
+    field: 'plMvarAcct',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '成本重估账户',
+    field: 'plCchgAcct',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))

From 5c126c4b3c9340a39e7232615cd8e0f8c82bc859 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 5 Jul 2024 11:08:37 +0800
Subject: [PATCH 152/408] =?UTF-8?q?=E5=8F=91=E6=96=99=E7=94=B3=E8=AF=B7=20?=
 =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E6=97=B6=E6=B7=BB=E5=8A=A0=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E5=90=8E=E5=88=A0=E9=99=A4=EF=BC=8C=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E7=9B=B4=E6=8E=A5=E6=96=B0=E5=A2=9E=E6=88=90?=
 =?UTF-8?q?=E5=8A=9F=EF=BC=8C=E4=BD=86=E6=98=AF=E9=A1=B5=E9=9D=A2=E4=B8=AD?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E8=AF=A5=E6=95=B0=E6=8D=AE=202.=E5=90=8C?=
 =?UTF-8?q?=E6=97=B6=E7=94=9F=E4=BA=A7=E7=BA=BF=E4=BB=A3=E7=A0=81=E6=97=B6?=
 =?UTF-8?q?=E5=BF=85=E5=A1=AB=E9=A1=B9=20=E4=BD=86=E6=98=AF=E6=9C=AA?=
 =?UTF-8?q?=E6=A0=87=E8=AF=86,=E8=A1=A5=E6=96=99=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E4=B8=AD=E5=BA=94=E8=AF=A5=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=97=A0=E6=84=8F=E4=B9=89=E7=9A=84=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicForm.vue    |   4 +-
 .../issueRequestMain/issueRequestMain.data.ts |   3 +
 .../repleinshRequestMain.data.ts              | 254 +++++++++---------
 .../productreceiptRequestMain.data.ts         |   3 +
 .../productreceiptAssembleRequestMain.data.ts |   3 +
 .../productscrapRequestMain.data.ts           |   3 +
 6 files changed, 147 insertions(+), 123 deletions(-)

diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 5fa0fbd9a..378a2ba07 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -615,14 +615,12 @@ const submitForm = async () => {
     formLoading.value = true
     if (formType.value == 'create') {
       const validateForm = await tableFormRef.value.validateForm()
-      if (!validateForm && props.tableFormDataLength) {
+      if (props.tableFormDataLength) {
         if (props.tableData.length == 0) {
           message.warning('请填写明细信息！')
           formLoading.value = false
           return
         }
-        formLoading.value = false
-        return
       }
       // 主子表——提交请求
       try {
diff --git a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
index 4a7479093..4b131b1bb 100644
--- a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
+++ b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
@@ -560,6 +560,9 @@ export const IssueRequestMainRules = reactive({
   workshopCode: [
     { required: true, message: '请选择车间代码', trigger: 'change' }
   ],
+  productionLineCode: [
+    { required: true, message: '请选择生产线代码', trigger: 'change' }
+  ],
   // fromWarehouseCode: [
   //   { required: true, message: '请选择从仓库代码', trigger: 'change' }
   // ],
diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
index f18f34c0d..80e5d6536 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
@@ -471,6 +471,122 @@ export const RepleinshRequestMainRules = reactive({
  * @returns {Array} 补料申请子表
  */
 export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch:true,
+    sortSearchDefault:2,
+    sortTableDefault:3,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '物料基础信息', // 查询弹窗标题
+        searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
+        searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
+        searchCondition:[{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
+    tableForm:{
+      enterSearch:true,
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+      searchField: 'code', // 查询弹窗赋值字段
+      searchTitle: '物料基础信息', // 查询弹窗标题
+      searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
+      searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
+      searchCondition:[{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key : 'businessTypeCode',
+        value: queryParams.businessTypeCode
+      }]
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    sortTableDefault:4,
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain:true,
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain:true,
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain:true,
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:9,
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
   {
     label: '到库位代码',
     field: 'toLocationCode',
@@ -541,7 +657,8 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'inventoryStatus',
     dictType: DICT_TYPE.INVENTORY_STATUS,
     dictClass: 'string',
-    isTable: true,
+    isTableForm: false,
+    isTable:false,
     sort: 'custom',
     form: {
       value: 'OK',
@@ -557,6 +674,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTableForm:false,
     tableForm: {
       type: 'Select',
       default: 'OK',
@@ -573,63 +691,23 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     hiddenInMain:true,
     isTableForm: false,
+    isTable:false,
     form: {
       componentProps: {
         disabled: true
       }
     }
   },
-  {
-    label: '物料代码',
-    field: 'itemCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch:true,
-    sortSearchDefault:2,
-    sortTableDefault:3,
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '物料基础信息', // 查询弹窗标题
-        searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
-        searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
-        searchCondition:[{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
-      }
-    },
-    tableForm:{
-      enterSearch:true,
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择物料代码', // 输入框占位文本
-      searchField: 'code', // 查询弹窗赋值字段
-      searchTitle: '物料基础信息', // 查询弹窗标题
-      searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
-      searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
-      searchCondition:[{
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
-      },{
-        key : 'businessTypeCode',
-        value: queryParams.businessTypeCode
-      }]
-    },
-  },
+ 
   {
     label: '备注',
     field: 'remark',
     sort: 'custom',
+    isTableForm:false,
     table: {
       width: 150
     },
+    isTable:false,
     hiddenInMain:true,
   },
   {
@@ -667,36 +745,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isTableForm: false,
     isForm: false
   },
-  {
-    label: '物料名称',
-    field: 'itemName',
-    sort: 'custom',
-    sortTableDefault:4,
-    isTableForm: false,
-    isForm: false,
-  },
-  {
-    label: '物料描述1',
-    field: 'itemDesc1',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false,
-  },
-  {
-    label: '物料描述2',
-    field: 'itemDesc2',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false,
-  },
+
   {
     label: '项目代码',
     field: 'projectCode',
@@ -706,50 +755,10 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     hiddenInMain:true,
     isTableForm: false,
+    isTable:false,
     isForm: false,
   },
-  {
-    label: '数量',
-    field: 'qty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        min: 0,
-        precision: 6
-      }
-    },
-    tableForm: {
-      type: 'InputNumber',
-      min: 0,
-      precision: 6
-    }
-  },
-  {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:9,
-    tableForm: {
-      type: 'Select',
-      disabled: true
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
+
   {
     label: '采购订单号',
     field: 'poNumber',
@@ -760,6 +769,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     hiddenInMain:true,
     isTableForm: false,
     sortTableDefault:1,
+    isTable:false,
   },
   {
     label: '订单行',
@@ -771,6 +781,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     hiddenInMain:true,
     isTableForm: false,
     sortTableDefault:2,
+    isTable:false,
   },
 
   {
@@ -783,6 +794,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isTableForm: false,
     isForm: false,
     hiddenInMain:true,
+    isTable:false,
   },
   {
     label: '到货主代码',
@@ -794,6 +806,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isTableForm: false,
     isForm: false,
     hiddenInMain:true,
+    isTable:false, 
   },
   {
     label: '最后更新时间',
@@ -829,6 +842,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTableForm: false,
     hiddenInMain:true,
+    isTable:false,
     isForm: false
   },
   {
@@ -847,9 +861,9 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
 
 //表单校验
 export const RepleinshRequestDetailRules = reactive({
-  inventoryStatus: [
-    { required: true, message: '请选择库存状态', trigger: 'change' }
-  ],
+  // inventoryStatus: [
+  //   { required: true, message: '请选择库存状态', trigger: 'change' }
+  // ],
   toLocationCode: [
     { required: true, message: '请输入到库位代码', trigger: 'blur' }
   ],
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
index eb64606c0..ad2d93277 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
@@ -535,6 +535,9 @@ export const ProductreceiptRequestMainRules = reactive({
   // departmentCode: [
   //   { required: true, message: '请输入部门', trigger: 'blur' }
   // ],
+  productionLineCode: [
+    { required: true, message: '请选择生产线代码', trigger: 'change' }
+  ],
   autoCommit: [
     { required: true, message: '请选择是否自动提交', trigger: 'change' }
   ],
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
index 9e01199c7..84fb8ddaa 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
@@ -536,6 +536,9 @@ export const ProductreceiptRequestMainRules = reactive({
   // departmentCode: [
   //   { required: true, message: '请输入部门', trigger: 'blur' }
   // ],
+  productionLineCode: [
+    { required: true, message: '请选择生产线代码', trigger: 'change' }
+  ],
   autoCommit: [
     { required: true, message: '请选择是否自动提交', trigger: 'change' }
   ],
diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
index 5c7911793..b6902aa29 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
@@ -500,6 +500,9 @@ export const ProductscrapRequestMainRules = reactive({
   // dueTime: [
   //   { required: true, message: '请选择截止时间', trigger: 'change' }
   // ],
+  productionLineCode: [
+    { required: true, message: '请选择生产线代码', trigger: 'change' }
+  ],
   departmentCode: [
     { required: true, message: '请输入部门', trigger: 'blur' }
   ],

From 73147b139f12f9443d1aaae11f80b583a428ef4f Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 5 Jul 2024 11:33:23 +0800
Subject: [PATCH 153/408] =?UTF-8?q?=E5=88=B6=E5=93=81=E8=BF=94=E4=BF=AE?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=20=E6=96=B0=E5=A2=9E=E6=97=B6=E7=9A=84?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=98=8E=E7=BB=86=E9=87=8C=E9=9D=A2=E7=9A=84?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=B2=A1=E6=9C=89=E5=88=A0=E9=99=A4=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=EF=BC=8C=E4=B9=9F=E6=B2=A1=E6=9C=89=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE,=E5=BB=BA=E5=B7=A5?=
 =?UTF-8?q?=E5=BA=8F=E6=8A=A5=E4=BA=A7=E7=94=B3=E8=AF=B7=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8D=E5=BA=94=E8=AF=A5=E6=9C=89=E4=B8=8A=E6=AC=A1=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E7=9A=84=E6=98=8E=E7=BB=86=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TableForm/src/TableForm.vue                  | 1 +
 .../processproduction/processproductionRequest/index.vue    | 1 +
 .../productrepair/productrepairRequestMain/index.vue        | 6 +++++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue
index 28db8d9a7..88439dd30 100644
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@@ -551,6 +551,7 @@ const tableSelectionChange = (val) => {
 }
 const handleSelectionDelete = () => {
   emit('tableSelectionDelete', deleteTableData.value)
+  TableBaseComponents_Ref.value.clearSelection()
   nextTick(() => {
     deleteTableData.value.forEach((row) => {
       TableBaseComponents_Ref.value!.toggleRowSelection(row, false)
diff --git a/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue b/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue
index e62b08b73..fe2a491bb 100644
--- a/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue
+++ b/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue
@@ -292,6 +292,7 @@ const handleHandle = async (id: number) => {
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
+  tableData.value = [] // 重置明细数据
   basicFormRef.value.open(type, row)
 }
 
diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
index 5f291b7e7..a6ba77156 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
+++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
@@ -56,6 +56,8 @@
     @searchTableSuccess="searchTableSuccess"
     @submitForm="submitForm"
     @buttonOperationClick="buttonOperationClick"
+    :isShowReduceButtonSelection="true"
+@tableSelectionDelete="tableSelectionDelete"
   />
 
   <!-- 详情 -->
@@ -686,7 +688,9 @@ const tableFormButton = async (val , row) => {
     await getDetailListBom()
   }
 }
-
+const tableSelectionDelete = (selection) => {
+  tableData.value = tableData.value.filter(item => !selection.includes(item))
+}
 /** 初始化 **/
 onMounted(async () => {
   getList()

From 09ccf1e7d323dcec1e1a1c7d079ec2273e96223e Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Fri, 5 Jul 2024 11:58:27 +0800
Subject: [PATCH 154/408] =?UTF-8?q?EAM=20=E2=80=94=E2=80=94>=20=20?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=8F=B0=E8=B4=A6=20=20=E5=8F=B0=E8=B4=A6?=
 =?UTF-8?q?=E9=AA=8C=E6=94=B6=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/eam/equipmentSigning/index.ts         |  6 ++++-
 .../equipmentSigning/equipmentSigning.data.ts | 26 +++++++------------
 src/views/eam/equipmentSigning/index.vue      |  4 +--
 3 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/src/api/eam/equipmentSigning/index.ts b/src/api/eam/equipmentSigning/index.ts
index e9db1653b..b33bcc99f 100644
--- a/src/api/eam/equipmentSigning/index.ts
+++ b/src/api/eam/equipmentSigning/index.ts
@@ -50,6 +50,10 @@ export const getEquipmentSigning = async (id: number) => {
 export const createEquipmentSigning = async (data: EquipmentSigningVO) => {
   return await request.post({ url: `/eam/equipment-signing/create`, data })
 }
+export const createsEquipmentSigning = async (data: EquipmentSigningVO) => {
+  return await request.post({ url: `/eam/equipment-signing/creates`, data })
+}
+
 
 // 修改设备到货签收记录
 export const updateEquipmentSigning = async (data: EquipmentSigningVO) => {
@@ -69,4 +73,4 @@ export const exportEquipmentSigning = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/eam/equipment-signing/get-import-template' })
-}
\ No newline at end of file
+}
diff --git a/src/views/eam/equipmentSigning/equipmentSigning.data.ts b/src/views/eam/equipmentSigning/equipmentSigning.data.ts
index b5d9eb86c..42e679c2b 100644
--- a/src/views/eam/equipmentSigning/equipmentSigning.data.ts
+++ b/src/views/eam/equipmentSigning/equipmentSigning.data.ts
@@ -54,10 +54,15 @@ export const EquipmentSigning = useCrudSchemas(reactive<CrudSchema[]>([
         searchTitle: '设备信息', // 查询弹窗标题
         searchAllSchemas: EquipmentAccounts.allSchemas, // 查询弹窗所需类
         searchPage: EquipmentAccountsApi.getEquipmentAccountsPage, // 查询弹窗所需分页方法
-        searchCondition: [{
+        searchCondition:
+        [{
           key: 'available',
           value: 'TRUE',
           isMainValue: false
+        },{
+          key: 'status',
+          value: 'TOACCEPT',
+          isMainValue: false
         }]
       }
     },
@@ -263,6 +268,7 @@ export const EquipmentSigning = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'storageLocation',
     sort: 'custom',
     isSearch: false,
+    isForm: false,
     form: {
       component: 'Input',
       componentProps: {
@@ -282,28 +288,14 @@ export const EquipmentSigning = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'workshopCode',
     sort: 'custom',
     isSearch: true,
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择车间代码', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '车间信息', // 查询弹窗标题
-        searchAllSchemas: Workshop.allSchemas, // 查询弹窗所需类
-        searchPage: WorkshopApi.getWorkshopPage, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
-      }
-    },
+    isForm: false,
   },
   {
     label: '产线编号',
     field: 'lineCode',
     sort: 'custom',
     isSearch: true,
+    isForm: false,
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
diff --git a/src/views/eam/equipmentSigning/index.vue b/src/views/eam/equipmentSigning/index.vue
index 479a60349..9730f9086 100644
--- a/src/views/eam/equipmentSigning/index.vue
+++ b/src/views/eam/equipmentSigning/index.vue
@@ -45,7 +45,7 @@
     :rules="EquipmentSigningRules"
     :formAllSchemas="EquipmentSigning.allSchemas"
     :apiUpdate="EquipmentSigningApi.updateEquipmentSigning"
-    :apiCreate="EquipmentSigningApi.createEquipmentSigning"
+    :apiCreate="EquipmentSigningApi.createsEquipmentSigning"
     @searchTableSuccess="searchTableSuccess"
     :isBusiness="false"
     @onChange="onChange"
@@ -179,7 +179,7 @@ const formsSuccess = async (formType,data) => {
   if(data.activeTime==0)data.activeTime = null;
   if(data.expireTime==0)data.expireTime = null;
   if (formType === 'create') {
-    await EquipmentSigningApi.createEquipmentSigning(data)
+    await EquipmentSigningApi.createsEquipmentSigning(data)
     message.success(t('common.createSuccess'))
   } else {
     await EquipmentSigningApi.updateEquipmentSigning(data)

From eacec1600209911aec96750125337b4cb680b0ff Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Fri, 5 Jul 2024 13:09:56 +0800
Subject: [PATCH 155/408] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E5=8F=82=E6=95=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts
index 00186c67c..08d9752d6 100644
--- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts
+++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts
@@ -351,7 +351,7 @@ export const SaleShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
         isMainValue: false
       },
       {
-        key: 'customerCode',
+        key: 'customer_code',
         value: 'customerCode',
         isMainValue: true
       }]
@@ -371,7 +371,7 @@ export const SaleShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
           isMainValue: false
         },
         {
-          key: 'customerCode',
+          key: 'customer_code',
           value: 'customerCode',
           isMainValue: true
         }]

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 156/408] =?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 157/408] =?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 158/408] =?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 287ed98f2eaf016934a57635f75ceb533ea51ea6 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Fri, 5 Jul 2024 13:27:32 +0800
Subject: [PATCH 159/408] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E7=94=B3=E8=AF=B7/?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E4=BB=A3=E7=A0=81=E6=96=B0=E5=A2=9E=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E5=B1=95=E7=A4=BA=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../itemManage/itembasic/itembasic.data.ts    |  9 ++
 .../deliverRequestMain.data.ts                |  4 +-
 .../deliverPlanMain/deliverPlanMain.data.ts   | 86 +++++++++++++++++++
 3 files changed, 97 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts
index 8b51c9881..7db799ca6 100644
--- a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts
@@ -465,6 +465,15 @@ export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
     isTable: false
   },
+  {
+    label: '产品类',
+    field: 'prodCla',
+    sort: 'custom',
+    isForm:false,
+    table: {
+      width: 100
+    } ,
+  },
   { label: '备注', field: 'remark', sort: 'custom', isTable: false},
   {
     label: '操作',
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
index 2e481c612..b9c9fbe01 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
@@ -6,7 +6,7 @@ import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
 
 import * as DeliverPlanMainApi from '@/api/wms/deliverPlanMain'
 import * as DeliverPlanDetailApi from '@/api/wms/deliverPlanDetail'
-import { DeliverPlanMain ,DeliverPlanDetail} from '../../deliverplan/deliverPlanMain/deliverPlanMain.data'
+import { DeliverPlanMain ,DeliverPlanDetail,DeliverPlanDetailRequest} from '../../deliverplan/deliverPlanMain/deliverPlanMain.data'
 
 import * as CustomerItemApi from '@/api/wms/customeritem'
 import { Customeritem } from '@/views/wms/basicDataManage/customerManage/customeritem/customeritem.data'
@@ -190,7 +190,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
         searchListPlaceholder: '请选择发货计划单号', // 输入框占位文本
         searchField: 'number', // 查询弹窗赋值字段
         searchTitle: '发货计划信息', // 查询弹窗标题
-        searchAllSchemas: DeliverPlanDetail.allSchemas, // 查询弹窗所需类
+        searchAllSchemas: DeliverPlanDetailRequest.allSchemas, // 查询弹窗所需类
         searchPage: DeliverPlanDetailApi.getDeliverPlanDetailPage, // 查询弹窗所需分页方法
         searchCondition: [{
           key: 'available',
diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
index 753350d31..fac92203b 100644
--- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
@@ -873,3 +873,89 @@ export const DeliverPlanDetailRules = reactive({
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
 })
+
+/**
+ * @returns {Array} 发货计划子表
+ */
+export const DeliverPlanDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+ {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      multiple:true,
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择物料代码',
+      searchField: 'itemCode',
+      searchTitle: '客户物料基础信息',
+      searchAllSchemas: Customeritem.allSchemas,
+      searchPage: CustomerItemApi.getPageBusinessTypeToItemCode,
+    },
+    form: {
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择物料代码',
+        searchField: 'itemCode',
+        searchTitle: '客户物料基础信息',
+        searchAllSchemas: Customeritem.allSchemas,
+        searchPage: CustomerItemApi.getPageBusinessTypeToItemCode,
+      }
+    }
+  },
+  {
+    label: '计划数量',
+    field: 'planQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+      type: 'Select'
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+]))
\ No newline at end of file

From ff1a7a039f36b94cc980305e318a3eeb3f15339a Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Fri, 5 Jul 2024 13:41:41 +0800
Subject: [PATCH 160/408] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0typ?=
 =?UTF-8?q?e=E4=BC=A0=E5=8F=82=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue
index 345042c99..ce5ab9968 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue
@@ -299,7 +299,7 @@ const searchFormClick = (searchData) => {
   const cmd = {
     'column':'type',
     'action':'==',
-    'value':'predict'
+    'value':'scrap'
   }
   searchData.filters.push(cmd)
   tableObject.params = {

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 161/408] =?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 7187d0348eba2e215cb8c77d85ef11506d371287 Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Fri, 5 Jul 2024 13:45:05 +0800
Subject: [PATCH 162/408] =?UTF-8?q?=E9=AB=98=E7=BA=A7=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E6=B2=A1=E4=BC=A0type=E5=8F=82=E6=95=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productreceiptscrapRecordMain/index.vue                 | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue
index 84962d800..e5f369ecc 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue
@@ -208,6 +208,12 @@ const handleExport = async () => {
 
 // 筛选提交
 const searchFormClick = (searchData) => {
+  const cmd = {
+    'column':'type',
+    'action':'==',
+    'value':'scrap'
+  }
+  searchData.filters.push(cmd)
   tableObject.params = {
     isSearch: true,
     filters: searchData.filters

From 592d773f69544168254a3e4166f9fa88d19844bb Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Fri, 5 Jul 2024 13:45:58 +0800
Subject: [PATCH 163/408] =?UTF-8?q?EAM=20=20=E2=80=94=E2=80=94>=20?=
 =?UTF-8?q?=E5=A4=87=E4=BB=B6=E7=AE=A1=E7=90=86=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/disposition/defaultButtons.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts
index edb8b8d7e..7f637131d 100644
--- a/src/utils/disposition/defaultButtons.ts
+++ b/src/utils/disposition/defaultButtons.ts
@@ -1154,7 +1154,7 @@ export function mainCopyBtn(option: any) {
 // 主列表-部件
 export function componentBtn(option: any) {
   return __defaultBtnOption(option, {
-    label: '部件',
+    label: '关联部件',
     name: 'component',
     hide: false,
     type: 'primary',
@@ -1166,7 +1166,7 @@ export function componentBtn(option: any) {
 // 主列表-备件
 export function sparePartBtn(option: any) {
   return __defaultBtnOption(option, {
-    label: '备件',
+    label: '关联备件',
     name: 'sparePart',
     hide: false,
     type: 'primary',

From 3879353b0229401bfd676b8e8f1ca332184d7ac9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com>
Date: Fri, 5 Jul 2024 13:57:36 +0800
Subject: [PATCH 164/408] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/eam/equipmentAccounts/index.vue | 368 ++++++++++++----------
 src/views/eam/toolAccounts/index.vue      | 350 +++++++++++---------
 2 files changed, 413 insertions(+), 305 deletions(-)

diff --git a/src/views/eam/equipmentAccounts/index.vue b/src/views/eam/equipmentAccounts/index.vue
index e17ae39a8..7196e45b5 100644
--- a/src/views/eam/equipmentAccounts/index.vue
+++ b/src/views/eam/equipmentAccounts/index.vue
@@ -1,18 +1,22 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="EquipmentAccounts.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search
+      :schema="EquipmentAccounts.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
   </ContentWrap>
 
-    <!-- 列表头部 -->
-    <TableHead
-      :HeadButttondata="HeadButttondata"
-      @button-base-click="buttonBaseClick"
-      :routeName="routeName"
-      @updataTableColumns="updataTableColumns"
-      @searchFormClick="searchFormClick"
-      :allSchemas="EquipmentAccounts.allSchemas"
-    />
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="EquipmentAccounts.allSchemas"
+  />
 
   <!-- 列表 -->
   <ContentWrap>
@@ -27,13 +31,13 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #code="{row}">
+      <template #code="{ row }">
         <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
           <span>{{ row.code }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase  :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)"/>
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -51,68 +55,105 @@
   />
 
   <!-- 详情 -->
-  <DetailLedger 
-    ref="detailRef" 
-    :isBasic="true" 
-    :allSchemas="EquipmentAccounts.allSchemas" 
-    :subTabs="subTabList" 
-    :operationRecordList="operationRecordList" 
-    @handleOperationTabsChange="handleOperationTabsChange" 
+  <DetailLedger
+    ref="detailRef"
+    :isBasic="true"
+    :allSchemas="EquipmentAccounts.allSchemas"
+    :subTabs="subTabList"
+    :operationRecordList="operationRecordList"
+    @handleOperationTabsChange="handleOperationTabsChange"
     :detailAllSchemas="detailAllSchemas"
     :apiPage="apiPage"
     :dialogApiPage="dialogApiPage"
     :dialogAllSchemas="dialogAllSchemas"
     :dynamicInfoFields="dynamicInfoFields"
     funcCode="device_mould_file"
-    />
+  />
   <!-- 主要部件 -->
   <SearchTable ref="searchTableRef" @searchTableSuccess="submitEquipmentMainPartRelation" />
   <!-- 备件 -->
   <SearchTable ref="searchSparePartTableRef" @searchTableSuccess="submitSparePartRelation" />
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/eam/device/equipment-accounts/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <ImportForm
+    ref="importFormRef"
+    url="/eam/device/equipment-accounts/import"
+    :importTemplateData="importTemplateData"
+    @success="importSuccess"
+  />
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { EquipmentAccounts,EquipmentAccountsRules } from './equipmentAccounts.data'
+import { EquipmentAccounts, EquipmentAccountsRules } from './equipmentAccounts.data'
 import * as EquipmentAccountsApi from '@/api/eam/equipmentAccounts'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import DetailLedger from '@/components/Detail/src/DetailLedger.vue'
-import { RelationMainPart,RelationMainPartRules } from '../relationMainPart/relationMainPart.data'
+import { RelationMainPart, RelationMainPartRules } from '../relationMainPart/relationMainPart.data'
 import * as RelationMainPartApi from '@/api/eam/relationMainPart'
-import { EquipmentMainPart,EquipmentMainPartRules } from '../equipmentMainPart/equipmentMainPart.data'
+import {
+  EquipmentMainPart,
+  EquipmentMainPartRules
+} from '../equipmentMainPart/equipmentMainPart.data'
 import * as EquipmentMainPartApi from '@/api/eam/equipmentMainPart'
-import { SparePart,SparePartRules } from '../sparePart/sparePart.data'
-import * as SparePartApi from '@/api/eam/sparePart'
-import { EquipmentToolSparePart,EquipmentToolSparePartRules } from '../equipmentToolSparePart/equipmentToolSparePart.data'
+import { Item, ItemRules } from '../item/item.data'
+import * as ItemApi from '@/api/eam/item'
+import {
+  EquipmentToolSparePart,
+  EquipmentToolSparePartRules
+} from '../equipmentToolSparePart/equipmentToolSparePart.data'
 import * as EquipmentToolSparePartApi from '@/api/eam/equipmentToolSparePart'
-import { EquipmentReportRepairRequest,EquipmentReportRepairRequestRules } from '../equipmentReportRepairRequest/equipmentReportRepairRequest.data'
+import {
+  EquipmentReportRepairRequest,
+  EquipmentReportRepairRequestRules
+} from '../equipmentReportRepairRequest/equipmentReportRepairRequest.data'
 import * as EquipmentReportRepairRequestApi from '@/api/eam/equipmentReportRepairRequest'
-import { EquipmentSpotCheckRecordMain,EquipmentSpotCheckRecordMainRules } from '../equipmentSpotCheckRecordMain/equipmentSpotCheckRecordMain.data'
+import {
+  EquipmentSpotCheckRecordMain,
+  EquipmentSpotCheckRecordMainRules
+} from '../equipmentSpotCheckRecordMain/equipmentSpotCheckRecordMain.data'
 import * as EquipmentSpotCheckRecordMainApi from '@/api/eam/equipmentSpotCheckRecordMain'
-import { EquipmentSpotCheckRecordDetail,EquipmentSpotCheckRecordDetailRules } from '../equipmentSpotCheckRecordDetail/equipmentSpotCheckRecordDetail.data'
+import {
+  EquipmentSpotCheckRecordDetail,
+  EquipmentSpotCheckRecordDetailRules
+} from '../equipmentSpotCheckRecordDetail/equipmentSpotCheckRecordDetail.data'
 import * as EquipmentSpotCheckRecordDetailApi from '@/api/eam/equipmentSpotCheckRecordDetail'
-import { EquipmentInspectionRecordMain,EquipmentInspectionRecordMainRules } from '../equipmentInspectionRecordMain/equipmentInspectionRecordMain.data'
+import {
+  EquipmentInspectionRecordMain,
+  EquipmentInspectionRecordMainRules
+} from '../equipmentInspectionRecordMain/equipmentInspectionRecordMain.data'
 import * as EquipmentInspectionRecordMainApi from '@/api/eam/equipmentInspectionRecordMain'
-import { EquipmentInspectionRecordDetail,EquipmentInspectionRecordDetailRules } from '../equipmentInspectionRecordDetail/equipmentInspectionRecordDetail.data'
+import {
+  EquipmentInspectionRecordDetail,
+  EquipmentInspectionRecordDetailRules
+} from '../equipmentInspectionRecordDetail/equipmentInspectionRecordDetail.data'
 import * as EquipmentInspectionRecordDetailApi from '@/api/eam/equipmentInspectionRecordDetail'
-import { EquipmentRepairRecordMain,EquipmentRepairRecordMainRules } from '../equipmentRepairRecordMain/equipmentRepairRecordMain.data'
+import {
+  EquipmentRepairRecordMain,
+  EquipmentRepairRecordMainRules
+} from '../equipmentRepairRecordMain/equipmentRepairRecordMain.data'
 import * as EquipmentRepairRecordMainApi from '@/api/eam/equipmentRepairRecordMain'
-import { EquipmentRepairRecordDetail,EquipmentRepairRecordDetailRules } from '../equipmentRepairRecordDetail/equipmentRepairRecordDetail.data'
+import {
+  EquipmentRepairRecordDetail,
+  EquipmentRepairRecordDetailRules
+} from '../equipmentRepairRecordDetail/equipmentRepairRecordDetail.data'
 import * as EquipmentRepairRecordDetailApi from '@/api/eam/equipmentRepairRecordDetail'
-import { EquipmentMaintenanceRecordMain,EquipmentMaintenanceRecordMainRules } from '../equipmentMaintenanceRecordMain/equipmentMaintenanceRecordMain.data'
+import {
+  EquipmentMaintenanceRecordMain,
+  EquipmentMaintenanceRecordMainRules
+} from '../equipmentMaintenanceRecordMain/equipmentMaintenanceRecordMain.data'
 import * as EquipmentMaintenanceRecordMainApi from '@/api/eam/equipmentMaintenanceRecordMain'
-import { EquipmentMaintenanceRecordDetail,EquipmentMaintenanceRecordDetailRules } from '../equipmentMaintenanceRecordDetail/equipmentMaintenanceRecordDetail.data'
+import {
+  EquipmentMaintenanceRecordDetail,
+  EquipmentMaintenanceRecordDetailRules
+} from '../equipmentMaintenanceRecordDetail/equipmentMaintenanceRecordDetail.data'
 import * as EquipmentMaintenanceRecordDetailApi from '@/api/eam/equipmentMaintenanceRecordDetail'
 import * as WorkshopApi from '@/api/wms/workshop'
 import * as ProductionlineApi from '@/api/wms/productionline'
 import * as EquipmentSupplierApi from '@/api/eam/equipmentSupplier'
 import * as EquipmentManufacturerApi from '@/api/eam/equipmentManufacturer'
 
-
 defineOptions({ name: 'EquipmentAccounts' })
 
 const message = useMessage() // 消息弹窗
@@ -123,8 +164,8 @@ const routeName = ref()
 const deviceNumber = ref()
 routeName.value = route.name
 const tableColumns = ref(EquipmentAccounts.allSchemas.tableColumns)
-const tabs = ref<{ label: string; prop: string; }[]>([])
-const subTabList = ref([]);
+const tabs = ref<{ label: string; prop: string }[]>([])
+const subTabList = ref([])
 const detailAllSchemas = ref()
 const apiPage = ref()
 const dialogApiPage = ref()
@@ -134,16 +175,16 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
   nextTick(() => {
     const setV = {}
     setV[formField] = val[0][searchField]
-    if(formField == 'workshopName'){
+    if (formField == 'workshopName') {
       setV['workshopCode'] = val[0]['code']
       setV['workshopName'] = val[0]['name']
-    }else if(formField == 'lineName'){
+    } else if (formField == 'lineName') {
       setV['lineCode'] = val[0]['code']
       setV['lineName'] = val[0]['name']
-    }else if(formField == 'manufactureName'){
+    } else if (formField == 'manufactureName') {
       setV['manufactureCode'] = val[0]['number']
       setV['manufactureName'] = val[0]['name']
-    }else if(formField == 'supplierName'){
+    } else if (formField == 'supplierName') {
       setV['supplierCode'] = val[0]['number']
       setV['supplierName'] = val[0]['name']
     }
@@ -152,24 +193,22 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
 }
 
 const operationRecordList = ref([
-  {label:'报修记录',value:'report'},
-  {label:'维修记录',value:'repair'},
-  {label:'保养记录',value:'maintenance'},
-  {label:'巡检记录',value:'inspection'},
-  {label:'点检记录',value:'spot_check'},
-
+  { label: '报修记录', value: 'report' },
+  { label: '维修记录', value: 'repair' },
+  { label: '保养记录', value: 'maintenance' },
+  { label: '巡检记录', value: 'inspection' },
+  { label: '点检记录', value: 'spot_check' }
 ])
 
-
 const dynamicInfoFields = ref([
-    "totalRunningTime",
-    "maintenanceRunningTime",
-    "usageTimes",
-    "lastInspectionDate",
-    "outageRate",
-    "breakdownRecover",
-    "purchaseInterval"
-]);
+  'totalRunningTime',
+  'maintenanceRunningTime',
+  'usageTimes',
+  'lastInspectionDate',
+  'outageRate',
+  'breakdownRecover',
+  'purchaseInterval'
+])
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -185,12 +224,12 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'eam:equipment-accounts:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'eam:equipment-accounts:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'eam:equipment-accounts:export'}), // 导出
+  defaultButtons.defaultAddBtn({ hasPermi: 'eam:equipment-accounts:create' }), // 新增
+  defaultButtons.defaultImportBtn({ hasPermi: 'eam:equipment-accounts:import' }), // 导入
+  defaultButtons.defaultExportBtn({ hasPermi: 'eam:equipment-accounts:export' }), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
-  defaultButtons.defaultSetBtn(null), // 设置
+  defaultButtons.defaultSetBtn(null) // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',
@@ -203,37 +242,47 @@ const HeadButttondata = [
 
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
-  if (val == 'add') { // 新增
+  if (val == 'add') {
+    // 新增
     openForm('create')
-  } else if (val == 'import') { // 导入
+  } else if (val == 'import') {
+    // 导入
     handleImport()
-  } else if (val == 'export') { // 导出
+  } else if (val == 'export') {
+    // 导出
     handleExport()
-  } else if (val == 'refresh') { // 刷新
+  } else if (val == 'refresh') {
+    // 刷新
     getList()
-  } else if (val == 'filtrate') { // 筛选
-  } else { // 其他按钮
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
     console.log('其他按钮', item)
   }
 }
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'eam:equipment-accounts:update'}), // 编辑
-  defaultButtons.componentBtn({hasPermi:'eam:equipment-accounts:component'}), // 部件
-  defaultButtons.sparePartBtn({hasPermi:'eam:equipment-accounts:item'}), // 备件
+  defaultButtons.mainListEditBtn({ hasPermi: 'eam:equipment-accounts:update' }), // 编辑
+  defaultButtons.componentBtn({ hasPermi: 'eam:equipment-accounts:component' }), // 部件
+  defaultButtons.sparePartBtn({ hasPermi: 'eam:equipment-accounts:item' }) // 备件
   // defaultButtons.mainListDeleteBtn({hasPermi:'eam:equipment-accounts:delete'}), // 删除
 ]
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
-  if (val == 'edit') { // 编辑
+  if (val == 'edit') {
+    // 编辑
     openForm('update', row)
-  } else if (val == 'delete') { // 删除
+  } else if (val == 'delete') {
+    // 删除
     handleDelete(row.id)
-  } else if (val == 'component') { // 部件
+  } else if (val == 'component') {
+    // 部件
     openComponent(row)
-  } else if (val == 'sparePart') { // 备件
+  } else if (val == 'sparePart') {
+    // 备件
     openSparePart(row)
   }
 }
@@ -241,46 +290,37 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = async (type: string, row?: any) => {
-  if(type == 'update'){
-    const equipmentManufacturerNoPage = await EquipmentManufacturerApi.getEquipmentManufacturerNoPage({})
+  if (type == 'update') {
+    const equipmentManufacturerNoPage =
+      await EquipmentManufacturerApi.getEquipmentManufacturerNoPage({})
     const equipmentSupplierNoPage = await EquipmentSupplierApi.getEquipmentSupplierNoPage({})
     const workshopNoPage = await WorkshopApi.getWorkshopNoPage({})
-    const productionlineNoPage = await ProductionlineApi.getProductionlineNoPage({});
-    row.workshopName = workshopNoPage?.find(item=>item.code == row.workshopCode)?.name
-    row.lineName = productionlineNoPage?.find(item=>item.code == row.lineCode)?.name
-    row.manufactureName = equipmentManufacturerNoPage?.find(item=>item.number == row.manufactureCode)?.name
-    row.supplierName = equipmentSupplierNoPage?.find(item=>item.number == row.supplierCode)?.name
-
-    EquipmentAccounts.allSchemas.formSchema.forEach((item) => {
-      if (item.field == 'status') {
-        item.componentProps.disabled = false
-
-      }
-    })
-  }else{
-    EquipmentAccounts.allSchemas.formSchema.forEach((item) => {
-      if (item.field == 'status') {
-        item.componentProps.disabled = true
-        item.value = 'TOACCEPT'
-      }
-    })
+    const productionlineNoPage = await ProductionlineApi.getProductionlineNoPage({})
+    row.workshopName = workshopNoPage?.find((item) => item.code == row.workshopCode)?.name
+    row.lineName = productionlineNoPage?.find((item) => item.code == row.lineCode)?.name
+    row.manufactureName = equipmentManufacturerNoPage?.find(
+      (item) => item.number == row.manufactureCode
+    )?.name
+    row.supplierName = equipmentSupplierNoPage?.find(
+      (item) => item.number == row.supplierCode
+    )?.name
   }
   basicFormRef.value.open(type, row)
 }
 
 // form表单提交
-const formsSuccess = async (formType,data) => {
-  var isHave =EquipmentAccounts.allSchemas.formSchema.some(function (item) {
-    return item.field === 'activeTime' || item.field === 'expireTime';
-  });
-  if(isHave){
-    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+const formsSuccess = async (formType, data) => {
+  var isHave = EquipmentAccounts.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;
+      return
     }
   }
-  if(data.activeTime==0)data.activeTime = null;
-  if(data.expireTime==0)data.expireTime = null;
+  if (data.activeTime == 0) data.activeTime = null
+  if (data.expireTime == 0) data.expireTime = null
   if (formType === 'create') {
     await EquipmentAccountsApi.createEquipmentAccounts(data)
     message.success(t('common.createSuccess'))
@@ -351,45 +391,49 @@ const searchFormClick = (searchData) => {
   getList() // 刷新当前列表
 }
 
-
 const searchTableRef = ref()
 const searchSparePartTableRef = ref()
 const searchTableSelections = ref([])
 const searchTableSparePartSelections = ref([])
 const syncData = async (row) => {
   searchTableSparePartSelections.value = []
-  await RelationMainPartApi.getRelationMainPartNoPage({ equipmentCode: row.code,type: 'DEVICE'  }).then(async (res) => {
-    await EquipmentMainPartApi.getEquipmentMainPartNoPage({type: 'DEVICE' }).then(response => {
-      searchTableSelections.value = response.filter(element => {
-        let flag = false;
-        res.forEach(item => {
+  await RelationMainPartApi.getRelationMainPartNoPage({
+    equipmentCode: row.code,
+    type: 'DEVICE'
+  }).then(async (res) => {
+    await EquipmentMainPartApi.getEquipmentMainPartNoPage({ type: 'DEVICE' }).then((response) => {
+      searchTableSelections.value = response.filter((element) => {
+        let flag = false
+        res.forEach((item) => {
           if (element.code == item.mainPartCode) {
-            flag = true;
+            flag = true
           }
-        });
-        return flag;
-      });
-    });
-  });
-};
+        })
+        return flag
+      })
+    })
+  })
+}
 const syncSparePartData = async (row) => {
   searchTableSparePartSelections.value = []
-  await EquipmentToolSparePartApi.getEquipmentToolSparePartNoPage({ equipmentToolCode: row.code}).then(async (res) => {
-    await SparePartApi.getSparePartNoPage({}).then(response => {
-      searchTableSparePartSelections.value = response.filter(element => {
-        let flag = false;
-        res.forEach(item => {
+  await EquipmentToolSparePartApi.getEquipmentToolSparePartNoPage({
+    equipmentToolCode: row.code
+  }).then(async (res) => {
+    await SparePartApi.getSparePartNoPage({}).then((response) => {
+      searchTableSparePartSelections.value = response.filter((element) => {
+        let flag = false
+        res.forEach((item) => {
           if (element.code == item.sparePartCode) {
-            flag = true;
+            flag = true
           }
-        });
-        return flag;
-      });
-    });
-  });
-};
+        })
+        return flag
+      })
+    })
+  })
+}
 /** 绑定备件操作 */
-const openComponent = async (row : any) => {
+const openComponent = async (row: any) => {
   await syncData(row)
   searchTableRef.value.open(
     '选择部件',
@@ -398,9 +442,9 @@ const openComponent = async (row : any) => {
     'equipmentMainPart',
     EquipmentMainPart.allSchemas.searchSchema,
     true,
-    null,//type
+    null, //type
     row,
-    {type: 'DEVICE'},
+    { type: 'DEVICE' },
     null,
     null,
     null,
@@ -408,16 +452,16 @@ const openComponent = async (row : any) => {
   )
 }
 
-const openSparePart = async (row : any) => {
+const openSparePart = async (row: any) => {
   await syncSparePartData(row)
   searchSparePartTableRef.value.open(
     '选择备件',
-    SparePart.allSchemas,
-    SparePartApi.getSparePartPage,
-    'sparePartPart',
-    SparePart.allSchemas.searchSchema,
+    Item.allSchemas,
+    ItemApi.getItemPage,
+    'item',
+    Item.allSchemas.searchSchema,
     true,
-    null,//type
+    null, //type
     row,
     null,
     null,
@@ -427,37 +471,38 @@ const openSparePart = async (row : any) => {
   )
 }
 
-const submitEquipmentMainPartRelation = (formField, searchField, val, formRef, rowRef) => { 
+const submitEquipmentMainPartRelation = (formField, searchField, val, formRef, rowRef) => {
   const deviceMainPartRelList = val.map((element) => ({
-      mainPartCode: element.code,
-      equipmentCode: rowRef.code,
-      type: 'DEVICE'
-    }))
-  RelationMainPartApi.createRelationMainPartBatch(deviceMainPartRelList).then(res => {
+    mainPartCode: element.number,
+    equipmentCode: rowRef.code,
+    type: 'DEVICE'
+  }))
+  RelationMainPartApi.createRelationMainPartBatch(deviceMainPartRelList).then((res) => {
     message.success(t('common.createSuccess'))
     getList()
   })
 }
 const handleOperationTabsChange = (val) => {
-  if(val == 'report'){
+  if (val == 'report') {
     apiPage.value = EquipmentReportRepairRequestApi.getEquipmentReportRepairRequestPage
     detailAllSchemas.value = EquipmentReportRepairRequest.allSchemas
-  }else if(val == 'repair'){
+  } else if (val == 'repair') {
     apiPage.value = EquipmentRepairRecordMainApi.getEquipmentRepairRecordMainPage
     detailAllSchemas.value = EquipmentRepairRecordMain.allSchemas
     dialogApiPage.value = EquipmentRepairRecordDetailApi.getEquipmentRepairRecordDetailPage
     dialogAllSchemas.value = EquipmentRepairRecordDetail.allSchemas
-  }else if(val == 'maintenance'){
+  } else if (val == 'maintenance') {
     apiPage.value = EquipmentMaintenanceRecordMainApi.getEquipmentMaintenanceRecordMainPage
     detailAllSchemas.value = EquipmentMaintenanceRecordMain.allSchemas
-    dialogApiPage.value = EquipmentMaintenanceRecordDetailApi.getEquipmentMaintenanceRecordDetailPage
+    dialogApiPage.value =
+      EquipmentMaintenanceRecordDetailApi.getEquipmentMaintenanceRecordDetailPage
     dialogAllSchemas.value = EquipmentMaintenanceRecordDetail.allSchemas
-  }else if(val == 'inspection'){
+  } else if (val == 'inspection') {
     apiPage.value = EquipmentInspectionRecordMainApi.getEquipmentInspectionRecordMainPage
     detailAllSchemas.value = EquipmentInspectionRecordMain.allSchemas
     dialogApiPage.value = EquipmentInspectionRecordDetailApi.getEquipmentInspectionRecordDetailPage
     dialogAllSchemas.value = EquipmentInspectionRecordDetail.allSchemas
-  }else if(val == 'spot_check'){
+  } else if (val == 'spot_check') {
     apiPage.value = EquipmentSpotCheckRecordMainApi.getEquipmentSpotCheckRecordMainPage
     detailAllSchemas.value = EquipmentSpotCheckRecordMain.allSchemas
     dialogApiPage.value = EquipmentSpotCheckRecordDetailApi.getEquipmentSpotCheckRecordDetailPage
@@ -465,16 +510,18 @@ const handleOperationTabsChange = (val) => {
   }
 }
 
-const submitSparePartRelation = (formField, searchField, val, formRef, rowRef) => { 
+const submitSparePartRelation = (formField, searchField, val, formRef, rowRef) => {
   const equipmentToolSparePartRelList = val.map((element) => ({
-      sparePartCode: element.code,
-      equipmentToolCode: rowRef.code,
-      type: 'DEVICE'
-    }))
-  EquipmentToolSparePartApi.createEquipmentToolSparePartBatch(equipmentToolSparePartRelList).then(res => {
-    message.success(t('common.createSuccess'))
-    getList()
-  })
+    sparePartCode: element.number,
+    equipmentToolCode: rowRef.code,
+    type: 'DEVICE'
+  }))
+  EquipmentToolSparePartApi.createEquipmentToolSparePartBatch(equipmentToolSparePartRelList).then(
+    (res) => {
+      message.success(t('common.createSuccess'))
+      getList()
+    }
+  )
 }
 
 /** 初始化 **/
@@ -482,5 +529,4 @@ onMounted(async () => {
   getList()
   importTemplateData.templateUrl = await EquipmentAccountsApi.importTemplate()
 })
-
 </script>
diff --git a/src/views/eam/toolAccounts/index.vue b/src/views/eam/toolAccounts/index.vue
index 0442cbfe7..27ebebe3f 100644
--- a/src/views/eam/toolAccounts/index.vue
+++ b/src/views/eam/toolAccounts/index.vue
@@ -1,18 +1,22 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="ToolAccounts.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search
+      :schema="ToolAccounts.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
   </ContentWrap>
 
-    <!-- 列表头部 -->
-    <TableHead
-      :HeadButttondata="HeadButttondata"
-      @button-base-click="buttonBaseClick"
-      :routeName="routeName"
-      @updataTableColumns="updataTableColumns"
-      @searchFormClick="searchFormClick"
-      :allSchemas="ToolAccounts.allSchemas"
-    />
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="ToolAccounts.allSchemas"
+  />
 
   <!-- 列表 -->
   <ContentWrap>
@@ -27,13 +31,13 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #code="{row}">
+      <template #code="{ row }">
         <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
           <span>{{ row.code }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -51,19 +55,19 @@
   />
 
   <!-- 详情 -->
-  <DetailLedger 
-    ref="detailRef" 
-    :isBasic="true" 
+  <DetailLedger
+    ref="detailRef"
+    :isBasic="true"
     :allSchemas="ToolAccounts.allSchemas"
-    :subTabs="subTabList" 
-    :operationRecordList="operationRecordList" 
-    @handleOperationTabsChange="handleOperationTabsChange" 
+    :subTabs="subTabList"
+    :operationRecordList="operationRecordList"
+    @handleOperationTabsChange="handleOperationTabsChange"
     :detailAllSchemas="detailAllSchemas"
     :apiPage="apiPage"
     :dialogApiPage="dialogApiPage"
     :dialogAllSchemas="dialogAllSchemas"
     :dynamicInfoFields="dynamicInfoFields"
-    funcCode="tool_mould_file" 
+    funcCode="tool_mould_file"
   />
 
   <!-- 主要部件 -->
@@ -71,40 +75,75 @@
   <!-- 备件 -->
   <SearchTable ref="searchSparePartTableRef" @searchTableSuccess="submitSparePartRelation" />
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/eam/tool/tool-accounts/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <ImportForm
+    ref="importFormRef"
+    url="/eam/tool/tool-accounts/import"
+    :importTemplateData="importTemplateData"
+    @success="importSuccess"
+  />
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { ToolAccounts,ToolAccountsRules } from './toolAccounts.data'
+import { ToolAccounts, ToolAccountsRules } from './toolAccounts.data'
 import * as ToolAccountsApi from '@/api/eam/toolAccounts'
 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'
 import * as RelationMainPartApi from '@/api/eam/relationMainPart'
-import { EquipmentMainPart,EquipmentMainPartRules } from '../equipmentMainPart/equipmentMainPart.data'
+import {
+  EquipmentMainPart,
+  EquipmentMainPartRules
+} from '../equipmentMainPart/equipmentMainPart.data'
 import * as EquipmentMainPartApi from '@/api/eam/equipmentMainPart'
-import { SparePart,SparePartRules } from '../sparePart/sparePart.data'
-import * as SparePartApi from '@/api/eam/sparePart'
+import { Item, ItemRules } from '../item/item.data'
+import * as ItemApi from '@/api/eam/item'
 import * as EquipmentToolSparePartApi from '@/api/eam/equipmentToolSparePart'
-import { EquipmentReportRepairRequest,EquipmentReportRepairRequestRules } from '../equipmentReportRepairRequest/equipmentReportRepairRequest.data'
+import {
+  EquipmentReportRepairRequest,
+  EquipmentReportRepairRequestRules
+} from '../equipmentReportRepairRequest/equipmentReportRepairRequest.data'
 import * as EquipmentReportRepairRequestApi from '@/api/eam/equipmentReportRepairRequest'
-import { EquipmentSpotCheckRecordMain,EquipmentSpotCheckRecordMainRules } from '../equipmentSpotCheckRecordMain/equipmentSpotCheckRecordMain.data'
+import {
+  EquipmentSpotCheckRecordMain,
+  EquipmentSpotCheckRecordMainRules
+} from '../equipmentSpotCheckRecordMain/equipmentSpotCheckRecordMain.data'
 import * as EquipmentSpotCheckRecordMainApi from '@/api/eam/equipmentSpotCheckRecordMain'
-import { EquipmentSpotCheckRecordDetail,EquipmentSpotCheckRecordDetailRules } from '../equipmentSpotCheckRecordDetail/equipmentSpotCheckRecordDetail.data'
+import {
+  EquipmentSpotCheckRecordDetail,
+  EquipmentSpotCheckRecordDetailRules
+} from '../equipmentSpotCheckRecordDetail/equipmentSpotCheckRecordDetail.data'
 import * as EquipmentSpotCheckRecordDetailApi from '@/api/eam/equipmentSpotCheckRecordDetail'
-import { EquipmentInspectionRecordMain,EquipmentInspectionRecordMainRules } from '../equipmentInspectionRecordMain/equipmentInspectionRecordMain.data'
+import {
+  EquipmentInspectionRecordMain,
+  EquipmentInspectionRecordMainRules
+} from '../equipmentInspectionRecordMain/equipmentInspectionRecordMain.data'
 import * as EquipmentInspectionRecordMainApi from '@/api/eam/equipmentInspectionRecordMain'
-import { EquipmentInspectionRecordDetail,EquipmentInspectionRecordDetailRules } from '../equipmentInspectionRecordDetail/equipmentInspectionRecordDetail.data'
+import {
+  EquipmentInspectionRecordDetail,
+  EquipmentInspectionRecordDetailRules
+} from '../equipmentInspectionRecordDetail/equipmentInspectionRecordDetail.data'
 import * as EquipmentInspectionRecordDetailApi from '@/api/eam/equipmentInspectionRecordDetail'
-import { EquipmentRepairRecordMain,EquipmentRepairRecordMainRules } from '../equipmentRepairRecordMain/equipmentRepairRecordMain.data'
+import {
+  EquipmentRepairRecordMain,
+  EquipmentRepairRecordMainRules
+} from '../equipmentRepairRecordMain/equipmentRepairRecordMain.data'
 import * as EquipmentRepairRecordMainApi from '@/api/eam/equipmentRepairRecordMain'
-import { EquipmentRepairRecordDetail,EquipmentRepairRecordDetailRules } from '../equipmentRepairRecordDetail/equipmentRepairRecordDetail.data'
+import {
+  EquipmentRepairRecordDetail,
+  EquipmentRepairRecordDetailRules
+} from '../equipmentRepairRecordDetail/equipmentRepairRecordDetail.data'
 import * as EquipmentRepairRecordDetailApi from '@/api/eam/equipmentRepairRecordDetail'
-import { EquipmentMaintenanceRecordMain,EquipmentMaintenanceRecordMainRules } from '../equipmentMaintenanceRecordMain/equipmentMaintenanceRecordMain.data'
+import {
+  EquipmentMaintenanceRecordMain,
+  EquipmentMaintenanceRecordMainRules
+} from '../equipmentMaintenanceRecordMain/equipmentMaintenanceRecordMain.data'
 import * as EquipmentMaintenanceRecordMainApi from '@/api/eam/equipmentMaintenanceRecordMain'
-import { EquipmentMaintenanceRecordDetail,EquipmentMaintenanceRecordDetailRules } from '../equipmentMaintenanceRecordDetail/equipmentMaintenanceRecordDetail.data'
+import {
+  EquipmentMaintenanceRecordDetail,
+  EquipmentMaintenanceRecordDetailRules
+} from '../equipmentMaintenanceRecordDetail/equipmentMaintenanceRecordDetail.data'
 import * as EquipmentMaintenanceRecordDetailApi from '@/api/eam/equipmentMaintenanceRecordDetail'
 import * as WorkshopApi from '@/api/wms/workshop'
 import * as ProductionlineApi from '@/api/wms/productionline'
@@ -120,18 +159,18 @@ const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref(ToolAccounts.allSchemas.tableColumns)
-const tabs = ref<{ label: string; prop: string; }[]>([])
-const subTabList = ref([]);
+const tabs = ref<{ label: string; prop: string }[]>([])
+const subTabList = ref([])
 const detailAllSchemas = ref()
 const apiPage = ref()
 const dialogApiPage = ref()
 const dialogAllSchemas = ref()
 const operationRecordList = ref([
-  {label:'报修记录',value:'report'},
-  {label:'维修记录',value:'repair'},
-  {label:'保养记录',value:'maintenance'},
-  {label:'巡检记录',value:'inspection'},
-  {label:'点检记录',value:'spot_check'},
+  { label: '报修记录', value: 'report' },
+  { label: '维修记录', value: 'repair' },
+  { label: '保养记录', value: 'maintenance' },
+  { label: '巡检记录', value: 'inspection' },
+  { label: '点检记录', value: 'spot_check' }
 ])
 
 // 查询页面返回
@@ -139,16 +178,16 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
   nextTick(() => {
     const setV = {}
     setV[formField] = val[0][searchField]
-    if(formField == 'workshopName'){
+    if (formField == 'workshopName') {
       setV['workshopCode'] = val[0]['code']
       setV['workshopName'] = val[0]['name']
-    }else if(formField == 'lineName'){
+    } else if (formField == 'lineName') {
       setV['lineCode'] = val[0]['code']
       setV['lineName'] = val[0]['name']
-    }else if(formField == 'manufactureName'){
+    } else if (formField == 'manufactureName') {
       setV['manufactureCode'] = val[0]['number']
       setV['manufactureName'] = val[0]['name']
-    }else if(formField == 'supplierName'){
+    } else if (formField == 'supplierName') {
       setV['supplierCode'] = val[0]['number']
       setV['supplierName'] = val[0]['name']
     }
@@ -170,12 +209,12 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'eam:tool-accounts:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'eam:tool-accounts:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'eam:tool-accounts:export'}), // 导出
+  defaultButtons.defaultAddBtn({ hasPermi: 'eam:tool-accounts:create' }), // 新增
+  defaultButtons.defaultImportBtn({ hasPermi: 'eam:tool-accounts:import' }), // 导入
+  defaultButtons.defaultExportBtn({ hasPermi: 'eam:tool-accounts:export' }), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
-  defaultButtons.defaultSetBtn(null), // 设置
+  defaultButtons.defaultSetBtn(null) // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',
@@ -188,37 +227,47 @@ const HeadButttondata = [
 
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
-  if (val == 'add') { // 新增
+  if (val == 'add') {
+    // 新增
     openForm('create')
-  } else if (val == 'import') { // 导入
+  } else if (val == 'import') {
+    // 导入
     handleImport()
-  } else if (val == 'export') { // 导出
+  } else if (val == 'export') {
+    // 导出
     handleExport()
-  } else if (val == 'refresh') { // 刷新
+  } else if (val == 'refresh') {
+    // 刷新
     getList()
-  } else if (val == 'filtrate') { // 筛选
-  } else { // 其他按钮
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
     console.log('其他按钮', item)
   }
 }
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'eam:tool-accounts:update'}), // 编辑
-  defaultButtons.componentBtn({hasPermi:'eam:tool-accounts:component'}), // 部件
-  defaultButtons.sparePartBtn({hasPermi:'eam:tool-accounts:item'}), // 备件
+  defaultButtons.mainListEditBtn({ hasPermi: 'eam:tool-accounts:update' }), // 编辑
+  defaultButtons.componentBtn({ hasPermi: 'eam:tool-accounts:component' }), // 部件
+  defaultButtons.sparePartBtn({ hasPermi: 'eam:tool-accounts:item' }) // 备件
   // defaultButtons.mainListDeleteBtn({hasPermi:'eam:tool-accounts:delete'}), // 删除
 ]
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
-  if (val == 'edit') { // 编辑
+  if (val == 'edit') {
+    // 编辑
     openForm('update', row)
-  } else if (val == 'delete') { // 删除
+  } else if (val == 'delete') {
+    // 删除
     handleDelete(row.id)
-  } else if (val == 'component') { // 部件
+  } else if (val == 'component') {
+    // 部件
     openComponent(row)
-  } else if (val == 'sparePart') { // 备件
+  } else if (val == 'sparePart') {
+    // 备件
     openSparePart(row)
   }
 }
@@ -226,32 +275,37 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = async (type: string, row?: any) => {
-  if(type == 'update'){
-    const equipmentManufacturerNoPage = await EquipmentManufacturerApi.getEquipmentManufacturerNoPage({})
+  if (type == 'update') {
+    const equipmentManufacturerNoPage =
+      await EquipmentManufacturerApi.getEquipmentManufacturerNoPage({})
     const equipmentSupplierNoPage = await EquipmentSupplierApi.getEquipmentSupplierNoPage({})
     const workshopNoPage = await WorkshopApi.getWorkshopNoPage({})
-    const productionlineNoPage = await ProductionlineApi.getProductionlineNoPage({});
-    row.workshopName = workshopNoPage?.find(item=>item.code == row.workshopCode)?.name
-    row.lineName = productionlineNoPage?.find(item=>item.code == row.lineCode)?.name
-    row.manufactureName = equipmentManufacturerNoPage?.find(item=>item.number == row.manufactureCode)?.name
-    row.supplierName = equipmentSupplierNoPage?.find(item=>item.number == row.supplierCode)?.name
+    const productionlineNoPage = await ProductionlineApi.getProductionlineNoPage({})
+    row.workshopName = workshopNoPage?.find((item) => item.code == row.workshopCode)?.name
+    row.lineName = productionlineNoPage?.find((item) => item.code == row.lineCode)?.name
+    row.manufactureName = equipmentManufacturerNoPage?.find(
+      (item) => item.number == row.manufactureCode
+    )?.name
+    row.supplierName = equipmentSupplierNoPage?.find(
+      (item) => item.number == row.supplierCode
+    )?.name
   }
   basicFormRef.value.open(type, row)
 }
 
 // form表单提交
-const formsSuccess = async (formType,data) => {
-  var isHave =ToolAccounts.allSchemas.formSchema.some(function (item) {
-    return item.field === 'activeTime' || item.field === 'expireTime';
-  });
-  if(isHave){
-    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+const formsSuccess = async (formType, data) => {
+  var isHave = ToolAccounts.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;
+      return
     }
   }
-  if(data.activeTime==0)data.activeTime = null;
-  if(data.expireTime==0)data.expireTime = null;
+  if (data.activeTime == 0) data.activeTime = null
+  if (data.expireTime == 0) data.expireTime = null
   if (formType === 'create') {
     await ToolAccountsApi.createToolAccounts(data)
     message.success(t('common.createSuccess'))
@@ -266,14 +320,14 @@ const formsSuccess = async (formType,data) => {
 /** 详情操作 */
 const detailRef = ref()
 const dynamicInfoFields = ref([
-    "totalRunningTime",
-    "maintenanceRunningTime",
-    "usageTimes",
-    "lastInspectionDate",
-    "outageRate",
-    "breakdownRecover",
-    "purchaseInterval"
-]);
+  'totalRunningTime',
+  'maintenanceRunningTime',
+  'usageTimes',
+  'lastInspectionDate',
+  'outageRate',
+  'breakdownRecover',
+  'purchaseInterval'
+])
 
 const openDetail = (row: any, titleName: any, titleValue: any) => {
   detailRef.value.openDetail(row, titleName, titleValue, 'basicToolAccounts')
@@ -332,27 +386,27 @@ const searchFormClick = (searchData) => {
   getList() // 刷新当前列表
 }
 
-
 const handleOperationTabsChange = (val) => {
-  if(val == 'report'){
+  if (val == 'report') {
     apiPage.value = EquipmentReportRepairRequestApi.getEquipmentReportRepairRequestPage
     detailAllSchemas.value = EquipmentReportRepairRequest.allSchemas
-  }else if(val == 'repair'){
+  } else if (val == 'repair') {
     apiPage.value = EquipmentRepairRecordMainApi.getEquipmentRepairRecordMainPage
     detailAllSchemas.value = EquipmentRepairRecordMain.allSchemas
     dialogApiPage.value = EquipmentRepairRecordDetailApi.getEquipmentRepairRecordDetailPage
     dialogAllSchemas.value = EquipmentRepairRecordDetail.allSchemas
-  }else if(val == 'maintenance'){
+  } else if (val == 'maintenance') {
     apiPage.value = EquipmentMaintenanceRecordMainApi.getEquipmentMaintenanceRecordMainPage
     detailAllSchemas.value = EquipmentMaintenanceRecordMain.allSchemas
-    dialogApiPage.value = EquipmentMaintenanceRecordDetailApi.getEquipmentMaintenanceRecordDetailPage
+    dialogApiPage.value =
+      EquipmentMaintenanceRecordDetailApi.getEquipmentMaintenanceRecordDetailPage
     dialogAllSchemas.value = EquipmentMaintenanceRecordDetail.allSchemas
-  }else if(val == 'inspection'){
+  } else if (val == 'inspection') {
     apiPage.value = EquipmentInspectionRecordMainApi.getEquipmentInspectionRecordMainPage
     detailAllSchemas.value = EquipmentInspectionRecordMain.allSchemas
     dialogApiPage.value = EquipmentInspectionRecordDetailApi.getEquipmentInspectionRecordDetailPage
     dialogAllSchemas.value = EquipmentInspectionRecordDetail.allSchemas
-  }else if(val == 'spot_check'){
+  } else if (val == 'spot_check') {
     apiPage.value = EquipmentSpotCheckRecordMainApi.getEquipmentSpotCheckRecordMainPage
     detailAllSchemas.value = EquipmentSpotCheckRecordMain.allSchemas
     dialogApiPage.value = EquipmentSpotCheckRecordDetailApi.getEquipmentSpotCheckRecordDetailPage
@@ -366,38 +420,45 @@ const searchTableSelections = ref([])
 const searchTableSparePartSelections = ref([])
 const syncData = async (row) => {
   searchTableSparePartSelections.value = []
-  await RelationMainPartApi.getRelationMainPartNoPage({ equipmentCode: row.code,type: 'EQUIPMENT' }).then(async (res) => {
-    await EquipmentMainPartApi.getEquipmentMainPartNoPage({type: 'EQUIPMENT'}).then(response => {
-      searchTableSelections.value = response.filter(element => {
-        let flag = false;
-        res.forEach(item => {
-          if (element.code == item.mainPartCode) {
-            flag = true;
-          }
-        });
-        return flag;
-      });
-    });
-  });
-};
+  await RelationMainPartApi.getRelationMainPartNoPage({
+    equipmentCode: row.code,
+    type: 'EQUIPMENT'
+  }).then(async (res) => {
+    await EquipmentMainPartApi.getEquipmentMainPartNoPage({ type: 'EQUIPMENT' }).then(
+      (response) => {
+        searchTableSelections.value = response.filter((element) => {
+          let flag = false
+          res.forEach((item) => {
+            if (element.code == item.mainPartCode) {
+              flag = true
+            }
+          })
+          return flag
+        })
+      }
+    )
+  })
+}
 const syncSparePartData = async (row) => {
   searchTableSparePartSelections.value = []
-  await EquipmentToolSparePartApi.getEquipmentToolSparePartNoPage({ equipmentToolCode: row.code}).then(async (res) => {
-    await SparePartApi.getSparePartNoPage({}).then(response => {
-      searchTableSparePartSelections.value = response.filter(element => {
-        let flag = false;
-        res.forEach(item => {
-          if (element.code == item.sparePartCode) {
-            flag = true;
+  await EquipmentToolSparePartApi.getEquipmentToolSparePartNoPage({
+    equipmentToolCode: row.code
+  }).then(async (res) => {
+    await ItemApi.getItemNoPage({}).then((response) => {
+      searchTableSparePartSelections.value = response.filter((element) => {
+        let flag = false
+        res.forEach((item) => {
+          if (element.number == item.sparePartCode) {
+            flag = true
           }
-        });
-        return flag;
-      });
-    });
-  });
-};
+        })
+        return flag
+      })
+    })
+  })
+}
 /** 绑定备件操作 */
-const openComponent = async (row : any) => {
+const openComponent = async (row: any) => {
   await syncData(row)
   searchTableRef.value.open(
     '选择部件',
@@ -406,9 +467,9 @@ const openComponent = async (row : any) => {
     'equipmentMainPart',
     EquipmentMainPart.allSchemas.searchSchema,
     true,
-    null,//type
+    null, //type
     row,
-    {type: 'EQUIPMENT'},
+    { type: 'EQUIPMENT' },
     null,
     null,
     null,
@@ -416,16 +477,16 @@ const openComponent = async (row : any) => {
   )
 }
 
-const openSparePart = async (row : any) => {
+const openSparePart = async (row: any) => {
   await syncSparePartData(row)
   searchSparePartTableRef.value.open(
     '选择备件',
-    SparePart.allSchemas,
-    SparePartApi.getSparePartPage,
-    'sparePartPart',
-    SparePart.allSchemas.searchSchema,
+    Item.allSchemas,
+    ItemApi.getItemPage,
+    'item',
+    Item.allSchemas.searchSchema,
     true,
-    null,//type
+    null, //type
     row,
     null,
     null,
@@ -435,33 +496,34 @@ const openSparePart = async (row : any) => {
   )
 }
 
-const submitEquipmentMainPartRelation = (formField, searchField, val, formRef, rowRef) => { 
+const submitEquipmentMainPartRelation = (formField, searchField, val, formRef, rowRef) => {
   const deviceMainPartRelList = val.map((element) => ({
-      mainPartCode: element.code,
-      equipmentCode: rowRef.code,
-      type: 'EQUIPMENT'
-    }))
-  RelationMainPartApi.createRelationMainPartBatch(deviceMainPartRelList).then(res => {
+    mainPartCode: element.number,
+    equipmentCode: rowRef.code,
+    type: 'EQUIPMENT'
+  }))
+  RelationMainPartApi.createRelationMainPartBatch(deviceMainPartRelList).then((res) => {
     message.success(t('common.createSuccess'))
     getList()
   })
 }
 
-const submitSparePartRelation = (formField, searchField, val, formRef, rowRef) => { 
+const submitSparePartRelation = (formField, searchField, val, formRef, rowRef) => {
   const equipmentToolSparePartRelList = val.map((element) => ({
-      sparePartCode: element.code,
-      equipmentToolCode: rowRef.code,
-      type: 'EQUIPMENT'
-    }))
-  EquipmentToolSparePartApi.createEquipmentToolSparePartBatch(equipmentToolSparePartRelList).then(res => {
-    message.success(t('common.createSuccess'))
-    getList()
-  })
+    sparePartCode: element.number,
+    equipmentToolCode: rowRef.code,
+    type: 'EQUIPMENT'
+  }))
+  EquipmentToolSparePartApi.createEquipmentToolSparePartBatch(equipmentToolSparePartRelList).then(
+    (res) => {
+      message.success(t('common.createSuccess'))
+      getList()
+    }
+  )
 }
 /** 初始化 **/
 onMounted(async () => {
   getList()
   importTemplateData.templateUrl = await ToolAccountsApi.importTemplate()
 })
-
 </script>

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 165/408] =?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 7c56de3a2c9917375ef1d8926369609c1914df81 Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Fri, 5 Jul 2024 14:04:54 +0800
Subject: [PATCH 166/408] =?UTF-8?q?=E5=88=B6=E5=93=81=E4=B8=8A=E6=9E=B6?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E3=80=81=E9=AB=98=E7=BA=A7=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E6=B2=A1=E4=BC=A0type=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productputaway/productputawayJobMain/index.vue        | 8 +++++++-
 .../productputaway/productputawayRecordMain/index.vue     | 6 ++++++
 .../productputaway/productputawayRequestMain/index.vue    | 6 ++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
index b8f15698c..83e25ee9b 100644
--- a/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
+++ b/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
@@ -129,7 +129,7 @@ const getSwitchStatus = async ()=>{
   console.log('getSwitchStatus',res)
   if(res&&res.list){
     switchproductPutawayJobPrint.value = res.list[0].effectiveSetValue == 'TRUE'
-    
+
   }
 }
 // 列表头部按钮
@@ -255,6 +255,12 @@ const handleExport = async () => {
 
 // 筛选提交
 const searchFormClick = (searchData) => {
+  const cmd = {
+    'column':'type',
+    'action':'==',
+    'value':'predict'
+  }
+  searchData.filters.push(cmd)
   tableObject.params = {
     isSearch: true,
     filters: searchData.filters
diff --git a/src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue
index bbe6e11a9..9778c239b 100644
--- a/src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue
+++ b/src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue
@@ -165,6 +165,12 @@ const handleExport = async () => {
 
 // 筛选提交
 const searchFormClick = (searchData) => {
+  const cmd = {
+    'column':'type',
+    'action':'==',
+    'value':'predict'
+  }
+  searchData.filters.push(cmd)
   tableObject.params = {
     isSearch: true,
     filters: searchData.filters
diff --git a/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue
index aa88d864f..9cfa44045 100644
--- a/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue
+++ b/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue
@@ -421,6 +421,12 @@ const importSuccess = () => {
 
 // 筛选提交
 const searchFormClick = (searchData) => {
+  const cmd = {
+    'column':'type',
+    'action':'==',
+    'value':'predict'
+  }
+  searchData.filters.push(cmd)
   tableObject.params = {
     isSearch: true,
     filters: searchData.filters

From d72fbd5e0ce714814b8de138e457969288350d53 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 5 Jul 2024 14:09:45 +0800
Subject: [PATCH 167/408] =?UTF-8?q?=E8=A1=A5=E6=96=99=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=93=8D=E4=BD=9C?=
 =?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    |   4 +-
 .../repleinsh/repleinshRequestMain/index.vue  |  17 ++-
 .../repleinshRequestMain.data.ts              | 131 +++++++++---------
 3 files changed, 84 insertions(+), 68 deletions(-)

diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue
index 88439dd30..af8cab620 100644
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@@ -406,7 +406,9 @@
           routeName == 'DeliverPlanMain' ||
           routeName == 'DeliverRequestMain' ||
           routeName == 'ZZBJDeliverRequestMain' ||
-          routeName == 'UnplannedreceiptRequestMain'
+          routeName == 'UnplannedreceiptRequestMain'||
+          routeName == 'RepleinshRequestMain'
+          
         "
       >
         <el-input v-model="keyWord" style="width: 240px" placeholder="回车自动添加" />
diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
index b71d95777..a687f0e42 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
+++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
@@ -51,6 +51,8 @@
     :apiUpdate="RepleinshRequestMainApi.updateRepleinshRequestMain"
     :apiCreate="RepleinshRequestMainApi.createRepleinshRequestMain"
     :isBusiness="true"
+    :isOpenSearchTable="true"
+    fieldTableColumn="itemCode"
     @handleAddTable="handleAddTable"
     @handleDeleteTable="handleDeleteTable"
     :isShowReduceButtonSelection="true"
@@ -108,8 +110,16 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
     if (type == 'tableForm') {
       // 明细查询页赋值
       if (formField == 'itemCode') {
-        row['itemCode'] = val[0]['code']
-        row['uom'] = val[0]['uom']
+        // row['itemCode'] = val[0]['code']
+        // row['uom'] = val[0]['uom']
+        val.forEach(item=>{
+          if(tableData.value.find(item1=>item1['itemCode'] == item['itemCode'])) return
+          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+          newRow['itemCode'] = item['code']
+          newRow['uom'] = item['uom']
+          newRow['id'] = item['id']
+          tableData.value.push(newRow)
+        })
       } else {
         row[formField] = val[0][searchField]
       }
@@ -366,6 +376,9 @@ const submitForm = async (formType, submitData) => {
   if(data.masterId){
     data.id = data.masterId
   }
+  tableData.value.forEach(item=>{
+          item.toLocationCode = data.toLocationCode
+        })
   data.subList = tableData.value // 拼接子表数据参数
   if(tableData.value.find(item => (item.qty <= 0))) {
     message.warning('数量必须大于0')
diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
index 80e5d6536..006c658d2 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
@@ -208,44 +208,86 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: false,
   },
   {
-    label: '从仓库代码',
-    field: 'fromWarehouseCode',
+    label: '到库位代码',
+    field: 'toLocationCode',
     sort: 'custom',
     table: {
       width: 150
     },
-    isTable: false,
+    hiddenInMain:true,
+    sortSearchDefault:1000,
+    isSearch: true,
+    sortTableDefault:1100,
+    // isTableForm: false,
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+        searchListPlaceholder: '请选择到库位代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '仓库信息', // 查询弹窗标题
-        searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
-        searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
-        searchCondition: [{
+        searchTitle: '库位信息', // 查询弹窗标题
+        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+        searchPage: LocationApi.getLocationPageRepleinsh, // 查询弹窗所需分页方法
+        searchCondition:[{
           key: 'available',
           value: 'TRUE',
           isMainValue: false
         }]
       }
-    }
-  },
-  {
-    label: '到仓库代码',
-    field: 'toWarehouseCode',
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    isTable: false,
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择到库位代码', // 输入框占位文本
+      searchField: 'code', // 查询弹窗赋值字段
+      searchTitle: '库位信息', // 查询弹窗标题
+      searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+      searchPage: LocationApi.getLocationPageRepleinsh, // 查询弹窗所需分页方法
+      searchCondition:[{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
   },
+  // {
+  //   label: '从仓库代码',
+  //   field: 'fromWarehouseCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTable: false,
+  //   form: {
+  //     // labelMessage: '信息提示说明！！！',
+  //     componentProps: {
+  //       isSearchList: true, // 开启查询弹窗
+  //       searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+  //       searchField: 'code', // 查询弹窗赋值字段
+  //       searchTitle: '仓库信息', // 查询弹窗标题
+  //       searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
+  //       searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
+  //       searchCondition: [{
+  //         key: 'available',
+  //         value: 'TRUE',
+  //         isMainValue: false
+  //       }]
+  //     }
+  //   }
+  // },
+  // {
+  //   label: '到仓库代码',
+  //   field: 'toWarehouseCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTable: false,
+  //   form: {
+  //     componentProps: {
+  //       disabled: true
+  //     }
+  //   }
+  // },
   {
     label: '自动提交',
     field: 'autoCommit',
@@ -498,8 +540,8 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     tableForm:{
-      enterSearch:true,
       isInpuFocusShow: true,
+      multiple:true,
       searchListPlaceholder: '请选择物料代码', // 输入框占位文本
       searchField: 'code', // 查询弹窗赋值字段
       searchTitle: '物料基础信息', // 查询弹窗标题
@@ -587,48 +629,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '到库位代码',
-    field: 'toLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    sortSearchDefault:1000,
-    isSearch: true,
-    sortTableDefault:1100,
-    // isTableForm: false,
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择到库位代码', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '库位信息', // 查询弹窗标题
-        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
-        searchPage: LocationApi.getLocationPageRepleinsh, // 查询弹窗所需分页方法
-        searchCondition:[{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
-      }
-    },
-    tableForm:{
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择到库位代码', // 输入框占位文本
-      searchField: 'code', // 查询弹窗赋值字段
-      searchTitle: '库位信息', // 查询弹窗标题
-      searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
-      searchPage: LocationApi.getLocationPageRepleinsh, // 查询弹窗所需分页方法
-      searchCondition:[{
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
-      }]
-    },
-  },
+ 
   // {
   //   label: '包装号',
   //   field: 'packingNumber',

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 168/408] =?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 dc669936d6c2865bae6268a14aa80de87874e624 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 5 Jul 2024 14:22:26 +0800
Subject: [PATCH 169/408] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=B4=A8=E9=87=8F?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E9=99=90=E5=88=B6=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliverInspectionDetail.data.ts                  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts
index 02ea8131c..3a5bb522d 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts
@@ -3,7 +3,7 @@ import { dateFormatter } from '@/utils/formatTime'
 
 export const SupplierdeliverInspectionDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '上传质检报告',
+    label: '上传质量报告',
     field: 'uploadFile',
     sort: 'custom',
     isTable:false,
@@ -16,7 +16,8 @@ export const SupplierdeliverInspectionDetail = useCrudSchemas(reactive<CrudSchem
           tableName: 'SupplierdeliverInspectionDetail',
         },
         fileType:['pdf','png','jpg','jpeg'],
-        fileSize:100
+        fileSize:100,
+        limit:20000
       }
     },
   },

From fb5c6e414063a4054227b21c141350d0fbd8b6f9 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 5 Jul 2024 14:27:35 +0800
Subject: [PATCH 170/408] =?UTF-8?q?=E8=A1=A5=E6=96=99=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E4=B8=AD=E5=BA=94=E8=AF=A5=E5=8E=BB=E6=8E=89=E4=BB=8E=E6=89=B9?=
 =?UTF-8?q?=E6=AC=A1=EF=BC=8C=E5=88=B0=E6=89=B9=E6=AC=A1=EF=BC=8C=E4=BB=8E?=
 =?UTF-8?q?=E5=8C=85=E8=A3=85=E5=8F=B7=EF=BC=8C=E5=88=B0=E5=8C=85=E8=A3=85?=
 =?UTF-8?q?=E5=8F=B7=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repleinshRecordMain.data.ts                    | 14 ++++++++++----
 .../repleinsh/repleinshRequestMain/index.vue       |  4 ++--
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts
index 4bf9a8d6e..471a5f41b 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts
@@ -429,7 +429,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isSearch: true,
+    isSearch: false,
     hiddenInMain: true
   },
   {
@@ -439,7 +439,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isSearch: true,
+    isSearch: false,
     hiddenInMain: true
   },
   {
@@ -480,7 +480,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     sortSearchDefault:3,
-    isSearch: true,
+    isSearch: false,
     hiddenInMain: true
   },
   {
@@ -491,7 +491,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     sortSearchDefault:4,
-    isSearch: true,
+    isSearch: false,
     hiddenInMain: true
   },
   {
@@ -512,6 +512,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
     hiddenInMain:true,
     sortTableDefault:2,
   },
@@ -522,6 +523,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
     hiddenInMain:true,
     sortTableDefault:3,
   },
@@ -529,6 +531,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '从货主代码',
     field: 'fromOwnerCode',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -690,6 +693,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
     hiddenInMain:true,
   },
   {
@@ -740,6 +744,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
     hiddenInMain:true,
 
   },
@@ -750,6 +755,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
     hiddenInMain:true,
 
   },
diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
index a687f0e42..74040ff72 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
+++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
@@ -377,8 +377,8 @@ const submitForm = async (formType, submitData) => {
     data.id = data.masterId
   }
   tableData.value.forEach(item=>{
-          item.toLocationCode = data.toLocationCode
-        })
+    item.toLocationCode = data.toLocationCode
+  })
   data.subList = tableData.value // 拼接子表数据参数
   if(tableData.value.find(item => (item.qty <= 0))) {
     message.warning('数量必须大于0')

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 171/408] =?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 172/408] =?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 173/408] =?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 174/408] =?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 dfe78de358633b1c79b3f0639796041779d289bc Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Fri, 5 Jul 2024 16:07:34 +0800
Subject: [PATCH 175/408] =?UTF-8?q?EAM=20=E2=80=94=E2=80=94>=20=20?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=8F=B0=E8=B4=A6=20=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=AD=A3=E5=B8=B8/=E5=81=9C=E5=BD=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/eam/equipmentAccounts/index.ts        |   8 +-
 .../equipmentAccounts.data.ts                 |   2 +-
 src/views/eam/equipmentAccounts/index.vue     | 412 +++++++++---------
 3 files changed, 210 insertions(+), 212 deletions(-)

diff --git a/src/api/eam/equipmentAccounts/index.ts b/src/api/eam/equipmentAccounts/index.ts
index d1e9e401a..6f76580dc 100644
--- a/src/api/eam/equipmentAccounts/index.ts
+++ b/src/api/eam/equipmentAccounts/index.ts
@@ -15,6 +15,7 @@ export interface EquipmentAccountsVO {
   principal: string
   principalTelephone: string
   status: string
+  changeReason: string
   startDate: Date
   supplierCode: string
   purchaseTime: Date
@@ -81,4 +82,9 @@ export const importTemplate = () => {
 // 查询设备台账列表
 export const getEquipmentAccountsNoPage = async (params) => {
   return await request.get({ url: `/eam/device/equipment-accounts/noPage`, params })
-}
\ No newline at end of file
+}
+
+//停用启用
+export const ableEquipmentAccountsMain = async (data: EquipmentAccountsVO) => {
+  return await request.post({ url: `/eam/device/equipment-accounts/ables`, data })
+}
diff --git a/src/views/eam/equipmentAccounts/equipmentAccounts.data.ts b/src/views/eam/equipmentAccounts/equipmentAccounts.data.ts
index 2c9115f5e..f22e6e5dc 100644
--- a/src/views/eam/equipmentAccounts/equipmentAccounts.data.ts
+++ b/src/views/eam/equipmentAccounts/equipmentAccounts.data.ts
@@ -631,7 +631,7 @@ export const EquipmentAccounts = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'action',
     isForm: false,
     table: {
-      width: 200,
+      width: 250,
       fixed: 'right'
     }
   }
diff --git a/src/views/eam/equipmentAccounts/index.vue b/src/views/eam/equipmentAccounts/index.vue
index 7196e45b5..fe388bea2 100644
--- a/src/views/eam/equipmentAccounts/index.vue
+++ b/src/views/eam/equipmentAccounts/index.vue
@@ -1,22 +1,18 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search
-      :schema="EquipmentAccounts.allSchemas.searchSchema"
-      @search="setSearchParams"
-      @reset="setSearchParams"
-    />
+    <Search :schema="EquipmentAccounts.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
-  <!-- 列表头部 -->
-  <TableHead
-    :HeadButttondata="HeadButttondata"
-    @button-base-click="buttonBaseClick"
-    :routeName="routeName"
-    @updataTableColumns="updataTableColumns"
-    @searchFormClick="searchFormClick"
-    :allSchemas="EquipmentAccounts.allSchemas"
-  />
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="EquipmentAccounts.allSchemas"
+    />
 
   <!-- 列表 -->
   <ContentWrap>
@@ -31,13 +27,13 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #code="{ row }">
+      <template #code="{row}">
         <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
           <span>{{ row.code }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, row)" />
+        <ButtonBase  :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)"/>
       </template>
     </Table>
   </ContentWrap>
@@ -54,106 +50,70 @@
     :isBusiness="false"
   />
 
+  <AblesForm ref="ablesFormRef" @success="getData" @close="getClosed"/>
+
   <!-- 详情 -->
-  <DetailLedger
-    ref="detailRef"
-    :isBasic="true"
-    :allSchemas="EquipmentAccounts.allSchemas"
-    :subTabs="subTabList"
-    :operationRecordList="operationRecordList"
-    @handleOperationTabsChange="handleOperationTabsChange"
+  <DetailLedger 
+    ref="detailRef" 
+    :isBasic="true" 
+    :allSchemas="EquipmentAccounts.allSchemas" 
+    :subTabs="subTabList" 
+    :operationRecordList="operationRecordList" 
+    @handleOperationTabsChange="handleOperationTabsChange" 
     :detailAllSchemas="detailAllSchemas"
     :apiPage="apiPage"
     :dialogApiPage="dialogApiPage"
     :dialogAllSchemas="dialogAllSchemas"
     :dynamicInfoFields="dynamicInfoFields"
     funcCode="device_mould_file"
-  />
+    />
   <!-- 主要部件 -->
   <SearchTable ref="searchTableRef" @searchTableSuccess="submitEquipmentMainPartRelation" />
   <!-- 备件 -->
   <SearchTable ref="searchSparePartTableRef" @searchTableSuccess="submitSparePartRelation" />
   <!-- 导入 -->
-  <ImportForm
-    ref="importFormRef"
-    url="/eam/device/equipment-accounts/import"
-    :importTemplateData="importTemplateData"
-    @success="importSuccess"
-  />
+  <ImportForm ref="importFormRef" url="/eam/device/equipment-accounts/import" :importTemplateData="importTemplateData" @success="importSuccess" />
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { EquipmentAccounts, EquipmentAccountsRules } from './equipmentAccounts.data'
+import { EquipmentAccounts,EquipmentAccountsRules } from './equipmentAccounts.data'
 import * as EquipmentAccountsApi from '@/api/eam/equipmentAccounts'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import AblesForm from '@/views/eam/equipmentAccounts/ablesForm.vue'
 import DetailLedger from '@/components/Detail/src/DetailLedger.vue'
-import { RelationMainPart, RelationMainPartRules } from '../relationMainPart/relationMainPart.data'
 import * as RelationMainPartApi from '@/api/eam/relationMainPart'
-import {
-  EquipmentMainPart,
-  EquipmentMainPartRules
-} from '../equipmentMainPart/equipmentMainPart.data'
+import { EquipmentMainPart,EquipmentMainPartRules } from '../equipmentMainPart/equipmentMainPart.data'
 import * as EquipmentMainPartApi from '@/api/eam/equipmentMainPart'
-import { Item, ItemRules } from '../item/item.data'
-import * as ItemApi from '@/api/eam/item'
-import {
-  EquipmentToolSparePart,
-  EquipmentToolSparePartRules
-} from '../equipmentToolSparePart/equipmentToolSparePart.data'
+import { SparePart,SparePartRules } from '../sparePart/sparePart.data'
+import * as SparePartApi from '@/api/eam/sparePart'
 import * as EquipmentToolSparePartApi from '@/api/eam/equipmentToolSparePart'
-import {
-  EquipmentReportRepairRequest,
-  EquipmentReportRepairRequestRules
-} from '../equipmentReportRepairRequest/equipmentReportRepairRequest.data'
+import { EquipmentReportRepairRequest,EquipmentReportRepairRequestRules } from '../equipmentReportRepairRequest/equipmentReportRepairRequest.data'
 import * as EquipmentReportRepairRequestApi from '@/api/eam/equipmentReportRepairRequest'
-import {
-  EquipmentSpotCheckRecordMain,
-  EquipmentSpotCheckRecordMainRules
-} from '../equipmentSpotCheckRecordMain/equipmentSpotCheckRecordMain.data'
+import { EquipmentSpotCheckRecordMain,EquipmentSpotCheckRecordMainRules } from '../equipmentSpotCheckRecordMain/equipmentSpotCheckRecordMain.data'
 import * as EquipmentSpotCheckRecordMainApi from '@/api/eam/equipmentSpotCheckRecordMain'
-import {
-  EquipmentSpotCheckRecordDetail,
-  EquipmentSpotCheckRecordDetailRules
-} from '../equipmentSpotCheckRecordDetail/equipmentSpotCheckRecordDetail.data'
+import { EquipmentSpotCheckRecordDetail,EquipmentSpotCheckRecordDetailRules } from '../equipmentSpotCheckRecordDetail/equipmentSpotCheckRecordDetail.data'
 import * as EquipmentSpotCheckRecordDetailApi from '@/api/eam/equipmentSpotCheckRecordDetail'
-import {
-  EquipmentInspectionRecordMain,
-  EquipmentInspectionRecordMainRules
-} from '../equipmentInspectionRecordMain/equipmentInspectionRecordMain.data'
+import { EquipmentInspectionRecordMain,EquipmentInspectionRecordMainRules } from '../equipmentInspectionRecordMain/equipmentInspectionRecordMain.data'
 import * as EquipmentInspectionRecordMainApi from '@/api/eam/equipmentInspectionRecordMain'
-import {
-  EquipmentInspectionRecordDetail,
-  EquipmentInspectionRecordDetailRules
-} from '../equipmentInspectionRecordDetail/equipmentInspectionRecordDetail.data'
+import { EquipmentInspectionRecordDetail,EquipmentInspectionRecordDetailRules } from '../equipmentInspectionRecordDetail/equipmentInspectionRecordDetail.data'
 import * as EquipmentInspectionRecordDetailApi from '@/api/eam/equipmentInspectionRecordDetail'
-import {
-  EquipmentRepairRecordMain,
-  EquipmentRepairRecordMainRules
-} from '../equipmentRepairRecordMain/equipmentRepairRecordMain.data'
+import { EquipmentRepairRecordMain,EquipmentRepairRecordMainRules } from '../equipmentRepairRecordMain/equipmentRepairRecordMain.data'
 import * as EquipmentRepairRecordMainApi from '@/api/eam/equipmentRepairRecordMain'
-import {
-  EquipmentRepairRecordDetail,
-  EquipmentRepairRecordDetailRules
-} from '../equipmentRepairRecordDetail/equipmentRepairRecordDetail.data'
+import { EquipmentRepairRecordDetail,EquipmentRepairRecordDetailRules } from '../equipmentRepairRecordDetail/equipmentRepairRecordDetail.data'
 import * as EquipmentRepairRecordDetailApi from '@/api/eam/equipmentRepairRecordDetail'
-import {
-  EquipmentMaintenanceRecordMain,
-  EquipmentMaintenanceRecordMainRules
-} from '../equipmentMaintenanceRecordMain/equipmentMaintenanceRecordMain.data'
+import { EquipmentMaintenanceRecordMain,EquipmentMaintenanceRecordMainRules } from '../equipmentMaintenanceRecordMain/equipmentMaintenanceRecordMain.data'
 import * as EquipmentMaintenanceRecordMainApi from '@/api/eam/equipmentMaintenanceRecordMain'
-import {
-  EquipmentMaintenanceRecordDetail,
-  EquipmentMaintenanceRecordDetailRules
-} from '../equipmentMaintenanceRecordDetail/equipmentMaintenanceRecordDetail.data'
+import { EquipmentMaintenanceRecordDetail,EquipmentMaintenanceRecordDetailRules } from '../equipmentMaintenanceRecordDetail/equipmentMaintenanceRecordDetail.data'
 import * as EquipmentMaintenanceRecordDetailApi from '@/api/eam/equipmentMaintenanceRecordDetail'
 import * as WorkshopApi from '@/api/wms/workshop'
 import * as ProductionlineApi from '@/api/wms/productionline'
 import * as EquipmentSupplierApi from '@/api/eam/equipmentSupplier'
 import * as EquipmentManufacturerApi from '@/api/eam/equipmentManufacturer'
 
+
 defineOptions({ name: 'EquipmentAccounts' })
 
 const message = useMessage() // 消息弹窗
@@ -164,27 +124,28 @@ const routeName = ref()
 const deviceNumber = ref()
 routeName.value = route.name
 const tableColumns = ref(EquipmentAccounts.allSchemas.tableColumns)
-const tabs = ref<{ label: string; prop: string }[]>([])
-const subTabList = ref([])
+const tabs = ref<{ label: string; prop: string; }[]>([])
+const subTabList = ref([]);
 const detailAllSchemas = ref()
 const apiPage = ref()
 const dialogApiPage = ref()
 const dialogAllSchemas = ref()
+
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
   nextTick(() => {
     const setV = {}
     setV[formField] = val[0][searchField]
-    if (formField == 'workshopName') {
+    if(formField == 'workshopName'){
       setV['workshopCode'] = val[0]['code']
       setV['workshopName'] = val[0]['name']
-    } else if (formField == 'lineName') {
+    }else if(formField == 'lineName'){
       setV['lineCode'] = val[0]['code']
       setV['lineName'] = val[0]['name']
-    } else if (formField == 'manufactureName') {
+    }else if(formField == 'manufactureName'){
       setV['manufactureCode'] = val[0]['number']
       setV['manufactureName'] = val[0]['name']
-    } else if (formField == 'supplierName') {
+    }else if(formField == 'supplierName'){
       setV['supplierCode'] = val[0]['number']
       setV['supplierName'] = val[0]['name']
     }
@@ -193,22 +154,24 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
 }
 
 const operationRecordList = ref([
-  { label: '报修记录', value: 'report' },
-  { label: '维修记录', value: 'repair' },
-  { label: '保养记录', value: 'maintenance' },
-  { label: '巡检记录', value: 'inspection' },
-  { label: '点检记录', value: 'spot_check' }
+  {label:'报修记录',value:'report'},
+  {label:'维修记录',value:'repair'},
+  {label:'保养记录',value:'maintenance'},
+  {label:'巡检记录',value:'inspection'},
+  {label:'点检记录',value:'spot_check'},
+
 ])
 
+
 const dynamicInfoFields = ref([
-  'totalRunningTime',
-  'maintenanceRunningTime',
-  'usageTimes',
-  'lastInspectionDate',
-  'outageRate',
-  'breakdownRecover',
-  'purchaseInterval'
-])
+    "totalRunningTime",
+    "maintenanceRunningTime",
+    "usageTimes",
+    "lastInspectionDate",
+    "outageRate",
+    "breakdownRecover",
+    "purchaseInterval"
+]);
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -224,12 +187,12 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({ hasPermi: 'eam:equipment-accounts:create' }), // 新增
-  defaultButtons.defaultImportBtn({ hasPermi: 'eam:equipment-accounts:import' }), // 导入
-  defaultButtons.defaultExportBtn({ hasPermi: 'eam:equipment-accounts:export' }), // 导出
+  defaultButtons.defaultAddBtn({hasPermi:'eam:equipment-accounts:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'eam:equipment-accounts:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'eam:equipment-accounts:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
-  defaultButtons.defaultSetBtn(null) // 设置
+  defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',
@@ -242,85 +205,105 @@ const HeadButttondata = [
 
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
-  if (val == 'add') {
-    // 新增
+  if (val == 'add') { // 新增
     openForm('create')
-  } else if (val == 'import') {
-    // 导入
+  } else if (val == 'import') { // 导入
     handleImport()
-  } else if (val == 'export') {
-    // 导出
+  } else if (val == 'export') { // 导出
     handleExport()
-  } else if (val == 'refresh') {
-    // 刷新
+  } else if (val == 'refresh') { // 刷新
     getList()
-  } else if (val == 'filtrate') {
-    // 筛选
-  } else {
-    // 其他按钮
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
     console.log('其他按钮', item)
   }
 }
 
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.available) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
 // 列表-操作按钮
-const butttondata = [
-  defaultButtons.mainListEditBtn({ hasPermi: 'eam:equipment-accounts:update' }), // 编辑
-  defaultButtons.componentBtn({ hasPermi: 'eam:equipment-accounts:component' }), // 部件
-  defaultButtons.sparePartBtn({ hasPermi: 'eam:equipment-accounts:item' }) // 备件
-  // defaultButtons.mainListDeleteBtn({hasPermi:'eam:equipment-accounts:delete'}), // 删除
-]
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListEditBtn({hasPermi:'eam:equipment-accounts:update'}), // 编辑
+    defaultButtons.componentBtn({hasPermi:'eam:equipment-accounts:component'}), // 部件
+    defaultButtons.sparePartBtn({hasPermi:'eam:equipment-accounts:item'}), // 备件
+    defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'eam:basicFaultType:update'}),
+    defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'eam:basicFaultType:update'}),
+  ]
+}
+
+//启用禁用
+const ablesFormRef = ref()
+function openables(row, val) {
+  ablesFormRef.value.open(val,row);
+}
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
-  if (val == 'edit') {
-    // 编辑
+  if (val == 'edit') { // 编辑
     openForm('update', row)
-  } else if (val == 'delete') {
-    // 删除
+  } else if (val == 'delete') { // 删除
     handleDelete(row.id)
-  } else if (val == 'component') {
-    // 部件
+  } else if (val == 'component') { // 部件
     openComponent(row)
-  } else if (val == 'sparePart') {
-    // 备件
+  } else if (val == 'sparePart') { // 备件
     openSparePart(row)
+  } else if (val == 'enable') { // 启用/禁用
+    openables(row,val)
+  } else if (val == 'disable') { // 启用/禁用
+    openables(row,val)
   }
 }
 
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = async (type: string, row?: any) => {
-  if (type == 'update') {
-    const equipmentManufacturerNoPage =
-      await EquipmentManufacturerApi.getEquipmentManufacturerNoPage({})
+  if(type == 'update'){
+    const equipmentManufacturerNoPage = await EquipmentManufacturerApi.getEquipmentManufacturerNoPage({})
     const equipmentSupplierNoPage = await EquipmentSupplierApi.getEquipmentSupplierNoPage({})
     const workshopNoPage = await WorkshopApi.getWorkshopNoPage({})
-    const productionlineNoPage = await ProductionlineApi.getProductionlineNoPage({})
-    row.workshopName = workshopNoPage?.find((item) => item.code == row.workshopCode)?.name
-    row.lineName = productionlineNoPage?.find((item) => item.code == row.lineCode)?.name
-    row.manufactureName = equipmentManufacturerNoPage?.find(
-      (item) => item.number == row.manufactureCode
-    )?.name
-    row.supplierName = equipmentSupplierNoPage?.find(
-      (item) => item.number == row.supplierCode
-    )?.name
+    const productionlineNoPage = await ProductionlineApi.getProductionlineNoPage({});
+    row.workshopName = workshopNoPage?.find(item=>item.code == row.workshopCode)?.name
+    row.lineName = productionlineNoPage?.find(item=>item.code == row.lineCode)?.name
+    row.manufactureName = equipmentManufacturerNoPage?.find(item=>item.number == row.manufactureCode)?.name
+    row.supplierName = equipmentSupplierNoPage?.find(item=>item.number == row.supplierCode)?.name
+
+    EquipmentAccounts.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'status') {
+        item.componentProps.disabled = false
+
+      }
+    })
+  }else{
+    EquipmentAccounts.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'status') {
+        item.componentProps.disabled = true
+        item.value = 'TOACCEPT'
+      }
+    })
   }
   basicFormRef.value.open(type, row)
 }
 
 // form表单提交
-const formsSuccess = async (formType, data) => {
-  var isHave = EquipmentAccounts.allSchemas.formSchema.some(function (item) {
-    return item.field === 'activeTime' || item.field === 'expireTime'
-  })
-  if (isHave) {
-    if (data.activeTime && data.expireTime && data.activeTime >= data.expireTime) {
+const formsSuccess = async (formType,data) => {
+  var isHave =EquipmentAccounts.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
+      return;
     }
   }
-  if (data.activeTime == 0) data.activeTime = null
-  if (data.expireTime == 0) data.expireTime = null
+  if(data.activeTime==0)data.activeTime = null;
+  if(data.expireTime==0)data.expireTime = null;
   if (formType === 'create') {
     await EquipmentAccountsApi.createEquipmentAccounts(data)
     message.success(t('common.createSuccess'))
@@ -391,49 +374,60 @@ const searchFormClick = (searchData) => {
   getList() // 刷新当前列表
 }
 
+//ablesForm 提交按钮回传
+const getData=(val)=> {
+  nextTick?.(async () => {
+    await getList()
+  })
+}
+
+//ablesForm 关闭按钮回传
+const getClosed=(val)=> {
+  nextTick?.(() => {
+    console.log(val)
+    getList()
+  })
+}
+
+
 const searchTableRef = ref()
 const searchSparePartTableRef = ref()
 const searchTableSelections = ref([])
 const searchTableSparePartSelections = ref([])
 const syncData = async (row) => {
   searchTableSparePartSelections.value = []
-  await RelationMainPartApi.getRelationMainPartNoPage({
-    equipmentCode: row.code,
-    type: 'DEVICE'
-  }).then(async (res) => {
-    await EquipmentMainPartApi.getEquipmentMainPartNoPage({ type: 'DEVICE' }).then((response) => {
-      searchTableSelections.value = response.filter((element) => {
-        let flag = false
-        res.forEach((item) => {
+  await RelationMainPartApi.getRelationMainPartNoPage({ equipmentCode: row.code,type: 'DEVICE'  }).then(async (res) => {
+    await EquipmentMainPartApi.getEquipmentMainPartNoPage({type: 'DEVICE' }).then(response => {
+      searchTableSelections.value = response.filter(element => {
+        let flag = false;
+        res.forEach(item => {
           if (element.code == item.mainPartCode) {
-            flag = true
+            flag = true;
           }
-        })
-        return flag
-      })
-    })
-  })
-}
+        });
+        return flag;
+      });
+    });
+  });
+};
 const syncSparePartData = async (row) => {
   searchTableSparePartSelections.value = []
-  await EquipmentToolSparePartApi.getEquipmentToolSparePartNoPage({
-    equipmentToolCode: row.code
-  }).then(async (res) => {
-    await SparePartApi.getSparePartNoPage({}).then((response) => {
-      searchTableSparePartSelections.value = response.filter((element) => {
-        let flag = false
-        res.forEach((item) => {
+  await EquipmentToolSparePartApi.getEquipmentToolSparePartNoPage({ equipmentToolCode: row.code}).then(async (res) => {
+    await SparePartApi.getSparePartNoPage({}).then(response => {
+      searchTableSparePartSelections.value = response.filter(element => {
+        let flag = false;
+        res.forEach(item => {
           if (element.code == item.sparePartCode) {
-            flag = true
+            flag = true;
           }
-        })
-        return flag
-      })
-    })
-  })
-}
+        });
+        return flag;
+      });
+    });
+  });
+};
 /** 绑定备件操作 */
-const openComponent = async (row: any) => {
+const openComponent = async (row : any) => {
   await syncData(row)
   searchTableRef.value.open(
     '选择部件',
@@ -442,9 +436,9 @@ const openComponent = async (row: any) => {
     'equipmentMainPart',
     EquipmentMainPart.allSchemas.searchSchema,
     true,
-    null, //type
+    null,//type
     row,
-    { type: 'DEVICE' },
+    {type: 'DEVICE'},
     null,
     null,
     null,
@@ -452,16 +446,16 @@ const openComponent = async (row: any) => {
   )
 }
 
-const openSparePart = async (row: any) => {
+const openSparePart = async (row : any) => {
   await syncSparePartData(row)
   searchSparePartTableRef.value.open(
     '选择备件',
-    Item.allSchemas,
-    ItemApi.getItemPage,
-    'item',
-    Item.allSchemas.searchSchema,
+    SparePart.allSchemas,
+    SparePartApi.getSparePartPage,
+    'sparePartPart',
+    SparePart.allSchemas.searchSchema,
     true,
-    null, //type
+    null,//type
     row,
     null,
     null,
@@ -471,38 +465,37 @@ const openSparePart = async (row: any) => {
   )
 }
 
-const submitEquipmentMainPartRelation = (formField, searchField, val, formRef, rowRef) => {
+const submitEquipmentMainPartRelation = (formField, searchField, val, formRef, rowRef) => { 
   const deviceMainPartRelList = val.map((element) => ({
-    mainPartCode: element.number,
-    equipmentCode: rowRef.code,
-    type: 'DEVICE'
-  }))
-  RelationMainPartApi.createRelationMainPartBatch(deviceMainPartRelList).then((res) => {
+      mainPartCode: element.code,
+      equipmentCode: rowRef.code,
+      type: 'DEVICE'
+    }))
+  RelationMainPartApi.createRelationMainPartBatch(deviceMainPartRelList).then(res => {
     message.success(t('common.createSuccess'))
     getList()
   })
 }
 const handleOperationTabsChange = (val) => {
-  if (val == 'report') {
+  if(val == 'report'){
     apiPage.value = EquipmentReportRepairRequestApi.getEquipmentReportRepairRequestPage
     detailAllSchemas.value = EquipmentReportRepairRequest.allSchemas
-  } else if (val == 'repair') {
+  }else if(val == 'repair'){
     apiPage.value = EquipmentRepairRecordMainApi.getEquipmentRepairRecordMainPage
     detailAllSchemas.value = EquipmentRepairRecordMain.allSchemas
     dialogApiPage.value = EquipmentRepairRecordDetailApi.getEquipmentRepairRecordDetailPage
     dialogAllSchemas.value = EquipmentRepairRecordDetail.allSchemas
-  } else if (val == 'maintenance') {
+  }else if(val == 'maintenance'){
     apiPage.value = EquipmentMaintenanceRecordMainApi.getEquipmentMaintenanceRecordMainPage
     detailAllSchemas.value = EquipmentMaintenanceRecordMain.allSchemas
-    dialogApiPage.value =
-      EquipmentMaintenanceRecordDetailApi.getEquipmentMaintenanceRecordDetailPage
+    dialogApiPage.value = EquipmentMaintenanceRecordDetailApi.getEquipmentMaintenanceRecordDetailPage
     dialogAllSchemas.value = EquipmentMaintenanceRecordDetail.allSchemas
-  } else if (val == 'inspection') {
+  }else if(val == 'inspection'){
     apiPage.value = EquipmentInspectionRecordMainApi.getEquipmentInspectionRecordMainPage
     detailAllSchemas.value = EquipmentInspectionRecordMain.allSchemas
     dialogApiPage.value = EquipmentInspectionRecordDetailApi.getEquipmentInspectionRecordDetailPage
     dialogAllSchemas.value = EquipmentInspectionRecordDetail.allSchemas
-  } else if (val == 'spot_check') {
+  }else if(val == 'spot_check'){
     apiPage.value = EquipmentSpotCheckRecordMainApi.getEquipmentSpotCheckRecordMainPage
     detailAllSchemas.value = EquipmentSpotCheckRecordMain.allSchemas
     dialogApiPage.value = EquipmentSpotCheckRecordDetailApi.getEquipmentSpotCheckRecordDetailPage
@@ -510,18 +503,16 @@ const handleOperationTabsChange = (val) => {
   }
 }
 
-const submitSparePartRelation = (formField, searchField, val, formRef, rowRef) => {
+const submitSparePartRelation = (formField, searchField, val, formRef, rowRef) => { 
   const equipmentToolSparePartRelList = val.map((element) => ({
-    sparePartCode: element.number,
-    equipmentToolCode: rowRef.code,
-    type: 'DEVICE'
-  }))
-  EquipmentToolSparePartApi.createEquipmentToolSparePartBatch(equipmentToolSparePartRelList).then(
-    (res) => {
-      message.success(t('common.createSuccess'))
-      getList()
-    }
-  )
+      sparePartCode: element.code,
+      equipmentToolCode: rowRef.code,
+      type: 'DEVICE'
+    }))
+  EquipmentToolSparePartApi.createEquipmentToolSparePartBatch(equipmentToolSparePartRelList).then(res => {
+    message.success(t('common.createSuccess'))
+    getList()
+  })
 }
 
 /** 初始化 **/
@@ -529,4 +520,5 @@ onMounted(async () => {
   getList()
   importTemplateData.templateUrl = await EquipmentAccountsApi.importTemplate()
 })
+
 </script>

From 16d9e59403aa47523ae8e3982526492ac7223a72 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 5 Jul 2024 16:45:25 +0800
Subject: [PATCH 176/408] =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/UploadFile/src/UploadFile.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/UploadFile/src/UploadFile.vue b/src/components/UploadFile/src/UploadFile.vue
index b74ee3325..c56f679cb 100644
--- a/src/components/UploadFile/src/UploadFile.vue
+++ b/src/components/UploadFile/src/UploadFile.vue
@@ -80,7 +80,7 @@ const uploadHeaders = ref({
 // 文件上传之前判断
 const beforeUpload: UploadProps['beforeUpload'] = (file: UploadRawFile) => {
   if (fileList.value.length >= props.limit) {
-    message.error(`${t('ts.上传文件数量不能超过')}${props.limit}!`)
+    message.error(`${t('ts.上传文件数量不能超过').replace('ts.','')}${props.limit}!`)
     return false
   }
   let fileExtension = ''

From 459d11a321d9d490aa45558108caf0ddfa9c7d30 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 5 Jul 2024 16:53:59 +0800
Subject: [PATCH 177/408] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/basicDataManage/itemManage/itempackage/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/basicDataManage/itemManage/itempackage/index.vue b/src/views/wms/basicDataManage/itemManage/itempackage/index.vue
index 729bc4b8b..4f25372ad 100644
--- a/src/views/wms/basicDataManage/itemManage/itempackage/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/itempackage/index.vue
@@ -153,7 +153,7 @@ const buttonBaseClick = (val, item) => {
 // 列表-操作按钮
 const butttondata = [
   defaultButtons.mainListEditBtn({ hasPermi: 'wms:itempackage:update' }), // 编辑
-  // defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:itempackage:delete' }) // 删除
+  defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:itempackage:delete' }) // 删除
 ]
 
 // 列表-操作按钮事件

From 124b38ec0c423a785d4f50130ce6821bd39f0e25 Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Fri, 5 Jul 2024 16:54:45 +0800
Subject: [PATCH 178/408] =?UTF-8?q?=E9=AB=98=E7=BA=A7=E7=AD=9B=E9=80=89=20?=
 =?UTF-8?q?=E5=99=A8=E5=85=B7=E5=88=9D=E5=A7=8B=E5=8C=96=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E3=80=81=E8=AE=B0=E5=BD=95=E3=80=81=E6=B2=A1=E4=BC=A0type?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../containerRecordMain/index.vue                | 14 ++++++++++----
 .../initialContainerMainRequest/index.vue        | 16 +++++++++++-----
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue
index f5b547605..edfe467ad 100644
--- a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue
@@ -49,7 +49,7 @@
     :tableFormRules="ContainerRecordDetailRules"
     :isBusiness="true"
   />
-  
+
    <!-- 详情 -->
    <Detail
     ref="detailRef"
@@ -91,7 +91,7 @@ const { tableObject, tableMethods } = useTable({
 
 // 判断 路由名称 进行条件过滤
 /**
- * 
+ *
  */
  if ( routeName.value == 'ReturnContainerManageRecord') {
   tableObject.params = {
@@ -111,11 +111,11 @@ const { tableObject, tableMethods } = useTable({
   }
   businessType.value = 'InitialContainerManage'
   importFileName.value = '器具初始化记录'
-} 
+}
 else if ( routeName.value == 'ScrapContainerManageRecord') {
   tableObject.params = {
     type:'SCRAP'
-  }  
+  }
   businessType.value = 'ScrapContainerManage'
   importFileName.value = '器具报废记录'
 } else if ( routeName.value == 'DeliverContainerManageRecord') {
@@ -237,6 +237,12 @@ const handleExport = async () => {
 
 // 筛选提交
 const searchFormClick = (searchData) => {
+  const cmd = {
+    'column':'type',
+    'action':'==',
+    'value':'INITIAL'
+  }
+  searchData.filters.push(cmd)
   tableObject.params = {
     isSearch: true,
     filters: searchData.filters
diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue
index 38af72a70..a8b9799b5 100644
--- a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue
@@ -109,7 +109,7 @@ const { tableObject, tableMethods } = useTable({
 })
 // 判断 路由名称 进行条件过滤
 /**
- * 
+ *
  */
  if ( routeName.value == 'InitialContainerManageRequest') {
   tableObject.params = {
@@ -121,7 +121,7 @@ const { tableObject, tableMethods } = useTable({
     }});
   businessType.value = 'InitialContainerManage'
   importFileName.value = '器具初始化申请'
-} 
+}
 
 //定义  展示子表数据时是否显示新增/修改/删除按钮
 const trueFalse = ref(false)
@@ -397,19 +397,19 @@ const submitForm = async (formType,submitData) => {
   if(data.masterId){
     data.id = data.masterId
   }
-  data.subList = tableData.value // 拼接子表数据参数  
+  data.subList = tableData.value // 拼接子表数据参数
   data.subList.forEach(item => {
     if(item.qty == 0){
       message.error(`到数量不能为0!`)
       flag.value = true
       return;
-    } 
+    }
   })
   try {
     if (formType === 'create') {
       data.businessType = businessType.value
       console.log(data.businessType,999);
-      
+
     await ContainerMainRequestApi.createContainerMainRequest(data)
     message.success(t('common.createSuccess'))
   } else {
@@ -475,6 +475,12 @@ const importSuccess = () => {
 
 // 筛选提交
 const searchFormClick = (searchData) => {
+  const cmd = {
+    'column':'type',
+    'action':'==',
+    'value':'INITIAL'
+  }
+  searchData.filters.push(cmd)
   tableObject.params = {
     isSearch: true,
     filters: searchData.filters

From 910a29090a74ef9a0d583d0a8772380421bd4fef Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Fri, 5 Jul 2024 17:28:37 +0800
Subject: [PATCH 179/408] =?UTF-8?q?EAM=20=20=E2=80=94=E2=80=94>=20?=
 =?UTF-8?q?=E5=A4=87=E4=BB=B6=E7=AE=A1=E7=90=86=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/eam/basicEamWorkshop/index.ts      | 1 -
 src/api/eam/documentTypeSelectSet/index.ts | 1 -
 src/api/eam/inspectionItem/index.ts        | 1 -
 3 files changed, 3 deletions(-)

diff --git a/src/api/eam/basicEamWorkshop/index.ts b/src/api/eam/basicEamWorkshop/index.ts
index 09d83c2d9..729ea6dae 100644
--- a/src/api/eam/basicEamWorkshop/index.ts
+++ b/src/api/eam/basicEamWorkshop/index.ts
@@ -1,5 +1,4 @@
 import request from '@/config/axios'
-import {EquipmentMainPartVO} from "@/api/eam/equipmentMainPart";
 
 export interface BasicEamWorkshopVO {
   id: number
diff --git a/src/api/eam/documentTypeSelectSet/index.ts b/src/api/eam/documentTypeSelectSet/index.ts
index 13b7164d6..c776a99dd 100644
--- a/src/api/eam/documentTypeSelectSet/index.ts
+++ b/src/api/eam/documentTypeSelectSet/index.ts
@@ -1,5 +1,4 @@
 import request from '@/config/axios'
-import {BasicSpotCheckSelectSetVO} from "@/api/eam/spotCheckSelectSet";
 
 export interface DocumentTypeSelectSetVO {
   id: number
diff --git a/src/api/eam/inspectionItem/index.ts b/src/api/eam/inspectionItem/index.ts
index ddf8cf80f..98f14dc05 100644
--- a/src/api/eam/inspectionItem/index.ts
+++ b/src/api/eam/inspectionItem/index.ts
@@ -1,5 +1,4 @@
 import request from '@/config/axios'
-import {InspectionItemSelectSetVO} from "@/api/eam/inspectionItemSelectSet";
 
 export interface InspectionItemVO {
   id: number

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 180/408] =?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 da5b1a799524040fad2a94196dcc89540bc2be5c Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Fri, 5 Jul 2024 18:37:45 +0800
Subject: [PATCH 181/408] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../itemManage/itembasic/itembasic.data.ts     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts
index 7db799ca6..9855c3265 100644
--- a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts
@@ -337,6 +337,15 @@ export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
+  {
+    label: '产品类',
+    field: 'prodCla',
+    sort: 'custom',
+    isForm:false,
+    table: {
+      width: 100
+    } ,
+  },
   {
     label: '是否可用',
     field: 'available',
@@ -465,15 +474,6 @@ export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
     isTable: false
   },
-  {
-    label: '产品类',
-    field: 'prodCla',
-    sort: 'custom',
-    isForm:false,
-    table: {
-      width: 100
-    } ,
-  },
   { label: '备注', field: 'remark', sort: 'custom', isTable: false},
   {
     label: '操作',

From cbce2cbb6ffa1d11ca41c667fe3cd552e9131e69 Mon Sep 17 00:00:00 2001
From: liuchen864 <23082234@qq.com>
Date: Sat, 6 Jul 2024 09:00:56 +0800
Subject: [PATCH 182/408] =?UTF-8?q?=E6=89=93=E5=8C=85=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/eam/equipmentAccounts/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/eam/equipmentAccounts/index.vue b/src/views/eam/equipmentAccounts/index.vue
index fe388bea2..f3503a55f 100644
--- a/src/views/eam/equipmentAccounts/index.vue
+++ b/src/views/eam/equipmentAccounts/index.vue
@@ -50,7 +50,7 @@
     :isBusiness="false"
   />
 
-  <AblesForm ref="ablesFormRef" @success="getData" @close="getClosed"/>
+  <!-- <AblesForm ref="ablesFormRef" @success="getData" @close="getClosed"/> -->
 
   <!-- 详情 -->
   <DetailLedger 
@@ -82,7 +82,7 @@ import * as EquipmentAccountsApi from '@/api/eam/equipmentAccounts'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-import AblesForm from '@/views/eam/equipmentAccounts/ablesForm.vue'
+// import AblesForm from '@/views/eam/equipmentAccounts/ablesForm.vue'
 import DetailLedger from '@/components/Detail/src/DetailLedger.vue'
 import * as RelationMainPartApi from '@/api/eam/relationMainPart'
 import { EquipmentMainPart,EquipmentMainPartRules } from '../equipmentMainPart/equipmentMainPart.data'

From 2c3162759e217abd59d101636fce59971c9f3764 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Sat, 6 Jul 2024 10:38:31 +0800
Subject: [PATCH 183/408] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../itemManage/itembasic/itembasic.data.ts     | 18 +++++++++---------
 .../basicDataManage/subject/mstr/mstr.data.ts  |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts
index 9855c3265..b59f27657 100644
--- a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts
@@ -248,6 +248,15 @@ export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
       width: 100
     } ,
   },
+  {
+    label: '产品类',
+    field: 'prodCla',
+    sort: 'custom',
+    isForm:false,
+    table: {
+      width: 100
+    } ,
+  },
   {
     label: '种类',
     field: 'category',
@@ -337,15 +346,6 @@ export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
-  {
-    label: '产品类',
-    field: 'prodCla',
-    sort: 'custom',
-    isForm:false,
-    table: {
-      width: 100
-    } ,
-  },
   {
     label: '是否可用',
     field: 'available',
diff --git a/src/views/wms/basicDataManage/subject/mstr/mstr.data.ts b/src/views/wms/basicDataManage/subject/mstr/mstr.data.ts
index da3628962..d0dab3ebd 100644
--- a/src/views/wms/basicDataManage/subject/mstr/mstr.data.ts
+++ b/src/views/wms/basicDataManage/subject/mstr/mstr.data.ts
@@ -13,7 +13,7 @@ export const MstrRules = reactive({
 export const Mstr = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '域代码',
-    field: 'hflccHflcd',
+    field: 'plDomain',
     sort: 'custom',
     isSearch: true,
   },

From 03c1fb583e7a493be12966e060cf0de4f393f821 Mon Sep 17 00:00:00 2001
From: bjang03 <259278618@qq.com>
Date: Sat, 6 Jul 2024 10:46:42 +0800
Subject: [PATCH 184/408] =?UTF-8?q?1=E3=80=81=E7=9B=98=E7=82=B9=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E5=A2=9E=E5=8A=A0=E4=BB=BB=E5=8A=A1=E6=8B=86=E5=88=86?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../count/countPlanMain/countPlanMain.data.ts            | 2 +-
 .../countadjustRequestMain.data.ts                       | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
index 25c3b062f..64f38a54f 100644
--- a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
+++ b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
@@ -85,7 +85,7 @@ export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isTable:false,
+    isTable:true,
     isForm: true,
     form: {
       value: 'locationCode'
diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
index a434768ee..490dfe82c 100644
--- a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
+++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
@@ -89,15 +89,6 @@ export const CountadjustRequestMain = useCrudSchemas(<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '库位代码',
-    field: 'locationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch: true,
-  },
   {
     label: '申请时间',
     field: 'requestTime',

From 01b03727b8f71fb6c111198bc97c94d81fe1bb43 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Sat, 6 Jul 2024 14:06:50 +0800
Subject: [PATCH 185/408] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=AD=97=E6=AE=B5=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereturnRecordMain.data.ts                       | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts
index 290a2a4b7..857e01136 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts
@@ -45,15 +45,16 @@ export const PurchasereturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
     sortTableDefault: 3,
     sortSearchDefault: 5,
-  },
-  {
+  },  {
     label: 'qad采购退货记录单号',
     field: 'qadPurchaseRrturnRecordCode',
     sort: 'custom',
     table: {
       width: 180
     },
-    isTable: false
+    sortSearchDefault:3,
+    sortTableDefault: 4,
+    isTable: true
   },
   {
     label: '发货单号',

From 4f8e00ef2a3f850cb696c1c6f70b13b9baf62691 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Sat, 6 Jul 2024 14:12:32 +0800
Subject: [PATCH 186/408] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts
index 857e01136..c31afc702 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts
@@ -47,7 +47,7 @@ export const PurchasereturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     sortSearchDefault: 5,
   },  {
     label: 'qad采购退货记录单号',
-    field: 'qadPurchaseRrturnRecordCode',
+    field: 'qadPurchaseReturnRecordCode',
     sort: 'custom',
     table: {
       width: 180

From c7fe517535fb35d5e4104db1d166499570739e31 Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Sat, 6 Jul 2024 16:37:07 +0800
Subject: [PATCH 187/408] =?UTF-8?q?QMS=20=E2=80=94=E2=80=94>=20=E6=A3=80?=
 =?UTF-8?q?=E9=AA=8C=E4=BB=BB=E5=8A=A1=20bug=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/eam/equipmentAccounts/ablesForm.vue | 121 ++++++++++++++++++
 src/views/qms/inspectionJob/addForm.vue       |   5 +-
 2 files changed, 125 insertions(+), 1 deletion(-)
 create mode 100644 src/views/eam/equipmentAccounts/ablesForm.vue

diff --git a/src/views/eam/equipmentAccounts/ablesForm.vue b/src/views/eam/equipmentAccounts/ablesForm.vue
new file mode 100644
index 000000000..4585930a9
--- /dev/null
+++ b/src/views/eam/equipmentAccounts/ablesForm.vue
@@ -0,0 +1,121 @@
+<template>
+  <Dialog v-model="dialogVisible" :title="dialogTitle"  :close-on-click-modal="false">
+    <el-form ref="basicFormRef" v-loading="formLoading" :model="formData" :rules="formRules" label-width="100px">
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="变更原因" prop="verifyContent">
+            <el-input v-model="formData.changeReason" type="textarea" :input-style="{height:'100px'}" maxlength="300" placeholder="请输入变更原因" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm('success')">确 定</el-button>
+      <el-button @click="handleClose('close')">取 消</el-button>
+    </template>
+  </Dialog>
+
+
+</template>
+<script lang="ts" setup>
+import * as EquipmentAccountsApi from '@/api/eam/equipmentAccounts'
+import {ElInput} from "element-plus";
+
+defineOptions({ name: 'TeamForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型
+
+
+
+const formData = ref({
+  id:'',
+  code:'',
+  changeReason: '',
+  status:'',
+  available:''
+})
+const formRules = reactive({
+  changeReason: [
+    { required: true, message: '变更原因不能为空', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
+const basicFormRef = ref() // 表单 Ref
+
+
+/** 初始化弹窗 */
+const open = async (type: string, row?: object) => {
+  dialogVisible.value = true
+  if(type == 'disable'){
+      dialogTitle.value = '禁用'
+      formData.value.status = 'DISABLE'
+      formData.value.available = 'FALSE'
+  }else if(type == 'enable'){
+      dialogTitle.value = '启用'
+      formData.value.status = 'NORMAL'
+      formData.value.available = 'TRUE'
+  }else{
+      dialogTitle.value = t('action.' + type)
+  }
+  formType.value = type
+  //初始化数据
+  formData.value.id = row.id
+  formData.value.code = row.code
+}
+
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const submitForm = async (val) => {
+
+   // 校验表单
+   if (!basicFormRef) return
+   const valid = await basicFormRef.value.validate()
+   if (!valid) return
+
+   //发送数据
+   await EquipmentAccountsApi.ableEquipmentAccountsMain(formData.value)
+   //把success函数传递到父页面
+   emit('success',formData.value.id)
+   dialogVisible.value = false
+}
+
+const handleClose=(val)=>{
+  dialogVisible.value = false
+  emit('close',val)
+}
+
+// 传递给父类
+const emit = defineEmits(['close','success'])
+
+</script>
+
+<style scoped>
+.tag-container {
+  margin-top: 10px; /* 可根据需要调整标签容器与表单项之间的间距 */
+  border: 1px solid #ccc; /* 添加边框样式 */
+  padding: 10px; /* 可根据需要调整容器内边距 */
+  width: 950px; /* 设置固定宽度为 950px */
+  overflow-y: auto; /* 当内容溢出容器高度时显示滚动条 */
+  word-wrap: break-word; /* 使用 word-wrap 属性实现超出范围换行 */
+  overflow-wrap: break-word; /* 兼容性更好的写法 */
+  flex-wrap: wrap;
+}
+.input-with-button {
+  display: flex;
+  align-items: center;
+  width: 100%;
+}
+
+.input-with-button > .el-input {
+  flex: 1;
+  /*margin-right: 10px;*/
+}
+
+</style>
diff --git a/src/views/qms/inspectionJob/addForm.vue b/src/views/qms/inspectionJob/addForm.vue
index cc24ae084..5242a93c4 100644
--- a/src/views/qms/inspectionJob/addForm.vue
+++ b/src/views/qms/inspectionJob/addForm.vue
@@ -175,7 +175,7 @@
                 </el-col>
                 <!-- 手动评估的时候显示 -->
                 <el-col :span="12" v-if="item.samplingProcessRespVO.evaluationMode == 1">
-                  <el-form-item label="评估代码" required>
+                  <el-form-item label="评估代码" required prop="inspectionJobCharacteristicsUpdateReqVO.estimateCode">
                     <el-select v-model="item.inspectionJobCharacteristicsUpdateReqVO.estimateCode" placeholder="请选择评估代码"
                       @change="changeFeatureType">
                       <el-option v-for="dict in getStrDictOptions(DICT_TYPE.EVALUATION_CODE)" :key="dict.value"
@@ -473,6 +473,9 @@
           rules.value['inspectionJobCharacteristicsUpdateReqVO.estimateCode'][0].required = false
         }
       })
+      list.forEach(item => {
+        item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime = new Date()
+      })
       data.value.subList = list
       /**
         设置采样数量，默认第一个包装采样数量<总数量，显示数量字段，第二个包装和剩下的总数量对比，以此类推，

From 970e6d703d0e10cfc7b6a7cc4fe4eae4391f2288 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Sun, 7 Jul 2024 10:37:55 +0800
Subject: [PATCH 188/408] =?UTF-8?q?QMS=20=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                            | 1 +
 src/main.ts                             | 4 ++++
 src/views/qms/inspectionJob/addForm.vue | 6 +++---
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 5646cfe76..d99ee0b98 100644
--- a/package.json
+++ b/package.json
@@ -55,6 +55,7 @@
     "vue": "^3.3.4",
     "vue-dompurify-html": "^4.1.4",
     "vue-i18n": "^9.4.1",
+    "vue-next-focus": "^0.0.12",
     "vue-router": "^4.2.5",
     "vue-types": "^5.1.1",
     "vuedraggable": "^4.1.0",
diff --git a/src/main.ts b/src/main.ts
index 50255e0c3..48fb29001 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -45,6 +45,9 @@ import VueDOMPurifyHTML from 'vue-dompurify-html' // 解决v-html 的安全隐
 import DataVVue3 from '@kjgl77/datav-vue3'
 import { useLocaleStore } from '@/store/modules/locale'
 
+import { vue_next_focus } from "vue-next-focus";
+
+
 // 创建实例
 const setupAll = async () => {
   const app = createApp(App)
@@ -67,6 +70,7 @@ const setupAll = async () => {
 
   app.use(VueDOMPurifyHTML)
   app.use(DataVVue3)
+  app.use( vue_next_focus )
 
   app.mount('#app')
   app.config.warnHandler = () => null;
diff --git a/src/views/qms/inspectionJob/addForm.vue b/src/views/qms/inspectionJob/addForm.vue
index 5242a93c4..c65bc1f1b 100644
--- a/src/views/qms/inspectionJob/addForm.vue
+++ b/src/views/qms/inspectionJob/addForm.vue
@@ -12,7 +12,7 @@
         </div>
         <el-tabs v-model="editableTabsValue" class="demo-tabs" @edit="handleTabsEdit" type="border-card"
           tab-position="left" :stretch="false">
-          <el-tab-pane v-for="item in data.subList" :key="item.name" :label="item.processDescribe" :name="item.name">
+          <el-tab-pane v-for="item in data.subList" :key="item.name" :label="item.processDescribe" :name="item.name" v-next-focus>
             <div class="small-title">检验工序</div>
             <el-form :model="item" label-width="auto" :rules="rules" ref="formProcessRef">
               <el-row :gutter="20">
@@ -415,7 +415,7 @@
       list = await InspectionJobDetailPageApi.getInspectionJobDetailList(row.id)
       data.value.packageList = await InspectionJobPackageApi.getInspectionJobPackageList(row.id)
       list.forEach((item, index) => {
-        editableTabsValue.value = index + 1
+        // editableTabsValue.value = index + 1
         item.name = index + 1
         item.inspectionJobCharacteristicsUpdateReqVO = item.inspectionJobCharacteristicsRespVO
 
@@ -523,7 +523,7 @@
   defineExpose({ open, dialogVisible, formLoading }) // 提供 open 方法，用于打开弹窗
   import type { TabPaneName } from 'element-plus'
 
-  const editableTabsValue = ref('1')
+  const editableTabsValue = ref(1)
   // const editableTabs = ref([])
   const handleTabsEdit = (targetName : TabPaneName | undefined, action : 'remove' | 'add') => {
     if (action === 'add') {

From e397206bc2e005a71eafcf6fcaf6b61ce6f9bd24 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Mon, 8 Jul 2024 09:07:16 +0800
Subject: [PATCH 189/408] =?UTF-8?q?=E8=A1=A5=E6=96=99=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=B7=BB=E5=8A=A0=E5=88=B0=E5=BA=93=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repleinshRequestMain.data.ts                 | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
index 006c658d2..3fe21b653 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
@@ -629,6 +629,20 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain:true,
+    sortSearchDefault:1000,
+    isSearch: true,
+    sortTableDefault:1100,
+    // isTableForm: false,
+   
+  },
  
   // {
   //   label: '包装号',
@@ -784,7 +798,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     sortTableDefault:2,
     isTable:false,
   },
-
+ 
   {
     label: '从货主代码',
     field: 'fromOwnerCode',

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 190/408] =?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 a21caf1a85828574a004c88f24afb7d2bd268416 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Mon, 8 Jul 2024 10:28:34 +0800
Subject: [PATCH 191/408] =?UTF-8?q?=E8=A1=A5=E6=96=99=E7=94=B3=E8=AF=B7=20?=
 =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E9=A1=B5=E9=9D=A2=E5=88=B0=E5=BA=93?=
 =?UTF-8?q?=E4=BD=8D=E4=BB=A3=E7=A0=81=E6=98=AF=E5=BF=85=E5=A1=AB=E9=A1=B9?=
 =?UTF-8?q?=EF=BC=8C=E4=BD=86=E6=98=AF=E6=9C=AA=E6=A0=87=E8=AF=86=E3=80=82?=
 =?UTF-8?q?2.=E6=98=8E=E7=BB=86=E9=A1=B5=E9=9D=A2=E4=B8=8D=E7=BE=8E?=
 =?UTF-8?q?=E8=A7=82=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TableForm/src/TableForm.vue                    | 4 ++--
 .../repleinshRequestMain/repleinshRequestMain.data.ts         | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue
index af8cab620..ccb16064c 100644
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@@ -62,8 +62,8 @@
         :prop="headerItem.field"
         :align="headerItem?.tableForm?.align || 'center'"
         :sortable="headerItem?.tableForm?.sortable || false"
-        :width="headerItem?.tableForm?.width || '200px'"
-        :min-width="headerItem?.tableForm?.minWidth || 'auto'"
+        :width="headerItem?.tableForm?.width"
+        :min-width="headerItem?.tableForm?.minWidth || '200px'"
       >
         <el-form
           ref="TableBaseForm_Ref"
diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
index 3fe21b653..e12e661d9 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
@@ -498,6 +498,9 @@ export const RepleinshRequestMainRules = reactive({
   autoExecute: [
     { required: true, message: '请选择是否自动执行', trigger: 'change' }
   ],
+  toLocationCode: [
+    { required: true, message: '请输入到库位代码', trigger: ['change', 'blur']}
+  ],
   directCreateRecord: [
     { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
   ],
@@ -541,7 +544,6 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     tableForm:{
       isInpuFocusShow: true,
-      multiple:true,
       searchListPlaceholder: '请选择物料代码', // 输入框占位文本
       searchField: 'code', // 查询弹窗赋值字段
       searchTitle: '物料基础信息', // 查询弹窗标题

From 418390738f304a185a16e68e9ed7b63397ab2612 Mon Sep 17 00:00:00 2001
From: zhaoyiran <zhaoyrd@yonyou.com>
Date: Mon, 8 Jul 2024 10:29:19 +0800
Subject: [PATCH 192/408] =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E6=A0=B7=E6=9C=AC?=
 =?UTF-8?q?=E5=AD=97=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/validator.ts        | 13 +++++++++++++
 src/views/qms/aql/aql.data.ts |  4 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/utils/validator.ts b/src/utils/validator.ts
index 8a9d70261..b040b2ddf 100644
--- a/src/utils/validator.ts
+++ b/src/utils/validator.ts
@@ -788,6 +788,19 @@ export function validatePercent(rule, value, callback){
   }
 }
 
+export function validateSampleCode(rule, value, callback){
+  if (value) {
+    const orgReg =/[A-Z]/
+    if (orgReg.test(value)) {
+      callback()
+    } else {
+      callback(new Error('样本字码错误'))
+    }
+  } else {
+    callback()
+  }
+}
+
 export default {
     validateCode,
     validateEmail,
diff --git a/src/views/qms/aql/aql.data.ts b/src/views/qms/aql/aql.data.ts
index a9beb51be..4c9fa28fc 100644
--- a/src/views/qms/aql/aql.data.ts
+++ b/src/views/qms/aql/aql.data.ts
@@ -1,13 +1,13 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
 import { getSamplingScheme } from "@/api/qms/aql";
-import { validateNum } from "@/utils/validator";
+import {validateNum, validateSampleCode} from "@/utils/validator";
 
 // 表单校验
 export const AqlRules = reactive({
   code: [required],
   inspectionQualification: [required],
-  sampleCharacterCode: [required, {max: 1, message: '长度不得超过1个字符', trigger: 'blur' }],
+  sampleCharacterCode: [required, {max: 1, message: '长度不得超过1个字符', trigger: 'blur' }, {validator: validateSampleCode, message: '请输入1个大写字母', trigger: 'blur' }],
   sampleQty: [required,{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
   a0separator010: [required,{  validator: validateNum, message: '请输入整数', trigger: 'blur' }],
   r0separator010: [required,{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],

From 74402ee4347f47bef4f934972f03090596ae4c3d Mon Sep 17 00:00:00 2001
From: bjang03 <259278618@qq.com>
Date: Mon, 8 Jul 2024 10:40:52 +0800
Subject: [PATCH 193/408] =?UTF-8?q?=E7=9B=98=E7=82=B9=E4=B8=BB=E8=A1=A8?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8C=89=E5=AD=97=E5=85=B8=E9=98=88=E5=80=BC?=
 =?UTF-8?q?=E6=8B=86=E5=88=86=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=AD=90=E8=A1=A8?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=93=E5=BA=93=E3=80=81=E5=BA=93=E5=8C=BA?=
 =?UTF-8?q?=E3=80=81=E5=BA=93=E4=BD=8D=E7=BB=84=E3=80=81=E5=BA=93=E4=BD=8D?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=AF=B9=E5=BA=94PC=E7=AB=AF?=
 =?UTF-8?q?=E5=8F=8A=E5=90=8E=E7=AB=AF=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../count/countJobMain/countJobMain.data.ts   | 27 ++++++++++++++
 .../count/countPlanMain/countPlanMain.data.ts | 32 ++++++++---------
 .../countRecordMain/countRecordMain.data.ts   | 35 ++++++++++++++-----
 .../countRequestMain/countRequestMain.data.ts | 25 ++++++++-----
 .../countadjustRecordMain.data.ts             | 34 +++++++++++-------
 .../countadjustRequestMain.data.ts            | 27 ++++++++++++++
 6 files changed, 135 insertions(+), 45 deletions(-)

diff --git a/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts b/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts
index c81addf77..4774927d0 100644
--- a/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts
+++ b/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts
@@ -27,6 +27,33 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '任务拆分方式',
+    field: 'countSplitType',
+    dictType: DICT_TYPE.COUNT_SPLIT_TYPE,
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:true,
+    isForm: true,
+    form: {
+      value: 'locationCode'
+    }
+
+  },
+  {
+    label: '任务拆分值',
+    field: 'countSplitCode',
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:true,
+    isForm: true
+  },
   {
     label: '计划单号',
     field: 'planNumber',
diff --git a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
index 64f38a54f..402a2964e 100644
--- a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
+++ b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
@@ -48,6 +48,22 @@ export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true
   },
+  {
+    label: '任务拆分方式',
+    field: 'countSplitType',
+    dictType: DICT_TYPE.COUNT_SPLIT_TYPE,
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:true,
+    isForm: true,
+    form: {
+      value: 'locationCode'
+    }
+
+  },
   {
     label: '',//执行周期
     field: 'crontab',
@@ -76,22 +92,6 @@ export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '任务拆分方式',
-    field: 'countSplitType',
-    dictType: DICT_TYPE.COUNT_SPLIT_TYPE,
-    dictClass: 'string',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:true,
-    isForm: true,
-    form: {
-      value: 'locationCode'
-    }
-
-  },
   {
     label: '维度',
     field: 'dimension',
diff --git a/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts b/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts
index 8b5029d6d..5e19bb62e 100644
--- a/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts
+++ b/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts
@@ -40,14 +40,33 @@ export const CountRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  // {
-  //   label: '仓库代码',
-  //   field: 'warehouseCode',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
+  {
+    label: '任务拆分方式',
+    field: 'countSplitType',
+    dictType: DICT_TYPE.COUNT_SPLIT_TYPE,
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:true,
+    isForm: true,
+    form: {
+      value: 'locationCode'
+    }
+
+  },
+  {
+    label: '任务拆分值',
+    field: 'countSplitCode',
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:true,
+    isForm: true
+  },
   {
     label: '阶段',
     field: 'stage',
diff --git a/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts b/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts
index 53a9b2930..ccb01037a 100644
--- a/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts
+++ b/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts
@@ -90,15 +90,22 @@ export const CountRequestMain = useCrudSchemas(<CrudSchema[]>([
     },
     isSearch: true,
   },
-  // {
-  //   label: '仓库代码',
-  //   field: 'warehouseCode',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   isSearch: true,
-  // },
+  {
+    label: '任务拆分方式',
+    field: 'countSplitType',
+    dictType: DICT_TYPE.COUNT_SPLIT_TYPE,
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:true,
+    isForm: true,
+    form: {
+      value: 'locationCode'
+    }
+
+  },
   {
     label: '申请时间',
     field: 'requestTime',
diff --git a/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts
index 32950081e..b79fd418e 100644
--- a/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts
+++ b/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts
@@ -24,22 +24,32 @@ export const CountadjustRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true
   },
-  // {
-  //   label: '盘点记录单号',
-  //   field: 'countRecordNumber',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 180
-  //   },
-  //   isSearch: true
-  // },
   {
-    label: '仓库代码',
-    field: 'warehouseCode',
+    label: '任务拆分方式',
+    field: 'countSplitType',
+    dictType: DICT_TYPE.COUNT_SPLIT_TYPE,
+    dictClass: 'string',
     sort: 'custom',
     table: {
       width: 150
     },
+    isTable:true,
+    isForm: true,
+    form: {
+      value: 'locationCode'
+    }
+
+  },
+  {
+    label: '任务拆分值',
+    field: 'countSplitCode',
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:true,
+    isForm: true
   },
   {
     label: '出库事务类型',
@@ -532,4 +542,4 @@ export const CountadjustRecordDetailRules =reactive({
   creator: [
     { required: true, message: '请输入创建者', trigger: 'blur' }
   ],
-})
\ No newline at end of file
+})
diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
index 490dfe82c..a88081343 100644
--- a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
+++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
@@ -55,6 +55,33 @@ export const CountadjustRequestMain = useCrudSchemas(<CrudSchema[]>([
     },
 
   },
+  {
+    label: '任务拆分方式',
+    field: 'countSplitType',
+    dictType: DICT_TYPE.COUNT_SPLIT_TYPE,
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:true,
+    isForm: true,
+    form: {
+      value: 'locationCode'
+    }
+
+  },
+  {
+    label: '任务拆分值',
+    field: 'countSplitCode',
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:true,
+    isForm: true
+  },
   // {
   //   label: '申请单号',
   //   field: 'requestNumber',

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 194/408] =?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 4808ead460bb5add33a3e53109206061b5e505ef Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Mon, 8 Jul 2024 10:59:51 +0800
Subject: [PATCH 195/408] =?UTF-8?q?=E5=88=B6=E5=93=81=E8=BF=94=E4=BF=AE?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=20=E8=BF=94=E4=BF=AE=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E7=BA=BF=E4=BB=A3=E7=A0=81=E6=98=AF=E5=BF=85=E5=A1=AB=E9=A1=B9?=
 =?UTF-8?q?=E4=BD=86=E6=98=AF=E6=9C=AA=E6=A0=87=E8=AF=86=EF=BC=8C=E8=A1=A5?=
 =?UTF-8?q?=E6=96=99=E7=94=B3=E8=AF=B7=E5=BA=94=E8=AF=A5=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E5=8F=AA=E8=83=BD=E6=B7=BB=E5=8A=A0=E4=B8=80=E6=9D=A1=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../issueManage/repleinsh/repleinshRequestMain/index.vue | 9 ++++++---
 .../productrepairRequestMain.data.ts                     | 7 +++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
index 74040ff72..d1a83f67e 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
+++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
@@ -118,6 +118,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           newRow['itemCode'] = item['code']
           newRow['uom'] = item['uom']
           newRow['id'] = item['id']
+          newRow['toLocationCode'] = formRef.formModel['toLocationCode']
           tableData.value.push(newRow)
         })
       } else {
@@ -359,6 +360,7 @@ const tableData = ref([])
 // 添加明细
 const handleAddTable = () => {
   tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+  
 }
 // 删除明细
 const handleDeleteTable = (item, index) => {
@@ -376,10 +378,11 @@ const submitForm = async (formType, submitData) => {
   if(data.masterId){
     data.id = data.masterId
   }
-  tableData.value.forEach(item=>{
-    item.toLocationCode = data.toLocationCode
-  })
   data.subList = tableData.value // 拼接子表数据参数
+  if( data.subList.length>1){
+    message.warning('明细只能选择一条数据')
+    return;
+  }
   if(tableData.value.find(item => (item.qty <= 0))) {
     message.warning('数量必须大于0')
     formRef.value.formLoading = false
diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
index 45a183c70..309e89bc0 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
+++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
@@ -118,7 +118,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     sortTableDefault:4,
     tableForm:{
       isInpuFocusShow: true,
-      searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+      searchListPlaceholder: '请选择返修生产线代码', // 输入框占位文本
       searchField: 'code', // 查询弹窗赋值字段
       searchTitle: '生产线信息', // 查询弹窗标题
       searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
@@ -138,7 +138,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       // labelMessage: '信息提示说明！！！',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+        searchListPlaceholder: '请选择返修生产线代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '生产线信息', // 查询弹窗标题
         searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
@@ -501,6 +501,9 @@ export const ProductrepairRequestMainRules = reactive({
   workshopCode: [
     { required: true, message: '请选择车间代码', trigger: 'change' }
   ],
+  productionLineCode: [
+    { required: true, message: '请选择返修生产线', trigger: 'change' }
+  ],
   // dueTime: [
   //   { required: true, message: '请选择截止时间', trigger: 'change' }
   // ],

From f48cbf6529686b943c55d4a89c00cfe29179bb5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com>
Date: Mon, 8 Jul 2024 11:04:49 +0800
Subject: [PATCH 196/408] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equipmentMainPart.data.ts                 | 274 +++++++++---------
 src/views/eam/itemAccounts/index.vue          |  44 ++-
 .../SparePartsApply.data.ts                   |   3 +-
 src/views/eam/sparePartsApplyMain/index.vue   |  10 +-
 4 files changed, 176 insertions(+), 155 deletions(-)

diff --git a/src/views/eam/equipmentMainPart/equipmentMainPart.data.ts b/src/views/eam/equipmentMainPart/equipmentMainPart.data.ts
index ed90c0233..04decb155 100644
--- a/src/views/eam/equipmentMainPart/equipmentMainPart.data.ts
+++ b/src/views/eam/equipmentMainPart/equipmentMainPart.data.ts
@@ -5,148 +5,150 @@ import { dateFormatter } from '@/utils/formatTime'
 export const EquipmentMainPartRules = reactive({
   name: [required],
   code: [required],
-  type: [required],
+  type: [required]
 })
 
-export const EquipmentMainPart = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: 'id',
-    field: 'id',
-    sort: 'custom',
-    isSearch: false,
-    isTable: false,
-    isForm: false,
-    isDetail:false,
-  },
-  {
-    label: '编码',
-    field: 'code',
-    sort: 'custom',
-    isSearch: true,
-  },
-  {
-    label: '名称',
-    field: 'name',
-    sort: 'custom',
-    isSearch: true,
-  },
-  {
-    label: '类型',
-    field: 'type',
-    sort: 'custom',
-    dictType: DICT_TYPE.DEVICE_TYPE,
-    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    isSearch: true,
-    form: {
-      component: 'Select'
-    }
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: true,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
+export const EquipmentMainPart = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: 'id',
+      field: 'id',
+      sort: 'custom',
+      isSearch: false,
+      isTable: false,
+      isForm: false,
+      isDetail: false
+    },
+    {
+      label: '编码',
+      field: 'code',
+      sort: 'custom',
+      isSearch: true
     },
-    isForm: false,
-  },
-  {
-    label: '部门id',
-    field: 'departmentCode',
-    sort: 'custom',
-    isSearch: false,
-    isTable: false,
-    isForm: false,
-    isDetail:false,
-  },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    isSearch: false,
-  },
-  {
-    label: '地点ID',
-    field: 'siteId',
-    sort: 'custom',
-    isSearch: false,
-    isTable: false,
-    isForm: false,
-    isDetail:false,
-  },
-  {
-    label: '是否启用',
-    field: 'available',
-    sort: 'custom',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    isTable: true,
-    isDetail: false,
-    isSearch: false,
-    isTableForm: false,
-    isForm: false,
-  },
-  {
-    label: '删除时间',
-    field: 'deletionTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: false,
-    isTable: false,
-    isForm: false,
-    isDetail:false,
-    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: 'name',
+      sort: 'custom',
+      isSearch: true
+    },
+    {
+      label: '类型',
+      field: 'type',
+      sort: 'custom',
+      dictType: DICT_TYPE.DEVICE_TYPE,
+      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+      isSearch: true,
+      form: {
+        component: 'Select'
       }
     },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
+    {
+      label: '创建时间',
+      field: 'createTime',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isSearch: true,
+      search: {
+        component: 'DatePicker',
+        componentProps: {
+          valueFormat: 'YYYY-MM-DD HH:mm:ss',
+          type: 'daterange',
+          defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+        }
+      },
+      isForm: false
+    },
+    {
+      label: '部门id',
+      field: 'departmentCode',
+      sort: 'custom',
+      isSearch: false,
+      isTable: false,
+      isForm: false,
+      isDetail: false
+    },
+    {
+      label: '备注',
+      field: 'remark',
+      sort: 'custom',
+      isSearch: false
+    },
+    {
+      label: '地点ID',
+      field: 'siteId',
+      sort: 'custom',
+      isSearch: false,
+      isTable: false,
+      isForm: false,
+      isDetail: false
+    },
+    {
+      label: '是否启用',
+      field: 'available',
+      sort: 'custom',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+      isTable: true,
+      isDetail: false,
+      isSearch: false,
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '删除时间',
+      field: 'deletionTime',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isSearch: false,
+      isTable: false,
+      isForm: false,
+      isDetail: false,
+      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: '删除人id',
-    field: 'deleterId',
-    sort: 'custom',
-    isSearch: false,
-    isTable: false,
-    isForm: false,
-    isDetail:false,
-  },
-  {
-    label: '并发乐观锁',
-    field: 'concurrencyStamp',
-    sort: 'custom',
-    isSearch: false,
-    isTable: false,
-    isForm: false,
-    isDetail:false,
-    form: {
-      component: 'InputNumber',
-      value: 0
+    {
+      label: '删除人id',
+      field: 'deleterId',
+      sort: 'custom',
+      isSearch: false,
+      isTable: false,
+      isForm: false,
+      isDetail: false
     },
-  },
-  {
-    label: '操作',
-    field: 'action',
-    isForm: false,
-    table: {
-      width: 150,
-      fixed: 'right'
+    {
+      label: '并发乐观锁',
+      field: 'concurrencyStamp',
+      sort: 'custom',
+      isSearch: false,
+      isTable: false,
+      isForm: false,
+      isDetail: false,
+      form: {
+        component: 'InputNumber',
+        value: 0
+      }
+    },
+    {
+      label: '操作',
+      field: 'action',
+      isForm: false,
+      table: {
+        width: 150,
+        fixed: 'right'
+      }
     }
-  }
-]))
+  ])
+)
diff --git a/src/views/eam/itemAccounts/index.vue b/src/views/eam/itemAccounts/index.vue
index 2369ba9cb..3e8f617a3 100644
--- a/src/views/eam/itemAccounts/index.vue
+++ b/src/views/eam/itemAccounts/index.vue
@@ -31,9 +31,9 @@
       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>
+      <template #itemNumber="{ row }">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.itemNumber)">
+          <span>{{ row.itemNumber }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
@@ -42,13 +42,6 @@
           @button-base-click="buttonTableClick($event, row)"
         />
       </template>
-      <!-- <template #upload="{ row }">
-        <ButtonBase
-          v-if="row.filePathList != null && row.filePathList.length != 0"
-          :Butttondata="butttondataView(row)"
-          @button-base-click="buttonTableClick($event, row)"
-        />
-      </template> -->
     </Table>
   </ContentWrap>
 
@@ -67,7 +60,20 @@
   <SearchTable ref="searchTableRef" @searchTableSuccess="submitItem" />
 
   <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="true" :allSchemas="ItemAccounts.allSchemas" />
+  <DetailLedger
+    ref="detailRef"
+    :isBasic="true"
+    :allSchemas="ItemAccounts.allSchemas"
+    :subTabs="subTabList"
+    :operationRecordList="operationRecordList"
+    @handleOperationTabsChange="handleOperationTabsChange"
+    :detailAllSchemas="detailAllSchemas"
+    :apiPage="apiPage"
+    :dialogApiPage="dialogApiPage"
+    :dialogAllSchemas="dialogAllSchemas"
+    :dynamicInfoFields="dynamicInfoFields"
+    funcCode="tool_mould_file"
+  />
 
   <!-- 导入 -->
   <ImportForm
@@ -309,6 +315,20 @@ const openForm = (type: string, row?: any) => {
     urls.value = row.filePathList
     viewKey.value += 1
   } else {
+    if (type == 'create') {
+      ItemAccounts.allSchemas.formSchema.forEach((item) => {
+        if (item.field == 'qty') {
+          item.componentProps.disabled = false
+        }
+      })
+    } else if (type == 'update') {
+      ItemAccounts.allSchemas.formSchema.forEach((item) => {
+        if (item.field == 'qty') {
+          item.componentProps.disabled = true
+        }
+      })
+    }
+
     basicFormRef.value.open(type, row)
   }
 }
@@ -340,7 +360,7 @@ const formsSuccess = async (formType, data) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue, 'basicItemAccounts')
+  detailRef.value.openDetail(row, titleName, titleValue, 'ItemAccounts')
 }
 
 /** 删除按钮操作 */
diff --git a/src/views/eam/sparePartsApplyMain/SparePartsApply.data.ts b/src/views/eam/sparePartsApplyMain/SparePartsApply.data.ts
index 287a1e917..aee2c495a 100644
--- a/src/views/eam/sparePartsApplyMain/SparePartsApply.data.ts
+++ b/src/views/eam/sparePartsApplyMain/SparePartsApply.data.ts
@@ -208,7 +208,7 @@ export const SparePartsApplyMain = useCrudSchemas(
       isForm: false
     },
     {
-      label: '操作11',
+      label: '操作',
       field: 'action',
       isForm: false,
       table: {
@@ -257,7 +257,6 @@ export const SparePartsApplyDetail = useCrudSchemas(
         searchListPlaceholder: '请选择备件编号', // 输入框占位文本
         searchField: 'itemNumber', // 查询弹窗赋值字段
         searchTitle: '备件信息', // 查询弹窗标题
-
         searchAllSchemas: ItemAccounts.allSchemas, // 查询弹窗所需类
         searchPage: ItemAccountsApi.getItemAccountsPage, // 查询弹窗所需分页方法
         searchCondition: [
diff --git a/src/views/eam/sparePartsApplyMain/index.vue b/src/views/eam/sparePartsApplyMain/index.vue
index ddb76807f..c1e7127d1 100644
--- a/src/views/eam/sparePartsApplyMain/index.vue
+++ b/src/views/eam/sparePartsApplyMain/index.vue
@@ -254,11 +254,11 @@ const butttondata = (row) => {
     defaultButtons.mainListApproveBtn({
       hide: isShowStatusButton(row, ['3']),
       hasPermi: 'eam:spare-parts-in-location-main:approve'
-    }), //审批通过
-    defaultButtons.mainListFinishBtn({
-      hide: isShowStatusButton(row, ['4']),
-      hasPermi: 'eam:spare-parts-in-location-main:finish'
-    }) //完成
+    }) //审批通过
+    // defaultButtons.mainListFinishBtn({
+    //   hide: isShowStatusButton(row, ['4']),
+    //   hasPermi: 'eam:spare-parts-in-location-main:finish'
+    // }) //完成
   ]
 }
 

From 9ae975ac0d9368b612f797de8cb322d7de8560c1 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 8 Jul 2024 11:10:13 +0800
Subject: [PATCH 197/408] =?UTF-8?q?=E5=85=B3=E9=97=AD=E7=BF=BB=E5=8C=85?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/packageoverJobMain/index.ts       |  4 ++
 .../packageoverJobMain/index.vue              | 38 ++++++++++++++-----
 .../packageoverJobMain.data.ts                | 18 ++++-----
 3 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/src/api/wms/packageoverJobMain/index.ts b/src/api/wms/packageoverJobMain/index.ts
index dcd1df373..6ce1b6c77 100644
--- a/src/api/wms/packageoverJobMain/index.ts
+++ b/src/api/wms/packageoverJobMain/index.ts
@@ -69,6 +69,10 @@ export const updatePackageoverJobMain = async (data: PackageoverJobMainVO) => {
 export const deletePackageoverJobMain = async (id: number) => {
   return await request.delete({ url: `/wms/packageover-job-main/delete?id=` + id })
 }
+// 关闭翻包任务主
+export const closePackageoverJobMain = async (id: number) => {
+  return await request.put({ url: `/wms/packageover-job-main/close?id=` + id })
+}
 
 // 导出翻包任务主 Excel
 export const exportPackageoverJobMain = async (params) => {
diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue
index 9f4aade48..9450acd5e 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue
@@ -33,9 +33,9 @@
           <span>{{ row.number }}</span>
         </el-button>
       </template>
-      <!-- <template #action="{ row,$index }">
+      <template #action="{ row,$index }">
         <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
-      </template> -->
+      </template>
     </Table>
   </ContentWrap>
 
@@ -138,16 +138,34 @@ const buttonBaseClick = (val, item) => {
     console.log('其他按钮', item)
   }
 }
-
-// 列表-操作按钮
-const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'wms:packageover-job-main:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'wms:packageover-job-main: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:packageover-job-main:update'}), // 编辑
+    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:packageover-job-main:close'}), // 关闭
+    // defaultButtons.mainListDeleteBtn({hasPermi:'wms:packageover-job-main:delete'}), // 删除
+  ]
+}
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row, val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
-  if (val == 'edit') { // 编辑
+  if (val == 'mainClose') { // 关闭
+    // 发起关闭
+    await message.confirm('确认要关闭吗？')
+    await PackageoverJobMainApi.closePackageoverJobMain(row.masterId)
+    // 刷新列表
+    await getList()
+  }else if (val == 'edit') { // 编辑
     openForm('update', row)
   } else if (val == 'delete') { // 删除
     handleDelete(row.masterId)
diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts
index 6ba16b567..6a0c13ec8 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts
@@ -523,15 +523,15 @@ export const PackageoverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTable: false
   },
-  // {
-  //   label: '操作',
-  //   field: 'action',
-  //   isForm: false,
-  //   table: {
-  //     width: 150,
-  //     fixed: 'right'
-  //   }
-  // }
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
 ]))
 
 // 表单校验

From 19cbb1faec1b1eec515a5ac802533f005c71a7b2 Mon Sep 17 00:00:00 2001
From: bjang03 <259278618@qq.com>
Date: Mon, 8 Jul 2024 11:18:28 +0800
Subject: [PATCH 198/408] =?UTF-8?q?=E7=9B=98=E7=82=B9=E4=B8=BB=E8=A1=A8?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8C=89=E5=AD=97=E5=85=B8=E9=98=88=E5=80=BC?=
 =?UTF-8?q?=E6=8B=86=E5=88=86=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=AD=90=E8=A1=A8?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=93=E5=BA=93=E3=80=81=E5=BA=93=E5=8C=BA?=
 =?UTF-8?q?=E3=80=81=E5=BA=93=E4=BD=8D=E7=BB=84=E3=80=81=E5=BA=93=E4=BD=8D?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=AF=B9=E5=BA=94PC=E7=AB=AF?=
 =?UTF-8?q?=E5=8F=8A=E5=90=8E=E7=AB=AF=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../count/countPlanMain/countPlanMain.data.ts | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
index 402a2964e..64f38a54f 100644
--- a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
+++ b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
@@ -48,22 +48,6 @@ export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true
   },
-  {
-    label: '任务拆分方式',
-    field: 'countSplitType',
-    dictType: DICT_TYPE.COUNT_SPLIT_TYPE,
-    dictClass: 'string',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:true,
-    isForm: true,
-    form: {
-      value: 'locationCode'
-    }
-
-  },
   {
     label: '',//执行周期
     field: 'crontab',
@@ -92,6 +76,22 @@ export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '任务拆分方式',
+    field: 'countSplitType',
+    dictType: DICT_TYPE.COUNT_SPLIT_TYPE,
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:true,
+    isForm: true,
+    form: {
+      value: 'locationCode'
+    }
+
+  },
   {
     label: '维度',
     field: 'dimension',

From f072712276cb9ce8d9117b72cbc63d62ac8713ad Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 8 Jul 2024 11:24:06 +0800
Subject: [PATCH 199/408] =?UTF-8?q?=E6=A3=80=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicForm.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 378a2ba07..5fa0fbd9a 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -615,12 +615,14 @@ const submitForm = async () => {
     formLoading.value = true
     if (formType.value == 'create') {
       const validateForm = await tableFormRef.value.validateForm()
-      if (props.tableFormDataLength) {
+      if (!validateForm && props.tableFormDataLength) {
         if (props.tableData.length == 0) {
           message.warning('请填写明细信息！')
           formLoading.value = false
           return
         }
+        formLoading.value = false
+        return
       }
       // 主子表——提交请求
       try {

From 1783ce55eff5a31442e31b77c76de4d1a9bca88e Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Mon, 8 Jul 2024 11:43:05 +0800
Subject: [PATCH 200/408] =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=95=BF=E5=BA=A6=E4=B8=BA0=E7=9A=84=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TableForm/src/TableForm.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue
index ccb16064c..5db0a2b76 100644
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@@ -607,6 +607,9 @@ 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
+  }
   return Promise.all(_lists)
     .then(() => {
       return true

From ac5f51510de5574ccaf4f4c9e949b7fb6b4c25bb Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 8 Jul 2024 12:17:17 +0800
Subject: [PATCH 201/408] =?UTF-8?q?=E5=8F=91=E6=96=99=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A1=B5=E9=9D=A2=E7=9A=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../issue/issueRequestMain/index.vue          | 32 ++++++++++++-
 .../issueRequestMain/issueRequestMain.data.ts | 47 ++++++++++---------
 2 files changed, 55 insertions(+), 24 deletions(-)

diff --git a/src/views/wms/issueManage/issue/issueRequestMain/index.vue b/src/views/wms/issueManage/issue/issueRequestMain/index.vue
index b70b6f50c..cac4c9dcd 100644
--- a/src/views/wms/issueManage/issue/issueRequestMain/index.vue
+++ b/src/views/wms/issueManage/issue/issueRequestMain/index.vue
@@ -42,6 +42,8 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
     ref="formRef"
+    :isOpenSearchTable="true"
+    fieldTableColumn="itemCode"
     @success="getList"
     :rules="IssueRequestMainRules"
     :formAllSchemas="IssueRequestMain.allSchemas"
@@ -57,6 +59,7 @@
     @tableSelectionDelete="tableSelectionDelete"
     @searchTableSuccess="searchTableSuccess"
     @submitForm="submitForm"
+    @onEnter="onEnter"
   />
 
   <!-- 详情 -->
@@ -104,14 +107,39 @@ const updataTableColumns = (val) => {
   tableColumns.value = val
 }
 
+const onEnter = async (field,value) => {
+  if (field == 'productionLineCode') {
+    //生产线
+    let res = await WorkstationApi.getWorkstationPage({
+      productionLineCode:value,
+      pageSize: 20,
+      pageNo: 1
+    })
+    if(res&&res.list&&res.list.length>0){
+      const setV = {}
+      setV['workStationCode'] = res.list[0].code
+      formRef.value.formRef.setValues(setV)
+    }
+  }
+}
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
   nextTick(async() => {
     if (type == 'tableForm') {
       // 明细查询页赋值
       if (formField == 'itemCode') {
-        row['itemCode'] = val[0]['code']
-        row['uom'] = val[0]['uom']
+        val.forEach(item=>{
+          let tableForm = JSON.parse(JSON.stringify(tableFormKeys))
+          if (tableData.value.length > 0) {
+            tableForm.productionLineCode = tableData.value[0].productionLineCode
+            tableForm.workStationCode = tableData.value[0].workStationCode
+          }
+          if(tableData.value.find(item1=>item1['itemCode'] == item['itemCode'])) return
+          const newRow = JSON.parse(JSON.stringify({...tableForm,...item}))
+          newRow['itemCode'] = item['code']
+          newRow['uom'] = item['uom']
+          tableData.value.push(newRow)
+        })
       } else {
         row[formField] = val[0][searchField]
       }
diff --git a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
index 4b131b1bb..38245d0f1 100644
--- a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
+++ b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
@@ -112,6 +112,7 @@ export const IssueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch:true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
@@ -161,6 +162,7 @@ export const IssueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch:true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择工位代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
@@ -766,6 +768,7 @@ export const IssueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     sortSearchDefault:2,
     sortTableDefault:3,
     tableForm:{
+      multiple: true,
       enterSearch:true,
       isInpuFocusShow: true,
       isSearchList: true, // 开启查询弹窗
@@ -809,7 +812,27 @@ export const IssueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain:true,
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    }
+  },
 
   {
     label: '计量单位',
@@ -991,27 +1014,7 @@ export const IssueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isTableForm: false,
     isForm: false
   },
-  {
-    label: '数量',
-    field: 'qty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    tableForm: {
-      type: 'InputNumber',
-      min: 0,
-      precision: 6
-    },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        min: 0,
-        precision: 6
-      }
-    }
-  },
+  
   {
     label: '从货主代码',
     field: 'fromOwnerCode',

From 293b4f9b209feb94085afbf3cfaedb53da8ed150 Mon Sep 17 00:00:00 2001
From: zhaoyiran <zhaoyrd@yonyou.com>
Date: Mon, 8 Jul 2024 13:36:10 +0800
Subject: [PATCH 202/408] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/user/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 44b6e5f7a..361595667 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -90,7 +90,7 @@
   </el-row>
 
   <!-- 添加或修改用户对话框 -->
-  <!-- <UserForm ref="formRef" @success="getList" /> -->
+   <UserForm ref="formRef" @success="getList" />
    <!-- 导入 -->
    <ImportForm ref="importFormRef" url="/system/user/import" :updateIsDisable='true' :coverIsDisable='true'  :mode='2' :importTemplateData="importTemplateData" @success="importSuccess" />
 

From 8b3ae7d8a24b7b6b07b40a55b95907dcfce1a83a Mon Sep 17 00:00:00 2001
From: zhaoyiran <zhaoyrd@yonyou.com>
Date: Mon, 8 Jul 2024 14:05:36 +0800
Subject: [PATCH 203/408] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/inspectionJob/addForm.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/qms/inspectionJob/addForm.vue b/src/views/qms/inspectionJob/addForm.vue
index c65bc1f1b..820e72c4a 100644
--- a/src/views/qms/inspectionJob/addForm.vue
+++ b/src/views/qms/inspectionJob/addForm.vue
@@ -195,7 +195,7 @@
                     </el-col>
                     <el-col :span="12" v-if="item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1">
                       <el-form-item label="不合格数量" required>
-                        <el-input v-model="cur.unqualifiedQuantity" type="number" placeholder="请输入不合格数量" />
+                        <el-input v-model="cur.unqualifiedQuantity" type="number" placeholder="请输入不合格数量"/>
                       </el-form-item>
                     </el-col>
                     <el-col :span="12" v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == '0'">
@@ -444,8 +444,8 @@
               inspectionValue: '', //检验值
               qualitativeCode: '', //定性字典项值
               defectLevel: '', //缺陷级别
-              qualifiedQuantity: '', //合格数量
-              unqualifiedQuantity: '' //不合格数量
+              qualifiedQuantity: allSamplePieceSize.value, //合格数量
+              unqualifiedQuantity: '0' //不合格数量
             }
             )
           }

From c46c883768223913c19272bab7788e218b1d3467 Mon Sep 17 00:00:00 2001
From: zhaoyiran <zhaoyrd@yonyou.com>
Date: Mon, 8 Jul 2024 14:31:56 +0800
Subject: [PATCH 204/408] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/inspectionJob/addForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/qms/inspectionJob/addForm.vue b/src/views/qms/inspectionJob/addForm.vue
index 820e72c4a..9889e083e 100644
--- a/src/views/qms/inspectionJob/addForm.vue
+++ b/src/views/qms/inspectionJob/addForm.vue
@@ -444,7 +444,7 @@
               inspectionValue: '', //检验值
               qualitativeCode: '', //定性字典项值
               defectLevel: '', //缺陷级别
-              qualifiedQuantity: allSamplePieceSize.value, //合格数量
+              qualifiedQuantity: parseFloat((parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty) * parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.samplePieceSize)).toFixed(6)), //合格数量
               unqualifiedQuantity: '0' //不合格数量
             }
             )

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 205/408] =?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 206/408] =?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 207/408] 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 208/408] =?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 209/408] =?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 210/408] =?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 9f5379ab3c241c5892dc3c760e919924693f118d Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Mon, 8 Jul 2024 16:36:58 +0800
Subject: [PATCH 211/408] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=8A=A0=E5=9B=9E=E5=88=B0=E9=A1=B6=E9=83=A8=EF=BC=8C=E6=A3=80?=
 =?UTF-8?q?=E9=AA=8C=E6=96=B9=E6=A1=88=E5=8A=A0=E5=A4=8D=E5=88=B6=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/inspectionJob/addForm.vue      | 15 +++-
 src/views/qms/inspectionScheme/addForm.vue   | 79 +++++++++++++++++++-
 src/views/qms/inspectionScheme/index.vue     |  3 +
 src/views/qms/inspectionTemplate/addForm.vue |  3 +-
 4 files changed, 95 insertions(+), 5 deletions(-)

diff --git a/src/views/qms/inspectionJob/addForm.vue b/src/views/qms/inspectionJob/addForm.vue
index 9889e083e..7bdea4cda 100644
--- a/src/views/qms/inspectionJob/addForm.vue
+++ b/src/views/qms/inspectionJob/addForm.vue
@@ -2,7 +2,8 @@
   <div>
     <Dialog :title="dialogTitle" v-model="dialogVisible" :width="dialogWidth" :close-on-click-modal="false"
       :vLoading="formLoading">
-      <div style="max-height: 80vh; overflow-y: auto; padding: 0px 20px">
+      <div class="box" style="max-height: 80vh; overflow-y: auto; padding: 0px 20px" ref="mianscroll">
+        <el-backtop :right="40" :bottom="100"  target='.box' @click="topScrollClick"/>
         <Form ref="formMainRef" :rules="rules" :schema="formSchema" :is-col="true" @opensearchTable="opensearchTable" />
         <div class="small-title">包装列表</div>
         <div style="border:1px solid #dedede;margin-bottom:20px;display: flex;">
@@ -1031,6 +1032,12 @@
     cur.defectLevel = obj.defectLevel
     cur.estimateCode = obj.estimateCode
   }
+  const mianscroll  =ref()
+  const  topScrollClick=()=> {
+   nextTick(() => {
+     mianscroll.value.scrollTo({ top: 550, behavior: 'smooth' });
+   })
+ }
 </script>
 <style scoped>
   .small-title {
@@ -1042,11 +1049,15 @@
 </style>
 <style>
   .el-tabs--left .el-tabs__header.is-left {
-    min-height: 700px !important;
+    padding-bottom: 5000px;
+    margin-bottom: -5000px;
     min-width: 150px !important;
   }
 
   .el-tabs--left.el-tabs--border-card .el-tabs__item.is-left {
     min-width: 120px !important;
   }
+  .el-backtop{
+    position: absolute!important;
+  }
 </style>
diff --git a/src/views/qms/inspectionScheme/addForm.vue b/src/views/qms/inspectionScheme/addForm.vue
index e0c398eb2..80b2c576c 100644
--- a/src/views/qms/inspectionScheme/addForm.vue
+++ b/src/views/qms/inspectionScheme/addForm.vue
@@ -819,7 +819,77 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
   isShowField.value = 0 //设置isShowField == 0隐藏aql和检验水平字段
   if (row) {
     data.value = JSON.parse(JSON.stringify(row))
-    let list = []
+    // 如果点击复制进入
+    if(formType.value == 'create'){
+      data.value.id = ''
+      data.value.code = ''
+      data.value.itemCode = ''
+      data.value.process= []
+      let list =[]
+      if (row.content) {
+      list = JSON.parse(row.content)
+    } else {
+      list = await InspectionProcessPageApi.getListByTempleteCode(row.programmeTemplateCode)
+    }
+      let arr = []
+      list.forEach((item, index) => {
+        editableTabsValue.value = index + 1
+        item.name = index + 1
+        console.log(item.inspectionCharacteristicsBaseVO)
+        
+        let obj = {
+          inspectionCode:item.inspectionCode,
+          description:item.description,
+          inspectionCharCode:item.inspectionCharCode,
+          sequenceCode:item.sequenceCode,
+          name : index + 1,
+          inspectionCharacteristicsBaseVO:{
+            description:item.inspectionCharacteristicsBaseVO.description,
+            featureType:item.inspectionCharacteristicsBaseVO.featureType,
+            inspectionMethodCode:item.inspectionCharacteristicsBaseVO.inspectionMethodCode,
+            inspectionMethodName:item.inspectionCharacteristicsBaseVO.inspectionMethodName,
+            samplingProcessCode:item.inspectionCharacteristicsBaseVO.samplingProcessCode,
+            
+            isCanUpdate:item.inspectionCharacteristicsBaseVO.isCanUpdate,
+            isDestructionInspection:item.inspectionCharacteristicsBaseVO.isDestructionInspection,
+            quantifyCapping:item.inspectionCharacteristicsBaseVO.quantifyCapping,
+            quantifyDecimal:item.inspectionCharacteristicsBaseVO.quantifyDecimal,
+            quantifyIsCapping:item.inspectionCharacteristicsBaseVO.quantifyIsCapping,
+            quantifyIsLowlimit:item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit,
+            quantifyIsTarget:item.inspectionCharacteristicsBaseVO.quantifyIsTarget,
+            quantifyLowlimit:item.inspectionCharacteristicsBaseVO.quantifyLowlimit,
+            quantifyQuantifyCode:item.inspectionCharacteristicsBaseVO.quantifyQuantifyCode,
+            quantifyQuantifyName:item.inspectionCharacteristicsBaseVO.quantifyQuantifyName,
+            quantifyTarget:item.inspectionCharacteristicsBaseVO.quantifyTarget,
+            quantifyUom:item.inspectionCharacteristicsBaseVO.quantifyUom,
+            resultEntryMethod:item.inspectionCharacteristicsBaseVO.resultEntryMethod,
+            samplingProcessCode:item.inspectionCharacteristicsBaseVO.samplingProcessCode,
+            samplingProcessName:item.inspectionCharacteristicsBaseVO.samplingProcessName,
+          }
+        }
+        
+        // 编辑判断上限下限目标值是否必填
+        if (item.inspectionCharacteristicsBaseVO.quantifyIsCapping) {
+          rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = true
+        } else {
+          rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = false
+        }
+        if (item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit) {
+          rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = true
+        } else {
+          rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = false
+        }
+        if (item.inspectionCharacteristicsBaseVO.quantifyIsTarget) {
+          rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = true
+        } else {
+          rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = false
+        }
+        arr.push(obj)
+      })
+      data.value.process = arr
+      console.log(111, data.value)
+    }else{
+      let list = []
     if (row.content) {
       list = JSON.parse(row.content)
     } else {
@@ -858,6 +928,10 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
       rules.value.aql[0].required = false
     }
     data.value.process = list
+    }
+   
+   
+   
   } else {
     data.value = {
       code: '',
@@ -1323,7 +1397,8 @@ const changeIsTarget = (e, item) => {
 </style>
 <style>
 .el-tabs--left .el-tabs__header.is-left {
-  min-height: 700px !important;
+    padding-bottom: 5000px;
+    margin-bottom: -5000px;
   min-width: 150px !important;
 }
 .el-tabs--left.el-tabs--border-card .el-tabs__item.is-left {
diff --git a/src/views/qms/inspectionScheme/index.vue b/src/views/qms/inspectionScheme/index.vue
index 2403a3b42..c1726aa0f 100644
--- a/src/views/qms/inspectionScheme/index.vue
+++ b/src/views/qms/inspectionScheme/index.vue
@@ -139,6 +139,7 @@ const butttondata = (row) => {
     defaultButtons.mainListEditBtn({hasPermi: 'qms:inspection-scheme:update'}),
     defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'qms:inspection-scheme:enable'}),
     defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'qms:inspection-scheme:disable'}),
+    defaultButtons.mainCopyBtn({hasPermi:'qms:programme-template:copy'}),
   ]
 }
 
@@ -152,6 +153,8 @@ const buttonTableClick = async (val, row) => {
     handleEnable(row.id)
   }else if (val == 'disable') {
     handleDisable(row.id)
+  }else if (val == 'copy') {
+    openForm('create', row)
   }
 }
 
diff --git a/src/views/qms/inspectionTemplate/addForm.vue b/src/views/qms/inspectionTemplate/addForm.vue
index e3e983539..4d2fc4d38 100644
--- a/src/views/qms/inspectionTemplate/addForm.vue
+++ b/src/views/qms/inspectionTemplate/addForm.vue
@@ -1027,7 +1027,8 @@ const changeIsTarget = (e,item) => {
 </style>
 <style>
 .el-tabs--left .el-tabs__header.is-left {
-  min-height: 700px !important;
+    padding-bottom: 5000px;
+    margin-bottom: -5000px;
   min-width: 150px !important;
 }
 .el-tabs--left.el-tabs--border-card .el-tabs__item.is-left {

From c3502f85a032e0c0147311528c9e18dc587f8bbf Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Mon, 8 Jul 2024 16:39:49 +0800
Subject: [PATCH 212/408] =?UTF-8?q?BOM=E7=89=88=E6=9C=AC=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E9=80=89=E4=B8=AD=E7=89=88=E6=9C=AC1?=
 =?UTF-8?q?=EF=BC=8C=E6=89=B9=E6=AC=A1=E3=80=81=E5=8D=95=E4=BB=B7=E3=80=81?=
 =?UTF-8?q?=E9=87=91=E9=A2=9D=E3=80=81=E6=9D=A5=E6=BA=90=E5=BA=93=E4=BD=8D?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E9=9A=90=E8=97=8F=E6=88=96=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productscrapRequestMain/index.vue         | 21 ++++++++++++++++++-
 .../productscrapRequestMain.data.ts           | 13 +++++++++---
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
index a4a2d241d..5243a5682 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
@@ -116,6 +116,7 @@ import * as ProductscrapRequestDetailApi from '@/api/wms/productscrapRequestDeta
 import * as StdcostpriceApi from '@/api/wms/stdcostprice'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as BomDismantleApi from "@/api/wms/bomDismantle"
+import * as BomApi from "@/api/wms/bom";
 
 // 制品报废申请
 defineOptions({ name: 'ProductscrapRequestMain' })
@@ -314,7 +315,25 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           console.log(res)
           row['uom'] = res.uom
           row['singlePrice'] = res.price
-        })
+        }) 
+        // 查看BOM版本
+        console.log(formRef.formModel)
+       const param1 =  {
+        productItemCode: val[0]['itemCode'],
+        available: 'TRUE',
+        pageSize: 20,
+        pageNo: 1,
+        sort: '',
+        by: 'ASC',
+       }
+        BomApi.getBomPage(param1).then(res => {
+          console.log(res)
+          if(res?.list?.length>0){
+            row['bomVersion'] = res.list[0].version
+          }
+         
+          // row['singlePrice'] = res.price
+        }) 
       }else if(formField == 'bomVersion'){
         row['bomVersion'] = val[0]['version']
       }
diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
index b6902aa29..5e4add7ff 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
@@ -740,7 +740,8 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150,
     },
     isForm: false,
-    isTable:true,
+    isTable:false,
+    isTableForm:false,
   },
   {
     label: '报废数量',
@@ -802,7 +803,9 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       type: 'InputNumber',
       min: 0,
       precision: 6
-    }
+    },
+    isTable:false,
+    isTableForm:false,
   },
   {
     label: '金额',
@@ -825,6 +828,8 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       min: 0,
       precision: 6,
     },
+    isTable:false,
+    isTableForm:false,
   },
   {
     label: '来源库位',
@@ -840,7 +845,9 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps:{
         disabled: true
       }
-    }
+    },
+    isTable:false,
+    isTableForm:false,
   },
 
   {

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 213/408] =?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 c6dc3dad4ff57a7b5e8bdd4e6ee9a4cc9c5ebcb1 Mon Sep 17 00:00:00 2001
From: zhaoyiran <zhaoyrd@yonyou.com>
Date: Mon, 8 Jul 2024 17:08:26 +0800
Subject: [PATCH 214/408] =?UTF-8?q?=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/counter/counter.data.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/qms/counter/counter.data.ts b/src/views/qms/counter/counter.data.ts
index 9cdd8ac2d..5d17afaae 100644
--- a/src/views/qms/counter/counter.data.ts
+++ b/src/views/qms/counter/counter.data.ts
@@ -30,6 +30,7 @@ export const Counter = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'inspectionType',
     sort: 'custom',
     isSearch: true,
+    dictType: DICT_TYPE.INSPECTION_TYPE,
     table: {
       width: 175
     }

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 215/408] =?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 953ec8b4e04ddc46b709e94fa6b51635e212c2e1 Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Mon, 8 Jul 2024 17:20:56 +0800
Subject: [PATCH 216/408] =?UTF-8?q?EAM=20=E2=80=94=E2=80=94>=20=20?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87/=E5=B7=A5=E8=A3=85=E5=8F=B0=E8=B4=A6=20=20?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=8F=98=E6=9B=B4=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/eam/equipmentRepairJobMain/index.ts   |   2 +-
 src/api/eam/recordDeviceChanged/index.ts      |  59 +++++
 src/views/eam/equipmentAccounts/index.vue     |   4 +-
 src/views/eam/recordDeviceChanged/index.vue   | 244 ++++++++++++++++++
 .../recordDeviceChanged.data.ts               | 181 +++++++++++++
 5 files changed, 487 insertions(+), 3 deletions(-)
 create mode 100644 src/api/eam/recordDeviceChanged/index.ts
 create mode 100644 src/views/eam/recordDeviceChanged/index.vue
 create mode 100644 src/views/eam/recordDeviceChanged/recordDeviceChanged.data.ts

diff --git a/src/api/eam/equipmentRepairJobMain/index.ts b/src/api/eam/equipmentRepairJobMain/index.ts
index 3e7cad2b0..0a77ee4eb 100644
--- a/src/api/eam/equipmentRepairJobMain/index.ts
+++ b/src/api/eam/equipmentRepairJobMain/index.ts
@@ -115,7 +115,7 @@ export const backEquipmentRepairOrder = async (data: EquipmentRepairJobMainVO) =
   return await request.post({ url: `/eam/equipment-repair-job-main/fallback`, data  })
 }
 
-//报修验证不通过,生成新工单
+//报修验证
 export const createEquipmentRepairNewOrder = async (data: EquipmentRepairJobMainVO) => {
   return await request.post({ url: `/eam/equipment-repair-job-main/createNew`, data  })
 }
diff --git a/src/api/eam/recordDeviceChanged/index.ts b/src/api/eam/recordDeviceChanged/index.ts
new file mode 100644
index 000000000..a7fe656b6
--- /dev/null
+++ b/src/api/eam/recordDeviceChanged/index.ts
@@ -0,0 +1,59 @@
+import request from '@/config/axios'
+
+export interface RecordDeviceChangedVO {
+  id: number
+  code: string
+  name: string
+  statusBefore: string
+  statusAfter: string
+  operator: number
+  operateTime: Date
+  departmentCode: string
+  remark: string
+  siteId: string
+  available: string
+  deletionTime: Date
+  deleterId: byte[]
+  concurrencyStamp: number
+}
+
+// 查询设备变更记录列表
+export const getRecordDeviceChangedPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/eam/record-device-changed/senior', data })
+  } else {
+    return await request.get({ url: `/eam/record-device-changed/page`, params })
+  }
+}
+
+// 查询设备变更记录详情
+export const getRecordDeviceChanged = async (id: number) => {
+  return await request.get({ url: `/eam/record-device-changed/get?id=` + id })
+}
+
+// 新增设备变更记录
+export const createRecordDeviceChanged = async (data: RecordDeviceChangedVO) => {
+  return await request.post({ url: `/eam/record-device-changed/create`, data })
+}
+
+// 修改设备变更记录
+export const updateRecordDeviceChanged = async (data: RecordDeviceChangedVO) => {
+  return await request.put({ url: `/eam/record-device-changed/update`, data })
+}
+
+// 删除设备变更记录
+export const deleteRecordDeviceChanged = async (id: number) => {
+  return await request.delete({ url: `/eam/record-device-changed/delete?id=` + id })
+}
+
+// 导出设备变更记录 Excel
+export const exportRecordDeviceChanged = async (params) => {
+  return await request.download({ url: `/eam/record-device-changed/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/eam/record-device-changed/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/views/eam/equipmentAccounts/index.vue b/src/views/eam/equipmentAccounts/index.vue
index f3503a55f..9a7a924e6 100644
--- a/src/views/eam/equipmentAccounts/index.vue
+++ b/src/views/eam/equipmentAccounts/index.vue
@@ -50,7 +50,7 @@
     :isBusiness="false"
   />
 
-  <!-- <AblesForm ref="ablesFormRef" @success="getData" @close="getClosed"/> -->
+   <AblesForm ref="ablesFormRef" @success="getData" @close="getClosed"/>
 
   <!-- 详情 -->
   <DetailLedger 
@@ -82,7 +82,7 @@ import * as EquipmentAccountsApi from '@/api/eam/equipmentAccounts'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-// import AblesForm from '@/views/eam/equipmentAccounts/ablesForm.vue'
+import AblesForm from '@/views/eam/equipmentAccounts/ablesForm.vue'
 import DetailLedger from '@/components/Detail/src/DetailLedger.vue'
 import * as RelationMainPartApi from '@/api/eam/relationMainPart'
 import { EquipmentMainPart,EquipmentMainPartRules } from '../equipmentMainPart/equipmentMainPart.data'
diff --git a/src/views/eam/recordDeviceChanged/index.vue b/src/views/eam/recordDeviceChanged/index.vue
new file mode 100644
index 000000000..31af76028
--- /dev/null
+++ b/src/views/eam/recordDeviceChanged/index.vue
@@ -0,0 +1,244 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="RecordDeviceChanged.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="RecordDeviceChanged.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="RecordDeviceChangedRules"
+    :formAllSchemas="RecordDeviceChanged.allSchemas"
+    :apiUpdate="RecordDeviceChangedApi.updateRecordDeviceChanged"
+    :apiCreate="RecordDeviceChangedApi.createRecordDeviceChanged"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="RecordDeviceChanged.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/eam/record-device-changed/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { RecordDeviceChanged,RecordDeviceChangedRules } from './recordDeviceChanged.data'
+import * as RecordDeviceChangedApi from '@/api/eam/recordDeviceChanged'
+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: 'RecordDeviceChanged' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(RecordDeviceChanged.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: RecordDeviceChangedApi.getRecordDeviceChangedPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  //defaultButtons.defaultAddBtn({hasPermi:'eam:recordDeviceChanged:create'}), // 新增
+  //defaultButtons.defaultImportBtn({hasPermi:'eam:recordDeviceChanged:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'eam:recordDeviceChanged: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:'eam:recordDeviceChanged:update'}), // 编辑
+  //defaultButtons.mainListDeleteBtn({hasPermi:'eam:recordDeviceChanged: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 =RecordDeviceChanged.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 RecordDeviceChangedApi.createRecordDeviceChanged(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await RecordDeviceChangedApi.updateRecordDeviceChanged(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, 'basicRecordDeviceChanged')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await RecordDeviceChangedApi.deleteRecordDeviceChanged(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 RecordDeviceChangedApi.exportRecordDeviceChanged(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 RecordDeviceChangedApi.importTemplate()
+})
+
+</script>
diff --git a/src/views/eam/recordDeviceChanged/recordDeviceChanged.data.ts b/src/views/eam/recordDeviceChanged/recordDeviceChanged.data.ts
new file mode 100644
index 000000000..3a587c48d
--- /dev/null
+++ b/src/views/eam/recordDeviceChanged/recordDeviceChanged.data.ts
@@ -0,0 +1,181 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const RecordDeviceChangedRules = reactive({
+  code: [required],
+  name: [required],
+})
+
+export const RecordDeviceChanged = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: 'id',
+    field: 'id',
+    sort: 'custom',
+    isForm: false,
+  },
+  {
+    label: '设备编号',
+    field: 'code',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '名称',
+    field: 'name',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '变更前状态',
+    field: 'statusBefore',
+    sort: 'custom',
+    dictType: DICT_TYPE.DEVICE_STATUS,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    isSearch: true,
+  },
+  {
+    label: '变更后状态',
+    field: 'statusAfter',
+    sort: 'custom',
+    dictType: DICT_TYPE.DEVICE_STATUS,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    isSearch: true,
+  },
+  {
+    label: '操作人',
+    field: 'operator',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '操作时间',
+    field: 'operateTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '部门id',
+    field: 'departmentCode',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '地点ID',
+    field: 'siteId',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+  },
+  {
+    label: '是否可用默认TRUE',
+    field: 'available',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+  },
+  {
+    label: '删除时间',
+    field: 'deletionTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+    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: '删除人id',
+    field: 'deleterId',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))

From b24e4cfbf1edc4eb07baa624614df4921eda8c6b Mon Sep 17 00:00:00 2001
From: bjang03 <259278618@qq.com>
Date: Tue, 9 Jul 2024 08:54:30 +0800
Subject: [PATCH 217/408] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=20HL-3915?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../countManage/count/countPlanMain/index.vue | 37 ++++++++++---------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/views/wms/countManage/count/countPlanMain/index.vue b/src/views/wms/countManage/count/countPlanMain/index.vue
index 5d7c2ecb9..4395f9e9d 100644
--- a/src/views/wms/countManage/count/countPlanMain/index.vue
+++ b/src/views/wms/countManage/count/countPlanMain/index.vue
@@ -108,40 +108,41 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import {
-  CountPlanMain,
-  CountPlanMainRules,
   CountPlanDetail,
   CountPlanDetailRules,
-  // CountPlanMain1
+  CountPlanMain,
+  CountPlanMainRules,
 } from './countPlanMain.data'
 import * as CountPlanMainApi from '@/api/wms/countPlanMain'
 import * as CountPlanDetailApi from '@/api/wms/countPlanDetail'
-import { Owner } from '@/views/wms/basicDataManage/orderManage/owner/owner.data'
+import {Owner} from '@/views/wms/basicDataManage/orderManage/owner/owner.data'
 import * as OwnerApi from '@/api/wms/owner'
 
-import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
+import {Supplier} from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
 import * as SupplierApi from '@/api/wms/supplier'
 
-import { Customer } from '@/views/wms/basicDataManage/customerManage/customer/customer.data'
+import {Customer} from '@/views/wms/basicDataManage/customerManage/customer/customer.data'
 import * as CustomerApi from '@/api/wms/customer'
 
-import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
+import {Itembasic} from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
 import * as ItembasicApi from '@/api/wms/itembasic'
 
-import { Warehouse } from '@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data'
+import {Warehouse} from '@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data'
 import * as WarehouseApi from '@/api/wms/warehouse'
 
-import { Area } from '@/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data'
+import {Area} from '@/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data'
 import * as AreaApi from '@/api/wms/areabasic'
 
-import { Locationgroup } from '@/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data'
+import {
+  Locationgroup
+} from '@/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data'
 import * as LocationgroupApi from '@/api/wms/locationgroup'
 
-import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
+import {Location} from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
 import * as LocationApi from '@/api/wms/location'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 
-import { DICT_TYPE, getIntDictOptions, getStrDictOptions } from '@/utils/dict'
+import {DICT_TYPE, getStrDictOptions} from '@/utils/dict'
 import BasicFormWmsCount from '@/components/BasicForm/src/BasicFormWmsCount.vue'
 
 // 盘点计划主
@@ -410,12 +411,12 @@ const openForm = async (type: string, row?: any) => {
     }
   ] // 重置明细数据
   row = row ? row : {}
-  row.dimension = 'BY_INEVNEOTY'
-  CountPlanMain.allSchemas.formSchema.forEach((item) => {
-    if (item.field == 'crontab') {
-      item.componentProps.disabled = true
-    }
-  })
+  // row.dimension = 'BY_INEVNEOTY'
+  CountPlanMain.allSchemas.formSchema.forEach((item) => {
+    if (item.field == 'crontab') {
+      item.componentProps.disabled = true
+    }
+  })
   formRef.value.open(type, row)
 
   // Promise.all([getOwnerAllList(),

From 9cd48c04a44865cbf99a20471d883b5ff3e132c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Tue, 9 Jul 2024 09:02:30 +0800
Subject: [PATCH 218/408] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=80=80=E6=96=99?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=A0=87=E7=AD=BE=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
index 60ce8db43..baa26aebd 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
@@ -1101,7 +1101,7 @@ export const ProductionreturnRequestDetailRules = reactive({
  */
 export const ProductionreturnRequestDetailLabel = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '生产线代码',
+    label: '标签生产线代码',
     field: 'productionLineCodePackage',
     sort: 'custom',
     table: {
@@ -1123,7 +1123,7 @@ export const ProductionreturnRequestDetailLabel = useCrudSchemas(reactive<CrudSc
     }
   },
   {
-    label: '供应商代码',
+    label: '标签供应商代码',
     field: 'supplierItemCode',
     sort: 'custom',
     table: {

From b9f27794d892f79b5fc60a941cb18fbe94768fd8 Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Tue, 9 Jul 2024 09:06:50 +0800
Subject: [PATCH 219/408] =?UTF-8?q?=E8=A1=A5=E6=96=99=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E5=8F=B7?=
 =?UTF-8?q?=EF=BC=8C=E8=AE=A2=E5=8D=95=E8=A1=8C=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repleinshJobMain/repleinshJobMain.data.ts | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts
index a24e43277..fb5d90334 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts
@@ -716,26 +716,26 @@ export const RepleinshJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '采购订单号',
-    field: 'poNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    sortTableDefault:2,
-  },
-  {
-    label: '订单行',
-    field: 'poLine',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    sortTableDefault:2,
-  },
+  // {
+  //   label: '采购订单号',
+  //   field: 'poNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   hiddenInMain:true,
+  //   sortTableDefault:2,
+  // },
+  // {
+  //   label: '订单行',
+  //   field: 'poLine',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   hiddenInMain:true,
+  //   sortTableDefault:2,
+  // },
   {
     label: '从库位代码',
     field: 'fromLocationCode',

From 37bf27a9cb2389b6802e26240c20367617935bc0 Mon Sep 17 00:00:00 2001
From: bjang03 <259278618@qq.com>
Date: Tue, 9 Jul 2024 09:40:34 +0800
Subject: [PATCH 220/408] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=20HL-3915?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/countManage/count/countPlanMain/countPlanMain.data.ts  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
index 64f38a54f..defc2b3f5 100644
--- a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
+++ b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
@@ -102,6 +102,9 @@ export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    form: {
+      value: 'BY_INEVNEOTY'
+    }
   },
   {
     label: '限值',

From 7cadd28ab9e5a3810c74cb6989828724d3d65802 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Tue, 9 Jul 2024 10:19:36 +0800
Subject: [PATCH 221/408] =?UTF-8?q?=E9=95=BF=E6=98=A5=E6=B5=B7=E6=8B=89?=
 =?UTF-8?q?=E6=AD=A3=E5=BC=8F=E7=8E=AF=E5=A2=83WMS=E5=B7=A5=E5=BA=8F?=
 =?UTF-8?q?=E6=8A=A5=E4=BA=A7=E7=94=B3=E8=AF=B7=E5=A4=84=E7=90=86=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E4=B8=8D=E5=BA=94=E8=AF=A5=E4=B8=80=E7=9B=B4loading?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processproductionRequest/index.vue        | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue b/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue
index fe2a491bb..3a9c0ca6a 100644
--- a/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue
+++ b/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue
@@ -226,7 +226,9 @@ const handleClose = async (id: number) => {
     message.success(t('common.closeSuccess'))
     tableObject.loading = false
     await getList()
-  } catch {}
+  } catch {
+    tableObject.loading = false
+  }
 }
 
 /** 重新添加按钮操作 */
@@ -238,7 +240,9 @@ const handleReAdd = async (id: number) => {
     message.success(t('common.reAddSuccess'))
     tableObject.loading = false
     await getList()
-  } catch {}
+  } catch {
+    tableObject.loading = false
+  }
 }
 
 /** 提交按钮操作 */
@@ -250,7 +254,9 @@ const handleSubmit = async (id: number) => {
     message.success(t('common.submitSuccess'))
     tableObject.loading = false
     await getList()
-  } catch {}
+  } catch {
+    tableObject.loading = false
+  }
 }
 
 /** 审批驳回按钮操作 */
@@ -262,7 +268,9 @@ const handleRefused = async (id: number) => {
     message.success(t('common.refusedSuccess'))
     tableObject.loading = false
     await getList()
-  } catch {}
+  } catch {
+    tableObject.loading = false
+  }
 }
 
 /** 审批通过按钮操作 */
@@ -274,7 +282,9 @@ const handleAgree = async (id: number) => {
     message.success(t('common.agreeSuccess'))
     tableObject.loading = false
     await getList()
-  } catch {}
+  } catch {
+    tableObject.loading = false
+  }
 }
 
 /** 处理按钮操作 */
@@ -286,7 +296,9 @@ const handleHandle = async (id: number) => {
     message.success(t('common.handleSuccess'))
     tableObject.loading = false
     await getList()
-  } catch {}
+  } catch {
+    tableObject.loading = false
+  }
 }
 
 /** 添加/修改操作 */

From cc581ec18907394002b3cdc4c51a2e568e567628 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Tue, 9 Jul 2024 10:28:19 +0800
Subject: [PATCH 222/408] =?UTF-8?q?=E5=8F=91=E6=96=99=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../issue/issueRequestMain/index.vue           | 18 ++++++++++++++++++
 .../issueRequestMain/issueRequestMain.data.ts  |  1 -
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/issueManage/issue/issueRequestMain/index.vue b/src/views/wms/issueManage/issue/issueRequestMain/index.vue
index cac4c9dcd..568bb3152 100644
--- a/src/views/wms/issueManage/issue/issueRequestMain/index.vue
+++ b/src/views/wms/issueManage/issue/issueRequestMain/index.vue
@@ -84,6 +84,8 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
+import * as ProductionlineApi from '@/api/wms/productionline'
+import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { IssueRequestMain,IssueRequestMainRules,IssueRequestDetail,IssueRequestDetailRules } from './issueRequestMain.data'
 import * as IssueRequestMainApi from '@/api/wms/issueRequestMain'
@@ -120,6 +122,22 @@ const onEnter = async (field,value) => {
       setV['workStationCode'] = res.list[0].code
       formRef.value.formRef.setValues(setV)
     }
+  }else if(field == 'workshopCode'){
+    //车间代码
+    formRef.value.opensearchTable('productionLineCode', 'code', '生产线信息', Productionline.allSchemas, ProductionlineApi.getProductionlinePage,[
+      {
+      key: 'available',
+      value: 'TRUE',
+      action: '==',
+      isSearch: true,
+      isMainValue: false
+    },{
+      key: 'workshopCode',
+      value: value,
+      action: '==',
+      isSearch: true,
+      isMainValue: false
+    }])
   }
 }
 // 查询页面返回
diff --git a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
index 38245d0f1..26d259db7 100644
--- a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
+++ b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
@@ -112,7 +112,6 @@ export const IssueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
-        enterSearch:true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段

From 39ee3306acf3847db916416b08c81a52901321dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Tue, 9 Jul 2024 10:32:08 +0800
Subject: [PATCH 223/408] =?UTF-8?q?=E8=A1=A5=E6=96=99=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E5=A4=9A=E4=BD=99=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repleinshJobMain/repleinshJobMain.data.ts | 42 +++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts
index fb5d90334..9fee8806c 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts
@@ -477,15 +477,15 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
-  {
-    label: '物料号',
-    field: 'code',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
+  // {
+  //   label: '物料号',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTable: false,
+  // },
   {
     label: '来源库位',
     field: 'fromLocationCode',
@@ -513,18 +513,18 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTable: false,
   },
-  {
-    label: '单位',
-    field: 'unit',
-    sort: 'custom',
-    dictType: DICT_TYPE.PACK_UNIT,
-    dictClass: 'string',
-    isSearch: false,
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
+  // {
+  //   label: '单位',
+  //   field: 'unit',
+  //   sort: 'custom',
+  //   dictType: DICT_TYPE.PACK_UNIT,
+  //   dictClass: 'string',
+  //   isSearch: false,
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTable: false,
+  // },
   {
     label: '创建者',
     field: 'creator',

From 121c5648ec830efc1955e55c90bc87ad5938ad26 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Tue, 9 Jul 2024 10:37:00 +0800
Subject: [PATCH 224/408] =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereceiptRequestMain.data.ts                          | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
index aec14295a..7a6b1c876 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
@@ -622,6 +622,8 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
         action: '==', // 查询拼接条件
         isSearch: true, // 使用自定义拼接条件
         isFormModel:true,
+        required:true,
+        message:'请选择采购订单号',
         isMainValue: false
       },
       {

From 80fb147a2e3a1546f423e43331142009f690a589 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Tue, 9 Jul 2024 10:50:26 +0800
Subject: [PATCH 225/408] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processproductionRequestMain.data.ts      | 26 ++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/views/wms/productionManage/processproduction/processproductionRequest/processproductionRequestMain.data.ts b/src/views/wms/productionManage/processproduction/processproductionRequest/processproductionRequestMain.data.ts
index 171aa15d8..2a63f139b 100644
--- a/src/views/wms/productionManage/processproduction/processproductionRequest/processproductionRequestMain.data.ts
+++ b/src/views/wms/productionManage/processproduction/processproductionRequest/processproductionRequestMain.data.ts
@@ -265,12 +265,32 @@ export const ProcessproductionRequestMain = useCrudSchemas(reactive<CrudSchema[]
     }
   }
 ]))
-
+// 完工数量校验
+const validateCompletedQuantity= (rule: any, value: any, callback: any) => {
+  if (Number(value)>0) {
+      callback();
+  } else {
+    callback(new Error('完工数量不能为0'));
+  }
+}
+// 报废数量校验
+const validateScrapQuantity= (rule: any, value: any, callback: any) => {
+  if (Number(value)>0) {
+      callback();
+  } else {
+    callback(new Error('完工数量不能为0'));
+  }
+}
 // 表单校验
 export const ProcessproductionRequestMainRules = reactive({
   itemCode: [{ required: true, message: '物料代码不能为空', trigger: 'change' }],
-  completedQuantity: [{ required: true, message: '完工数量不能为空', trigger: 'change' }],
-  scrapQuantity: [{ required: true, message: '报废数量不能为空', trigger: 'change' }],
+  completedQuantity: [
+    { required: true, message: '完工数量不能为空', trigger: 'change' },
+    { validator: validateCompletedQuantity, trigger: 'change' }
+  ],
+  scrapQuantity: [{ required: true, message: '报废数量不能为空', trigger: 'change' },
+    { validator: validateScrapQuantity, trigger: 'change' }
+  ],
 })
 
 

From 2d714ad379184fcad3c497b958a5f68a3703c2b8 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Tue, 9 Jul 2024 10:58:56 +0800
Subject: [PATCH 226/408] =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E6=8A=A5=E5=B7=A5?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processproductionRequest/index.vue        | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue b/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue
index 3a9c0ca6a..8f1767579 100644
--- a/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue
+++ b/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue
@@ -40,6 +40,8 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
     ref="basicFormRef"
+    :isOpenSearchTable="true"
+    fieldTableColumn="productionLine"
     @submitForm="submitForm"
     :isBusiness="true"
     :rules="ProcessproductionRequestMainRules"
@@ -54,6 +56,7 @@
     @handleDeleteTable="handleDeleteTable"
     :isShowReduceButtonSelection="true"
     @tableSelectionDelete="tableSelectionDelete"
+    @onEnter="onEnter"
   />
 
   <!-- 详情 -->
@@ -87,6 +90,8 @@
 import download from '@/utils/download'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { ProcessproductionRequestMain,ProcessproductionRequestMainRules,ProcessproductionRequestDetail,ProcessproductionRequestDetailRules } from './processproductionRequestMain.data'
+import * as ProductionlineitemApi from '@/api/wms/productionlineitem'
+import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data'
 import * as ProcessproductionRequestMainApi from '@/api/wms/processproductionRequestMain'
 import * as ProcessproductionRequestDetailApi from '@/api/wms/processproductionRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
@@ -440,6 +445,26 @@ const handleDeleteTable = (item, index) => {
     tableData.value.splice(itemIndex, 1)
   }
 }
+
+const onEnter = async (field,value) => {
+  if (field == 'itemCode') {
+    //车间代码
+    basicFormRef.value.opensearchTable('productionLine', 'productionLineCode', '生产线物料关系信息', Productionlineitem.allSchemas, ProductionlineitemApi.getProductionlineitemPage,[
+      {
+      key: 'available',
+      value: 'TRUE',
+      action: '==',
+      isSearch: true,
+      isMainValue: false
+    },{
+      key: 'itemCode',
+      value: value,
+      action: '==',
+      isSearch: true,
+      isMainValue: false
+    }])
+  }
+}
 const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))
 }

From 7e7904fb591a51784015cfcc8055939303af8a8f Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Tue, 9 Jul 2024 11:03:09 +0800
Subject: [PATCH 227/408] =?UTF-8?q?=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processproduction/processproductionRequest/index.vue   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue b/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue
index 8f1767579..9979429f2 100644
--- a/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue
+++ b/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue
@@ -114,7 +114,12 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
   nextTick(() => {
     if (type == 'tableForm') {
       if(formField === 'productionLine'){
-        row['productionLine']=val[0]['productionLineCode']
+        val.forEach(item=>{
+          // if(tableData.value.find(item1=>item1['productionLine'] == item['productionLineCode'])) return
+          const newRow = JSON.parse(JSON.stringify(tableFormKeys))
+          newRow['productionLine'] = item['productionLineCode']
+          tableData.value.push(newRow)
+        })
       }
       if(formField === 'processCode'){
         row['processCode']=val[0]['code']

From 46e3235395a4646fc670eae86ed91b13731c5db4 Mon Sep 17 00:00:00 2001
From: bjang03 <259278618@qq.com>
Date: Tue, 9 Jul 2024 11:07:32 +0800
Subject: [PATCH 228/408] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=20HL-3897?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../countRecordMain/countRecordMain.data.ts   | 92 +++++++++----------
 1 file changed, 46 insertions(+), 46 deletions(-)

diff --git a/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts b/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts
index 5e19bb62e..44ce95f5e 100644
--- a/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts
+++ b/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts
@@ -79,22 +79,22 @@ export const CountRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '出库事务类型',
-    field: 'outTransactionType',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '入库事务类型',
-    field: 'inTransactionType',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  // {
+  //   label: '出库事务类型',
+  //   field: 'outTransactionType',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '入库事务类型',
+  //   field: 'inTransactionType',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
     label: '申请时间',
     field: 'requestTime',
@@ -200,17 +200,17 @@ export const CountRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '接口类型',
-    field: 'interfaceType',
-    dictType: DICT_TYPE.INTERFACE_TYPE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  // {
+  //   label: '接口类型',
+  //   field: 'interfaceType',
+  //   dictType: DICT_TYPE.INTERFACE_TYPE,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
     label: '创建时间',
     field: 'createTime',
@@ -420,14 +420,14 @@ export const CountRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '盘点描述',
-    field: 'countDescription',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  // {
+  //   label: '盘点描述',
+  //   field: 'countDescription',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
     label: '批次',
     field: 'batch',
@@ -533,17 +533,17 @@ export const CountRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '接口类型',
-    field: 'interfaceType',
-    dictType: DICT_TYPE.INTERFACE_TYPE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  // {
+  //   label: '接口类型',
+  //   field: 'interfaceType',
+  //   dictType: DICT_TYPE.INTERFACE_TYPE,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
     label: '创建时间',
     field: 'createTime',

From 049abf9d9f4769d737199025509a6eb10cf3b881 Mon Sep 17 00:00:00 2001
From: bjang03 <259278618@qq.com>
Date: Tue, 9 Jul 2024 11:10:21 +0800
Subject: [PATCH 229/408] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=20HL-3897?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../count/countRecordMain/countRecordMain.data.ts           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts b/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts
index 44ce95f5e..a130cb322 100644
--- a/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts
+++ b/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts
@@ -312,9 +312,9 @@ export const CountRecordMainRules = reactive({
   departmentCode: [
     { required: true, message: '请输入部门', trigger: 'blur' }
   ],
-  interfaceType: [
-    { required: true, message: '请选择接口类型', trigger: 'change' }
-  ],
+  // interfaceType: [
+  //   { required: true, message: '请选择接口类型', trigger: 'change' }
+  // ],
   number: [
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],

From 9d0f52c167b4374e19c09f4ee9286806e2ad051d Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 9 Jul 2024 11:11:41 +0800
Subject: [PATCH 230/408] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E6=97=B6=EF=BC=8C=E7=B3=BB=E7=BB=9F=E5=88=A4?=
 =?UTF-8?q?=E5=AE=9A=E5=9C=A8=E4=B8=8D=E5=90=88=E6=A0=BC=E6=97=B6(?=
 =?UTF-8?q?=E5=AE=9A=E6=80=A7=E7=9A=84=E9=80=89=E6=8B=A9=E4=BA=86=E6=8B=92?=
 =?UTF-8?q?=E7=BB=9D=E3=80=82=E5=AE=9A=E9=87=8F=E7=9A=84=E8=B6=85=E5=87=BA?=
 =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=96=B9=E6=A1=88=E8=8C=83=E5=9B=B4)?=
 =?UTF-8?q?=EF=BC=8C=E9=9C=80=E8=A6=81=E6=9C=89=E4=B8=AA=E6=98=8E=E6=98=BE?=
 =?UTF-8?q?=E7=9A=84=E5=B9=B6=E4=B8=94=E5=B8=A6=E6=9C=89=E7=89=B9=E6=AE=8A?=
 =?UTF-8?q?=E9=A2=9C=E8=89=B2=E7=9A=84=E6=A0=87=E8=AE=B0=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/inspectionJob/addForm.vue | 2028 ++++++++++++++---------
 1 file changed, 1208 insertions(+), 820 deletions(-)

diff --git a/src/views/qms/inspectionJob/addForm.vue b/src/views/qms/inspectionJob/addForm.vue
index 7bdea4cda..6cf33a50e 100644
--- a/src/views/qms/inspectionJob/addForm.vue
+++ b/src/views/qms/inspectionJob/addForm.vue
@@ -1,30 +1,93 @@
 <template>
   <div>
-    <Dialog :title="dialogTitle" v-model="dialogVisible" :width="dialogWidth" :close-on-click-modal="false"
-      :vLoading="formLoading">
-      <div class="box" style="max-height: 80vh; overflow-y: auto; padding: 0px 20px" ref="mianscroll">
-        <el-backtop :right="40" :bottom="100"  target='.box' @click="topScrollClick"/>
-        <Form ref="formMainRef" :rules="rules" :schema="formSchema" :is-col="true" @opensearchTable="opensearchTable" />
-        <div class="small-title">包装列表</div>
-        <div style="border:1px solid #dedede;margin-bottom:20px;display: flex;">
-          <TableForm ref="tableFormRef" style="width:100%;" :maxHeight="490"
-            :tableFields="tableAllSchemas.tableFormColumns" :tableFormRules="tableFormRules"
-            :tableData="data.packageList" :isShowButton="false" :isShowReduceButton="false" />
+    <Dialog
+      :title="dialogTitle"
+      v-model="dialogVisible"
+      :width="dialogWidth"
+      :close-on-click-modal="false"
+      :vLoading="formLoading"
+    >
+      <div
+        class="box"
+        style="max-height: 80vh; overflow-y: auto; padding: 0px 20px"
+        ref="mianscroll"
+      >
+        <el-backtop :right="40" :bottom="100" target=".box" @click="topScrollClick" />
+        <Form
+          ref="formMainRef"
+          :rules="rules"
+          :schema="formSchema"
+          :is-col="true"
+          @opensearchTable="opensearchTable"
+        />
+        <div ref="boxList">
+          <div class="small-title">包装列表</div>
+          <div style="border: 1px solid #dedede; margin-bottom: 20px; display: flex">
+            <TableForm
+              ref="tableFormRef"
+              style="width: 100%"
+              :maxHeight="490"
+              :tableFields="tableAllSchemas.tableFormColumns"
+              :tableFormRules="tableFormRules"
+              :tableData="data.packageList"
+              :isShowButton="false"
+              :isShowReduceButton="false"
+            />
+          </div>
         </div>
-        <el-tabs v-model="editableTabsValue" class="demo-tabs" @edit="handleTabsEdit" type="border-card"
-          tab-position="left" :stretch="false">
-          <el-tab-pane v-for="item in data.subList" :key="item.name" :label="item.processDescribe" :name="item.name" v-next-focus>
+        <el-tabs
+          v-model="editableTabsValue"
+          class="demo-tabs"
+          @edit="handleTabsEdit"
+          type="border-card"
+          tab-position="left"
+          :stretch="false"
+        >
+          <el-tab-pane
+            v-for="item in data.subList"
+            :key="item.name"
+            :label="item.processDescribe"
+            :name="item.name"
+            v-next-focus
+          >
+            <template #label>
+              <span class="custom-tabs-label" style="display: flex; align-items: center">
+                <Icon
+                  class="mr-5px"
+                  icon="ep:circle-check-filled"
+                  v-if="item.isPass === true"
+                  color="#67C23A"
+                  style="margin-top: 4px"
+                />
+                <Icon
+                  class="mr-5px"
+                  icon="ep:circle-close-filled"
+                  v-if="item.isPass === false"
+                  color="#ff0000"
+                  style="margin-top: 4px"
+                />
+                <span>{{ item.processDescribe }}</span>
+              </span>
+            </template>
             <div class="small-title">检验工序</div>
             <el-form :model="item" label-width="auto" :rules="rules" ref="formProcessRef">
               <el-row :gutter="20">
                 <el-col :span="12">
                   <el-form-item label="编码" prop="processCode">
-                    <el-input v-model="item.processCode" placeholder="根据系统生成" :disabled="true" />
+                    <el-input
+                      v-model="item.processCode"
+                      placeholder="根据系统生成"
+                      :disabled="true"
+                    />
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="检验特性编号">
-                    <el-input v-model="item.inspectionFeatureCode" placeholder="根据系统生成" :disabled="true" />
+                    <el-input
+                      v-model="item.inspectionFeatureCode"
+                      placeholder="根据系统生成"
+                      :disabled="true"
+                    />
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
@@ -44,172 +107,349 @@
               <el-row :gutter="20">
                 <el-col :span="12">
                   <el-form-item label="编码">
-                    <el-input v-model="item.inspectionJobCharacteristicsUpdateReqVO.number" placeholder="根据系统生成"
-                      :disabled="true" />
+                    <el-input
+                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.number"
+                      placeholder="根据系统生成"
+                      :disabled="true"
+                    />
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label="描述" prop="inspectionJobCharacteristicsUpdateReqVO.description">
-                    <el-input v-model="item.inspectionJobCharacteristicsUpdateReqVO.description" :disabled="true" />
+                  <el-form-item
+                    label="描述"
+                    prop="inspectionJobCharacteristicsUpdateReqVO.description"
+                  >
+                    <el-input
+                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.description"
+                      :disabled="true"
+                    />
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label="检验方法" prop="inspectionJobCharacteristicsUpdateReqVO.inspectionMethodCode">
+                  <el-form-item
+                    label="检验方法"
+                    prop="inspectionJobCharacteristicsUpdateReqVO.inspectionMethodCode"
+                  >
                     <div style="display: flex; width: 100%">
-                      <el-input v-model="item.inspectionJobCharacteristicsUpdateReqVO.inspectionMethodName" disabled
-                        placeholder="请选择检验方法" />
+                      <el-input
+                        v-model="item.inspectionJobCharacteristicsUpdateReqVO.inspectionMethodName"
+                        disabled
+                        placeholder="请选择检验方法"
+                      />
                     </div>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label="采样过程编码" prop="inspectionJobCharacteristicsUpdateReqVO.samplingProcessCode">
+                  <el-form-item
+                    label="采样过程编码"
+                    prop="inspectionJobCharacteristicsUpdateReqVO.samplingProcessCode"
+                  >
                     <div style="display: flex; width: 100%">
-                      <el-input v-model="item.inspectionJobCharacteristicsUpdateReqVO.samplingProcessName" disabled
-                        placeholder="请选择采样过程编码" />
+                      <el-input
+                        v-model="item.inspectionJobCharacteristicsUpdateReqVO.samplingProcessName"
+                        disabled
+                        placeholder="请选择采样过程编码"
+                      />
                     </div>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label="样品份数" prop="inspectionJobCharacteristicsUpdateReqVO.sampleQty">
+                  <el-form-item
+                    label="样品份数"
+                    prop="inspectionJobCharacteristicsUpdateReqVO.sampleQty"
+                  >
                     <div style="display: flex; width: 100%">
-                      <el-input v-model="item.inspectionJobCharacteristicsUpdateReqVO.sampleQty" disabled
-                        placeholder="请输入样品份数" />
+                      <el-input
+                        v-model="item.inspectionJobCharacteristicsUpdateReqVO.sampleQty"
+                        disabled
+                        placeholder="请输入样品份数"
+                      />
                     </div>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="12">
-                  <el-form-item label="每份样品量" prop="inspectionJobCharacteristicsUpdateReqVO.samplePieceSize">
+                  <el-form-item
+                    label="每份样品量"
+                    prop="inspectionJobCharacteristicsUpdateReqVO.samplePieceSize"
+                  >
                     <div style="display: flex; width: 100%">
-                      <el-input v-model="item.inspectionJobCharacteristicsUpdateReqVO.samplePieceSize" disabled
-                        placeholder="请输入样品份数" />
+                      <el-input
+                        v-model="item.inspectionJobCharacteristicsUpdateReqVO.samplePieceSize"
+                        disabled
+                        placeholder="请输入样品份数"
+                      />
                     </div>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label="是否允许修改特征值" prop="inspectionJobCharacteristicsUpdateReqVO.isCanUpdate">
-                    <el-switch v-model="item.inspectionJobCharacteristicsUpdateReqVO.isCanUpdate" disabled />
+                  <el-form-item
+                    label="是否允许修改特征值"
+                    prop="inspectionJobCharacteristicsUpdateReqVO.isCanUpdate"
+                  >
+                    <el-switch
+                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.isCanUpdate"
+                      disabled
+                    />
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label="结果录入方式" prop="inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod">
-                    <el-select v-model="item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod"
-                      placeholder="请选择结果录入方式" @change="resultEntryMethodChange($event, item)" disabled>
-                      <el-option v-for="dict in getStrDictOptions(DICT_TYPE.INSPECTION_CHARACTERISTICS_RESULT_ENTRY)"
-                        :key="dict.value" :label="dict.label" :value="dict.value" />
+                  <el-form-item
+                    label="结果录入方式"
+                    prop="inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod"
+                  >
+                    <el-select
+                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod"
+                      placeholder="请选择结果录入方式"
+                      @change="resultEntryMethodChange($event, item)"
+                      disabled
+                    >
+                      <el-option
+                        v-for="dict in getStrDictOptions(
+                          DICT_TYPE.INSPECTION_CHARACTERISTICS_RESULT_ENTRY
+                        )"
+                        :key="dict.value"
+                        :label="dict.label"
+                        :value="dict.value"
+                      />
                     </el-select>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label="特征类型" prop="inspectionJobCharacteristicsUpdateReqVO.featureType">
-                    <el-select v-model="item.inspectionJobCharacteristicsUpdateReqVO.featureType" placeholder="请选择特征类型"
-                      @change="changeFeatureType" disabled>
-                      <el-option v-for="dict in getStrDictOptions(DICT_TYPE.INSPECTION_CHARACTERISTICS_FEATURE_TYPE)"
-                        :key="dict.value" :label="dict.label" :value="dict.value" />
+                  <el-form-item
+                    label="特征类型"
+                    prop="inspectionJobCharacteristicsUpdateReqVO.featureType"
+                  >
+                    <el-select
+                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.featureType"
+                      placeholder="请选择特征类型"
+                      @change="changeFeatureType"
+                      disabled
+                    >
+                      <el-option
+                        v-for="dict in getStrDictOptions(
+                          DICT_TYPE.INSPECTION_CHARACTERISTICS_FEATURE_TYPE
+                        )"
+                        :key="dict.value"
+                        :label="dict.label"
+                        :value="dict.value"
+                      />
                     </el-select>
                   </el-form-item>
                 </el-col>
 
-
-                <el-col :span="12" v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0">
+                <el-col
+                  :span="12"
+                  v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0"
+                >
                   <el-form-item
                     label="是否设定上限"
                     prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
                   >
-                    <el-switch v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping" :disabled="true" />
+                    <el-switch
+                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping"
+                      :disabled="true"
+                    />
                   </el-form-item>
                 </el-col>
-                <el-col :span="12" v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 && item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping">
+                <el-col
+                  :span="12"
+                  v-if="
+                    item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 &&
+                    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping
+                  "
+                >
                   <el-form-item
                     label="上限值"
                     prop="inspectionCharacteristicsBaseVO.quantifyCapping"
                   >
-                    <el-input v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping" :disabled="true" />
+                    <el-input
+                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping"
+                      :disabled="true"
+                    />
                   </el-form-item>
                 </el-col>
 
-                <el-col :span="12" v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0">
+                <el-col
+                  :span="12"
+                  v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0"
+                >
                   <el-form-item
                     label="是否设定下限"
                     prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
                   >
-                    <el-switch v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit" :disabled="true" />
+                    <el-switch
+                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit"
+                      :disabled="true"
+                    />
                   </el-form-item>
                 </el-col>
-                <el-col :span="12" v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 && item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit">
+                <el-col
+                  :span="12"
+                  v-if="
+                    item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 &&
+                    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit
+                  "
+                >
                   <el-form-item
                     label="下限值"
                     prop="inspectionCharacteristicsBaseVO.quantifyCapping"
                   >
-                    <el-input v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit" :disabled="true" />
+                    <el-input
+                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit"
+                      :disabled="true"
+                    />
                   </el-form-item>
                 </el-col>
 
-                <el-col :span="12" v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0">
+                <el-col
+                  :span="12"
+                  v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0"
+                >
                   <el-form-item
                     label="是否设定目标值"
                     prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
                   >
-                    <el-switch v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget" :disabled="true" />
+                    <el-switch
+                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget"
+                      :disabled="true"
+                    />
                   </el-form-item>
                 </el-col>
-                <el-col :span="12" v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 && item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget">
+                <el-col
+                  :span="12"
+                  v-if="
+                    item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 &&
+                    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget
+                  "
+                >
                   <el-form-item
                     label="目标值"
                     prop="inspectionCharacteristicsBaseVO.quantifyCapping"
                   >
-                    <el-input v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget" :disabled="true" />
+                    <el-input
+                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget"
+                      :disabled="true"
+                    />
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="12">
-                  <el-form-item label="开始时间" prop="inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime">
-                    <el-date-picker v-model="item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime"
-                      type="datetime" placeholder="请选择开始时间" style="width: 100%" value-format="x" />
+                  <el-form-item
+                    label="开始时间"
+                    prop="inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime"
+                  >
+                    <el-date-picker
+                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime"
+                      type="datetime"
+                      placeholder="请选择开始时间"
+                      style="width: 100%"
+                      value-format="x"
+                    />
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label="结束时间" prop="inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime">
-                    <el-date-picker v-model="item.inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime"
-                      type="datetime" placeholder="请选择结束时间" style="width: 100%" value-format="x" />
+                  <el-form-item
+                    label="结束时间"
+                    prop="inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime"
+                  >
+                    <el-date-picker
+                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime"
+                      type="datetime"
+                      placeholder="请选择结束时间"
+                      style="width: 100%"
+                      value-format="x"
+                    />
                   </el-form-item>
                 </el-col>
                 <!-- 手动评估的时候显示 -->
                 <el-col :span="12" v-if="item.samplingProcessRespVO.evaluationMode == 1">
-                  <el-form-item label="评估代码" required prop="inspectionJobCharacteristicsUpdateReqVO.estimateCode">
-                    <el-select v-model="item.inspectionJobCharacteristicsUpdateReqVO.estimateCode" placeholder="请选择评估代码"
-                      @change="changeFeatureType">
-                      <el-option v-for="dict in getStrDictOptions(DICT_TYPE.EVALUATION_CODE)" :key="dict.value"
-                        :label="dict.label" :value="dict.value" />
+                  <el-form-item
+                    label="评估代码"
+                    required
+                    prop="inspectionJobCharacteristicsUpdateReqVO.estimateCode"
+                  >
+                    <el-select
+                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.estimateCode"
+                      placeholder="请选择评估代码"
+                      @change="changeFeatureType"
+                    >
+                      <el-option
+                        v-for="dict in getStrDictOptions(DICT_TYPE.EVALUATION_CODE)"
+                        :key="dict.value"
+                        :label="dict.label"
+                        :value="dict.value"
+                      />
                     </el-select>
                   </el-form-item>
                 </el-col>
-                <el-col :span="24"
-                  v-for="(cur, i) in item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList" :key="i"
-                  style="border: 1px solid #dedede; border-radius: 4px; padding-top: 16px; margin-bottom: 10px;">
+                <el-col
+                  :span="24"
+                  v-for="(cur, i) in item.inspectionJobCharacteristicsUpdateReqVO
+                    .recordInspectionQuantifyList"
+                  :key="i"
+                  style="
+                    border: 1px solid #dedede;
+                    border-radius: 4px;
+                    padding-top: 16px;
+                    margin-bottom: 10px;
+                  "
+                >
                   <el-row>
                     <!-- 汇总录入的时候显示 -->
-                    <el-col :span="12" v-if="item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1">
+                    <el-col
+                      :span="12"
+                      v-if="item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1"
+                    >
                       <el-form-item label="合格数量" required>
-                        <el-input v-model="cur.qualifiedQuantity" placeholder="请输入合格数量" type="number" />
+                        <el-input
+                          v-model="cur.qualifiedQuantity"
+                          placeholder="请输入合格数量"
+                          type="number"
+                        />
                       </el-form-item>
                     </el-col>
-                    <el-col :span="12" v-if="item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1">
+                    <el-col
+                      :span="12"
+                      v-if="item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1"
+                    >
                       <el-form-item label="不合格数量" required>
-                        <el-input v-model="cur.unqualifiedQuantity" type="number" placeholder="请输入不合格数量"/>
+                        <el-input
+                          v-model="cur.unqualifiedQuantity"
+                          type="number"
+                          placeholder="请输入不合格数量"
+                        />
                       </el-form-item>
                     </el-col>
-                    <el-col :span="12" v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == '0'">
+                    <el-col
+                      :span="12"
+                      v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == '0'"
+                    >
                       <el-form-item label="检验值" required>
-                        <el-input v-model="cur.inspectionValue" placeholder="请输入检验值" type="number" />
+                        <el-input
+                          v-model="cur.inspectionValue"
+                          placeholder="请输入检验值"
+                          type="number"
+                          @blur="inspectionValueInput(item, cur)"
+                        />
                       </el-form-item>
                     </el-col>
-                    <el-col :span="12" v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == '1'">
+                    <el-col
+                      :span="12"
+                      v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == '1'"
+                    >
                       <el-form-item label="选定集" required>
-                        <el-select v-model="cur.qualitativeCode" placeholder="请选择选定集"
-                          @change="changeQualitativeCode($event, item, cur)">
-                          <el-option v-for="dict in item.selectedProjectRespVOList" :key="dict.dictionaryValue"
-                            :label="dict.dictionaryLabel" :value="dict.dictionaryValue" />
+                        <el-select
+                          v-model="cur.qualitativeCode"
+                          placeholder="请选择选定集"
+                          @change="changeQualitativeCode($event, item, cur)"
+                        >
+                          <el-option
+                            v-for="dict in item.selectedProjectRespVOList"
+                            :key="dict.dictionaryValue"
+                            :label="dict.dictionaryLabel"
+                            :value="dict.dictionaryValue"
+                          />
                         </el-select>
                       </el-form-item>
                     </el-col>
@@ -231,10 +471,18 @@
         <ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick" />
       </template>
     </Dialog>
-    <Dialog title="修改名称" v-model="dialogVisibleName" width="500px" :close-on-click-modal="false">
+    <Dialog
+      title="修改名称"
+      v-model="dialogVisibleName"
+      width="500px"
+      :close-on-click-modal="false"
+    >
       <div style="padding: 0px 20px">
         <el-form ref="nameRef" :model="nameForm">
-          <el-form-item :rules="[{ required: true, message: '请输入名称', trigger: 'blur' }]" prop="name">
+          <el-form-item
+            :rules="[{ required: true, message: '请输入名称', trigger: 'blur' }]"
+            prop="name"
+          >
             <el-input v-model="nameForm.name" style="width: 240px" placeholder="请输入名称" />
           </el-form-item>
         </el-form>
@@ -247,817 +495,957 @@
   </div>
 </template>
 <script setup lang="ts">
-  import * as defaultButtons from '@/utils/disposition/defaultButtons'
-  import { getCurrentInstance } from 'vue'
-  import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
-  import * as InspectionJobDetailPageApi from '@/api/qms/inspectionJob/inspectionJobDetail'
-  import { SearchTable } from '@/components/SearchTable'
-  import * as InspectionJobMainApi from '@/api/qms/inspectionJob/inspectionJobMain'
-  import * as InspectionJobPackageApi from '@/api/qms/inspectionJob/InspectionJobPackage/InspectionJobPackage'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { getCurrentInstance } from 'vue'
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+import * as InspectionJobDetailPageApi from '@/api/qms/inspectionJob/inspectionJobDetail'
+import { SearchTable } from '@/components/SearchTable'
+import * as InspectionJobMainApi from '@/api/qms/inspectionJob/inspectionJobMain'
+import * as InspectionJobPackageApi from '@/api/qms/inspectionJob/InspectionJobPackage/InspectionJobPackage'
 
-  const { proxy } = getCurrentInstance()
+const { proxy } = getCurrentInstance()
 
-  const message = useMessage() // 消息弹窗
+const message = useMessage() // 消息弹窗
 
-  const props = defineProps({
-    // 显示窗口宽度设置
-    basicFormWidth: {
-      type: String,
-      default: ''
-    },
-    // 检验特性表单，列表 相关信息
-    formAllSchemasFeatures: {
-      type: Object,
-      required: true,
-      default: null
-    },
-    // 检验工序表单，列表 相关信息
-    formAllSchemasProcess: {
-      type: Object,
-      required: true,
-      default: null
-    },
-    // 检验模板表单，列表 相关信息
-    formAllSchemasMain: {
-      type: Object,
-      required: true,
-      default: null
-    },
-    // 底部按钮集合
-    footButttondata: {
-      type: Array,
-      required: false,
-      default: null
-    },
-    // 表单，列表 相关信息
-    formAllSchemas: {
-      type: Object,
-      required: true,
-      default: null
-    },
-    // 校验rules
-    rules: {
-      type: Object,
-      required: true,
-      default: null
-    },
-    // 包装 列表 相关信息
-    tableAllSchemas: {
-      type: Array,
-      required: true,
-      default: null
-    },
-    tableFormRules: {
-      type: Array,
-      required: true,
-      default: null
-    },
-  })
-  const { t } = useI18n() // 国际化
+const props = defineProps({
+  // 显示窗口宽度设置
+  basicFormWidth: {
+    type: String,
+    default: ''
+  },
+  // 检验特性表单，列表 相关信息
+  formAllSchemasFeatures: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 检验工序表单，列表 相关信息
+  formAllSchemasProcess: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 检验模板表单，列表 相关信息
+  formAllSchemasMain: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 底部按钮集合
+  footButttondata: {
+    type: Array,
+    required: false,
+    default: null
+  },
+  // 表单，列表 相关信息
+  formAllSchemas: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 校验rules
+  rules: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 包装 列表 相关信息
+  tableAllSchemas: {
+    type: Array,
+    required: true,
+    default: null
+  },
+  tableFormRules: {
+    type: Array,
+    required: true,
+    default: null
+  }
+})
+const { t } = useI18n() // 国际化
 
-  const dialogVisible = ref(false) // 弹窗的是否展示
-  const dialogTitle = ref('') // 弹窗的标题
-  const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-  const formType = ref('') // 表单的类型：create - 新增；update - 修改
-  const dialogWidth = ref()
-  const formMainRef = ref()
-  const formFeaturesRef = ref()
-  const formProcessRef = ref()
-  const formSchema = ref(props.formAllSchemas?.formSchema)
-  const tableAllSchemas = ref(props.tableAllSchemas)
-  const tableFormRules = ref(props.tableFormRules)
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const dialogWidth = ref()
+const formMainRef = ref()
+const formFeaturesRef = ref()
+const formProcessRef = ref()
+const formSchema = ref(props.formAllSchemas?.formSchema)
+const tableAllSchemas = ref(props.tableAllSchemas)
+const tableFormRules = ref(props.tableFormRules)
 
-  const data = ref({
-    code: '',
-    itemCode: '',
-    version: '',
-    testTypeCode: '',
-    programmeTemplateCode: '',
-    splitRule: '',
-    aql: '',
-    inspectionLevel: '',
-    effectiveDate: '',
-    expirationDate: '',
-    available: 'TRUE',
-    subList: []
-  })
+const data = ref({
+  code: '',
+  itemCode: '',
+  version: '',
+  testTypeCode: '',
+  programmeTemplateCode: '',
+  splitRule: '',
+  aql: '',
+  inspectionLevel: '',
+  effectiveDate: '',
+  expirationDate: '',
+  available: 'TRUE',
+  subList: []
+})
 
-  const dialogVisibleName = ref(false)
-  const nameForm = ref({
-    name: ''
-  })
-  const nameRef = ref()
-  if (props.basicFormWidth) {
-    dialogWidth.value = props.basicFormWidth + '%'
+const dialogVisibleName = ref(false)
+const nameForm = ref({
+  name: ''
+})
+const nameRef = ref()
+if (props.basicFormWidth) {
+  dialogWidth.value = props.basicFormWidth + '%'
+} else {
+  dialogWidth.value = props.isBusiness ? '60%' : '40%'
+}
+const rules = ref({
+  ...props.rules,
+  'inspectionJobCharacteristicsUpdateReqVO.description': [
+    { required: true, message: '请填写描述', trigger: ['blur', 'change'] }
+  ],
+  'inspectionJobCharacteristicsUpdateReqVO.inspectionMethodCode': [
+    { required: true, message: '请选择检验方法编码', trigger: 'blur' }
+  ],
+  'inspectionJobCharacteristicsUpdateReqVO.dynamicUpdateCode': [
+    { required: true, message: '请选择采样过程编码', trigger: ['blur', 'change'] }
+  ],
+  'inspectionJobCharacteristicsUpdateReqVO.inspectionMethod': [
+    { required: true, message: '请选择动态修改规则编码', trigger: ['blur', 'change'] }
+  ],
+  'inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod': [
+    { required: true, message: '请选择结果录入方式', trigger: ['blur', 'change'] }
+  ],
+  'inspectionJobCharacteristicsUpdateReqVO.featureType': [
+    { required: true, message: '请选择特征类型', trigger: ['blur', 'change'] }
+  ],
+  'inspectionJobCharacteristicsUpdateReqVO.quantifyTarget': [
+    { required: true, message: '请输入目标值', trigger: 'blur' }
+  ],
+  'inspectionJobCharacteristicsUpdateReqVO.quantifyCapping': [
+    { required: true, message: '请输入上限值', trigger: 'blur' }
+  ],
+  'inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit': [
+    { required: true, message: '请输入下限值', trigger: 'blur' }
+  ],
+  'inspectionJobCharacteristicsUpdateReqVO.quantifyUom': [
+    { required: true, message: '请选择计量单位', trigger: 'blur' }
+  ],
+  'inspectionJobCharacteristicsUpdateReqVO.quantifyDecimal': [
+    { required: true, message: '请输入小数位', trigger: 'blur' }
+  ],
+  'inspectionJobCharacteristicsUpdateReqVO.quantifyQuantifyCode': [
+    { required: true, message: '请选择集编码', trigger: 'change' }
+  ],
+  'inspectionJobCharacteristicsUpdateReqVO.estimateCode': [
+    { required: true, message: '请选择评估代码', trigger: 'blur' }
+  ],
+  'inspectionJobCharacteristicsUpdateReqVO.sampleQty': [
+    { required: true, message: '请输入样品份数', trigger: 'blur' }
+  ],
+  qualifiedQuantity: [{ required: true, message: '请输入选择结束时间', trigger: 'blur' }]
+})
+const allSamplePieceSize = ref(0)
+/** 打开弹窗 */
+let tabIndex = 1
+const open = async (type: string, row?: any, masterParmas?: any, titleName?: any) => {
+  if (titleName) {
+    dialogTitle.value = t('action.' + titleName)
   } else {
-    dialogWidth.value = props.isBusiness ? '60%' : '40%'
+    dialogTitle.value = t('action.' + type)
   }
-  const rules = ref({
-    ...props.rules,
-    'inspectionJobCharacteristicsUpdateReqVO.description': [
-      { required: true, message: '请填写描述', trigger: ['blur', 'change'] }
-    ],
-    'inspectionJobCharacteristicsUpdateReqVO.inspectionMethodCode': [
-      { required: true, message: '请选择检验方法编码', trigger: 'blur' }
-    ],
-    'inspectionJobCharacteristicsUpdateReqVO.dynamicUpdateCode': [
-      { required: true, message: '请选择采样过程编码', trigger: ['blur', 'change'] }
-    ],
-    'inspectionJobCharacteristicsUpdateReqVO.inspectionMethod': [
-      { required: true, message: '请选择动态修改规则编码', trigger: ['blur', 'change'] }
-    ],
-    'inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod': [
-      { required: true, message: '请选择结果录入方式', trigger: ['blur', 'change'] }
-    ],
-    'inspectionJobCharacteristicsUpdateReqVO.featureType': [
-      { required: true, message: '请选择特征类型', trigger: ['blur', 'change'] }
-    ],
-    'inspectionJobCharacteristicsUpdateReqVO.quantifyTarget': [
-      { required: true, message: '请输入目标值', trigger: 'blur' }
-    ],
-    'inspectionJobCharacteristicsUpdateReqVO.quantifyCapping': [
-      { required: true, message: '请输入上限值', trigger: 'blur' }
-    ],
-    'inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit': [
-      { required: true, message: '请输入下限值', trigger: 'blur' }
-    ],
-    'inspectionJobCharacteristicsUpdateReqVO.quantifyUom': [
-      { required: true, message: '请选择计量单位', trigger: 'blur' }
-    ],
-    'inspectionJobCharacteristicsUpdateReqVO.quantifyDecimal': [
-      { required: true, message: '请输入小数位', trigger: 'blur' }
-    ],
-    'inspectionJobCharacteristicsUpdateReqVO.quantifyQuantifyCode': [
-      { required: true, message: '请选择集编码', trigger: 'change' }
-    ],
-    'inspectionJobCharacteristicsUpdateReqVO.estimateCode': [
-      { required: true, message: '请选择评估代码', trigger: 'blur' }
-    ],
-    'inspectionJobCharacteristicsUpdateReqVO.sampleQty': [
-      { required: true, message: '请输入样品份数', trigger: 'blur' }
-    ],
-    qualifiedQuantity: [{ required: true, message: '请输入选择结束时间', trigger: 'blur' }]
-  })
-  const allSamplePieceSize = ref(0)
-  /** 打开弹窗 */
-  let tabIndex = 1
-  const open = async (type : string, row ?: any, masterParmas ?: any, titleName ?: any) => {
-    if (titleName) {
-      dialogTitle.value = t('action.' + titleName)
-    } else {
-      dialogTitle.value = t('action.' + type)
-    }
-    formType.value = type
-    allSamplePieceSize.value = 0//打开时候归0
-    if (row) {
-      data.value = JSON.parse(JSON.stringify(row))
-      //   await InspectionJobMainApi.acceptInspectionJobMain(row.id)
-      let list = []
-      list = await InspectionJobDetailPageApi.getInspectionJobDetailList(row.id)
-      data.value.packageList = await InspectionJobPackageApi.getInspectionJobPackageList(row.id)
-      list.forEach((item, index) => {
-        // editableTabsValue.value = index + 1
-        item.name = index + 1
-        item.inspectionJobCharacteristicsUpdateReqVO = item.inspectionJobCharacteristicsRespVO
-
-        // 总数量值是 样品份数 乘 每份样品量
-        allSamplePieceSize.value += parseFloat((parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty) * parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.samplePieceSize)).toFixed(6))
-        // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
-        if (!item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList) {
-          // 单个录入时
-          if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 2) {
-            // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
-            item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = []
-            for (let i = 0; i < parseInt(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty); i++) {
-              item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({
-                inspectionValue: '', //检验值
-                qualitativeCode: '', //定性字典项值
-                defectLevel: '', //缺陷级别
-                qualifiedQuantity: '', //合格数量
-                unqualifiedQuantity: '' //不合格数量
-              })
-            }
-          } else {
-            // 汇总录入时
-            item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = []
-            rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = false
+  formType.value = type
+  allSamplePieceSize.value = 0 //打开时候归0
+  if (row) {
+    data.value = JSON.parse(JSON.stringify(row))
+    //   await InspectionJobMainApi.acceptInspectionJobMain(row.id)
+    let list = []
+    list = await InspectionJobDetailPageApi.getInspectionJobDetailList(row.id)
+    data.value.packageList = await InspectionJobPackageApi.getInspectionJobPackageList(row.id)
+    list.forEach((item, index) => {
+      // editableTabsValue.value = index + 1
+      item.name = index + 1
+      item.inspectionJobCharacteristicsUpdateReqVO = item.inspectionJobCharacteristicsRespVO
+      item.isPass = '' //判断是否显示对号错误图标
+      // 总数量值是 样品份数 乘 每份样品量
+      allSamplePieceSize.value += parseFloat(
+        (
+          parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty) *
+          parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.samplePieceSize)
+        ).toFixed(6)
+      )
+      // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
+      if (!item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList) {
+        // 单个录入时
+        if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 2) {
+          // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
+          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = []
+          for (
+            let i = 0;
+            i < parseInt(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty);
+            i++
+          ) {
             item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({
               inspectionValue: '', //检验值
               qualitativeCode: '', //定性字典项值
               defectLevel: '', //缺陷级别
-              qualifiedQuantity: parseFloat((parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty) * parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.samplePieceSize)).toFixed(6)), //合格数量
-              unqualifiedQuantity: '0' //不合格数量
-            }
-            )
+              qualifiedQuantity: '', //合格数量
+              unqualifiedQuantity: '' //不合格数量
+            })
           }
-        }
-
-        // 编辑判断上限下限目标值是否必填
-        if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping) {
-          rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
         } else {
+          // 汇总录入时
+          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = []
           rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = false
+          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({
+            inspectionValue: '', //检验值
+            qualitativeCode: '', //定性字典项值
+            defectLevel: '', //缺陷级别
+            qualifiedQuantity: parseFloat(
+              (
+                parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty) *
+                parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.samplePieceSize)
+              ).toFixed(6)
+            ), //合格数量
+            unqualifiedQuantity: '0' //不合格数量
+          })
         }
-        if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit) {
-          rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit'][0].required = true
-        } else {
-          rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit'][0].required = false
-        }
-        if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget) {
-          rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyTarget'][0].required = true
-        } else {
-          rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyTarget'][0].required = false
-        }
-        if (item.samplingProcessRespVO.evaluationMode == 1) {
-          rules.value['inspectionJobCharacteristicsUpdateReqVO.estimateCode'][0].required = true
-        } else {
-          rules.value['inspectionJobCharacteristicsUpdateReqVO.estimateCode'][0].required = false
-        }
-      })
-      list.forEach(item => {
-        item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime = new Date()
-      })
-      data.value.subList = list
-      /**
+      }
+
+      // 编辑判断上限下限目标值是否必填
+      if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping) {
+        rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
+      } else {
+        rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = false
+      }
+      if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit) {
+        rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit'][0].required = true
+      } else {
+        rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit'][0].required = false
+      }
+      if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget) {
+        rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyTarget'][0].required = true
+      } else {
+        rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyTarget'][0].required = false
+      }
+      if (item.samplingProcessRespVO.evaluationMode == 1) {
+        rules.value['inspectionJobCharacteristicsUpdateReqVO.estimateCode'][0].required = true
+      } else {
+        rules.value['inspectionJobCharacteristicsUpdateReqVO.estimateCode'][0].required = false
+      }
+    })
+    list.forEach((item) => {
+      item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime = new Date()
+    })
+    data.value.subList = list
+    /**
         设置采样数量，默认第一个包装采样数量<总数量，显示数量字段，第二个包装和剩下的总数量对比，以此类推，
         第一个包装采样数量>总数量 则显示总数量
       */
 
-      for (let i = 0; i < data.value.packageList.length; i++) {
-        if (data.value.packageList[i].sampleAmount == null) {
-          if (allSamplePieceSize.value > data.value.packageList[i].amount) {
-            data.value.packageList[i].sampleAmount = data.value.packageList[i].amount
-            allSamplePieceSize.value = parseFloat((allSamplePieceSize.value - data.value.packageList[i].amount).toFixed(6))
-          } else {
-            data.value.packageList[i].sampleAmount = allSamplePieceSize.value
-            allSamplePieceSize.value = 0
-            // return;
-          }
+    for (let i = 0; i < data.value?.packageList?.length; i++) {
+      if (data.value.packageList[i].sampleAmount == null) {
+        if (allSamplePieceSize.value > data.value.packageList[i].amount) {
+          data.value.packageList[i].sampleAmount = data.value.packageList[i].amount
+          allSamplePieceSize.value = parseFloat(
+            (allSamplePieceSize.value - data.value.packageList[i].amount).toFixed(6)
+          )
+        } else {
+          data.value.packageList[i].sampleAmount = allSamplePieceSize.value
+          allSamplePieceSize.value = 0
+          // return;
         }
       }
-      // data.value.packageList.forEach(item=>{
-
-      // })
-      dialogVisible.value = true
-      nextTick(() => {
-        formMainRef.value.setValues(row)
-      })
-    } else {
-      data.value = {
-        code: '',
-        itemCode: '',
-        version: '',
-        testTypeCode: '',
-        programmeTemplateCode: '',
-        splitRule: '',
-        aql: '',
-        inspectionLevel: '',
-        effectiveDate: '',
-        expirationDate: '',
-        available: 'TRUE',
-        subList: []
-      }
     }
-    dialogVisible.value = true
-    tabIndex = data.value.subList.length + 1
-  }
-  defineExpose({ open, dialogVisible, formLoading }) // 提供 open 方法，用于打开弹窗
-  import type { TabPaneName } from 'element-plus'
+    // data.value.packageList.forEach(item=>{
 
-  const editableTabsValue = ref(1)
-  // const editableTabs = ref([])
-  const handleTabsEdit = (targetName : TabPaneName | undefined, action : 'remove' | 'add') => {
-    if (action === 'add') {
-      nameForm.value.name = ''
-      dialogVisibleName.value = true
-    } else if (action === 'remove') {
-      const tabs = data.value.subList
-      let activeName = editableTabsValue.value
-      if (activeName === targetName) {
-        tabs.forEach((tab, index) => {
-          if (tab.name === targetName) {
-            const nextTab = tabs[index + 1] || tabs[index - 1]
-            if (nextTab) {
-              activeName = nextTab.name
-            }
-          }
-        })
-      }
-      editableTabsValue.value = activeName
-      data.value.subList = tabs.filter((tab) => tab.name !== targetName)
+    // })
+    dialogVisible.value = true
+    nextTick(() => {
+      formMainRef.value.setValues(row)
+    })
+  } else {
+    data.value = {
+      code: '',
+      itemCode: '',
+      version: '',
+      testTypeCode: '',
+      programmeTemplateCode: '',
+      splitRule: '',
+      aql: '',
+      inspectionLevel: '',
+      effectiveDate: '',
+      expirationDate: '',
+      available: 'TRUE',
+      subList: []
     }
   }
-  /** 修改名称时间 */
-  const buttonBaseClick1 = async (val) => {
-    // 保存
-    if (val == 'save') {
-      if (!nameRef.value) return
-      nameRef.value.validate((valid, fields) => {
-        if (valid) {
-          const newTabName = `${++tabIndex}`
-          data.value.subList.push({
-            description: nameForm.value.name,
-            name: newTabName,
-            inspectionCode: '',
-            sequenceCode: '',
-            inspectionCharCode: '',
-            inspectionJobCharacteristicsUpdateReqVO: {
-              describe: '',
-              inspectionMethodCode: '',
-              dynamicUpdateCode: '',
-              inspectionMethod: '',
-              isCanUpdate: '',
-              isDestructionInspection: '',
-              resultEntryMethod: '',
-              featureType: '',
-              quantifyIsCapping: '',
-              quantifyIsLowlimit: '',
-              quantifyIsTarget: '',
-              quantifyTarget: '',
-              quantifyCapping: '',
-              quantifyLowlimit: '',
-              quantifyUom: '',
-              quantifyDecimal: '',
-              quantifyQuantifyCode: ''
-            }
-          })
+  dialogVisible.value = true
+  tabIndex = data.value.subList.length + 1
+}
+defineExpose({ open, dialogVisible, formLoading }) // 提供 open 方法，用于打开弹窗
+import type { TabPaneName } from 'element-plus'
 
-          editableTabsValue.value = newTabName
-          dialogVisibleName.value = false
-        } else {
-          return false
+const editableTabsValue = ref(1)
+// const editableTabs = ref([])
+const handleTabsEdit = (targetName: TabPaneName | undefined, action: 'remove' | 'add') => {
+  if (action === 'add') {
+    nameForm.value.name = ''
+    dialogVisibleName.value = true
+  } else if (action === 'remove') {
+    const tabs = data.value.subList
+    let activeName = editableTabsValue.value
+    if (activeName === targetName) {
+      tabs.forEach((tab, index) => {
+        if (tab.name === targetName) {
+          const nextTab = tabs[index + 1] || tabs[index - 1]
+          if (nextTab) {
+            activeName = nextTab.name
+          }
         }
       })
     }
-    // 关闭
-    else if (val == 'close') {
-      dialogVisibleName.value = false
-    }
-  }
-  const buttonBaseClick = async (val) => {
-    // 保存
-    if (val == 'save') {
-      submitForm()
-    }
-    // 关闭
-    else if (val == 'close') {
-      //  await InspectionJobMainApi.abandonInspectionJobMain(data.value.id)
-      dialogVisible.value = false
-    }
-    // 暂存
-    else if (val == 'staging') {
-      staging()
-    }
+    editableTabsValue.value = activeName
+    data.value.subList = tabs.filter((tab) => tab.name !== targetName)
   }
-  // 传递给父类
-  const emit = defineEmits(['submitForm', 'searchTableSuccess'])
-  const validateForm = (formRef) => {
-    let _lists = formRef?.map((v) => v.validate())
-    return Promise.all(_lists)
-      .then(() => {
-        return true
-      })
-      .catch(() => {
-        return false
-      })
-  }
-  const tableFormRef = ref()
-  const submitForm = async () => {
-    try {
-      const elForm = unref(formMainRef)?.getElFormRef()
-      // 校验表单
-      if (!elForm) return
-      const valid = await elForm.validate()
-      if (!valid) return
-      // 校验包装列表
+}
+/** 修改名称时间 */
+const buttonBaseClick1 = async (val) => {
+  // 保存
+  if (val == 'save') {
+    if (!nameRef.value) return
+    nameRef.value.validate((valid, fields) => {
+      if (valid) {
+        const newTabName = `${++tabIndex}`
+        data.value.subList.push({
+          description: nameForm.value.name,
+          name: newTabName,
+          inspectionCode: '',
+          sequenceCode: '',
+          inspectionCharCode: '',
+          inspectionJobCharacteristicsUpdateReqVO: {
+            describe: '',
+            inspectionMethodCode: '',
+            dynamicUpdateCode: '',
+            inspectionMethod: '',
+            isCanUpdate: '',
+            isDestructionInspection: '',
+            resultEntryMethod: '',
+            featureType: '',
+            quantifyIsCapping: '',
+            quantifyIsLowlimit: '',
+            quantifyIsTarget: '',
+            quantifyTarget: '',
+            quantifyCapping: '',
+            quantifyLowlimit: '',
+            quantifyUom: '',
+            quantifyDecimal: '',
+            quantifyQuantifyCode: ''
+          }
+        })
 
-      if (data.value.packageList?.length > 0) {
-        const validateForm1 = await tableFormRef.value.validateForm()
-        if (!validateForm1) return
-        let isPass = data.value.packageList.some(cur => parseFloat(cur.sampleAmount) > parseFloat(cur.amount))
-        if (isPass) {
-          message.error(`采样数量不能大于数量`)
-          return
-        }
-        // let number = 0
-        // data.value.packageList.forEach(cur=>{
-        //   number += parseFloat(cur.sampleAmount)
-        // })
-        // number = number.toFixed('2')
-        // if(number != data.value.sampleTotalAmount){
-        //   message.error(`采样数量之和必须等于采样总数量`)
-        //   return
-        // }
+        editableTabsValue.value = newTabName
+        dialogVisibleName.value = false
+      } else {
+        return false
       }
+    })
+  }
+  // 关闭
+  else if (val == 'close') {
+    dialogVisibleName.value = false
+  }
+}
+const buttonBaseClick = async (val) => {
+  // 保存
+  if (val == 'save') {
+    submitForm()
+  }
+  // 关闭
+  else if (val == 'close') {
+    //  await InspectionJobMainApi.abandonInspectionJobMain(data.value.id)
+    dialogVisible.value = false
+  }
+  // 暂存
+  else if (val == 'staging') {
+    staging()
+  }
+}
+// 传递给父类
+const emit = defineEmits(['submitForm', 'searchTableSuccess'])
+const validateForm = (formRef) => {
+  let _lists = formRef?.map((v) => v.validate())
+  return Promise.all(_lists)
+    .then(() => {
+      return true
+    })
+    .catch(() => {
+      return false
+    })
+}
+const tableFormRef = ref()
+const submitForm = async () => {
+  try {
+    const elForm = unref(formMainRef)?.getElFormRef()
+    // 校验表单
+    if (!elForm) return
+    const valid = await elForm.validate()
+    if (!valid) return
+    // 校验包装列表
 
-      const bol2 = await validateForm(formFeaturesRef.value)
-      if (!bol2) {
-        message.error(`模板中有检验工序和检验特性未填写完全`)
+    if (data.value.packageList?.length > 0) {
+      const validateForm1 = await tableFormRef.value.validateForm()
+      if (!validateForm1) return
+      let isPass = data.value.packageList.some(
+        (cur) => parseFloat(cur.sampleAmount) > parseFloat(cur.amount)
+      )
+      if (isPass) {
+        message.error(`采样数量不能大于数量`)
         return
       }
-      // 判断数组是否有未填的选项
-      let arrBol = []
-      let isOutweigh = []//结束时间是否大于开始时间
-      let numberList = []//判断合格数量和不合格数量之和是否等于主表数量
-      let parseFloatList = []//判断合格数量和不合格数量是否是整数
-      data.value.subList.forEach((item, index) => {
-        if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1) {
-          arrBol.push(
-            item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
-              (cur, key) => {
-                return cur.qualifiedQuantity === '' || cur.unqualifiedQuantity === ''
-              }
-            )
-          )
-        }
-        if (item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0) {
-          arrBol.push(
-            item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
-              (cur, key) => {
-                return !cur.inspectionValue
-              }
-            )
-          )
-        }
-        if (item.inspectionJobCharacteristicsUpdateReqVO.featureType == 1) {
-          arrBol.push(
-            item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
-              (cur, key) => {
-                return !cur.qualitativeCode
-              }
-            )
-          )
-        }
-        // 开始时间大于结束时间放入数组中
-        if (item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime > item.inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime) {
-          isOutweigh.push(item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime)
-        }
-        // 合格数量和不合格数量之和不能是小数
-        if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1) {
-          parseFloatList.push(
-            item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
-              (cur, key) => {
-                return String(cur.qualifiedQuantity).indexOf('.') > -1 || String(cur.unqualifiedQuantity).indexOf('.') > -1
-              }
-            )
-          )
-          // 合格数量和不合格数量之和不等于总数量
-          numberList.push(
-            item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
-              (cur, key) => {
-                return parseFloat(cur.qualifiedQuantity) + parseFloat(cur.unqualifiedQuantity) != parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty)
-              }
-            )
+      // let number = 0
+      // data.value.packageList.forEach(cur=>{
+      //   number += parseFloat(cur.sampleAmount)
+      // })
+      // number = number.toFixed('2')
+      // if(number != data.value.sampleTotalAmount){
+      //   message.error(`采样数量之和必须等于采样总数量`)
+      //   return
+      // }
+    }
+
+    const bol2 = await validateForm(formFeaturesRef.value)
+    if (!bol2) {
+      message.error(`模板中有检验工序和检验特性未填写完全`)
+      return
+    }
+    // 判断数组是否有未填的选项
+    let arrBol = []
+    let isOutweigh = [] //结束时间是否大于开始时间
+    let numberList = [] //判断合格数量和不合格数量之和是否等于主表数量
+    let parseFloatList = [] //判断合格数量和不合格数量是否是整数
+    data.value.subList.forEach((item, index) => {
+      if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1) {
+        arrBol.push(
+          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
+            (cur, key) => {
+              return cur.qualifiedQuantity === '' || cur.unqualifiedQuantity === ''
+            }
           )
-        }
-      })
-      let isEmpty1 = arrBol.some(item => item == true)
-      let isEmptyNumberList = numberList.some(item => item == true)
-      let isParseFloat = parseFloatList.some(item => item == true)
-      if (isEmpty1) {
-        message.error('检验工序和检验特性有字段未填写完全')
-        return;
+        )
       }
-      if (isOutweigh?.length > 0) {
-        message.error('检验特性中有开始时间大于结束时间')
-        return;
+      if (item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0) {
+        arrBol.push(
+          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
+            (cur, key) => {
+              return !cur.inspectionValue
+            }
+          )
+        )
       }
-      if (isParseFloat) {
-        message.error('合格数量和不合格数量之和不可以是小数')
-        return;
+      if (item.inspectionJobCharacteristicsUpdateReqVO.featureType == 1) {
+        arrBol.push(
+          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
+            (cur, key) => {
+              return !cur.qualitativeCode
+            }
+          )
+        )
       }
-      if (isEmptyNumberList) {
-        message.error('合格数量和不合格数量之和必须等于样品份数')
-        return;
+      // 开始时间大于结束时间放入数组中
+      if (
+        item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime >
+        item.inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime
+      ) {
+        isOutweigh.push(item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime)
       }
-      if (formType.value == 'create') {
-        // 主子表——提交请求
-        emit('submitForm', formType.value, data.value)
-      } else {
-        // 编辑/执行
-        emit('submitForm', formType.value, data.value)
+      // 合格数量和不合格数量之和不能是小数
+      if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1) {
+        parseFloatList.push(
+          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
+            (cur, key) => {
+              return (
+                String(cur.qualifiedQuantity).indexOf('.') > -1 ||
+                String(cur.unqualifiedQuantity).indexOf('.') > -1
+              )
+            }
+          )
+        )
+        // 合格数量和不合格数量之和不等于总数量
+        numberList.push(
+          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
+            (cur, key) => {
+              return (
+                parseFloat(cur.qualifiedQuantity) + parseFloat(cur.unqualifiedQuantity) !=
+                parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty)
+              )
+            }
+          )
+        )
       }
-    } catch {
+    })
+    let isEmpty1 = arrBol.some((item) => item == true)
+    let isEmptyNumberList = numberList.some((item) => item == true)
+    let isParseFloat = parseFloatList.some((item) => item == true)
+    if (isEmpty1) {
+      message.error('检验工序和检验特性有字段未填写完全')
+      return
     }
-  }
+    if (isOutweigh?.length > 0) {
+      message.error('检验特性中有开始时间大于结束时间')
+      return
+    }
+    if (isParseFloat) {
+      message.error('合格数量和不合格数量之和不可以是小数')
+      return
+    }
+    if (isEmptyNumberList) {
+      message.error('合格数量和不合格数量之和必须等于样品份数')
+      return
+    }
+    if (formType.value == 'create') {
+      // 主子表——提交请求
+      emit('submitForm', formType.value, data.value)
+    } else {
+      // 编辑/执行
+      emit('submitForm', formType.value, data.value)
+    }
+  } catch {}
+}
 
-  const staging = async () => {
-    try {
-      const elForm = unref(formMainRef)?.getElFormRef()
-      // 校验表单
-      if (!elForm) return
-      const valid = await elForm.validate()
-      if (!valid) return
-      // 校验包装列表
+const staging = async () => {
+  try {
+    const elForm = unref(formMainRef)?.getElFormRef()
+    // 校验表单
+    if (!elForm) return
+    const valid = await elForm.validate()
+    if (!valid) return
+    // 校验包装列表
 
-      if (data.value.packageList?.length > 0) {
-        const validateForm1 = await tableFormRef.value.validateForm()
-        if (!validateForm1) return
-        let isPass = data.value.packageList.some(cur => parseFloat(cur.sampleAmount) > parseFloat(cur.amount))
-        if (isPass) {
-          message.error(`采样数量不能大于数量`)
-          return
-        }
-        // let number = 0
-        // data.value.packageList.forEach(cur=>{
-        //   number += parseFloat(cur.sampleAmount)
-        // })
-        // number = number.toFixed('2')
-        // if(number != data.value.sampleTotalAmount){
-        //   message.error(`采样数量之和必须等于采样总数量`)
-        //   return
-        // }
+    if (data.value.packageList?.length > 0) {
+      const validateForm1 = await tableFormRef.value.validateForm()
+      if (!validateForm1) return
+      let isPass = data.value.packageList.some(
+        (cur) => parseFloat(cur.sampleAmount) > parseFloat(cur.amount)
+      )
+      if (isPass) {
+        message.error(`采样数量不能大于数量`)
+        return
       }
+      // let number = 0
+      // data.value.packageList.forEach(cur=>{
+      //   number += parseFloat(cur.sampleAmount)
+      // })
+      // number = number.toFixed('2')
+      // if(number != data.value.sampleTotalAmount){
+      //   message.error(`采样数量之和必须等于采样总数量`)
+      //   return
+      // }
+    }
 
-      const bol2 = await validateForm(formFeaturesRef.value)
-      if (!bol2) {
-        message.error(`模板中有检验工序和检验特性未填写完全`)
-        return
+    const bol2 = await validateForm(formFeaturesRef.value)
+    if (!bol2) {
+      message.error(`模板中有检验工序和检验特性未填写完全`)
+      return
+    }
+    // 判断数组是否有未填的选项
+    let arrBol = []
+    let isOutweigh = [] //结束时间是否大于开始时间
+    let numberList = [] //判断合格数量和不合格数量之和是否等于主表数量
+    let parseFloatList = [] //判断合格数量和不合格数量是否是整数
+    data.value.subList.forEach((item, index) => {
+      if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1) {
+        arrBol.push(
+          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
+            (cur, key) => {
+              return cur.qualifiedQuantity === '' || cur.unqualifiedQuantity === ''
+            }
+          )
+        )
       }
-      // 判断数组是否有未填的选项
-      let arrBol = []
-      let isOutweigh = []//结束时间是否大于开始时间
-      let numberList = []//判断合格数量和不合格数量之和是否等于主表数量
-      let parseFloatList = []//判断合格数量和不合格数量是否是整数
-      data.value.subList.forEach((item, index) => {
-        if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1) {
-          arrBol.push(
-            item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
-              (cur, key) => {
-                return cur.qualifiedQuantity === '' || cur.unqualifiedQuantity === ''
-              }
-            )
+      if (item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0) {
+        arrBol.push(
+          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
+            (cur, key) => {
+              return !cur.inspectionValue
+            }
           )
-        }
-        if (item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0) {
-          arrBol.push(
-            item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
-              (cur, key) => {
-                return !cur.inspectionValue
-              }
-            )
+        )
+      }
+      if (item.inspectionJobCharacteristicsUpdateReqVO.featureType == 1) {
+        arrBol.push(
+          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
+            (cur, key) => {
+              return !cur.qualitativeCode
+            }
           )
-        }
-        if (item.inspectionJobCharacteristicsUpdateReqVO.featureType == 1) {
-          arrBol.push(
-            item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
-              (cur, key) => {
-                return !cur.qualitativeCode
-              }
-            )
+        )
+      }
+      // 开始时间大于结束时间放入数组中
+      if (
+        item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime >
+        item.inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime
+      ) {
+        isOutweigh.push(item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime)
+      }
+      // 合格数量和不合格数量之和不能是小数
+      if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1) {
+        parseFloatList.push(
+          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
+            (cur, key) => {
+              return (
+                String(cur.qualifiedQuantity).indexOf('.') > -1 ||
+                String(cur.unqualifiedQuantity).indexOf('.') > -1
+              )
+            }
           )
-        }
-        // 开始时间大于结束时间放入数组中
-        if (item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime > item.inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime) {
-          isOutweigh.push(item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime)
-        }
-        // 合格数量和不合格数量之和不能是小数
-        if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1) {
-          parseFloatList.push(
-            item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
-              (cur, key) => {
-                return String(cur.qualifiedQuantity).indexOf('.') > -1 || String(cur.unqualifiedQuantity).indexOf('.') > -1
-              }
-            )
+        )
+        // 合格数量和不合格数量之和不等于总数量
+        numberList.push(
+          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
+            (cur, key) => {
+              return (
+                parseFloat(cur.qualifiedQuantity) + parseFloat(cur.unqualifiedQuantity) !=
+                parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty)
+              )
+            }
           )
-          // 合格数量和不合格数量之和不等于总数量
-          numberList.push(
-            item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
-              (cur, key) => {
-                return parseFloat(cur.qualifiedQuantity) + parseFloat(cur.unqualifiedQuantity) != parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty)
-              }
-            )
+        )
+      }
+    })
+    let isEmpty1 = arrBol.some((item) => item == true)
+    let isEmptyNumberList = numberList.some((item) => item == true)
+    let isParseFloat = parseFloatList.some((item) => item == true)
+    if (isEmpty1) {
+      message.error('检验工序和检验特性有字段未填写完全')
+      return
+    }
+    if (isOutweigh?.length > 0) {
+      message.error('检验特性中有开始时间大于结束时间')
+      return
+    }
+    if (isParseFloat) {
+      message.error('合格数量和不合格数量之和不可以是小数')
+      return
+    }
+    if (isEmptyNumberList) {
+      message.error('合格数量和不合格数量之和必须等于样品份数')
+      return
+    }
+    await InspectionJobMainApi.stagingInspectionJobMain(data.value)
+    message.success('暂存成功')
+  } catch {}
+}
+
+/** 弹窗按钮 */
+let Butttondata: any = []
+if (props.footButttondata) {
+  Butttondata = props.footButttondata
+} else {
+  Butttondata = [
+    defaultButtons.formStagingBtn(null), // 暂存
+    defaultButtons.formSaveBtn(null), // 保存
+    defaultButtons.formCloseBtn(null) // 关闭
+  ]
+}
+// 选择特征类型
+const changeFeatureType = (e) => {
+  // if (e) {
+  //   rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyQuantifyCode'][0].required = true
+  // } else {
+  //   rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyQuantifyCode'][0].required = false
+  // }
+}
+const searchTableRef = ref()
+const opensearchTable = (
+  formField,
+  searchField,
+  searchTitle,
+  searchAllSchemas,
+  searchPage,
+  searchCondition,
+  multiple,
+  type,
+  row
+) => {
+  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].isSearch) {
+          filters.push({
+            action: searchCondition[i].action,
+            column: searchCondition[i].key,
+            value: searchCondition[i].value
+          })
+        } else {
+          _searchCondition[searchCondition[i].key] = searchCondition[i].value
         }
-      })
-      let isEmpty1 = arrBol.some(item => item == true)
-      let isEmptyNumberList = numberList.some(item => item == true)
-      let isParseFloat = parseFloatList.some(item => item == true)
-      if (isEmpty1) {
-        message.error('检验工序和检验特性有字段未填写完全')
-        return;
-      }
-      if (isOutweigh?.length > 0) {
-        message.error('检验特性中有开始时间大于结束时间')
-        return;
-      }
-      if (isParseFloat) {
-        message.error('合格数量和不合格数量之和不可以是小数')
-        return;
-      }
-      if (isEmptyNumberList) {
-        message.error('合格数量和不合格数量之和必须等于样品份数')
-        return;
       }
-      await InspectionJobMainApi.stagingInspectionJobMain(data.value);
-      message.success("暂存成功")
-    } catch {
+    }
+    if (filters.length > 0) {
+      _searchCondition.isSearch = true
+      _searchCondition.filters = filters
     }
   }
-
-  /** 弹窗按钮 */
-  let Butttondata : any = []
-  if (props.footButttondata) {
-    Butttondata = props.footButttondata
-  } else {
-    Butttondata = [
-      defaultButtons.formStagingBtn(null), // 暂存
-      defaultButtons.formSaveBtn(null), // 保存
-      defaultButtons.formCloseBtn(null) // 关闭
-    ]
-  }
-  // 选择特征类型
-  const changeFeatureType = (e) => {
-    // if (e) {
-    //   rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyQuantifyCode'][0].required = true
-    // } else {
-    //   rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyQuantifyCode'][0].required = false
-    // }
-  }
-  const searchTableRef = ref()
-  const opensearchTable = (
+  const _searchTableTitle = searchTitle
+  const _searchTableAllSchemas = searchAllSchemas
+  const _searchTablePage = searchPage
+  searchTableRef.value.open(
+    _searchTableTitle,
+    _searchTableAllSchemas,
+    _searchTablePage,
     formField,
     searchField,
-    searchTitle,
-    searchAllSchemas,
-    searchPage,
-    searchCondition,
     multiple,
     type,
-    row
-  ) => {
-    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
-          }
+    row,
+    _searchCondition
+  )
+}
+// 弹层确定返回所选数据
+// val ： 弹层列表row 数据
+const searchTableSuccess = async (formField, searchField, val, type, row) => {
+  if (type == 'features') {
+    row.inspectionJobCharacteristicsUpdateReqVO[formField] = val[0].code
+    if (formField == 'inspectionMethodCode') {
+      row.inspectionJobCharacteristicsUpdateReqVO.inspectionMethodName = val[0].description
+    } else if (formField == 'dynamicUpdateCode') {
+      row.inspectionJobCharacteristicsUpdateReqVO.dynamicUpdateName = val[0].description
+    } else if (formField == 'inspectionMethod') {
+      row.inspectionJobCharacteristicsUpdateReqVO.inspectionName = val[0].description
+    }
+  } else if (type == 'main') {
+    data.value[formField] = val[0].code
+    if (formField == 'itemCode') {
+      data.value.itemName = val[0].name
+    } else if (formField == 'testTypeCode') {
+      data.value.testTypeName = val[0].description
+    } else if (formField == 'programmeTemplateCode') {
+      data.value.programmeTemplateName = val[0].description
+    }
+    if (formField == 'programmeTemplateCode') {
+      let list = await InspectionProcessPageApi.getListByTempleteCode(val[0].code)
+      list.forEach((item, index) => {
+        editableTabsValue.value = index + 1
+        item.name = index + 1
+        // 编辑判断上限下限目标值是否必填
+        if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping) {
+          rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
         } else {
-          // 扩展 转换为筛选条件进行查询
-          if (searchCondition[i].isSearch) {
-            filters.push({
-              action: searchCondition[i].action,
-              column: searchCondition[i].key,
-              value: searchCondition[i].value
-            })
-          } else {
-            _searchCondition[searchCondition[i].key] = searchCondition[i].value
-          }
+          rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = false
         }
-      }
-      if (filters.length > 0) {
-        _searchCondition.isSearch = true
-        _searchCondition.filters = filters
-      }
+        if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit) {
+          rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit'][0].required = true
+        } else {
+          rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit'][0].required =
+            false
+        }
+        if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget) {
+          rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyTarget'][0].required = true
+        } else {
+          rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyTarget'][0].required = false
+        }
+      })
+      data.value.subList = list
     }
-    const _searchTableTitle = searchTitle
-    const _searchTableAllSchemas = searchAllSchemas
-    const _searchTablePage = searchPage
-    searchTableRef.value.open(
-      _searchTableTitle,
-      _searchTableAllSchemas,
-      _searchTablePage,
-      formField,
-      searchField,
-      multiple,
-      type,
-      row,
-      _searchCondition
-    )
   }
-  // 弹层确定返回所选数据
-  // val ： 弹层列表row 数据
-  const searchTableSuccess = async (formField, searchField, val, type, row) => {
-    if (type == 'features') {
-      row.inspectionJobCharacteristicsUpdateReqVO[formField] = val[0].code
-      if (formField == 'inspectionMethodCode') {
-        row.inspectionJobCharacteristicsUpdateReqVO.inspectionMethodName = val[0].description
-      } else if (formField == 'dynamicUpdateCode') {
-        row.inspectionJobCharacteristicsUpdateReqVO.dynamicUpdateName = val[0].description
-      } else if (formField == 'inspectionMethod') {
-        row.inspectionJobCharacteristicsUpdateReqVO.inspectionName = val[0].description
-      }
-    } else if (type == 'main') {
-      data.value[formField] = val[0].code
-      if (formField == 'itemCode') {
-        data.value.itemName = val[0].name
-      } else if (formField == 'testTypeCode') {
-        data.value.testTypeName = val[0].description
-      } else if (formField == 'programmeTemplateCode') {
-        data.value.programmeTemplateName = val[0].description
-      }
-      if (formField == 'programmeTemplateCode') {
-        let list = await InspectionProcessPageApi.getListByTempleteCode(val[0].code)
-        list.forEach((item, index) => {
-          editableTabsValue.value = index + 1
-          item.name = index + 1
-          // 编辑判断上限下限目标值是否必填
-          if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping) {
-            rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
-          } else {
-            rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = false
-          }
-          if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit) {
-            rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit'][0].required = true
-          } else {
-            rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit'][0].required =
-              false
-          }
-          if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget) {
-            rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyTarget'][0].required = true
-          } else {
-            rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyTarget'][0].required = false
-          }
-        })
-        data.value.subList = list
+
+  // emit('searchTableSuccess', formField, searchField, val, formRef.value, type, row)
+}
+// 请选择结果录入方式
+const resultEntryMethodChange = (e, item) => {
+  item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = []
+  if (e == 0) {
+    // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
+    for (let i = 0; i < parseInt(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty); i++) {
+      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({
+        inspectionValue: '', //检验值
+        qualitativeCode: '', //定性字典项值
+        defectLevel: '', //缺陷级别
+        qualifiedQuantity: '', //合格数量
+        unqualifiedQuantity: '' //不合格数量
+      })
+    }
+  } else {
+    // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = false
+    item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = [
+      {
+        inspectionValue: '', //检验值
+        qualitativeCode: '', //定性字典项值
+        defectLevel: '', //缺陷级别
+        qualifiedQuantity: '', //合格数量
+        unqualifiedQuantity: '' //不合格数量
       }
+    ]
+  }
+}
+// 选择选定级
+const changeQualitativeCode = (e, item, cur) => {
+  let obj = item.selectedProjectRespVOList.find((cur) => cur.dictionaryValue == e)
+  cur.defectLevel = obj.defectLevel
+  cur.estimateCode = obj.estimateCode
+  // 显示图标
+  for (
+    let i = 0;
+    i < item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList?.length;
+    i++
+  ) {
+    item.isPass = true
+    if (
+      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].estimateCode ==
+      '2'
+    ) {
+      item.isPass = false
+      return
     }
+  }
+}
+const mianscroll = ref()
+const boxList = ref()
 
-    // emit('searchTableSuccess', formField, searchField, val, formRef.value, type, row)
+const topScrollClick = () => {
+  nextTick(() => {
+    mianscroll.value.scrollTo({ top: boxList.value.clientHeight + 550, behavior: 'smooth' })
+  })
+}
+const inspectionValueInput = (item, cur) => {
+  for ( let i = 0;i < item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.length;i++) {
+    item.isPass = true
+//  如果上限值存在,下限值和目标值不存在 大于上限值显示红色图标
+  if (
+    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
+    !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
+    !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
+    item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue&&
+    parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping)
+  ) {
+    item.isPass = false
+    return
+  } 
+  // 如果下限值存在,上限值和目标值不存在 小于下限值显示红色图标
+  if (
+    !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
+    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
+    !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
+    item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue&&
+    parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit)
+  ) {
+    item.isPass = false
+    return
   }
-  // 请选择结果录入方式
-  const resultEntryMethodChange = (e, item) => {
-    item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = []
-    if (e == 0) {
-      // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
-      for (let i = 0; i < parseInt(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty); i++) {
-        item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({
-          inspectionValue: '', //检验值
-          qualitativeCode: '', //定性字典项值
-          defectLevel: '', //缺陷级别
-          qualifiedQuantity: '', //合格数量
-          unqualifiedQuantity: '' //不合格数量
-        })
-      }
-    } else {
-      // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = false
-      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = [
-        {
-          inspectionValue: '', //检验值
-          qualitativeCode: '', //定性字典项值
-          defectLevel: '', //缺陷级别
-          qualifiedQuantity: '', //合格数量
-          unqualifiedQuantity: '' //不合格数量
-        }
-      ]
-    }
+  // 如果目标值存在,上限值和下限值不存在 小于目标值显示红色图标
+  if (
+    !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
+    !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
+    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
+    item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue&&
+    parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) != parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget)
+  ) {
+    item.isPass = false
+    return
+  }
+   // 如果上限值和下限值存在,目标值不存在 大于上限并且小于下限值显示红色图标
+   if (
+    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
+    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
+    !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
+    item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue&&
+   ( parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) ||
+    parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
+  ) {
+    item.isPass = false
+    return
   }
-  // 选择选定级
-  const changeQualitativeCode = (e, item, cur) => {
-    let obj = item.selectedProjectRespVOList.find((cur) => cur.dictionaryValue == e)
-    cur.defectLevel = obj.defectLevel
-    cur.estimateCode = obj.estimateCode
+  // 如果上限值和目标值存在,下限值不存在 大于上限并且小于目标值显示红色图标
+  if (
+    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
+    !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
+    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
+    item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue&&
+    (parseFloat(cur.inspectionValue) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping)||
+    parseFloat(cur.inspectionValue) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget))
+  ) {
+    item.isPass = false
+    return
   }
-  const mianscroll  =ref()
-  const  topScrollClick=()=> {
-   nextTick(() => {
-     mianscroll.value.scrollTo({ top: 550, behavior: 'smooth' });
-   })
- }
+   // 如果下限值和目标值存在,下限值不存在 大于上限并且小于目标值显示红色图标
+   if (
+    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
+    !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
+    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
+    (parseFloat(cur.inspectionValue) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget)||
+    parseFloat(cur.inspectionValue) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
+  ) {
+    item.isPass = false
+    return
+  }
+    // 如果上限值和下限值,目标值存在 大于上限并且小于下限值显示红色图标
+    if (
+      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
+      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
+      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
+      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue&&
+      (parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) ||
+      parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
+    ) {
+      item.isPass = false
+      return
+    }
+  }
+}
 </script>
 <style scoped>
-  .small-title {
-    font-weight: bold;
-    padding: 0px 10px 10px;
-    color: #1a8bfc;
-    font-size: 16px;
-  }
+.small-title {
+  font-weight: bold;
+  padding: 0px 10px 10px;
+  color: #1a8bfc;
+  font-size: 16px;
+}
 </style>
 <style>
-  .el-tabs--left .el-tabs__header.is-left {
-    padding-bottom: 5000px;
-    margin-bottom: -5000px;
-    min-width: 150px !important;
-  }
+.el-tabs--left .el-tabs__header.is-left {
+  padding-bottom: 5000px;
+  margin-bottom: -5000px;
+  min-width: 150px !important;
+}
 
-  .el-tabs--left.el-tabs--border-card .el-tabs__item.is-left {
-    min-width: 120px !important;
-  }
-  .el-backtop{
-    position: absolute!important;
-  }
+.el-tabs--left.el-tabs--border-card .el-tabs__item.is-left {
+  min-width: 120px !important;
+}
+.el-backtop {
+  position: absolute !important;
+}
+.red .el-input__inner {
+  color: red !important;
+}
 </style>

From ce880b8d3789fef363e8ec0e77af09cf53628348 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 9 Jul 2024 11:25:47 +0800
Subject: [PATCH 231/408] =?UTF-8?q?=E5=88=B6=E5=93=81=E8=BF=94=E4=BF=AE?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E4=BF=AE=E6=94=B9=E4=B8=BA=E8=AF=B7=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E8=BF=94=E4=BF=AE=E7=94=9F=E4=BA=A7=E7=BA=BF=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=EF=BC=8C=E9=A1=B5=E9=9D=A2=E9=87=8C=E7=9A=84=E8=AF=B7?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=94=9F=E4=BA=A7=E7=BA=BF=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?->=E8=AF=B7=E9=80=89=E6=8B=A9=E8=BF=94=E4=BF=AE=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E7=BA=BF=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
index 309e89bc0..bdcb195cd 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
+++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
@@ -566,7 +566,7 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
       },{
         key: 'productionLineCode',
         value: 'productionLineCode',
-        message: '请填写生产线代码！',
+        message: '请选择返修生产线代码！',
         isMainValue: true
       }]
     },
@@ -586,7 +586,7 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
         },{
           key: 'productionLineCode',
           value: 'productionLineCode',
-          message: '请填写生产线代码！',
+          message: '请选择返修生产线代码！',
           isMainValue: 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 232/408] =?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 daeed16deef6588c17c69bef1ec5a640da965c81 Mon Sep 17 00:00:00 2001
From: bjang03 <259278618@qq.com>
Date: Tue, 9 Jul 2024 11:27:12 +0800
Subject: [PATCH 233/408] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=20HL-3897?=
 =?UTF-8?q?=EF=BC=8CHL-3908?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../count/countPlanMain/countPlanMain.data.ts | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
index defc2b3f5..4247edc61 100644
--- a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
+++ b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
@@ -106,20 +106,20 @@ export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       value: 'BY_INEVNEOTY'
     }
   },
-  {
-    label: '限值',
-    field: 'limitedValue',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-      componentProps:{
-        disabled:false
-      }
-    }
-  },
+  // {
+  //   label: '限值',
+  //   field: 'limitedValue',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'InputNumber',
+  //     componentProps:{
+  //       disabled:false
+  //     }
+  //   }
+  // },
   {
     label: '物料忽略名单',
     field: 'ignoreListOfItem',

From 7f0caef857bc781f071e979b77131e0ab8743134 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 9 Jul 2024 11:28:54 +0800
Subject: [PATCH 234/408] =?UTF-8?q?QMS=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E6=89=A7=E8=A1=8C=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E9=BB=98=E8=AE=A4=E6=98=BE=E7=A4=BA=E7=AC=AC?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1(?=
 =?UTF-8?q?=E7=9B=AE=E5=89=8D=E7=B3=BB=E7=BB=9F=E6=98=BE=E7=A4=BA=E7=9A=84?=
 =?UTF-8?q?=E6=98=AF=E6=9C=80=E5=90=8E=E4=B8=80=E4=B8=AA=E6=A3=80=E9=AA=8C?=
 =?UTF-8?q?=E5=B7=A5=E5=BA=8F)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/inspectionJob/addForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/qms/inspectionJob/addForm.vue b/src/views/qms/inspectionJob/addForm.vue
index 6cf33a50e..592b812f5 100644
--- a/src/views/qms/inspectionJob/addForm.vue
+++ b/src/views/qms/inspectionJob/addForm.vue
@@ -664,7 +664,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
     list = await InspectionJobDetailPageApi.getInspectionJobDetailList(row.id)
     data.value.packageList = await InspectionJobPackageApi.getInspectionJobPackageList(row.id)
     list.forEach((item, index) => {
-      // editableTabsValue.value = index + 1
+      editableTabsValue.value = 1
       item.name = index + 1
       item.inspectionJobCharacteristicsUpdateReqVO = item.inspectionJobCharacteristicsRespVO
       item.isPass = '' //判断是否显示对号错误图标

From 4df92b480ed470dad1dcfbd57ab4bb4a1acf5849 Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Tue, 9 Jul 2024 11:56:49 +0800
Subject: [PATCH 235/408] =?UTF-8?q?WMS=20=E2=80=94=E2=80=94>=20bug=20?=
 =?UTF-8?q?=E8=B0=83=E6=8B=A8=E5=87=BA=E5=BA=93=EF=BC=8C=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E8=AE=A1=E9=87=8F=E5=8D=95=E4=BD=8D=E6=B2=A1=E6=9C=89=E5=B8=A6?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../transferissue/transferissueRequestMain/index.vue             | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue
index 24d0df98b..ae1397bce 100644
--- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue
@@ -115,6 +115,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         row['packingNumber'] = val[0]['packingNumber']
         row['containerNumber'] = val[0]['containerNumber']
         row['batch'] = val[0]['batch']
+        row['uom'] = val[0]['uom']
         row['inventoryStatus'] = val[0]['inventoryStatus']
         row['fromLocationCode'] = val[0]['locationCode']
         row['itemCode'] = val[0]['itemCode']

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 236/408] 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 fb2329ec2b9bcc130216a1c81c8a50385d44f177 Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Tue, 9 Jul 2024 13:15:37 +0800
Subject: [PATCH 237/408] =?UTF-8?q?WMS=20=E2=80=94=E2=80=94>=20bug=20?=
 =?UTF-8?q?=E8=B0=83=E6=8B=A8=E5=87=BA=E5=BA=93=E6=96=B0=E5=A2=9E=EF=BC=8C?=
 =?UTF-8?q?=E8=AE=A1=E9=87=8F=E5=8D=95=E4=BD=8D=E6=B2=A1=E6=9C=89=E5=B8=A6?=
 =?UTF-8?q?=E5=87=BA=EF=BC=8C=E5=B9=B6=E4=B8=8D=E8=83=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../transferissueRequestMain/transferissueRequestMain.data.ts  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
index dd7828519..4c5170a52 100644
--- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
@@ -692,7 +692,8 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
     tableForm: {
-      type: 'Select'
+      type: 'Select',
+      disabled: true,
     }
   },
   {

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 238/408] =?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 239/408] =?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 921fe8876971c28507fc16bf6f98fbbb5654764a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com>
Date: Tue, 9 Jul 2024 14:32:34 +0800
Subject: [PATCH 240/408] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../index.ts                                  |  24 +-
 .../SparePartsOutLocationRecord.data.ts       | 133 +++---
 .../eam/SparePartsOutLocationRecord/index.vue |   2 +-
 src/views/eam/itemAccounts/index.vue          |  15 +-
 .../eam/itemAccounts/itemAccounts.data.ts     |   3 +
 .../maintainExperience.data.ts                | 164 ++++----
 .../repairExperience/repairExperience.data.ts | 205 +++++----
 .../eam/sparePartsInLocationRecord/index.vue  |   7 +-
 .../sparePartsInLocationRecordMain.data.ts    | 392 ++++++++----------
 src/views/eam/sparepartsinlocation/index.vue  |  49 +--
 10 files changed, 459 insertions(+), 535 deletions(-)

diff --git a/src/api/eam/sparePartsOutLocationRecordDetail/index.ts b/src/api/eam/sparePartsOutLocationRecordDetail/index.ts
index c4ea46811..afffa390c 100644
--- a/src/api/eam/sparePartsOutLocationRecordDetail/index.ts
+++ b/src/api/eam/sparePartsOutLocationRecordDetail/index.ts
@@ -28,45 +28,49 @@ export const getSparePartsOutLocationDetailRecordPage = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = { ...params }
-    return await request.post({ url: '/eam/spare-parts-in-location-main-record/senior', data })
+    return await request.post({ url: '/eam/spare-parts-out-location-detail-record/senior', data })
   } else {
-    return await request.get({ url: `/eam/spare-parts-in-location-main-record/page`, params })
+    return await request.get({ url: `/eam/spare-parts-out-location-detail-record/page`, params })
   }
 }
 
 // 查询备件入库记录主详情
 export const getSparePartsOutLocationDetailRecord = async (id: number) => {
-  return await request.get({ url: `/eam/spare-parts-in-location-main-record/get?id=` + id })
+  return await request.get({ url: `/eam/spare-parts-out-location-detail-record/get?id=` + id })
 }
 
 // 新增备件入库记录主
 export const createSparePartsOutLocationDetailRecord = async (
-  data: SparePartsInLocationMainRecordVO
+  data: SparePartsOutLocationRecordDetailVO
 ) => {
-  return await request.post({ url: `/eam/spare-parts-in-location-main-record/create`, data })
+  return await request.post({ url: `/eam/spare-parts-out-location-detail-record/create`, data })
 }
 
 // 修改备件入库记录主
 export const updateSparePartsOutLocationDetailRecord = async (
-  data: SparePartsInLocationMainRecordVO
+  data: SparePartsOutLocationRecordDetailVO
 ) => {
-  return await request.put({ url: `/eam/spare-parts-in-location-main-record/update`, data })
+  return await request.put({ url: `/eam/spare-parts-out-location-detail-record/update`, data })
 }
 
 // 删除备件入库记录主
 export const deleteSparePartsOutLocationDetailRecord = async (id: number) => {
-  return await request.delete({ url: `/eam/spare-parts-in-location-main-record/delete?id=` + id })
+  return await request.delete({
+    url: `/eam/spare-parts-out-location-detail-record/delete?id=` + id
+  })
 }
 
 // 导出备件入库记录主 Excel
 export const exportSparePartsOutLocationDetailRecord = async (params) => {
   return await request.download({
-    url: `/eam/spare-parts-in-location-main-record/export-excel`,
+    url: `/eam/spare-parts-out-location-detail-record/export-excel`,
     params
   })
 }
 
 // 下载用户导入模板
 export const importTemplate = () => {
-  return request.download({ url: '/eam/spare-parts-in-location-main-record/get-import-template' })
+  return request.download({
+    url: '/eam/spare-parts-out-location-detail-record/get-import-template'
+  })
 }
diff --git a/src/views/eam/SparePartsOutLocationRecord/SparePartsOutLocationRecord.data.ts b/src/views/eam/SparePartsOutLocationRecord/SparePartsOutLocationRecord.data.ts
index 56a2508a2..b42a0405e 100644
--- a/src/views/eam/SparePartsOutLocationRecord/SparePartsOutLocationRecord.data.ts
+++ b/src/views/eam/SparePartsOutLocationRecord/SparePartsOutLocationRecord.data.ts
@@ -11,113 +11,88 @@ import { dateFormatter } from '@/utils/formatTime'
 export const SparePartsOutLocationRecordMain = useCrudSchemas(
   reactive<CrudSchema[]>([
     {
-      label: '编号',
-      field: 'number',
+      label: '备件编号',
+      field: 'sparePartsCode',
       sort: 'custom',
       isSearch: true,
-      isForm: false
+      isForm: false,
+      table: {
+        width: 180,
+        fixed: 'left'
+      }
     },
     {
-      label: '出库编号',
-      field: 'requestNumber',
+      label: '备件名称',
+      field: 'name',
       sort: 'custom',
       isSearch: true,
-      isForm: false
+      table: {
+        width: 110
+      }
     },
     {
-      label: '入库主题',
-      field: 'theme',
+      label: '备件名称',
+      field: 'name',
       sort: 'custom',
-      isSearch: true
+      isSearch: true,
+      table: {
+        width: 110
+      }
     },
     {
-      label: '入库类型',
-      field: 'type',
+      label: '备件类型',
+      field: 'classification',
       sort: 'custom',
-      dictType: DICT_TYPE.PUT_IN_TYPE,
-      dictClass: 'string'
+      dictType: DICT_TYPE.PART_CLASS,
+      dictClass: 'string',
+      isSearch: false,
+      isTable: true,
+      tableForm: {
+        type: 'Select'
+      }
     },
     {
-      label: '流程状态',
-      field: 'status',
-      sort: 'custom',
-      isSearch: false,
-      isForm: false,
-
-      dictType: DICT_TYPE.SPAREPARTS_APPLY_STATUS_ENUM,
-      dictClass: 'string'
+      label: '规格型号',
+      field: 'specifications',
+      sort: 'custom'
     },
+
     {
-      label: '入库申请人',
-      field: 'applyer',
-      sort: 'custom',
-      isSearch: false
+      label: '存放位置',
+      field: 'locationCode',
+      sort: 'custom'
     },
     {
-      label: '审核人',
-      field: 'approver',
+      label: '计量单位',
+      field: 'uom',
       sort: 'custom',
+      dictType: DICT_TYPE.UOM,
+      dictClass: 'string',
       isSearch: false,
-      isForm: false
+      isTable: true,
+      tableForm: {
+        type: 'Select'
+      }
     },
     {
-      label: '审核内容',
-      field: 'approveContent',
-      sort: 'custom',
-      isSearch: false,
-      isForm: false
+      label: '生产厂家',
+      field: 'brand',
+      sort: 'custom'
     },
     {
-      label: '审核时间',
-      field: 'approveTime',
-      sort: 'custom',
-      formatter: dateFormatter,
-      isSearch: false,
-      isForm: false,
-      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'
-        }
-      },
-      detail: {
-        dateFormat: 'YYYY-MM-DD HH:mm:ss'
-      }
+      label: '申请单号',
+      field: 'requestNumber',
+      sort: 'custom'
     },
     {
-      label: '入库时间',
-      field: 'createTime',
-      sort: 'custom',
-      formatter: dateFormatter,
-      isSearch: false,
-      search: {
-        component: 'DatePicker',
-        componentProps: {
-          valueFormat: 'YYYY-MM-DD HH:mm:ss',
-          type: 'daterange',
-          defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-        }
-      },
-      isForm: false,
-      detail: {
-        dateFormat: 'YYYY-MM-DD HH:mm:ss'
-      }
+      label: '申领数量',
+      field: 'applyQty',
+      sort: 'custom'
     },
-
     {
-      label: '备注',
-      field: 'remark',
-      sort: 'custom',
-      isSearch: false
+      label: '出库时问',
+      field: 'createTime',
+      sort: 'custom'
     }
   ])
 )
diff --git a/src/views/eam/SparePartsOutLocationRecord/index.vue b/src/views/eam/SparePartsOutLocationRecord/index.vue
index 35ed57fbc..7cff87de1 100644
--- a/src/views/eam/SparePartsOutLocationRecord/index.vue
+++ b/src/views/eam/SparePartsOutLocationRecord/index.vue
@@ -153,7 +153,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
 // 子表新增的时候选择表格之后需要会显得字段
 const Echo = []
 const { tableObject, tableMethods } = useTable({
-  getListApi: SparePartsOutLocationRecordMainApi.getSparePartsOutLocationRecordMainPage // 分页接口
+  getListApi: SparePartsOutLocationRecordDetailApi.getSparePartsOutLocationDetailRecordPage // 分页接口
 })
 
 // 获得表格的各种操作
diff --git a/src/views/eam/itemAccounts/index.vue b/src/views/eam/itemAccounts/index.vue
index 3e8f617a3..1085c7899 100644
--- a/src/views/eam/itemAccounts/index.vue
+++ b/src/views/eam/itemAccounts/index.vue
@@ -60,20 +60,7 @@
   <SearchTable ref="searchTableRef" @searchTableSuccess="submitItem" />
 
   <!-- 详情 -->
-  <DetailLedger
-    ref="detailRef"
-    :isBasic="true"
-    :allSchemas="ItemAccounts.allSchemas"
-    :subTabs="subTabList"
-    :operationRecordList="operationRecordList"
-    @handleOperationTabsChange="handleOperationTabsChange"
-    :detailAllSchemas="detailAllSchemas"
-    :apiPage="apiPage"
-    :dialogApiPage="dialogApiPage"
-    :dialogAllSchemas="dialogAllSchemas"
-    :dynamicInfoFields="dynamicInfoFields"
-    funcCode="tool_mould_file"
-  />
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="ItemAccounts.allSchemas" />
 
   <!-- 导入 -->
   <ImportForm
diff --git a/src/views/eam/itemAccounts/itemAccounts.data.ts b/src/views/eam/itemAccounts/itemAccounts.data.ts
index 630a73339..4e1e37a62 100644
--- a/src/views/eam/itemAccounts/itemAccounts.data.ts
+++ b/src/views/eam/itemAccounts/itemAccounts.data.ts
@@ -22,6 +22,9 @@ export const ItemAccounts = useCrudSchemas(
       field: 'itemNumber',
       sort: 'custom',
       isSearch: true,
+      table: {
+        width: 200
+      },
       form: {
         // labelMessage: '信息提示说明！！！',
         componentProps: {
diff --git a/src/views/eam/maintainExperience/maintainExperience.data.ts b/src/views/eam/maintainExperience/maintainExperience.data.ts
index bb30f7e2c..f79a89192 100644
--- a/src/views/eam/maintainExperience/maintainExperience.data.ts
+++ b/src/views/eam/maintainExperience/maintainExperience.data.ts
@@ -4,94 +4,88 @@ import { dateFormatter } from '@/utils/formatTime'
 // 表单校验
 export const MaintainExperienceRules = reactive({
   name: [required],
-  maintainNumber: [required],
+  maintainNumber: [required]
 })
 
-export const MaintainExperience = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: 'id',
-    field: 'id',
-    sort: 'custom',
-  },
-  {
-    label: '经验标题',
-    field: 'name',
-    sort: 'custom',
-    isSearch: true,
-  },
-  {
-    label: '经验内容',
-    field: 'content',
-    sort: 'custom',
-    isTable:true,
-    form: {
-      componentProps: {
-        type: 'textarea',
-        height: 200
+export const MaintainExperience = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '经验标题',
+      field: 'name',
+      sort: 'custom',
+      isSearch: true
+    },
+    {
+      label: '经验内容',
+      field: 'content',
+      sort: 'custom',
+      isTable: true,
+      form: {
+        componentProps: {
+          type: 'textarea',
+          height: 200
+        }
+      }
+    },
+
+    {
+      label: '保养工单编号',
+      field: 'maintainNumber',
+      sort: 'custom',
+      isSearch: true,
+      isForm: false
+    },
+    {
+      label: '工单类型',
+      field: 'orderType',
+      sort: 'custom',
+      isForm: false,
+      isTable: false,
+      form: {
+        component: 'SelectV2'
       }
     },
-  },
-  
-  {
-    label: '保养工单编号',
-    field: 'maintainNumber',
-    sort: 'custom',
-    isSearch: true,
-    isForm: false,
-  },
-  {
-    label: '工单类型',
-    field: 'orderType',
-    sort: 'custom',
-    isForm: false,
-    isTable: false,
-    form: {
-      component: 'SelectV2'
+    {
+      label: '来源字典',
+      field: 'sources',
+      sort: 'custom',
+      dictType: DICT_TYPE.EAM_MAINTENANCE_SOURCES,
+      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+      isSearch: false,
+      isForm: false
+    },
+    {
+      label: '保养类型',
+      field: 'type',
+      sort: 'custom',
+      dictType: DICT_TYPE.DEVICE_TYPE,
+      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+      isSearch: false,
+      isForm: false
     },
-  },
-  {
-    label: '来源字典',
-    field: 'sources',
-    sort: 'custom',
-    dictType: DICT_TYPE.EAM_MAINTENANCE_SOURCES,
-    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    isSearch: false,
-    isForm:false
-  },
-  {
-    label: '保养类型',
-    field: 'type',
-    sort: 'custom',
-    dictType: DICT_TYPE.DEVICE_TYPE,
-    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    isSearch: false,
-    isForm:false
-  },
-  {
-    label: '设备/工装编号',
-    field: 'equipmentCode',
-    sort: 'custom',
-    isSearch:false,
-    isForm:false
-  },
-  {
-    label: '设备/工装名称',
-    field: 'equipmentName',
-    sort: 'custom',
-    isSearch:false,
-    isForm:false
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isForm: false,
-    detail:{
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    {
+      label: '设备/工装编号',
+      field: 'equipmentCode',
+      sort: 'custom',
+      isSearch: false,
+      isForm: false
+    },
+    {
+      label: '设备/工装名称',
+      field: 'equipmentName',
+      sort: 'custom',
+      isSearch: false,
+      isForm: false
+    },
+    {
+      label: '创建时间',
+      field: 'createTime',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isForm: false,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      }
     }
-  },
-
-
-
-]))
+  ])
+)
diff --git a/src/views/eam/repairExperience/repairExperience.data.ts b/src/views/eam/repairExperience/repairExperience.data.ts
index 3f0e48465..0582461b7 100644
--- a/src/views/eam/repairExperience/repairExperience.data.ts
+++ b/src/views/eam/repairExperience/repairExperience.data.ts
@@ -4,114 +4,109 @@ import { dateFormatter } from '@/utils/formatTime'
 // 表单校验
 export const RepairExperienceRules = reactive({
   name: [required],
-  repairNumber: [required],
+  repairNumber: [required]
 })
 
-export const RepairExperience = useCrudSchemas(reactive<CrudSchema[]>([
+export const RepairExperience = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '经验标题',
+      field: 'name',
+      sort: 'custom',
+      isSearch: true
+    },
+    {
+      label: '维修工单编号',
+      field: 'repairNumber',
+      sort: 'custom',
+      isSearch: true,
 
-  {
-    label: 'id',
-    field: 'id',
-    sort: 'custom',
-  },
-  {
-    label: '经验标题',
-    field: 'name',
-    sort: 'custom',
-    isSearch: true,
-  },
-  {
-    label: '维修工单编号',
-    field: 'repairNumber',
-    sort: 'custom',
-    isSearch: true,
-    
-    isForm: false,
-  },
-  {
-    label: '经验内容',
-    field: 'content',
-    sort: 'custom',
-    isSearch:false,
-    form: {
-      component: 'Input',
-      componentProps: {
-        type:'textarea',
-        valueHtml: '',
-        height: 200
+      isForm: false
+    },
+    {
+      label: '经验内容',
+      field: 'content',
+      sort: 'custom',
+      isSearch: false,
+      form: {
+        component: 'Input',
+        componentProps: {
+          type: 'textarea',
+          valueHtml: '',
+          height: 200
+        }
       }
     },
-  },
- 
-  {
-    label: '来源字典',
-    field: 'sources',
-    sort: 'custom',
-    dictType: DICT_TYPE.EAM_MAINTENANCE_SOURCES,
-    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    isSearch: false,
-    isForm:false
-  },
-  {
-    label: '报修类型',
-    field: 'type',
-    sort: 'custom',
-    dictType: DICT_TYPE.DEVICE_TYPE,
-    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    isSearch: false,
-    isForm:false
-  },
-  {
-    label: '设备/工装编号',
-    field: 'equipmentCode',
-    sort: 'custom',
-    isSearch:false,
-    isForm:false
-  },
-  {
-    label: '设备/工装名称',
-    field: 'equipmentName',
-    sort: 'custom',
-    isSearch:false,
-    isForm:false
-  },
-  {
-    label: '故障时间',
-    field: 'faultTime',
-    formatter: dateFormatter,
-    sort: 'custom',
-    isSearch:false,
-    isForm:false,
-    detail:{
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    }
-  },
-  {
-    label: '故障类型',
-    field: 'faultType',
-    sort: 'custom',
-    isSearch: false,
-    isForm:false
-  },
-  {
-    label: '创建人',
-    field: 'createTime',
-    sort: 'custom',
-    isSearch:false,
-    isForm:false,
-    isTable:false,
-    isDetail:false
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isForm: false,
-    isSearch:false,
-    detail:{
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+
+    {
+      label: '来源字典',
+      field: 'sources',
+      sort: 'custom',
+      dictType: DICT_TYPE.EAM_MAINTENANCE_SOURCES,
+      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+      isSearch: false,
+      isForm: false
+    },
+    {
+      label: '报修类型',
+      field: 'type',
+      sort: 'custom',
+      dictType: DICT_TYPE.DEVICE_TYPE,
+      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+      isSearch: false,
+      isForm: false
+    },
+    {
+      label: '设备/工装编号',
+      field: 'equipmentCode',
+      sort: 'custom',
+      isSearch: false,
+      isForm: false
+    },
+    {
+      label: '设备/工装名称',
+      field: 'equipmentName',
+      sort: 'custom',
+      isSearch: false,
+      isForm: false
+    },
+    {
+      label: '故障时间',
+      field: 'faultTime',
+      formatter: dateFormatter,
+      sort: 'custom',
+      isSearch: false,
+      isForm: false,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      }
+    },
+    {
+      label: '故障类型',
+      field: 'faultType',
+      sort: 'custom',
+      isSearch: false,
+      isForm: false
+    },
+    {
+      label: '创建人',
+      field: 'createTime',
+      sort: 'custom',
+      isSearch: false,
+      isForm: false,
+      isTable: false,
+      isDetail: false
+    },
+    {
+      label: '创建时间',
+      field: 'createTime',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isForm: false,
+      isSearch: false,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      }
     }
-  },
- 
-]))
+  ])
+)
diff --git a/src/views/eam/sparePartsInLocationRecord/index.vue b/src/views/eam/sparePartsInLocationRecord/index.vue
index 86aefd08e..981c0e399 100644
--- a/src/views/eam/sparePartsInLocationRecord/index.vue
+++ b/src/views/eam/sparePartsInLocationRecord/index.vue
@@ -44,7 +44,7 @@
       </template>
     </Table>
   </ContentWrap>
-  
+
   <!-- 详情 -->
   <Detail
     ref="detailRef"
@@ -86,7 +86,7 @@ const updataTableColumns = (val) => {
 // 子表新增的时候选择表格之后需要会显得字段
 const Echo = []
 const { tableObject, tableMethods } = useTable({
-  getListApi: SparePartsInLocationRecordMainApi.getSparePartsInLocationRecordMainPage // 分页接口
+  getListApi: SparePartsInLocationRecordDetailApi.getSparePartsInLocationRecordDetailPage // 分页接口
 })
 
 // 获得表格的各种操作
@@ -100,12 +100,11 @@ const HeadButttondata = [
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null) // 设置
-
 ]
 
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
-if (val == 'refresh') {
+  if (val == 'refresh') {
     // 刷新
     getList()
   } else if (val == 'filtrate') {
diff --git a/src/views/eam/sparePartsInLocationRecord/sparePartsInLocationRecordMain.data.ts b/src/views/eam/sparePartsInLocationRecord/sparePartsInLocationRecordMain.data.ts
index c0d7b7b30..44e521d7d 100644
--- a/src/views/eam/sparePartsInLocationRecord/sparePartsInLocationRecordMain.data.ts
+++ b/src/views/eam/sparePartsInLocationRecord/sparePartsInLocationRecordMain.data.ts
@@ -3,129 +3,102 @@ import { dateFormatter } from '@/utils/formatTime'
 import * as ItemAccountsApi from '@/api/eam/itemAccounts'
 import { ItemAccounts } from '@/views/eam/itemAccounts/itemAccounts.data'
 
-
 // 表单校验
 export const SparePartsInLocationRecordMainRules = reactive({
   number: [required],
   theme: [required],
-  type: [required],
+  type: [required]
 })
 // 备件入库主表
-export const SparePartsInLocationRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: 'id',
-    field: 'id',
-    sort: 'custom',
-    isSearch: false,
-    isTable: false,
-    isForm: false,
-    isDetail:false,
-  },
-  {
-    label: '编号',
-    field: 'number',
-    sort: 'custom',
-    isSearch: true,
-    isForm: false,
-  },
-  {
-    label: '入库主题',
-    field: 'theme',
-    sort: 'custom',
-    isSearch: true,
-  },{
-    label: '入库类型',
-    field: 'type',
-    sort: 'custom',
-    dictType: DICT_TYPE.PUT_IN_TYPE,
-    dictClass: 'string',
-   
-  },
-  {
-    label: '流程状态',
-    field: 'status',
-    sort: 'custom',
-    isSearch: false,
-    isForm:false,
-    
-    dictType: DICT_TYPE.SPAREPARTS_APPLY_STATUS_ENUM,
-    dictClass: 'string',
-   
-  },
-  {
-    label: '入库申请人',
-    field: 'applyer',
-    sort: 'custom',
-    isSearch: false,
-  },
-  {
-    label: '审核人',
-    field: 'approver',
-    sort: 'custom',
-    isSearch: false,
-    isForm:false
-  },
-  {
-    label: '审核内容',
-    field: 'approveContent',
-    sort: 'custom',
-    isSearch: false,
-    isForm:false
-  },
-  {
-    label: '审核时间',
-    field: 'approveTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: false,
-    isForm:false,
-    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')]
+export const SparePartsInLocationRecordMain = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '备件编号',
+      field: 'sparePartsCode',
+      sort: 'custom',
+      isSearch: true,
+      isForm: false,
+      table: {
+        width: 180,
+        fixed: 'left'
       }
     },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
+    {
+      label: '备件名称',
+      field: 'name',
+      sort: 'custom',
+      isSearch: true,
+      table: {
+        width: 110
       }
     },
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    {
+      label: '备件名称',
+      field: 'name',
+      sort: 'custom',
+      isSearch: true,
+      table: {
+        width: 110
+      }
     },
-  },
-  {
-    label: '入库时间',
-    field: 'createTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: false,
-    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: 'classification',
+      sort: 'custom',
+      dictType: DICT_TYPE.PART_CLASS,
+      dictClass: 'string',
+      isSearch: false,
+      isTable: true,
+      tableForm: {
+        type: 'Select'
       }
     },
-    isForm: false,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+
+    {
+      label: '规格型号',
+      field: 'specifications',
+      sort: 'custom'
     },
-  },
 
-  
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    isSearch: false,
-  },
-]))
+    {
+      label: '存放位置',
+      field: 'locationCode',
+      sort: 'custom'
+    },
+    {
+      label: '计量单位',
+      field: 'uom',
+      sort: 'custom',
+      dictType: DICT_TYPE.UOM,
+      dictClass: 'string',
+      isSearch: false,
+      isTable: true,
+      tableForm: {
+        type: 'Select'
+      }
+    },
+    {
+      label: '生产厂家',
+      field: 'brand',
+      sort: 'custom'
+    },
+    {
+      label: '申请单号',
+      field: 'requestNumber',
+      sort: 'custom'
+    },
+    {
+      label: '申领数量',
+      field: 'applyQty',
+      sort: 'custom'
+    },
+    {
+      label: '出库时问',
+      field: 'createTime',
+      sort: 'custom'
+    }
+  ])
+)
 // 备件入库子表
 export const SparePartsInLocationRecordDetailRules = reactive({
   number: [required],
@@ -133,24 +106,42 @@ export const SparePartsInLocationRecordDetailRules = reactive({
   locationCode: [required],
   areaCode: [required],
   sparePartsCode: [required],
-  applyQty: [required],
+  applyQty: [required]
 })
 
-export const SparePartsInLocationRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '库位编号',
-    field: 'locationCode',
-    sort: 'custom',
-    isSearch: false,
-    form: {
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择库位编号', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '库位信息', // 查询弹窗标题
-       
-      searchAllSchemas: ItemAccounts.allSchemas, // 查询弹窗所需类
-      searchPage: ItemAccountsApi.getItemAccountsPage, // 查询弹窗所需分页方法
+export const SparePartsInLocationRecordDetail = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '库位编号',
+      field: 'locationCode',
+      sort: 'custom',
+      isSearch: false,
+      form: {
+        componentProps: {
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择库位编号', // 输入框占位文本
+          searchField: 'code', // 查询弹窗赋值字段
+          searchTitle: '库位信息', // 查询弹窗标题
+
+          searchAllSchemas: ItemAccounts.allSchemas, // 查询弹窗所需类
+          searchPage: ItemAccountsApi.getItemAccountsPage, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            }
+          ]
+        }
+      },
+      tableForm: {
+        isInpuFocusShow: true,
+        searchListPlaceholder: '请选择备件编号', // 输入框占位文本
+        searchField: 'itemNumber', // 查询弹窗赋值字段
+        searchTitle: '备件信息', // 查询弹窗标题
+
+        searchAllSchemas: ItemAccounts.allSchemas, // 查询弹窗所需类
+        searchPage: ItemAccountsApi.getItemAccountsPage, // 查询弹窗所需分页方法
         searchCondition: [
           {
             key: 'available',
@@ -160,99 +151,80 @@ export const SparePartsInLocationRecordDetail = useCrudSchemas(reactive<CrudSche
         ]
       }
     },
-    tableForm: {
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择备件编号', // 输入框占位文本
-      searchField: 'itemNumber', // 查询弹窗赋值字段
-      searchTitle: '备件信息', // 查询弹窗标题
-    
-      searchAllSchemas: ItemAccounts.allSchemas, // 查询弹窗所需类
-      searchPage: ItemAccountsApi.getItemAccountsPage, // 查询弹窗所需分页方法
-      searchCondition: [
-        {
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
+    {
+      label: '库区编号',
+      field: 'areaCode',
+      sort: 'custom',
+      isSearch: false,
+      form: {
+        componentProps: {
+          disabled: true
         }
-      ]
-    }
-  },
-  {
-    label: '库区编号',
-    field: 'areaCode',
-    sort: 'custom',
-    isSearch: false,
-    form: {
-      componentProps: {
+      },
+      tableForm: {
         disabled: true
       }
     },
-    tableForm:{
-      disabled: true
-    }
-  },
-  {
-    label: '备件编号',
-    field: 'sparePartsCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      componentProps: {
+    {
+      label: '备件编号',
+      field: 'sparePartsCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
+      tableForm: {
         disabled: true
       }
     },
-    tableForm:{
-      disabled: true
-    }
-  },
-  {
-    label: '库存数量',
-    field: 'currentQty',
-    sort: 'custom',
-    isSearch: false,
-    tableForm: {
-      disabled: true
+    {
+      label: '库存数量',
+      field: 'currentQty',
+      sort: 'custom',
+      isSearch: false,
+      tableForm: {
+        disabled: true
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
+      isDetail: false,
+      isTable: false
     },
-    form:{
-     componentProps:{
-      disabled: true
-     }
+    {
+      label: '申领数量',
+      field: 'applyQty',
+      sort: 'custom',
+      isSearch: false
     },
-    isDetail:false,
-    isTable:false
-  },
-  {
-    label: '申领数量',
-    field: 'applyQty',
-    sort: 'custom',
-    isSearch: false
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: true,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
+    {
+      label: '创建时间',
+      field: 'createTime',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isSearch: true,
+      search: {
+        component: 'DatePicker',
+        componentProps: {
+          valueFormat: 'YYYY-MM-DD HH:mm:ss',
+          type: 'daterange',
+          defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+        }
+      },
+      isForm: false,
+      isTableForm: false
     },
-    isForm: false,
-    isTableForm:false
-  },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    isSearch: true,
-  },
- 
-]))
-
-
+    {
+      label: '备注',
+      field: 'remark',
+      sort: 'custom',
+      isSearch: true
+    }
+  ])
+)
diff --git a/src/views/eam/sparepartsinlocation/index.vue b/src/views/eam/sparepartsinlocation/index.vue
index ed9ee8067..50f7a9a99 100644
--- a/src/views/eam/sparepartsinlocation/index.vue
+++ b/src/views/eam/sparepartsinlocation/index.vue
@@ -132,29 +132,29 @@ const updataTableColumns = (val) => {
 
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
-    nextTick(() => {
-      const setV = {}
-      setV[formField] = val[0][searchField]
-      console.log(11, val[0])
-      if (type == 'tableForm') {
-        if (formField == 'locationCode') {
-          row['locationCode'] = val[0].locationNumber
-          row['areaCode'] = val[0].areaNumber
-          row['sparePartsCode'] = val[0].itemNumber
-          row['currentQty'] = val[0].qty
-          row['isRadeIn'] = val[0].isRadeIn
-        }
-      } else {
-        if (formField == 'locationCode') {
-          setV['locationCode'] = val[0].locationNumber
-          setV['areaCode'] = val[0].areaNumber
-          setV['sparePartsCode'] = val[0].itemNumber
-          setV['currentQty'] = val[0].qty
-          setV['isRadeIn'] = val[0].isRadeIn
-        }
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    console.log(11, val[0])
+    if (type == 'tableForm') {
+      if (formField == 'locationCode') {
+        row['locationCode'] = val[0].locationNumber
+        row['areaCode'] = val[0].areaNumber
+        row['sparePartsCode'] = val[0].itemNumber
+        row['currentQty'] = val[0].qty
+        row['isRadeIn'] = val[0].isRadeIn
+      }
+    } else {
+      if (formField == 'locationCode') {
+        setV['locationCode'] = val[0].locationNumber
+        setV['areaCode'] = val[0].areaNumber
+        setV['sparePartsCode'] = val[0].itemNumber
+        setV['currentQty'] = val[0].qty
+        setV['isRadeIn'] = val[0].isRadeIn
       }
-      formRef.setValues(setV)
-    })
+    }
+    formRef.setValues(setV)
+  })
 }
 // 查询页面返回——详情
 const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
@@ -363,11 +363,6 @@ const submitForm = async (formType, data) => {
   data.subList = tableData.value // 拼接子表数据参数
   console.log(formRef.value)
   formRef.value.formLoading = true
-  let isHave = data.subList.some(item=>item.applyQty>item.currentQty)
-  if(isHave){
-    message.warning('申领数量不能大于库存数量')
-    return
-  }
   try {
     if (formType === 'create') {
       await SparePartsInLocationMainApi.createSparePartsInLocationMain(data)

From 600812e7a9becb8749c82488f34d65fa91b81a7b Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Tue, 9 Jul 2024 14:35:04 +0800
Subject: [PATCH 241/408] =?UTF-8?q?WMS=20=E2=80=94=E2=80=94>=20bug=20=20?=
 =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86->?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E7=AE=A1=E7=90=86->=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E5=8C=85=E8=A3=85=E4=BF=A1=E6=81=AF=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=97=B6=E7=82=B9=E5=87=BB=E5=8C=85=E8=A3=85=E8=A7=84=E6=A0=BC?=
 =?UTF-8?q?=EF=BC=8C=E8=BF=9B=E5=85=A5=E5=8C=85=E8=A3=85=E8=A7=84=E6=A0=BC?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=A1=B5=E9=9D=A2=EF=BC=8C=E8=AF=A5=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=B1=95=E7=A4=BA=E5=8C=85=E8=A3=85=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=EF=BC=8C=E4=BD=86=E6=98=AF=E4=B8=BB=E9=A1=B5=E9=9D=A2=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E5=8C=85=E8=A3=85=E7=B1=BB=E5=9E=8B=E7=9A=84=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../itemManage/itempackage/itempackage.data.ts        | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts
index 6a2d7c6e4..04e2537e2 100644
--- a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts
@@ -95,6 +95,17 @@ export const Itempackaging = useCrudSchemas(reactive<CrudSchema[]>([
     isForm:false,
     isDetail:false
   },
+  {
+    label: '包装类型',
+    field: 'packType',
+    dictType: DICT_TYPE.PACK_UNIT_TYPE,
+    dictClass: 'string',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
   {
     label: '包装数量',
     field: 'packQty',

From 36719fde427035b27cc5b38c77a46ead1e72fdce Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Tue, 9 Jul 2024 14:35:37 +0800
Subject: [PATCH 242/408] =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E7=AC=AC=E4=B8=80=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Detail/src/Detail.vue | 3 +++
 src/components/Tabs/src/Tabs.vue     | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue
index 52b781867..82af70806 100644
--- a/src/components/Detail/src/Detail.vue
+++ b/src/components/Detail/src/Detail.vue
@@ -625,6 +625,9 @@ const titleNameRef = ref()
 const titleValueRef = ref()
 const count  =ref(0)
 const openDetail = async (row: any, titleName: any, titleValue: any, tableName: any) => {
+  if(tabRef.value){
+    tabRef.value.changeCurrent(0)
+  }
   annexTableData.value = []
   titleNameRef.value = titleName
   titleValueRef.value = titleValue
diff --git a/src/components/Tabs/src/Tabs.vue b/src/components/Tabs/src/Tabs.vue
index 8c22163f6..57add6cef 100644
--- a/src/components/Tabs/src/Tabs.vue
+++ b/src/components/Tabs/src/Tabs.vue
@@ -32,7 +32,13 @@ const change = (item, index) => {
   current.value = index
   emit('change',item,index)
 }
+
+const changeCurrent = (index) =>{
+  change(props.tabsList[index],index)
+}
 const emit = defineEmits(['change'])
+defineExpose({ changeCurrent}) 
+
 </script>
 
 

From 2b9af5013e894aa2f629468db77083110ecd4bee Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Tue, 9 Jul 2024 14:51:17 +0800
Subject: [PATCH 243/408] =?UTF-8?q?WMS=20=E2=80=94=E2=80=94>=20bug=20=20?=
 =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86->?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AE=A1=E7=90=86->=E9=A1=B9=E7=9B=AE=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=97=B6=E5=AE=A2=E6=88=B7=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E6=98=AF=E5=BF=85=E5=A1=AB=E9=A1=B9=E4=BD=86=E6=98=AF=E6=9C=AA?=
 =?UTF-8?q?=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/basicDataManage/customerManage/project/project.data.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/views/wms/basicDataManage/customerManage/project/project.data.ts b/src/views/wms/basicDataManage/customerManage/project/project.data.ts
index 622fbb5ed..95da14f67 100644
--- a/src/views/wms/basicDataManage/customerManage/project/project.data.ts
+++ b/src/views/wms/basicDataManage/customerManage/project/project.data.ts
@@ -205,6 +205,9 @@ export const ProjectRules = reactive({
   name: [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
+  customerCode: [
+    { required: true,message: '请输入客户代码', trigger: 'blur' }
+  ],
   remark: [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],

From 7beb3514cb9de52492bb9d30ee826fbd3514b787 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Tue, 9 Jul 2024 14:57:38 +0800
Subject: [PATCH 244/408] =?UTF-8?q?=E8=A1=A5=E6=96=99=E7=94=B3=E8=AF=B7=20?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=AD=90=E8=A1=A8=E4=B8=AD=E5=A4=9A=E4=BD=99?=
 =?UTF-8?q?=E7=9A=84=E5=88=B0=E5=BA=93=E4=BD=8D=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repleinshRequestMain/repleinshRequestMain.data.ts    | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
index e12e661d9..37a24c678 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
@@ -642,8 +642,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     sortSearchDefault:1000,
     isSearch: true,
     sortTableDefault:1100,
-    // isTableForm: false,
-   
+    isTableForm: false,
   },
  
   // {
@@ -881,9 +880,9 @@ export const RepleinshRequestDetailRules = reactive({
   // inventoryStatus: [
   //   { required: true, message: '请选择库存状态', trigger: 'change' }
   // ],
-  toLocationCode: [
-    { required: true, message: '请输入到库位代码', trigger: 'blur' }
-  ],
+  // toLocationCode: [
+  //   { required: true, message: '请输入到库位代码', trigger: 'blur' }
+  // ],
   itemCode: [
     { required: true, message: '请输入物料代码', trigger: 'blur' }
   ],

From fbdf82a1ff718ece12763b6fe6d1b23bb33e110e Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Tue, 9 Jul 2024 15:05:26 +0800
Subject: [PATCH 245/408] =?UTF-8?q?WMS=20=E2=80=94=E2=80=94>=20bug=20=20?=
 =?UTF-8?q?=E9=95=BF=E6=98=A5=E6=B5=B7=E6=8B=89=E6=AD=A3=E5=BC=8F=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=E5=8F=91=E8=B4=A7=E7=94=B3=E8=AF=B7=E4=B8=AD=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7=E8=AE=A1=E5=88=92=E5=8D=95=E5=8F=B7=E5=BC=B9=E5=87=BA?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=B8=83=E5=B1=80=E4=B8=8D=E5=90=88=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
index fac92203b..40d883e9a 100644
--- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
@@ -883,7 +883,7 @@ export const DeliverPlanDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 180
+      width: 350
     },
     form: {
       componentProps: {
@@ -896,7 +896,7 @@ export const DeliverPlanDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'itemCode',
     sort: 'custom',
     table: {
-      width: 150
+      width: 350
     },
     tableForm:{
       multiple:true,
@@ -923,7 +923,7 @@ export const DeliverPlanDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'planQty',
     sort: 'custom',
     table: {
-      width: 150
+      width: 350
     },
     form: {
       component: 'InputNumber',
@@ -946,7 +946,7 @@ export const DeliverPlanDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: true,
     sort: 'custom',
     table: {
-      width: 150
+      width: 360
     },
     tableForm: {
       disabled: true,
@@ -958,4 +958,4 @@ export const DeliverPlanDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-]))
\ No newline at end of file
+]))

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 246/408] =?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 247/408] =?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 248/408] =?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 2ac98e361cdb2a5127ac72e39c6790ce967abc1c Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Tue, 9 Jul 2024 15:40:18 +0800
Subject: [PATCH 249/408] =?UTF-8?q?WMS=20=E2=80=94=E2=80=94>=20bug=20=20?=
 =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E5=87=BA=E5=BA=93=E6=96=B0=E5=A2=9E=EF=BC=8C?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=8C=85=E8=A3=85=E5=8F=B7=EF=BC=8C=E5=BA=94?=
 =?UTF-8?q?=E5=8F=AA=E6=98=BE=E7=A4=BA=E6=8A=A5=E5=BA=9F=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scrap/scrapRequestMain/scrapRequestMain.data.ts         | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
index fe6c6a315..0430fe023 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
@@ -503,6 +503,12 @@ export const ScrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
         action: '==',
         isSearch: true,
         isMainValue: false
+      },{
+        key: 'inventoryStatus',
+        value: 'SCRAP',
+        action: '==',
+        isSearch: true,
+        isMainValue: false
       }]
     },
     form: {

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 250/408] 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 490b675447a792a6f230e9e77d3427a23739a1cc Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Tue, 9 Jul 2024 16:07:25 +0800
Subject: [PATCH 251/408] =?UTF-8?q?=E5=90=88=E6=A0=BC=E8=BD=AC=E9=9A=94?=
 =?UTF-8?q?=E7=A6=BB=E7=94=B3=E8=AF=B7=E6=B7=BB=E5=8A=A0=E6=98=8E=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventorymoveRequestMain/index.vue        | 47 +++++++++++--------
 .../inventorymoveRequestMain.data.ts          |  1 +
 2 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
index bb663d3d6..b92e5212d 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
@@ -42,6 +42,8 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
     ref="formRef"
+    :isOpenSearchTable="true"
+    fieldTableColumn="fromPackingNumber"
     @success="getList"
     :rules="InventorymoveRequestMainRules"
     :formAllSchemas="InventorymoveRequestMain.allSchemas"
@@ -329,26 +331,31 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
   nextTick(() => {
     if (type == 'tableForm') {
       if(formField == 'fromPackingNumber'){
-        row['fromPackingNumber'] = val[0]['packingNumber']
-        row['fromContainerNumber'] = val[0]['containerNumber']
-        row['itemCode'] = val[0]['itemCode']
-        row['fromBatch'] = val[0]['batch']
-        row['fromInventoryStatus'] = val[0]['inventoryStatus']
-        row['fromLocationCode'] = val[0]['locationCode']
-        row['uom'] = val[0]['uom']
-        if(routeName.value == 'OktoholdRequestMain'){
-          row['toInventoryStatus'] = "HOLD"
-        }else if ( routeName.value == 'HoldtookRequestMain') {
-          row['toInventoryStatus'] = "OK"
-        }else if ( routeName.value == 'HoldtoscrapRequestMain') {
-          row['toInventoryStatus'] = "SCRAP"
-        }else if ( routeName.value == 'OktoscrapRequestMain') {
-          row['toInventoryStatus'] = "SCRAP"
-        }else if ( routeName.value == 'ScraptoholdRequestMain') {
-          row['toInventoryStatus'] = "HOLD"
-        }else{
-          row['toInventoryStatus'] = val[0]['inventoryStatus']
-        }
+       
+        val.forEach(item=>{
+          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+          newRow['fromPackingNumber'] = item['packingNumber']
+          newRow['fromContainerNumber'] = item['containerNumber']
+          newRow['itemCode'] = item['itemCode']
+          newRow['fromBatch'] = item['batch']
+          newRow['fromInventoryStatus'] = item['inventoryStatus']
+          newRow['fromLocationCode'] = item['locationCode']
+          newRow['uom'] = item['uom']
+          if(routeName.value == 'OktoholdRequestMain'){
+            newRow['toInventoryStatus'] = "HOLD"
+          }else if ( routeName.value == 'HoldtookRequestMain') {
+            newRow['toInventoryStatus'] = "OK"
+          }else if ( routeName.value == 'HoldtoscrapRequestMain') {
+            newRow['toInventoryStatus'] = "SCRAP"
+          }else if ( routeName.value == 'OktoscrapRequestMain') {
+            newRow['toInventoryStatus'] = "SCRAP"
+          }else if ( routeName.value == 'ScraptoholdRequestMain') {
+            newRow['toInventoryStatus'] = "HOLD"
+          }else{
+            newRow['toInventoryStatus'] = item['inventoryStatus']
+          }
+          tableData.value.push(newRow)
+        })
       } else {
         row[formField] = val[0][searchField]
       }
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
index 8a52a684d..d22558b36 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
@@ -545,6 +545,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
     tableForm:{
+      multiple:true,
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择从包装号',
       searchField: 'packingNumber',

From 17df25887bfd85161ebf2215ee69af98f171c012 Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Tue, 9 Jul 2024 16:14:36 +0800
Subject: [PATCH 252/408] =?UTF-8?q?SCP=E4=BE=9B=E5=BA=94=E5=95=86=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=85=B3=E8=81=94=E7=AE=A1=E7=90=86=EF=BC=8C=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E5=85=B3=E8=81=94=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../systemSetting/supplierUser/index.vue      | 15 ++++---
 .../supplierUser/supplierUser.data.ts         | 44 ++++++++++++++-----
 2 files changed, 42 insertions(+), 17 deletions(-)

diff --git a/src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue b/src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue
index cb66c5960..c8d92b883 100644
--- a/src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue
+++ b/src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue
@@ -55,11 +55,11 @@
   <Detail ref="detailRef" :isBasic="true" :allSchemas="SupplierUser.allSchemas" />
 
   <!-- 导入 -->
-  <ImportForm 
-    ref="importFormRef" 
-    url="/wms/supplier-user/import" 
-    :importTemplateData="importTemplateData" 
-    @success="importSuccess" 
+  <ImportForm
+    ref="importFormRef"
+    url="/wms/supplier-user/import"
+    :importTemplateData="importTemplateData"
+    @success="importSuccess"
     :updateIsDisable="true"
     :coverIsDisable="true"
     :mode="2"
@@ -99,7 +99,7 @@ const onInput = (field,value) => {
   }
 
 }
-    
+
 
 // 查询列表页面参数设置
 const searchTableParams = ref([
@@ -184,6 +184,9 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
   nextTick(() => {
     const setV = {}
     setV[formField] = val[0][searchField]
+    if(formField == 'userName'){
+      setV['userId'] = val[0]['id']
+    }
     formRef.setValues(setV)
   })
 }
diff --git a/src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts b/src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts
index 1e5c4a94e..94a3317c8 100644
--- a/src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts
+++ b/src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts
@@ -15,7 +15,7 @@ export const User = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '用户名称',
-    field: 'username',
+    field: 'userName',
     sort: 'custom',
     table: {
       width: 150
@@ -58,7 +58,8 @@ export const User = useCrudSchemas(reactive<CrudSchema[]>([
 
 // 表单校验
 export const SupplierUserRules = reactive({
-  userId: [required],
+  // userId: [required],
+  userName: [required],
   supplierCode: [required],
   status: [required],
   concurrencyStamp: [required],
@@ -75,11 +76,37 @@ export const SupplierUser = useCrudSchemas(reactive<CrudSchema[]>([
     label: '用户ID',
     field: 'userId',
     sort: 'custom',
+    isForm: false,
     isSearch: true,
+    // tableForm:{
+    //   isInpuFocusShow: true,
+    //   searchListPlaceholder: '请选用户信息',
+    //   searchField: 'username',
+    //   searchTitle: '用户信息',
+    //   searchAllSchemas: User.allSchemas,
+    //   searchPage: UserApi.getUserPage
+    // },
+    // form: {
+    //   // labelMessage: '信息提示说明！！！',
+    //   componentProps: {
+    //     dialogWidth:'1025px',//搜索出来弹窗的宽度
+    //     isSearchList: true,
+    //     searchListPlaceholder: '请选用户信息',
+    //     searchField: 'username',
+    //     searchTitle: '用户信息',
+    //     searchAllSchemas: User.allSchemas,
+    //     searchPage: UserApi.getUserPage
+    //   }
+    // }
+  },
+  {
+    label: '用户账号',
+    field: 'userName',
+    sort: 'custom',
     tableForm:{
       isInpuFocusShow: true,
       searchListPlaceholder: '请选用户信息',
-      searchField: 'id',
+      searchField: 'username',
       searchTitle: '用户信息',
       searchAllSchemas: User.allSchemas,
       searchPage: UserApi.getUserPage
@@ -90,18 +117,13 @@ export const SupplierUser = useCrudSchemas(reactive<CrudSchema[]>([
         dialogWidth:'1025px',//搜索出来弹窗的宽度
         isSearchList: true,
         searchListPlaceholder: '请选用户信息',
-        searchField: 'id',
+        searchField: 'username',
         searchTitle: '用户信息',
         searchAllSchemas: User.allSchemas,
         searchPage: UserApi.getUserPage
       }
-    }
-  },
-  {
-    label: '用户账号',
-    field: 'userName',
-    sort: 'custom',
-    isForm: false,
+    },
+    isSearch: true,
   },
   {
     label: '用户昵称',

From fcf855a0e48ee32efb9535457aaf6c1e8b1bcd51 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Tue, 9 Jul 2024 16:50:34 +0800
Subject: [PATCH 253/408] =?UTF-8?q?=E5=BA=93=E5=86=85=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86--=E6=B7=BB=E5=8A=A0=E6=98=8E=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../containerMainRequest.data.ts              |  1 +
 .../containerMainRequest/index.vue            | 15 ++++--
 .../initialContainerMainRequest/index.vue     | 23 +++++---
 .../initialContainerMainRequest.data.ts       |  1 +
 .../inventoryinitRequestMain/index.vue        | 14 ++++-
 .../inventoryinitRequestMain.data.ts          |  1 +
 .../packageoverRequestMain/index.vue          | 34 +++++++-----
 .../packageoverRequestMain.data.ts            |  1 +
 .../transferissueRequestMain/index.vue        | 20 ++++---
 .../transferissueRequestMain.data.ts          |  1 +
 .../inventorychangeRequestMain/index.vue      | 54 ++++++++++---------
 .../inventorychangeRequestMain.data.ts        |  1 +
 12 files changed, 108 insertions(+), 58 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts
index ed1f59bfd..dabab54a5 100644
--- a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts
+++ b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts
@@ -357,6 +357,7 @@ export const ContainerDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'containerNumber',
     sort: 'custom',
     tableForm:{
+      multiple:true,
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择器具号',
       searchField: 'itemCode',
diff --git a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue
index 250cf0c72..6226545d9 100644
--- a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue
@@ -42,6 +42,8 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
     ref="basicFormRef"
+    :isOpenSearchTable="true"
+    fieldTableColumn="containerNumber"
     @success="getList"
     :rules="ContainerMainRequestRules"
     :formAllSchemas="ContainerMainRequest.allSchemas"
@@ -155,10 +157,15 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
   nextTick(() => {
     if (type == 'tableForm') {
       if(formField == 'containerNumber') {
-        row['containerNumber'] = val[0]['itemCode']
-        row['uom'] = val[0]['uom']
-        row['fromLocationCode'] = val[0]['locationCode']
-        row['fromInventoryStatus'] = val[0]['inventoryStatus']
+        
+        val.forEach(item=>{
+          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+          newRow['containerNumber'] = item['itemCode']
+          newRow['uom'] = item['uom']
+          newRow['fromLocationCode'] = item['locationCode']
+          newRow['fromInventoryStatus'] = item['inventoryStatus']
+          tableData.value.push(newRow)
+        })
     }else if(formField == 'toLocationCode'){
       row['toLocationCode'] = val[0]['code']
     }else {
diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue
index a8b9799b5..80a5ba071 100644
--- a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue
@@ -42,6 +42,8 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
     ref="basicFormRef"
+    :isOpenSearchTable="true"
+    fieldTableColumn="containerNumber"
     @success="getList"
     :rules="ContainerMainRequestRules"
     :formAllSchemas="ContainerMainRequest.allSchemas"
@@ -130,14 +132,19 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
   nextTick(() => {
     if (type == 'tableForm') {
       if(formField == 'containerNumber') {
-        row['containerNumber'] = val[0]['code']
-        row['uom'] = val[0]['uom']
-        row['toInventoryStatus'] = 'OK'
-    }else if(formField == 'toLocationCode'){
-      row['toLocationCode'] = val[0]['code']
-    }else {
-      row[formField] = val[0][searchField]
-    }
+        val.forEach(item=>{
+          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+          newRow['containerNumber'] = item['code']
+          newRow['uom'] = item['uom']
+          newRow['toInventoryStatus'] = 'OK'
+          tableData.value.push(newRow)
+        })
+          
+      }else if(formField == 'toLocationCode'){
+        row['toLocationCode'] = val[0]['code']
+      }else {
+        row[formField] = val[0][searchField]
+      }
     }
     const setV = {}
     setV[formField] = val[0][searchField]
diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts
index 42a132c15..97a6dc837 100644
--- a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts
+++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts
@@ -358,6 +358,7 @@ export const ContainerDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'containerNumber',
     sort: 'custom',
     tableForm:{
+      multiple:true,
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择器具号',
       searchField: 'itemCode',
diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
index 342766d7c..391bc45ec 100644
--- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
@@ -42,6 +42,8 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
     ref="formRef"
+    :isOpenSearchTable="true"
+    fieldTableColumn="itemCode"
     @success="getList"
     :rules="InventoryinitRequestMainRules"
     :formAllSchemas="InventoryinitRequestMain.allSchemas"
@@ -111,20 +113,28 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
   nextTick(() => {
     if (type == 'tableForm') {
       // 明细查询页赋值
-      row[formField] = val[0][searchField]
       if(formField=='itemCode'){
         //物料代码
-        row['uom'] = val[0]['uom']
+        val.forEach(item=>{
+          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+          newRow[formField] = item[searchField]
+          newRow['uom'] = item['uom']
+          tableData.value.push(newRow)
+        })
+        
       }else if(formField=='packUnit'){
         //包装规格1
+        row[formField] = val[0][searchField]
         row['packUnit'] = val[0]['packUnit']
         row['packQty'] = val[0]['packQty']
       }else if(formField=='secondPackUnit'){
         //包装规格2
+        row[formField] = val[0][searchField]
         row['secondPackUnit'] = val[0]['packUnit']
         row['secondPackQty'] = val[0]['packQty']
       }else if(formField == 'balancePackUnit'){
         // 入库存包装规格
+        row[formField] = val[0][searchField]
         row['balancePackUnit'] = val[0]['packUnit']
       }
     } else {
diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
index 8f7b40872..7ea15a22d 100644
--- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
@@ -394,6 +394,7 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
     tableForm:{
+      multiple:true,
       enterSearch:true,
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择物料代码',
diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue
index 788f4465e..dab4cf2b7 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue
@@ -42,6 +42,8 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
     ref="formRef"
+    :isOpenSearchTable="true"
+    fieldTableColumn="itemCode"
     @success="getList"
     :rules="PackageoverRequestMainRules"
     :formAllSchemas="PackageoverRequestMain.allSchemas"
@@ -105,19 +107,25 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
     if (type == 'tableForm') {
       // 明细查询页赋值
       if (formField == 'itemCode') {
-        row['itemCode'] = val[0]['itemCode']
-        row['uom'] = val[0]['uom']
-        row['qty'] = val[0]['qty']
-        row['batch'] = val[0]['batch']
-        row['fromLocationCode'] = val[0]['locationCode']
-        row['toLocationCode'] = val[0]['locationCode']
-        row['fromLocationGroupCode'] = val[0]['locationGroupCode']
-        row['toLocationGroupCode'] = val[0]['locationGroupCode']
-        row['fromAreaCode'] = val[0]['areaCode']
-        row['toAreaCode'] = val[0]['areaCode']
-        row['inventoryStatus'] = val[0]['inventoryStatus']
-        row['fromPackUnit'] = val[0]['packUnit']
-        row['fromPackQty'] = val[0]['packQty']
+
+        val.forEach(item=>{
+          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+          newRow['itemCode'] = item['itemCode']
+          newRow['uom'] = item['uom']
+          newRow['qty'] = item['qty']
+          newRow['batch'] = item['batch']
+          newRow['fromLocationCode'] = item['locationCode']
+          newRow['toLocationCode'] = item['locationCode']
+          newRow['fromLocationGroupCode'] = item['locationGroupCode']
+          newRow['toLocationGroupCode'] = item['locationGroupCode']
+          newRow['fromAreaCode'] = item['areaCode']
+          newRow['toAreaCode'] = item['areaCode']
+          newRow['inventoryStatus'] = item['inventoryStatus']
+          newRow['fromPackUnit'] = item['packUnit']
+          newRow['fromPackQty'] = item['packQty']
+          tableData.value.push(newRow)
+        })
+        
       } else if (formField == 'toPackUnit') {
         row['toPackUnit'] = val[0]['packUnit']
         row['toPackQty'] = val[0]['packQty']
diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts
index ad67b4e19..91bbeb867 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts
@@ -452,6 +452,7 @@ export const PackageoverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     tableForm:{
+      multiple:true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择物料代码', // 输入框占位文本
       searchField: 'itemCode', // 查询弹窗赋值字段
diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue
index ae1397bce..c10f1bcc4 100644
--- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue
@@ -42,6 +42,8 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
     ref="formRef"
+    :isOpenSearchTable="true"
+    fieldTableColumn="packingNumber"
     @success="getList"
     :rules="TransferissueRequestMainRules"
     :formAllSchemas="TransferissueRequestMain.allSchemas"
@@ -112,13 +114,17 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
     if (type == 'tableForm') {
       // 明细查询页赋值
       if (formField == 'packingNumber') {
-        row['packingNumber'] = val[0]['packingNumber']
-        row['containerNumber'] = val[0]['containerNumber']
-        row['batch'] = val[0]['batch']
-        row['uom'] = val[0]['uom']
-        row['inventoryStatus'] = val[0]['inventoryStatus']
-        row['fromLocationCode'] = val[0]['locationCode']
-        row['itemCode'] = val[0]['itemCode']
+        val.forEach(item=>{
+          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+          newRow['packingNumber'] = item['packingNumber']
+          newRow['containerNumber'] = item['containerNumber']
+          newRow['batch'] = item['batch']
+          newRow['uom'] = item['uom']
+          newRow['inventoryStatus'] = item['inventoryStatus']
+          newRow['fromLocationCode'] = item['locationCode']
+          newRow['itemCode'] = item['itemCode']
+          tableData.value.push(newRow)
+        })
       } else {
         row[formField] = val[0][searchField]
       }
diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
index 4c5170a52..1d3630a91 100644
--- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
@@ -619,6 +619,7 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
     tableForm:{
+      multiple:true,
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择包装号',
       searchField: 'packingNumber',
diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
index 143b2f135..aefda2d5c 100644
--- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
+++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
@@ -53,6 +53,8 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
     ref="formRef"
+    :isOpenSearchTable="true"
+    fieldTableColumn="fromPackingNumber"
     @success="getList"
     :rules="InventorychangeRequestMainRules"
     :formAllSchemas="InventorychangeRequestMain.allSchemas"
@@ -130,30 +132,34 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       if(formField=='toOwnerCode'){
         //到货主代码
         row['toOwnerCode'] = val[0]['code']
-      }else{
-        row[formField] = val[0][searchField]
-        row['fromPackingNumber'] = val[0]['packingNumber']
-        row['toPackingNumber'] = val[0]['packingNumber']
-        row['fromBatch'] = val[0]['batch']
-        row['toBatch'] = val[0]['batch']
-        row['fromInventoryStatus'] = val[0]['inventoryStatus']
-        row['toInventoryStatus'] = val[0]['inventoryStatus']
-        row['fromContainerNumber'] = val[0]['containerNumber']
-        row['toContainerNumber'] = val[0]['containerNumber']
-        row['fromQty'] = val[0]['qty']
-        row['toQty'] = val[0]['qty']
-        row['fromOwnerCode'] = val[0]['ownerCode']
-        row['fromAltBatch'] = val[0]['altBatch']
-        row['toAltBatch'] = val[0]['altBatch']
-        row['fromArriveDate'] = val[0]['arriveDate']
-        row['toArriveDate'] = val[0]['arriveDate']
-        row['fromProduceDate'] = val[0]['produceDate']
-        row['toProduceDate'] = val[0]['produceDate']
-        row['fromExpireDate'] = val[0]['expireDate']
-        row['toExpireDate'] = val[0]['expireDate']
-        row['itemCode'] = val[0]['itemCode']
-        row['locationCode'] = val[0]['locationCode']
-        row['uom'] = val[0]['uom']
+      }else if(formField == 'fromPackingNumber'){
+        val.forEach(item=>{
+          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+          newRow[formField] = item[searchField]
+          newRow['fromPackingNumber'] = item['packingNumber']
+          newRow['toPackingNumber'] = item['packingNumber']
+          newRow['fromBatch'] = item['batch']
+          newRow['toBatch'] = item['batch']
+          newRow['fromInventoryStatus'] = item['inventoryStatus']
+          newRow['toInventoryStatus'] = item['inventoryStatus']
+          newRow['fromContainerNumber'] = item['containerNumber']
+          newRow['toContainerNumber'] = item['containerNumber']
+          newRow['fromQty'] = item['qty']
+          newRow['toQty'] = item['qty']
+          newRow['fromOwnerCode'] = item['ownerCode']
+          newRow['fromAltBatch'] = item['altBatch']
+          newRow['toAltBatch'] = item['altBatch']
+          newRow['fromArriveDate'] = item['arriveDate']
+          newRow['toArriveDate'] = item['arriveDate']
+          newRow['fromProduceDate'] = item['produceDate']
+          newRow['toProduceDate'] = item['produceDate']
+          newRow['fromExpireDate'] = item['expireDate']
+          newRow['toExpireDate'] = item['expireDate']
+          newRow['itemCode'] = item['itemCode']
+          newRow['locationCode'] = item['locationCode']
+          newRow['uom'] = item['uom']
+          tableData.value.push(newRow)
+        })
       }
       
     } else {
diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
index 74acc42bd..b6e8cc592 100644
--- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
@@ -383,6 +383,7 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       width: 150
     },
     tableForm:{
+      multiple:true,
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择从包装号',
       searchField: 'packingNumber',

From 691ba55304fc8c3785ec8ded4c16d70017dec17a Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Tue, 9 Jul 2024 17:02:07 +0800
Subject: [PATCH 254/408] =?UTF-8?q?=E5=8F=91=E8=BF=90=E7=BB=93=E7=AE=97?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../relegate/relegateRequest/index.vue        | 25 +++++++++++--------
 .../relegateRequestMain.data.ts               |  2 ++
 .../saleShipmentMainRequest/index.vue         | 17 ++++++++-----
 .../saleShipmentMain.data.ts                  |  1 +
 4 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
index 0311d8b2e..777c111db 100644
--- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
@@ -29,7 +29,7 @@
 
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm ref="basicFormRef" 
-    :isOpenSearchTable="false" 
+    :isOpenSearchTable="true"
     fieldTableColumn="itemCode" 
     @success="getList"
     :rules="RelegateRequestMainRules" 
@@ -93,15 +93,20 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
   nextTick(() => {
     if (type == 'tableForm') {
       if (formField == 'itemCode') {
-        row['itemCode'] = val[0]['itemCode']
-        row['uom'] = val[0]['uom']
-        row['qty'] = val[0]['qty']
-        row['fromBatch'] = val[0]['batch']
-        row['fromPackingNumber'] = val[0]['packingNumber']
-        row['toBatch'] = val[0]['batch']
-        row['toPackingNumber'] = val[0]['packingNumber']
-        row['fromLocationCode'] = val[0]['locationCode']
-        row['inventoryStatus'] = val[0]['inventoryStatus']
+        val.forEach(item=>{
+          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+          newRow['itemCode'] = item['itemCode']
+          newRow['uom'] = item['uom']
+          newRow['qty'] = item['qty']
+          newRow['fromBatch'] = item['batch']
+          newRow['fromPackingNumber'] = item['packingNumber']
+          newRow['toBatch'] = item['batch']
+          newRow['toPackingNumber'] = item['packingNumber']
+          newRow['fromLocationCode'] = item['locationCode']
+          newRow['inventoryStatus'] = item['inventoryStatus']
+          tableData.value.push(newRow)
+        })
+        
       } else if (formField == 'downItemCode') {
         row['downItemCode'] = val[0]['code']
       } else if (formField == 'toLocationCode') {
diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
index c759b61b6..9111450eb 100644
--- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
@@ -59,6 +59,7 @@ export const RelegateRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch: true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
@@ -318,6 +319,7 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     tableForm:{
+      multiple:true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择物料代码', // 输入框占位文本
       searchField: 'itemCode', // 查询弹窗赋值字段
diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
index afac9f2f0..f34280f34 100644
--- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
+++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
@@ -42,7 +42,7 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
     ref="basicFormRef"
-    :isOpenSearchTable="false"
+    :isOpenSearchTable="true"
     fieldTableColumn="soLine"
     @success="getList"
     :rules="SaleShipmentMainRules"
@@ -111,11 +111,16 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
   nextTick(() => {
     if (type == 'tableForm') {
       if(formField == 'soLine') {
-        row['soLine'] = val[0]['lineNumber']
-        row['soNumber'] = val[0]['number']    
-        row['itemCode'] = val[0]['itemCode']
-        row['projectCode'] = val[0]['projectCode']
-        row['uom'] = val[0]['uom']
+        val.forEach(item=>{
+          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+          newRow['soLine'] = item['lineNumber']
+          newRow['soNumber'] = item['number']    
+          newRow['itemCode'] = item['itemCode']
+          newRow['projectCode'] = item['projectCode']
+          newRow['uom'] = item['uom']
+          tableData.value.push(newRow)
+        })
+        
       }else if(formField == 'fromLocationCode'){
         row['fromLocationCode'] = val[0]['defaultLocationCode']
       }
diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts
index 08d9752d6..139f6b6f4 100644
--- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts
+++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts
@@ -339,6 +339,7 @@ export const SaleShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     tableForm:{
+      multiple: true,
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择销售订单行',
       searchField: 'lineNumber',

From c54fbed62f6a2d60d43d8e53af725f4596b603cf Mon Sep 17 00:00:00 2001
From: zhaoyiran <zhaoyrd@yonyou.com>
Date: Tue, 9 Jul 2024 17:09:07 +0800
Subject: [PATCH 255/408] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?=
 =?UTF-8?q?=E7=A5=A8=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoiceRecordMain/index.vue       | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
index d2ea9d461..86e5bbba9 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
@@ -125,6 +125,9 @@ import * as SupplierinvoiceRecordDetailApi from '@/api/wms/supplierinvoiceRecord
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import * as SupplierinvoiceRequestDetailApi from '@/api/wms/supplierinvoiceRequestDetail'
+import * as PackageApi from "@/api/wms/package";
+import {getAccessToken} from "@/utils/auth";
+import {getJmreportBaseUrl} from "@/utils/systemParam";
 
 // 供应商发票记录主
 defineOptions({ name: 'SupplierinvoiceRecordMain' })
@@ -151,7 +154,7 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultExportBtn({hasPermi:'wms:supplierinvoice-record-main:export'}), // 导出
-  // defaultButtons.mainLisSelectiontPointBtn(null), // 批量打印
+  defaultButtons.mainLisSelectiontPointBtn(null), // 批量打印
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -180,28 +183,26 @@ const buttonBaseClick = (val, item) => {
       getList()
     }
   } else if (val == 'filtrate') { // 筛选
-  } else { // 其他按钮
+  }else { // 其他按钮
     console.log('其他按钮', item)
   }
 }
+
+const BASE_URL = getJmreportBaseUrl()
+const srcPoint = ref(BASE_URL + '/jmreport/view/970564557155733504?token=' + getAccessToken())
 const handleSelectionPoint = async ()=>{
   let rows:any = []
   selectionRows.value.forEach(item=>{
     rows = [...rows,...item.selectionRows.map(item1=>item1.id)]
   })
   if(rows.length==0){
+    message.warning('至少选择一条数据！')
     return
   }
   console.log('批量打印',rows.join(','))
-  // let getLoading = ElLoading.service({
-  //   lock: true,
-  //   text: 'loading...',
-  //   background: 'rgba(0, 0, 0, 0.7)'
-  // })
-  // getLoading?.close()
-  
-
+  window.open(srcPoint.value+'&ids='+rows.join(','))
 }
+
 // 列表-操作按钮
 const butttondata = (row,$index) => {
   return [
@@ -310,4 +311,4 @@ onMounted(async () => {
   color:var(--el-color-danger);
   font-weight:700;
 }
-</style>
\ No newline at end of file
+</style>

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 256/408] =?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 a3b0dd9b1f9799584c51ff99c489a4122e51b94e Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Tue, 9 Jul 2024 18:00:32 +0800
Subject: [PATCH 257/408] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=98=8E=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionreturnRequestMain/index.vue     | 11 +++++++--
 .../productionMainAssemble/index.vue          | 10 ++++++--
 .../productionMainAssemble.data.ts            |  1 +
 .../productionMainAssembleSparePart/index.vue | 10 ++++++--
 .../productionMainAssembleSparePart.data.ts   |  1 +
 .../productionMainPredictSparePart/index.vue  | 10 ++++++--
 .../productionMainPredictSparePart.data.ts    |  1 +
 .../index.vue                                 | 24 ++++++++++++-------
 .../productputawayAssembleRequestMain.data.ts |  1 +
 .../productreceiptRequestMain/index.vue       | 15 ++++++++++--
 .../productreceiptRequestMain.data.ts         |  1 +
 .../index.vue                                 | 14 +++++++++--
 .../productreceiptAssembleRequestMain.data.ts |  1 +
 .../productreceiptscrapRequestMain/index.vue  | 19 ++++++++++++---
 .../productreceiptscrapRequestMain.data.ts    |  1 +
 .../productscrapRequestMain/index.vue         | 14 ++++++++---
 .../productscrapRequestMain.data.ts           |  1 +
 17 files changed, 108 insertions(+), 27 deletions(-)

diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
index 59cb00dc0..af65818e2 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
@@ -42,6 +42,8 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
     ref="formRef"
+    :isOpenSearchTable="true"
+    fieldTableColumn="workStationCode"
     @success="getList"
     :rules="ProductionreturnRequestMainRules"
     :formAllSchemas="ProductionreturnRequestMain.allSchemas"
@@ -209,8 +211,13 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           })
         }
       } else if(formField == 'workStationCode') {
-        row['workStationCode'] = val[0]['code']
-        row['fromLocationCode'] = val[0]['rawLocationCode']
+        // 明细查询页赋值
+        val.forEach(item=>{
+          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+          newRow['workStationCode'] = item['code']
+          newRow['fromLocationCode'] = item['rawLocationCode']
+          tableData.value.push(newRow)
+        })
       } else if(formField == 'packUnit') {
         row['packUnit'] = val[0]['packUnit']
         row['packQty'] = val[0]['packQty']
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
index d74384f20..0afec4008 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
@@ -42,6 +42,8 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
     ref="formRef"
+    :isOpenSearchTable="true"
+    fieldTableColumn="itemCode"
     @success="getList"
     :rules="ProductionMainRules"
     :formAllSchemas="ProductionMain.allSchemas"
@@ -114,8 +116,12 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       // }).catch(err =>{
       //   console.log(err);
       // })
-      row[formField] = val[0][searchField]
-      row['uom'] = val[0]['uom']
+      val.forEach(item=>{
+        const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+        newRow[formField] = item[searchField]
+        newRow['uom'] = item['uom']
+        tableData.value.push(newRow)
+      })
     } else {
       const setV = {}
       if(formField == 'workshop'){
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
index b6b85d8b5..4bf309088 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
@@ -635,6 +635,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     tableForm:{
+      multiple: true,
       enterSearch:true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择物料代码', // 输入框占位文本
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
index 1c8dc8bb6..41164cefb 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
@@ -42,6 +42,8 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
     ref="formRef"
+    :isOpenSearchTable="true"
+    fieldTableColumn="itemCode"
     @success="getList"
     :rules="ProductionMainRules"
     :formAllSchemas="ProductionMain.allSchemas"
@@ -114,8 +116,12 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       // }).catch(err =>{
       //   console.log(err);
       // })
-      row[formField] = val[0][searchField]
-      row['uom'] = val[0]['uom']
+      val.forEach(item=>{
+        const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+        newRow[formField] = item[searchField]
+        newRow['uom'] = item['uom']
+        tableData.value.push(newRow)
+      })
     } else {
       const setV = {}
       if(formField == 'workshop'){
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
index 7b01b6b20..47e9efe15 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
@@ -627,6 +627,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     tableForm:{
+      multiple:true,
       enterSearch:true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择物料代码', // 输入框占位文本
diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
index c9a6eb60f..6aa22fecd 100644
--- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
@@ -42,6 +42,8 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
     ref="formRef"
+    :isOpenSearchTable="true"
+    fieldTableColumn="itemCode"
     @success="getList"
     :rules="ProductionMainRules"
     :formAllSchemas="ProductionMain.allSchemas"
@@ -114,8 +116,12 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       // }).catch(err =>{
       //   console.log(err);
       // })
-      row[formField] = val[0][searchField]
-      row['uom'] = val[0]['uom']
+      val.forEach(item=>{
+        const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+        newRow[formField] = item[searchField]
+        newRow['uom'] = item['uom']
+        tableData.value.push(newRow)
+      })
     } else {
       const setV = {}
       if(formField == 'workshop'){
diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
index 4ad8db37b..5b2907265 100644
--- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
@@ -628,6 +628,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     tableForm:{
+      multiple:true,
       enterSearch:true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择物料代码', // 输入框占位文本
diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue
index b7195c45f..378abf063 100644
--- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue
+++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue
@@ -42,6 +42,8 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
     ref="formRef"
+    :isOpenSearchTable="true"
+    fieldTableColumn="itemCode"
     @success="getList"
     :rules="ProductputawayRequestMainRules"
     :formAllSchemas="ProductputawayRequestMain.allSchemas"
@@ -87,7 +89,7 @@ import * as ProductputawayRequestMainApi from '@/api/wms/productputawayRequestMa
 import * as ProductputawayRequestDetailApi from '@/api/wms/productputawayRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 
-// 制品上架申请
+// 制品上架申请 装配上架申请
 defineOptions({ name: 'ProductputawayRequestMain' })
 
 const message = useMessage() // 消息弹窗
@@ -108,14 +110,18 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
   nextTick(() => {
     if (type == 'tableForm') {
       // 明细查询页赋值
-      row[formField] = val[0][searchField]
-      row['poLine'] = val[0]['itemCode']
-      row['packingNumber'] = val[0]['packingNumber']
-      row['containerNumber'] = val[0]['containerNumber']
-      row['batch'] = val[0]['batch']
-      row['uom'] = val[0]['uom']
-      row['inventoryStatus'] = val[0]['inventoryStatus']
-      row['fromLocationCode'] = val[0]['locationCode']
+      val.forEach(item=>{
+        const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+        newRow[formField] = item[searchField]
+        newRow['poLine'] = item['itemCode']
+        newRow['packingNumber'] = item['packingNumber']
+        newRow['containerNumber'] = item['containerNumber']
+        newRow['batch'] = item['batch']
+        newRow['uom'] = item['uom']
+        newRow['inventoryStatus'] = item['inventoryStatus']
+        newRow['fromLocationCode'] = item['locationCode']
+        tableData.value.push(newRow)
+      })
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]
diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts
index 620475a8a..9dcc911d5 100644
--- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts
+++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts
@@ -447,6 +447,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
     tableForm:{
+      multiple: true,
       isInpuFocusShow: true,
       isSearchList: true, // 开启查询弹窗
       searchListPlaceholder: '请选择物料代码', // 输入框占位文本
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
index 7fb5b61d8..8263f8d62 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
@@ -42,6 +42,8 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
     ref="formRef"
+    :isOpenSearchTable="true"
+    fieldTableColumn="workStationCode"
     @success="getList"
     :rules="ProductreceiptRequestMainRules"
     :formAllSchemas="ProductreceiptRequestMain.allSchemas"
@@ -201,15 +203,24 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       if (formField == 'secondPackUnit') {
         row['secondPackUnit'] = val[0]['packUnit']
         row['secondPackQty'] = val[0]['packQty']
+        row[formField] = val[0][searchField]
       }else if(formField == 'packUnit'){
         row['packUnit'] = val[0]['packUnit']
         row['packQty'] = val[0]['packQty']
+        row[formField] = val[0][searchField]
       }else if (formField == 'itemCode') {
         row['uom'] = val[0]['uom']
         row['produceDate'] = dayjs().valueOf()
+        row[formField] = val[0][searchField]
+      }else if (formField == 'workStationCode') {
+        // 明细查询页赋值
+        val.forEach(item=>{
+          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+          newRow[formField] = item[searchField]
+          tableData.value.push(newRow)
+        })
       }
-      // 明细查询页赋值
-      row[formField] = val[0][searchField]
+      
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
index ad2d93277..560808251 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
@@ -615,6 +615,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
     tableForm:{
+      multiple: true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择工位代码',
       searchField: 'code',
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
index cd06bef9a..6296dda1e 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
@@ -42,6 +42,8 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
     ref="formRef"
+    :isOpenSearchTable="true"
+    fieldTableColumn="workStationCode"
     @success="getList"
     :rules="ProductreceiptRequestMainRules"
     :formAllSchemas="ProductreceiptRequestMain.allSchemas"
@@ -202,15 +204,23 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       if (formField == 'secondPackUnit') {
         row['secondPackUnit'] = val[0]['packUnit']
         row['secondPackQty'] = val[0]['packQty']
+        row[formField] = val[0][searchField]
       }else if(formField == 'packUnit'){
         row['packUnit'] = val[0]['packUnit']
         row['packQty'] = val[0]['packQty']
+        row[formField] = val[0][searchField]
       }else if (formField == 'itemCode') {
         row['uom'] = val[0]['uom']
         row['produceDate'] = dayjs().valueOf()
+        row[formField] = val[0][searchField]
+      }else if (formField == 'workStationCode') {
+        // 明细查询页赋值
+        val.forEach(item=>{
+          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+          newRow[formField] = item[searchField]
+          tableData.value.push(newRow)
+        })
       }
-      // 明细查询页赋值
-      row[formField] = val[0][searchField]
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
index 84fb8ddaa..63fd5b156 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
@@ -616,6 +616,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
     tableForm:{
+      multiple: true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择工位代码',
       searchField: 'code',
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
index e76239855..d2be36d10 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
@@ -42,6 +42,8 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
     ref="formRef"
+    :isOpenSearchTable="true"
+    fieldTableColumn="productionLineCode"
     @success="getList"
     :rules="ProductreceiptRequestMainRules"
     :formAllSchemas="ProductreceiptRequestMain.allSchemas"
@@ -140,6 +142,7 @@ import {
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 
 // 制品收货申请
+// 隔离报工申请
 defineOptions({ name: 'ProductreceiptRequestMain' })
 
 const message = useMessage() // 消息弹窗
@@ -187,21 +190,31 @@ const updataTableColumns = (val) => {
 
 // 查询页面返回
 const searchTableSuccess = async (formField, searchField, val, formRef, type, row ) => {
+  console.log(formField, searchField, val, formRef, type, row)
   nextTick(async () => {
     if (type == 'tableForm') {
       if (formField == 'secondPackUnit') {
         row['secondPackUnit'] = val[0]['packUnit']
         row['secondPackQty'] = val[0]['packQty']
+        row[formField] = val[0][searchField]
+
       }else if(formField == 'itemCode'){
-        
         let res = await ItembasicApi.getQueryItemCodeInfo({itemCodes:val.map(item=>item.itemCode).join(',')})
         if(res.length>0){
           row['uom'] = res[0]['uom']
         }
+        row[formField] = val[0][searchField]
+
         console.log('获取计量单位',res)
+      }else{
+        //添加明细
+        val.forEach(item=>{
+          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+          newRow.batch = formatTime(new Date(), 'yyyyMMdd')
+          newRow[formField] = item[searchField]
+          tableData.value.push(newRow)
+        })
       }
-      // 明细查询页赋值
-      row[formField] = val[0][searchField]
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
index 7896c89eb..668c03dbc 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
@@ -523,6 +523,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
     tableForm:{
+      multiple: true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择生产线代码',
       searchField: 'code',
diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
index 5243a5682..cae64b1f9 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
@@ -42,6 +42,8 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
     ref="formRef"
+    :isOpenSearchTable="true"
+    fieldTableColumn="workStationCode"
     @success="getList"
     :rules="ProductscrapRequestMainRules"
     :formAllSchemas="ProductscrapRequestMain.allSchemas"
@@ -83,6 +85,7 @@
  <!-- BOM弹窗列表 -->
  <BasicForm
     ref="detailBomRef"
+    
     @success="getList"
     :tableAllSchemas="ProdcutscrapBomScrap.allSchemas"
     :tableFormRules="ProdcutscrapBomScrapRules"
@@ -118,7 +121,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as BomDismantleApi from "@/api/wms/bomDismantle"
 import * as BomApi from "@/api/wms/bom";
 
-// 制品报废申请
+// 制品报废申请 制品子件报废申请
 defineOptions({ name: 'ProductscrapRequestMain' })
 
 const message = useMessage() // 消息弹窗
@@ -300,8 +303,13 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       if(formField == 'productionLineCode'){
         row['productionLineCode'] = val[0]['code']
       }else if(formField == 'workStationCode'){
-        row['workStationCode'] = val[0]['code']
-        row['fromLocationCode'] = val[0]['rawLocationCode']
+        val.forEach(item=>{
+          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+          newRow['workStationCode'] = item['code']
+          newRow['fromLocationCode'] = item['rawLocationCode']
+          tableData.value.push(newRow)
+        })
+       
       }else if(formField == 'processCode'){
         row['processCode'] = val[0]['code']
       }else if(formField == 'itemCode'){
diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
index 5e4add7ff..c7ad921ec 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
@@ -551,6 +551,7 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     tableForm:{
+      multiple: true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择工位代码', // 输入框占位文本
       searchField: 'code', // 查询弹窗赋值字段

From 9b8e56c7ad7c3c428d08836e104c7436ac28418e Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Tue, 9 Jul 2024 18:02:44 +0800
Subject: [PATCH 258/408] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=BA=BF=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionreturnRequestMain.data.ts                        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
index baa26aebd..46f95443d 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
@@ -491,6 +491,9 @@ export const ProductionreturnRequestMainRules = reactive({
   workshopCode: [
     { required: true, message: '请选择车间', trigger: 'change' }
   ],
+  productionLineCode: [
+    { required: true, message: '请选择生产线代码', trigger: 'change' }
+  ],
 })
 
 /**

From 8b50d3b5624ad77eb5b9ab571c5647561a79f950 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Tue, 9 Jul 2024 18:08:05 +0800
Subject: [PATCH 259/408] packQty

---
 .../moveManage/inventorymove/inventorymoveRequestMain/index.vue  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
index b92e5212d..9eceed8a9 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
@@ -341,6 +341,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           newRow['fromInventoryStatus'] = item['inventoryStatus']
           newRow['fromLocationCode'] = item['locationCode']
           newRow['uom'] = item['uom']
+          newRow['qty'] = item['packQty']
           if(routeName.value == 'OktoholdRequestMain'){
             newRow['toInventoryStatus'] = "HOLD"
           }else if ( routeName.value == 'HoldtookRequestMain') {

From b292f84830af6483a2c73b954b8eb23652cafbc9 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Tue, 9 Jul 2024 18:10:11 +0800
Subject: [PATCH 260/408] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=AD=90=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/basicDataManage/itemManage/itemarea/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
index b4bd4fd9d..46e9ba97b 100644
--- a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
@@ -52,7 +52,7 @@
     :tableData="tableData"
     :apiUpdate="ItemareaApi.updateItemarea"
     :apiCreate="ItemareaApi.createItemarea"
-    :isBusiness="true"
+    :isBusiness="false"
     @handleAddTable="handleAddTable"
     @handleDeleteTable="handleDeleteTable"
     :isShowReduceButtonSelection="true"

From b4143cbaeab134dd7676d82352597385e701a685 Mon Sep 17 00:00:00 2001
From: bjang03 <259278618@qq.com>
Date: Tue, 9 Jul 2024 18:39:35 +0800
Subject: [PATCH 261/408] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=20HL-3897?=
 =?UTF-8?q?=EF=BC=8CHL-3908=EF=BC=8CHL-3966?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 5fa0fbd9a..9b5e713cb 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -135,7 +135,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import ButtonBase from '@/components/XButton/src/ButtonBase.vue'
 import TableForm from '@/components/TableForm/src/TableForm.vue'
 import TableFormCountPlan from '@/components/TableFormCountPlan/src/TableFormCountPlan.vue'
-
+import {DICT_TYPE, getStrDictOptions} from '@/utils/dict'
 import { tableFormBlurVer,FormBlur,getListByBottonInput } from '@/api/wms/business/business'
 const props = defineProps({
   // 显示窗口宽度设置

From fb7aadc6817e4194f6c2c423348d3964fc15b584 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Tue, 9 Jul 2024 18:43:16 +0800
Subject: [PATCH 262/408] =?UTF-8?q?WMS+SCP=E7=94=B5=E8=84=91=E7=AB=AF?=
 =?UTF-8?q?=E5=85=A8=E5=B1=80UI=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/RouterSearch/index.vue           |  2 +-
 src/layout/components/CategoryHeader.vue        |  9 ++++++++-
 src/layout/components/Message/src/Message.vue   |  2 +-
 src/layout/components/ToolHeader.vue            | 16 ++++++++--------
 src/layout/components/UserInfo/src/UserInfo.vue |  4 ++--
 src/layout/components/useRenderLayout.tsx       |  4 ++--
 6 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/src/components/RouterSearch/index.vue b/src/components/RouterSearch/index.vue
index 0966638e6..b15f88066 100644
--- a/src/components/RouterSearch/index.vue
+++ b/src/components/RouterSearch/index.vue
@@ -18,7 +18,7 @@
     </el-select> -->
   </ElDialog>
   <div v-else class="custom-hover" @click.stop="showTopSearch = !showTopSearch">
-    <Icon icon="ep:search" />
+    <Icon icon="ep:search" color="#ffffff"/>
     <el-select
       filterable
       :reserve-keyword="false"
diff --git a/src/layout/components/CategoryHeader.vue b/src/layout/components/CategoryHeader.vue
index 824731f8b..e0f6ee0f3 100644
--- a/src/layout/components/CategoryHeader.vue
+++ b/src/layout/components/CategoryHeader.vue
@@ -9,6 +9,8 @@ import { ElMenu, ElMenuItem } from 'element-plus'
 import { usePermissionStore } from '@/store/modules/permission'
 import { hasOneShowingChild } from '@/layout/components/Menu/src/helper'
 import { useRenderMenuTitle } from '@/layout/components/Menu/src/components/useRenderMenuTitle'
+import ToolHeader from './ToolHeader.vue'
+
 // 头部工具
 import { useDesign } from '@/hooks/web/useDesign'
 const { getPrefixCls, variables } = useDesign()
@@ -101,6 +103,7 @@ export default defineComponent({
             }
         }}
       </ElMenu>
+      <ToolHeader class="tool-header"></ToolHeader>
       </div>
     )
   }
@@ -127,7 +130,11 @@ $prefix-cls: #{$namespace}-tool-header;
     left:0;
     z-index: 999;
   }
-
+  .tool-header{
+    position: absolute;
+    right: 0px;
+    top: 0px;
+  }
 }
 .categoryheader{
   padding-left: 20px;
diff --git a/src/layout/components/Message/src/Message.vue b/src/layout/components/Message/src/Message.vue
index 4ca667fbd..67ea37a33 100644
--- a/src/layout/components/Message/src/Message.vue
+++ b/src/layout/components/Message/src/Message.vue
@@ -62,7 +62,7 @@ onBeforeUnmount(() => {
     <ElPopover :width="400" placement="bottom" trigger="click">
       <template #reference>
         <ElBadge :is-dot="unreadCount > 0" class="item">
-          <Icon :size="18" class="cursor-pointer" icon="ep:bell" @click="getList" />
+          <Icon :size="18" class="cursor-pointer" color="#ffffff" icon="ep:bell" @click="getList" />
         </ElBadge>
       </template>
       <ElTabs v-model="activeName">
diff --git a/src/layout/components/ToolHeader.vue b/src/layout/components/ToolHeader.vue
index 22d7a457c..ca7328fb9 100644
--- a/src/layout/components/ToolHeader.vue
+++ b/src/layout/components/ToolHeader.vue
@@ -54,28 +54,28 @@ export default defineComponent({
           'dark:bg-[var(--el-bg-color)]'
         ]}
       >
-        {layout.value !== 'top' ? (
+        {/* {layout.value !== 'top' ? (
           <div class="h-full flex items-center">
             {hamburger.value && layout.value !== 'cutMenu' ? (
               <Collapse class="custom-hover" color="var(--top-header-text-color)"></Collapse>
             ) : undefined}
             {breadcrumb.value ? <Breadcrumb class="lt-md:hidden"></Breadcrumb> : undefined}
           </div>
-        ) : undefined}
+        ) : undefined} */}
         <div class="h-full flex items-center">
           {search.value ? (<RouterSearch isModal={false} />) : undefined}
-          {screenfull.value ? (
+          {/* {screenfull.value ? (
             <Screenfull class="custom-hover" color="var(--top-header-text-color)"></Screenfull>
-          ) : undefined}
-          {size.value ? (
+          ) : undefined} */}
+          {/* {size.value ? (
             <SizeDropdown class="custom-hover" color="var(--top-header-text-color)"></SizeDropdown>
-          ) : undefined}
-          {locale.value ? (
+          ) : undefined} */}
+          {/* {locale.value ? (
             <LocaleDropdown
               class="custom-hover"
               color="var(--top-header-text-color)"
             ></LocaleDropdown>
-          ) : undefined}
+          ) : undefined} */}
           {message.value ? (
             <Message class="custom-hover" color="var(--top-header-text-color)"></Message>
           ) : undefined}
diff --git a/src/layout/components/UserInfo/src/UserInfo.vue b/src/layout/components/UserInfo/src/UserInfo.vue
index 3c03ea7d2..3521bd443 100644
--- a/src/layout/components/UserInfo/src/UserInfo.vue
+++ b/src/layout/components/UserInfo/src/UserInfo.vue
@@ -54,7 +54,7 @@ const toDocument = () => {
   <ElDropdown class="custom-hover" :class="prefixCls" trigger="click">
     <div class="flex items-center">
       <ElAvatar :src="avatar" alt="" class="w-[calc(var(--logo-height)-25px)] rounded-[50%]" />
-      <span class="pl-[5px] text-14px text-[var(--top-header-text-color)] <lg:hidden">
+      <span class="pl-[5px] text-14px text-[var(--top-header-text-color)] <lg:hidden" style="color:#ffffff">
         {{ userName }}
       </span>
     </div>
@@ -62,7 +62,7 @@ const toDocument = () => {
       <ElDropdownMenu>
         <ElDropdownItem>
           <Icon icon="ep:tools" />
-          <div @click="toProfile">{{ t('common.profile') }}</div>
+          <div @click="toProfile" >{{ t('common.profile') }}</div>
         </ElDropdownItem>
         <!-- <ElDropdownItem>
           <Icon icon="ep:menu" />
diff --git a/src/layout/components/useRenderLayout.tsx b/src/layout/components/useRenderLayout.tsx
index e9340b5db..393d2e8c6 100644
--- a/src/layout/components/useRenderLayout.tsx
+++ b/src/layout/components/useRenderLayout.tsx
@@ -114,14 +114,14 @@ export const useRenderLayout = () => {
             style="transition: all var(--transition-time-02);width:100%;"
           >
             
-            <ToolHeader
+            {/* <ToolHeader
               class={[
                 'bg-[var(--top-header-bg-color)]',
                 {
                   'layout-border__bottom': !tagsView.value
                 }
               ]}
-            ></ToolHeader>
+            ></ToolHeader> */}
 
             {tagsView.value ? (
               <TagsView class="layout-border__bottom layout-border__top"></TagsView>

From 4c8129fbfb9aba8b54c960214389ead410fa8599 Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Tue, 9 Jul 2024 18:51:14 +0800
Subject: [PATCH 263/408] =?UTF-8?q?WMS=20=E2=80=94=E2=80=94>=20bug=20=20?=
 =?UTF-8?q?=E5=8C=85=E8=A3=85=E4=BF=A1=E6=81=AF=E4=B8=AD=E5=8C=85=E8=A3=85?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=9F=A5=E8=AF=A2=E4=B8=8D=E5=A5=BD=E4=BD=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../itemManage/itempackage/itempackage.data.ts              | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts
index 04e2537e2..b07a6fe83 100644
--- a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts
@@ -86,7 +86,7 @@ export const Itempackaging = useCrudSchemas(reactive<CrudSchema[]>([
     label: '包装名称',
     field: 'packName',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
     table: {
       width: 120
     },
@@ -101,7 +101,7 @@ export const Itempackaging = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.PACK_UNIT_TYPE,
     dictClass: 'string',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
     table: {
       width: 150
     },
@@ -110,7 +110,7 @@ export const Itempackaging = useCrudSchemas(reactive<CrudSchema[]>([
     label: '包装数量',
     field: 'packQty',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
     table: {
       width: 120
     },

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 264/408] 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 265/408] =?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 78981ff80b4c1bf75e4e4a18391643f9bce70a5e Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Tue, 9 Jul 2024 19:40:14 +0800
Subject: [PATCH 266/408] =?UTF-8?q?=E5=8F=91=E6=96=99=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Form/src/Form.vue                |  2 ++
 src/components/RouterSearch/index.vue           |  5 ++++-
 .../issue/issueRequestMain/index.vue            | 17 ++++++++++++++++-
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/components/Form/src/Form.vue b/src/components/Form/src/Form.vue
index 6babae951..55e4e7726 100644
--- a/src/components/Form/src/Form.vue
+++ b/src/components/Form/src/Form.vue
@@ -272,6 +272,7 @@ export default defineComponent({
               }} 
               
               onBlur={(e)=>{onBlur(item.field, e)}}
+              onChange={(e)=>{onChange(item.field, e)}}
               v-slots={{
                   suffix: () => (
                     <ElButton type="text" icon={CircleClose} style="color:var(--el-button-text-color)" onClick={()=>{
@@ -324,6 +325,7 @@ export default defineComponent({
               }}
               
               onBlur={(e)=>{onBlur(item.field,formModel.value[item.field])}}
+              onChange={(e)=>{onChange(item.field,formModel.value[item.field])}}
                disabled={item?.componentProps?.enterSearch?false:true} v-slots={{
                   suffix: () => (
                     <ElButton type="text" icon={CircleClose} style="color:var(--el-button-text-color)" onClick={()=>{
diff --git a/src/components/RouterSearch/index.vue b/src/components/RouterSearch/index.vue
index b15f88066..7c938dc02 100644
--- a/src/components/RouterSearch/index.vue
+++ b/src/components/RouterSearch/index.vue
@@ -17,7 +17,7 @@
       />
     </el-select> -->
   </ElDialog>
-  <div v-else class="custom-hover" @click.stop="showTopSearch = !showTopSearch">
+  <div v-else class="custom-hover1" @click.stop="showTopSearch = !showTopSearch">
     <Icon icon="ep:search" color="#ffffff"/>
     <el-select
       filterable
@@ -170,4 +170,7 @@ defineExpose({
 .w-220px {
     width: 220px !important;
 }
+.custom-hover1{
+  background-color: transparent;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/wms/issueManage/issue/issueRequestMain/index.vue b/src/views/wms/issueManage/issue/issueRequestMain/index.vue
index 568bb3152..1bb24f9f6 100644
--- a/src/views/wms/issueManage/issue/issueRequestMain/index.vue
+++ b/src/views/wms/issueManage/issue/issueRequestMain/index.vue
@@ -60,6 +60,7 @@
     @searchTableSuccess="searchTableSuccess"
     @submitForm="submitForm"
     @onEnter="onEnter"
+    @onChange="onChange"
   />
 
   <!-- 详情 -->
@@ -108,7 +109,16 @@ const tableColumns = ref([...IssueRequestMain.allSchemas.tableColumns,...IssueRe
 const updataTableColumns = (val) => {
   tableColumns.value = val
 }
-
+const onChange  = async (field,value) => {
+  console.log('onChange',field,value)
+  if (field == 'workshopCode') {
+    //车间代码
+    const setV = {}
+    setV['productionLineCode'] = ''
+    setV['workStationCode'] = ''
+    formRef.value.formRef.setValues(setV)
+  }
+}
 const onEnter = async (field,value) => {
   if (field == 'productionLineCode') {
     //生产线
@@ -168,6 +178,11 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         setV['fromWarehouseCode'] = val[0]['code']
         setV['toWarehouseCode'] = val[0]['code']
       }
+      if (formField == 'workshopCode') {
+        //车间代码
+        setV['productionLineCode'] = ''
+        setV['workStationCode'] = ''
+      }
       if (formField == 'productionLineCode') {
         //生产线
         let res = await WorkstationApi.getWorkstationPage({

From b7c654d15bcdf116a8f1f16417a58ae60267cd51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com>
Date: Tue, 9 Jul 2024 19:52:21 +0800
Subject: [PATCH 267/408] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereturnRequestMain/index.vue       |  288 +-
 .../supplierdeliverRequestMain.data.ts        | 2933 ++++++++---------
 2 files changed, 1609 insertions(+), 1612 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
index d32bddadf..d09d0bc40 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
@@ -2,7 +2,10 @@
   <ContentWrap>
     <!-- 搜索工作栏 -->
     <Search
-      :schema="[...PurchasereturnRequestMain.allSchemas.searchSchema,...PurchasereturnRequestDetail.allSchemas.searchSchema]"
+      :schema="[
+        ...PurchasereturnRequestMain.allSchemas.searchSchema,
+        ...PurchasereturnRequestDetail.allSchemas.searchSchema
+      ]"
       @search="setSearchParams"
       @reset="setSearchParams"
     />
@@ -21,7 +24,8 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table v-clientTable
+    <Table
+      v-clientTable
       :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
@@ -37,9 +41,9 @@
           <span>{{ row.number }}</span>
         </el-button>
       </template>
-      <template #action="{ row,$index }">
+      <template #action="{ row, $index }">
         <ButtonBase
-        :Butttondata="butttondata(row,$index)"
+          :Butttondata="butttondata(row, $index)"
           @button-base-click="buttonTableClick($event, row)"
         />
       </template>
@@ -87,8 +91,8 @@
     :detailValidate="detailValidate"
   />
 
-<!-- 创建标签 -->
-<BasicForm
+  <!-- 创建标签 -->
+  <BasicForm
     ref="formLabelRef"
     @success="getList"
     :tableAllSchemas="PurchasereReturnRequestDetailLabel.allSchemas"
@@ -101,7 +105,7 @@
     @searchTableSuccess="searchTableSuccessLabel"
   />
   <!-- 标签打印 -->
-  <SearchTable style="width:905px" ref="showLabelRef" @searchTableSuccess="showLabelSuccess" />
+  <SearchTable style="width: 905px" ref="showLabelRef" @searchTableSuccess="showLabelSuccess" />
   <!-- 导入 -->
   <ImportForm
     ref="importFormRef"
@@ -129,9 +133,7 @@ import * as PurchasereturnRequestMainApi from '@/api/wms/purchasereturnRequestMa
 import * as PurchasereturnRequestDetailApi from '@/api/wms/purchasereturnRequestDetail'
 import * as PurchasereceiptRecordDetailApi from '@/api/wms/purchasereceiptRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import {
-  SupplierdeliverRequestPackage
-} from '../../supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data'
+import { SupplierdeliverRequestPackage } from '../../supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data'
 import * as PackageApi from '@/api/wms/package'
 import { getAccessToken } from '@/utils/auth'
 import * as BalanceApi from '@/api/wms/balance'
@@ -142,11 +144,14 @@ defineOptions({ name: 'PurchasereturnRequestMain' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
-const genLabelId = ref(); //主表ID
+const genLabelId = ref() //主表ID
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref([...PurchasereturnRequestMain.allSchemas.tableColumns,...PurchasereturnRequestDetail.allSchemas.tableMainColumns])
+const tableColumns = ref([
+  ...PurchasereturnRequestMain.allSchemas.tableColumns,
+  ...PurchasereturnRequestDetail.allSchemas.tableMainColumns
+])
 
 const isShowButton = ref(true)
 
@@ -154,16 +159,25 @@ const isShowButton = ref(true)
 const updataTableColumns = (val) => {
   tableColumns.value = val
 }
-const onEnter = async (field,value)=>{
-  console.log(field,value)
-  if('supplierCode'==field){
+const onEnter = async (field, value) => {
+  console.log(field, value)
+  if ('supplierCode' == field) {
     //供应商代码
-    formRef.value.opensearchTable('purchaseReceiptRecordNumber', 'number', '采购收货记录', PurchasereceiptRecordMain1.allSchemas, PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPageReturn,[{
+    formRef.value.opensearchTable(
+      'purchaseReceiptRecordNumber',
+      'number',
+      '采购收货记录',
+      PurchasereceiptRecordMain1.allSchemas,
+      PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPageReturn,
+      [
+        {
           key: 'supplierCode',
           value: 'supplierCode',
           isMainValue: true
-        }])
-  }else if('purchaseReceiptRecordNumber' == field){
+        }
+      ]
+    )
+  } else if ('purchaseReceiptRecordNumber' == field) {
     //采购收货记录
   }
 }
@@ -171,22 +185,22 @@ const onEnter = async (field,value)=>{
 // 生成标签
 const isCreateLabel = ref(false)
 const formLabelRef = ref()
-const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({
+const { tableObject: detatableData, tableMethods: detatableMethods } = useTable({
   getListApi: PurchasereturnRequestDetailApi.getPurchasereturnRequestDetailPage
 })
-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
-    console.log("detatableData",detatableData)
+    console.log('detatableData', detatableData)
     await message.confirm(t('ts.是否为此数据生成标签？'))
     await PurchasereturnRequestMainApi.genLabel(data) //genLabelId.value
     isCreateLabel.value = true
@@ -207,21 +221,20 @@ const searchTableSuccessLabel = (formField, searchField, val, formRef, type, row
         row['packUnit'] = val[0]['packUnit']
         row['packQty'] = val[0]['packQty']
       }
-    } 
+    }
   })
 }
 
 // 查询页面返回
-const searchTableSuccess = async(formField, searchField, val, formRef, type, row) => {
-  
-  console.log('searchTableSuccess',formField, searchField, val, formRef, type, row)
-  console.log('searchTableSuccess123',val)
-  nextTick( async () => {
-    
+const searchTableSuccess = async (formField, searchField, val, formRef, type, row) => {
+  console.log('searchTableSuccess', formField, searchField, val, formRef, type, row)
+  console.log('searchTableSuccess123', val)
+  nextTick(async () => {
     if (type == 'tableForm') {
       // 明细查询页赋值
       row[formField] = val[0][searchField]
-      if(formField=='purchaseReceiptRecordNumber'){//搜索记录单号--回显数据
+      if (formField == 'purchaseReceiptRecordNumber') {
+        //搜索记录单号--回显数据
         row['supplierCode'] = val[0]['supplierCode']
         row['poNumber'] = val[0]['poNumber']
         row['poLine'] = val[0]['poLine']
@@ -257,14 +270,14 @@ const searchTableSuccess = async(formField, searchField, val, formRef, type, row
         row['singlePrice'] = val[0]['singlePrice']
         row['amount'] = val[0]['amount']
         row['projectCode'] = val[0]['projectCode']
-      }else if(formField == 'itemCode'){
+      } else if (formField == 'itemCode') {
         row['batch'] = val[0]['toBatch']
         row['containerNumber'] = val[0]['toContainerNumber']
         row['containerNumber'] = val[0]['containerNumber']
         row['containerNumber'] = val[0]['containerNumber']
         // row['fromLocationCode'] = val[0]['fromLocationCode']
         row['toLocationCode'] = val[0]['toLocationCode']
-      }else if(formField=='fromLocationCode'){
+      } else if (formField == 'fromLocationCode') {
         //   let params = {
         //   itemCode: row.itemCode,
         //   batch: row.batch,
@@ -273,12 +286,12 @@ const searchTableSuccess = async(formField, searchField, val, formRef, type, row
         // let aa  = await  BalanceApi.getSumByConditions(params);
         // console.log('23423423',aa);
         // row['inventoryBalance'] = aa//库存余额
-      }else if(formField=='packingNumber'){
-        row['inventoryBalance'] = val[0]['qty']//库存余额
+      } else if (formField == 'packingNumber') {
+        row['inventoryBalance'] = val[0]['qty'] //库存余额
       }
     } else {
       const setV = {}
-      if(formField == 'purchaseReceiptRecordNumber'){
+      if (formField == 'purchaseReceiptRecordNumber') {
         // isShowButton.value = false
         setV[formField] = val[0][searchField]
         setV['purchaseReceiptRecordNumber'] = val[0]['number']
@@ -287,9 +300,10 @@ const searchTableSuccess = async(formField, searchField, val, formRef, type, row
         setV['ppNumber'] = val[0]['ppNumber']
         // 获取子表数据 getBomDisassemble
         // PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailList({
-          PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailListToRepeat({
+        PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailListToRepeat({
           masterId: val[0]['masterId']
-        }).then((res) => {
+        })
+          .then((res) => {
             if (res) tableData.value = res
             tableData.value.forEach((item) => {
               item.batch = item.toBatch
@@ -307,7 +321,7 @@ const searchTableSuccess = async(formField, searchField, val, formRef, type, row
               // item.fromLocationGroupCode = item.fromLocationGroupCode
             })
             originTableData.value = JSON.parse(JSON.stringify(tableData.value))
-            
+
             PurchasereturnRequestMain.allSchemas.formSchema.forEach((item) => {
               if (item.field == 'supplierCode') {
                 item.componentProps.disabled = true
@@ -331,11 +345,12 @@ const searchTableSuccess = async(formField, searchField, val, formRef, type, row
                 item.tableForm.isInpuFocusShow = false
               }
             })
-        }).catch((err) => {
-          console.log(err)
-        })
+          })
+          .catch((err) => {
+            console.log(err)
+          })
       }
-      if(formField == 'supplierCode'){
+      if (formField == 'supplierCode') {
         // isShowButton.value = true
         setV['supplierCode'] = val[0]['code']
         // setV['purchaseReceiptRecordNumber'] = ''
@@ -349,7 +364,7 @@ const searchTableSuccess = async(formField, searchField, val, formRef, type, row
 const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
   nextTick(() => {
     const setV = {}
-    if(formField == 'poLine' || formField == 'itemCode'){
+    if (formField == 'poLine' || formField == 'itemCode') {
       console.log(val)
       setV['poLine'] = val[0]['poLine']
       setV['poNumber'] = val[0]['poNumber']
@@ -387,7 +402,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
       setV['amount'] = val[0]['amount']
       setV['projectCode'] = val[0]['projectCode']
 
-      if(formField == 'itemCode'){
+      if (formField == 'itemCode') {
         setV['batch'] = val[0]['toBatch']
         setV['containerNumber'] = val[0]['toContainerNumber']
         setV['containerNumber'] = val[0]['containerNumber']
@@ -395,7 +410,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
         // setV['fromLocationCode'] = val[0]['fromLocationCode']
         // setV['toLocationCode'] = val[0]['toLocationCode']
       }
-    }else {
+    } else {
       setV[formField] = val[0][searchField]
     }
     formRef.setValues(setV)
@@ -439,7 +454,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
       })
@@ -464,9 +479,11 @@ const isShowMainButton = (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 [
@@ -497,7 +514,7 @@ const butttondata = (row,$index) => {
     defaultButtons.mainListEditBtn({
       hide: isShowMainButton(row, ['1']),
       hasPermi: 'wms:purchasereceipt-request-main:update'
-    }), // 编辑
+    }) // 编辑
     // {
     //   label: '生成标签',
     //   name: 'ssbq',
@@ -535,18 +552,18 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'edit') {
     // 编辑
     openForm('update', row)
-  } else if(val == 'ssbq'){
-       // 生成标签
-     detatableData.params = {
-      masterId:row.masterId
-     }
+  } else if (val == 'ssbq') {
+    // 生成标签
+    detatableData.params = {
+      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 标题
   } else if (val == 'point') {
     // 标签打印
     labelPrint(row)
-  } 
+  }
 }
 
 /** 添加/修改操作 */
@@ -555,25 +572,25 @@ const openForm = async (type: string, row?: number) => {
   originTableData.value = [] // 重置明细数据
   tableData.value = [] // 重置明细数据
   isShowButton.value = true
-  if(type == 'create'){
+  if (type == 'create') {
     PurchasereturnRequestMain.allSchemas.formSchema.forEach((item) => {
       if (item.field == 'supplierCode') {
         item.componentProps.disabled = true
         item.componentProps.isSearchList = true
       }
-      if(item.field == 'purchaseReceiptRecordNumber'){
+      if (item.field == 'purchaseReceiptRecordNumber') {
         item.componentProps.disabled = true
         item.componentProps.isSearchList = true
       }
     })
   }
-  if(type == 'update'){
+  if (type == 'update') {
     PurchasereturnRequestMain.allSchemas.formSchema.forEach((item) => {
       if (item.field == 'supplierCode') {
         item.componentProps.disabled = true
         item.componentProps.isSearchList = false
       }
-      if(item.field == 'purchaseReceiptRecordNumber'){
+      if (item.field == 'purchaseReceiptRecordNumber') {
         item.componentProps.disabled = true
         item.componentProps.isSearchList = false
       }
@@ -588,11 +605,16 @@ const { wsCache } = useCache()
 const detailRef = ref()
 const purchaseReceiptRecordNumberRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  purchaseReceiptRecordNumberRef.value = row.purchaseReceiptRecordNumber;
-  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  purchaseReceiptRecordNumberRef.value = row.purchaseReceiptRecordNumber
+  const departmentCode = wsCache
+    .get(CACHE_KEY.DEPT)
+    .find((account) => account.id == row.departmentCode)?.name
   if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
-  PurchasereturnRequestDetail.allSchemas.tableColumns = PurchasereturnRequestDetail.allSchemas.tableColumns.filter(item=>item.field!='inventoryBalance')
-  detailRef.value.openDetail(row, titleName, titleValue,'requestPurchasereturnMain')
+  PurchasereturnRequestDetail.allSchemas.tableColumns =
+    PurchasereturnRequestDetail.allSchemas.tableColumns.filter(
+      (item) => item.field != 'inventoryBalance'
+    )
+  detailRef.value.openDetail(row, titleName, titleValue, 'requestPurchasereturnMain')
 }
 
 /** 关闭按钮操作 */
@@ -603,7 +625,8 @@ const handleClose = async (id: number) => {
     await PurchasereturnRequestMainApi.closePurchasereturnRequestMain(id)
     message.success(t('common.closeSuccess'))
     await getList()
-  } catch {}finally{
+  } catch {
+  } finally {
     tableObject.loading = false
   }
 }
@@ -616,7 +639,8 @@ const handleReAdd = async (id: number) => {
     await PurchasereturnRequestMainApi.reAddPurchasereturnRequestMain(id)
     message.success(t('common.reAddSuccess'))
     await getList()
-  } catch {}finally{
+  } catch {
+  } finally {
     tableObject.loading = false
   }
 }
@@ -629,7 +653,8 @@ const handleAgree = async (id: number) => {
     await PurchasereturnRequestMainApi.agreePurchasereturnRequestMain(id)
     message.success(t('common.agreeSuccess'))
     await getList()
-  } catch {}finally{
+  } catch {
+  } finally {
     tableObject.loading = false
   }
 }
@@ -642,7 +667,8 @@ const handleRefused = async (id: number) => {
     await PurchasereturnRequestMainApi.refusedPurchasereturnRequestMain(id)
     message.success(t('common.refusedSuccess'))
     await getList()
-  } catch {}finally{
+  } catch {
+  } finally {
     tableObject.loading = false
   }
 }
@@ -655,7 +681,8 @@ const handleHandle = async (id: number) => {
     await PurchasereturnRequestMainApi.handlePurchasereturnRequestMain(id)
     message.success(t('common.handleSuccess'))
     await getList()
-  } catch {}finally{
+  } catch {
+  } finally {
     tableObject.loading = false
   }
 }
@@ -680,7 +707,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await PurchasereturnRequestMainApi.exportPurchasereturnRequestMain(tableObject.params)
+    const data = await PurchasereturnRequestMainApi.exportPurchasereturnRequestMain(
+      tableObject.params
+    )
     download.excel(data, '采购退货申请主.xlsx')
   } catch {
   } finally {
@@ -698,15 +727,15 @@ PurchasereturnRequestDetail.allSchemas.tableFormColumns.forEach((item) => {
 const tableData = ref([])
 const originTableData = ref([])
 
-
 const searchTableRef = ref()
 // 添加明细
 const handleAddTable = () => {
-  
-  const subTableDFata = originTableData.value.filter(item=> !tableData.value.find(item1=>item1.id == item.id))
-  if(subTableDFata.length==0){
+  const subTableDFata = originTableData.value.filter(
+    (item) => !tableData.value.find((item1) => item1.id == item.id)
+  )
+  if (subTableDFata.length == 0) {
     message.warning('暂无可选择数据!')
-    return 
+    return
   }
 
   const tableObject = {
@@ -718,7 +747,7 @@ const handleAddTable = () => {
     loading: false,
     // 页数
     pageSize: subTableDFata.length,
-    params:null,
+    params: null,
     // 排序
     sort: {
       order: '', // 排序规则
@@ -728,7 +757,7 @@ const handleAddTable = () => {
     total: subTableDFata.length,
     // 表格数据
     tableList: subTableDFata,
-    currentRow:null
+    currentRow: null
   }
 
   const tableColumns = PurchasereturnRequestDetail.allSchemas.tableFormColumns
@@ -736,7 +765,7 @@ const handleAddTable = () => {
     item.width = item.table?.width || 150
   })
 
-  searchTableRef.value.openData("采购收货记录单号",tableObject,{tableColumns},true)
+  searchTableRef.value.openData('采购收货记录单号', tableObject, { tableColumns }, true)
   // searchTableRef.value.open(
   //   ('供应商信息',
   //   // _searchTableAllSchemas,
@@ -750,7 +779,6 @@ const handleAddTable = () => {
   //   )
   // )
 
-  
   // console.log(subTableDFata)
   // const {tableObject, tableMethods } = useTable({
   //   getListApi: getPage.value // 分页接口
@@ -799,12 +827,12 @@ const handleAddTable = () => {
 }
 const searchTableSuccess1 = (formField, searchField, val, formRef, type, row) => {
   console.log(val)
-  tableData.value = [...tableData.value,...val]
+  tableData.value = [...tableData.value, ...val]
 }
 // 删除明细
 const handleDeleteTable = (item, index, formRef) => {
   let itemIndex = tableData.value.indexOf(item)
-  if(itemIndex>-1){
+  if (itemIndex > -1) {
     tableData.value.splice(itemIndex, 1)
   }
   if (tableData.value.length == 0) {
@@ -814,11 +842,10 @@ const handleDeleteTable = (item, index, formRef) => {
         item.componentProps.disabled = false
       }
     })
-    
   }
 }
 const tableSelectionDelete = (selection) => {
-  tableData.value = tableData.value.filter(item => !selection.includes(item))
+  tableData.value = tableData.value.filter((item) => !selection.includes(item))
   if (tableData.value.length == 0) {
     isShowButton.value = true
     PurchasereturnRequestMain.allSchemas.formSchema.forEach((item) => {
@@ -837,31 +864,31 @@ const tableSelectionDelete = (selection) => {
 
 // 主子数据 提交
 const submitForm = async (formType, submitData) => {
-  let data = {...submitData}
-  if(data.masterId){
+  let data = { ...submitData }
+  if (data.masterId) {
     data.id = data.masterId
   }
-  console.log('submitForm',tableData.value)
+  console.log('submitForm', tableData.value)
   // if(tableData.value.find(item=>Number(item.returnedQty)>Number(item.receiptQty))){
   //   message.warning("退货数量不能大于收获数量")
   //   return;
   // }
-  if(tableData.value.find(item=>Number(item.qty)>Number(item.inventoryBalance))){
-    message.warning("退货数量不能大于库存余额")
-    return;
+  if (tableData.value.find((item) => Number(item.qty) > Number(item.inventoryBalance))) {
+    message.warning('退货数量不能大于库存余额')
+    return
   }
   data.subList = tableData.value // 拼接子表数据参数
   try {
     if (formType === 'create') {
-      let flag = false;
+      let flag = false
       data.subList.forEach((item) => {
-          if(item.qty == 0){
-            message.warning("数量不能为0")
-            flag = true;
-            return;
-          }
+        if (item.qty == 0) {
+          message.warning('数量不能为0')
+          flag = true
+          return
+        }
       })
-      if(flag){
+      if (flag) {
         formRef.value.formLoading = false
         return
       }
@@ -881,14 +908,14 @@ const submitForm = async (formType, submitData) => {
 
 // 子表新增/编辑校验
 const detailValidate = (data) => {
-  let tag = false;
-  if(data.qty <= 0){
+  let tag = false
+  if (data.qty <= 0) {
     message.warning('数量必须大于0')
-    tag = false;
-    return tag;
-  }else {
-    tag = true;
-    return tag;
+    tag = false
+    return tag
+  } else {
+    tag = true
+    return tag
   }
 }
 
@@ -918,26 +945,26 @@ const searchFormClick = (searchData) => {
   getList() // 刷新当前列表
 }
 
-const detailOpenForm = (type, row) =>{
-  console.log("type",type);
-  console.log("row",row);
-  console.log("AAAAAA",purchaseReceiptRecordNumberRef.value);
+const detailOpenForm = (type, row) => {
+  console.log('type', type)
+  console.log('row', row)
+  console.log('AAAAAA', purchaseReceiptRecordNumberRef.value)
   PurchasereturnRequestDetail.allSchemas.tableFormColumns.map((item) => {
-    if(purchaseReceiptRecordNumberRef.value == ''){
+    if (purchaseReceiptRecordNumberRef.value == '') {
       if (item.field == 'itemCode') {
         item.form.componentProps.disabled = true
         item.form.componentProps.isSearchList = true
       }
-      if(item.field == 'poLine'){
+      if (item.field == 'poLine') {
         item.form.componentProps.disabled = true
         item.form.componentProps.isSearchList = false
       }
-    }else{
+    } else {
       if (item.field == 'itemCode') {
         item.form.componentProps.disabled = true
         item.form.componentProps.isSearchList = false
       }
-      if(item.field == 'poLine'){
+      if (item.field == 'poLine') {
         item.form.componentProps.disabled = true
         item.form.componentProps.isSearchList = true
       }
@@ -945,7 +972,6 @@ const detailOpenForm = (type, row) =>{
   })
 }
 
-
 const BASE_URL = getJmreportBaseUrl()
 const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
 
@@ -953,38 +979,40 @@ const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAcces
 const showLabelRef = ref()
 const labelPrint = async (row) => {
   tableObject.loading = true
-  const defaultParams = {'moduleName':'purchasereturn','recordNumber':row.number}
-  const {tableObject:tableObjectPrint ,tableMethods} = useTable({
+  const defaultParams = { moduleName: 'purchasereturn', 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 || 150
   })
-  showLabelRef.value.openData("标签信息",tableObjectPrint,{tableColumns},true)
+  showLabelRef.value.openData('标签信息', tableObjectPrint, { tableColumns }, true)
 }
 
 // 批量打印---采购收货申请
 const showLabelSuccess = async (formField, searchField, val, formRef, type, row) => {
-  console.log('批量打印',val)
-  
-  if(val.length == 0){
-    message.warning("请先选择要打印的数据!")
+  console.log('批量打印', val)
+
+  if (val.length == 0) {
+    message.warning('请先选择要打印的数据!')
     return
   }
-  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('创建标签失败')
-  })
+    })
+    .catch((err) => {
+      console.log(err)
+      message.error('创建标签失败')
+    })
 }
 
 /** 初始化 **/
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index 12e3371d4..8bdd03730 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,512 +21,507 @@ 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} 供应商发货申请主表
  */
-export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 180,
-      fixed: 'left'
-    },
-    isForm: false,
-    isSearch: true,
-  },
-  {
-    label: '供应商代码',
-    field: 'supplierCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:2,
-    isSearch: true,
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        enterSearch: true,
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '供应商信息', // 查询弹窗标题
-        searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
-        searchPage: SupplierApi.getSupplierPageSCP // 查询弹窗所需分页方法
+export const SupplierdeliverRequestMain = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '单据号',
+      field: 'number',
+      sort: 'custom',
+      table: {
+        width: 180,
+        fixed: 'left'
+      },
+      isForm: false,
+      isSearch: true
+    },
+    {
+      label: '供应商代码',
+      field: 'supplierCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 2,
+      isSearch: true,
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+          searchField: 'code', // 查询弹窗赋值字段
+          searchTitle: '供应商信息', // 查询弹窗标题
+          searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
+          searchPage: SupplierApi.getSupplierPageSCP // 查询弹窗所需分页方法
+        }
       }
-    }
-  },
-  {
-    label: '发货单号',
-    field: 'asnNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch: true,
-    isForm: true
-  },
-  {
-    label: '要货计划单号',
-    field: 'ppNumber',
-    sort: 'custom',
-    isTable:true,
-    table: {
-      width: 150
-    },
-    sortTableDefault:1,
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        dialogWidth:'1055px',//搜索出来弹窗的宽度
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择要货计划单号', // 输入框占位文本
-        searchField: 'number', // 查询弹窗赋值字段
-        searchTitle: '要货计划信息', // 查询弹窗标题
-        searchAllSchemas: PurchasePlanDetail.allSchemas, // 查询弹窗所需类
-        searchPage: PurchasePlanDetailApi.getPurchasePlanDetailPage, // 查询弹窗所需分页方法
-        searchCondition: [
-          {
-            key: 'supplierCode',
-            value: 'supplierCode',
-            message: '请填写供应商代码！',
-            isMainValue: true
-          },
-          {
-            key: 'status',
-            value: 4,
-            isMainValue: false
-          },
-          {
-            key: 'available',
-            value: "TRUE",
-            isMainValue: false
-          }]
+    },
+    {
+      label: '发货单号',
+      field: 'asnNumber',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true,
+      isForm: true
+    },
+    {
+      label: '要货计划单号',
+      field: 'ppNumber',
+      sort: 'custom',
+      isTable: true,
+      table: {
+        width: 150
+      },
+      sortTableDefault: 1,
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          dialogWidth: '1055px', //搜索出来弹窗的宽度
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择要货计划单号', // 输入框占位文本
+          searchField: 'number', // 查询弹窗赋值字段
+          searchTitle: '要货计划信息', // 查询弹窗标题
+          searchAllSchemas: PurchasePlanDetail.allSchemas, // 查询弹窗所需类
+          searchPage: PurchasePlanDetailApi.getPurchasePlanDetailPage, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'supplierCode',
+              value: 'supplierCode',
+              message: '请填写供应商代码！',
+              isMainValue: true
+            },
+            {
+              key: 'status',
+              value: 4,
+              isMainValue: false
+            },
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            }
+          ]
+        }
       }
-    }
-  },
-  {
-    label: '联系人姓名',
-    field: 'contactName',
-    sort: 'custom',
-    isTable:false,
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '联系人电话',
-    field: 'contactPhone',
-    sort: 'custom',
-    isTable:false,
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '联系人电子邮件',
-    field: 'contactEmail',
-    sort: 'custom',
-    isTable:false,
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '供应商发货仓库代码',
-    field: 'fromWarehouseCode',
-    sort: 'custom',
-    isTable:false,
-    table: {
-      width: 150
-    },
-    form: {
-      componentProps: {
-        disbaled: true
+    },
+    {
+      label: '联系人姓名',
+      field: 'contactName',
+      sort: 'custom',
+      isTable: false,
+      table: {
+        width: 150
       }
     },
-    isForm: true
-  },
-  {
-    label: '到仓库代码',
-    field: 'toWarehouseCode',
-    sort: 'custom',
-    isTable:false,
-    table: {
-      width: 150
-    },
-    isForm: false
-  },
-  {
-    label: '到月台代码',
-    field: 'toDockCode',
-    sort: 'custom',
-    isTable:false,
-    table: {
-      width: 150
-    },
-    isForm: false
-  },
-  {
-    label: '时间窗口',
-    field: 'timeWindow',
-    sort: 'custom',
-    isTable:false,
-    table: {
-      width: 150
-    },
-    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: 'contactPhone',
+      sort: 'custom',
+      isTable: false,
+      table: {
+        width: 150
       }
     },
-  },
-  {
-    label: '承运商',
-    field: 'carrierCode',
-    sort: 'custom',
-    isTable:false,
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '运输方式',
-    field: 'transferMode',
-    dictType: DICT_TYPE.TRANSFER_MODE,
-    sort: 'custom',
-    isTable:false,
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '车牌号',
-    field: 'vehiclePlateNumber',
-    sort: 'custom',
-    isTable:false,
-    table: {
-      width: 150
-    },
-  },
-  // {
-  //   label: '业务类型',
-  //   field: 'businessType',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   form: {
-  //     value: 'SupplierDeliver',
-  //     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',
-    isTable:false,
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: { width: '100%' },
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '联系人电子邮件',
+      field: 'contactEmail',
+      sort: 'custom',
+      isTable: false,
+      table: {
+        width: 150
       }
     },
-    isForm: false
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    isTable:false,
-    table: {
-      width: 150
-    },
-    isForm: false
-  },
-  {
-    label: '申请时间',
-    field: 'requestTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    isTable:false,
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: { width: '100%' },
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '供应商发货仓库代码',
+      field: 'fromWarehouseCode',
+      sort: 'custom',
+      isTable: false,
+      table: {
+        width: 150
+      },
+      form: {
+        componentProps: {
+          disbaled: true
+        }
+      },
+      isForm: true
+    },
+    {
+      label: '到仓库代码',
+      field: 'toWarehouseCode',
+      sort: 'custom',
+      isTable: false,
+      table: {
+        width: 150
+      },
+      isForm: false
+    },
+    {
+      label: '到月台代码',
+      field: 'toDockCode',
+      sort: 'custom',
+      isTable: false,
+      table: {
+        width: 150
+      },
+      isForm: false
+    },
+    {
+      label: '时间窗口',
+      field: 'timeWindow',
+      sort: 'custom',
+      isTable: false,
+      table: {
+        width: 150
+      },
+      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'
+        }
       }
     },
-    isForm: false
-  },
-  {
-    label: '截止时间',
-    field: 'dueTime',
-    formatter: dateFormatter,
-    detaul: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    isTable:false,
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: { width: '100%' },
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '承运商',
+      field: 'carrierCode',
+      sort: 'custom',
+      isTable: false,
+      table: {
+        width: 150
       }
     },
-    isForm: false
-  },
-  // {
-  //   label: '部门',
-  //   field: 'departmentCode',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-  //     return userDeptArray.find((account) => account.id == cellValue)?.name
-  //   },
-  //   form: {
-  //     value: userDept.id,
-  //     component: 'Select',
-  //     api: () => userDeptArray,
-  //     componentProps: {
-  //       disabled: true,
-  //       optionsAlias: {
-  //         labelField: 'name',
-  //         valueField: 'id'
-  //       }
-  //     }
-  //   }
-  // },
-  {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.REQUEST_STATUS,
-    dictClass: 'string',
-    isTable: true,
-    isForm:false,
-    isSearch: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      value: '1',
-      componentProps: {
-        disabled: true
+    {
+      label: '运输方式',
+      field: 'transferMode',
+      dictType: DICT_TYPE.TRANSFER_MODE,
+      sort: 'custom',
+      isTable: false,
+      table: {
+        width: 150
       }
-    }
-  },
-  {
-    label: '最后更新时间',
-    field: 'updateTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    isTable:false,
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: { width: '100%' },
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    },
+    {
+      label: '车牌号',
+      field: 'vehiclePlateNumber',
+      sort: 'custom',
+      isTable: false,
+      table: {
+        width: 150
       }
     },
-    isForm: false
-  },
-  {
-    label: '最后更新者',
-    field: 'updater',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    isForm: false
-  },
-  {
-    label: '自动提交',
-    field: 'autoCommit',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable:false,
-    sort: 'custom',
-    isForm:false,
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.autoCommit,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true,
+    // {
+    //   label: '业务类型',
+    //   field: 'businessType',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   form: {
+    //     value: 'SupplierDeliver',
+    //     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',
+      isTable: false,
+      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: 'creator',
+      sort: 'custom',
+      isTable: false,
+      table: {
+        width: 150
+      },
+      isForm: false
+    },
+    {
+      label: '申请时间',
+      field: 'requestTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      isTable: false,
+      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: 'dueTime',
+      formatter: dateFormatter,
+      detaul: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      isTable: false,
+      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: 'departmentCode',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+    //     return userDeptArray.find((account) => account.id == cellValue)?.name
+    //   },
+    //   form: {
+    //     value: userDept.id,
+    //     component: 'Select',
+    //     api: () => userDeptArray,
+    //     componentProps: {
+    //       disabled: true,
+    //       optionsAlias: {
+    //         labelField: 'name',
+    //         valueField: 'id'
+    //       }
+    //     }
+    //   }
+    // },
+    {
+      label: '状态',
+      field: 'status',
+      dictType: DICT_TYPE.REQUEST_STATUS,
+      dictClass: 'string',
+      isTable: true,
+      isForm: false,
+      isSearch: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        value: '1',
+        componentProps: {
+          disabled: true
+        }
       }
-    }
-  },
-  {
-    label: '自动通过',
-    field: 'autoAgree',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm:false,
-    form: {
-      component: 'Switch',
-      value: requestsettingData.autoAgree,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true,
+    },
+    {
+      label: '最后更新时间',
+      field: 'updateTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      isTable: false,
+      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: 'updater',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      isForm: false
+    },
+    {
+      label: '自动提交',
+      field: 'autoCommit',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      isForm: false,
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: requestsettingData.autoCommit,
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE',
+          disabled: true
+        }
       }
-    }
-  },
-  {
-    label: '自动执行',
-    field: 'autoExecute',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm:false,
-    form: {
-      component: 'Switch',
-      value: requestsettingData.autoExecute,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true,
+    },
+    {
+      label: '自动通过',
+      field: 'autoAgree',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isForm: false,
+      form: {
+        component: 'Switch',
+        value: requestsettingData.autoAgree,
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE',
+          disabled: true
+        }
       }
-    }
-  },
-  {
-    label: '直接生成记录',
-    field: 'directCreateRecord',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isForm: false,
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.directCreateRecord,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true,
+    },
+    {
+      label: '自动执行',
+      field: 'autoExecute',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isForm: false,
+      form: {
+        component: 'Switch',
+        value: requestsettingData.autoExecute,
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE',
+          disabled: true
+        }
       }
-    }
-  },
-  {
-    label: '操作',
-    field: 'action',
-    isDetail: false,
-    isForm: false,
-    table: {
-      width: 450,
-      fixed: 'right'
     },
-  }
-]))
+    {
+      label: '直接生成记录',
+      field: 'directCreateRecord',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isForm: false,
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: requestsettingData.directCreateRecord,
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE',
+          disabled: true
+        }
+      }
+    },
+    {
+      label: '操作',
+      field: 'action',
+      isDetail: false,
+      isForm: false,
+      table: {
+        width: 450,
+        fixed: 'right'
+      }
+    }
+  ])
+)
 
 //表单校验
 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' }
@@ -535,36 +530,20 @@ 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' }
   // ],
@@ -573,19 +552,42 @@ 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,
+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: '要货计划信息',
@@ -603,494 +605,473 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
             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
-        }]
-    }
-  },
-  {
-    label: '订单行',
-    field: 'poLine',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      componentProps: {
+    {
+      label: '订单行',
+      field: 'poLine',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
+      tableForm: {
         disabled: true
       }
     },
-    tableForm: {
-      disabled: true
-    }
-  },
-  {
-    label: '物料代码',
-    field: 'itemCode',
-    sort: 'custom',
-    isSearch:true,
-    table: {
-      width: 150
-    },
-    sortTableDefault:2,
-    form: {
-      componentProps: {
+    {
+      label: '物料代码',
+      field: 'itemCode',
+      sort: 'custom',
+      isSearch: true,
+      table: {
+        width: 150
+      },
+      sortTableDefault: 2,
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
+      tableForm: {
         disabled: true
       }
     },
-    tableForm: {
-      disabled: true
-    }
-  },
-  {
-    label: '批次',
-    field: 'batch',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    tableForm: {
-      disabled: true
-    }
-  },
-  {
-    label: '供应商批次',
-    field: 'supplierBatch',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: false
-    }
-  },
-  {
-    label: '生产日期',
-    field: 'produceDate',
-    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',
+    {
+      label: '批次',
+      field: 'batch',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true,
+      tableForm: {
+        disabled: true
       }
     },
-    tableForm: {
-      type: 'FormDate',
-      dateFormat: 'YYYY-MM-DD',
-      valueFormat: 'x',
-    }
-  },
-  
-  // {
-  //   label: '替代批次',
-  //   field: 'altBatch',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   isTableForm: false,
-  //   isForm: false
-  // },
-  {
-    label: '到货日期',
-    field: 'arriveDate',
-    formatter: dateFormatter2,
-    detail: {
-      dateFormat: 'YYYY-MM-DD'
-    },
-    sort: 'custom',
-    hiddenInMain:true,
-    table: {
-      width: 180
-    },
-    isForm: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width: '100%'},
-        type: 'date',
+    {
+      label: '供应商批次',
+      field: 'supplierBatch',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      tableForm: {
+        disabled: false
+      }
+    },
+    {
+      label: '生产日期',
+      field: 'produceDate',
+      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',
+        valueFormat: 'x'
       }
     },
-    
-    isTableForm: false,
-    tableForm: {
-      type: 'FormDate',
-      dateFormat: 'YYYY-MM-DD',
-      valueFormat: 'x',
-    }
-  },
-  {
-    label: '过期日期',
-    hiddenInMain:true,
-    field: 'expireDate',
-    formatter: dateFormatter2,
-    detail: {
-      dateFormat: 'YYYY-MM-DD'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width: '100%'},
-        type: 'date',
+
+    // {
+    //   label: '替代批次',
+    //   field: 'altBatch',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   isTableForm: false,
+    //   isForm: false
+    // },
+    {
+      label: '到货日期',
+      field: 'arriveDate',
+      formatter: dateFormatter2,
+      detail: {
+        dateFormat: 'YYYY-MM-DD'
+      },
+      sort: 'custom',
+      hiddenInMain: true,
+      table: {
+        width: 180
+      },
+      isForm: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'date',
+          dateFormat: 'YYYY-MM-DD',
+          valueFormat: 'x'
+        }
+      },
+
+      isTableForm: false,
+      tableForm: {
+        type: 'FormDate',
         dateFormat: 'YYYY-MM-DD',
-        valueFormat: 'x',
+        valueFormat: 'x'
       }
     },
-    // tableForm: {
-    //   type: 'FormDate',
-    //   dateFormat: 'YYYY-MM-DD',
-    //   valueFormat: 'x',
-    // }
-    tableForm:{
-      type: 'slot',
-      disabled: true
-    }
-  },
-  {
-    label: '发货数量',
-    field: 'qty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:2,
-    form: {
-      component: 'InputNumber',
-      componentProps: {
+    {
+      label: '过期日期',
+      hiddenInMain: true,
+      field: 'expireDate',
+      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',
+      // }
+      tableForm: {
+        type: 'slot',
+        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
       }
     },
-    tableForm: {
-      type: 'InputNumber',
-      min: 1,
-      precision: 6
-    }
-  },
-  {
-    label: '订单数量',
-    field: 'orderQty',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    form: {
-      component: 'InputNumber',
-      componentProps: {
+    {
+      label: '订单数量',
+      field: 'orderQty',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true,
+      form: {
+        component: 'InputNumber',
+        componentProps: {
+          disabled: true,
+          min: 0,
+          precision: 6
+        }
+      },
+      tableForm: {
         disabled: true,
+        type: 'InputNumber',
         min: 0,
         precision: 6
       }
     },
-    tableForm: {
-      disabled: true,
-      type: 'InputNumber',
-      min: 0,
-      precision: 6
-    }
-  },
-  
-  {
-    label: '供应商计量数量',
-    field: 'supplierPackQty',
-    sort: 'custom',
-    hiddenInMain:true,
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
+
+    {
+      label: '供应商计量数量',
+      field: 'supplierPackQty',
+      sort: 'custom',
+      hiddenInMain: true,
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'InputNumber',
+        componentProps: {
+          min: 1,
+          precision: 6
+        }
+      },
+      isTableForm: false,
+      isForm: false,
+      tableForm: {
+        type: 'InputNumber',
         min: 1,
         precision: 6
       }
     },
-    isTableForm: false,
-    isForm: false,
-    tableForm: {
-      type: 'InputNumber',
-      min: 1,
-      precision: 6
-    }
-  },
-  {
-    label: '供应商计量单位',
-    field: 'supplierPackUnit',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    hiddenInMain:true,
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false,
-    tableForm: {
-      type: 'Select'
-    }
-  },
-  {
-    label: '转换率',
-    hiddenInMain:true,
-    field: 'convertRate',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
+    {
+      label: '供应商计量单位',
+      field: 'supplierPackUnit',
+      dictType: DICT_TYPE.UOM,
+      dictClass: 'string',
+      hiddenInMain: true,
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTableForm: false,
+      isForm: false,
+      tableForm: {
+        type: 'Select'
+      }
+    },
+    {
+      label: '转换率',
+      hiddenInMain: true,
+      field: 'convertRate',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'InputNumber',
+        componentProps: {
+          min: 0
+        }
+      },
+      isTableForm: false,
+      isForm: false,
+      tableForm: {
+        type: 'InputNumber',
         min: 0
       }
     },
-    isTableForm: false,
-    isForm: false,
-    tableForm: {
-      type: 'InputNumber',
-      min: 0
-    }
-  },
-  {
-    label: '单据号',
-    hiddenInMain:true,
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTableForm: false,
-    form: {
-      componentProps: {
-        disabled: true
+    {
+      label: '单据号',
+      hiddenInMain: true,
+      field: 'number',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTableForm: false,
+      form: {
+        componentProps: {
+          disabled: true
+        }
       }
-    }
-  },
-  
-  {
-    label: '计量单位',
-    field: 'uom',
-    sort: 'custom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    sortTableDefault:3,
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true,
-      type: 'Select'
-    }
-  },
-  
-  {
-    label: '从货主代码',
-    field: 'fromOwnerCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '到货主代码',
-    field: 'toOwnerCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '物料名称',
-    field: 'itemName',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '物料描述1',
-    field: 'itemDesc1',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '物料描述2',
-    field: 'itemDesc2',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '项目代码',
-    field: 'projectCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    hiddenInMain:true,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: { width: '100%' },
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    },
+
+    {
+      label: '计量单位',
+      field: 'uom',
+      sort: 'custom',
+      dictType: DICT_TYPE.UOM,
+      dictClass: 'string',
+      isTable: true,
+      sortTableDefault: 3,
+      table: {
+        width: 150
+      },
+      tableForm: {
+        disabled: true,
+        type: 'Select'
       }
     },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTableForm: false,
-    isForm: false,
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false,
-  },
-  {
-    label: '最后更新时间',
-    field: 'updateTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: { width: '100%' },
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+
+    {
+      label: '从货主代码',
+      field: 'fromOwnerCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true,
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '到货主代码',
+      field: 'toOwnerCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true,
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '物料名称',
+      field: 'itemName',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true,
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '物料描述1',
+      field: 'itemDesc1',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true,
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '物料描述2',
+      field: 'itemDesc2',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true,
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '项目代码',
+      field: 'projectCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true,
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '创建时间',
+      field: 'createTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      hiddenInMain: true,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '创建者',
+      field: 'creator',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true,
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '最后更新时间',
+      field: 'updateTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      },
+      hiddenInMain: true,
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '最后更新者',
+      field: 'updater',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true,
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '备注',
+      field: 'remark',
+      sort: 'custom',
+      hiddenInMain: true,
+      table: {
+        width: 150
       }
     },
-    hiddenInMain:true,
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTableForm: false,
-    isForm: false,
-  },
-  {
-    label: '最后更新者',
-    field: 'updater',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false,
-  },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    hiddenInMain:true,
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '操作',
-    hiddenInMain:true,
-    field: 'action',
-    isDetail: false,
-    isForm: false,
-    table: {
-      width: 180,
-      fixed: 'right'
-    },
-    isTableForm: false,
-  }
-]))
+    {
+      label: '操作',
+      hiddenInMain: true,
+      field: 'action',
+      isDetail: false,
+      isForm: false,
+      table: {
+        width: 180,
+        fixed: 'right'
+      },
+      isTableForm: false
+    }
+  ])
+)
 
 // 批次校验
 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()
+    }
   }
 }
 //表单校验
@@ -1098,173 +1079,178 @@ export const SupplierdeliverRequestDetailRules = reactive({
   // packingNumber: [
   //   { required: true, message: '请输入包装号', trigger: 'blur' }
   // ],
-  qty:[
-    { required: true, message: '请输入发货数量', trigger: 'change' },
-  ],
+  qty: [{ required: true, message: '请输入发货数量', 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' }
-  ],
-  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' }
+    { 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' }],
   secondPackQty: [
-    { 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' }
+    { 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' }]
   // secondPackQty:[{ validator:validateInteger, message: '请输入正确的整数', trigger: 'blur'}]
 })
 
-export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '批次',
-    field: 'batch',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true
-    }
-  },
-  {
-    label: '生产日期',
-    field: 'produceDate',
-    formatter: dateFormatter2,
-    detail: {
-      dateFormat: 'YYYY-MM-DD'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        disabled:true,
-        style: {width: '100%'},
-        type: 'date',
+export const SupplierdeliverRequestDetailLabel = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '批次',
+      field: 'batch',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      tableForm: {
+        disabled: true
+      }
+    },
+    {
+      label: '生产日期',
+      field: 'produceDate',
+      formatter: dateFormatter2,
+      detail: {
+        dateFormat: 'YYYY-MM-DD'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          disabled: true,
+          style: { width: '100%' },
+          type: 'date',
+          dateFormat: 'YYYY-MM-DD',
+          valueFormat: 'x'
+        }
+      },
+      tableForm: {
+        disabled: true,
+        type: 'FormDate',
         dateFormat: 'YYYY-MM-DD',
-        valueFormat: 'x',
-        
+        valueFormat: 'x'
       }
     },
-    tableForm: {
-      disabled:true,
-      type: 'FormDate',
-      dateFormat: 'YYYY-MM-DD',
-      valueFormat: 'x',
-    }
-  },
-  // {
-  //   label: '替代批次',
-  //   field: 'altBatch',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   isTableForm: false,
-  //   isForm: false,
-  //   tableForm:{
-  //     disabled:true
-  //   }
-  // },
-  {
-    label: '到货日期',
-    field: 'arriveDate',
-    formatter: dateFormatter2,
-    detail: {
-      dateFormat: 'YYYY-MM-DD'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isForm: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        disabled:true,
-        style: {width: '100%'},
-        type: 'date',
+    // {
+    //   label: '替代批次',
+    //   field: 'altBatch',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   isTableForm: false,
+    //   isForm: false,
+    //   tableForm:{
+    //     disabled:true
+    //   }
+    // },
+    {
+      label: '到货日期',
+      field: 'arriveDate',
+      formatter: dateFormatter2,
+      detail: {
+        dateFormat: 'YYYY-MM-DD'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isForm: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          disabled: true,
+          style: { width: '100%' },
+          type: 'date',
+          dateFormat: 'YYYY-MM-DD',
+          valueFormat: 'x'
+        }
+      },
+      isTableForm: false,
+      tableForm: {
+        disabled: true,
+        type: 'FormDate',
         dateFormat: 'YYYY-MM-DD',
-        valueFormat: 'x',
+        valueFormat: 'x'
       }
     },
-    isTableForm: false,
-    tableForm: {
-      disabled:true,
-      type: 'FormDate',
-      dateFormat: 'YYYY-MM-DD',
-      valueFormat: 'x',
-    }
-  },
-  {
-    label: '过期日期',
-    field: 'expireDate',
-    formatter: dateFormatter2,
-    detail: {
-      dateFormat: 'YYYY-MM-DD',
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        disabled:true,
-        style: {width: '100%'},
-        type: 'date',
+    {
+      label: '过期日期',
+      field: 'expireDate',
+      formatter: dateFormatter2,
+      detail: {
+        dateFormat: 'YYYY-MM-DD'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          disabled: true,
+          style: { width: '100%' },
+          type: 'date',
+          dateFormat: 'YYYY-MM-DD',
+          valueFormat: 'x'
+        }
+      },
+      tableForm: {
+        disabled: true,
+        type: 'FormDate',
         dateFormat: 'YYYY-MM-DD',
-        valueFormat: 'x',
+        valueFormat: 'x'
       }
     },
-    tableForm: {
-      disabled:true,
-      type: 'FormDate',
-      dateFormat: 'YYYY-MM-DD',
-      valueFormat: 'x',
-    }
-  },
-  {
-    label: '订单号',
-    field: 'poNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        disabled:true,
-        isSearchList: false,
+    {
+      label: '订单号',
+      field: 'poNumber',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          disabled: true,
+          isSearchList: false,
+          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: false,
+        disabled: true,
         searchListPlaceholder: '请选择订单号',
         searchField: 'number',
         searchTitle: '要货计划信息',
@@ -1282,212 +1268,212 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
             value: 'TRUE',
             isMainValue: false
           }
-
         ]
       }
     },
-    tableForm: {
-      isInpuFocusShow: false,
-      disabled: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
-        }]
-    }
-  },
-  {
-    label: '订单行',
-    field: 'poLine',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      componentProps: {
+    {
+      label: '订单行',
+      field: 'poLine',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
+      tableForm: {
         disabled: true
       }
     },
-    tableForm: {
-      disabled: true
-    }
-  },
-  {
-    label: '订单数量',
-    field: 'orderQty',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
+    {
+      label: '订单数量',
+      field: 'orderQty',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'InputNumber',
+        componentProps: {
+          disabled: true,
+          min: 0,
+          precision: 6
+        }
+      },
+      tableForm: {
         disabled: true,
+        type: 'InputNumber',
         min: 0,
         precision: 6
       }
     },
-    tableForm: {
-      disabled: true,
-      type: 'InputNumber',
-      min: 0,
-      precision: 6
-    }
-  },
-  
-  {
-    label: '供应商计量数量',
-    field: 'supplierPackQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        disabled:true,
+
+    {
+      label: '供应商计量数量',
+      field: 'supplierPackQty',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'InputNumber',
+        componentProps: {
+          disabled: true,
+          min: 1,
+          precision: 6
+        }
+      },
+      isTableForm: false,
+      isForm: false,
+      tableForm: {
+        disabled: true,
+        type: 'InputNumber',
         min: 1,
         precision: 6
       }
     },
-    isTableForm: false,
-    isForm: false,
-    tableForm: {
-      disabled:true,
-      type: 'InputNumber',
-      min: 1,
-      precision: 6
-    }
-  },
-  {
-    label: '供应商计量单位',
-    field: 'supplierPackUnit',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false,
-    tableForm: {
-      disabled:true,
-      type: 'Select'
-    }
-  },
-  {
-    label: '转换率',
-    field: 'convertRate',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
+    {
+      label: '供应商计量单位',
+      field: 'supplierPackUnit',
+      dictType: DICT_TYPE.UOM,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTableForm: false,
+      isForm: false,
+      tableForm: {
+        disabled: true,
+        type: 'Select'
+      }
+    },
+    {
+      label: '转换率',
+      field: 'convertRate',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'InputNumber',
+        componentProps: {
+          min: 0
+        }
+      },
+      isTableForm: false,
+      isForm: false,
+      tableForm: {
+        disabled: true,
+        type: 'InputNumber',
         min: 0
       }
     },
-    isTableForm: false,
-    isForm: false,
-    tableForm: {
-      disabled:true,
-      type: 'InputNumber',
-      min: 0
-    }
-  },
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTableForm: false,
-    form: {
-      componentProps: {
-        disabled: true
+    {
+      label: '单据号',
+      field: 'number',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTableForm: false,
+      form: {
+        componentProps: {
+          disabled: true
+        }
       }
-    }
-  },
-  {
-    label: '物料代码',
-    field: 'itemCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      componentProps: {
+    },
+    {
+      label: '物料代码',
+      field: 'itemCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
+      tableForm: {
         disabled: true
       }
     },
-    tableForm: {
-      disabled: true
-    }
-  },
-  {
-    label: '计量单位',
-    field: 'uom',
-    sort: 'custom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isSearch: true,
-    isTable: true,
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled:true,
-      type: 'Select'
-    }
-  },
-  {
-    label: '数量',
-    field: 'qty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        disabled:true,
+    {
+      label: '计量单位',
+      field: 'uom',
+      sort: 'custom',
+      dictType: DICT_TYPE.UOM,
+      dictClass: 'string',
+      isSearch: true,
+      isTable: true,
+      table: {
+        width: 150
+      },
+      tableForm: {
+        disabled: true,
+        type: 'Select'
+      }
+    },
+    {
+      label: '数量',
+      field: 'qty',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'InputNumber',
+        componentProps: {
+          disabled: true,
+          min: 1,
+          precision: 6
+        }
+      },
+      tableForm: {
+        disabled: true,
+        type: 'InputNumber',
         min: 1,
         precision: 6
       }
     },
-    tableForm: {
-      disabled:true,
-      type: 'InputNumber',
-      min: 1,
-      precision: 6
-    }
-  },
-  {
-    label: '包装规格1',
-    field: 'packUnit',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150,
-      componentProps: {
+    {
+      label: '包装规格1',
+      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,
-        isSearchList: true,
+        isInpuFocusShow: true,
         searchListPlaceholder: '请选择包装',
-        searchField: 'packUnit',
+        searchField: 'itemCode',
         searchTitle: '物品包装信息',
         searchAllSchemas: Itempackaging.allSchemas,
         searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
@@ -1496,7 +1482,8 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
             key: 'itemCode',
             value: 'itemCode',
             message: '请选择订单行',
-            isMainValue: true
+            isTableRowValue: true,
+            isMainValue: false
           },
           {
             key: 'available',
@@ -1504,72 +1491,76 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
             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: {
+    {
+      label: '包装名称1',
+      field: 'packName',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
+      tableForm: {
         disabled: true
       }
     },
-    tableForm: {
-      disabled: true
-    }
-  },
-  {
-    label: '物料数量1',
-    field: 'packQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      componentProps: {
+    {
+      label: '物料数量1',
+      field: 'packQty',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'InputNumber',
+        componentProps: {
+          min: 0
+        }
+      },
+      tableForm: {
+        type: 'InputNumber',
+        min: 0
       }
     },
-    tableForm: {
-    }
-  },
-  {
-    label: '包装规格2',
-    field: 'secondPackUnit',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150,
-      componentProps: {
+    {
+      label: '包装规格2',
+      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,
-        isSearchList: true,
+        isInpuFocusShow: true,
         searchListPlaceholder: '请选择包装',
         searchField: 'packUnit',
         searchTitle: '物品包装信息',
@@ -1580,7 +1571,8 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
             key: 'itemCode',
             value: 'itemCode',
             message: '请选择订单行',
-            isMainValue: true
+            isTableRowValue: true,
+            isMainValue: false
           },
           {
             key: 'available',
@@ -1588,149 +1580,126 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
             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: {
+    {
+      label: '包装名称2',
+      field: 'secondPackName',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
+      tableForm: {
         disabled: true
       }
     },
-    tableForm: {
-      disabled: true
-    }
-  },
-  {
-    label: '物料数量2',
-    field: 'secondPackQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      componentProps: {
+    {
+      label: '物料数量2',
+      field: 'secondPackQty',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'InputNumber',
+        componentProps: {
+          min: 0
+        }
+      },
+      tableForm: {
+        type: 'InputNumber',
+        min: 0
       }
     },
-    tableForm: {
+    {
+      label: '物料名称',
+      field: 'itemName',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '物料描述1',
+      field: 'itemDesc1',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '物料描述2',
+      field: 'itemDesc2',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '项目代码',
+      field: 'projectCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTableForm: false,
+      isForm: false
     }
-  },
-  {
-    label: '物料名称',
-    field: 'itemName',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '物料描述1',
-    field: 'itemDesc1',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '物料描述2',
-    field: 'itemDesc2',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '项目代码',
-    field: 'projectCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false
-  },
-]))
+  ])
+)
 
-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: {
-    },
-  },
-
-]))
+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: {}
+    }
+  ])
+)

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 268/408] =?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 e336d617265864740e7e6660527f5007a8da2360 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Tue, 9 Jul 2024 19:57:56 +0800
Subject: [PATCH 269/408]  custom-hover1

---
 src/components/RouterSearch/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/RouterSearch/index.vue b/src/components/RouterSearch/index.vue
index 7c938dc02..f8b79ab99 100644
--- a/src/components/RouterSearch/index.vue
+++ b/src/components/RouterSearch/index.vue
@@ -17,7 +17,7 @@
       />
     </el-select> -->
   </ElDialog>
-  <div v-else class="custom-hover1" @click.stop="showTopSearch = !showTopSearch">
+  <div v-else class="custom-hover custom-hover1" @click.stop="showTopSearch = !showTopSearch">
     <Icon icon="ep:search" color="#ffffff"/>
     <el-select
       filterable

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 270/408] =?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 271/408] =?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 ea82f707f3ae6c1f15391a2867c6d710ffd1b788 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Wed, 10 Jul 2024 08:44:37 +0800
Subject: [PATCH 272/408] =?UTF-8?q?UI=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/directives/permission/clientTable.ts  | 2 +-
 src/layout/components/useRenderLayout.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/directives/permission/clientTable.ts b/src/directives/permission/clientTable.ts
index 7db98c0bd..b1c8b09ba 100644
--- a/src/directives/permission/clientTable.ts
+++ b/src/directives/permission/clientTable.ts
@@ -13,7 +13,7 @@ export function clientTable(app: App<Element>) {
       if(el.children&&el.children.length>1){
         paginationHeight = 70
       }
-      const height = window.innerHeight - top - paginationHeight - qustionHeight 
+      const height = window.innerHeight - top - paginationHeight - qustionHeight +5
       el.style.height = height + 'px'
       el.firstChild.style.height = '100%'
     })
diff --git a/src/layout/components/useRenderLayout.tsx b/src/layout/components/useRenderLayout.tsx
index 393d2e8c6..d0d705a23 100644
--- a/src/layout/components/useRenderLayout.tsx
+++ b/src/layout/components/useRenderLayout.tsx
@@ -39,7 +39,7 @@ const fixedMenu = computed(() => appStore.getFixedMenu)
 // 搜索图片
 const search = computed(() => appStore.search)
 const scrollBarHeight = computed(() => {
-  return (window.innerHeight - appStore.getCategoryMenuHeight - 85)+'px'
+  return (window.innerHeight - appStore.getCategoryMenuHeight - 35)+'px'
 })
 
 export const useRenderLayout = () => {

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 273/408] =?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 b63f49c6b38b82e12d094edb8374ad50c2d0b97f Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Wed, 10 Jul 2024 09:02:24 +0800
Subject: [PATCH 274/408] =?UTF-8?q?WMS=20=E2=80=94=E2=80=94>=20bug=20=20?=
 =?UTF-8?q?=E5=8F=91=E8=B4=A7=E8=AE=B0=E5=BD=95:=20=E5=8F=91=E8=B4=A7?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=8D=95=E5=8F=B7=E3=80=81=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=BA=94=E5=8E=BB=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deliver/deliverRecordMain/deliverRecordMain.data.ts     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts
index 9cef4876b..2192b55f1 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts
@@ -40,6 +40,9 @@ export const DeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
   },
   // {
   //   label: '发货计划单号',
@@ -63,8 +66,9 @@ export const DeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.REQUEST_STATUS,
     dictClass: 'string',
     isSearch: false,
-    isTable: true,
+    isTable: false,
     isForm: false,
+    isDetail:false,
     sort: 'custom',
     table: {
       width: 150

From e9b53bdcb49dde0a0e0bd333e4be60d66a408450 Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Wed, 10 Jul 2024 09:59:20 +0800
Subject: [PATCH 275/408] =?UTF-8?q?WMS=20=E2=80=94=E2=80=94>=20bug=20=20?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E5=8C=85=E8=A3=85=E4=BF=A1=E6=81=AF=20?=
 =?UTF-8?q?=E5=8C=85=E8=A3=85=E7=B1=BB=E5=9E=8B=E5=BA=94=E8=AF=A5=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=B8=A6=E5=87=BA=E4=B8=94=E4=B8=8D=E5=8F=AF=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../itemManage/itempackage/index.vue          | 43 +++++++++++--------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/src/views/wms/basicDataManage/itemManage/itempackage/index.vue b/src/views/wms/basicDataManage/itemManage/itempackage/index.vue
index 4f25372ad..a0c999b69 100644
--- a/src/views/wms/basicDataManage/itemManage/itempackage/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/itempackage/index.vue
@@ -173,25 +173,31 @@ const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
   if(type == "update"){
     Itempackaging.allSchemas.formSchema.forEach((item) => {
-      if (item.field == 'itemCode') {
-              item.componentProps.disabled = true
-              item.componentProps.isSearchList = false
-            }
-            if (item.field == 'packUnit') {
-              item.componentProps.disabled = true
-              item.componentProps.isSearchList = false
-            }
-          })       
+        if (item.field == 'itemCode') {
+          item.componentProps.disabled = true
+          item.componentProps.isSearchList = false
+        }
+        if (item.field == 'packUnit') {
+          item.componentProps.disabled = true
+          item.componentProps.isSearchList = false
+        }
+        if (item.field == 'packType') {
+          item.componentProps.disabled = false
+        }
+    })
   }else {
     Itempackaging.allSchemas.formSchema.forEach((item) => {
-      if (item.field == 'itemCode') {
-        item.componentProps.disabled = false
-        item.componentProps.isSearchList = true
-      }
-      if (item.field == 'packUnit') {
-        item.componentProps.disabled = false
-        item.componentProps.isSearchList = true
-      }
+        if (item.field == 'itemCode') {
+          item.componentProps.disabled = false
+          item.componentProps.isSearchList = true
+        }
+        if (item.field == 'packUnit') {
+          item.componentProps.disabled = false
+          item.componentProps.isSearchList = true
+        }
+        if (item.field == 'packType') {
+          item.componentProps.disabled = true
+        }
     })  
   }
   basicFormRef.value.open(type, row)
@@ -261,6 +267,9 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
     if('itemCode'==formField){
       setV['uom'] = val[0]['uom']
     }
+    if('packUnit'==formField){
+      setV['packType'] = val[0]['type']
+    }
     formRef.setValues(setV)
   })
 }

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 276/408] =?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 71588c0c254a5e8962b65f5cdf3c452b59887183 Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Wed, 10 Jul 2024 10:29:32 +0800
Subject: [PATCH 277/408] =?UTF-8?q?WMS=20=E2=80=94=E2=80=94>=20bug=20=20?=
 =?UTF-8?q?=E8=87=AA=E5=88=B6=E5=A4=87=E4=BB=B6=E5=8F=91=E8=B4=A7=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E8=AE=B0=E5=BD=95=E3=80=81=E5=AE=A2=E6=88=B7=E6=94=B6?=
 =?UTF-8?q?=E8=B4=A7=E8=AE=B0=E5=BD=95=E3=80=81=E5=AE=A2=E6=88=B7=E9=80=80?=
 =?UTF-8?q?=E8=B4=A7=E8=AE=B0=E5=BD=95=E7=9A=84=E7=8A=B6=E6=80=81=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=BA=94=E5=8E=BB=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customerreceiptRecordMain.data.ts                        | 5 +++--
 .../customerreturnRecordMain.data.ts                         | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts
index 2785f8c38..6324d6ec0 100644
--- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts
@@ -45,8 +45,9 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'status',
     dictType: DICT_TYPE.REQUEST_STATUS,
     dictClass: 'string',
-    isSearch: true,
-    isTable: true,
+    isSearch: false,
+    isTable: false,
+    isDetail: false,
     isForm: false,
     sort: 'custom',
     table: {
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts
index 76f01ff74..188819bec 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts
@@ -20,7 +20,9 @@ export const CustomerreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'status',
     dictType: DICT_TYPE.REQUEST_STATUS,
     dictClass: 'string',
-    isTable: true,
+    isSearch: false,
+    isTable: false,
+    isDetail: false,
     isForm: false,
     sort: 'custom',
     table: {

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 278/408] =?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 279/408] =?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 280/408] =?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 9a3f20b14c4858b9ae8938b2467858b9b6484d10 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Wed, 10 Jul 2024 11:18:39 +0800
Subject: [PATCH 281/408] =?UTF-8?q?=E5=8F=91=E6=96=99=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Form/src/Form.vue                          | 2 +-
 .../wms/issueManage/issue/issueRequestMain/index.vue      | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/components/Form/src/Form.vue b/src/components/Form/src/Form.vue
index 55e4e7726..0daccf3aa 100644
--- a/src/components/Form/src/Form.vue
+++ b/src/components/Form/src/Form.vue
@@ -126,7 +126,7 @@ export default defineComponent({
     }
 
     const clearSearchInput = (field) => {
-      emit('clearSearchInput')
+      emit('clearSearchInput',field)
     }
     expose({
       setValues,
diff --git a/src/views/wms/issueManage/issue/issueRequestMain/index.vue b/src/views/wms/issueManage/issue/issueRequestMain/index.vue
index 1bb24f9f6..df1f3f87a 100644
--- a/src/views/wms/issueManage/issue/issueRequestMain/index.vue
+++ b/src/views/wms/issueManage/issue/issueRequestMain/index.vue
@@ -61,6 +61,7 @@
     @submitForm="submitForm"
     @onEnter="onEnter"
     @onChange="onChange"
+    @clearSearchInput="onChange"
   />
 
   <!-- 详情 -->
@@ -117,8 +118,15 @@ const onChange  = async (field,value) => {
     setV['productionLineCode'] = ''
     setV['workStationCode'] = ''
     formRef.value.formRef.setValues(setV)
+  }else if(field== 'productionLineCode'){
+    //生产线
+    const setV = {}
+    setV['workStationCode'] = ''
+    formRef.value.formRef.setValues(setV)
   }
 }
+
+
 const onEnter = async (field,value) => {
   if (field == 'productionLineCode') {
     //生产线

From aa24ae02ba67d2181e391dbd822c403cc43c3db8 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Wed, 10 Jul 2024 11:53:29 +0800
Subject: [PATCH 282/408] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=BA=93=E5=8C=BA?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/basicDataManage/itemManage/itemarea/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
index 46e9ba97b..1870b44e9 100644
--- a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
@@ -42,7 +42,7 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
     ref="formRef"
-    @success="getList"
+    @success="submitForm"
     :rules="ItemareaRules"
     :isOpenSearchTable="true"
     fieldTableColumn="locationCode"
@@ -361,7 +361,7 @@ const tableSelectionDelete = (selection) => {
 }
 // 主子数据 提交
 const submitForm = async (formType, data) => {
-  data.subList = tableData.value // 拼接子表数据参数
+  // data.subList = tableData.value // 拼接子表数据参数
   try {
     if (formType === 'create') {
       await ItemareaApi.createItemarea(data)

From d647a17591a1c5dd3cb7372df1e88df633dbbf2b Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Wed, 10 Jul 2024 11:58:00 +0800
Subject: [PATCH 283/408] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=BA=93=E5=8C=BA?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/basicDataManage/itemManage/itemarea/index.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
index 1870b44e9..b4bd4fd9d 100644
--- a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
@@ -42,7 +42,7 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
     ref="formRef"
-    @success="submitForm"
+    @success="getList"
     :rules="ItemareaRules"
     :isOpenSearchTable="true"
     fieldTableColumn="locationCode"
@@ -52,7 +52,7 @@
     :tableData="tableData"
     :apiUpdate="ItemareaApi.updateItemarea"
     :apiCreate="ItemareaApi.createItemarea"
-    :isBusiness="false"
+    :isBusiness="true"
     @handleAddTable="handleAddTable"
     @handleDeleteTable="handleDeleteTable"
     :isShowReduceButtonSelection="true"
@@ -361,7 +361,7 @@ const tableSelectionDelete = (selection) => {
 }
 // 主子数据 提交
 const submitForm = async (formType, data) => {
-  // data.subList = tableData.value // 拼接子表数据参数
+  data.subList = tableData.value // 拼接子表数据参数
   try {
     if (formType === 'create') {
       await ItemareaApi.createItemarea(data)

From d93fd7d37db69d63fc88efdfbd9c6438497e1abb Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Wed, 10 Jul 2024 13:35:30 +0800
Subject: [PATCH 284/408] =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E3=80=81=E5=BF=85=E5=A1=AB=E9=A1=B9=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scrap/scrapRequestMain/scrapRequestMain.data.ts            | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
index fe6c6a315..2c4787b5f 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
@@ -396,6 +396,9 @@ export const ScrapRequestMainRules = reactive({
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
+  fromWarehouseCode:[
+    {required: true,message: '请选择从仓库代码',trigger: 'change'  }
+  ]
 })
 
 /**

From 3cfbf462ca5ef0e4c2a32014093eb0fa4e09fafc Mon Sep 17 00:00:00 2001
From: bjang03 <259278618@qq.com>
Date: Wed, 10 Jul 2024 13:40:28 +0800
Subject: [PATCH 285/408] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=20HL-3513?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../countadjustRecordMain.data.ts             | 66 ++++++++++++-------
 1 file changed, 41 insertions(+), 25 deletions(-)

diff --git a/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts
index b79fd418e..843aab50e 100644
--- a/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts
+++ b/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts
@@ -164,17 +164,17 @@ export const CountadjustRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '接口类型',
-    field: 'interfaceType',
-    dictType: DICT_TYPE.INTERFACE_TYPE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  // {
+  //   label: '接口类型',
+  //   field: 'interfaceType',
+  //   dictType: DICT_TYPE.INTERFACE_TYPE,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
     label: '备注',
     field: 'remark',
@@ -267,9 +267,9 @@ export const CountadjustRecordMainRules =reactive({
   departmentCode: [
     { required: true, message: '请输入部门', trigger: 'blur' }
   ],
-  interfaceType: [
-    { required: true, message: '请选择接口类型', trigger: 'change' }
-  ],
+  // interfaceType: [
+  //   { required: true, message: '请选择接口类型', trigger: 'change' }
+  // ],
   number: [
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
@@ -368,6 +368,22 @@ export const CountadjustRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '库位组代码',
+    field: 'locationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库区代码',
+    field: 'areaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '计量单位',
     field: 'uom',
@@ -455,17 +471,17 @@ export const CountadjustRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   //     width: 150
   //   },
   // },
-  {
-    label: '接口类型',
-    field: 'interfaceType',
-    dictType: DICT_TYPE.INTERFACE_TYPE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  // {
+  //   label: '接口类型',
+  //   field: 'interfaceType',
+  //   dictType: DICT_TYPE.INTERFACE_TYPE,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
     label: '备注',
     field: 'remark',

From ac116c49c5496515db3dde29f7f809001f790b88 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Wed, 10 Jul 2024 13:40:36 +0800
Subject: [PATCH 286/408] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=98=8E=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scrapContainerMainRequest/index.vue       | 16 ++++++---
 .../scrapContainerMainRequest.data.ts         |  1 +
 .../scrap/scrapRequestMain/index.vue          | 35 ++++++++++++++-----
 .../scrapRequestMain/scrapRequestMain.data.ts |  1 +
 .../preparetoissueMain/index.vue              | 10 ++++--
 .../preparetoissueMain.data.ts                |  1 +
 .../productionreturnRequestMainNo/index.vue   | 10 ++++--
 .../productionreturnRequestMainNo.data.ts     |  1 +
 .../productdismantleRequestMain/index.vue     |  8 ++++-
 .../productdismantleRequestMain.data.ts       |  1 +
 .../productrepairRequestMain/index.vue        | 12 +++++--
 .../productrepairRequestMain.data.ts          |  1 +
 .../productscrapRequestMain/index.vue         | 11 +++---
 13 files changed, 83 insertions(+), 25 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue
index 9f35176d5..1eaca15ea 100644
--- a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue
@@ -42,6 +42,8 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
     ref="basicFormRef"
+    :isOpenSearchTable="true"
+    fieldTableColumn="containerNumber"
     @success="getList"
     :rules="ContainerMainRequestRules"
     :formAllSchemas="ContainerMainRequest.allSchemas"
@@ -131,11 +133,15 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
   nextTick(() => {
     if (type == 'tableForm') {
       if(formField == 'containerNumber') {
-        row['containerNumber'] = val[0]['itemCode']
-        row['uom'] = val[0]['uom']
-        row['fromLocationCode'] = val[0]['locationCode']
-        row['fromInventoryStatus'] = val[0]['inventoryStatus']
-        row['toInventoryStatus'] = 'SCRAP'
+        val.forEach(item=>{
+          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+          newRow['containerNumber'] = item['itemCode']
+          newRow['uom'] = item['uom']
+          newRow['fromLocationCode'] = item['locationCode']
+          newRow['fromInventoryStatus'] = item['inventoryStatus']
+          newRow['toInventoryStatus'] = 'SCRAP'
+          tableData.value.push(newRow)
+        })
     }else if(formField == 'toLocationCode'){
       row['toLocationCode'] = val[0]['code']
     }else {
diff --git a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts
index 804623d5e..5516b76cb 100644
--- a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts
+++ b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts
@@ -357,6 +357,7 @@ export const ContainerDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'containerNumber',
     sort: 'custom',
     tableForm: {
+      multiple: true,
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择器具号',
       searchField: 'itemCode',
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
index 28d98d053..29df5e05e 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
@@ -42,6 +42,8 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
     ref="formRef"
+    :isOpenSearchTable="true"
+    fieldTableColumn="packingNumber"
     @success="getList"
     :rules="ScrapRequestMainRules"
     :formAllSchemas="ScrapRequestMain.allSchemas"
@@ -104,6 +106,7 @@ const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref([...ScrapRequestMain.allSchemas.tableColumns,...ScrapRequestDetail.allSchemas.tableMainColumns])
 
+
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
   tableColumns.value = val
@@ -114,16 +117,32 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
   nextTick(() => {
     if (type == 'tableForm') {
       // 明细查询页赋值
-      row[formField] = val[0][searchField]
-      row['packingNumber'] = val[0]['packingNumber']
-      row['batch'] = val[0]['batch']
-      row['fromLocationCode'] = val[0]['locationCode']
-      row['itemCode'] = val[0]['itemCode']
-      row['uom'] = val[0]['uom']
+      // val.forEach(item=>{
+      //   const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+      //   newRow[formField] = item[searchField]
+      //   newRow['packingNumber'] = item['packingNumber']
+      //   newRow['batch'] = item['batch']
+      //   newRow['fromLocationCode'] = item['locationCode']
+      //   newRow['itemCode'] = item['itemCode']
+      //   newRow['uom'] = item['uom']
+      //   tableData.value.push(newRow)
+      // })
       // 查询标准价格
-      let param = {'itemCode':val[0]['itemCode'] as string}
+      let param = {'itemCodes':val.map(item=>item.itemCode).join(',') as string}
       StdcostpriceApi.queryStdcostpriceByItemCode(param).then(res => {
-        row['singlePrice'] = res.price
+        val.forEach(item=>{
+          const itemCode = res.find(item1=>item1['itemCode']==item['itemCode'])
+          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+          newRow[formField] = item[searchField]
+          newRow['packingNumber'] = item['packingNumber']
+          newRow['batch'] = item['batch']
+          newRow['fromLocationCode'] = item['locationCode']
+          newRow['itemCode'] = item['itemCode']
+          newRow['uom'] = item['uom']
+          newRow['singlePrice'] = itemCode?itemCode['price']:''
+          tableData.value.push(newRow)
+        })
+        // row['singlePrice'] = res.price
       })
     } else {
       const setV = {}
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
index 2c4787b5f..e329127c8 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
@@ -483,6 +483,7 @@ export const ScrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     tableForm:{
+      multiple:true,
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择包装号',
       searchField: 'packingNumber',
diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue
index b52587d8b..81cccfca0 100644
--- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue
+++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue
@@ -42,6 +42,8 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
     ref="formRef"
+    :isOpenSearchTable="true"
+    fieldTableColumn="workStation"
     @success="getList"
     :rules="PreparetoissueMainRules"
     :formAllSchemas="PreparetoissueMain.allSchemas"
@@ -113,8 +115,12 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         row['itemCode'] = val[0]['componentItemCode']
         row['uom'] = val[0]['componentUom']
       } else {
-        row[formField] = val[0][searchField]
-        row['toLocationCode'] = val[0]['rawLocationCode']
+        val.forEach(item=>{
+          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+          newRow[formField] = item[searchField]
+          newRow['toLocationCode'] = item['rawLocationCode']
+          tableData.value.push(newRow)
+        })
       }
     } else {
       const setV = {}
diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts
index ddf2e9d2c..d16192121 100644
--- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts
+++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts
@@ -503,6 +503,7 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     tableForm: {
+      multiple: true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择工位', // 输入框占位文本
       searchField: 'code', // 查询弹窗赋值字段
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
index 81bc49646..3a703320f 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
@@ -42,6 +42,8 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
     ref="formRef"
+     :isOpenSearchTable="true"
+    fieldTableColumn="workStationCode"
     @success="getList"
     :rules="ProductionreturnRequestMainRules"
     :formAllSchemas="ProductionreturnRequestMain.allSchemas"
@@ -193,8 +195,12 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           })
         }
       } else if(formField == 'workStationCode') {
-        row['workStationCode'] = val[0]['code']
-        row['fromLocationCode'] = val[0]['rawLocationCode']
+        val.forEach(item=>{
+          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+          newRow['workStationCode'] = item['code']
+          newRow['fromLocationCode'] = item['rawLocationCode']
+          tableData.value.push(newRow)
+        })
       } else if(formField == 'packUnit') {
         row['packUnit'] = val[0]['packUnit']
         row['packQty'] = val[0]['packQty']
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts
index 1901bc019..f4a9739fa 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts
@@ -105,6 +105,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
       }
     },
     tableForm:{
+      multiple: true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择工位代码', // 输入框占位文本
       searchField: 'code', // 查询弹窗赋值字段
diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue
index 76468f55c..06a8d79a5 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue
@@ -42,6 +42,8 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
     ref="formRef"
+    :isOpenSearchTable="true"
+    fieldTableColumn="productionLineCode"
     @success="getList"
     :rules="ProductdismantleRequestMainRules"
     :formAllSchemas="ProductdismantleRequestMain.allSchemas"
@@ -269,7 +271,11 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         row['bomVersion'] = ''
         row['childList'] = []
       } else {
-        row[formField] = val[0][searchField]
+        val.forEach(item=>{
+          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+          newRow[formField] = item[searchField]
+          tableData.value.push(newRow)
+        })
       }
     } else {
       const setV = {}
diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
index c40d77a5f..cdd5e6572 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
@@ -474,6 +474,7 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
       width: 150
     },
     tableForm:{
+      multiple: true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
       searchField: 'code', // 查询弹窗赋值字段
diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
index a6ba77156..3bc4b80e4 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
+++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
@@ -42,6 +42,8 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
     ref="formRef"
+    :isOpenSearchTable="true"
+    fieldTableColumn="workStationCode"
     @success="getList"
     :rules="ProductrepairRequestMainRules"
     :formAllSchemas="ProductrepairRequestMain.allSchemas"
@@ -247,8 +249,14 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       } else if(formField == 'productionLineCode'){
         row['productionLineCode'] = val[0]['code']
       } else if(formField == 'workStationCode'){
-        row['fromLocationCode'] = val[0]['rawLocationCode']
-        row['workStationCode'] = val[0]['code']
+        
+        val.forEach(item=>{
+          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+          newRow['fromLocationCode'] = item['rawLocationCode']
+          newRow['workStationCode'] =item['code']
+          tableData.value.push(newRow)
+        })
+
       } else if(formField == 'formField'){
         row['workStationCode'] = val[0]['code']
       } else if(formField == 'bomVersion'){
diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
index bdcb195cd..2d2ddd79e 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
+++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
@@ -553,6 +553,7 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     },
     sortTableDefault:5,
     tableForm:{
+      multiple: true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择工位代码', // 输入框占位文本
       searchField: 'code', // 查询弹窗赋值字段
diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
index cae64b1f9..b1a0986b9 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
@@ -318,12 +318,13 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         row['bomVersion'] = ''
         row['childList'] = []
         // 查询标准价格
-        let param = {'itemCode':val[0]['itemCode'] as string}
+        let param = {'itemCodes':val[0]['itemCode'] as string}
         StdcostpriceApi.queryStdcostpriceByItemCode(param).then(res => {
-          console.log(res)
-          row['uom'] = res.uom
-          row['singlePrice'] = res.price
-        }) 
+          if(res&&res.length>0){
+            row['uom'] = res.uom
+            row['singlePrice'] = res.price
+          }
+        })
         // 查看BOM版本
         console.log(formRef.formModel)
        const param1 =  {

From 85ebc8de4934cfbcf4291345c40c7d11f490b570 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 10 Jul 2024 13:44:17 +0800
Subject: [PATCH 287/408] =?UTF-8?q?=E8=B0=83=E6=95=B4WMS=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=AD=E6=89=80=E6=9C=89BOM=E7=89=88=E6=9C=AC=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionplan/productionMain/index.vue   | 19 ++++++++++++++++++-
 .../productionMainAssemble/index.vue          | 18 +++++++++++++++++-
 .../productionMainAssembleSparePart/index.vue | 18 +++++++++++++++++-
 .../productionMainPredictSparePart/index.vue  | 18 +++++++++++++++++-
 .../productreceiptRequestMain/index.vue       | 16 ++++++++++++++++
 .../index.vue                                 | 16 ++++++++++++++++
 .../productreceiptscrapRequestMain/index.vue  | 18 ++++++++++++++++--
 7 files changed, 117 insertions(+), 6 deletions(-)

diff --git a/src/views/wms/productionManage/productionplan/productionMain/index.vue b/src/views/wms/productionManage/productionplan/productionMain/index.vue
index ef854e67a..2f6dfc3bf 100644
--- a/src/views/wms/productionManage/productionplan/productionMain/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMain/index.vue
@@ -87,6 +87,7 @@ import * as ProductionMainApi from '@/api/wms/productionMain'
 import * as ProductionDetailApi from '@/api/wms/productionDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as ItemBasicApi from '@/api/wms/itembasic'
+import * as BomApi from "@/api/wms/bom";
 
 // 生产计划主
 // 预生产计划
@@ -119,10 +120,26 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       // })
       if(formField=='itemCode'){
         // row[formField] = val[0][searchField]
-        val.forEach(item=>{
+        val.forEach(async item=>{
           if(tableData.value.find(item1=>item1['id'] == item['id'])) return
           const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
           newRow['id'] = item['id']
+          // 查看BOM版本
+          console.log(22,item)
+          const param1 =  {
+            productItemCode: item['itemCode'],
+            available: 'TRUE',
+            pageSize: 20,
+            pageNo: 1,
+            sort: '',
+            by: 'ASC',
+          }
+          await BomApi.getBomPage(param1).then(res => {
+            console.log(res)
+            if(res?.list?.length>0){
+              newRow['bomVersion'] = res.list[0].version
+            }
+          }) 
           tableData.value.push(newRow)
         })
       } else {
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
index 0afec4008..4d196be98 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
@@ -87,6 +87,7 @@ import * as ProductionMainApi from '@/api/wms/productionMain'
 import * as ProductionDetailApi from '@/api/wms/productionDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as ItemBasicApi from '@/api/wms/itembasic'
+import * as BomApi from "@/api/wms/bom";
 
 // 装配计划
 defineOptions({ name: 'ProductionMainAssemble' })
@@ -116,10 +117,25 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       // }).catch(err =>{
       //   console.log(err);
       // })
-      val.forEach(item=>{
+      val.forEach(async item=>{
         const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
         newRow[formField] = item[searchField]
         newRow['uom'] = item['uom']
+        // 查看BOM版本
+        const param1 =  {
+            productItemCode: item['itemCode'],
+            available: 'TRUE',
+            pageSize: 20,
+            pageNo: 1,
+            sort: '',
+            by: 'ASC',
+          }
+          await BomApi.getBomPage(param1).then(res => {
+            console.log(res)
+            if(res?.list?.length>0){
+              newRow['bomVersion'] = res.list[0].version
+            }
+          }) 
         tableData.value.push(newRow)
       })
     } else {
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
index 41164cefb..0592934c1 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
@@ -87,6 +87,7 @@ import * as ProductionMainApi from '@/api/wms/productionMain'
 import * as ProductionDetailApi from '@/api/wms/productionDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as ItemBasicApi from '@/api/wms/itembasic'
+import * as BomApi from "@/api/wms/bom";
 
 // 装配备件计划
 defineOptions({ name: 'ProductionMainASparePart' })
@@ -116,10 +117,25 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       // }).catch(err =>{
       //   console.log(err);
       // })
-      val.forEach(item=>{
+      val.forEach(async item=>{
         const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
         newRow[formField] = item[searchField]
         newRow['uom'] = item['uom']
+        // 查看BOM版本
+        const param1 =  {
+            productItemCode: item['itemCode'],
+            available: 'TRUE',
+            pageSize: 20,
+            pageNo: 1,
+            sort: '',
+            by: 'ASC',
+          }
+          await BomApi.getBomPage(param1).then(res => {
+            console.log(res)
+            if(res?.list?.length>0){
+              newRow['bomVersion'] = res.list[0].version
+            }
+          }) 
         tableData.value.push(newRow)
       })
     } else {
diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
index 6aa22fecd..a4d22853c 100644
--- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
@@ -87,6 +87,7 @@ import * as ProductionMainApi from '@/api/wms/productionMain'
 import * as ProductionDetailApi from '@/api/wms/productionDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as ItemBasicApi from '@/api/wms/itembasic'
+import * as BomApi from "@/api/wms/bom";
 
 // 预生产备件计划
 defineOptions({ name: 'ProductionMainPredictSparePart' })
@@ -116,10 +117,25 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       // }).catch(err =>{
       //   console.log(err);
       // })
-      val.forEach(item=>{
+      val.forEach(async item=>{
         const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
         newRow[formField] = item[searchField]
         newRow['uom'] = item['uom']
+        // 查看BOM版本
+        const param1 =  {
+            productItemCode: item['itemCode'],
+            available: 'TRUE',
+            pageSize: 20,
+            pageNo: 1,
+            sort: '',
+            by: 'ASC',
+          }
+          await BomApi.getBomPage(param1).then(res => {
+            console.log(res)
+            if(res?.list?.length>0){
+              newRow['bomVersion'] = res.list[0].version
+            }
+          }) 
         tableData.value.push(newRow)
       })
     } else {
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
index 8263f8d62..c3a97d551 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
@@ -149,6 +149,7 @@ import { formatTime } from '@/utils/index'
 import { getAccessToken } from '@/utils/auth'
 import dayjs from 'dayjs'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
+import * as BomApi from "@/api/wms/bom";
 // 制品收货申请
 // 预生产收货申请
 defineOptions({ name: 'ProductreceiptRequestMain' })
@@ -212,6 +213,21 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         row['uom'] = val[0]['uom']
         row['produceDate'] = dayjs().valueOf()
         row[formField] = val[0][searchField]
+        // 查看BOM版本
+        const param1 =  {
+          productItemCode: val[0]['itemCode'],
+          available: 'TRUE',
+          pageSize: 20,
+          pageNo: 1,
+          sort: '',
+          by: 'ASC',
+        }
+        BomApi.getBomPage(param1).then(res => {
+          console.log(res)
+          if(res?.list?.length>0){
+            row['bomVersion'] = res.list[0].version
+          }
+        })
       }else if (formField == 'workStationCode') {
         // 明细查询页赋值
         val.forEach(item=>{
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
index 6296dda1e..a066d3239 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
@@ -149,6 +149,7 @@ import * as PackageApi from '@/api/wms/package'
 import { formatTime } from '@/utils/index'
 import { getAccessToken } from '@/utils/auth'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
+import * as BomApi from "@/api/wms/bom";
 
 // 装配收货申请
 defineOptions({ name: 'ProductreceiptRequestMainA' })
@@ -213,6 +214,21 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         row['uom'] = val[0]['uom']
         row['produceDate'] = dayjs().valueOf()
         row[formField] = val[0][searchField]
+         // 查看BOM版本
+         const param1 =  {
+          productItemCode: val[0]['itemCode'],
+          available: 'TRUE',
+          pageSize: 20,
+          pageNo: 1,
+          sort: '',
+          by: 'ASC',
+        }
+        BomApi.getBomPage(param1).then(res => {
+          console.log(res)
+          if(res?.list?.length>0){
+            row['bomVersion'] = res.list[0].version
+          }
+        })
       }else if (formField == 'workStationCode') {
         // 明细查询页赋值
         val.forEach(item=>{
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
index d2be36d10..e9a80a163 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
@@ -136,6 +136,7 @@ import * as ItembasicApi from '@/api/wms/itembasic'
 import * as PackageApi from '@/api/wms/package'
 import { formatTime } from '@/utils/index'
 import { getAccessToken } from '@/utils/auth'
+import * as BomApi from "@/api/wms/bom";
 import {
   SupplierdeliverRequestPackage
 } from '../../../purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts'
@@ -204,8 +205,21 @@ const searchTableSuccess = async (formField, searchField, val, formRef, type, ro
           row['uom'] = res[0]['uom']
         }
         row[formField] = val[0][searchField]
-
-        console.log('获取计量单位',res)
+        // 查看BOM版本
+        const param1 =  {
+          productItemCode: val[0]['itemCode'],
+          available: 'TRUE',
+          pageSize: 20,
+          pageNo: 1,
+          sort: '',
+          by: 'ASC',
+        }
+        BomApi.getBomPage(param1).then(res => {
+          console.log(res)
+          if(res?.list?.length>0){
+            row['bomVersion'] = res.list[0].version
+          }
+        })
       }else{
         //添加明细
         val.forEach(item=>{

From cedf5e20bb1158f5e3cc8ed7da8f26a6aa463e33 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 10 Jul 2024 13:45:05 +0800
Subject: [PATCH 288/408] =?UTF-8?q?=E8=B0=83=E6=95=B4WMS=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=AD=E6=89=80=E6=9C=89BOM=E7=89=88=E6=9C=AC=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productscrapRequestMain/index.vue         | 44 +++++++------------
 1 file changed, 16 insertions(+), 28 deletions(-)

diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
index b1a0986b9..af5f92bc1 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
@@ -42,8 +42,6 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
     ref="formRef"
-    :isOpenSearchTable="true"
-    fieldTableColumn="workStationCode"
     @success="getList"
     :rules="ProductscrapRequestMainRules"
     :formAllSchemas="ProductscrapRequestMain.allSchemas"
@@ -85,7 +83,6 @@
  <!-- BOM弹窗列表 -->
  <BasicForm
     ref="detailBomRef"
-    
     @success="getList"
     :tableAllSchemas="ProdcutscrapBomScrap.allSchemas"
     :tableFormRules="ProdcutscrapBomScrapRules"
@@ -121,7 +118,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as BomDismantleApi from "@/api/wms/bomDismantle"
 import * as BomApi from "@/api/wms/bom";
 
-// 制品报废申请 制品子件报废申请
+// 制品报废申请
 defineOptions({ name: 'ProductscrapRequestMain' })
 
 const message = useMessage() // 消息弹窗
@@ -303,13 +300,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       if(formField == 'productionLineCode'){
         row['productionLineCode'] = val[0]['code']
       }else if(formField == 'workStationCode'){
-        val.forEach(item=>{
-          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
-          newRow['workStationCode'] = item['code']
-          newRow['fromLocationCode'] = item['rawLocationCode']
-          tableData.value.push(newRow)
-        })
-       
+        row['workStationCode'] = val[0]['code']
+        row['fromLocationCode'] = val[0]['rawLocationCode']
       }else if(formField == 'processCode'){
         row['processCode'] = val[0]['code']
       }else if(formField == 'itemCode'){
@@ -318,30 +310,26 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         row['bomVersion'] = ''
         row['childList'] = []
         // 查询标准价格
-        let param = {'itemCodes':val[0]['itemCode'] as string}
+        let param = {'itemCode':val[0]['itemCode'] as string}
         StdcostpriceApi.queryStdcostpriceByItemCode(param).then(res => {
-          if(res&&res.length>0){
-            row['uom'] = res.uom
-            row['singlePrice'] = res.price
-          }
-        })
+          console.log(res)
+          row['uom'] = res.uom
+          row['singlePrice'] = res.price
+        }) 
         // 查看BOM版本
-        console.log(formRef.formModel)
-       const param1 =  {
-        productItemCode: val[0]['itemCode'],
-        available: 'TRUE',
-        pageSize: 20,
-        pageNo: 1,
-        sort: '',
-        by: 'ASC',
-       }
+        const param1 =  {
+          productItemCode: val[0]['itemCode'],
+          available: 'TRUE',
+          pageSize: 20,
+          pageNo: 1,
+          sort: '',
+          by: 'ASC',
+        }
         BomApi.getBomPage(param1).then(res => {
           console.log(res)
           if(res?.list?.length>0){
             row['bomVersion'] = res.list[0].version
           }
-         
-          // row['singlePrice'] = res.price
         }) 
       }else if(formField == 'bomVersion'){
         row['bomVersion'] = val[0]['version']

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 289/408] =?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 32e9f3b16859e66bdb874dcc2c6785163b240aa3 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Wed, 10 Jul 2024 14:10:31 +0800
Subject: [PATCH 290/408] =?UTF-8?q?=E7=8E=8B=E9=B2=81=E9=B9=8F=E5=B8=8C?=
 =?UTF-8?q?=E6=9C=9B=EF=BC=9A=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E6=97=B6=E9=81=87=E5=88=B0=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereturnRequestMain/index.vue       | 21 +++++++++++++++++--
 .../purchasereturnRequestMain.data.ts         |  1 +
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
index d09d0bc40..de668c94d 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
@@ -232,8 +232,9 @@ const searchTableSuccess = async (formField, searchField, val, formRef, type, ro
   nextTick(async () => {
     if (type == 'tableForm') {
       // 明细查询页赋值
-      row[formField] = val[0][searchField]
+      
       if (formField == 'purchaseReceiptRecordNumber') {
+        row[formField] = val[0][searchField]
         //搜索记录单号--回显数据
         row['supplierCode'] = val[0]['supplierCode']
         row['poNumber'] = val[0]['poNumber']
@@ -271,6 +272,7 @@ const searchTableSuccess = async (formField, searchField, val, formRef, type, ro
         row['amount'] = val[0]['amount']
         row['projectCode'] = val[0]['projectCode']
       } else if (formField == 'itemCode') {
+        row[formField] = val[0][searchField]
         row['batch'] = val[0]['toBatch']
         row['containerNumber'] = val[0]['toContainerNumber']
         row['containerNumber'] = val[0]['containerNumber']
@@ -278,6 +280,7 @@ const searchTableSuccess = async (formField, searchField, val, formRef, type, ro
         // row['fromLocationCode'] = val[0]['fromLocationCode']
         row['toLocationCode'] = val[0]['toLocationCode']
       } else if (formField == 'fromLocationCode') {
+        row[formField] = val[0][searchField]
         //   let params = {
         //   itemCode: row.itemCode,
         //   batch: row.batch,
@@ -287,7 +290,21 @@ const searchTableSuccess = async (formField, searchField, val, formRef, type, ro
         // console.log('23423423',aa);
         // row['inventoryBalance'] = aa//库存余额
       } else if (formField == 'packingNumber') {
-        row['inventoryBalance'] = val[0]['qty'] //库存余额
+        // row[formField] = val[0][searchField]
+        val.forEach((item,index)=>{
+          if(index==0){
+            row[formField] = item[searchField]
+            row['inventoryBalance'] = item['qty'] //库存余额
+          }else{
+            let newRow =  {...row}
+            newRow[formField] = item[searchField]
+            row['inventoryBalance'] = item['qty'] //库存余额
+            tableData.value.push(newRow)
+          }
+        })
+        // row['inventoryBalance'] = val[0]['qty'] //库存余额
+      }else{
+        row[formField] = val[0][searchField]
       }
     } else {
       const setV = {}
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
index 1358415e2..f4a706b9c 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
@@ -982,6 +982,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       }
     },
     tableForm:{
+      multiple: true,
       // labelMessage: '信息提示说明！！！',
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择物料代码、批次、从库位代码',

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 291/408] =?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 1c40e893c4a20af7a073bc6fe35784f1d9e845b9 Mon Sep 17 00:00:00 2001
From: bjang03 <259278618@qq.com>
Date: Wed, 10 Jul 2024 14:29:27 +0800
Subject: [PATCH 292/408] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=20=E7=9B=98?=
 =?UTF-8?q?=E7=82=B9=E5=AD=90=E8=A1=A8=E5=A2=9E=E5=8A=A0=E4=BB=93=E5=BA=93?=
 =?UTF-8?q?=E3=80=81=E5=BA=93=E5=8C=BA=E3=80=81=E5=BA=93=E4=BD=8D=E7=BB=84?=
 =?UTF-8?q?=E3=80=81=E5=BA=93=E4=BD=8D=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../count/countJobMain/countJobMain.data.ts   | 48 ++++++++++++-------
 .../countRequestMain/countRequestMain.data.ts | 24 ++++++++++
 .../countadjustRecordMain.data.ts             | 16 +++++--
 .../countadjustRequestMain.data.ts            | 24 ++++++++++
 4 files changed, 92 insertions(+), 20 deletions(-)

diff --git a/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts b/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts
index 4774927d0..079cff73d 100644
--- a/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts
+++ b/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts
@@ -83,22 +83,38 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  // {
-  //   label: '仓库代码',
-  //   field: 'warehouseCode',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
-  // {
-  //   label: '库位代码',
-  //   field: 'locationCode',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
+  {
+    label: '仓库代码',
+    field: 'warehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+
+  {
+    label: '库区代码',
+    field: 'areaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },{
+    label: '库位组代码',
+    field: 'locationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库位代码',
+    field: 'locationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '申请时间',
     field: 'requestTime',
diff --git a/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts b/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts
index ccb01037a..e525d6a90 100644
--- a/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts
+++ b/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts
@@ -482,6 +482,30 @@ export const CountRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       type: 'Select'
     }
   },
+  {
+    label: '仓库代码',
+    field: 'warehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+
+  {
+    label: '库区代码',
+    field: 'areaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },{
+    label: '库位组代码',
+    field: 'locationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '库位代码',
     field: 'locationCode',
diff --git a/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts
index 843aab50e..baa353828 100644
--- a/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts
+++ b/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts
@@ -361,14 +361,22 @@ export const CountadjustRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '库位代码',
-    field: 'locationCode',
+    label: '仓库代码',
+    field: 'warehouseCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
+
   {
+    label: '库区代码',
+    field: 'areaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },{
     label: '库位组代码',
     field: 'locationGroupCode',
     sort: 'custom',
@@ -377,8 +385,8 @@ export const CountadjustRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '库区代码',
-    field: 'areaCode',
+    label: '库位代码',
+    field: 'locationCode',
     sort: 'custom',
     table: {
       width: 150
diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
index a88081343..553b94740 100644
--- a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
+++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
@@ -518,6 +518,30 @@ export const CountadjustRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       precision: 6
     }
   },
+  {
+    label: '仓库代码',
+    field: 'warehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+
+  {
+    label: '库区代码',
+    field: 'areaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },{
+    label: '库位组代码',
+    field: 'locationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '库位代码',
     field: 'locationCode',

From 7700718b170683a240485bca0029036ca8b96ca6 Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Wed, 10 Jul 2024 14:37:11 +0800
Subject: [PATCH 293/408] =?UTF-8?q?WMS=20=E2=80=94=E2=80=94>=20bug=20=20?=
 =?UTF-8?q?=E8=87=AA=E5=88=B6=E5=A4=87=E4=BB=B6=E5=8F=91=E8=B4=A7=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=EF=BC=8C=E5=8F=91=E8=B4=A7=E6=9C=88=E5=8F=B0=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E5=B8=A6=E5=87=BA=EF=BC=9B=E8=87=AA=E5=88=B6=E5=A4=87?=
 =?UTF-8?q?=E4=BB=B6=E5=8F=91=E8=B4=A7=E8=AE=B0=E5=BD=95=EF=BC=8C=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7=E8=AE=B0=E5=BD=95=E5=8D=95=E5=8F=B7=E3=80=81=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=BA=94=E5=8E=BB=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deliverJobMain/deliverJobMain.data.ts     | 23 +++++++++++--------
 .../stockupMainRecord.data.ts                 |  4 +++-
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts
index 6cf16428b..3ca07c19c 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts
@@ -44,10 +44,23 @@ export const DeliverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '客户月台代码',
+    field: 'customerDockCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: true,
+  },
   {
     label: '发货月台',
     field: 'deliverDock',
     sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isDetail: false,
+    isForm: false,
     table: {
       width: 150
     },
@@ -81,16 +94,6 @@ export const DeliverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: false,
   },
 
-  {
-    label: '客户月台代码',
-    field: 'customerDockCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-
   {
     label: '承运商',
     field: 'carrierCode',
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts
index a671a1bf7..487bc3b3a 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts
@@ -314,6 +314,7 @@ export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
     label: '操作',
     field: 'action',
     isForm: false,
+    isTable: false,
     table: {
       width: 150,
       fixed: 'right'
@@ -557,7 +558,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'interfaceType',
     dictType: DICT_TYPE.INTERFACE_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     hiddenInMain: true,
     sort: 'custom',
     table: {
@@ -618,6 +619,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     label: '操作',
     field: 'action',
     isForm: false,
+    isTable: false,
     hiddenInMain: true,
     table: {
       width: 150,

From a27bb9ad3c394757d77681c38eceda6bc869ad35 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Wed, 10 Jul 2024 14:38:42 +0800
Subject: [PATCH 294/408] =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/RouterSearch/index.vue           |  5 ++++-
 src/layout/components/ToolHeader.vue            |  8 +++++++-
 src/layout/components/UserInfo/src/UserInfo.vue | 12 +++++++++++-
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/components/RouterSearch/index.vue b/src/components/RouterSearch/index.vue
index f8b79ab99..532af4f27 100644
--- a/src/components/RouterSearch/index.vue
+++ b/src/components/RouterSearch/index.vue
@@ -170,7 +170,10 @@ defineExpose({
 .w-220px {
     width: 220px !important;
 }
-.custom-hover1{
+.custom-hover1:hover{
+  opacity: 0.5;
   background-color: transparent;
+  scale: 1.1;
+  transition: all 50ms;
 }
 </style>
\ No newline at end of file
diff --git a/src/layout/components/ToolHeader.vue b/src/layout/components/ToolHeader.vue
index ca7328fb9..fc153d386 100644
--- a/src/layout/components/ToolHeader.vue
+++ b/src/layout/components/ToolHeader.vue
@@ -77,7 +77,7 @@ export default defineComponent({
             ></LocaleDropdown>
           ) : undefined} */}
           {message.value ? (
-            <Message class="custom-hover" color="var(--top-header-text-color)"></Message>
+            <Message class="custom-hover custom-hover1" color="var(--top-header-text-color)"></Message>
           ) : undefined}
           <UserInfo></UserInfo>
         </div>
@@ -93,4 +93,10 @@ $prefix-cls: #{$namespace}-tool-header;
 .#{$prefix-cls} {
   transition: left var(--transition-time-02);
 }
+.custom-hover1:hover{
+  opacity: 0.5;
+  background-color: transparent;
+  scale: 1.2;
+  transition: all 50ms;
+}
 </style>
diff --git a/src/layout/components/UserInfo/src/UserInfo.vue b/src/layout/components/UserInfo/src/UserInfo.vue
index 3521bd443..9e7f89c23 100644
--- a/src/layout/components/UserInfo/src/UserInfo.vue
+++ b/src/layout/components/UserInfo/src/UserInfo.vue
@@ -51,7 +51,7 @@ const toDocument = () => {
 </script>
 
 <template>
-  <ElDropdown class="custom-hover" :class="prefixCls" trigger="click">
+  <ElDropdown class="custom-hover custom-hover1" :class="prefixCls" trigger="click">
     <div class="flex items-center">
       <ElAvatar :src="avatar" alt="" class="w-[calc(var(--logo-height)-25px)] rounded-[50%]" />
       <span class="pl-[5px] text-14px text-[var(--top-header-text-color)] <lg:hidden" style="color:#ffffff">
@@ -76,3 +76,13 @@ const toDocument = () => {
     </template>
   </ElDropdown>
 </template>
+
+<style lang="scss" scoped>
+
+.custom-hover1:hover{
+  opacity: 0.5;
+  background-color: transparent;
+  scale: 1.1;
+  transition: all 50ms;
+}
+</style>

From 3e8bb02d025b1f78ea3e59b9f5c96586b1d7e09e Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 10 Jul 2024 14:41:28 +0800
Subject: [PATCH 295/408] =?UTF-8?q?=E7=9B=98=E7=82=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../count/countPlanMain/countPlanMain.data.ts |   1 +
 .../countManage/count/countPlanMain/index.vue | 114 ++++++++++++------
 2 files changed, 76 insertions(+), 39 deletions(-)

diff --git a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
index 4247edc61..efda01683 100644
--- a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
+++ b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
@@ -55,6 +55,7 @@ export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isDetail:false,
     isTable:false,
     form:{
       componentProps:{
diff --git a/src/views/wms/countManage/count/countPlanMain/index.vue b/src/views/wms/countManage/count/countPlanMain/index.vue
index 4395f9e9d..eaf2b9d63 100644
--- a/src/views/wms/countManage/count/countPlanMain/index.vue
+++ b/src/views/wms/countManage/count/countPlanMain/index.vue
@@ -111,38 +111,36 @@ import {
   CountPlanDetail,
   CountPlanDetailRules,
   CountPlanMain,
-  CountPlanMainRules,
+  CountPlanMainRules
 } from './countPlanMain.data'
 import * as CountPlanMainApi from '@/api/wms/countPlanMain'
 import * as CountPlanDetailApi from '@/api/wms/countPlanDetail'
-import {Owner} from '@/views/wms/basicDataManage/orderManage/owner/owner.data'
+import { Owner } from '@/views/wms/basicDataManage/orderManage/owner/owner.data'
 import * as OwnerApi from '@/api/wms/owner'
 
-import {Supplier} from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
+import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
 import * as SupplierApi from '@/api/wms/supplier'
 
-import {Customer} from '@/views/wms/basicDataManage/customerManage/customer/customer.data'
+import { Customer } from '@/views/wms/basicDataManage/customerManage/customer/customer.data'
 import * as CustomerApi from '@/api/wms/customer'
 
-import {Itembasic} from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
+import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
 import * as ItembasicApi from '@/api/wms/itembasic'
 
-import {Warehouse} from '@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data'
+import { Warehouse } from '@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data'
 import * as WarehouseApi from '@/api/wms/warehouse'
 
-import {Area} from '@/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data'
+import { Area } from '@/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data'
 import * as AreaApi from '@/api/wms/areabasic'
 
-import {
-  Locationgroup
-} from '@/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data'
+import { Locationgroup } from '@/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data'
 import * as LocationgroupApi from '@/api/wms/locationgroup'
 
-import {Location} from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
+import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
 import * as LocationApi from '@/api/wms/location'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 
-import {DICT_TYPE, getStrDictOptions} from '@/utils/dict'
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 import BasicFormWmsCount from '@/components/BasicForm/src/BasicFormWmsCount.vue'
 
 // 盘点计划主
@@ -412,11 +410,28 @@ const openForm = async (type: string, row?: any) => {
   ] // 重置明细数据
   row = row ? row : {}
   // row.dimension = 'BY_INEVNEOTY'
-  CountPlanMain.allSchemas.formSchema.forEach((item) => {
-    if (item.field == 'crontab') {
-      item.componentProps.disabled = true
+  // CountPlanMain.allSchemas.formSchema.forEach((item) => {
+  //   if (item.field == 'crontab') {
+  //     item.componentProps.disabled = true
+  //   }
+  // })
+  if (row.type == 'CYCLE') {
+      CountPlanMain.allSchemas.formSchema.forEach((item) => {
+        if (item.field == 'crontab') {
+          item.componentProps.disabled = false
+          item.label = '执行周期'
+        }
+      })
+      CountPlanMainRules.crontab[0].required = true
+    } else {
+      CountPlanMainRules.crontab[0].required = false
+      CountPlanMain.allSchemas.formSchema.forEach((item) => {
+        if (item.field == 'crontab') {
+          item.componentProps.disabled = true
+          item.label = ''
+        }
+      })
     }
-  })
   formRef.value.open(type, row)
 
   // Promise.all([getOwnerAllList(),
@@ -572,7 +587,7 @@ const detailOpenForm = (type, row) => {
           })
           break
       }
-    } else if ( row.type == 'PROJECT') {
+    } else if (row.type == 'PROJECT') {
       formTypeDetail.value = 'InputString'
     }
   }
@@ -635,7 +650,7 @@ const handleAddTable = () => {
 // 删除明细
 const handleDeleteTable = (item, index) => {
   let itemIndex = tableData.value.indexOf(item)
-  if(itemIndex>-1){
+  if (itemIndex > -1) {
     tableData.value.splice(itemIndex, 1)
   }
 }
@@ -644,6 +659,15 @@ const tableSelectionDelete = (selection) => {
 }
 // 主子数据 提交
 const submitForm = async (formType, data) => {
+  var isHave = CountPlanMain.allSchemas.formSchema.some(function (item) {
+    return item.field === 'beginTime' || item.field === 'endTime'
+  })
+  if (isHave) {
+    if (data.beginTime && data.endTime && data.beginTime >= data.endTime) {
+      message.error('开始时间大于结束时间')
+      return
+    }
+  }
   data.subList = tableData.value.map((item) => {
     return {
       type: item.type,
@@ -721,22 +745,34 @@ const selectChange = (field, val) => {
         }
       })
     }
-    formRef.value.formRef.setValues({
-       crontab:''
-    })
-    if (val == 'DYNAMIC') {
-      CountPlanMain.allSchemas.formSchema[3].label = '限值（%）'
-      CountPlanMain.allSchemas.formSchema[3].componentProps.min = 0
-      CountPlanMain.allSchemas.formSchema[3].componentProps.max = 100
-      CountPlanMain.allSchemas.formSchema[3].componentProps.disabled = false
-    } else if (val == 'LOW' || val == 'RANDOM') {
-      CountPlanMain.allSchemas.formSchema[3].label = '限值'
-      CountPlanMain.allSchemas.formSchema[3].componentProps.min = 0
-      CountPlanMain.allSchemas.formSchema[3].componentProps.max = Infinity
-      CountPlanMain.allSchemas.formSchema[3].componentProps.disabled = false
-    } else {
-      CountPlanMain.allSchemas.formSchema[3].componentProps.disabled = true
-    }
+    formRef.value.formRef.setValues({
+      crontab: ''
+    })
+    // if (val == 'DYNAMIC') {
+    //   CountPlanMain.allSchemas.formSchema.forEach(item=>{
+    //     if(item.field == 'limitedValue'){
+    //       item.label = '限值（%）'
+    //       item.componentProps.min = 0
+    //       item.componentProps.max = 100
+    //       item.componentProps.disabled = false
+    //     }
+    //   })
+    // } else if (val == 'LOW' || val == 'RANDOM') {
+    //   CountPlanMain.allSchemas.formSchema.forEach(item=>{
+    //     if(item.field == 'limitedValue'){
+    //       item.label = '限值（%）'
+    //       item.componentProps.min = 0
+    //       item.componentProps.max =Infinity
+    //       item.componentProps.disabled = false
+    //     }
+    //   })
+    // } else {
+    //   CountPlanMain.allSchemas.formSchema.forEach(item=>{
+    //     if(item.field == 'limitedValue'){
+    //       item.componentProps.disabled = true
+    //     }
+    //   })
+    // }
   }
 }
 const formTypeDetail = ref('InputString') //盘点详情子表新增的时候判断盘点范围值显示输入框还是下拉框
@@ -823,7 +859,7 @@ const selectChangeDetail = (field, val) => {
         case 'ITEMS_CODE':
           CountPlanDetail.allSchemas.formSchema.forEach((item) => {
             if (item.field == 'value') {
-              item.componentProps.isInpuFocusShow = true
+              item.componentProps.isSearchList = true
               item.componentProps.searchTitle = '物品信息'
               item.componentProps.searchAllSchemas = Itembasic.allSchemas
               item.componentProps.searchPage = ItembasicApi.getItembasicPage
@@ -833,7 +869,7 @@ const selectChangeDetail = (field, val) => {
         case 'WAREHOUSE_CODE':
           CountPlanDetail.allSchemas.formSchema.forEach((item) => {
             if (item.field == 'value') {
-              item.componentProps.isInpuFocusShow = true
+              item.componentProps.isSearchList = true
               item.componentProps.searchTitle = '仓库信息'
               item.componentProps.searchAllSchemas = Warehouse.allSchemas
               item.componentProps.searchPage = WarehouseApi.getWarehousePage
@@ -843,7 +879,7 @@ const selectChangeDetail = (field, val) => {
         case 'AREABASIC_CODE':
           CountPlanDetail.allSchemas.formSchema.forEach((item) => {
             if (item.field == 'value') {
-              item.componentProps.isInpuFocusShow = true
+              item.componentProps.isSearchList = true
               item.componentProps.searchTitle = '库区信息'
               item.componentProps.searchAllSchemas = Area.allSchemas
               item.componentProps.searchPage = AreaApi.getAreaPage
@@ -853,7 +889,7 @@ const selectChangeDetail = (field, val) => {
         case 'LOCATIONGROUP_CODE':
           CountPlanDetail.allSchemas.formSchema.forEach((item) => {
             if (item.field == 'value') {
-              item.componentProps.isInpuFocusShow = true
+              item.componentProps.isSearchList = true
               item.componentProps.searchTitle = '库位组信息'
               item.componentProps.searchAllSchemas = Locationgroup.allSchemas
               item.componentProps.searchPage = LocationgroupApi.getLocationgroupPage
@@ -863,7 +899,7 @@ const selectChangeDetail = (field, val) => {
         case 'LOCATION_CODE':
           CountPlanDetail.allSchemas.formSchema.forEach((item) => {
             if (item.field == 'value') {
-              item.componentProps.isInpuFocusShow = true
+              item.componentProps.isSearchList = true
               item.componentProps.searchTitle = '库位组信息'
               item.componentProps.searchAllSchemas = Location.allSchemas
               item.componentProps.searchPage = LocationApi.getLocationPage

From 952a394faddbc0e6741d055805bb84a633420e98 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Wed, 10 Jul 2024 14:43:42 +0800
Subject: [PATCH 296/408] ui

---
 src/components/RouterSearch/index.vue | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/components/RouterSearch/index.vue b/src/components/RouterSearch/index.vue
index 532af4f27..a29d5c972 100644
--- a/src/components/RouterSearch/index.vue
+++ b/src/components/RouterSearch/index.vue
@@ -17,7 +17,7 @@
       />
     </el-select> -->
   </ElDialog>
-  <div v-else class="custom-hover custom-hover1" @click.stop="showTopSearch = !showTopSearch">
+  <div v-else class="custom-hover custom-hover2" @click.stop="showTopSearch = !showTopSearch">
     <Icon icon="ep:search" color="#ffffff"/>
     <el-select
       filterable
@@ -170,10 +170,7 @@ defineExpose({
 .w-220px {
     width: 220px !important;
 }
-.custom-hover1:hover{
-  opacity: 0.5;
+.custom-hover2:hover{
   background-color: transparent;
-  scale: 1.1;
-  transition: all 50ms;
 }
 </style>
\ No newline at end of file

From 616abc00ae6b3f4f7e677e95a4f19eb69a0139bb Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Wed, 10 Jul 2024 14:52:39 +0800
Subject: [PATCH 297/408] uom

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

diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
index 2d2ddd79e..37114f603 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
+++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
@@ -918,6 +918,7 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     },
     sortTableDefault:17,
     tableForm: {
+      disabled: true,
       type: 'Select'
     }
   },

From 82f0c124b5c32d1f8b01cb59f0ac33150c808a4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com>
Date: Wed, 10 Jul 2024 14:58:47 +0800
Subject: [PATCH 298/408] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/formatTime.ts                       |  20 +-
 .../orderManage/shift/shift.data.ts           | 478 +++++++++---------
 2 files changed, 251 insertions(+), 247 deletions(-)

diff --git a/src/utils/formatTime.ts b/src/utils/formatTime.ts
index 64bb9c8b3..db7948081 100644
--- a/src/utils/formatTime.ts
+++ b/src/utils/formatTime.ts
@@ -26,11 +26,10 @@ export function formatDate(date: Date | number, format?: string): string {
 /**
  * 获取当前的日期+时间
  */
-export function addDay(date: Date | number,addDay:number) {
-  return dayjs(date).add(addDay,'day')
+export function addDay(date: Date | number, addDay: number) {
+  return dayjs(date).add(addDay, 'day')
 }
 
-
 /**
  * 获取当前的日期+时间
  */
@@ -163,6 +162,21 @@ export const dateFormatter = (row, column, cellValue) => {
   }
   return formatDate(cellValue)
 }
+/**
+ * element plus 的时间 Formatter 实现，使用 YYYY-MM-DD HH:mm:ss 格式
+ *
+ * @param row 行数据
+ * @param column 字段
+ * @param cellValue 字段值
+ */
+// @ts-ignore
+export const dateFormatter3 = (row, column, cellValue) => {
+  if (!cellValue) {
+    return
+  }
+  let str = formatDate(cellValue).split(' ')[1]
+  return str
+}
 // 获取时间戳
 export const formatGetTime = (row, column, cellValue) => {
   console.log(cellValue.getTime())
diff --git a/src/views/wms/basicDataManage/orderManage/shift/shift.data.ts b/src/views/wms/basicDataManage/orderManage/shift/shift.data.ts
index df23c425a..045efa49a 100644
--- a/src/views/wms/basicDataManage/orderManage/shift/shift.data.ts
+++ b/src/views/wms/basicDataManage/orderManage/shift/shift.data.ts
@@ -1,283 +1,273 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter, dateFormatter3 } from '@/utils/formatTime'
 const { t } = useI18n() // 国际化
 
-import {validateYS} from '@/utils/validator'
+import { validateYS } from '@/utils/validator'
 
 /**
  * @returns {Array} 班次
  */
-export const Shift = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '代码',
-    field: 'code',
-    sort: 'custom',
-    table: {
-      width: 150,
-      fixed: 'left'
+export const Shift = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '代码',
+      field: 'code',
+      sort: 'custom',
+      table: {
+        width: 150,
+        fixed: 'left'
+      },
+      isSearch: true
     },
-    isSearch: true,
-  },
-  {
-    label: '名称',
-    field: 'name',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '开始时间',
-    field: 'beginTime',
-    isTable: true,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180,
-    },
-    form: {
-      component: 'TimePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'time',
-        dateFormat: 'HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '名称',
+      field: 'name',
+      sort: 'custom',
+      table: {
+        width: 150
       }
     },
-    isSearch: false,
-    search: {
-      show: false,
-      component: 'TimePicker',
-      componentProps: {
-        valueFormat: 'HH:mm:ss',
-        type: 'timeSelect',
+    {
+      label: '开始时间',
+      field: 'beginTime',
+      isTable: true,
+      formatter: dateFormatter3,
+      detail: {
+        dateFormat: 'HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'TimePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'time',
+          dateFormat: 'HH:mm:ss',
+          valueFormat: 'x'
+        }
+      },
+      isSearch: false,
+      search: {
+        show: false,
+        component: 'TimePicker',
+        componentProps: {
+          valueFormat: 'HH:mm:ss',
+          type: 'timeSelect'
+        }
       }
-    }
-  },
-  {
-    label: '结束时间',
-    field: 'entTime',
-    isTable: true,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'HH:mm:ss',
-    },
-    sort: 'custom',
-    table: {
-      width: 180
     },
-    form: {
-      component: 'TimePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'time',
-        dateFormat: 'HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '结束时间',
+      field: 'entTime',
+      isTable: true,
+      formatter: dateFormatter3,
+      detail: {
+        dateFormat: 'HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'TimePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'time',
+          dateFormat: 'HH:mm:ss',
+          valueFormat: 'x'
+        }
+      },
+      isSearch: false,
+      search: {
+        show: false,
+        component: 'TimePicker',
+        componentProps: {
+          valueFormat: 'HH:mm:ss',
+          type: 'timeSelect'
+        }
       }
     },
-    isSearch: false,
-    search: {
-      show: false,
-      component: 'TimePicker',
-      componentProps: {
-        valueFormat: 'HH:mm:ss',
-        type: 'timeSelect',
+    {
+      label: '是否跨天',
+      field: 'endAtNextDay',
+      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: 'endAtNextDay',
-    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: 'available',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: true,
+      isSearch: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
       }
     },
-  },
-  {
-    label: '是否可用',
-    field: 'available',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    isSearch: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    {
+      label: '生效时间',
+      field: 'activeTime',
+      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'
+        }
       }
     },
-  },
-  {
-    label: '生效时间',
-    field: 'activeTime',
-    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',
+    {
+      label: '失效时间',
+      field: 'expireTime',
+      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'
+        }
       }
     },
-  },
-  {
-    label: '失效时间',
-    field: 'expireTime',
-    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',
+    {
+      label: '备注',
+      field: 'remark',
+      sort: 'custom',
+      table: {
+        width: 150
       }
     },
-  },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    isForm: false,
-    table: {
-      width: 180
+    {
+      label: '创建时间',
+      field: 'createTime',
+      isForm: false,
+      table: {
+        width: 180
+      },
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      }
     },
-    formatter: dateFormatter,
-    detail: {
-      dateFormat : 'YYYY-MM-DD HH:mm:ss'
+    {
+      label: '创建者',
+      field: 'creator',
+      table: {
+        width: 130
+      },
+      isForm: false,
+      isTable: true
     },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      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: 'creator',
-    table: {
-      width: 130
-    },
-    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
+    {
+      label: '最后更新者',
+      field: 'updater',
+      isDetail: true,
+      isForm: false,
+      isTable: false,
+      table: {
+        width: 150
+      }
     },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '操作',
+      field: 'action',
+      isDetail: false,
+      isForm: false,
+      table: {
+        width: 150,
+        fixed: 'right'
       }
     }
-  },
-  {
-    label: '最后更新者',
-    field: 'updater',
-    isDetail: true,
-    isForm: false,
-    isTable: false,
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '操作',
-    field: 'action',
-    isDetail: false,
-    isForm: false ,
-    table: {
-      width: 150,
-      fixed: 'right'
-    }
-  }
-]))
+  ])
+)
 
 //表单校验
 export const ShiftRules = reactive({
   code: [
     { required: true, message: '请输入代码', trigger: 'blur' },
     { max: 50, message: '不得超过50个字符', trigger: 'blur' },
-    { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'}
-  ],
-  name: [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
-  ],
-  remark: [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
-  ],
-  beginTime: [
-    { required: true, message: '请输入开始时间', trigger: 'blur' }
-  ],
-  entTime: [
-    { required: true, message: '请输入结束时间', trigger: 'blur' }
-  ],
-  endAtNextDay: [
-    { required: true, message: '请选择是否跨天', trigger: 'change' }
-  ],
-  available:  [
-    { required: true, message: '请选择是否可用', trigger: 'change' }
+    { validator: validateYS, message: '请输入正确的代码', trigger: 'blur' }
   ],
+  name: [{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
+  remark: [{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
+  beginTime: [{ required: true, message: '请输入开始时间', trigger: 'blur' }],
+  entTime: [{ required: true, message: '请输入结束时间', trigger: 'blur' }],
+  endAtNextDay: [{ required: true, message: '请选择是否跨天', trigger: 'change' }],
+  available: [{ required: true, message: '请选择是否可用', trigger: 'change' }]
 })

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 299/408] =?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 e6dc07c54a7678bdc7cc3562378ab4fa0f84116b Mon Sep 17 00:00:00 2001
From: bjang03 <259278618@qq.com>
Date: Wed, 10 Jul 2024 15:35:48 +0800
Subject: [PATCH 300/408] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=20=E7=9B=98?=
 =?UTF-8?q?=E7=82=B9=E5=AD=90=E8=A1=A8=E5=A2=9E=E5=8A=A0=E4=BB=93=E5=BA=93?=
 =?UTF-8?q?=E3=80=81=E5=BA=93=E5=8C=BA=E3=80=81=E5=BA=93=E4=BD=8D=E7=BB=84?=
 =?UTF-8?q?=E3=80=81=E5=BA=93=E4=BD=8D=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../countadjustRecordMain.data.ts             | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts
index baa353828..3c7f73c51 100644
--- a/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts
+++ b/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts
@@ -51,22 +51,22 @@ export const CountadjustRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     isTable:true,
     isForm: true
   },
-  {
-    label: '出库事务类型',
-    field: 'outTransactionType',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '入库事务类型',
-    field: 'inTransactionType',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  // {
+  //   label: '出库事务类型',
+  //   field: 'outTransactionType',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '入库事务类型',
+  //   field: 'inTransactionType',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
     label: '申请时间',
     field: 'requestTime',

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 301/408] 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 251004521efdf3c539d95d1ac90bd0660a7b5f9e Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Wed, 10 Jul 2024 15:51:23 +0800
Subject: [PATCH 302/408] =?UTF-8?q?WMS=20=E2=80=94=E2=80=94>=20bug=20=20?=
 =?UTF-8?q?=E5=A4=87=E8=B4=A7=E7=94=B3=E8=AF=B7=EF=BC=8C=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E4=BB=8E=E5=BA=93=E4=BD=8D=EF=BC=8C=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E6=B2=A1=E6=9C=89=E4=BF=9D=E5=AD=98=E4=B8=8A=EF=BC=8C?=
 =?UTF-8?q?=E6=88=96=E5=8E=BB=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stockup/stockupMainRequest/stockupMainRequest.data.ts       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
index acdc78077..e40c37748 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
@@ -741,6 +741,8 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     label: '从库位',
     field: 'fromLocationCode',
     sort: 'custom',
+    isTableForm: false,
+    isTable: false,
     table: {
       width: 150
     },

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 303/408] 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 304/408] =?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 305/408] 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 0a77c3fc1aa1bb7cf35993d09bb76d7b1394cff1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com>
Date: Wed, 10 Jul 2024 16:49:20 +0800
Subject: [PATCH 306/408] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/inspectionJob/index.vue         |  596 ++--
 .../inspectionJob/inspectionJobMain.data.ts   | 1135 +++---
 .../inspectionRecordMain.data.ts              |  756 ++--
 .../inspectionRequestMain.data.ts             |  784 +++--
 .../purchasereceiptJobMain.data.ts            | 3038 ++++++++---------
 5 files changed, 3201 insertions(+), 3108 deletions(-)

diff --git a/src/views/qms/inspectionJob/index.vue b/src/views/qms/inspectionJob/index.vue
index 3566e702d..34ac036b8 100644
--- a/src/views/qms/inspectionJob/index.vue
+++ b/src/views/qms/inspectionJob/index.vue
@@ -1,33 +1,52 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="InspectionJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search
+      :schema="InspectionJobMain.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
   </ContentWrap>
 
   <!-- 列表头部 -->
-  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
-    @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick"
-    :allSchemas="InspectionJobMain.allSchemas" />
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="InspectionJobMain.allSchemas"
+  />
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
         total: tableObject.total
-      }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
-      v-model:sort="tableObject.sort">
-      <template #number="{row}">
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{ row }">
         <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
           <span>{{ row.number }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBase
+          :Butttondata="butttondata(row)"
+          @button-base-click="buttonTableClick($event, row)"
+        />
       </template>
     </Table>
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-    <AddForm
+  <AddForm
     ref="formRef"
     basicFormWidth="80"
     :formAllSchemasFeatures="InspectionTemplateFeatures.allSchemas"
@@ -41,298 +60,357 @@
   />
   <!-- 详情 -->
   <Detail
-  ref="detailRef" :isBasic="false" :allSchemas="InspectionJobMain.allSchemas"
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="InspectionJobMain.allSchemas"
     :detailAllSchemas="InspectionJobDetail.allSchemas"
     :detailAllSchemasRules="InspectionJobDetailRules"
     :apiCreate="InspectionJobDetailApi.createInspectionJobDetail"
     :apiUpdate="InspectionJobDetailApi.updateInspectionJobDetail"
     :apiPage="InspectionJobDetailApi.getInspectionJobDetailPage"
-    :apiDelete="InspectionJobDetailApi.deleteInspectionJobDetail" @searchTableSuccessDetail="searchTableSuccessDetail"
-    :isShowAddBtn="false" :detailButtonIsShow="true"
+    :apiDelete="InspectionJobDetailApi.deleteInspectionJobDetail"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+    :isShowAddBtn="false"
+    :detailButtonIsShow="true"
   />
   <!-- 包装信息 -->
-  <ListTable ref="listTableRef" titleName="包装信息" :allSchemas="InspectionJobMain.allSchemas"
-    :detailAllSchemas="InspectionJobPackage.allSchemas" :detailAllSchemasRules="InspectionJobPackageRules"
-    :list="list" />
+  <ListTable
+    ref="listTableRef"
+    titleName="包装信息"
+    :allSchemas="InspectionJobMain.allSchemas"
+    :detailAllSchemas="InspectionJobPackage.allSchemas"
+    :detailAllSchemasRules="InspectionJobPackageRules"
+    :list="list"
+  />
 </template>
 
 <script setup lang="ts">
-  import download from '@/utils/download'
-  import { InspectionJobMain, InspectionJobMainRules, InspectionJobDetail, InspectionJobDetailRules,InspectionJobPackage,InspectionJobPackageRules} from './inspectionJobMain.data'
-  import { InspectionTemplateMain,InspectionTemplateProcess,InspectionTemplateFeatures,InspectionTemplateRules } from '../inspectionTemplate/inspectionTemplate.data'
+import download from '@/utils/download'
+import {
+  InspectionJobMain,
+  InspectionJobMainRules,
+  InspectionJobDetail,
+  InspectionJobDetailRules,
+  InspectionJobPackage,
+  InspectionJobPackageRules
+} from './inspectionJobMain.data'
+import {
+  InspectionTemplateMain,
+  InspectionTemplateProcess,
+  InspectionTemplateFeatures,
+  InspectionTemplateRules
+} from '../inspectionTemplate/inspectionTemplate.data'
 
-  import * as InspectionJobPackageApi from '@/api/qms/inspectionJob/InspectionJobPackage/InspectionJobPackage'
-  import * as InspectionJobMainApi from '@/api/qms/inspectionJob/inspectionJobMain'
-  import * as InspectionJobDetailApi from '@/api/qms/inspectionJob/inspectionJobDetail'
-  import * as defaultButtons from '@/utils/disposition/defaultButtons'
-  import ListTable from '@/components/ListTable/src/ListTable.vue'
-  import TableHead from '@/components/TableHead/src/TableHead.vue'
-  import AddForm from './addForm.vue'
-  import Detail from './detail.vue'
+import * as InspectionJobPackageApi from '@/api/qms/inspectionJob/InspectionJobPackage/InspectionJobPackage'
+import * as InspectionJobMainApi from '@/api/qms/inspectionJob/inspectionJobMain'
+import * as InspectionJobDetailApi from '@/api/qms/inspectionJob/inspectionJobDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import ListTable from '@/components/ListTable/src/ListTable.vue'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import AddForm from './addForm.vue'
+import Detail from './detail.vue'
+import { getReportUrl } from '@/utils/systemParam'
 
-  // 采购订单
-  defineOptions({ name: 'InspectionJobMain' })
+// 采购订单
+defineOptions({ name: 'InspectionJobMain' })
 
-  const message = useMessage() // 消息弹窗
-  const { t } = useI18n() // 国际化
-  const route = useRoute() // 路由信息
-  const routeName = ref()
-  routeName.value = route.name
-  const tableColumns = ref(InspectionJobMain.allSchemas.tableColumns)
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(InspectionJobMain.allSchemas.tableColumns)
 
-  // 字段设置 更新主列表字段
-  const updataTableColumns = (val) => {
-    tableColumns.value = val
-  }
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
 
-  // 查询页面返回
-  const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
-    nextTick(async () => {
-      if (type == 'tableForm') {
-        // 明细查询页赋值
-        row[formField] = val[0][searchField]
-        // row['itemNumber'] = val[0]['number']
-        // row['itemName'] = val[0]['name']
-        // row['uom'] = val[0]['uom']
-        // row['isRadeIn'] = val[0]['isRadeIn']
-        // row['available'] = val[0]['available']
-      } else {
-        const setV = {}
-        setV[formField] = val[0][searchField]
-        formRef.setValues(setV)
-      }
-    })
-  }
-  // 查询页面返回——详情
-  const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
-    nextTick(async () => {
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
+  nextTick(async () => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      row[formField] = val[0][searchField]
+      // row['itemNumber'] = val[0]['number']
+      // row['itemName'] = val[0]['name']
+      // row['uom'] = val[0]['uom']
+      // row['isRadeIn'] = val[0]['isRadeIn']
+      // row['available'] = val[0]['available']
+    } else {
       const setV = {}
-      // if(formField == 'itemCode'){
-      //     await ItembasicApi.getItembasicPage({
-      //       code: setV['itemCode']
-      //     }).then(res => {
-      //       setV['uom'] = res.list[0].uom
-      //       setV[formField] = val[0][searchField]
-      //     })
-      //   }
+      setV[formField] = val[0][searchField]
       formRef.setValues(setV)
-    })
-  }
-
-  // 子表新增的时候选择表格之后需要会显得字段
-  const Echo = []
-  const { tableObject, tableMethods } = useTable({
-    getListApi: InspectionJobMainApi.getInspectionJobMainPage // 分页接口
+    }
   })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
+  nextTick(async () => {
+    const setV = {}
+    // if(formField == 'itemCode'){
+    //     await ItembasicApi.getItembasicPage({
+    //       code: setV['itemCode']
+    //     }).then(res => {
+    //       setV['uom'] = res.list[0].uom
+    //       setV[formField] = val[0][searchField]
+    //     })
+    //   }
+    formRef.setValues(setV)
+  })
+}
 
-  // 获得表格的各种操作
-  const { getList, setSearchParams } = tableMethods
+// 子表新增的时候选择表格之后需要会显得字段
+const Echo = []
+const { tableObject, tableMethods } = useTable({
+  getListApi: InspectionJobMainApi.getInspectionJobMainPage // 分页接口
+})
 
-  // 列表头部按钮
-  const HeadButttondata = [
-    defaultButtons.defaultFreshBtn(null), // 刷新
-    defaultButtons.defaultFilterBtn(null), // 筛选
-    defaultButtons.defaultSetBtn(null), // 设置
-  ]
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
 
-  // 头部按钮事件
-  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 HeadButttondata = [
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null) // 设置
+]
 
-  // 根据状态返回该按钮是否显示
-  const isShowMainButton = (row, val) => {
-    if (val.indexOf(row.status) > -1) {
-      return false
-    } else {
-      return true
-    }
+// 头部按钮事件
+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 isShowMainButton2 = (row, val) => {
-    if (val.indexOf(row.isStaging) > -1) {
-      return false
-    } else {
-      return true
-    }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row, val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
   }
+}
 
-  // 列表-操作按钮
-  const butttondata = (row) => {
-    return [
-      defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1']),hasPermi:'qms:inspection-job-main:accept'}), // 承接
-      defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'qms:inspection-job-main:close'}), // 关闭
-      defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2']),hasPermi:'qms:inspection-job-main:abandon'}), // 放弃
-      defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2']),hasPermi:'qms:inspection-job-main:execute'}), // 执行
-      defaultButtons.mainListOrderPubBtn({hide:isShowMainButton2(row,['TRUE']),hasPermi:'qms:inspection-job-main:execute'}), // 发布
-      defaultButtons.mainListPackageBtn(null), // 包装
-    ]
+// 根据状态返回该按钮是否显示
+const isShowMainButton2 = (row, val) => {
+  if (val.indexOf(row.isStaging) > -1) {
+    return false
+  } else {
+    return true
   }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListJobAccBtn({
+      hide: isShowMainButton(row, ['1']),
+      hasPermi: 'qms:inspection-job-main:accept'
+    }), // 承接
+    defaultButtons.mainListJobCloBtn({
+      hide: isShowMainButton(row, ['1']),
+      hasPermi: 'qms:inspection-job-main:close'
+    }), // 关闭
+    defaultButtons.mainListJobAbaBtn({
+      hide: isShowMainButton(row, ['2']),
+      hasPermi: 'qms:inspection-job-main:abandon'
+    }), // 放弃
+    defaultButtons.mainListJobExeBtn({
+      hide: isShowMainButton(row, ['2']),
+      hasPermi: 'qms:inspection-job-main:execute'
+    }), // 执行
+    defaultButtons.mainListOrderPubBtn({
+      hide: isShowMainButton2(row, ['TRUE']),
+      hasPermi: 'qms:inspection-job-main:execute'
+    }), // 发布
+    defaultButtons.mainListPackageBtn(null), // 包装
+    defaultButtons.mainListPlanCheckQualityReportBtn({}) // 查看质检报告
+  ]
+}
 const listTableRef = ref()
 const list = ref([])
-  // 列表-操作按钮事件
-  const buttonTableClick = async (val, row) => {
-    if (val == 'mainJobExe') { // 执行
-      execute('execute', row)
-    }else if (val == 'mainPackage') { // 包装
-      
-      list.value = await InspectionJobPackageApi.getInspectionJobPackageList(row.id)
-      // row.status = '1'
-      listTableRef.value.openPackage(row,'包装信息',InspectionJobPackage.allSchemas.tableColumns)
-    }else if (val == 'mainJobAba') { // 放弃
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainJobExe') {
+    // 执行
+    execute('execute', row)
+  } else if (val == 'mainPackage') {
+    // 包装
+
+    list.value = await InspectionJobPackageApi.getInspectionJobPackageList(row.id)
+    // row.status = '1'
+    listTableRef.value.openPackage(row, '包装信息', InspectionJobPackage.allSchemas.tableColumns)
+  } else if (val == 'mainJobAba') {
+    // 放弃
     handleAbandon(row.id)
-  } else if (val == 'mainJobClo') { // 关闭
+  } else if (val == 'mainJobClo') {
+    // 关闭
     handleClose(row.id)
-  }  else if (val == 'mainOrderPub') { // 发布
+  } else if (val == 'mainOrderPub') {
+    // 发布
     handleRelease(row.id)
-  } else if (val == 'mainJobAcc') { // 承接
+  } else if (val == 'mainPlanCheckQualityReport') {
+    // 查看质检报告
+    checkQualityReport(row)
+  } else if (val == 'mainJobAcc') {
+    // 承接
     handleAccept(row.id)
   }
-  }
+}
 
-  /** 添加/修改操作 */
-  // const formRef = ref()
-  // const openForm = async (type : string, row ?: number) => {
-  //   tableData.value = [] // 重置明细数据
-  //   formRef.value.open(type, row)
-  // }
+// 查看质检报告
+const showQualityReport = ref(false)
+const qualityReport = ref('')
+const checkQualityReport = async (row) => {
+  showQualityReport.value = true
+  qualityReport.value = `${getReportUrl()}/purchasereceiptReport?asnNumber=${row.asnNumber}`
+}
 
-  /** 详情操作 */
-  const detailRef = ref()
-  const openDetail = (row : any, titleName : any, titleValue : any) => {
-    detailRef.value.openDetail(row, titleName, titleValue, 'basicInspectionJobMain')
-  }
-  //执行
-  
-  const formRef = ref()
-  const execute = async (type : string, row ?: number) => {
-    formRef.value.open(type, row)
-  }
-  /** 关闭按钮操作 */
-  const handleClose = async (id : number) => {
-    try {
-      // 删除的二次确认
-      await message.confirm(t('common.confirmColse'))
-      // 发起删除
-      await InspectionJobMainApi.closeInspectionJobMain(id)
-      message.success(t('common.closeSuccess'))
-      // 刷新列表
-      await getList()
-    } catch { }
-  }
-  /** 发布按钮操作 */
-  const handleRelease = async (id : number) => {
-    try {
-      // 发布的二次确认
-      await message.confirm('确认发布吗？')
-      // 发起发布
-      await InspectionJobMainApi.releaseInspectionJobMain(id)
-      message.success('发布成功！')
-      // 刷新列表
-      await getList()
-    } catch { }
-  }
-  // 承接
-  const handleAccept = async (id : number) => {
-    try {
-      // 承接的二次确认
-      await message.confirm(t('common.confirmAccept'))
-      // 发起承接
-      await InspectionJobMainApi.acceptInspectionJobMain(id)
-      message.success(t('common.acceptSuccess'))
-      // 刷新列表
-      await getList()
-    } catch { }
-  }
-  // 放弃任务
-  const handleAbandon = async (id : number) => {
-    try {
-      // 放弃的二次确认
-      await message.confirm(t('common.confirmGiveup'))
-      // 发起放弃
-      await InspectionJobMainApi.abandonInspectionJobMain(id)
-      message.success(t('common.giveupSuccess'))
-      // 刷新列表
-      await getList()
-    } catch { }
-  }
-  
-  /** 导出按钮操作 */
-  const exportLoading = ref(false) // 导出的加载中
-  const handleExport = async () => {
-    try {
-      // 导出的二次确认
-      await message.exportConfirm()
-      // 发起导出
-      exportLoading.value = true
-      const data = await InspectionJobMainApi.exportInspectionJobMain(tableObject.params)
-      download.excel(data, '检验任务.xlsx')
-    } catch {
-    } finally {
-      exportLoading.value = false
-    }
-  }
+/** 添加/修改操作 */
+// const formRef = ref()
+// const openForm = async (type : string, row ?: number) => {
+//   tableData.value = [] // 重置明细数据
+//   formRef.value.open(type, row)
+// }
 
-  /**
-    * tableForm方法
-  */
-  const tableFormKeys = {}
-  InspectionJobDetail.allSchemas.tableFormColumns.forEach(item => {
-    tableFormKeys[item.field] = item.default ? item.default : ''
-  })
-  const tableData = ref([])
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicInspectionJobMain')
+}
+//执行
 
+const formRef = ref()
+const execute = async (type: string, row?: number) => {
+  formRef.value.open(type, row)
+}
+/** 关闭按钮操作 */
+const handleClose = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.confirm(t('common.confirmColse'))
+    // 发起删除
+    await InspectionJobMainApi.closeInspectionJobMain(id)
+    message.success(t('common.closeSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+/** 发布按钮操作 */
+const handleRelease = async (id: number) => {
+  try {
+    // 发布的二次确认
+    await message.confirm('确认发布吗？')
+    // 发起发布
+    await InspectionJobMainApi.releaseInspectionJobMain(id)
+    message.success('发布成功！')
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+// 承接
+const handleAccept = async (id: number) => {
+  try {
+    // 承接的二次确认
+    await message.confirm(t('common.confirmAccept'))
+    // 发起承接
+    await InspectionJobMainApi.acceptInspectionJobMain(id)
+    message.success(t('common.acceptSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+// 放弃任务
+const handleAbandon = async (id: number) => {
+  try {
+    // 放弃的二次确认
+    await message.confirm(t('common.confirmGiveup'))
+    // 发起放弃
+    await InspectionJobMainApi.abandonInspectionJobMain(id)
+    message.success(t('common.giveupSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
 
-  // 主子数据 提交
-  const submitForm = async (formType, data) => {
-    // return
-    try {
-      if (formType === 'create') {
-        await InspectionJobMainApi.createInspectionJobMain(data)
-        message.success(t('common.createSuccess'))
-      } else if(formType === 'execute') {
-        await InspectionJobMainApi.executeInspectionJobMain(data)
-        message.success(t('common.updateSuccess'))
-      }
-      formRef.value.dialogVisible = false
-      // 刷新当前列表
-      getList()
-    } finally {
-      formRef.value.formLoading = false
-    }
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await InspectionJobMainApi.exportInspectionJobMain(tableObject.params)
+    download.excel(data, '检验任务.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
   }
+}
 
-  /** 导入 */
-  const importFormRef = ref()
-  const handleImport = () => {
-    importFormRef.value.open()
+/**
+ * tableForm方法
+ */
+const tableFormKeys = {}
+InspectionJobDetail.allSchemas.tableFormColumns.forEach((item) => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  // return
+  try {
+    if (formType === 'create') {
+      await InspectionJobMainApi.createInspectionJobMain(data)
+      message.success(t('common.createSuccess'))
+    } else if (formType === 'execute') {
+      await InspectionJobMainApi.executeInspectionJobMain(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 searchFormClick = (searchData) => {
-    tableObject.params = {
-      isSearch: true,
-      filters: searchData.filters
-    }
-    getList() // 刷新当前列表
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
   }
+  getList() // 刷新当前列表
+}
 
-  /** 初始化 **/
-  onMounted(async () => {
-    getList()
-    // importTemplateData.templateUrl = await InspectionJobMainApi.importTemplate()
-  })
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  // importTemplateData.templateUrl = await InspectionJobMainApi.importTemplate()
+})
 </script>
diff --git a/src/views/qms/inspectionJob/inspectionJobMain.data.ts b/src/views/qms/inspectionJob/inspectionJobMain.data.ts
index a9d51f446..1db4e1263 100644
--- a/src/views/qms/inspectionJob/inspectionJobMain.data.ts
+++ b/src/views/qms/inspectionJob/inspectionJobMain.data.ts
@@ -2,434 +2,454 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter2 } from '@/utils/formatTime'
 import { validateHanset, validateEmail } from '@/utils/validator'
 import { dateFormatter } from '@/utils/formatTime'
-import { validateTwoNum,validateSixNum} from '@/utils/validator'
+import { validateTwoNum, validateSixNum } from '@/utils/validator'
 const { t } = useI18n() // 国际化
 import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
-const resultEntryMethodList =  getStrDictOptions(DICT_TYPE.INSPECTION_CHARACTERISTICS_RESULT_ENTRY)
-const featureTypeList =  getStrDictOptions( DICT_TYPE.INSPECTION_CHARACTERISTICS_FEATURE_TYPE )
-const isCanUpdateList = [{
-  label:'是',
-  value:true
-},{
-  label:'否',
-  value:false
-}]
+const resultEntryMethodList = getStrDictOptions(DICT_TYPE.INSPECTION_CHARACTERISTICS_RESULT_ENTRY)
+const featureTypeList = getStrDictOptions(DICT_TYPE.INSPECTION_CHARACTERISTICS_FEATURE_TYPE)
+const isCanUpdateList = [
+  {
+    label: '是',
+    value: true
+  },
+  {
+    label: '否',
+    value: false
+  }
+]
 
 /**
  * @returns {Array} 检验任务主表
  */
-export const InspectionJobMain = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '编码',
-    field: 'number',
-    sort: 'custom',
-    isSearch: true,
-    form: {
-      componentProps:{
-        disabled:true
-      }
-    },
-    table: {
-      width: 200,
-      fixed: 'left'
-    }
-  },
-  {
-    label: '申请单号',
-    field: 'requestNumber',
-    sort: 'custom',
-    isSearch: true,
-    form: {
-      componentProps:{
-        disabled:true
+export const InspectionJobMain = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '编码',
+      field: 'number',
+      sort: 'custom',
+      isSearch: true,
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
+      table: {
+        width: 200,
+        fixed: 'left'
       }
     },
-    table: {
-      width: 200
-    }
-  },
-  {
-    label: '供应商编码',
-    field: 'supplierCode',
-    sort: 'custom',
-    isSearch: true,
-    form: {
-      componentProps:{
-        disabled:true
+    {
+      label: '申请单号',
+      field: 'requestNumber',
+      sort: 'custom',
+      isSearch: true,
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
+      table: {
+        width: 200
       }
     },
-    table: {
-      width: 175
-    }
-  },{
-    label: '供应商名称',
-    field: 'supplierName',
-    sort: 'custom',
-    isSearch: false,
-    table: {
-      width: 175
+    {
+      label: '发货单号',
+      field: 'asnNumber',
+      sort: 'custom',
+      isSearch: false,
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
+      table: {
+        width: 150
+      }
     },
-    form: {
-      componentProps:{
-        disabled:true
+    {
+      label: '供应商编码',
+      field: 'supplierCode',
+      sort: 'custom',
+      isSearch: true,
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
+      table: {
+        width: 175
       }
     },
-  },
-  {
-    label: '物料编码',
-    field: 'itemCode',
-    sort: 'custom',
-    isSearch: false,
-    table: {
-      width: 150
+    {
+      label: '供应商名称',
+      field: 'supplierName',
+      sort: 'custom',
+      isSearch: false,
+      table: {
+        width: 175
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      }
     },
-    form: {
-      componentProps:{
-        disabled:true
+    {
+      label: '物料编码',
+      field: 'itemCode',
+      sort: 'custom',
+      isSearch: false,
+      table: {
+        width: 150
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
       }
     },
-  },
-  {
-    label: '物料名称',
-    field: 'itemName',
-    sort: 'custom',
-    isSearch: false,
-    table: {
-      width: 175
+    {
+      label: '物料名称',
+      field: 'itemName',
+      sort: 'custom',
+      isSearch: false,
+      table: {
+        width: 175
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      }
     },
-    form: {
-      componentProps:{
-        disabled:true
+    {
+      label: '物料批次',
+      field: 'batch',
+      sort: 'custom',
+      isSearch: false,
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
+      table: {
+        width: 150
       }
     },
-  },
-  {
-    label: '物料批次',
-    field: 'batch',
-    sort: 'custom',
-    isSearch: false,
-    form: {
-      componentProps:{
-        disabled:true
+    {
+      label: '参考订单号',
+      field: 'referenceOrderCode',
+      sort: 'custom',
+      isSearch: false,
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
+      table: {
+        width: 150
       }
     },
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '参考订单号',
-    field: 'referenceOrderCode',
-    sort: 'custom',
-    isSearch: false,
-    form: {
-      componentProps:{
-        disabled:true
+    {
+      label: '参考订单行',
+      field: 'referenceOrderRow',
+      sort: 'custom',
+      isSearch: false,
+      form: {
+        component: 'InputNumber',
+        value: 0,
+        componentProps: {
+          disabled: true
+        }
+      },
+      table: {
+        width: 150
       }
     },
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '参考订单行',
-    field: 'referenceOrderRow',
-    sort: 'custom',
-    isSearch: false,
-    form: {
-      component: 'InputNumber',
-      value: 0,
-      componentProps:{
-        disabled:true
-      }
-    },
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '参考凭证号',
-    field: 'referenceCertificateCode',
-    sort: 'custom',
-    isSearch: false,
-    form: {
-      componentProps:{
-        disabled:true
+    {
+      label: '参考凭证号',
+      field: 'referenceCertificateCode',
+      sort: 'custom',
+      isSearch: false,
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
+      table: {
+        width: 150
       }
     },
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '参考凭证行',
-    field: 'referenceCertificateRow',
-    sort: 'custom',
-    isSearch: false,
-    form: {
-      component: 'InputNumber',
-      value: 0,
-      componentProps:{
-        disabled:true
-      }
-    },
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '检验方案编码',
-    field: 'inspectionSchemeCode',
-    sort: 'custom',
-    isSearch: false,
-    form: {
-      componentProps:{
-        disabled:true
+    {
+      label: '参考凭证行',
+      field: 'referenceCertificateRow',
+      sort: 'custom',
+      isSearch: false,
+      form: {
+        component: 'InputNumber',
+        value: 0,
+        componentProps: {
+          disabled: true
+        }
+      },
+      table: {
+        width: 150
       }
     },
-    table: {
-      width: 200
-    }
-  },
-  {
-    label: '检验批次',
-    field: 'inspectionBatch',
-    sort: 'custom',
-    isSearch: false,
-    form: {
-      componentProps:{
-        disabled:true
+    {
+      label: '检验方案编码',
+      field: 'inspectionSchemeCode',
+      sort: 'custom',
+      isSearch: false,
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
+      table: {
+        width: 200
       }
     },
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '检验批数量',
-    field: 'inspectionBatchAmount',
-    sort: 'custom',
-    isSearch: false,
-    form: {
-      componentProps:{
-        disabled:true
+    {
+      label: '检验批次',
+      field: 'inspectionBatch',
+      sort: 'custom',
+      isSearch: false,
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
+      table: {
+        width: 150
       }
     },
-    table: {
-      width: 150
-    }
-  },
-  // {
-  //   label: '采样总数量',
-  //   field: 'sampleTotalAmount',
-  //   sort: 'custom',
-  //   isSearch: false,
-  //   form: {
-  //     componentProps:{
-  //       disabled:true
-  //     }
-  //   },
-  //   table: {
-  //     width: 150
-  //   }
-  // },
-  {
-    label: '检验类型',
-    field: 'inspectionType',
-    sort: 'custom',
-    isSearch: false,
-    dictType: DICT_TYPE.INSPECTION_TYPE,
-    dictClass: 'string',
-    form: {
-      component: 'Select',
-      componentProps:{
-        disabled:true
-      }
-    },
-    table: {
-      width: 150
-    }
-  },
-  // {
-  //   label: '检验批来源',
-  //   field: 'inspectionBatchSource',
-  //   sort: 'custom',
-  //   isSearch: false,
-  //   dictType: DICT_TYPE.INSPECTION_BATCH_SOURCE,
-  //   dictClass: 'string',
-  //   form:{
-  //     componentProps:{
-  //       disabled:true
-  //     }
-  //   },
-  //   table: {
-  //     width: 150
-  //   }
-  // },
-  {
-    label: '检验阶段',
-    field: 'inspectionStage',
-    sort: 'custom',
-    isSearch: false,
-    form: {
-      component: 'InputNumber',
-      value: 0,
-      componentProps:{
-        disabled:true
-      }
-    },
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '检验严格性',
-    field: 'inspectionStringency',
-    sort: 'custom',
-    isSearch: false,
-    dictType: DICT_TYPE.INSPECTION_SEVERITY,
-    dictClass: 'string',
-    form:{
-      componentProps:{
-        disabled:true
-      }
-    },
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '计划开始时间',
-    field: 'planStartTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: false,
-    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',
-        disabled:true
-      }
-    },
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    table: {
-      width: 175
-    }
-  },
-  {
-    label: '计划结束时间',
-    field: 'planEndTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: false,
-    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',
-        disabled:true
-      }
-    },
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    table: {
-      width: 175
-    }
-  },
-  {
-    label: '检验水平',
-    field: 'inspectionLevel',
-    sort: 'custom',
-    isSearch: false,
-    dictType: DICT_TYPE.INSPECTION_LEVEL,
-    dictClass: 'string',
-    form:{
-      componentProps:{
-        disabled:true
-      }
-    },
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: 'AQL值',
-    field: 'aqlValue',
-    sort: 'custom',
-    isSearch: false,
-    dictType: DICT_TYPE.BASIC_AQL,
-    dictClass: 'string',
-    form:{
-      componentProps:{
-        disabled:true
-      }
-    },
-    table: {
-      width: 150
-    }
-  },
-  // {
-  //   label: '使用决策',
-  //   field: 'usageDecision',
-  //   sort: 'custom',
-  //   isSearch: false,
-  //   dictType: DICT_TYPE.USAGE_DECISION,
-  //   form:{
-  //     componentProps:{
-  //     }
-  //   }
-  // },
-  // {
-  //   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',
-  //       disabled:true
-  //     }
-  //   }
-  // },
-  {
-    label: '操作',
-    field: 'action',
-    isDetail: false,
-    isForm: false,
-    table: {
-      width: 200,
-      fixed: 'right'
+    {
+      label: '检验批数量',
+      field: 'inspectionBatchAmount',
+      sort: 'custom',
+      isSearch: false,
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
+      table: {
+        width: 150
+      }
+    },
+    // {
+    //   label: '采样总数量',
+    //   field: 'sampleTotalAmount',
+    //   sort: 'custom',
+    //   isSearch: false,
+    //   form: {
+    //     componentProps:{
+    //       disabled:true
+    //     }
+    //   },
+    //   table: {
+    //     width: 150
+    //   }
+    // },
+    {
+      label: '检验类型',
+      field: 'inspectionType',
+      sort: 'custom',
+      isSearch: false,
+      dictType: DICT_TYPE.INSPECTION_TYPE,
+      dictClass: 'string',
+      form: {
+        component: 'Select',
+        componentProps: {
+          disabled: true
+        }
+      },
+      table: {
+        width: 150
+      }
+    },
+    // {
+    //   label: '检验批来源',
+    //   field: 'inspectionBatchSource',
+    //   sort: 'custom',
+    //   isSearch: false,
+    //   dictType: DICT_TYPE.INSPECTION_BATCH_SOURCE,
+    //   dictClass: 'string',
+    //   form:{
+    //     componentProps:{
+    //       disabled:true
+    //     }
+    //   },
+    //   table: {
+    //     width: 150
+    //   }
+    // },
+    {
+      label: '检验阶段',
+      field: 'inspectionStage',
+      sort: 'custom',
+      isSearch: false,
+      form: {
+        component: 'InputNumber',
+        value: 0,
+        componentProps: {
+          disabled: true
+        }
+      },
+      table: {
+        width: 150
+      }
+    },
+    {
+      label: '检验严格性',
+      field: 'inspectionStringency',
+      sort: 'custom',
+      isSearch: false,
+      dictType: DICT_TYPE.INSPECTION_SEVERITY,
+      dictClass: 'string',
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
+      table: {
+        width: 150
+      }
+    },
+    {
+      label: '计划开始时间',
+      field: 'planStartTime',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isSearch: false,
+      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',
+          disabled: true
+        }
+      },
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      table: {
+        width: 175
+      }
+    },
+    {
+      label: '计划结束时间',
+      field: 'planEndTime',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isSearch: false,
+      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',
+          disabled: true
+        }
+      },
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      table: {
+        width: 175
+      }
+    },
+    {
+      label: '检验水平',
+      field: 'inspectionLevel',
+      sort: 'custom',
+      isSearch: false,
+      dictType: DICT_TYPE.INSPECTION_LEVEL,
+      dictClass: 'string',
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
+      table: {
+        width: 150
+      }
+    },
+    {
+      label: 'AQL值',
+      field: 'aqlValue',
+      sort: 'custom',
+      isSearch: false,
+      dictType: DICT_TYPE.BASIC_AQL,
+      dictClass: 'string',
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
+      table: {
+        width: 150
+      }
+    },
+    // {
+    //   label: '使用决策',
+    //   field: 'usageDecision',
+    //   sort: 'custom',
+    //   isSearch: false,
+    //   dictType: DICT_TYPE.USAGE_DECISION,
+    //   form:{
+    //     componentProps:{
+    //     }
+    //   }
+    // },
+    // {
+    //   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',
+    //       disabled:true
+    //     }
+    //   }
+    // },
+    {
+      label: '操作',
+      field: 'action',
+      isDetail: false,
+      isForm: false,
+      table: {
+        width: 200,
+        fixed: 'right'
+      }
     }
-  }
-]))
+  ])
+)
 
 //表单校验
 export const InspectionJobMainRules = reactive({
@@ -439,176 +459,185 @@ export const InspectionJobMainRules = reactive({
 /**
  * @returns {Array} 检验任务子表
  */
-export const InspectionJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '编码',
-    field: 'number',
-    sort: 'custom',
-    isSearch: true,
-  },
-  {
-    label: '检验方案模板编码',
-    field: 'inspectionCode',
-    sort: 'custom',
-    isSearch: true,
-  },
-  {
-    label: '描述',
-    field: 'processDescribe',
-    sort: 'custom',
-    isSearch: true,
-  },
-  {
-    label: '顺序号',
-    field: 'sequenceCode',
-    sort: 'custom',
-    isSearch: true,
-    form: {
-      component: 'InputNumber',
-      value: 0
+export const InspectionJobDetail = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '编码',
+      field: 'number',
+      sort: 'custom',
+      isSearch: true
+    },
+    {
+      label: '检验方案模板编码',
+      field: 'inspectionCode',
+      sort: 'custom',
+      isSearch: true
+    },
+    {
+      label: '描述',
+      field: 'processDescribe',
+      sort: 'custom',
+      isSearch: true
+    },
+    {
+      label: '顺序号',
+      field: 'sequenceCode',
+      sort: 'custom',
+      isSearch: true,
+      form: {
+        component: 'InputNumber',
+        value: 0
+      }
     },
-  },
-  {
-    label: '检验特性编号',
-    field: 'inspectionCharCode',
-    sort: 'custom',
-    isSearch: true,
-  },
-  {
-    label: '检验特性编码',
-    field: 'inspectionJobCharacteristicsRespVO.number',
-    sort: 'custom',
-  },
-  {
-    label: '检验特性描述',
-    field: 'inspectionJobCharacteristicsRespVO.description',
-    sort: 'custom',
-  },{
-    label: '检验方法',
-    field: 'inspectionJobCharacteristicsRespVO.inspectionMethodCode',
-    sort: 'custom',
-  },{
-    label: '采样过程编码',
-    field: 'inspectionJobCharacteristicsRespVO.samplingProcessCode',
-    sort: 'custom',
-  },{
-    label: '动态修改规则编码',
-    field: 'inspectionJobCharacteristicsRespVO.dynamicUpdateCode',
-    sort: 'custom',
-  },{
-    label: '是否允许修改特征值',
-    field: 'inspectionJobCharacteristicsRespVO.isCanUpdate',
-    sort: 'custom',
-    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-      return isCanUpdateList.find((account) => account.value == cellValue)?.label
-    },
-  },{
-    label: '结果录入方式',
-    field: 'inspectionJobCharacteristicsRespVO.resultEntryMethod',
-    sort: 'custom',
-    // dictType: DICT_TYPE.INSPECTION_CHARACTERISTICS_RESULT_ENTRY,
-    // dictClass: 'string',
-    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-      return resultEntryMethodList.find((account) => account.value == cellValue)?.label
-    },
-  },{
-    label: '特征类型',
-    field: 'inspectionJobCharacteristicsRespVO.featureType',
-    sort: 'custom',
-    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-      return featureTypeList.find((account) => account.value == cellValue)?.label
+    {
+      label: '检验特性编号',
+      field: 'inspectionCharCode',
+      sort: 'custom',
+      isSearch: true
+    },
+    {
+      label: '检验特性编码',
+      field: 'inspectionJobCharacteristicsRespVO.number',
+      sort: 'custom'
+    },
+    {
+      label: '检验特性描述',
+      field: 'inspectionJobCharacteristicsRespVO.description',
+      sort: 'custom'
+    },
+    {
+      label: '检验方法',
+      field: 'inspectionJobCharacteristicsRespVO.inspectionMethodCode',
+      sort: 'custom'
+    },
+    {
+      label: '采样过程编码',
+      field: 'inspectionJobCharacteristicsRespVO.samplingProcessCode',
+      sort: 'custom'
+    },
+    {
+      label: '动态修改规则编码',
+      field: 'inspectionJobCharacteristicsRespVO.dynamicUpdateCode',
+      sort: 'custom'
+    },
+    {
+      label: '是否允许修改特征值',
+      field: 'inspectionJobCharacteristicsRespVO.isCanUpdate',
+      sort: 'custom',
+      formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+        return isCanUpdateList.find((account) => account.value == cellValue)?.label
+      }
     },
-  }
-]))
+    {
+      label: '结果录入方式',
+      field: 'inspectionJobCharacteristicsRespVO.resultEntryMethod',
+      sort: 'custom',
+      // dictType: DICT_TYPE.INSPECTION_CHARACTERISTICS_RESULT_ENTRY,
+      // dictClass: 'string',
+      formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+        return resultEntryMethodList.find((account) => account.value == cellValue)?.label
+      }
+    },
+    {
+      label: '特征类型',
+      field: 'inspectionJobCharacteristicsRespVO.featureType',
+      sort: 'custom',
+      formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+        return featureTypeList.find((account) => account.value == cellValue)?.label
+      }
+    }
+  ])
+)
 
 //表单校验
 export const InspectionJobDetailRules = reactive({
   taskCode: [required],
   processCode: [required],
   sequenceCode: [required],
-  available: [required],
+  available: [required]
 })
 /**
  * @returns {Array} 检验任务包装
  */
-export const InspectionJobPackage = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '编码',
-    field: 'number',
-    sort: 'custom',
-    isSearch: true,
-    tableForm:{
-      disabled:true
-    },
-    table:{
-      width:200
-    }
-  },
-  {
-    label: '包装号',
-    field: 'packageCode',
-    sort: 'custom',
-    isSearch: true,
-    tableForm:{
-      disabled:true
-    },
-    table:{
-      width:200
-    }
-  },
-  {
-    label: '包装规格',
-    field: 'packageSpecificationCode',
-    sort: 'custom',
-    isSearch: true,
-    tableForm:{
-      disabled:true
-    },
-    table:{
-      width:180
-    }
-  },
-  {
-    label: '数量',
-    field: 'amount',
-    sort: 'custom',
-    isSearch: true,
-    form: {
-      component: 'InputNumber',
-      value: 0
-    },
-    tableForm:{
-      disabled:true
-    },
-    table:{
-      width:150
-    }
-  },
-  {
-    label: '计量单位',
-    field: 'measuringUnit',
-    sort: 'custom',
-    isSearch: true,
-    tableForm:{
-      disabled:true
-    },
-    table:{
-      width:150
-    }
-  },
-  {
-    label: '采样数量',
-    field: 'sampleAmount',
-    sort: 'custom',
-    isSearch: true,
-    isTable:false,
-    table:{
-      width:150,
+export const InspectionJobPackage = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '编码',
+      field: 'number',
+      sort: 'custom',
+      isSearch: true,
+      tableForm: {
+        disabled: true
+      },
+      table: {
+        width: 200
+      }
+    },
+    {
+      label: '包装号',
+      field: 'packageCode',
+      sort: 'custom',
+      isSearch: true,
+      tableForm: {
+        disabled: true
+      },
+      table: {
+        width: 200
+      }
+    },
+    {
+      label: '包装规格',
+      field: 'packageSpecificationCode',
+      sort: 'custom',
+      isSearch: true,
+      tableForm: {
+        disabled: true
+      },
+      table: {
+        width: 180
+      }
+    },
+    {
+      label: '数量',
+      field: 'amount',
+      sort: 'custom',
+      isSearch: true,
+      form: {
+        component: 'InputNumber',
+        value: 0
+      },
+      tableForm: {
+        disabled: true
+      },
+      table: {
+        width: 150
+      }
+    },
+    {
+      label: '计量单位',
+      field: 'measuringUnit',
+      sort: 'custom',
+      isSearch: true,
+      tableForm: {
+        disabled: true
+      },
+      table: {
+        width: 150
+      }
+    },
+    {
+      label: '采样数量',
+      field: 'sampleAmount',
+      sort: 'custom',
+      isSearch: true,
+      isTable: false,
+      table: {
+        width: 150
+      }
     }
-  },
-]))
+  ])
+)
 //表单校验
 export const InspectionJobPackageRules = reactive({
-  sampleAmount: [required,
-    { validator:validateSixNum, trigger: 'blur'}]
+  sampleAmount: [required, { validator: validateSixNum, trigger: 'blur' }]
 })
diff --git a/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts b/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts
index 90263f8d8..8837aa808 100644
--- a/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts
+++ b/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts
@@ -2,419 +2,435 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter2 } from '@/utils/formatTime'
 import { validateHanset, validateEmail } from '@/utils/validator'
 import { dateFormatter } from '@/utils/formatTime'
-import {validateTwoNum,validateSixNum } from '@/utils/validator'
+import { validateTwoNum, validateSixNum } from '@/utils/validator'
 const { t } = useI18n() // 国际化
 
 /**
  * @returns {Array} 检验任务主表
  */
-export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '记录编码',
-    field: 'number',
-    sort: 'custom',
-    isSearch: true,
-    isForm:false,
-    table: {
-      width: 200,
-      fixed: 'left'
-    }
-  },
-  {
-    label: '申请编码',
-    field: 'requestNumber',
-    sort: 'custom',
-    isSearch: true,
-    isForm:false,
-    table: {
-      width: 200
-    }
-  },
-  {
-    label: '任务编码',
-    field: 'jobNumber',
-    sort: 'custom',
-    isSearch: false,
-    isForm:false,
-    table: {
-      width: 200
-    }
-  },
-  {
-    label: '供应商编码',
-    field: 'supplierCode',
-    sort: 'custom',
-    isSearch: false,
-    isForm:false,
-    table: {
-      width: 200
-    }
-  },{
-    label: '供应商名称',
-    field: 'supplierName',
-    sort: 'custom',
-    isSearch: false,
-    isForm:false,
-    table: {
-      width: 200
+export const InspectionRecordMain = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '记录编码',
+      field: 'number',
+      sort: 'custom',
+      isSearch: true,
+      isForm: false,
+      table: {
+        width: 200,
+        fixed: 'left'
+      }
     },
-    form: {
-      componentProps:{
-        disabled:true
+    {
+      label: '申请编码',
+      field: 'requestNumber',
+      sort: 'custom',
+      isSearch: true,
+      isForm: false,
+      table: {
+        width: 200
       }
     },
-  },
-  {
-    label: '物料编码',
-    field: 'itemCode',
-    sort: 'custom',
-    isSearch: false,
-    isForm:false,
-    table: {
-      width: 150
+    {
+      label: '任务编码',
+      field: 'jobNumber',
+      sort: 'custom',
+      isSearch: false,
+      isForm: false,
+      table: {
+        width: 200
+      }
     },
-    form: {
-      componentProps:{
-        disabled:true
+    {
+      label: '发货单号',
+      field: 'asnNumber',
+      sort: 'custom',
+      isSearch: false,
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
+      table: {
+        width: 150
       }
     },
-  },
-  {
-    label: '物料名称',
-    field: 'itemName',
-    sort: 'custom',
-    isSearch: false,
-    isForm:false,
-    table: {
-      width: 200
+    {
+      label: '供应商编码',
+      field: 'supplierCode',
+      sort: 'custom',
+      isSearch: false,
+      isForm: false,
+      table: {
+        width: 200
+      }
     },
-    form: {
-      componentProps:{
-        disabled:true
+    {
+      label: '供应商名称',
+      field: 'supplierName',
+      sort: 'custom',
+      isSearch: false,
+      isForm: false,
+      table: {
+        width: 200
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
       }
     },
-  },
-  {
-    label: '批次',
-    field: 'batch',
-    sort: 'custom',
-    isSearch: false,
-    isForm:false,
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '检验方案编码',
-    field: 'inspectionSchemeCode',
-    sort: 'custom',
-    isSearch: false,
-    isForm:false,
-    table: {
-      width: 200
-    }
-  },
-  {
-    label: '检验批次',
-    field: 'inspectionBatch',
-    sort: 'custom',
-    isSearch: false,
-    isForm:false,
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '检验批数量',
-    field: 'inspectionBatchAmount',
-    sort: 'custom',
-    isSearch: false,
-    isForm:false,
-    table: {
-      width: 150
-    }
-  },
-  // {
-  //   label: '采样总数量',
-  //   field: 'sampleTotalAmount',
-  //   sort: 'custom',
-  //   isSearch: false,
-  //   isForm:false,
-  //   table: {
-  //     width: 150
-  //   }
-  // },
-  {
-    label: '检验类型',
-    field: 'inspectionType',
-    dictType: DICT_TYPE.INSPECTION_TYPE,
-    sort: 'custom',
-    isSearch: false,
-    isForm:false,
-    form: {
-      component: 'Select'
+    {
+      label: '物料编码',
+      field: 'itemCode',
+      sort: 'custom',
+      isSearch: false,
+      isForm: false,
+      table: {
+        width: 150
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      }
     },
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '参考订单号',
-    field: 'referenceOrderCode',
-    sort: 'custom',
-    isSearch: false,
-    isForm:false,
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '参考订单行',
-    field: 'referenceOrderRow',
-    sort: 'custom',
-    isSearch: false,
-    isForm:false,
-    form: {
-      component: 'InputNumber',
-      value: 0
+    {
+      label: '物料名称',
+      field: 'itemName',
+      sort: 'custom',
+      isSearch: false,
+      isForm: false,
+      table: {
+        width: 200
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      }
     },
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '参考凭证号',
-    field: 'referenceCertificateCode',
-    sort: 'custom',
-    isSearch: false,
-    isForm:false,
-    table: {
-      width: 150
-    }
-  },
-  {
-    // reference_certificate_row
-    label: '参考凭证行',
-    field: 'referenceCertificateRow',
-    sort: 'custom',
-    isSearch: false,
-    isForm:false,
-    form: {
-      component: 'InputNumber',
-      value: 0
+    {
+      label: '批次',
+      field: 'batch',
+      sort: 'custom',
+      isSearch: false,
+      isForm: false,
+      table: {
+        width: 150
+      }
     },
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '检验阶段',
-    field: 'inspectionStage',
-    sort: 'custom',
-    isSearch: false,
-    isForm:false,
-    form: {
-      component: 'InputNumber',
-      value: 0
+    {
+      label: '检验方案编码',
+      field: 'inspectionSchemeCode',
+      sort: 'custom',
+      isSearch: false,
+      isForm: false,
+      table: {
+        width: 200
+      }
     },
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '检验严格性',
-    field: 'inspectionStringency',
-    dictType: DICT_TYPE.INSPECTION_SEVERITY,
-    sort: 'custom',
-    isSearch: false,
-    isForm:false,
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '计划开始时间',
-    field: 'planStartTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: false,
-    isForm:false,
-    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: 'inspectionBatch',
+      sort: 'custom',
+      isSearch: false,
+      isForm: false,
+      table: {
+        width: 150
       }
     },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
+    {
+      label: '检验批数量',
+      field: 'inspectionBatchAmount',
+      sort: 'custom',
+      isSearch: false,
+      isForm: false,
+      table: {
+        width: 150
       }
     },
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    // {
+    //   label: '采样总数量',
+    //   field: 'sampleTotalAmount',
+    //   sort: 'custom',
+    //   isSearch: false,
+    //   isForm:false,
+    //   table: {
+    //     width: 150
+    //   }
+    // },
+    {
+      label: '检验类型',
+      field: 'inspectionType',
+      dictType: DICT_TYPE.INSPECTION_TYPE,
+      sort: 'custom',
+      isSearch: false,
+      isForm: false,
+      form: {
+        component: 'Select'
+      },
+      table: {
+        width: 150
+      }
     },
-    table: {
-      width: 175
-    }
-  },
-  {
-    label: '计划结束时间',
-    field: 'planEndTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: false,
-    isForm:false,
-    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: 'referenceOrderCode',
+      sort: 'custom',
+      isSearch: false,
+      isForm: false,
+      table: {
+        width: 150
       }
     },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
+    {
+      label: '参考订单行',
+      field: 'referenceOrderRow',
+      sort: 'custom',
+      isSearch: false,
+      isForm: false,
+      form: {
+        component: 'InputNumber',
+        value: 0
+      },
+      table: {
+        width: 150
       }
     },
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    {
+      label: '参考凭证号',
+      field: 'referenceCertificateCode',
+      sort: 'custom',
+      isSearch: false,
+      isForm: false,
+      table: {
+        width: 150
+      }
     },
-    table: {
-      width: 175
-    }
-  },
-  {
-    label: '实际开始时间',
-    field: 'realStartTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: false,
-    isForm:false,
-    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')]
+    {
+      // reference_certificate_row
+      label: '参考凭证行',
+      field: 'referenceCertificateRow',
+      sort: 'custom',
+      isSearch: false,
+      isForm: false,
+      form: {
+        component: 'InputNumber',
+        value: 0
+      },
+      table: {
+        width: 150
       }
     },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
+    {
+      label: '检验阶段',
+      field: 'inspectionStage',
+      sort: 'custom',
+      isSearch: false,
+      isForm: false,
+      form: {
+        component: 'InputNumber',
+        value: 0
+      },
+      table: {
+        width: 150
       }
     },
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    {
+      label: '检验严格性',
+      field: 'inspectionStringency',
+      dictType: DICT_TYPE.INSPECTION_SEVERITY,
+      sort: 'custom',
+      isSearch: false,
+      isForm: false,
+      table: {
+        width: 150
+      }
     },
-    table: {
-      width: 175
-    }
-  },
-  {
-    label: '实际结束时间',
-    field: 'realEndTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: false,
-    isForm:false,
-    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: 'planStartTime',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isSearch: false,
+      isForm: false,
+      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'
+        }
+      },
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      table: {
+        width: 175
       }
     },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
+    {
+      label: '计划结束时间',
+      field: 'planEndTime',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isSearch: false,
+      isForm: false,
+      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'
+        }
+      },
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      table: {
+        width: 175
       }
     },
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    {
+      label: '实际开始时间',
+      field: 'realStartTime',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isSearch: false,
+      isForm: false,
+      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'
+        }
+      },
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      table: {
+        width: 175
+      }
     },
-    table: {
-      width: 175
-    }
-  },
-  {
-    label: '检验水平',
-    field: 'inspectionLevel',
-    dictType: DICT_TYPE.INSPECTION_LEVEL,
-    sort: 'custom',
-    isSearch: false,
-    isForm:false,
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: 'AQL值',
-    field: 'aqlValue',
-    dictType: DICT_TYPE.BASIC_AQL,
-    sort: 'custom',
-    isSearch: false,
-    isForm:false,
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '使用决策',
-    field: 'useDecision',
-    sort: 'custom',
-    isSearch: false,
-    dictType: DICT_TYPE.USAGE_DECISION,
-    table: {
-      width: 150
-    }
-
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: false,
-    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: 'realEndTime',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isSearch: false,
+      isForm: false,
+      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'
+        }
+      },
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      table: {
+        width: 175
       }
     },
-    isForm: false,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    {
+      label: '检验水平',
+      field: 'inspectionLevel',
+      dictType: DICT_TYPE.INSPECTION_LEVEL,
+      sort: 'custom',
+      isSearch: false,
+      isForm: false,
+      table: {
+        width: 150
+      }
+    },
+    {
+      label: 'AQL值',
+      field: 'aqlValue',
+      dictType: DICT_TYPE.BASIC_AQL,
+      sort: 'custom',
+      isSearch: false,
+      isForm: false,
+      table: {
+        width: 150
+      }
+    },
+    {
+      label: '使用决策',
+      field: 'useDecision',
+      sort: 'custom',
+      isSearch: false,
+      dictType: DICT_TYPE.USAGE_DECISION,
+      table: {
+        width: 150
+      }
+    },
+    {
+      label: '创建时间',
+      field: 'createTime',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isSearch: false,
+      search: {
+        component: 'DatePicker',
+        componentProps: {
+          valueFormat: 'YYYY-MM-DD HH:mm:ss',
+          type: 'daterange',
+          defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+        }
+      },
+      isForm: false,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      table: {
+        width: 175
+      }
     },
-    table: {
-      width: 175
-    }
-  },
 
-  {
-    label: '操作',
-    field: 'action',
-    isDetail: false,
-    isForm: false,
-    table: {
-      width: 200,
-      fixed: 'right'
+    {
+      label: '操作',
+      field: 'action',
+      isDetail: false,
+      isForm: false,
+      table: {
+        width: 200,
+        fixed: 'right'
+      }
     }
-  }
-]))
+  ])
+)
 
 //表单校验
 export const InspectionRecordMainRules = reactive({
diff --git a/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts b/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts
index 20406de65..c7af0319c 100644
--- a/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts
+++ b/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts
@@ -4,441 +4,471 @@ import * as ItemApi from '@/api/wms/itembasic'
 import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
 import * as SupplierApi from '@/api/wms/supplier'
 import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
-import { validateInteger,validateTwoNum } from '@/utils/validator'
+import { validateInteger, validateTwoNum } from '@/utils/validator'
 
 // 表单校验
 export const InspectionMainRules = reactive({
   requestStartTime: [required],
   itemCode: [required],
   requestEndTime: [required],
-  batch: [required,{ validator:validateInteger, message: '请输入正确的整数', trigger: 'blur'}],
-  requestInspectionNum: [required,{ validator:validateTwoNum, message: '小数点后最多2位', trigger: 'blur'}],
-  referenceCertificateRow: [{ validator:validateInteger, message: '请输入正确的整数', trigger: 'blur'}],
+  batch: [required, { validator: validateInteger, message: '请输入正确的整数', trigger: 'blur' }],
+  requestInspectionNum: [
+    required,
+    { validator: validateTwoNum, message: '小数点后最多2位', trigger: 'blur' }
+  ],
+  referenceCertificateRow: [
+    { validator: validateInteger, message: '请输入正确的整数', trigger: 'blur' }
+  ],
   inspectionType: [required],
-  minPackageQty: [required],
+  minPackageQty: [required]
 })
 
-export const InspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '申请编码',
-    field: 'number',
-    sort: 'custom',
-    isSearch: true,
-    table: {
-      width: 200,
-      fixed: 'left'
-    },
-    form:{
-      componentProps:{
-        disabled:true
-      }
-    }
-  },
-  {
-    label: '申请日期',
-    field: 'applicationDate',
-    sort: 'custom',
-    formatter: dateFormatter2,
-    isSearch: false,
-    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')]
+export const InspectionMain = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '申请编码',
+      field: 'number',
+      sort: 'custom',
+      isSearch: true,
+      table: {
+        width: 200,
+        fixed: 'left'
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
       }
     },
-    isForm:false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
+    {
+      label: '发货单号',
+      field: 'asnNumber',
+      sort: 'custom',
+      isSearch: false,
+      isForm: false,
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
+      table: {
+        width: 150
       }
     },
-    table: {
-      width: 120
-    },
-    detail: {
-      dateFormat: 'YYYY-MM-DD'
-    },
-  },
-  {
-    label: '申请时间',
-    field: 'applicationTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: false,
-    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: 'applicationDate',
+      sort: 'custom',
+      formatter: dateFormatter2,
+      isSearch: false,
+      search: {
+        component: 'DatePicker',
+        componentProps: {
+          valueFormat: 'YYYY-MM-DD HH:mm:ss',
+          type: 'daterange',
+          defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+        }
+      },
+      isForm: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          valueFormat: 'x'
+        }
+      },
+      table: {
+        width: 120
+      },
+      detail: {
+        dateFormat: 'YYYY-MM-DD'
       }
     },
-    isForm:false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
+    {
+      label: '申请时间',
+      field: 'applicationTime',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isSearch: false,
+      search: {
+        component: 'DatePicker',
+        componentProps: {
+          valueFormat: 'YYYY-MM-DD HH:mm:ss',
+          type: 'daterange',
+          defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+        }
+      },
+      isForm: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          valueFormat: 'x'
+        }
+      },
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      table: {
+        width: 175
       }
     },
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    table: {
-      width: 175
-    }
-  },
-  {
-    label: '要求开始时间',
-    field: 'requestStartTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: false,
-    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: 'requestStartTime',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isSearch: false,
+      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'
+        }
+      },
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      table: {
+        width: 175
       }
     },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
+    {
+      label: '要求结束时间',
+      field: 'requestEndTime',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isSearch: false,
+      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'
+        }
+      },
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      table: {
+        width: 175
       }
     },
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    table: {
-      width: 175
-    }
-  },
-  {
-    label: '要求结束时间',
-    field: 'requestEndTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: false,
-    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: 'finishTime',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isSearch: false,
+      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'
+        }
+      },
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      table: {
+        width: 175
       }
     },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
+    {
+      label: '供应商编码',
+      field: 'supplierCode',
+      sort: 'custom',
+      isSearch: false,
+      table: {
+        width: 175
+      },
+      form: {
+        componentProps: {
+          isSearchList: true, // 开启查询弹窗
+          searchTitle: '供应商信息', // 查询弹窗标题
+          searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
+          searchField: 'code', // 查询弹窗赋值字段
+          searchPage: SupplierApi.getSupplierPage, // 查询弹窗所需分页方法
+          multiple: false,
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            }
+          ]
+        }
       }
     },
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    table: {
-      width: 175
-    }
-  },
-  {
-    label: '完成时间',
-    field: 'finishTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: false,
-    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: 'supplierName',
+      sort: 'custom',
+      isSearch: false,
+      table: {
+        width: 175
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
       }
     },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
+    {
+      label: '物料编码',
+      field: 'itemCode',
+      sort: 'custom',
+      isSearch: false,
+      table: {
+        width: 150
+      },
+      form: {
+        componentProps: {
+          isSearchList: true, // 开启查询弹窗
+          searchTitle: '物料信息', // 查询弹窗标题
+          searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
+          searchField: 'code', // 查询弹窗赋值字段
+          searchPage: ItemApi.getItembasicPage, // 查询弹窗所需分页方法
+          multiple: false,
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            }
+          ]
+        }
       }
     },
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    {
+      label: '物料名称',
+      field: 'itemName',
+      sort: 'custom',
+      isSearch: false,
+      table: {
+        width: 150
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      }
     },
-    table: {
-      width: 175
-    }
-  },
-  {
-    label: '供应商编码',
-    field: 'supplierCode',
-    sort: 'custom',
-    isSearch: false,
-    table: {
-      width: 175
+    {
+      label: '批次',
+      field: 'batch',
+      sort: 'custom',
+      isSearch: false,
+      table: {
+        width: 150
+      }
     },
-    form:{
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchTitle: '供应商信息', // 查询弹窗标题
-        searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
-        searchField: 'code', // 查询弹窗赋值字段
-        searchPage: SupplierApi.getSupplierPage, // 查询弹窗所需分页方法
-        multiple:false,
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
+    {
+      label: '待检数量',
+      field: 'requestInspectionNum',
+      sort: 'custom',
+      isSearch: false,
+      table: {
+        width: 150
       }
-    }
-  },
-  {
-    label: '供应商名称',
-    field: 'supplierName',
-    sort: 'custom',
-    isSearch: false,
-    table: {
-      width: 175
     },
-    form:{
-      componentProps: {
-        disabled:true
+    {
+      label: '参考订单号',
+      field: 'referenceOrderCode',
+      sort: 'custom',
+      isSearch: false,
+      table: {
+        width: 150
       }
-    }
-  },
-  {
-    label: '物料编码',
-    field: 'itemCode',
-    sort: 'custom',
-    isSearch: false,
-    table: {
-      width: 150
     },
-    form:{
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchTitle: '物料信息', // 查询弹窗标题
-        searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
-        searchField: 'code', // 查询弹窗赋值字段
-        searchPage: ItemApi.getItembasicPage, // 查询弹窗所需分页方法
-        multiple:false,
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
+    {
+      label: '参考订单行',
+      field: 'referenceOrderRow',
+      sort: 'custom',
+      isSearch: false,
+      form: {
+        component: 'InputNumber',
+        value: 0
+      },
+      table: {
+        width: 150
       }
-    }
-  },
-  {
-    label: '物料名称',
-    field: 'itemName',
-    sort: 'custom',
-    isSearch: false,
-    table: {
-      width: 150
     },
-    form:{
-      componentProps: {
-        disabled:true
+    {
+      label: '参考凭证号',
+      field: 'referenceCertificateCode',
+      sort: 'custom',
+      isSearch: false,
+      table: {
+        width: 150
       }
-    }
-  },
-  {
-    label: '批次',
-    field: 'batch',
-    sort: 'custom',
-    isSearch: false,
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '待检数量',
-    field: 'requestInspectionNum',
-    sort: 'custom',
-    isSearch: false,
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '参考订单号',
-    field: 'referenceOrderCode',
-    sort: 'custom',
-    isSearch: false,
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '参考订单行',
-    field: 'referenceOrderRow',
-    sort: 'custom',
-    isSearch: false,
-    form: {
-      component: 'InputNumber',
-      value: 0
     },
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '参考凭证号',
-    field: 'referenceCertificateCode',
-    sort: 'custom',
-    isSearch: false,
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '参考凭证行',
-    field: 'referenceCertificateRow',
-    sort: 'custom',
-    isSearch: false,
-    form: {
-      component: 'InputNumber',
-      value: 0
+    {
+      label: '参考凭证行',
+      field: 'referenceCertificateRow',
+      sort: 'custom',
+      isSearch: false,
+      form: {
+        component: 'InputNumber',
+        value: 0
+      },
+      table: {
+        width: 150
+      }
     },
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '检验类型',
-    field: 'inspectionType',
-    sort: 'custom',
-    isSearch: false,
-    dictType: DICT_TYPE.INSPECTION_TYPE,
-    dictClass: 'string',
-    form: {
-      componentProps: {
+    {
+      label: '检验类型',
+      field: 'inspectionType',
+      sort: 'custom',
+      isSearch: false,
+      dictType: DICT_TYPE.INSPECTION_TYPE,
+      dictClass: 'string',
+      form: {
+        componentProps: {}
+      },
+      table: {
+        width: 175
       }
     },
-    table: {
-      width: 175
-    }
-  },
-  {
-    label: '小包装数',
-    field: 'minPackageQty',
-    sort: 'custom',
-    isSearch: false,
-    form: {
-      component: 'InputNumber',
-      value: 0
+    {
+      label: '小包装数',
+      field: 'minPackageQty',
+      sort: 'custom',
+      isSearch: false,
+      form: {
+        component: 'InputNumber',
+        value: 0
+      },
+      table: {
+        width: 150
+      }
     },
-    table: {
-      width: 150
-    }
-  }, {
-    label: '检验水平',
-    field: 'inspectionLevel',
-    sort: 'custom',
-    dictType: DICT_TYPE.INSPECTION_LEVEL,
-    dictClass: 'string',
-    table: {
-      width: 150
+    {
+      label: '检验水平',
+      field: 'inspectionLevel',
+      sort: 'custom',
+      dictType: DICT_TYPE.INSPECTION_LEVEL,
+      dictClass: 'string',
+      table: {
+        width: 150
+      },
+      isSearch: true
+    },
+    {
+      label: 'aql',
+      field: 'aql',
+      sort: 'custom',
+      dictType: DICT_TYPE.BASIC_AQL,
+      dictClass: 'string',
+      table: {
+        width: 150
+      }
     },
-    isSearch: true,
-  }, {
-    label: 'aql',
-    field: 'aql',
-    sort: 'custom',
-    dictType: DICT_TYPE.BASIC_AQL,
-    dictClass: 'string',
-    table: {
-      width: 150
-    }
-  }, {
-    label: '操作',
-    field: 'action',
-    isForm: false,
-    table: {
-      width: 240,
-      fixed: 'right'
+    {
+      label: '操作',
+      field: 'action',
+      isForm: false,
+      table: {
+        width: 240,
+        fixed: 'right'
+      }
     }
-  }
-]))
+  ])
+)
 
 // 表单校验
 export const InspectionRequestPackageRules = reactive({
   // packageCode: [required],
   // packageSpecificationCode: [required],
-  amount: [required,{ validator:validateTwoNum, message: '小数点后最多2位', trigger: 'blur'}],
-  measuringUnit: [required],
+  amount: [required, { validator: validateTwoNum, message: '小数点后最多2位', trigger: 'blur' }],
+  measuringUnit: [required]
 })
 
 /**
  * @returns {Array} 检验申请包装
  */
-export const InspectionRequestPackage = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '编码',
-    field: 'number',
-    sort: 'custom',
-    isSearch: true,
-    tableForm:{
-      disabled:true
-    },
-    isTableForm:false,
-    form:{
-      componentProps:{
-        disabled:true
+export const InspectionRequestPackage = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '编码',
+      field: 'number',
+      sort: 'custom',
+      isSearch: true,
+      tableForm: {
+        disabled: true
+      },
+      isTableForm: false,
+      form: {
+        componentProps: {
+          disabled: true
+        }
       }
-    }
-  },
-  {
-    label: '包装号',
-    field: 'packageCode',
-    sort: 'custom',
-    isSearch: true,
-    tableForm:{
-      disabled:false
-    },
-  },
-  {
-    label: '包装规格',
-    field: 'packageSpecificationCode',
-    sort: 'custom',
-    isSearch: true,
-    tableForm:{
-      disabled:false
     },
-  },
-  {
-    label: '数量',
-    field: 'amount',
-    sort: 'custom',
-    isSearch: false,
-    form: {
-      component: 'InputNumber',
-      value: 0
+    {
+      label: '包装号',
+      field: 'packageCode',
+      sort: 'custom',
+      isSearch: true,
+      tableForm: {
+        disabled: false
+      }
     },
-    tableForm:{
-      disabled:false
+    {
+      label: '包装规格',
+      field: 'packageSpecificationCode',
+      sort: 'custom',
+      isSearch: true,
+      tableForm: {
+        disabled: false
+      }
     },
-  },
-  {
-    label: '计量单位',
-    field: 'measuringUnit',
-    sort: 'custom',
-    isSearch: true,
-    tableForm:{
-      disabled:false
+    {
+      label: '数量',
+      field: 'amount',
+      sort: 'custom',
+      isSearch: false,
+      form: {
+        component: 'InputNumber',
+        value: 0
+      },
+      tableForm: {
+        disabled: false
+      }
     },
-    table:{
-      width:150
+    {
+      label: '计量单位',
+      field: 'measuringUnit',
+      sort: 'custom',
+      isSearch: true,
+      tableForm: {
+        disabled: false
+      },
+      table: {
+        width: 150
+      }
     }
-  }
-]))
+  ])
+)
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
index 3617757b5..91e1ee099 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
@@ -1,1640 +1,1580 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
 import { fa } from 'element-plus/es/locale'
 import { DICT_TYPE } from '@/utils/dict'
 
 /**
  * @returns {Array} 采购收货任务主表
  */
-export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 180,
-      fixed: 'left'
-    },
-    isSearch: true,
-    sortSearchDefault:1
-  },
-  {
-    label: '申请单号',
-    field: 'requestNumber',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isSearch: false,
-    sortTableDefault:2,
-  },
-  {
-    label: '发货单号',
-    field: 'asnNumber',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    sortTableDefault:3,
-    isSearch: true
-  },
-  {
-    label: '要货计划单号',
-    field: 'ppNumber',
-    sort: 'custom',
-    isTable:false,
-    table: {
-      width: 180
-    },
-  },
-  {
-    label: '供应商代码',
-    field: 'supplierCode',
-    sort: 'custom',
-    sortTableDefault:1,
-    table: {
-      width: 150
-    },
-    isSearch: true,
-    sortSearchDefault:2
-  },
-  {
-    label: '到月台代码',
-    field: 'toDockCode',
-    sort: 'custom',
-    isTable:false,
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '承运商',
-    field: 'carrierCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:1010
-  },
-  {
-    label: '数据来源',
-    field: 'sourceType',
-    dictType: DICT_TYPE.PURCHASERECEIPT_SOURCE_TYPE,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      componentProps: {
-        disabled: true
+export const PurchasereceiptJobMain = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '单据号',
+      field: 'number',
+      sort: 'custom',
+      table: {
+        width: 180,
+        fixed: 'left'
+      },
+      isSearch: true,
+      sortSearchDefault: 1
+    },
+    {
+      label: '申请单号',
+      field: 'requestNumber',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isSearch: false,
+      sortTableDefault: 2
+    },
+    {
+      label: '发货单号',
+      field: 'asnNumber',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      sortTableDefault: 3,
+      isSearch: true
+    },
+    {
+      label: '要货计划单号',
+      field: 'ppNumber',
+      sort: 'custom',
+      isTable: false,
+      table: {
+        width: 180
       }
     },
-    isSearch: false,
-    sortTableDefault:5,
-  },
-  {
-    label: '运输方式',
-    field: 'transferMode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:1011
-  },
-  {
-    label: '车牌号',
-    field: 'vehiclePlateNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:1012
-  },
-  {
-    label: '从仓库代码',
-    field: 'fromWarehouseCode',
-    sort: 'custom',
-    isTable:false,
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '到仓库代码',
-    field: 'toWarehouseCode',
-    sort: 'custom',
-    isTable:false,
-    table: {
-      width: 150
-    },
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '供应商代码',
+      field: 'supplierCode',
+      sort: 'custom',
+      sortTableDefault: 1,
+      table: {
+        width: 150
+      },
+      isSearch: true,
+      sortSearchDefault: 2
+    },
+    {
+      label: '到月台代码',
+      field: 'toDockCode',
+      sort: 'custom',
+      isTable: false,
+      table: {
+        width: 150
       }
     },
-  },
-  {
-    label: '申请时间',
-    field: 'requestTime',
-    sort: 'custom',
-    isTable:false,
-    table: {
-      width: 180
-    },
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '承运商',
+      field: 'carrierCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 1010
+    },
+    {
+      label: '数据来源',
+      field: 'sourceType',
+      dictType: DICT_TYPE.PURCHASERECEIPT_SOURCE_TYPE,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
+      isSearch: false,
+      sortTableDefault: 5
+    },
+    {
+      label: '运输方式',
+      field: 'transferMode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 1011
+    },
+    {
+      label: '车牌号',
+      field: 'vehiclePlateNumber',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 1012
+    },
+    {
+      label: '从仓库代码',
+      field: 'fromWarehouseCode',
+      sort: 'custom',
+      isTable: false,
+      table: {
+        width: 150
       }
     },
-  },
-  {
-    label: '要求截止时间',
-    field: 'requestDueTime',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable:false,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '到仓库代码',
+      field: 'toWarehouseCode',
+      sort: 'custom',
+      isTable: false,
+      table: {
+        width: 150
+      },
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
     },
-  },
-  {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.JOB_STATUS,
-    dictClass: 'string',
-    isSearch: false,
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:6
-  },
-  {
-    label: '过期时间',
-    field: 'expiredTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable:false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '申请时间',
+      field: 'requestTime',
+      sort: 'custom',
+      isTable: false,
+      table: {
+        width: 180
+      },
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
     },
-  },
-  // {
-  //   label: '状态',
-  //   field: 'jobStageStatus',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
-  {
-    label: '优先级',
-    field: 'priority',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    form: {
-      component: 'InputNumber',
-    }
-  },
-  {
-    label: '优先级增量',
-    field: 'priorityIncrement',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    form: {
-      component: 'InputNumber',
-    }
-  },
-  {
-    label: '部门',
-    field: 'departmentCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-  },
-  {
-    label: '岗位',
-    field: 'userPositionCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-  },
-  {
-    label: '承接人',
-    field: 'acceptUserName',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-  },
-  {
-    label: '承接时间',
-    field: 'acceptTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable:false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '要求截止时间',
+      field: 'requestDueTime',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      }
+    },
+    {
+      label: '状态',
+      field: 'status',
+      dictType: DICT_TYPE.JOB_STATUS,
+      dictClass: 'string',
+      isSearch: false,
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 6
+    },
+    {
+      label: '过期时间',
+      field: 'expiredTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      }
+    },
+    // {
+    //   label: '状态',
+    //   field: 'jobStageStatus',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    // },
+    {
+      label: '优先级',
+      field: 'priority',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      form: {
+        component: 'InputNumber'
+      }
+    },
+    {
+      label: '优先级增量',
+      field: 'priorityIncrement',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      form: {
+        component: 'InputNumber'
+      }
+    },
+    {
+      label: '部门',
+      field: 'departmentCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '岗位',
+      field: 'userPositionCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '承接人',
+      field: 'acceptUserName',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '承接时间',
+      field: 'acceptTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      }
+    },
+    {
+      label: '完成人',
+      field: 'completeUserName',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '完成时间',
+      field: 'completeTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      }
+    },
+    {
+      label: '从库区类型范围',
+      field: 'fromAreaTypes',
+      dictType: DICT_TYPE.AREA_TYPE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      }
+    },
+    {
+      label: '到库区类型范围',
+      field: 'toAreaTypes',
+      dictType: DICT_TYPE.AREA_TYPE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
       }
     },
-  },
-  {
-    label: '完成人',
-    field: 'completeUserName',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-  },
-  {
-    label: '完成时间',
-    field: 'completeTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable:false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '从库区代码范围',
+      field: 'fromAreaCodes',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '到库区代码范围',
+      field: 'toAreaCodes',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '业务类型',
+      field: 'businessType',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '备注',
+      field: 'remark',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '创建者',
+      field: 'creator',
+      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: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
     },
-  },
-  {
-    label: '从库区类型范围',
-    field: 'fromAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '到库区类型范围',
-    field: 'toAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '从库区代码范围',
-    field: 'fromAreaCodes',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-  },
-  {
-    label: '到库区代码范围',
-    field: 'toAreaCodes',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-  },
-  {
-    label: '业务类型',
-    field: 'businessType',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-  },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    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: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '自动完成',
+      field: 'autoComplete',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
+      },
+      sort: 'custom',
+      table: {
+        width: 180
       }
     },
-  },
-  {
-    label: '自动完成',
-    field: 'autoComplete',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    {
+      label: '允许修改库位',
+      field: 'allowModifyLocation',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
+      },
+      sort: 'custom',
+      table: {
+        width: 180
       }
     },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-  },
-  {
-    label: '允许修改库位',
-    field: 'allowModifyLocation',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    {
+      label: '允许修改数量',
+      field: 'allowModifyQty',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
+      },
+      sort: 'custom',
+      table: {
+        width: 180
       }
     },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-  },
-  {
-    label: '允许修改数量',
-    field: 'allowModifyQty',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    {
+      label: '允许大于推荐数量',
+      field: 'allowBiggerQty',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
+      },
+      sort: 'custom',
+      table: {
+        width: 180
       }
     },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-  },
-  {
-    label: '允许大于推荐数量',
-    field: 'allowBiggerQty',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    {
+      label: '允许小于推荐数量',
+      field: 'allowSmallerQty',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
+      },
+      sort: 'custom',
+      table: {
+        width: 180
       }
     },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-  },
-  {
-    label: '允许小于推荐数量',
-    field: 'allowSmallerQty',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    {
+      label: '允许修改库存状态',
+      field: 'allowModifyInventoryStatus',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
+      },
+      sort: 'custom',
+      table: {
+        width: 180
       }
     },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-  },
-  {
-    label: '允许修改库存状态',
-    field: 'allowModifyInventoryStatus',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    {
+      label: '允许连续扫描',
+      field: 'allowContinuousScanning',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
+      },
+      sort: 'custom',
+      table: {
+        width: 180
       }
     },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-  },
-  {
-    label: '允许连续扫描',
-    field: 'allowContinuousScanning',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    {
+      label: '允许部分完成',
+      field: 'allowPartialComplete',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
+      },
+      sort: 'custom',
+      table: {
+        width: 180
       }
     },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-  },
-  {
-    label: '允许部分完成',
-    field: 'allowPartialComplete',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    {
+      label: '允许修改批次',
+      field: 'allowModifyBatch',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
+      },
+      sort: 'custom',
+      table: {
+        width: 180
       }
     },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-  },
-  {
-    label: '允许修改批次',
-    field: 'allowModifyBatch',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    {
+      label: '允许修改箱码',
+      field: 'allowModifyPackingNumber',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
+      },
+      sort: 'custom',
+      table: {
+        width: 180
       }
     },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-  },
-  {
-    label: '允许修改箱码',
-    field: 'allowModifyPackingNumber',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    {
+      label: '操作',
+      field: 'action',
+      isDetail: false,
+      isForm: false,
+      table: {
+        width: 250,
+        fixed: 'right'
       }
     },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-  },
-  {
-    label: '操作',
-    field: 'action',
-    isDetail: false,
-    isForm: false,
-    table: {
-      width: 250,
-      fixed: 'right'
-    },
-  },
-  {
-    label: '批次', // 实际是子表的到批次，为了不影响页面，单独放上面
-    field: 'toBatch',
-    sort: 'custom',
-    isForm:false,
-    isTableForm:false,
-    table: {
-      width: 150
-    },
-    sortTableDefault:1001,
-  },
-  {
-    label: '包装号', // 实际是子表的到包装号，为了不影响页面，单独放上面
-    field: 'toPackingNumber',
-    sort: 'custom',
-    isForm:false,
-    isTableForm:false,
-    table: {
-      width: 150
-    },
-    sortTableDefault:1001,
-  },
+    {
+      label: '批次', // 实际是子表的到批次，为了不影响页面，单独放上面
+      field: 'toBatch',
+      sort: 'custom',
+      isForm: false,
+      isTableForm: false,
+      table: {
+        width: 150
+      },
+      sortTableDefault: 1001
+    },
+    {
+      label: '包装号', // 实际是子表的到包装号，为了不影响页面，单独放上面
+      field: 'toPackingNumber',
+      sort: 'custom',
+      isForm: false,
+      isTableForm: false,
+      table: {
+        width: 150
+      },
+      sortTableDefault: 1001
+    },
 
-  {
-    label: '创建时间',
-    field: 'createTime',
-    isForm: false,
-    table: {
-      width: 180
-    },
-    formatter: dateFormatter,
-    detail: {
-      dateFormat : 'YYYY-MM-DD HH:mm:ss'
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '创建时间',
+      field: 'createTime',
+      isForm: false,
+      table: {
+        width: 180
+      },
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
+    },
+    {
+      label: '创建者',
+      field: 'creator',
+      table: {
+        width: 130
+      },
+      isForm: false,
+      isTable: true
     }
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    table: {
-      width: 130
-    },
-    isForm: false,
-    isTable: true
-  }
-
-]))
+  ])
+)
 
 //表单校验
 export const PurchasereceiptJobMainRules = reactive({
-  requestNumber: [
-    { required: true, message: '请选择申请单号', trigger: 'change' }
-  ],
-  supplierCode: [
-    { required: true, message: '请选择供应商代码', trigger: 'change' }
-  ],
-  toWarehouseCode: [
-    { required: true, message: '请选择到仓库代码', trigger: 'change' }
-  ],
-  toAreaTypes: [
-    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
-  ],
-  requestTime: [
-    { required: true, message: '请输入申请时间', trigger: 'change' }
-  ],
-  requestDueTime: [
-    { required: true, message: '请输入要求截止时间', trigger: 'change' }
-  ],
-  status: [
-    { required: true, message: '请选择状态', trigger: 'change' }
-  ],
+  requestNumber: [{ required: true, message: '请选择申请单号', trigger: 'change' }],
+  supplierCode: [{ required: true, message: '请选择供应商代码', trigger: 'change' }],
+  toWarehouseCode: [{ required: true, message: '请选择到仓库代码', trigger: 'change' }],
+  toAreaTypes: [{ required: true, message: '请选择到库区类型范围', trigger: 'change' }],
+  requestTime: [{ required: true, message: '请输入申请时间', trigger: 'change' }],
+  requestDueTime: [{ required: true, message: '请输入要求截止时间', trigger: 'change' }],
+  status: [{ required: true, message: '请选择状态', trigger: 'change' }],
   // jobStageStatus: [
   //   { required: true, message: '请选择阶段状态', trigger: 'change' }
   // ],
-  priority: [
-    { required: true, message: '请输入优先级', trigger: 'blur' }
-  ],
-  priorityIncrement: [
-    { required: true, message: '请输入优先级增量', trigger: 'blur' }
-  ],
-  departmentCode: [
-    { required: true, message: '请输入部门', trigger: 'blur' }
-  ],
-  userPositionCode: [
-    { required: true, message: '请输入岗位', trigger: 'blur' }
-  ],
-  number: [
-    { required: true, message: '请输入单据号', trigger: 'blur' }
-  ],
-  businessType: [
-    { required: true, message: '请输入业务类型', trigger: 'blur' }
-  ],
-  createTime: [
-    { required: true, message: '请输入创建时间', trigger: 'blur' }
-  ],
-  creator: [
-    { required: true, message: '请输入创建者', trigger: 'blur' }
-  ],
+  priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }],
+  priorityIncrement: [{ required: true, message: '请输入优先级增量', trigger: 'blur' }],
+  departmentCode: [{ required: true, message: '请输入部门', trigger: 'blur' }],
+  userPositionCode: [{ required: true, message: '请输入岗位', trigger: 'blur' }],
+  number: [{ required: true, message: '请输入单据号', trigger: 'blur' }],
+  businessType: [{ required: true, message: '请输入业务类型', trigger: 'blur' }],
+  createTime: [{ required: true, message: '请输入创建时间', trigger: 'blur' }],
+  creator: [{ required: true, message: '请输入创建者', trigger: 'blur' }]
 })
 
 /**
  * @returns {Array} 采购收货任务子表
  */
-export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '包装号',
-    field: 'packingNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch:true,
-    hiddenInMain:true,
-    sortTableDefault:1002,
-    sortSearchDefault:1002
-  },
-  {
-    label: '包装规格',
-    field: 'packUnit',
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:1002
-  },
-  {
-    label: '包装数量',
-    field: 'qty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-    },
-    sortTableDefault:1002
-  },
-  {
-    label: '器具号',
-    field: 'containerNumber',
-    sort: 'custom',
-    hiddenInMain:true,
-    table: {
-      width: 150
-    },
-    isTable:false,
-  },
-  {
-    label: '批次',
-    field: 'batch',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortSearchDefault:1000,
-    isSearch:true,
-    hiddenInMain:true,
-    sortTableDefault:8,
-  },
-  {
-    label: '替代批次',
-    field: 'altBatch',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    hiddenInMain:true,
-  },
-  {
-    label: '到货日期',
-    field: 'arriveDate',
-    formatter: dateFormatter2,
-    detail: {
-      dateFormat: 'YYYY-MM-DD'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    sortTableDefault:1005,
-    hiddenInMain:true,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width: '100%'},
-        type: 'date',
-        dateFormat: 'YYYY-MM-DD',
-        valueFormat: 'x',
+export const PurchasereceiptJobDetail = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '包装号',
+      field: 'packingNumber',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true,
+      hiddenInMain: true,
+      sortTableDefault: 1002,
+      sortSearchDefault: 1002
+    },
+    {
+      label: '包装规格',
+      field: 'packUnit',
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 1002
+    },
+    {
+      label: '包装数量',
+      field: 'qty',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'InputNumber'
+      },
+      sortTableDefault: 1002
+    },
+    {
+      label: '器具号',
+      field: 'containerNumber',
+      sort: 'custom',
+      hiddenInMain: true,
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '批次',
+      field: 'batch',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortSearchDefault: 1000,
+      isSearch: true,
+      hiddenInMain: true,
+      sortTableDefault: 8
+    },
+    {
+      label: '替代批次',
+      field: 'altBatch',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      hiddenInMain: true
+    },
+    {
+      label: '到货日期',
+      field: 'arriveDate',
+      formatter: dateFormatter2,
+      detail: {
+        dateFormat: 'YYYY-MM-DD'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      sortTableDefault: 1005,
+      hiddenInMain: true,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'date',
+          dateFormat: 'YYYY-MM-DD',
+          valueFormat: 'x'
+        }
       }
     },
-  },
-  {
-    label: '生产日期',
-    field: 'produceDate',
-    formatter: dateFormatter2,
-    detail: {
-      dateFormat: 'YYYY-MM-DD'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    sortTableDefault:1005,
-    hiddenInMain:true,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width: '100%'},
-        type: 'date',
-        dateFormat: 'YYYY-MM-DD',
-        valueFormat: 'x',
+    {
+      label: '生产日期',
+      field: 'produceDate',
+      formatter: dateFormatter2,
+      detail: {
+        dateFormat: 'YYYY-MM-DD'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      sortTableDefault: 1005,
+      hiddenInMain: true,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'date',
+          dateFormat: 'YYYY-MM-DD',
+          valueFormat: 'x'
+        }
       }
     },
-  },
-  {
-    label: '过期日期',
-    field: 'expireDate',
-    formatter: dateFormatter2,
-    detail: {
-      dateFormat: 'YYYY-MM-DD'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    sortTableDefault:1005,
-    hiddenInMain:true,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width: '100%'},
-        type: 'date',
-        dateFormat: 'YYYY-MM-DD',
-        valueFormat: 'x',
+    {
+      label: '过期日期',
+      field: 'expireDate',
+      formatter: dateFormatter2,
+      detail: {
+        dateFormat: 'YYYY-MM-DD'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      sortTableDefault: 1005,
+      hiddenInMain: true,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'date',
+          dateFormat: 'YYYY-MM-DD',
+          valueFormat: 'x'
+        }
       }
     },
-  },
-  {
-    label: '库存状态',
-    field: 'inventoryStatus',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    sortTableDefault:1006,
-  },
-  {
-    label: '来源库位',
-    field: 'fromLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:1007,
-  },
-  {
-    label: '目标库位',
-    field: 'toLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:1007,
-  },
-  {
-    label: '采购订单号',
-    field: 'poNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch:true,
-    sortTableDefault:6,
-
-  },
-  {
-    label: '订单行',
-    field: 'poLine',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:6,
-  },
-  {
-    label: '行类型',
-    field: 'poLineType',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    sortTableDefault:6,
-    hiddenInMain:true,
-    isForm: false,
-    tableForm:{
-      disabled: true
-    }
-  },
-
-  {
-    label: '供应商计量数量',
-    field: 'supplierQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:1009,
-    hiddenInMain:true,
-    form: {
-      component: 'InputNumber',
-    }
-  },
-  {
-    label: '供应商计量单位',
-    field: 'supplierUom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:1009,
-    hiddenInMain:true,
-  },
-  {
-    label: '转换率',
-    field: 'convertRate',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-    },
-    sortTableDefault:1009,
-    hiddenInMain:true,
-  },
-  {
-    label: '从货主',
-    field: 'fromOwnerCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    sortTableDefault:1008,
-  },
-  {
-    label: '到货主',
-    field: 'toOwnerCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    sortTableDefault:1008,
-  },
-  {
-    label: '物料代码',
-    field: 'itemCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:7,
-    isSearch:true
-  },
-  {
-    label: '物料名称',
-    field: 'itemName',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:7,
-  },
-  {
-    label: '物料描述1',
-    field: 'itemDesc1',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    sortTableDefault:7,
-  },
-  {
-    label: '物料描述2',
-    field: 'itemDesc2',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    sortTableDefault:7,
-  },
-  {
-    label: '项目代码',
-    field: 'projectCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    sortTableDefault:1010,
-  },
-  {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:1004
-  },
-  {
-    label: '订单数量',
-    field: 'orderQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    sortTableDefault:1004
-  },
-  {
-    label: '收货数量',
-    field: 'qty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    sortTableDefault:1004
-  },
-  {
-    label: '数量',
-    field: 'qty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    form: {
-      component: 'InputNumber',
-    },
-    sortTableDefault:1004
-  },
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    hiddenInMain:true,
-    sortTableDefault:1011,
-  },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:1012,
-    hiddenInMain:true,
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    sortTableDefault:1012
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '库存状态',
+      field: 'inventoryStatus',
+      dictType: DICT_TYPE.INVENTORY_STATUS,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true,
+      sortTableDefault: 1006
+    },
+    {
+      label: '来源库位',
+      field: 'fromLocationCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 1007
+    },
+    {
+      label: '目标库位',
+      field: 'toLocationCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 1007
+    },
+    {
+      label: '采购订单号',
+      field: 'poNumber',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true,
+      sortTableDefault: 6
+    },
+    {
+      label: '订单行',
+      field: 'poLine',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 6
+    },
+    {
+      label: '行类型',
+      field: 'poLineType',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      sortTableDefault: 6,
+      hiddenInMain: true,
+      isForm: false,
+      tableForm: {
+        disabled: true
       }
     },
-    hiddenInMain:true,
-    sortTableDefault:1012
-  },
-  {
-    label: '操作',
-    hiddenInMain:true,
-    field: 'action',
-    isDetail: false,
-    isForm: false ,
-    table: {
-      width: 180,
-      fixed: 'right'
-    },
-    isTableForm:true,
-  },
 
-]))
+    {
+      label: '供应商计量数量',
+      field: 'supplierQty',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 1009,
+      hiddenInMain: true,
+      form: {
+        component: 'InputNumber'
+      }
+    },
+    {
+      label: '供应商计量单位',
+      field: 'supplierUom',
+      dictType: DICT_TYPE.UOM,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 1009,
+      hiddenInMain: true
+    },
+    {
+      label: '转换率',
+      field: 'convertRate',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'InputNumber'
+      },
+      sortTableDefault: 1009,
+      hiddenInMain: true
+    },
+    {
+      label: '从货主',
+      field: 'fromOwnerCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true,
+      sortTableDefault: 1008
+    },
+    {
+      label: '到货主',
+      field: 'toOwnerCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true,
+      sortTableDefault: 1008
+    },
+    {
+      label: '物料代码',
+      field: 'itemCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 7,
+      isSearch: true
+    },
+    {
+      label: '物料名称',
+      field: 'itemName',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 7
+    },
+    {
+      label: '物料描述1',
+      field: 'itemDesc1',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true,
+      sortTableDefault: 7
+    },
+    {
+      label: '物料描述2',
+      field: 'itemDesc2',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true,
+      sortTableDefault: 7
+    },
+    {
+      label: '项目代码',
+      field: 'projectCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true,
+      sortTableDefault: 1010
+    },
+    {
+      label: '计量单位',
+      field: 'uom',
+      dictType: DICT_TYPE.UOM,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 1004
+    },
+    {
+      label: '订单数量',
+      field: 'orderQty',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true,
+      sortTableDefault: 1004
+    },
+    {
+      label: '收货数量',
+      field: 'qty',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true,
+      sortTableDefault: 1004
+    },
+    {
+      label: '数量',
+      field: 'qty',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      form: {
+        component: 'InputNumber'
+      },
+      sortTableDefault: 1004
+    },
+    {
+      label: '单据号',
+      field: 'number',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      hiddenInMain: true,
+      sortTableDefault: 1011
+    },
+    {
+      label: '备注',
+      field: 'remark',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 1012,
+      hiddenInMain: true
+    },
+    {
+      label: '创建者',
+      field: 'creator',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true,
+      sortTableDefault: 1012
+    },
+    {
+      label: '创建时间',
+      field: 'createTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      },
+      hiddenInMain: true,
+      sortTableDefault: 1012
+    },
+    {
+      label: '操作',
+      hiddenInMain: true,
+      field: 'action',
+      isDetail: false,
+      isForm: false,
+      table: {
+        width: 180,
+        fixed: 'right'
+      },
+      isTableForm: true
+    }
+  ])
+)
 
 //表单校验
 export const PurchasereceiptJobDetailRules = reactive({
-  packingNumber: [
-    { required: true, message: '请选择包装号', trigger: 'change' }
-  ],
-  batch: [
-    { required: true, message: '请输入批次', trigger: 'blur' }
-  ],
-  arriveDate: [
-    { required: true, message: '请输入到货日期', trigger: 'change' }
-  ],
-  produceDate: [
-    { required: true, message: '请输入生产日期', trigger: 'change' }
-  ],
-  expireDate: [
-    { required: true, message: '请输入过期日期', trigger: 'change' }
-  ],
-  inventoryStatus: [
-    { required: true, message: '请选择库存状态', trigger: 'change' }
-  ],
-  poNumber: [
-    { required: true, message: '请选择订单号', trigger: 'change' }
-  ],
-  poLine: [
-    { required: true, message: '请输入订单行', trigger: 'blur' }
-  ],
-  packQty: [
-    { required: true, message: '请输入包装数量', trigger: 'blur' }
-  ],
-  packUnit: [
-    { required: true, message: '请选择包装规格', trigger: 'change' }
-  ],
-  convertRate: [
-    { required: true, message: '请输入转换率', trigger: 'blur' }
-  ],
-  toLocationCode: [
-    { required: true, message: '请选择到库位代码', trigger: 'change' }
-  ],
-  number: [
-    { required: true, message: '请输入单据号', trigger: 'blur' }
-  ],
-  itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
-  ],
-  createTime: [
-    { required: true, message: '请输入创建时间', trigger: 'blur' }
-  ],
-  creator: [
-    { required: true, message: '请输入创建者', trigger: 'blur' }
-  ],
+  packingNumber: [{ required: true, message: '请选择包装号', trigger: 'change' }],
+  batch: [{ required: true, message: '请输入批次', trigger: 'blur' }],
+  arriveDate: [{ required: true, message: '请输入到货日期', trigger: 'change' }],
+  produceDate: [{ required: true, message: '请输入生产日期', trigger: 'change' }],
+  expireDate: [{ required: true, message: '请输入过期日期', trigger: 'change' }],
+  inventoryStatus: [{ required: true, message: '请选择库存状态', trigger: 'change' }],
+  poNumber: [{ required: true, message: '请选择订单号', trigger: 'change' }],
+  poLine: [{ required: true, message: '请输入订单行', trigger: 'blur' }],
+  packQty: [{ required: true, message: '请输入包装数量', trigger: 'blur' }],
+  packUnit: [{ required: true, message: '请选择包装规格', trigger: 'change' }],
+  convertRate: [{ required: true, message: '请输入转换率', trigger: 'blur' }],
+  toLocationCode: [{ required: true, message: '请选择到库位代码', trigger: 'change' }],
+  number: [{ required: true, message: '请输入单据号', trigger: 'blur' }],
+  itemCode: [{ required: true, message: '请选择物料代码', trigger: 'change' }],
+  createTime: [{ required: true, message: '请输入创建时间', trigger: 'blur' }],
+  creator: [{ required: true, message: '请输入创建者', trigger: 'blur' }]
 })
 
-
 /**
  * @returns {Array} 采购收货任务子表
  */
-export const PurchasereceiptJobDetailPackingNumber = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '包装号',
-    field: 'packingNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      componentProps: {
-        disabled:true
+export const PurchasereceiptJobDetailPackingNumber = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '包装号',
+      field: 'packingNumber',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
+      tableForm: {
+        disabled: true
       }
     },
-    tableForm: {
-      disabled: true,
-    }
-  },
-  {
-    label: '器具号',
-    field: 'containerNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      componentProps: {
-      disabled:true
+    {
+      label: '器具号',
+      field: 'containerNumber',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
+      tableForm: {
+        disabled: true
       }
     },
-    tableForm: {
-      disabled: true,
-    }
-  },
-  {
-    label: '批次',
-    field: 'batch',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      componentProps: {
-      disabled:true
+    {
+      label: '批次',
+      field: 'batch',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
+      tableForm: {
+        disabled: true
       }
     },
-    tableForm: {
-      disabled: true,
-    }
-  },
-  {
-    label: '替代批次',
-    field: 'altBatch',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      componentProps: {
-      disabled:true
+    {
+      label: '替代批次',
+      field: 'altBatch',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
+      tableForm: {
+        disabled: true
       }
     },
-    tableForm: {
-      disabled: true,
-    }
-  },
-  {
-    label: '到货日期',
-    field: 'arriveDate',
-    formatter: dateFormatter2,
-    detail: {
-      dateFormat: 'YYYY-MM-DD'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        disabled:true,
-        style: {width: '100%'},
-        type: 'date',
-        dateFormat: 'YYYY-MM-DD',
-        valueFormat: 'x',
+    {
+      label: '到货日期',
+      field: 'arriveDate',
+      formatter: dateFormatter2,
+      detail: {
+        dateFormat: 'YYYY-MM-DD'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          disabled: true,
+          style: { width: '100%' },
+          type: 'date',
+          dateFormat: 'YYYY-MM-DD',
+          valueFormat: 'x'
+        }
+      },
+      tableForm: {
+        disabled: true
       }
     },
-    tableForm: {
-      disabled: true,
-    }
-  },
-  {
-    label: '生产日期',
-    field: 'produceDate',
-    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',
+    {
+      label: '生产日期',
+      field: 'produceDate',
+      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: {
+        disabled: true,
+        type: 'FormDate',
+        valueFormat: 'x'
       }
     },
-    tableForm: {
-      disabled: true,
-      type:'FormDate',
-      valueFormat: 'x',
-    }
-  },
-  {
-    label: '过期日期',
-    field: 'expireDate',
-    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',
+    {
+      label: '过期日期',
+      field: 'expireDate',
+      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: {
+        disabled: true,
+        type: 'FormDate',
+        valueFormat: 'x'
       }
     },
-    tableForm: {
-      disabled: true,
-      type:'FormDate',
-      valueFormat: 'x',
-    }
-  },
-  {
-    label: '库存状态',
-    field: 'inventoryStatus',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true,
-    }
-  },
-  {
-    label: '从库位代码',
-    field: 'fromLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true,
-    }
-  },
-  {
-    label: '到库位代码',
-    field: 'toLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true,
-    }
-  },
-  {
-    label: '订单号',
-    field: 'poNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true,
-    }
-  },
-  {
-    label: '订单行',
-    field: 'poLine',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true,
-    }
-  },
-  {
-    label: '包装数量',
-    field: 'packQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-    },
-    tableForm: {
-      disabled: true,
-    }
-  },
-  {
-    label: '包装规格',
-    field: 'packUnit',
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true,
-    }
-  },
-  {
-    label: '供应商计量数量',
-    field: 'supplierQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-    },
-    tableForm: {
-      disabled: true,
-    }
-  },
-  {
-    label: '供应商计量单位',
-    field: 'supplierUom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true,
-    }
-  },
-  {
-    label: '转换率',
-    field: 'convertRate',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-    },
-    tableForm: {
-      disabled: true,
-    }
-  },
-  {
-    label: '从货主代码',
-    field: 'fromOwnerCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true,
-    }
-  },
-  {
-    label: '到货主代码',
-    field: 'toOwnerCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true,
-    }
-  },
-  {
-    label: '物料代码',
-    field: 'itemCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true,
-    }
-  },
-  {
-    label: '物料名称',
-    field: 'itemName',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true,
-    }
-  },
-  {
-    label: '物料描述1',
-    field: 'itemDesc1',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true,
-    }
-  },
-  {
-    label: '物料描述2',
-    field: 'itemDesc2',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true,
-    }
-  },
-  {
-    label: '项目代码',
-    field: 'projectCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true,
-    }
-  },
-  {
-    label: '数量',
-    field: 'qty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-    },
-    tableForm: {
-      disabled: true,
-    }
-  },
-  {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      type: 'Select',
-      disabled: true,
-    }
-  },
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    tableForm: {
-      disabled: true,
-    }
-  },
-  {
-    label: '备注',
-    fiield: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true,
-    }
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true,
-    }
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '库存状态',
+      field: 'inventoryStatus',
+      dictType: DICT_TYPE.INVENTORY_STATUS,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      tableForm: {
+        disabled: true
       }
     },
-    tableForm: {
-      disabled: true,
-      type:'FormDate',
-      valueFormat: 'x',
+    {
+      label: '从库位代码',
+      field: 'fromLocationCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      tableForm: {
+        disabled: true
+      }
+    },
+    {
+      label: '到库位代码',
+      field: 'toLocationCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      tableForm: {
+        disabled: true
+      }
+    },
+    {
+      label: '订单号',
+      field: 'poNumber',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      tableForm: {
+        disabled: true
+      }
+    },
+    {
+      label: '订单行',
+      field: 'poLine',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      tableForm: {
+        disabled: true
+      }
+    },
+    {
+      label: '包装数量',
+      field: 'packQty',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'InputNumber'
+      },
+      tableForm: {
+        disabled: true
+      }
+    },
+    {
+      label: '包装规格',
+      field: 'packUnit',
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      tableForm: {
+        disabled: true
+      }
+    },
+    {
+      label: '供应商计量数量',
+      field: 'supplierQty',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'InputNumber'
+      },
+      tableForm: {
+        disabled: true
+      }
+    },
+    {
+      label: '供应商计量单位',
+      field: 'supplierUom',
+      dictType: DICT_TYPE.UOM,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      tableForm: {
+        disabled: true
+      }
+    },
+    {
+      label: '转换率',
+      field: 'convertRate',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'InputNumber'
+      },
+      tableForm: {
+        disabled: true
+      }
+    },
+    {
+      label: '从货主代码',
+      field: 'fromOwnerCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      tableForm: {
+        disabled: true
+      }
+    },
+    {
+      label: '到货主代码',
+      field: 'toOwnerCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      tableForm: {
+        disabled: true
+      }
+    },
+    {
+      label: '物料代码',
+      field: 'itemCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      tableForm: {
+        disabled: true
+      }
+    },
+    {
+      label: '物料名称',
+      field: 'itemName',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      tableForm: {
+        disabled: true
+      }
+    },
+    {
+      label: '物料描述1',
+      field: 'itemDesc1',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      tableForm: {
+        disabled: true
+      }
+    },
+    {
+      label: '物料描述2',
+      field: 'itemDesc2',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      tableForm: {
+        disabled: true
+      }
+    },
+    {
+      label: '项目代码',
+      field: 'projectCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      tableForm: {
+        disabled: true
+      }
+    },
+    {
+      label: '数量',
+      field: 'qty',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'InputNumber'
+      },
+      tableForm: {
+        disabled: true
+      }
+    },
+    {
+      label: '计量单位',
+      field: 'uom',
+      dictType: DICT_TYPE.UOM,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      tableForm: {
+        type: 'Select',
+        disabled: true
+      }
+    },
+    {
+      label: '单据号',
+      field: 'number',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      tableForm: {
+        disabled: true
+      }
+    },
+    {
+      label: '备注',
+      fiield: 'remark',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      tableForm: {
+        disabled: true
+      }
+    },
+    {
+      label: '创建者',
+      field: 'creator',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      tableForm: {
+        disabled: true
+      }
+    },
+    {
+      label: '创建时间',
+      field: 'createTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      },
+      tableForm: {
+        disabled: true,
+        type: 'FormDate',
+        valueFormat: 'x'
+      }
     }
-  },
-]))
+  ])
+)

From cea853487c3e838bf3074f42b75a767076e14b13 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Wed, 10 Jul 2024 16:54:24 +0800
Subject: [PATCH 307/408] =?UTF-8?q?=E8=B4=A8=E6=A3=80=E6=98=8E=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/inspectionJob/index.vue | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/views/qms/inspectionJob/index.vue b/src/views/qms/inspectionJob/index.vue
index 34ac036b8..edd41b170 100644
--- a/src/views/qms/inspectionJob/index.vue
+++ b/src/views/qms/inspectionJob/index.vue
@@ -82,6 +82,15 @@
     :detailAllSchemasRules="InspectionJobPackageRules"
     :list="list"
   />
+  <el-dialog
+      v-model="showQualityReport"
+      :title="t('质检明细')"
+      width="90%"
+      append-to-body
+      destroy-on-close
+    >
+    <iframe height="600px" width="100%"  :src="qualityReport" frameborder="0"></iframe>
+  </el-dialog>
 </template>
 
 <script setup lang="ts">

From e1b5caf2f2ecb84cbcdef6c5aac5cc7919910a09 Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Wed, 10 Jul 2024 16:55:59 +0800
Subject: [PATCH 308/408] =?UTF-8?q?WMS:=20=E2=80=94=E2=80=94>=20bug=20=20?=
 =?UTF-8?q?=E5=A4=87=E8=B4=A7=E4=BB=BB=E5=8A=A1=EF=BC=8C=E7=82=B9=E5=BC=80?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=EF=BC=8C=E6=8A=8A=E6=96=B0=E5=A2=9E=E3=80=81?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E3=80=81=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deliversettlementManage/stockup/stockupMainJob/index.vue   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue
index 4b4687f4a..3c0bd0bb5 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue
@@ -62,6 +62,9 @@
     :detailAllSchemas="StockupDetailJob.allSchemas"
     :detailAllSchemasRules="StockupDetailJobRules"
     :searchTableParams="searchTableParams"
+    :detailButtonIsShowAdd="false"
+    :detailButtonIsShowEdit="false"
+    :detailButtonIsShowDelete="false"
     :apiPage="StockupJobDetailApi.getStockupDetailJobPage"
   />
 </template>

From 5d7ffc0a995d461af2a0e2dc959017cbc035de00 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 10 Jul 2024 17:05:05 +0800
Subject: [PATCH 309/408] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E5=B7=A5=E5=BA=8F?=
 =?UTF-8?q?=E5=8A=A0=E5=A4=8D=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/inspectionScheme/addForm.vue   |  2 +-
 src/views/qms/inspectionTemplate/addForm.vue | 25 ++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/views/qms/inspectionScheme/addForm.vue b/src/views/qms/inspectionScheme/addForm.vue
index 80b2c576c..19d1b72c1 100644
--- a/src/views/qms/inspectionScheme/addForm.vue
+++ b/src/views/qms/inspectionScheme/addForm.vue
@@ -233,7 +233,7 @@
         </el-form>
         <el-tabs
           v-model="editableTabsValue"
-          editable
+          closable
           class="demo-tabs"
           @edit="handleTabsEdit"
           type="border-card"
diff --git a/src/views/qms/inspectionTemplate/addForm.vue b/src/views/qms/inspectionTemplate/addForm.vue
index 4d2fc4d38..adde857d0 100644
--- a/src/views/qms/inspectionTemplate/addForm.vue
+++ b/src/views/qms/inspectionTemplate/addForm.vue
@@ -81,6 +81,18 @@
           :label="item.description"
           :name="item.name"
         >
+        <template #label>
+              <span class="custom-tabs-label" style="display: flex; align-items: center">
+               
+                <span>{{ item.description }}</span>
+                <Icon
+                  icon="ep:document-copy"
+                  color="#67C23A"
+                  style="margin-left: 10px"
+                  @click.stop="copy(item)"
+                />
+              </span>
+            </template>
           <div class="small-title">检验工序</div>
           <!-- <Form
             :ref="`formRefProcess`+index"
@@ -1016,6 +1028,19 @@ const changeIsTarget = (e,item) => {
     rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = false
   }
 }
+// 复制工序
+const copy = (item)=>{
+  const newItem = JSON.parse(JSON.stringify(item))
+  newItem.name = data.value.process[data.value.process.length-1].name + 1
+  newItem.code = ''
+  newItem.id = ''
+  newItem.sequenceCode =data.value?.process[data.value?.process?.length-1]?.sequenceCode? parseInt(data.value.process[data.value.process.length-1].sequenceCode) + 1 : ''
+  newItem.inspectionCharacteristicsBaseVO.code = ''
+  newItem.inspectionCharacteristicsBaseVO. id = ''
+  newItem.inspectionCharacteristicsBaseVO.concurrencyStamp = 1
+  data.value.process.push(newItem)
+  editableTabsValue.value =  newItem.name
+}
 </script>
 <style scoped>
 .small-title {

From 5a9cd4cfc2b55fd1fd82988021afffb1c076260d Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Wed, 10 Jul 2024 17:18:45 +0800
Subject: [PATCH 310/408] =?UTF-8?q?=E4=BF=9D=E7=95=99=E5=B0=8F=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index 234035685..7c37b8505 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -1044,7 +1044,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
 ]))
 
 const singlePriceFormart = (row, column, cellValue) => {
-  cellValue= Number(cellValue).toFixed(5)
+  cellValue= Number(cellValue).toFixed(2)
   cellValue = cellValue + '' || ''
 
   let x = cellValue.split('.')

From 84dcab8f2b90417ab896fbd0f95a0e48f0281247 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Wed, 10 Jul 2024 18:15:13 +0800
Subject: [PATCH 311/408] itemcodes

---
 .../scrap/scrapRequestMain/index.vue                   |  8 +++++---
 .../productscrap/productscrapRequestMain/index.vue     | 10 ++++++----
 .../supplierinvoiceRequestMain.data.ts                 |  2 ++
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
index 29df5e05e..62613ab63 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
@@ -162,10 +162,12 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
     setV['itemCode'] = val[0]['itemCode']
     setV['uom'] = val[0]['uom']
     // 查询标准价格
-    let param = {'itemCode':val[0]['itemCode'] as string}
+    let param = {'itemCodes':val[0]['itemCode'] as string}
     StdcostpriceApi.queryStdcostpriceByItemCode(param).then(res => {
-        setV['singlePrice'] = res.price
-      })
+      if(res&&res.length>0){
+        setV['singlePrice'] = res[0].price
+      }
+    })
     formRef.setValues(setV)
   })
 }
diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
index af5f92bc1..7258d22f8 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
@@ -310,11 +310,13 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         row['bomVersion'] = ''
         row['childList'] = []
         // 查询标准价格
-        let param = {'itemCode':val[0]['itemCode'] as string}
+        let param = {'itemCodes':val[0]['itemCode'] as string}
         StdcostpriceApi.queryStdcostpriceByItemCode(param).then(res => {
           console.log(res)
-          row['uom'] = res.uom
-          row['singlePrice'] = res.price
+          if(res&&res.length>0){
+            row['uom'] = res[0].uom
+            row['singlePrice'] = res[0].price
+          }
         }) 
         // 查看BOM版本
         const param1 =  {
@@ -359,7 +361,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
       setV['bomVersion'] = ''
       setV['childList'] = []
       // 查询标准价格
-      let param = {'itemCode':val[0]['itemCode'] as string}
+      let param = {'itemCodes':val[0]['itemCode'] as string}
       StdcostpriceApi.queryStdcostpriceByItemCode(param).then(res => {
         console.log(res)
       })
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index 7c37b8505..fb8172e03 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -1281,6 +1281,7 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       width: 150
     },
     form: {
+      component: 'InputNumber',
       componentProps: {
         disabled: true,
         min: 0,
@@ -1288,6 +1289,7 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       }
     },
     tableForm:{
+      type: 'InputNumber',
       disabled: true,
       min: 0,
       precision: 2,

From 4cc578a5e92a9a5a9e2e2f7a2fcc2e2d9ce27276 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Wed, 10 Jul 2024 18:27:15 +0800
Subject: [PATCH 312/408] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=98=8E=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productscrap/productscrapRequestMain/index.vue    | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
index 7258d22f8..ceef161d2 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
@@ -42,6 +42,8 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
     ref="formRef"
+    :isOpenSearchTable="true"
+    fieldTableColumn="workStationCode"
     @success="getList"
     :rules="ProductscrapRequestMainRules"
     :formAllSchemas="ProductscrapRequestMain.allSchemas"
@@ -300,8 +302,13 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       if(formField == 'productionLineCode'){
         row['productionLineCode'] = val[0]['code']
       }else if(formField == 'workStationCode'){
-        row['workStationCode'] = val[0]['code']
-        row['fromLocationCode'] = val[0]['rawLocationCode']
+        val.forEach(item=>{
+          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+          newRow['workStationCode'] = item['code']
+          newRow['fromLocationCode'] = item['rawLocationCode']
+          tableData.value.push(newRow)
+        })
+        
       }else if(formField == 'processCode'){
         row['processCode'] = val[0]['code']
       }else if(formField == 'itemCode'){

From 4c398efa8556b315ebb274ae48dcc575b9eddf7c Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 10 Jul 2024 18:33:48 +0800
Subject: [PATCH 313/408] =?UTF-8?q?SCPtest=E4=BE=9B=E5=BA=94=E5=95=86?=
 =?UTF-8?q?=E5=8F=91=E7=A5=A8=E7=94=B3=E8=AF=B7=E4=B8=8E=E4=BE=9B=E5=BA=94?=
 =?UTF-8?q?=E5=95=86=E5=8F=91=E7=A5=A8=E8=AE=B0=E5=BD=95=E4=B8=AD=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=BB=E6=95=B0=E6=8D=AE=E6=9F=A5=E7=9C=8B=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E6=94=B9=E5=8F=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Descriptions/src/Descriptions.vue         |   1 +
 src/components/Detail/src/Detail.vue          |  14 +-
 .../supplierinvoiceRecordMain/index.vue       |   6 +-
 .../supplierinvoiceRecordMain.data.ts         | 374 ++++++++++++++++++
 .../supplierinvoiceRequestMain/index.vue      |   7 +-
 .../supplierinvoiceRequestMain.data.ts        | 374 ++++++++++++++++++
 6 files changed, 770 insertions(+), 6 deletions(-)

diff --git a/src/components/Descriptions/src/Descriptions.vue b/src/components/Descriptions/src/Descriptions.vue
index f81f8f35a..a7c49f853 100644
--- a/src/components/Descriptions/src/Descriptions.vue
+++ b/src/components/Descriptions/src/Descriptions.vue
@@ -127,6 +127,7 @@ const showAll = () =>{
             :label-align="labelAlign"
             :label-class-name="labelClassName"
             :width="width"
+            :span="item.span"
           >
             <template #label>
               <slot
diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue
index 82af70806..fa730797f 100644
--- a/src/components/Detail/src/Detail.vue
+++ b/src/components/Detail/src/Detail.vue
@@ -18,8 +18,8 @@
           :data="detailData"
           labelClassName="label-class-name"
           label-align="left"
-          direction="vertical"
-          :column="8"
+          :direction="direction"
+          :column="column"
           :schema="allSchemas.detailSchema"
           :columns="2"
           width="200px"
@@ -408,6 +408,16 @@ const props = defineProps({
     required: false,
     default: null
   },
+  direction:{
+    type: String,
+    required: false,
+    default: 'vertical'
+  },
+  column:{
+    type: Number,
+    required: false,
+    default: 8
+  }
 })
 const isShowDrawer = ref(false)
 const detailLoading = ref(false)
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
index 86e5bbba9..989ffeaaf 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
@@ -106,7 +106,9 @@
       hiddenDelete:true
     }"
     :isBasic="false"
-    :allSchemas="SupplierinvoiceRecordMain.allSchemas"
+    direction="horizontal"
+    :column="3"
+    :allSchemas="SupplierinvoiceRecordDetailMain.allSchemas"
     :detailAllSchemas="SupplierinvoiceRecordDetail.allSchemas"
     :detailAllSchemasRules="SupplierinvoiceRecordDetailRules"
     :apiPage="SupplierinvoiceRecordDetailApi.getSupplierinvoiceRecordDeatilPage"
@@ -119,7 +121,7 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { SupplierinvoiceRecordMain,SupplierinvoiceRecordMainRules,SupplierinvoiceRecordDetail,SupplierinvoiceRecordDetailRules } from './supplierinvoiceRecordMain.data'
+import { SupplierinvoiceRecordMain,SupplierinvoiceRecordMainRules,SupplierinvoiceRecordDetail,SupplierinvoiceRecordDetailRules,SupplierinvoiceRecordDetailMain } from './supplierinvoiceRecordMain.data'
 import * as SupplierinvoiceRecordMainApi from '@/api/wms/supplierinvoiceRecordMain'
 import * as SupplierinvoiceRecordDetailApi from '@/api/wms/supplierinvoiceRecordDeatil'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
index 03b7ecd70..c0f8ebfaa 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
@@ -755,7 +755,381 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   }
 ]))
+/**
+ * @returns {Array} 供应商发票在详情展示的主表字段
+ */
+export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '汇总信息',
+    field: '',
+    sort: 'custom',
+    isForm: false,
+    isSearch: false,
+    isTable: false,
+    isDetail: true,
+  },
+  {
+    label: '供应商信息',
+    field: '',
+    sort: 'custom',
+    isForm: false,
+    isSearch: false,
+    isTable: false,
+    isDetail: true,
+  },
+  {
+    label: 'SCP系统数据',
+    field: '',
+    sort: 'custom',
+    isForm: false,
+    isSearch: false,
+    isTable: false,
+    isDetail: true,
+  },
 
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '系统价税合计',
+    field: 'afterTaxAmount',
+    formatter: accountantFormart,
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '财务凭证号',
+    field: 'voucherNumber',
+   
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '供应商名称',
+    field: 'supplierName',
+    sort: 'custom',
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '系统未税金额',
+    field: 'amount',
+    formatter: accountantFormart,
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '供应商创建日期',
+    field: 'supplierName',
+    sort: 'custom',
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '订单类型',
+    field: 'orderType',
+    dictType: DICT_TYPE.PURCHASE_INVOICE_ORDER_TYPE,
+    dictClass: 'string',
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '系统税额',
+    field: 'taxAmount',
+    formatter: accountantFormart,
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.SUPPLIERINVOICE_REQUEST_STATUS,
+    dictClass: 'string',
+    sort: 'custom',
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '发票号码',
+    field: 'goldenTaxInvoiceNumber',
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '',
+    field: '',
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '采购价格审批人',
+    field: 'procurementCreator',
+    sortTableDefault: 1003,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '开票日期',
+    field: 'invoiceTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '',
+    field: '',
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '采购价格审批时间',
+    field: 'procurementCreator',
+    sortTableDefault: 1003,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '税率(%)',
+    field: 'taxRate',
+    dictType: DICT_TYPE.TAX_RATE_DICT,
+    dictClass: 'string',
+    sortTableDefault: 3,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '',
+    field: '',
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '价差通过说明',
+    field: 'balanceStatement',
+    sort: 'custom',
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '价税合计金额',
+    field: 'adTaxAmount',
+    formatter: accountantFormart,
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '',
+    field: '',
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+
+  {
+    label: '财务审批人',
+    field: 'financialCreatorName',
+    sort: 'custom',
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '未税金额',
+    field: 'beforeTaxAmount',
+    formatter: accountantFormart,
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '差额',
+    field: '',
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '财务审批时间',
+    field: 'financialCreateTime',
+    formatter: dateFormatter,
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '税额',
+    field: 'totalTaxAmount',
+    formatter: accountantFormart,
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '价税合计差额(价税合计-系统价税合计)',
+    field: 'totalTaxDiffAmount',
+    formatter: accountantFormart,
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '财务过账日期',
+    field: 'postingDate',
+    isTable: true,
+    sortTableDefault: 15,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+   
+  },
+  {
+    label: '折扣金额',
+    field: 'discountAmount1',
+    formatter: accountantFormart,
+   
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '未税差额(未税金额-系统未税金额)',
+    field: 'beforeTaxDiffAmount',
+    formatter: accountantFormart,
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+   
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+    detail:{
+      span:2
+    }
+  },
+  {
+    label: '税额差异',
+    field: 'taxAmountDiff',
+    formatter: accountantFormart,
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+]))
 //表单校验
 export const SupplierinvoiceRecordMainRules = reactive({
   requestNumber: [
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 850836e95..b99976ba2 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -146,6 +146,8 @@
     :isOpenSearchTable="true"
     fieldTableColumn="poLine"
     :annexTable="detailAnnexTable"
+    direction="horizontal"
+    :column="3"
     :annexAlias="{
       hidden:true,
       label:t('ts.其他附件')
@@ -196,7 +198,7 @@
       })
     }"
     :isBasic="false" 
-    :allSchemas="SupplierinvoiceRequestMain.allSchemas"
+    :allSchemas="SupplierinvoiceRequestDetailMain.allSchemas"
     :detailAllSchemas="SupplierinvoiceRequestDetail.allSchemas"
     :detailAllSchemasRules="SupplierinvoiceRequestDetailRules" 
     :searchTableParams="searchTableParams"
@@ -244,7 +246,8 @@ import dayjs from 'dayjs'
     SupplierinvoiceRequestFinance,
     SupplierinvoiceRequestFinanceRules,
     PurchasePass,
-    PurchasePassRules
+    PurchasePassRules,
+    SupplierinvoiceRequestDetailMain
   } from './supplierinvoiceRequestMain.data'
   import * as SupplierinvoiceRequestMainApi from '@/api/wms/supplierinvoiceRequestMain'
   import * as SupplierinvoiceRequestDetailApi from '@/api/wms/supplierinvoiceRequestDetail'
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index fb8172e03..2ee03376f 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -1042,7 +1042,381 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     },
   }
 ]))
+/**
+ * @returns {Array} 供应商发票在详情展示的主表字段
+ */
+export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '汇总信息',
+    field: '',
+    sort: 'custom',
+    isForm: false,
+    isSearch: false,
+    isTable: false,
+    isDetail: true,
+  },
+  {
+    label: '供应商信息',
+    field: '',
+    sort: 'custom',
+    isForm: false,
+    isSearch: false,
+    isTable: false,
+    isDetail: true,
+  },
+  {
+    label: 'SCP系统数据',
+    field: '',
+    sort: 'custom',
+    isForm: false,
+    isSearch: false,
+    isTable: false,
+    isDetail: true,
+  },
+
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '系统价税合计',
+    field: 'afterTaxAmount',
+    formatter: accountantFormart,
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '财务凭证号',
+    field: 'voucherNumber',
+   
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '供应商名称',
+    field: 'supplierName',
+    sort: 'custom',
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '系统未税金额',
+    field: 'amount',
+    formatter: accountantFormart,
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '供应商创建日期',
+    field: 'supplierName',
+    sort: 'custom',
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '订单类型',
+    field: 'orderType',
+    dictType: DICT_TYPE.PURCHASE_INVOICE_ORDER_TYPE,
+    dictClass: 'string',
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '系统税额',
+    field: 'taxAmount',
+    formatter: accountantFormart,
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.SUPPLIERINVOICE_REQUEST_STATUS,
+    dictClass: 'string',
+    sort: 'custom',
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '发票号码',
+    field: 'goldenTaxInvoiceNumber',
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '',
+    field: '',
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '采购价格审批人',
+    field: 'procurementCreator',
+    sortTableDefault: 1003,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '开票日期',
+    field: 'invoiceTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '',
+    field: '',
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '采购价格审批时间',
+    field: 'procurementCreator',
+    sortTableDefault: 1003,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '税率(%)',
+    field: 'taxRate',
+    dictType: DICT_TYPE.TAX_RATE_DICT,
+    dictClass: 'string',
+    sortTableDefault: 3,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '',
+    field: '',
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '价差通过说明',
+    field: 'balanceStatement',
+    sort: 'custom',
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '价税合计金额',
+    field: 'adTaxAmount',
+    formatter: accountantFormart,
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '',
+    field: '',
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
 
+  {
+    label: '财务审批人',
+    field: 'financialCreatorName',
+    sort: 'custom',
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '未税金额',
+    field: 'beforeTaxAmount',
+    formatter: accountantFormart,
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '差额',
+    field: '',
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '财务审批时间',
+    field: 'financialCreateTime',
+    formatter: dateFormatter,
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '税额',
+    field: 'totalTaxAmount',
+    formatter: accountantFormart,
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '价税合计差额(价税合计-系统价税合计)',
+    field: 'totalTaxDiffAmount',
+    formatter: accountantFormart,
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '财务过账日期',
+    field: 'postingDate',
+    isTable: true,
+    sortTableDefault: 15,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+   
+  },
+  {
+    label: '折扣金额',
+    field: 'discountAmount1',
+    formatter: accountantFormart,
+   
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '未税差额(未税金额-系统未税金额)',
+    field: 'beforeTaxDiffAmount',
+    formatter: accountantFormart,
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+   
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+    detail:{
+      span:2
+    }
+  },
+  {
+    label: '税额差异',
+    field: 'taxAmountDiff',
+    formatter: accountantFormart,
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+]))
 const singlePriceFormart = (row, column, cellValue) => {
   cellValue= Number(cellValue).toFixed(2)
   cellValue = cellValue + '' || ''

From 80aed4fa05ace44d9722dc9e2e22a45e9aba428a Mon Sep 17 00:00:00 2001
From: bjang03 <259278618@qq.com>
Date: Wed, 10 Jul 2024 18:34:31 +0800
Subject: [PATCH 314/408] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=20=E7=9B=98?=
 =?UTF-8?q?=E7=82=B9=E5=AD=90=E8=A1=A8=E5=A2=9E=E5=8A=A0=E4=BB=93=E5=BA=93?=
 =?UTF-8?q?=E3=80=81=E5=BA=93=E5=8C=BA=E3=80=81=E5=BA=93=E4=BD=8D=E7=BB=84?=
 =?UTF-8?q?=E3=80=81=E5=BA=93=E4=BD=8D=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../count/countJobMain/countJobMain.data.ts   | 64 +++++++++----------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts b/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts
index 079cff73d..9c0fe1ba0 100644
--- a/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts
+++ b/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts
@@ -83,38 +83,6 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '仓库代码',
-    field: 'warehouseCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-
-  {
-    label: '库区代码',
-    field: 'areaCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },{
-    label: '库位组代码',
-    field: 'locationGroupCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '库位代码',
-    field: 'locationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
   {
     label: '申请时间',
     field: 'requestTime',
@@ -671,6 +639,38 @@ export const CountJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '仓库代码',
+    field: 'warehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+
+  {
+    label: '库区代码',
+    field: 'areaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },{
+    label: '库位组代码',
+    field: 'locationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库位代码',
+    field: 'locationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '器具号',
     field: 'containerNumber',

From 25ae4fe26feb845b622150af9b31d4820a964d14 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 10 Jul 2024 18:41:42 +0800
Subject: [PATCH 315/408] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?=
 =?UTF-8?q?=E7=A5=A8=E7=94=B3=E8=AF=B7=E4=B8=8E=E4=BE=9B=E5=BA=94=E5=95=86?=
 =?UTF-8?q?=E5=8F=91=E7=A5=A8=E8=AE=B0=E5=BD=95=E4=B8=AD=EF=BC=8C=E4=B8=BB?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9F=A5=E7=9C=8B=E5=88=97=E8=A1=A8=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E6=94=B9=E5=8F=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoiceRecordMain.data.ts                         | 4 ++--
 .../supplierinvoiceRequestMain.data.ts                        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
index c0f8ebfaa..fe31c9a12 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
@@ -854,7 +854,7 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
   },
   {
     label: '供应商创建日期',
-    field: 'supplierName',
+    field: 'supplierDate',
     sort: 'custom',
     
     sortTableDefault: 6,
@@ -947,7 +947,7 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
   },
   {
     label: '采购价格审批时间',
-    field: 'procurementCreator',
+    field: 'procurementCreateTime',
     sortTableDefault: 1003,
     isForm: false,
     isTable: false,
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index 2ee03376f..67b8cdda6 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -1141,7 +1141,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
   },
   {
     label: '供应商创建日期',
-    field: 'supplierName',
+    field: 'supplierDate',
     sort: 'custom',
     
     sortTableDefault: 6,
@@ -1234,7 +1234,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
   },
   {
     label: '采购价格审批时间',
-    field: 'procurementCreator',
+    field: 'procurementCreateTime',
     sortTableDefault: 1003,
     isForm: false,
     isTable: false,

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 316/408] =?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 317/408] =?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 458804ec480b5f5c5796d2292ffd7bdf5eca2fad Mon Sep 17 00:00:00 2001
From: zhaoyiran <zhaoyrd@yonyou.com>
Date: Wed, 10 Jul 2024 19:40:39 +0800
Subject: [PATCH 318/408] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
index 989ffeaaf..2d7484b2e 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
@@ -191,7 +191,7 @@ const buttonBaseClick = (val, item) => {
 }
 
 const BASE_URL = getJmreportBaseUrl()
-const srcPoint = ref(BASE_URL + '/jmreport/view/970564557155733504?token=' + getAccessToken())
+const srcPoint = ref(BASE_URL + '/jmreport/view/970966724605804544?token=' + getAccessToken())
 const handleSelectionPoint = async ()=>{
   let rows:any = []
   selectionRows.value.forEach(item=>{

From 4fc03d73aa0ebb3a794472b55ea47b4a0e8edea9 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Wed, 10 Jul 2024 19:43:19 +0800
Subject: [PATCH 319/408] =?UTF-8?q?=E7=A7=91=E7=9B=AE=E8=B4=A6=E6=88=B7?=
 =?UTF-8?q?=E9=85=8D=E8=B5=84=E7=AE=A1=E7=90=86=E6=96=B0=E5=A2=9E=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/dict.ts                             |  1 +
 .../subjectAccount/subjectAccount.data.ts     | 37 +++++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index fe86384be..a335effc5 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -286,6 +286,7 @@ export enum DICT_TYPE {
   BILL_TYPE = 'bill_type', // 发票类型
   CONTAIN_MANAGE_TYPE = 'contain_menage_type', //器具管理类型
   INVOICE_BALANCE_STATEMENT_STATUS = 'invoice_balance_statement_status', //是否有价差
+  PL_MSTR_TYPE = 'pl_mstr_type', //产品类类型
 
   // ========== 业务 - mes ==========
   MESDO_STATUS = 'mes_do_status', // 工单执行状态
diff --git a/src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts b/src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts
index ac575491b..5a3a0f763 100644
--- a/src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts
+++ b/src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts
@@ -17,6 +17,7 @@ export const SubjectAccountRules = reactive({
   projectId: [required],
   projectCode: [required],
   available: [required],
+  isFromPlMstr:[required]
 })
 
 export const SubjectAccount = useCrudSchemas(reactive<CrudSchema[]>([
@@ -180,6 +181,42 @@ export const SubjectAccount = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
+  {
+    label: '是否来自产品类',
+    field: 'isFromPlMstr',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    table: {
+      width: 140
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '产品类类型',
+    field: 'plMstrType',
+    sort: 'custom',
+    isSearch: false,
+    dictType: DICT_TYPE.PL_MSTR_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    table: {
+      width: 120
+    },
+    form:{
+      componentProps:{
+        disabled:false
+      }
+    }
+  },
   {
     label: '备注',
     field: 'remark',

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 320/408] =?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 0d65f757fe9bff3b0247bc0e52f3cbce71dc53ab Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Wed, 10 Jul 2024 19:52:23 +0800
Subject: [PATCH 321/408] =?UTF-8?q?=E6=9B=B4=E6=8D=A2field?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts
index 9fee8806c..146cbd97e 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts
@@ -440,7 +440,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '承接人用户名',
-    field: 'acceptUserId',
+    field: 'acceptUserName',
     sort: 'custom',
     table: {
       width: 150
@@ -449,7 +449,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '完成人用户名',
-    field: 'completeUserId',
+    field: 'completeUserName',
     sort: 'custom',
     table: {
       width: 150

From aa89c6d644cc6638491045521183db656dd57663 Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Wed, 10 Jul 2024 19:55:16 +0800
Subject: [PATCH 322/408] =?UTF-8?q?WMS=20=E2=80=94=E2=80=94>=20bug=20=20?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E9=99=8D=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../relegate/relegateRequest/index.vue           | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
index 777c111db..65b5da1a2 100644
--- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
@@ -280,14 +280,14 @@ const butttondata = (row, $index) => {
     return []
   }
   return [
-    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:deliver-request-main:close'}), // 关闭
-    defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:deliver-request-main:reAdd'}), //重新添加
-    defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:deliver-request-main:submit'}), // 提交审批
-    defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:deliver-request-main:refused'}), // 驳回
-    defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:deliver-request-main:agree'}), // 审批通过
-    defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:deliver-request-main:handle'}), // 处理
-    defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:deliver-request-main:update'}), // 编辑
-    // defaultButtons.mainListDeleteBtn({hasPermi:'wms:deliver-request-main:delete'}), // 删除
+    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:relegate-request-main:close'}), // 关闭
+    defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:relegate-request-main:reAdd'}), //重新添加
+    defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:relegate-request-main:update'}), // 提交审批
+    defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:relegate-request-main:refused'}), // 驳回
+    defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:relegate-request-main:agree'}), // 审批通过
+    defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:relegate-request-main:handle'}), // 处理
+    defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:relegate-request-main:update'}), // 编辑
+    // defaultButtons.mainListDeleteBtn({hasPermi:'wms:relegate-request-main:delete'}), // 删除
     ]
 }
 

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 323/408] =?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 38508e814dfd8232fb6012164f31addbde42bfe7 Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Thu, 11 Jul 2024 08:50:40 +0800
Subject: [PATCH 324/408] =?UTF-8?q?WMS=20=E2=80=94=E2=80=94>=20bug=20=20WM?=
 =?UTF-8?q?S=20=E5=8F=91=E8=BF=90=E7=BB=93=E7=AE=97=E7=AE=A1=E7=90=86->?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E9=99=8D=E7=BA=A7=E7=AE=A1=E7=90=86->?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E9=99=8D=E7=BA=A7=E7=94=B3=E8=AF=B7=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=97=B6=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=EF=BC=8C=E6=B2=A1=E6=9C=89=E5=88=A0=E9=99=A4=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=EF=BC=8C=E4=B9=9F=E6=B2=A1=E6=9C=89=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../itemManage/relegate/relegateRequest/index.vue            | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
index 65b5da1a2..b64c43744 100644
--- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
@@ -28,7 +28,7 @@
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <BasicForm ref="basicFormRef" 
+  <BasicForm ref="basicFormRef"
     :isOpenSearchTable="true"
     fieldTableColumn="itemCode" 
     @success="getList"
@@ -41,7 +41,8 @@
     :apiCreate="RelegateRequestMainApi.createRelegateRequestMain" 
     :isBusiness="true" fromeWhere="RelegateRequestMain"
     @handleAddTable="handleAddTable" 
-    @handleDeleteTable="handleDeleteTable" 
+    @handleDeleteTable="handleDeleteTable"
+    :isShowReduceButtonSelection="true"
     @searchTableSuccess="searchTableSuccess"
     @submitForm="submitForm"
     :isShowButton=isShowButton />

From 955b229d849da7ac079055751bd25490391c80c6 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 11 Jul 2024 08:52:56 +0800
Subject: [PATCH 325/408] =?UTF-8?q?=E6=88=90=E9=83=BD=20QMS=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E7=BF=BB=E9=A1=B5=E9=9C=80=E8=A6=81=E5=8F=AA=E8=83=BD?=
 =?UTF-8?q?=E6=BB=91=E5=8A=A8=E4=B8=AD=E9=97=B4=E6=95=B0=E6=8D=AE=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=EF=BC=8C=E4=B8=8A=E9=9D=A2=E6=AF=8F=E5=88=97=E7=9A=84?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=92=8C=E4=B8=8B=E9=9D=A2=E7=BF=BB=E9=A1=B5?=
 =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E5=9C=A8=E7=95=8C=E9=9D=A2=E4=B8=8D=E9=9A=8F?=
 =?UTF-8?q?=E6=BB=9A=E8=BD=AE=E6=BB=91=E5=8A=A8=E8=80=8C=E6=BB=91=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/aql/index.vue                | 2 +-
 src/views/qms/counter/index.vue            | 2 +-
 src/views/qms/dynamicRule/index.vue        | 2 +-
 src/views/qms/inspectionJob/index.vue      | 2 +-
 src/views/qms/inspectionMethod/index.vue   | 2 +-
 src/views/qms/inspectionRecord/index.vue   | 2 +-
 src/views/qms/inspectionRequest/index.vue  | 2 +-
 src/views/qms/inspectionScheme/index.vue   | 2 +-
 src/views/qms/inspectionStage/index.vue    | 2 +-
 src/views/qms/inspectionTemplate/index.vue | 2 +-
 src/views/qms/qualityNotice/index.vue      | 2 +-
 src/views/qms/sampleCode/index.vue         | 2 +-
 src/views/qms/samplingProcess/index.vue    | 2 +-
 src/views/qms/samplingScheme/index.vue     | 2 +-
 src/views/qms/selectedSet/index.vue        | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/views/qms/aql/index.vue b/src/views/qms/aql/index.vue
index 44911263b..c72299829 100644
--- a/src/views/qms/aql/index.vue
+++ b/src/views/qms/aql/index.vue
@@ -16,7 +16,7 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table
+    <Table v-clientTable
       :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
diff --git a/src/views/qms/counter/index.vue b/src/views/qms/counter/index.vue
index 4b7416869..d58b262cf 100644
--- a/src/views/qms/counter/index.vue
+++ b/src/views/qms/counter/index.vue
@@ -16,7 +16,7 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table
+    <Table v-clientTable
       :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
diff --git a/src/views/qms/dynamicRule/index.vue b/src/views/qms/dynamicRule/index.vue
index 1e62a5b29..bdb959e6d 100644
--- a/src/views/qms/dynamicRule/index.vue
+++ b/src/views/qms/dynamicRule/index.vue
@@ -16,7 +16,7 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table
+    <Table v-clientTable
       :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
diff --git a/src/views/qms/inspectionJob/index.vue b/src/views/qms/inspectionJob/index.vue
index edd41b170..06f266f48 100644
--- a/src/views/qms/inspectionJob/index.vue
+++ b/src/views/qms/inspectionJob/index.vue
@@ -20,7 +20,7 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table
+    <Table v-clientTable
       :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
diff --git a/src/views/qms/inspectionMethod/index.vue b/src/views/qms/inspectionMethod/index.vue
index dbdd57137..646e65198 100644
--- a/src/views/qms/inspectionMethod/index.vue
+++ b/src/views/qms/inspectionMethod/index.vue
@@ -16,7 +16,7 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table
+    <Table v-clientTable
       :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
diff --git a/src/views/qms/inspectionRecord/index.vue b/src/views/qms/inspectionRecord/index.vue
index 8dbccb0fa..a8871e9bf 100644
--- a/src/views/qms/inspectionRecord/index.vue
+++ b/src/views/qms/inspectionRecord/index.vue
@@ -11,7 +11,7 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
+    <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">
diff --git a/src/views/qms/inspectionRequest/index.vue b/src/views/qms/inspectionRequest/index.vue
index be4b972ee..e63611e3d 100644
--- a/src/views/qms/inspectionRequest/index.vue
+++ b/src/views/qms/inspectionRequest/index.vue
@@ -12,7 +12,7 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
+    <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">
diff --git a/src/views/qms/inspectionScheme/index.vue b/src/views/qms/inspectionScheme/index.vue
index c1726aa0f..1442fa9e0 100644
--- a/src/views/qms/inspectionScheme/index.vue
+++ b/src/views/qms/inspectionScheme/index.vue
@@ -16,7 +16,7 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table
+    <Table v-clientTable
       :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
diff --git a/src/views/qms/inspectionStage/index.vue b/src/views/qms/inspectionStage/index.vue
index 25e4ce571..dcbbb196a 100644
--- a/src/views/qms/inspectionStage/index.vue
+++ b/src/views/qms/inspectionStage/index.vue
@@ -16,7 +16,7 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table
+    <Table v-clientTable
       :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
diff --git a/src/views/qms/inspectionTemplate/index.vue b/src/views/qms/inspectionTemplate/index.vue
index d5dc6e642..1d59f1568 100644
--- a/src/views/qms/inspectionTemplate/index.vue
+++ b/src/views/qms/inspectionTemplate/index.vue
@@ -16,7 +16,7 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table
+    <Table v-clientTable
       :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
diff --git a/src/views/qms/qualityNotice/index.vue b/src/views/qms/qualityNotice/index.vue
index 012cdc29c..54b0b8409 100644
--- a/src/views/qms/qualityNotice/index.vue
+++ b/src/views/qms/qualityNotice/index.vue
@@ -11,7 +11,7 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
+    <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">
diff --git a/src/views/qms/sampleCode/index.vue b/src/views/qms/sampleCode/index.vue
index 119f8551a..5025694e6 100644
--- a/src/views/qms/sampleCode/index.vue
+++ b/src/views/qms/sampleCode/index.vue
@@ -16,7 +16,7 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table
+    <Table v-clientTable
       :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
diff --git a/src/views/qms/samplingProcess/index.vue b/src/views/qms/samplingProcess/index.vue
index 974a1c612..ad482a907 100644
--- a/src/views/qms/samplingProcess/index.vue
+++ b/src/views/qms/samplingProcess/index.vue
@@ -16,7 +16,7 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table
+    <Table v-clientTable
       :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
diff --git a/src/views/qms/samplingScheme/index.vue b/src/views/qms/samplingScheme/index.vue
index 21cc5649a..3b7d6260f 100644
--- a/src/views/qms/samplingScheme/index.vue
+++ b/src/views/qms/samplingScheme/index.vue
@@ -16,7 +16,7 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table
+    <Table v-clientTable
       :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
diff --git a/src/views/qms/selectedSet/index.vue b/src/views/qms/selectedSet/index.vue
index bcacdc0ca..d2a498651 100644
--- a/src/views/qms/selectedSet/index.vue
+++ b/src/views/qms/selectedSet/index.vue
@@ -16,7 +16,7 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table
+    <Table v-clientTable
       :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"

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 326/408] =?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 9330323891895f3852abcc5baf6a978156d866fb Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Thu, 11 Jul 2024 09:24:06 +0800
Subject: [PATCH 327/408] =?UTF-8?q?WMS:=20=E2=80=94=E2=80=94>=20bug=20=20?=
 =?UTF-8?q?=E5=A4=87=E8=B4=A7=E4=BB=BB=E5=8A=A1=20=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=A0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stockup/stockupMainJob/stockupMainJob.data.ts            | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts
index e3e6e26ed..c99428b6e 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts
@@ -630,7 +630,10 @@ export const StockupDetailJob = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '操作',
     field: 'action',
-    isForm: false,
+    isSearch: false,
+    isTable: false,
+    isForm:false,
+    isDetail:false,
     hiddenInMain: true,
     table: {
       width: 150,

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 328/408] =?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 a4ae440dfc1d6bbaffeb6429fc90a22ded1c0684 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 11 Jul 2024 09:47:48 +0800
Subject: [PATCH 329/408] =?UTF-8?q?=E9=80=89=E4=B8=8D=E4=B8=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventoryinitial/inventoryinitRequestMain/index.vue       | 4 +++-
 .../productreceipt/productreceiptRequestMain/index.vue        | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
index 391bc45ec..79694b38a 100644
--- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
@@ -136,10 +136,12 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         // 入库存包装规格
         row[formField] = val[0][searchField]
         row['balancePackUnit'] = val[0]['packUnit']
+      }else{
+        row[formField] = val[0][searchField]
       }
     } else {
       const setV = {}
-      
+
       setV[formField] = val[0][searchField]
       //setV['supplierCode'] = val[0]['supplierCode']
       formRef.setValues(setV)
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
index c3a97d551..46c2e7a7b 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
@@ -235,6 +235,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           newRow[formField] = item[searchField]
           tableData.value.push(newRow)
         })
+      }else{
+        row[formField] = val[0][searchField]
       }
       
     } else {

From 75ffc33aebbfafc7f193673c52368211e406da8c 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, 11 Jul 2024 09:49:32 +0800
Subject: [PATCH 330/408] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92=20?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=A4=87=E6=96=99=E8=AE=A1=E5=88=92=E5=92=8C?=
 =?UTF-8?q?=E5=88=B6=E5=93=81=E6=94=B6=E8=B4=A7=E6=8B=86=E5=88=86=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/productionMain/index.ts           | 10 ++++--
 .../productionplan/productionMain/index.vue   | 31 ++++++++++++++++---
 .../productionMain/productionMain.data.ts     |  2 +-
 .../productionMainAssemble/index.vue          | 28 +++++++++++++++--
 .../productionMainAssemble.data.ts            |  2 +-
 .../productionMainAssembleSparePart/index.vue | 28 +++++++++++++++--
 .../productionMainAssembleSparePart.data.ts   |  2 +-
 .../productionMainPredictSparePart/index.vue  | 28 +++++++++++++++--
 .../productionMainPredictSparePart.data.ts    |  2 +-
 9 files changed, 113 insertions(+), 20 deletions(-)

diff --git a/src/api/wms/productionMain/index.ts b/src/api/wms/productionMain/index.ts
index 9e4fed120..0086aa58e 100644
--- a/src/api/wms/productionMain/index.ts
+++ b/src/api/wms/productionMain/index.ts
@@ -179,11 +179,15 @@ export const resetting = (id) => {
   return request.put({ url: '/wms/production-main/resetting?id=' + id })
 }
 
-// 创建备料计划/制品收货申请
-export const generateRequest = (number) => {
-  return request.post({ url: '/wms/production-main/generateRequest?number=' + number })
+// 创建备料计划
+export const generatePreparetoissue = (number) => {
+  return request.post({ url: '/wms/production-main/generatePreparetoissue?number=' + number })
 }
 
+// 创建制品收货申请
+export const generateProductreceiptRequest = (number) => {
+  return request.post({ url: '/wms/production-main/generateProductreceiptRequest?number=' + number })
+}
 
 
 
diff --git a/src/views/wms/productionManage/productionplan/productionMain/index.vue b/src/views/wms/productionManage/productionplan/productionMain/index.vue
index 2f6dfc3bf..17b8a3676 100644
--- a/src/views/wms/productionManage/productionplan/productionMain/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMain/index.vue
@@ -253,7 +253,7 @@ const butttondata = (row,$index) => {
     defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:update'}), // 编辑
     // defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:delete'}), // 删除
     {
-      label: '生成备料计划/收货申请',
+      label: '生成备料计划',
       name: 'scbljh',
       hide: isShowMainButton(row,['6']),
       type: 'primary',
@@ -262,6 +262,16 @@ const butttondata = (row,$index) => {
       link: true, // 文本展现按钮
       color: ''
     },
+    {
+      label: '生成收货申请',
+      name: 'scshsq',
+      hide: isShowMainButton(row,['6']),
+      type: 'primary',
+      icon: 'Select',
+      hasPermi:'wms:production-main:publish',
+      link: true, // 文本展现按钮
+      color: ''
+    },
   ]
 }
 
@@ -364,9 +374,21 @@ const buttonTableClick = async (val, row) => {
     })
   } else if(val == 'scbljh') {
     if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
-    await message.confirm('确认要生成备料计划/收货申请吗？')
+    await message.confirm('确认要生成备料计划吗？')
+    tableObject.loading = true
+    await ProductionMainApi.generatePreparetoissue(row.number).then(() => {
+      message.success(t('common.createSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if(val == 'scshsq') {
+    if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+    await message.confirm('确认要生成收货申请吗？')
     tableObject.loading = true
-    await ProductionMainApi.generateRequest(row.number).then(() => {
+    await ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
       message.success(t('common.createSuccess'))
       tableObject.loading = false
       getList()
@@ -374,7 +396,8 @@ const buttonTableClick = async (val, row) => {
       tableObject.loading = false
       console.log(err)
     })
-  } else if (val == 'edit') { // 编辑
+  }
+  if (val == 'edit') { // 编辑
     openForm('update', row)
   } else if (val == 'delete') { // 删除
     handleDelete(row.masterId)
diff --git a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
index d3f6e0e3e..bf0dee7de 100644
--- a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
@@ -558,7 +558,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     isDetail: false,
     isForm: false ,
     table: {
-      width: 220,
+      width: 260,
       fixed: 'right'
     },
   }
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
index 4d196be98..9547ad2f5 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
@@ -246,7 +246,7 @@ const butttondata = (row,$index) => {
     defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:update'}), // 编辑
     // defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:delete'}), // 删除
     {
-      label: '生成备料计划/收货申请',
+      label: '生成备料计划',
       name: 'scbljh',
       hide: isShowMainButton(row,['6']),
       type: 'primary',
@@ -255,6 +255,16 @@ const butttondata = (row,$index) => {
       link: true, // 文本展现按钮
       color: ''
     },
+    {
+      label: '生成收货申请',
+      name: 'scshsq',
+      hide: isShowMainButton(row,['6']),
+      type: 'primary',
+      icon: 'Select',
+      hasPermi:'wms:production-main:publish',
+      link: true, // 文本展现按钮
+      color: ''
+    },
   ]
 }
 
@@ -357,9 +367,21 @@ const buttonTableClick = async (val, row) => {
     })
   } else if(val == 'scbljh') {
     if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
-    await message.confirm('确认要生成备料计划/收货申请吗？')
+    await message.confirm('确认要生成备料计划吗？')
+    tableObject.loading = true
+    await ProductionMainApi.generatePreparetoissue(row.number).then(() => {
+      message.success(t('common.createSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if(val == 'scshsq') {
+    if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+    await message.confirm('确认要生成收货申请吗？')
     tableObject.loading = true
-    await ProductionMainApi.generateRequest(row.number).then(() => {
+    await ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
       message.success(t('common.createSuccess'))
       tableObject.loading = false
       getList()
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
index 4bf309088..aec2ca5bf 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
@@ -557,7 +557,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     isDetail: false,
     isForm: false ,
     table: {
-      width: 220,
+      width: 260,
       fixed: 'right'
     },
   }
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
index 0592934c1..09206440d 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
@@ -246,7 +246,7 @@ const butttondata = (row,$index) => {
     defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:update'}), // 编辑
     // defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:delete'}), // 删除
     {
-      label: '生成备料计划/收货申请',
+      label: '生成备料计划',
       name: 'scbljh',
       hide: isShowMainButton(row,['6']),
       type: 'primary',
@@ -255,6 +255,16 @@ const butttondata = (row,$index) => {
       link: true, // 文本展现按钮
       color: ''
     },
+    {
+      label: '生成收货申请',
+      name: 'scshsq',
+      hide: isShowMainButton(row,['6']),
+      type: 'primary',
+      icon: 'Select',
+      hasPermi:'wms:production-main:publish',
+      link: true, // 文本展现按钮
+      color: ''
+    },
   ]
 }
 
@@ -357,9 +367,21 @@ const buttonTableClick = async (val, row) => {
     })
   } else if(val == 'scbljh') {
     if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
-    await message.confirm('确认要生成备料计划/收货申请吗？')
+    await message.confirm('确认要生成备料计划吗？')
+    tableObject.loading = true
+    await ProductionMainApi.generatePreparetoissue(row.number).then(() => {
+      message.success(t('common.createSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if(val == 'scshsq') {
+    if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+    await message.confirm('确认要生成收货申请吗？')
     tableObject.loading = true
-    await ProductionMainApi.generateRequest(row.number).then(() => {
+    await ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
       message.success(t('common.createSuccess'))
       tableObject.loading = false
       getList()
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
index 47e9efe15..4955f8006 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
@@ -549,7 +549,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     isDetail: false,
     isForm: false ,
     table: {
-      width: 220,
+      width: 260,
       fixed: 'right'
     },
   }
diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
index a4d22853c..13bbfbac3 100644
--- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
@@ -246,7 +246,7 @@ const butttondata = (row,$index) => {
     defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:update'}), // 编辑
     // defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:delete'}), // 删除
     {
-      label: '生成备料计划/收货申请',
+      label: '生成备料计划',
       name: 'scbljh',
       hide: isShowMainButton(row,['6']),
       type: 'primary',
@@ -255,6 +255,16 @@ const butttondata = (row,$index) => {
       link: true, // 文本展现按钮
       color: ''
     },
+    {
+      label: '生成收货申请',
+      name: 'scshsq',
+      hide: isShowMainButton(row,['6']),
+      type: 'primary',
+      icon: 'Select',
+      hasPermi:'wms:production-main:publish',
+      link: true, // 文本展现按钮
+      color: ''
+    },
   ]
 }
 
@@ -357,9 +367,21 @@ const buttonTableClick = async (val, row) => {
     })
   } else if(val == 'scbljh') {
     if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
-    await message.confirm('确认要生成备料计划/收货申请吗？')
+    await message.confirm('确认要生成备料计划吗？')
+    tableObject.loading = true
+    await ProductionMainApi.generatePreparetoissue(row.number).then(() => {
+      message.success(t('common.createSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if(val == 'scshsq') {
+    if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+    await message.confirm('确认要生成收货申请吗？')
     tableObject.loading = true
-    await ProductionMainApi.generateRequest(row.number).then(() => {
+    await ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
       message.success(t('common.createSuccess'))
       tableObject.loading = false
       getList()
diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
index 5b2907265..1f985f00b 100644
--- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
@@ -550,7 +550,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     isDetail: false,
     isForm: false ,
     table: {
-      width: 220,
+      width: 260,
       fixed: 'right'
     },
   }

From 76b706e4423251162644057545139471d851310d Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Thu, 11 Jul 2024 09:56:13 +0800
Subject: [PATCH 331/408] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/dict.ts                                              | 3 ++-
 .../purchasereceiptJobMain/purchasereceiptJobMain.data.ts      | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index a335effc5..4270e4070 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -380,5 +380,6 @@ export enum DICT_TYPE {
   SPAREPARTS_APPLY_STATUS_ENUM = 'spareparts_apply_status_enum', // 流程状态
   EAM_OUT_STATUS = 'eam_out_status', // 出库状态
   IS_LINE_ITEM = 'is_line_item', // 是否是线边
-  PUT_IN_TYPE = 'put_in_type' // 入库类型
+  PUT_IN_TYPE = 'put_in_type', // 入库类型
+  PURCHASE_JOB_STATUS = 'purchase_job_status', // 采购收货任务状态
 }
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
index 91e1ee099..29ba1c92d 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
@@ -186,7 +186,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(
     {
       label: '状态',
       field: 'status',
-      dictType: DICT_TYPE.JOB_STATUS,
+      dictType: DICT_TYPE.PURCHASE_JOB_STATUS,
       dictClass: 'string',
       isSearch: false,
       isTable: true,

From 93c0f9f622f1bdfe21b39515b5aadc103463e9df Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 11 Jul 2024 09:56:40 +0800
Subject: [PATCH 332/408] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?=
 =?UTF-8?q?=E7=A5=A8=E7=94=B3=E8=AF=B7=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index 67b8cdda6..09a897730 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -1274,7 +1274,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isDetail: true,
   },
   {
-    label: '价税合计金额',
+    label: '价税合计',
     field: 'adTaxAmount',
     formatter: accountantFormart,
     
@@ -1406,7 +1406,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     }
   },
   {
-    label: '税额差异',
+    label: '税额差异（税额-系统税额）',
     field: 'taxAmountDiff',
     formatter: accountantFormart,
     

From dac9009488cb1b4ab6baab95d5124db263272923 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 11 Jul 2024 10:11:54 +0800
Subject: [PATCH 333/408] =?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

---
 .../inventorymoveRequestMain/inventorymoveRequestMain.data.ts  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
index d22558b36..1bd34a6ae 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
@@ -632,7 +632,8 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
     tableForm: {
-      type: 'Select'
+      type: 'Select',
+      disabled: true
     },
     form: {
       componentProps: {

From 20a42cb609564df2fc089d854d172a14b9c24e28 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 11 Jul 2024 10:34:45 +0800
Subject: [PATCH 334/408] =?UTF-8?q?bom=E9=BB=98=E8=AE=A4=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productdismantleRequestMain/index.vue        | 16 ++++++++++++++++
 .../productrepairRequestMain/index.vue           | 16 ++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue
index 06a8d79a5..8f9c31ca3 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue
@@ -111,6 +111,7 @@ import * as ProductdismantleRequestDetailApi from '@/api/wms/productdismantleReq
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as BomDismantleApi from '@/api/wms/bomDismantle'
 import * as dismantleRequestDetailbApi from '@/api/wms/dismantleRequestDetailb'
+import * as BomApi from "@/api/wms/bom";
 
 
 // 制品拆解申请
@@ -270,6 +271,21 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         row['expireDate'] = val[0]['expireDate']
         row['bomVersion'] = ''
         row['childList'] = []
+        // 查看BOM版本
+        const param1 =  {
+          productItemCode: val[0]['itemCode'],
+          available: 'TRUE',
+          pageSize: 20,
+          pageNo: 1,
+          sort: '',
+          by: 'ASC',
+        }
+        BomApi.getBomPage(param1).then(res => {
+          console.log(res)
+          if(res?.list?.length>0){
+            row['bomVersion'] = res.list[0].version
+          }
+        })
       } else {
         val.forEach(item=>{
           const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
index 3bc4b80e4..8c2482afd 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
+++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
@@ -116,6 +116,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as BomDismantleApi from '@/api/wms/bomDismantle'
 import * as dismantleRequestDetailbApi from "@/api/wms/dismantleRequestDetailb";
 import {updateProductscrapDetailRequestBom} from "@/api/wms/productrepairRequestMain";
+import * as BomApi from "@/api/wms/bom";
 
 
 // 制品返修申请
@@ -246,6 +247,21 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         row['fgFromLocationCode'] = val[0]['locationCode']
         row['bomVersion'] = ''
         row['childList'] = []
+          // 查看BOM版本
+          const param1 =  {
+          productItemCode: val[0]['itemCode'],
+          available: 'TRUE',
+          pageSize: 20,
+          pageNo: 1,
+          sort: '',
+          by: 'ASC',
+        }
+        BomApi.getBomPage(param1).then(res => {
+          console.log(res)
+          if(res?.list?.length>0){
+            row['bomVersion'] = res.list[0].version
+          }
+        })
       } else if(formField == 'productionLineCode'){
         row['productionLineCode'] = val[0]['code']
       } else if(formField == 'workStationCode'){

From e7dedabe7c1928f7a1d263fd3b51c80a2b23d003 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 11 Jul 2024 10:54:33 +0800
Subject: [PATCH 335/408] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?=
 =?UTF-8?q?=E7=A5=A8=E8=AE=B0=E5=BD=95=E4=B8=AD=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
index fe31c9a12..a73fe67a4 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
@@ -987,7 +987,7 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
     isDetail: true,
   },
   {
-    label: '价税合计金额',
+    label: '价税合计',
     field: 'adTaxAmount',
     formatter: accountantFormart,
     
@@ -1119,7 +1119,7 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
     }
   },
   {
-    label: '税额差异',
+    label: '税额差异（税额-系统税额）',
     field: 'taxAmountDiff',
     formatter: accountantFormart,
     

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 336/408] =?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 337/408] =?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()

From 98d62260283744216ff948a71e31d6118659c6b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com>
Date: Thu, 11 Jul 2024 11:05:47 +0800
Subject: [PATCH 338/408] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/inspectionJob/inspectionJobMain.data.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/qms/inspectionJob/inspectionJobMain.data.ts b/src/views/qms/inspectionJob/inspectionJobMain.data.ts
index 1db4e1263..51c9b2d86 100644
--- a/src/views/qms/inspectionJob/inspectionJobMain.data.ts
+++ b/src/views/qms/inspectionJob/inspectionJobMain.data.ts
@@ -444,7 +444,7 @@ export const InspectionJobMain = useCrudSchemas(
       isDetail: false,
       isForm: false,
       table: {
-        width: 200,
+        width: 250,
         fixed: 'right'
       }
     }

From 1e10a40f9ccdfe9d74b12ea9916047d27c55d532 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, 11 Jul 2024 11:18:03 +0800
Subject: [PATCH 339/408] =?UTF-8?q?=E9=9A=90=E8=97=8F=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E5=A4=87=E6=96=99=E8=AE=A1=E5=88=92=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionplan/productionMain/index.vue   | 20 +++++++++----------
 .../productionMainAssemble/index.vue          | 20 +++++++++----------
 .../productionMainAssembleSparePart/index.vue | 20 +++++++++----------
 .../productionMainPredictSparePart/index.vue  | 20 +++++++++----------
 4 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/src/views/wms/productionManage/productionplan/productionMain/index.vue b/src/views/wms/productionManage/productionplan/productionMain/index.vue
index 17b8a3676..a71293867 100644
--- a/src/views/wms/productionManage/productionplan/productionMain/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMain/index.vue
@@ -252,16 +252,16 @@ const butttondata = (row,$index) => {
     defaultButtons.mainListPlanResBtn({hide:isShowMainButton(row,['4']),hasPermi:'wms:production-main:resetting'}), // 重置
     defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:update'}), // 编辑
     // defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:delete'}), // 删除
-    {
-      label: '生成备料计划',
-      name: 'scbljh',
-      hide: isShowMainButton(row,['6']),
-      type: 'primary',
-      icon: 'Select',
-      hasPermi:'wms:production-main:publish',
-      link: true, // 文本展现按钮
-      color: ''
-    },
+    // {
+    //   label: '生成备料计划',
+    //   name: 'scbljh',
+    //   hide: isShowMainButton(row,['6']),
+    //   type: 'primary',
+    //   icon: 'Select',
+    //   hasPermi:'wms:production-main:publish',
+    //   link: true, // 文本展现按钮
+    //   color: ''
+    // },
     {
       label: '生成收货申请',
       name: 'scshsq',
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
index 9547ad2f5..850ebebeb 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
@@ -245,16 +245,16 @@ const butttondata = (row,$index) => {
     defaultButtons.mainListPlanResBtn({hide:isShowMainButton(row,['4']),hasPermi:'wms:production-main:resetting'}), // 重置
     defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:update'}), // 编辑
     // defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:delete'}), // 删除
-    {
-      label: '生成备料计划',
-      name: 'scbljh',
-      hide: isShowMainButton(row,['6']),
-      type: 'primary',
-      icon: 'Select',
-      hasPermi:'wms:production-main:publish',
-      link: true, // 文本展现按钮
-      color: ''
-    },
+    // {
+    //   label: '生成备料计划',
+    //   name: 'scbljh',
+    //   hide: isShowMainButton(row,['6']),
+    //   type: 'primary',
+    //   icon: 'Select',
+    //   hasPermi:'wms:production-main:publish',
+    //   link: true, // 文本展现按钮
+    //   color: ''
+    // },
     {
       label: '生成收货申请',
       name: 'scshsq',
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
index 09206440d..86075935e 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
@@ -245,16 +245,16 @@ const butttondata = (row,$index) => {
     defaultButtons.mainListPlanResBtn({hide:isShowMainButton(row,['4']),hasPermi:'wms:production-main:resetting'}), // 重置
     defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:update'}), // 编辑
     // defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:delete'}), // 删除
-    {
-      label: '生成备料计划',
-      name: 'scbljh',
-      hide: isShowMainButton(row,['6']),
-      type: 'primary',
-      icon: 'Select',
-      hasPermi:'wms:production-main:publish',
-      link: true, // 文本展现按钮
-      color: ''
-    },
+    // {
+    //   label: '生成备料计划',
+    //   name: 'scbljh',
+    //   hide: isShowMainButton(row,['6']),
+    //   type: 'primary',
+    //   icon: 'Select',
+    //   hasPermi:'wms:production-main:publish',
+    //   link: true, // 文本展现按钮
+    //   color: ''
+    // },
     {
       label: '生成收货申请',
       name: 'scshsq',
diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
index 13bbfbac3..15a77d617 100644
--- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
@@ -245,16 +245,16 @@ const butttondata = (row,$index) => {
     defaultButtons.mainListPlanResBtn({hide:isShowMainButton(row,['4']),hasPermi:'wms:production-main:resetting'}), // 重置
     defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:update'}), // 编辑
     // defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:delete'}), // 删除
-    {
-      label: '生成备料计划',
-      name: 'scbljh',
-      hide: isShowMainButton(row,['6']),
-      type: 'primary',
-      icon: 'Select',
-      hasPermi:'wms:production-main:publish',
-      link: true, // 文本展现按钮
-      color: ''
-    },
+    // {
+    //   label: '生成备料计划',
+    //   name: 'scbljh',
+    //   hide: isShowMainButton(row,['6']),
+    //   type: 'primary',
+    //   icon: 'Select',
+    //   hasPermi:'wms:production-main:publish',
+    //   link: true, // 文本展现按钮
+    //   color: ''
+    // },
     {
       label: '生成收货申请',
       name: 'scshsq',

From 11b3d63acaba85379d9613387ef1f54957808484 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Thu, 11 Jul 2024 11:35:30 +0800
Subject: [PATCH 340/408] =?UTF-8?q?=E4=B8=8D=E5=90=88=E6=A0=BC=E8=BD=AC?=
 =?UTF-8?q?=E9=9A=94=E7=A6=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventorymoveRequestMain/index.vue              | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
index 9eceed8a9..30e3cdf70 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
@@ -123,6 +123,15 @@ const { tableObject, tableMethods } = useTable({
   toInventoryStatus.value = "HOLD"
   businessType.value = 'OkToHold'
   importFileName.value = '合格转隔离申请'
+}else if ( routeName.value == 'NoktoholdRequestMain') {
+  tableObject.params = {
+    fromInventoryStatus: 'NOK',
+    toInventoryStatus:'HOLD'
+  }
+  fromInventoryStatus.value = 'NOK'
+  toInventoryStatus.value = "HOLD"
+  businessType.value = 'NokToHold'
+  importFileName.value = '不合格转隔离申请'
 } else if ( routeName.value == 'HoldtookRequestMain') {
   tableObject.params = {
     fromInventoryStatus: 'HOLD',
@@ -344,6 +353,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           newRow['qty'] = item['packQty']
           if(routeName.value == 'OktoholdRequestMain'){
             newRow['toInventoryStatus'] = "HOLD"
+          }else if(routeName.value == 'NoktoholdRequestMain'){
+            newRow['toInventoryStatus'] = "HOLD"
           }else if ( routeName.value == 'HoldtookRequestMain') {
             newRow['toInventoryStatus'] = "OK"
           }else if ( routeName.value == 'HoldtoscrapRequestMain') {
@@ -396,6 +407,8 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
       setV['uom'] = val[0]['uom']
       if(routeName.value == 'OktoholdRequestMain'){
         setV['toInventoryStatus'] = "HOLD"
+      }else  if(routeName.value == 'NoktoholdRequestMain'){
+        setV['toInventoryStatus'] = "HOLD"
       }else if ( routeName.value == 'HoldtookRequestMain') {
         setV['toInventoryStatus'] = "OK"
       }else if ( routeName.value == 'HoldtoscrapRequestMain') {

From 0974555f13501dca9e16414177d543fad04d57a0 Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Thu, 11 Jul 2024 11:35:49 +0800
Subject: [PATCH 341/408] =?UTF-8?q?WMS:=20=E2=80=94=E2=80=94>=20bug=20=20?=
 =?UTF-8?q?=E8=87=AA=E5=88=B6=E5=A4=87=E4=BB=B6=E5=8F=91=E8=B4=A7=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deliver/deliverJobMain/index.vue          | 24 ++++++++++++++++---
 .../deliver/deliverRecordMain/index.vue       | 24 ++++++++++++++++---
 2 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue
index 925840fa2..83153f2cf 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue
@@ -359,10 +359,28 @@ const handleExport = async () => {
 
 // 筛选提交
 const searchFormClick = (searchData) => {
-  tableObject.params = {
-    isSearch: true,
-    filters: searchData.filters
+  tableObject.params.isSearch = true
+  console.log('searchData',searchData.filters);
+  if(!searchData.filters){//重置的时候应用
+    searchData.filters = []
+  }
+  let filters = [...searchData.filters]
+  if(!filters.find(item=>item.column=='business_type')){
+    if ( routeName.value == 'DeliverJobMain') {
+      filters = [...filters,{
+        action:'==',
+        column:'business_type',
+        value:'Deliver',
+      }]
+    } else if ( routeName.value == 'ZZBJDeliverJobMain') {
+      filters = [...filters,{
+        action:'==',
+        column:'business_type',
+        value:'ZZBJDeliver',
+      }]
+    }
   }
+  tableObject.params.filters = filters
   getList() // 刷新当前列表
 }
 
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue
index c38bee76b..6c3944f96 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue
@@ -200,10 +200,28 @@ const handlePoint = async (row) => {
 
 // 筛选提交
 const searchFormClick = (searchData) => {
-  tableObject.params = {
-    isSearch: true,
-    filters: searchData.filters
+  tableObject.params.isSearch = true
+  console.log('searchData',searchData.filters);
+  if(!searchData.filters){//重置的时候应用
+    searchData.filters = []
+  }
+  let filters = [...searchData.filters]
+  if(!filters.find(item=>item.column=='business_type')){
+    if ( routeName.value == 'DeliverRecordMain') {
+      filters = [...filters,{
+        action:'==',
+        column:'business_type',
+        value:'Deliver',
+      }]
+    } else if ( routeName.value == 'ZZBJDeliverRecordMain') {
+      filters = [...filters,{
+        action:'==',
+        column:'business_type',
+        value:'ZZBJDeliver',
+      }]
+    }
   }
+  tableObject.params.filters = filters
   getList() // 刷新当前列表
 }
 

From 486225af30161222c3ea7b2ab0cbc8a469c444c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com>
Date: Thu, 11 Jul 2024 11:57:55 +0800
Subject: [PATCH 342/408] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/inspectionRequest/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/qms/inspectionRequest/index.vue b/src/views/qms/inspectionRequest/index.vue
index e63611e3d..586355240 100644
--- a/src/views/qms/inspectionRequest/index.vue
+++ b/src/views/qms/inspectionRequest/index.vue
@@ -112,7 +112,7 @@
 
   // 列表头部按钮
   const HeadButttondata = [
-    defaultButtons.defaultAddBtn(null), // 新增
+    defaultButtons.defaultAddBtn({hasPermi: 'qms:inspection-request-main:create' }), // 新增
     // defaultButtons.defaultImportBtn({ hasPermi: 'wms:inspectionMain:import' }), // 导入
     // defaultButtons.defaultExportBtn({ hasPermi: 'wms:inspectionMain:export' }), // 导出
     defaultButtons.defaultFreshBtn(null), // 刷新

From 65e5b0a8c1b2e15745f731fa26ee8c94c132580c Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 11 Jul 2024 12:02:58 +0800
Subject: [PATCH 343/408] =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=A4=B1=E5=8E=BB?=
 =?UTF-8?q?=E7=84=A6=E7=82=B9=E6=B7=BB=E5=8A=A0=E7=9A=84=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/process/index.ts                  |   5 +
 src/api/wms/warehouse/index.ts                |   4 +
 src/components/BasicForm/src/BasicForm.vue    | 141 +++++++++++++++++-
 .../factoryModeling/areabasic/index.vue       |   5 +
 .../basicDataManage/itemManage/bom/index.vue  |   7 +-
 .../itemManage/itemwarehouse/index.vue        |   2 +
 6 files changed, 158 insertions(+), 6 deletions(-)

diff --git a/src/api/wms/process/index.ts b/src/api/wms/process/index.ts
index c9e5d1d5f..dda9c6de1 100644
--- a/src/api/wms/process/index.ts
+++ b/src/api/wms/process/index.ts
@@ -62,4 +62,9 @@ export const importTemplate = () => {
 // 查询工序列表
 export const getProcessNoPage = async (params) => {
   return await request.get({ url: `/wms/process/noPage`, params })
+}
+
+// 根据code获取数据列表
+export const getProcessByCodes = async (params) => {
+  return await request.get({ url: `/wms/process/listByCodes`, params })
 }
\ No newline at end of file
diff --git a/src/api/wms/warehouse/index.ts b/src/api/wms/warehouse/index.ts
index 96e64a813..6c0e25b15 100644
--- a/src/api/wms/warehouse/index.ts
+++ b/src/api/wms/warehouse/index.ts
@@ -69,4 +69,8 @@ export const pageBusinessTypeToWarehouse = async (params) => {
   } else {
     return await request.get({ url: `/wms/warehouse/pageBusinessTypeToWarehouse`, params })
   }
+}
+// 根据code获取数据列表
+export const getWarehouseByCodes = async (params) => {
+  return await request.get({ url: `/wms/warehouse/listByCodes`, params })
 }
\ No newline at end of file
diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index c9d62bbca..b9313b4c6 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -142,6 +142,7 @@ import TableForm from '@/components/TableForm/src/TableForm.vue'
 import TableFormCountPlan from '@/components/TableFormCountPlan/src/TableFormCountPlan.vue'
 import {DICT_TYPE, getStrDictOptions} from '@/utils/dict'
 import { tableFormBlurVer,FormBlur,getListByBottonInput } from '@/api/wms/business/business'
+import { isString } from 'min-dash'
 const props = defineProps({
   // 显示窗口宽度设置
   basicFormWidth: {
@@ -324,7 +325,17 @@ const props = defineProps({
     type: Array,
     required: false,
     default: []
-  }
+  },
+  byCodespageApi: {
+    type: Function,
+    required: true,
+    default: null
+  }, //输入框校验是否正确的方法
+  byCodesParams: {
+    type: Object,
+    required: true,
+    default: null
+  } //输入框校验是否正确的参数
 })
 
 const { t } = useI18n() // 国际化
@@ -783,15 +794,135 @@ const onChange = (field, cur) => {
  * @param field 当前操作字段
  * @param e
  */
- const onBlur = async (field, e) => {
+const onBlur = async (field, e) => {
   isExecute.value = false
-  await FormBlur(field, e,routeName.value,formRef.value,props.detailData,formSchema.value,(searchField, list)=>{
-    emit('searchTableSuccess', field, searchField, list, formRef.value, 'form')
-  })
+  if (
+    field == 'supplierCode' ||
+    field == 'itemCode' ||
+    field == 'productItemCode' ||
+    field == 'componentItemCode' ||
+    field == 'packUnit' ||
+    field == 'inPackUnit' ||
+    field == 'fromPackingNumber'
+  ) {
+    await FormBlur(
+      field,
+      e,
+      routeName.value,
+      formRef.value,
+      props.detailData,
+      formSchema.value,
+      (searchField, list) => {
+        emit('searchTableSuccess', field, searchField, list, formRef.value, 'form')
+      }
+    )
+  } else {
+    let formSchemaObj = formSchema.value.find((item) => item.field == field)
+    let searchCondition1 = formSchema.value.find((item) => item.field == field).componentProps
+      .searchCondition //获取data.ts参数信息
+    if (formSchemaObj?.componentProps?.enterSearch) {
+      if (e && isString(e)) {
+        let setV = {}
+        setV[field] = ''
+        let obj = {}
+console.log(233,searchCondition1)
+        // 循环参数设置参数为key：value格式
+        if (searchCondition1 && searchCondition1.length > 0) {
+          for (let i = 0; i < searchCondition1.length; i++) {
+            if (searchCondition1[i].isMainValue) {
+              obj[searchCondition1[i].key] = formRef.value.formModel[searchCondition1[i].value]
+                ? formRef.value.formModel[searchCondition1[i].value]
+                : props.detailData
+                ? props.detailData[searchCondition1[i].value]
+                : ''
+              // 是否含有空参数情况
+              let isNull = false
+              if (obj[searchCondition1[i].key] == '' || obj[searchCondition1[i].key] == undefined) {
+                isNull = true
+              }
+              if (isNull) {
+                message.warning(
+                  searchCondition1[i].message ? searchCondition1[i].message : '前置条件未选择！'
+                )
+                return
+              }
+            } else {
+              // 扩展 转换为筛选条件进行查询
+              if (searchCondition1[i].isSearch) {
+                if (searchCondition1[i].isFormModel) {
+                  //用formModel中的值
+                  if (searchCondition1[i].required) {
+                    if (
+                      formRef.value.formModel[searchCondition1[i].value] == '' ||
+                      formRef.value.formModel[searchCondition1[i].value] == undefined
+                    ) {
+                      message.warning(
+                        searchCondition1[i].message
+                          ? searchCondition1[i].message
+                          : '前置条件未选择！'
+                      )
+                      return
+                    }
+                  }
+                }
+                  obj[searchCondition1[i].key] = searchCondition1[i].value
+              } else {
+                obj[searchCondition1[i].key] = searchCondition1[i].value
+              }
+            }
+          }
+        }
+        if (!formSchemaObj?.componentProps.multiple && e.indexOf(',') > -1) {
+          message.alert('该输入框只能输入一条数据')
+          formRef.value.setValues(setV)
+          return
+        }
+        if (props.byCodespageApi) {
+          let params = {}
+          if (props.byCodesParams) {
+            params = { ...props.byCodesParams, ...obj, codes: e }
+          } else {
+            params = { ...obj, codes: e }
+          }
+          await props.byCodespageApi(params).then((res) => {
+            let arr1 = e.split(',')
+            let list = ref([])
+            list.value = res
+            if (list.value?.length == 0) {
+              message.alert('暂无数据')
+              formRef.value.setValues(setV)
+              return
+            }
+            if (arr1.length != list.value.length) {
+              let arr2 = list.value.map((item) => item.code)
+              let str = [
+                ...arr1.filter((item) => !arr2.includes(item)),
+                ...arr2.filter((item) => !arr1.includes(item))
+              ].join(',')
+              message.alert('代码' + str + '没有找到对应数据')
+              formRef.value.setValues(setV)
+              return
+            }
+            emit(
+              'searchTableSuccess',
+              field,
+              searchCondition1.searchField,
+              list,
+              formRef.value,
+              'form'
+            )
+          })
+        }
+      }
+    } else {
+      emit('onBlur', field, e)
+    }
+  }
   isExecute.value = true
   emit('onBlur', field, e)
 }
 
+
 // 批量增加
 const batchAdd = async (val) => {
   const row = {}
diff --git a/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue b/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue
index c9ad73d84..15046fcca 100644
--- a/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue
@@ -48,6 +48,7 @@
     :apiCreate="AreaApi.createArea"
     @searchTableSuccess="searchTableSuccess"
     :isBusiness="false"
+    @onBlur="onBlur"
   />
 
   <!-- 详情 -->
@@ -267,6 +268,10 @@ const searchFormClick = (searchData) => {
   }
   getList() // 刷新当前列表
 }
+// 失去焦点
+const onBlur = (field, e)=>{
+
+}
 
 /** 初始化 **/
 onMounted(async() => {
diff --git a/src/views/wms/basicDataManage/itemManage/bom/index.vue b/src/views/wms/basicDataManage/itemManage/bom/index.vue
index f15170e8b..e6becb72c 100644
--- a/src/views/wms/basicDataManage/itemManage/bom/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/bom/index.vue
@@ -48,6 +48,7 @@
     :apiCreate="BomApi.createBom"
     @searchTableSuccess="searchTableSuccess"
     :isBusiness="false"
+    :byCodespageApi="ProcessApi.getProcessByCodes"
   />
 
   <!-- 详情 -->
@@ -66,6 +67,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'
+import * as ProcessApi from "@/api/wms/process";
 
 // 物料清单bom
 defineOptions({ name: 'Bom' })
@@ -277,7 +279,10 @@ const searchFormClick = (searchData) => {
   }
   getList() // 刷新当前列表
 }
-
+// 失去焦点
+// const onBlur = (field, e)=>{
+// ProcessApi.getProcessByCodes().then()
+// }
 /** 初始化 **/
 onMounted(async () => {
   getList()
diff --git a/src/views/wms/basicDataManage/itemManage/itemwarehouse/index.vue b/src/views/wms/basicDataManage/itemManage/itemwarehouse/index.vue
index 6ec0e6347..c2c403729 100644
--- a/src/views/wms/basicDataManage/itemManage/itemwarehouse/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/itemwarehouse/index.vue
@@ -48,6 +48,7 @@
     :apiCreate="ItemwarehouseApi.createItemwarehouse"
     @searchTableSuccess="searchTableSuccess"
     :isBusiness="false"
+    :byCodespageApi="WarehouseApi.getWarehouseByCodes"
   />
 
   <!-- 详情 -->
@@ -65,6 +66,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'
+import * as WarehouseApi from "@/api/wms/warehouse";
 
 defineOptions({ name: 'Itemwarehouse' })
 

From d92305389698f46a32aec5a1a1d03f32f3438aa3 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 11 Jul 2024 13:36:32 +0800
Subject: [PATCH 344/408] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=8C=85=E8=A3=85?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/api/wms/itempackage/index.ts b/src/api/wms/itempackage/index.ts
index 0917dc431..352a0c9b1 100644
--- a/src/api/wms/itempackage/index.ts
+++ b/src/api/wms/itempackage/index.ts
@@ -39,6 +39,16 @@ export const getItempackagingPageTree = async (params) => {
     return await request.get({ url: `/wms/itempackage/pageTree`, params })
   }
 }
+// 查询物料包装信息树形列表
+export const getItempackagingPageTreeSCP = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/itempackage/seniorTreeSCP', data })
+  } else {
+    return await request.get({ url: `/wms/itempackage/pageTreeSCP`, 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 df88aeb52..7eb681e33 100644
--- a/src/views/wms/basicDataManage/itemManage/itempackage/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/itempackage/index.vue
@@ -91,14 +91,19 @@ const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref(Itempackaging.allSchemas.tableColumns)
-
+if(routeName.value.includes('SCP')){
+  tableColumns.value = tableColumns.value.filter(item=>item.field!='action')
+}
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
+  if(routeName.value.includes('SCP')){
+    val = val.filter(item=>item.field!='action')
+  }
   tableColumns.value = val
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: ItempackagingApi.getItempackagingPageTree // 分页接口
+  getListApi:routeName.value.includes('SCP')?ItempackagingApi.getItempackagingPageTreeSCP:ItempackagingApi.getItempackagingPageTree // 分页接口
 })
 
 // 获得表格的各种操作

From d5910a7b07bab3b023dabc4904ec5edbcf7a3caa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com>
Date: Thu, 11 Jul 2024 13:48:17 +0800
Subject: [PATCH 345/408] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productredressRequestMain/productredressRequestMain.data.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
index eab66118f..023a77ee9 100644
--- a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
+++ b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
@@ -504,6 +504,8 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '库存状态',
     field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
     sort: 'custom',
     table: {
       width: 150

From faa1757a6f980996edf44a60e9616b7e6713a690 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 11 Jul 2024 14:13:11 +0800
Subject: [PATCH 346/408] =?UTF-8?q?=201.=E7=94=9F=E6=88=90=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E6=97=B6=EF=BC=8C=E6=B2=A1=E6=9C=89=E5=8C=85=E8=A3=85?=
 =?UTF-8?q?=E8=A7=84=E7=9A=84=E5=BA=94=E8=AF=A5=E6=98=BE=E7=A4=BA=E6=97=A0?=
 =?UTF-8?q?=E3=80=821.=E9=87=8D=E6=96=B0=E7=94=9F=E6=88=90=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E6=97=B6=EF=BC=8C=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=85=B7?=
 =?UTF-8?q?=E4=BD=93=E7=9A=84=E5=8C=85=E8=A3=85=E8=A7=84=E6=A0=BC=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index e6b157d16..85b694f7a 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -645,6 +645,8 @@ const getGenerateLabelList=async(row)=>{
           item.packUnit= obj.packUnit
           item.packQty = obj.packQty
         } 
+        item.secondPackUnit= ''
+        item.secondPackQty = ''
       })
     })
 }
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index 672b2ea87..f5bb1e74c 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -1628,6 +1628,8 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     },
     tableForm: {
       type: 'Select',
+      labelField: 'packName',
+      valueField: 'packUnit',
       initOptions: [{
         label: '',
         value: ''
@@ -1657,6 +1659,8 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     },
     tableForm: {
       type: 'Select',
+      labelField: 'packName',
+      valueField: 'packUnit',
       initOptions: [{
         label: '',
         value: ''

From e88c2dda0b8248c32376f745ccee088caa831c6f Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 11 Jul 2024 14:27:04 +0800
Subject: [PATCH 347/408] =?UTF-8?q?=20=20=20=20label:=20'=E8=B4=A7?=
 =?UTF-8?q?=E8=BF=90=E5=8D=95=E5=8F=B7',?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoiceRequestMain.data.ts          | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index 09a897730..232cc7af4 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -154,6 +154,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     isSearch: true,
     isForm: false
   },
+  
   {
     label: '供应商代码',
     field: 'supplierCode',
@@ -217,6 +218,21 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       }
     }
   },
+  //子表数据，仅是查询条件
+  {
+    label: '货运单号',
+    field: 'asnBillNum',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isTableForm:false,
+    isTable:false,
+    isDetail:false,
+    isSearch: true,
+    isForm: false,
+  },
   {
     label: '系统未税金额',
     field: 'amount',
@@ -1576,6 +1592,7 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isDetail: false,
     isTable: true,
   },
+  
    //仅是主列表页面的筛选搜索条件
    {
     label: '收货日期',

From 569795a79c5b5141809560e205b0cbd322498bb7 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 11 Jul 2024 15:47:47 +0800
Subject: [PATCH 348/408] =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=AD=90=E7=89=A9=E6=96=99=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=AC=AC=E4=B8=80=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processproductionRequest/index.vue          | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue b/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue
index 9979429f2..02730bae1 100644
--- a/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue
+++ b/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue
@@ -98,6 +98,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'
+import * as BomApi from "@/api/wms/bom";
 
 defineOptions({ name: 'ProcessproductionRequestMain' })
 
@@ -114,10 +115,24 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
   nextTick(() => {
     if (type == 'tableForm') {
       if(formField === 'productionLine'){
-        val.forEach(item=>{
+        val.forEach(async item=>{
           // if(tableData.value.find(item1=>item1['productionLine'] == item['productionLineCode'])) return
           const newRow = JSON.parse(JSON.stringify(tableFormKeys))
           newRow['productionLine'] = item['productionLineCode']
+          const param1 =  {
+            productItemCode: formRef.formModel['itemCode'],
+            available: 'TRUE',
+            pageSize: 20,
+            pageNo: 1,
+            sort: '',
+            by: 'ASC',
+          }
+          await BomApi.getBomPage(param1).then(res => {
+            console.log(res)
+            if(res?.list?.length>0){
+              newRow['componentItemCode'] = res.list[0].componentItemCode
+            }
+          }) 
           tableData.value.push(newRow)
         })
       }

From 07a325765f1dd11c78f35e21dc6d4ad5c84d58a8 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 11 Jul 2024 16:11:28 +0800
Subject: [PATCH 349/408] =?UTF-8?q?=E5=A4=B1=E5=8E=BB=E7=84=A6=E7=82=B9?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicForm.vue    | 704 ++++++++++--------
 .../itemManage/bom/bom.data.ts                |  17 +-
 2 files changed, 416 insertions(+), 305 deletions(-)

diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index b9313b4c6..e162d86d9 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -7,131 +7,136 @@
     :vLoading="formLoading"
     @updateFullscreen="updateFullscreen"
   >
-  
-  <div 
-    style="overflow-y: auto;" :style="{'max-height':formHeight}">
-    <Form
-      ref="formRef"
-      :rules="rules"
-      :schema="formSchema"
-      :is-col="true"
-      @opensearchTable="opensearchTable"
-      @hiddenFilterButton="hiddenSearchTableFilterButton"
-      @changeDialogWidth="changeDialogWidth"
-      @clearSearchInput="clearSearchInput"
-      @onChange="onChange"
-      @onBlur="onBlur"
-      @onEnter="onEnter"
-    >
-      <template #crontab="formSchema1" v-if="fromeWhere == 'countPlan'">
-      
-        <crontab v-model="formSchema1.crontab" :disabled="formSchema?.find(item=>item.field == 'crontab')?.componentProps?.disabled "/>
-      </template>
-      <template #type="formSchema" v-if="fromeWhere == 'countPlan'">
-        <el-select
-          v-model="formSchema.type"
-          placeholder="选择盘点类型"
-          @change="selectChange('type', $event)"
-          v-if="!isDetail"
-        >
-          <el-option
-            v-for="dict in getStrDictOptions(DICT_TYPE.COUNT_TYPE)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-        <el-select
-          v-model="formSchema.type"
-          placeholder="选择盘点范围类型"
-          @change="selectChangeDetail('type', $event,formSchema)"
-          v-if="isDetail"
-        >
-          <el-option
-            v-for="dict in getStrDictOptions(DICT_TYPE.COUNT_SCOPE_TYPE)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </template>
-      <template #value="formSchema" v-if="fromeWhere == 'countPlan'">
-        <el-select
-          v-model="formSchema.value"
-          placeholder="选择盘点范围值"
-          multiple
-          v-if="isDetail&& formTypeDetail =='Select'"
-        >
-          <el-option
-            v-for="dict in countPlanAllList"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
+    <div style="overflow-y: auto" :style="{ 'max-height': formHeight }">
+      <Form
+        ref="formRef"
+        :rules="rules"
+        :schema="formSchema"
+        :is-col="true"
+        @opensearchTable="opensearchTable"
+        @hiddenFilterButton="hiddenSearchTableFilterButton"
+        @changeDialogWidth="changeDialogWidth"
+        @clearSearchInput="clearSearchInput"
+        @onChange="onChange"
+        @onBlur="onBlur"
+        @onEnter="onEnter"
+      >
+        <template #crontab="formSchema1" v-if="fromeWhere == 'countPlan'">
+          <crontab
+            v-model="formSchema1.crontab"
+            :disabled="
+              formSchema?.find((item) => item.field == 'crontab')?.componentProps?.disabled
+            "
           />
-        </el-select>
-        <el-input v-model="formSchema.value" v-if="isDetail && formTypeDetail =='InputString'"/>
-      </template>
-    </Form>
-    <div class="table" v-if="isBusiness && formType == 'create' && fromeWhere != 'countPlan'">
-      <TableForm
-        ref="tableFormRef"
-        class="w-[100%]"
-        :maxHeight = "490"
-        :tableFields="tableAllSchemas.tableFormColumns"
-        :tableData="tableData"
-        :tableFormRules="tableFormRules"
-        :isShowButton="isShowButton"
-        :isShowReduceButton="isShowReduceButton"
-        :isShowReduceButtonSelection="isShowReduceButtonSelection"
-        @handleAddTable="handleAddTable"
-        @handleDeleteTable="handleDeleteTable"
-        @tableSelectionChange="tableSelectionChange"
-        @tableSelectionDelete="tableSelectionDelete"
-        @extendedButtonsClick="extendedButtonsClick"
-        @formSelectChange="formSelectChange"
-        @formSelectvVisibleChange="formSelectvVisibleChange"
-        @tableSortChange="tableSortChange"
-        @selectCallback="selectCallback"
-        @handleTableSelect="handleTableSelect"
-        @inpuFocus="inpuFocus"
-        @buttonOperationClick="buttonOperationClick"
-        @inputStringBlur="inputStringBlur"
-        @inputNumberChange="inputNumberChange"
-        @tableFormSelectOnBlur="tableFormSelectOnBlur"
-        @formFormDateChange="formFormDateChange"
-      @clearInput='clearInput'
+        </template>
+        <template #type="formSchema" v-if="fromeWhere == 'countPlan'">
+          <el-select
+            v-model="formSchema.type"
+            placeholder="选择盘点类型"
+            @change="selectChange('type', $event)"
+            v-if="!isDetail"
+          >
+            <el-option
+              v-for="dict in getStrDictOptions(DICT_TYPE.COUNT_TYPE)"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+          <el-select
+            v-model="formSchema.type"
+            placeholder="选择盘点范围类型"
+            @change="selectChangeDetail('type', $event, formSchema)"
+            v-if="isDetail"
+          >
+            <el-option
+              v-for="dict in getStrDictOptions(DICT_TYPE.COUNT_SCOPE_TYPE)"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </template>
+        <template #value="formSchema" v-if="fromeWhere == 'countPlan'">
+          <el-select
+            v-model="formSchema.value"
+            placeholder="选择盘点范围值"
+            multiple
+            v-if="isDetail && formTypeDetail == 'Select'"
+          >
+            <el-option
+              v-for="dict in countPlanAllList"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+          <el-input v-model="formSchema.value" v-if="isDetail && formTypeDetail == 'InputString'" />
+        </template>
+      </Form>
+      <div class="table" v-if="isBusiness && formType == 'create' && fromeWhere != 'countPlan'">
+        <TableForm
+          ref="tableFormRef"
+          class="w-[100%]"
+          :maxHeight="490"
+          :tableFields="tableAllSchemas.tableFormColumns"
+          :tableData="tableData"
+          :tableFormRules="tableFormRules"
+          :isShowButton="isShowButton"
+          :isShowReduceButton="isShowReduceButton"
+          :isShowReduceButtonSelection="isShowReduceButtonSelection"
+          @handleAddTable="handleAddTable"
+          @handleDeleteTable="handleDeleteTable"
+          @tableSelectionChange="tableSelectionChange"
+          @tableSelectionDelete="tableSelectionDelete"
+          @extendedButtonsClick="extendedButtonsClick"
+          @formSelectChange="formSelectChange"
+          @formSelectvVisibleChange="formSelectvVisibleChange"
+          @tableSortChange="tableSortChange"
+          @selectCallback="selectCallback"
+          @handleTableSelect="handleTableSelect"
+          @inpuFocus="inpuFocus"
+          @buttonOperationClick="buttonOperationClick"
+          @inputStringBlur="inputStringBlur"
+          @inputNumberChange="inputNumberChange"
+          @tableFormSelectOnBlur="tableFormSelectOnBlur"
+          @formFormDateChange="formFormDateChange"
+          @clearInput="clearInput"
           @batchAdd="batchAdd"
           :routeName="routeName"
-          @visibleChange='visibleChange'
-      >
-      <template v-slot="{row}">
-        <slot :row="row"></slot>
-      </template>
-    </TableForm>
-    </div>
-    <div v-if="isBusiness && formType == 'create' && fromeWhere == 'countPlan'">
-      <TableFormCountPlan 
-        :tableFields="tableAllSchemas.tableFormColumns"
-        :tableData="tableData"
-        :countScopeType="countScopeType"
-        :tableFormRules="tableFormRules"
-        ref="tableFormRef"
-        @tableFormChange="tableFormChange"
-        @handleAddTable="handleAddTable"
-        @handleDeleteTable="handleDeleteTable"
-      />
+          @visibleChange="visibleChange"
+        >
+          <template v-slot="{ row }">
+            <slot :row="row"></slot>
+          </template>
+        </TableForm>
+      </div>
+      <div v-if="isBusiness && formType == 'create' && fromeWhere == 'countPlan'">
+        <TableFormCountPlan
+          :tableFields="tableAllSchemas.tableFormColumns"
+          :tableData="tableData"
+          :countScopeType="countScopeType"
+          :tableFormRules="tableFormRules"
+          ref="tableFormRef"
+          @tableFormChange="tableFormChange"
+          @handleAddTable="handleAddTable"
+          @handleDeleteTable="handleDeleteTable"
+        />
+      </div>
     </div>
-  </div>
-    <template #footer >
+    <template #footer>
       <slot name="foorter"></slot>
       <ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick" />
     </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>
+      <slot :name="name"></slot>
+    </template>
   </SearchTable>
 </template>
 <script setup lang="ts">
@@ -140,9 +145,10 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import ButtonBase from '@/components/XButton/src/ButtonBase.vue'
 import TableForm from '@/components/TableForm/src/TableForm.vue'
 import TableFormCountPlan from '@/components/TableFormCountPlan/src/TableFormCountPlan.vue'
-import {DICT_TYPE, getStrDictOptions} from '@/utils/dict'
-import { tableFormBlurVer,FormBlur,getListByBottonInput } from '@/api/wms/business/business'
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+import { tableFormBlurVer, FormBlur, getListByBottonInput } from '@/api/wms/business/business'
 import { isString } from 'min-dash'
+
 const props = defineProps({
   // 显示窗口宽度设置
   basicFormWidth: {
@@ -155,9 +161,9 @@ const props = defineProps({
     default: true
   },
   // 是否显示删除按钮--多选
-  isShowReduceButtonSelection:{
+  isShowReduceButtonSelection: {
     type: Boolean,
-    default: false,
+    default: false
   },
   // 是否显示tableForm 删除按钮
   isShowReduceButton: {
@@ -290,13 +296,13 @@ const props = defineProps({
     default: null
   },
   //是否直接展示搜索表单
-  isOpenSearchTable:{
+  isOpenSearchTable: {
     type: Boolean,
     required: false,
     default: false
   },
-  
-  fieldTableColumn:{
+
+  fieldTableColumn: {
     type: String,
     required: false,
     default: ''
@@ -306,36 +312,32 @@ const props = defineProps({
     formField:form中对应的field,
     tableField:searchtable中对应的field,
   }]*/
-  sumFormDataField:{
+  sumFormDataField: {
     type: Array,
     required: false,
     default: null
   },
-  sumFormDataByForm:{
-    type:Function,
+  sumFormDataByForm: {
+    type: Function,
     required: false,
     default: null
   },
-  sumFormDataByTableCustom:{
-    type:Function,
+  sumFormDataByTableCustom: {
+    type: Function,
     required: false,
     default: null
   },
-  showSearchTableQueryFields:{
+  showSearchTableQueryFields: {
     type: Array,
     required: false,
     default: []
   },
-  byCodespageApi: {
-    type: Function,
-    required: true,
-    default: null
-  }, //输入框校验是否正确的方法
-  byCodesParams: {
-    type: Object,
-    required: true,
-    default: null
-  } //输入框校验是否正确的参数
+  // 失去焦点之后是否进行校验，
+  isJiaoyan: {
+    type: Boolean,
+    required: false,
+    default: false
+  }
 })
 
 const { t } = useI18n() // 国际化
@@ -347,8 +349,8 @@ if (props.basicFormWidth) {
   dialogWidth.value = props.isBusiness ? '60%' : '40%'
 }
 const formHeight = ref('60vh')
-const updateFullscreen = (isFullscreen)=>{
-  formHeight.value = isFullscreen?'auto':'60vh'
+const updateFullscreen = (isFullscreen) => {
+  formHeight.value = isFullscreen ? 'auto' : '60vh'
 }
 
 const dialogVisible = ref(false) // 弹窗的是否展示
@@ -363,7 +365,7 @@ const tableFormRules = ref(props.tableFormRules)
 const route = useRoute() // 路由信息
 const routeName = ref('')
 routeName.value = route.name
-const isExecute = ref(true)//如果走失去焦点的方法只有为true的时候才能进行保存
+const isExecute = ref(true) //如果走失去焦点的方法只有为true的时候才能进行保存
 
 // 列表-按钮
 // const buttondata = [
@@ -373,9 +375,9 @@ const isExecute = ref(true)//如果走失去焦点的方法只有为true的时
 // // 列表-操作按钮事件
 // const buttonTableClick = async (val, row) => {
 //   if (val == 'edit') {
-    
+
 //   } else if (val == 'delete') {
-   
+
 //   } else {
 //   }
 // }
@@ -396,7 +398,7 @@ const opensearchTable = (
   multiple,
   type,
   row,
-  isConcatDetailSchemas=false,
+  isConcatDetailSchemas = false,
   searchDetailSchemas: any
 ) => {
   const _searchCondition = {}
@@ -404,8 +406,8 @@ const opensearchTable = (
   if (searchCondition && searchCondition.length > 0) {
     // 转换筛选条件所需
     let filters: any[] = []
-    for (var i=0; i< searchCondition.length; i++ ) {
-    // searchCondition.forEach((item) => {
+    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]
@@ -417,19 +419,26 @@ const opensearchTable = (
           : ''
         // 是否含有空参数情况
         let isNull = false
-        if (_searchCondition[searchCondition[i].key] == '' || _searchCondition[searchCondition[i].key] == undefined) {
+        if (
+          _searchCondition[searchCondition[i].key] == '' ||
+          _searchCondition[searchCondition[i].key] == undefined
+        ) {
           isNull = true
         }
         if (isNull) {
-          message.warning(searchCondition[i].message?searchCondition[i].message:'前置条件未选择！')
+          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
-            }
+      } 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表数据的值
@@ -439,10 +448,15 @@ const opensearchTable = (
         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
+            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({
@@ -450,14 +464,13 @@ const opensearchTable = (
               column: searchCondition[i].key,
               value: formRef.value.formModel[searchCondition[i].value]
             })
-          }else{
+          } else {
             filters.push({
               action: searchCondition[i].action,
               column: searchCondition[i].key,
               value: searchCondition[i].value
             })
           }
-          
         } else {
           _searchCondition[searchCondition[i].key] = searchCondition[i].value
         }
@@ -488,50 +501,76 @@ const opensearchTable = (
 }
 
 //修改 searchTable 弹窗宽度
-const changeDialogWidth = (width)=>{
+const changeDialogWidth = (width) => {
   searchTableRef.value.changeDialogWidth(width)
 }
-const hiddenSearchTableFilterButton = ()=>{
+const hiddenSearchTableFilterButton = () => {
   searchTableRef.value.hiddenFilterButton()
 }
-const clearSearchInput = (field)=>{
-  emit('clearSearchInput',field)
+const clearSearchInput = (field) => {
+  emit('clearSearchInput', field)
 }
 const sumFormDataByTable = () => {
-  if(props.sumFormDataField){
+  if (props.sumFormDataField) {
     const sumObject = {}
-    props.sumFormDataField.forEach(sumItem=>{
-      sumObject[sumItem?.formField]= props.tableData.reduce((prev, item) => prev + item[sumItem?.tableField],0)
+    props.sumFormDataField.forEach((sumItem) => {
+      sumObject[sumItem?.formField] = props.tableData.reduce(
+        (prev, item) => prev + item[sumItem?.tableField],
+        0
+      )
     })
-    nextTick(()=>{
+    nextTick(() => {
       formRef.value.setValues(sumObject)
     })
   }
 }
-watch(()=>props.tableData,() => {
-  sumFormDataByTable()
-  if(props?.sumFormDataByTableCustom&&unref(formRef)?.formModel&&props.tableData){
-    props?.sumFormDataByTableCustom(formRef,unref(formRef)?.formModel,props.tableData)
+watch(
+  () => props.tableData,
+  () => {
+    sumFormDataByTable()
+    if (props?.sumFormDataByTableCustom && unref(formRef)?.formModel && props.tableData) {
+      props?.sumFormDataByTableCustom(formRef, unref(formRef)?.formModel, props.tableData)
+    }
+  },
+  {
+    deep: true
   }
-  
-},{
-  deep:true
-})
+)
 let originFormModel = {}
-const updateOriginFormModel = (data)=>{
+const updateOriginFormModel = (data) => {
   originFormModel = JSON.parse(JSON.stringify(data))
 }
-const sumFormDataHandle1 = ()=>{
-  emit('sumFormDataHandle',formRef,unref(formRef)?.formModel,props.tableData,formType.value,originFormModel,updateOriginFormModel)
+const sumFormDataHandle1 = () => {
+  emit(
+    'sumFormDataHandle',
+    formRef,
+    unref(formRef)?.formModel,
+    props.tableData,
+    formType.value,
+    originFormModel,
+    updateOriginFormModel
+  )
 }
 
-watch(()=>unref(formRef)?.formModel,async () => {
-  if(props?.sumFormDataByForm&&unref(formRef)?.formModel){
-    props?.sumFormDataByForm(formRef,unref(formRef)?.formModel,props.tableData,formType.value,originFormModel,updateOriginFormModel,sumFormDataHandle1)
+watch(
+  () => unref(formRef)?.formModel,
+  async () => {
+    if (props?.sumFormDataByForm && unref(formRef)?.formModel) {
+      props?.sumFormDataByForm(
+        formRef,
+        unref(formRef)?.formModel,
+        props.tableData,
+        formType.value,
+        originFormModel,
+        updateOriginFormModel,
+        sumFormDataHandle1
+      )
+    }
+  },
+  {
+    deep: true
   }
-},{
-  deep:true
-})
+)
 
 // 弹层确定返回所选数据
 // val ： 弹层列表row 数据
@@ -540,11 +579,17 @@ const searchTableSuccess = (formField, searchField, val, type, row) => {
 }
 
 /** 打开弹窗 */
-const open = async (type: string, row?: any, masterParmas?: any, titleName?: any, alltitleName?: any) => {
+const open = async (
+  type: string,
+  row?: any,
+  masterParmas?: any,
+  titleName?: any,
+  alltitleName?: any
+) => {
   dialogVisible.value = true
-  if(alltitleName){
+  if (alltitleName) {
     dialogTitle.value = alltitleName
-  }else if (titleName) {
+  } else if (titleName) {
     dialogTitle.value = t('action.' + titleName)
   } else {
     dialogTitle.value = t('action.' + type)
@@ -574,22 +619,25 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
 }
 // 添加数据
 const handleAddTable = () => {
-  if(props.isOpenSearchTable){
+  if (props.isOpenSearchTable) {
     const tableFormKeys = {}
-    tableAllSchemas.value.tableFormColumns.forEach(item => {
+    tableAllSchemas.value.tableFormColumns.forEach((item) => {
       tableFormKeys[item.field] = item.default ? item.default : ''
     })
-    if(props.fieldTableColumn!=''){
-      inpuFocus(tableAllSchemas.value.tableFormColumns.find(item=>item.field==props.fieldTableColumn),tableFormKeys,0)
+    if (props.fieldTableColumn != '') {
+      inpuFocus(
+        tableAllSchemas.value.tableFormColumns.find((item) => item.field == props.fieldTableColumn),
+        tableFormKeys,
+        0
+      )
     }
-  }else{
+  } else {
     emit('handleAddTable')
   }
-  
 }
 
 /** 弹窗按钮 */
-let Butttondata:any = []
+let Butttondata: any = []
 if (props.isShowFooterButtton) {
   Butttondata = [
     defaultButtons.formSaveBtn(null), // 保存
@@ -604,9 +652,9 @@ if (props.footButttondata) {
 const buttonBaseClick = (val) => {
   // 扩展 按钮事件回调
   if (props.footButttondata) {
-    emit('footButtonClick',val)
-  } 
-   // 保存
+    emit('footButtonClick', val)
+  }
+  // 保存
   else if (val == 'save') {
     submitForm()
   }
@@ -708,15 +756,15 @@ const emit = defineEmits([
   'visibleChange'
 ])
 const visibleChange = (field, val, row, index) => {
-  emit('visibleChange',field, val, row, index)
+  emit('visibleChange', field, val, row, index)
 }
 //普通下拉改变事件
 const formSelectChange = (field, val, row) => {
   emit('formSelectChange', field, val, row)
 }
 // 日期改变事件
-const formFormDateChange = (field, val,row, index) => {
-  emit('formFormDateChange', field, val,row, index)
+const formFormDateChange = (field, val, row, index) => {
+  emit('formFormDateChange', field, val, row, index)
 }
 const formSelectvVisibleChange = (field, val, row) => {
   emit('formSelectvVisibleChange', field, val, row)
@@ -753,14 +801,11 @@ const handleTableSelect = (row, column, event) => {
 
 // 删除数据
 const handleDeleteTable = (row, index) => {
-  emit('handleDeleteTable', row, index,formRef.value)
+  emit('handleDeleteTable', row, index, formRef.value)
 }
 
-
-
 // 输入框聚焦
 const inpuFocus = (headerItem, row, index) => {
-  
   emit('inpuFocus', headerItem, row, index)
 
   opensearchTable(
@@ -778,7 +823,7 @@ const inpuFocus = (headerItem, row, index) => {
   )
 }
 const clearInput = (field, row, index) => {
-  emit('clearInput',field, row, index)
+  emit('clearInput', field, row, index)
 }
 /**
  * 监听改变事件
@@ -796,48 +841,31 @@ const onChange = (field, cur) => {
  */
 const onBlur = async (field, e) => {
   isExecute.value = false
-  if (
-    field == 'supplierCode' ||
-    field == 'itemCode' ||
-    field == 'productItemCode' ||
-    field == 'componentItemCode' ||
-    field == 'packUnit' ||
-    field == 'inPackUnit' ||
-    field == 'fromPackingNumber'
-  ) {
-    await FormBlur(
-      field,
-      e,
-      routeName.value,
-      formRef.value,
-      props.detailData,
-      formSchema.value,
-      (searchField, list) => {
-        emit('searchTableSuccess', field, searchField, list, formRef.value, 'form')
-      }
-    )
-  } else {
-    let formSchemaObj = formSchema.value.find((item) => item.field == field)
-    let searchCondition1 = formSchema.value.find((item) => item.field == field).componentProps
-      .searchCondition //获取data.ts参数信息
-    if (formSchemaObj?.componentProps?.enterSearch) {
+
+  let formSchemaObj = formSchema.value.find((item) => item.field == field)?.componentProps
+  if (formSchemaObj?.enterSearch) {
+    if (formSchemaObj.verificationPage) {
+      let searchCondition1 = formSchema.value.find((item) => item.field == field).componentProps
+        .searchCondition //获取data.ts参数信息
+      let verificationParams = formSchema.value.find((item) => item.field == field).componentProps
+        .verificationParams //获取失去焦点参数信息
+      console.log('走新方法啦')
       if (e && isString(e)) {
         let setV = {}
         setV[field] = ''
-        let obj = {}
-console.log(233,searchCondition1)
+        let params = {}
         // 循环参数设置参数为key：value格式
         if (searchCondition1 && searchCondition1.length > 0) {
           for (let i = 0; i < searchCondition1.length; i++) {
             if (searchCondition1[i].isMainValue) {
-              obj[searchCondition1[i].key] = formRef.value.formModel[searchCondition1[i].value]
+              params[searchCondition1[i].key] = formRef.value.formModel[searchCondition1[i].value]
                 ? formRef.value.formModel[searchCondition1[i].value]
                 : props.detailData
                 ? props.detailData[searchCondition1[i].value]
                 : ''
               // 是否含有空参数情况
               let isNull = false
-              if (obj[searchCondition1[i].key] == '' || obj[searchCondition1[i].key] == undefined) {
+              if (params[searchCondition1[i].key] == '' || params[searchCondition1[i].key] == undefined) {
                 isNull = true
               }
               if (isNull) {
@@ -865,120 +893,188 @@ console.log(233,searchCondition1)
                     }
                   }
                 }
-                  obj[searchCondition1[i].key] = searchCondition1[i].value
+                params[searchCondition1[i].key] = searchCondition1[i].value
               } else {
-                obj[searchCondition1[i].key] = searchCondition1[i].value
+                params[searchCondition1[i].key] = searchCondition1[i].value
               }
             }
           }
         }
-        if (!formSchemaObj?.componentProps.multiple && e.indexOf(',') > -1) {
+        // 循环参数设置参数为key：value格式
+        if (verificationParams && verificationParams.length > 0) {
+          for (let i = 0; i < verificationParams.length; i++) {
+              params[verificationParams[i].key] = e?.trim()
+          }
+        }
+        console.log(333,params)
+        if (!formSchemaObj?.multiple && e.indexOf(',') > -1) {
           message.alert('该输入框只能输入一条数据')
           formRef.value.setValues(setV)
           return
         }
-        if (props.byCodespageApi) {
-          let params = {}
-          if (props.byCodesParams) {
-            params = { ...props.byCodesParams, ...obj, codes: e }
-          } else {
-            params = { ...obj, codes: e }
+        await formSchemaObj.verificationPage(params).then((res) => {
+          let arr1 = e.split(',')
+          let list = ref([])
+          list.value = res
+          console.log(222, list.value)
+          if (list.value?.length == 0) {
+            message.alert('暂无数据')
+            formRef.value.setValues(setV)
+            return
           }
-          await props.byCodespageApi(params).then((res) => {
-            let arr1 = e.split(',')
-            let list = ref([])
-            list.value = res
-            if (list.value?.length == 0) {
-              message.alert('暂无数据')
-              formRef.value.setValues(setV)
-              return
-            }
-            if (arr1.length != list.value.length) {
-              let arr2 = list.value.map((item) => item.code)
-              let str = [
-                ...arr1.filter((item) => !arr2.includes(item)),
-                ...arr2.filter((item) => !arr1.includes(item))
-              ].join(',')
-              message.alert('代码' + str + '没有找到对应数据')
-              formRef.value.setValues(setV)
-              return
-            }
-            emit(
-              'searchTableSuccess',
-              field,
-              searchCondition1.searchField,
-              list,
-              formRef.value,
-              'form'
-            )
-          })
-        }
+          if (arr1.length != list.value.length) {
+            let arr2 = list.value.map((item) => item.code)
+            let str = [
+              ...arr1.filter((item) => !arr2.includes(item)),
+              ...arr2.filter((item) => !arr1.includes(item))
+            ].join(',')
+            message.alert('代码' + str + '没有找到对应数据')
+            formRef.value.setValues(setV)
+            return
+          }
+          // emit('searchTableSuccess', formField, searchField, list.value, formRef.value, 'form')
+          // callback(list.value)
+        })
+        // emit(
+        //   'onBlur',
+        //   field,
+        //   e,
+        //   formSchemaObj.componentProps.searchField,
+        //   formSchemaObj,
+        //   formRef.value,
+        //   'form',
+        //   obj
+        // )
       }
     } else {
-      emit('onBlur', field, e)
+      if (
+        field == 'supplierCode' ||
+        field == 'itemCode' ||
+        field == 'productItemCode' ||
+        field == 'componentItemCode' ||
+        field == 'packUnit' ||
+        field == 'inPackUnit' ||
+        field == 'fromPackingNumber'
+      ) {
+        await FormBlur(
+          field,
+          e,
+          routeName.value,
+          formRef.value,
+          props.detailData,
+          formSchema.value,
+          (searchField, list) => {
+            emit('searchTableSuccess', field, searchField, list, formRef.value, 'form')
+          }
+        )
+        return
+      }
     }
+  } else {
+    emit('onBlur', field, e)
   }
   isExecute.value = true
-  emit('onBlur', field, e)
 }
 
-
 // 批量增加
 const batchAdd = async (val) => {
   const row = {}
-    tableAllSchemas.value.tableFormColumns.forEach((item) => {
-      row[item.field] = item.default ? item.default : ''
-    })
-  const headerItem = tableAllSchemas.value.tableColumns.find((item) => item.field ==  props.fieldTableColumn)
-
-
-
-  await getListByBottonInput(headerItem, val,row,routeName.value,formRef.value,props.detailData,props.tableData,(list)=>{
-    emit('searchTableSuccess',headerItem.field,'itemCode',list, formRef.value,'tableForm',row)
+  tableAllSchemas.value.tableFormColumns.forEach((item) => {
+    row[item.field] = item.default ? item.default : ''
   })
+  const headerItem = tableAllSchemas.value.tableColumns.find(
+    (item) => item.field == props.fieldTableColumn
+  )
+
+  await getListByBottonInput(
+    headerItem,
+    val,
+    row,
+    routeName.value,
+    formRef.value,
+    props.detailData,
+    props.tableData,
+    (list) => {
+      emit(
+        'searchTableSuccess',
+        headerItem.field,
+        'itemCode',
+        list,
+        formRef.value,
+        'tableForm',
+        row
+      )
+    }
+  )
 }
 
 const inputStringBlur = async (headerItem, val, row, index) => {
   // isExecute.value = false
- await  tableFormBlurVer(headerItem,val,row,index,routeName.value,formRef.value,props.detailData,props.tableData,(searchField, list)=>{
-      emit('searchTableSuccess',headerItem.field,searchField,list, formRef.value,'tableForm',row,'blur',index)
-    })
-    
+  await tableFormBlurVer(
+    headerItem,
+    val,
+    row,
+    index,
+    routeName.value,
+    formRef.value,
+    props.detailData,
+    props.tableData,
+    (searchField, list) => {
+      emit(
+        'searchTableSuccess',
+        headerItem.field,
+        searchField,
+        list,
+        formRef.value,
+        'tableForm',
+        row,
+        'blur',
+        index
+      )
+    }
+  )
+
   // isExecute.value = true
 }
 
-
 /**
  * 回车事件
  * @param field 当前操作字段
- * @param e 
+ * @param e
  */
-const onEnter = (field,value, e) => {
-  emit('onEnter', field,value, e)
-} 
+const onEnter = (field, value, e) => {
+  emit('onEnter', field, value, e)
+}
 
 // 修改盘点类型
 const selectChange = (field, val) => {
   emit('selectChange', field, val)
 }
 // 修改盘点范围类型
-const selectChangeDetail = (field, val,formSchema) => {
+const selectChangeDetail = (field, val, formSchema) => {
   formSchema.value = ''
   emit('selectChangeDetail', field, val)
 }
 
-
 const tableFormChange = (field, val, row) => {
   emit('tableFormChange', field, val, row)
 }
 
-const buttonOperationClick = (row, label, index)=> {
-  emit("buttonOperationClick", row, label, index);
+const buttonOperationClick = (row, label, index) => {
+  emit('buttonOperationClick', row, label, index)
 }
 
-
-defineExpose({ open, formRef, opensearchTable, dialogVisible, formLoading ,handleAddTable,changeDialogWidth,searchTableRef,tableFormRef}) // 提供 open 方法，用于打开弹窗
-
+defineExpose({
+  open,
+  formRef,
+  opensearchTable,
+  dialogVisible,
+  formLoading,
+  handleAddTable,
+  changeDialogWidth,
+  searchTableRef,
+  tableFormRef
+}) // 提供 open 方法，用于打开弹窗
 </script>
 <style lang="scss" scoped>
 .table {
@@ -1007,8 +1103,8 @@ defineExpose({ open, formRef, opensearchTable, dialogVisible, formLoading ,handl
 
 ::v-deep(.el-icon) {
   display: block;
-}button
-.button {
+}
+button .button {
   > div {
     display: flex;
     align-items: center;
diff --git a/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts b/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts
index f2888fc7f..e8729c17f 100644
--- a/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts
@@ -32,6 +32,11 @@ export const Bom = useCrudSchemas(reactive<CrudSchema[]>([
         searchTitle: '物料基础信息', // 查询弹窗标题
         searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
         searchPage: ItembasicApi.selectItembasicPageToFgAndSemibasicPage, // 查询弹窗所需分页方法
+        verificationPage: ItembasicApi.getItemListByCodes, // 失去焦点校验输入框的数据内容存在
+        verificationParams: [{
+          key: 'codes',
+          value: '',
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -53,6 +58,11 @@ export const Bom = useCrudSchemas(reactive<CrudSchema[]>([
         searchTitle: '物料基础信息', // 查询弹窗标题
         searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
         searchPage: ItembasicApi.selectTypeToItembasic, // 查询弹窗所需分页方法
+        verificationPage: ItembasicApi.getItemListByCodes, // 失去焦点校验输入框的数据内容存在
+        verificationParams: [{
+          key: 'codes',
+          value: '',
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -105,7 +115,12 @@ export const Bom = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+        verificationPage: ProcessApi.getProcessByCodes, // 失去焦点校验输入框的数据内容存在
+        verificationParams: [{
+          key: 'codes',
+          value: '',
+        }], // 失去焦点校验参数
       }
     }
   },

From 2966a54994713b65573f783e2b5dc38fe79e552f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com>
Date: Thu, 11 Jul 2024 16:16:13 +0800
Subject: [PATCH 350/408] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inspectionJob/inspectionJobMain.data.ts   |    2 +-
 .../issue/issueJobMain/issueJobMain.data.ts   | 1848 ++++++++--------
 .../issueRecordMain/issueRecordMain.data.ts   | 1554 +++++++------
 .../issueRequestMain/issueRequestMain.data.ts | 1958 +++++++++--------
 4 files changed, 2676 insertions(+), 2686 deletions(-)

diff --git a/src/views/qms/inspectionJob/inspectionJobMain.data.ts b/src/views/qms/inspectionJob/inspectionJobMain.data.ts
index 51c9b2d86..cf3999056 100644
--- a/src/views/qms/inspectionJob/inspectionJobMain.data.ts
+++ b/src/views/qms/inspectionJob/inspectionJobMain.data.ts
@@ -444,7 +444,7 @@ export const InspectionJobMain = useCrudSchemas(
       isDetail: false,
       isForm: false,
       table: {
-        width: 250,
+        width: 300,
         fixed: 'right'
       }
     }
diff --git a/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts b/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts
index 8c9d6859b..c11f0d6c3 100644
--- a/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts
+++ b/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts
@@ -4,980 +4,966 @@ import { dateFormatter } from '@/utils/formatTime'
 /**
  * @returns {Array} 发料任务主表
  */
-export const IssueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 180,
-      fixed: 'left'
-    },
-    sortSearchDefault:1,
-    isSearch: true,
-  },
-  {
-    label: '申请单号',
-    field: 'requestNumber',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: false,
-  },
-  {
-    label: '供应商代码',
-    field: 'supplierCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '车间代码',
-    field: 'workShopCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '从仓库代码',
-    field: 'fromWarehouseCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '申请时间',
-    field: 'requestTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+export const IssueJobMain = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '单据号',
+      field: 'number',
+      sort: 'custom',
+      table: {
+        width: 180,
+        fixed: 'left'
+      },
+      sortSearchDefault: 1,
+      isSearch: true
+    },
+    {
+      label: '申请单号',
+      field: 'requestNumber',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false
+    },
+    {
+      label: '供应商代码',
+      field: 'supplierCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '车间代码',
+      field: 'workShopCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '从仓库代码',
+      field: 'fromWarehouseCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '申请时间',
+      field: 'requestTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
     },
-  },
-  {
-    label: '要求截止时间',
-    field: 'requestDueTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '要求截止时间',
+      field: 'requestDueTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      },
+      isTable: false
+    },
+    {
+      label: '过期时间',
+      field: 'expiredTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
     },
-    isTable: false,
-  },
-  {
-    label: '过期时间',
-    field: 'expiredTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
+    {
+      label: '状态',
+      field: 'status',
+      dictType: DICT_TYPE.JOB_STATUS,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 1
+    },
+    {
+      label: '到仓库代码',
+      field: 'toWarehouseCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '生产线代码',
+      field: 'detailProductionLineCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '工位代码',
+      field: 'detailWorkStationCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
     },
-  },
-  {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.JOB_STATUS,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:1,
-  },
-  {
-    label: '到仓库代码',
-    field: 'toWarehouseCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '生产线代码',
-    field: 'detailProductionLineCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '工位代码',
-    field: 'detailWorkStationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
 
-  {
-    label: '最后更新时间',
-    field: 'updateTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '最后更新时间',
+      field: 'updateTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
     },
-  },
-  {
-    label: '最后更新者',
-    field: 'updater',
-    sort: 'custom',
-    table: {
-      width: 150
+    {
+      label: '最后更新者',
+      field: 'updater',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
     },
-    isTable: false,
-
-  },
 
-  {
-    label: '优先级',
-    field: 'priority',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-    form: {
-      component: 'InputNumber',
-    }
-  },
-  {
-    label: '优先级增量',
-    field: 'priorityIncrement',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-    form: {
-      component: 'InputNumber',
-    }
-  },
-  {
-    label: '部门',
-    field: 'departmentCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '承接人用户名',
-    field: 'acceptUserId',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '承接时间',
-    field: 'acceptTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '优先级',
+      field: 'priority',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      form: {
+        component: 'InputNumber'
       }
     },
-  },
-  {
-    label: '完成人用户名',
-    field: 'completeUserId',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '完成时间',
-    field: 'completeTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '优先级增量',
+      field: 'priorityIncrement',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      form: {
+        component: 'InputNumber'
       }
     },
-  },
-  {
-    label: '从库区类型范围',
-    field: 'fromAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '到库区类型范围',
-    field: 'toAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '业务类型',
-    field: 'businessType',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: 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: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '部门',
+      field: 'departmentCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '承接人用户名',
+      field: 'acceptUserId',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '承接时间',
+      field: 'acceptTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
     },
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    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: 'completeUserId',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '完成时间',
+      field: 'completeTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          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: 'fromAreaCodes',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '到库区代码范围',
-    field: 'toAreaCodes',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  // {
-  //   label: '使用在途库',
-  //   field: 'useOnTheWayLocation',
-  //   dictType: DICT_TYPE.TRUE_FALSE,
-  //   dictClass: 'string',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   isTable: false,
-  //   form: {
-  //     component: 'Switch',
-  //     value: 'TRUE',
-  //     componentProps: {
-  //       inactiveValue: 'FALSE',
-  //       activeValue: 'TRUE'
-  //     }
-  //   }
-  // },
-  {
-    label: '自动完成',
-    field: 'autoComplete',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    },
+    {
+      label: '从库区类型范围',
+      field: 'fromAreaTypes',
+      dictType: DICT_TYPE.AREA_TYPE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
       }
-    }
-  },
-  {
-    label: '允许修改库位',
-    field: 'allowModifyLocation',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    },
+    {
+      label: '到库区类型范围',
+      field: 'toAreaTypes',
+      dictType: DICT_TYPE.AREA_TYPE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
       }
-    }
-  },
-  {
-    label: '允许修改数量',
-    field: 'allowModifyQty',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    },
+    {
+      label: '业务类型',
+      field: 'businessType',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: 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: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
-    }
-  },
-  {
-    label: '允许大于推荐数量',
-    field: 'allowBiggerQty',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    },
+    {
+      label: '创建者',
+      field: 'creator',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      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: 'allowSmallerQty',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    },
+    {
+      label: '最后更新者',
+      field: 'updater',
+      isDetail: true,
+      isForm: false,
+      isTable: false,
+      table: {
+        width: 150
       }
-    }
-  },
-  {
-    label: '允许修改库存状态',
-    field: 'allowModifyInventoryStatus',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    },
+    {
+      label: '从库区代码范围',
+      field: 'fromAreaCodes',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '到库区代码范围',
+      field: 'toAreaCodes',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    // {
+    //   label: '使用在途库',
+    //   field: 'useOnTheWayLocation',
+    //   dictType: DICT_TYPE.TRUE_FALSE,
+    //   dictClass: 'string',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   isTable: false,
+    //   form: {
+    //     component: 'Switch',
+    //     value: 'TRUE',
+    //     componentProps: {
+    //       inactiveValue: 'FALSE',
+    //       activeValue: 'TRUE'
+    //     }
+    //   }
+    // },
+    {
+      label: '自动完成',
+      field: 'autoComplete',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
       }
-    }
-  },
-  {
-    label: '允许连续扫描',
-    field: 'allowContinuousScanning',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    },
+    {
+      label: '允许修改库位',
+      field: 'allowModifyLocation',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
       }
-    }
-  },
-  {
-    label: '允许部分完成',
-    field: 'allowPartialComplete',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    },
+    {
+      label: '允许修改数量',
+      field: 'allowModifyQty',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
       }
-    }
-  },
-  {
-    label: '允许修改批次',
-    field: 'allowModifyBatch',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    },
+    {
+      label: '允许大于推荐数量',
+      field: 'allowBiggerQty',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
       }
-    }
-  },
-  {
-    label: '允许修改箱码',
-    field: 'allowModifyPackingNumber',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    },
+    {
+      label: '允许小于推荐数量',
+      field: 'allowSmallerQty',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
+      }
+    },
+    {
+      label: '允许修改库存状态',
+      field: 'allowModifyInventoryStatus',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
+      }
+    },
+    {
+      label: '允许连续扫描',
+      field: 'allowContinuousScanning',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
+      }
+    },
+    {
+      label: '允许部分完成',
+      field: 'allowPartialComplete',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
+      }
+    },
+    {
+      label: '允许修改批次',
+      field: 'allowModifyBatch',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
+      }
+    },
+    {
+      label: '允许修改箱码',
+      field: 'allowModifyPackingNumber',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
+      }
+    },
+    {
+      label: '操作',
+      field: 'action',
+      isDetail: false,
+      isForm: false,
+      table: {
+        width: 120,
+        fixed: 'right'
       }
     }
-  },
-  {
-    label: '操作',
-    field: 'action',
-    isDetail: false,
-    isForm: false,
-    table: {
-      width: 120,
-      fixed: 'right'
-    },
-  }
-]))
+  ])
+)
 
 //表单校验
 export const IssueJobMainRules = reactive({
-  requestNumber: [
-    { required: true, message: '请选择申请单号', trigger: 'change' }
-  ],
-  fromWarehouseCode: [
-    { required: true, message: '请选择从仓库代码', trigger: 'change' }
-  ],
-  fromAreaTypes: [
-    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
-  ],
-  toWarehouseCode: [
-    { required: true, message: '请选择到仓库代码', trigger: 'change' }
-  ],
-  toAreaTypes: [
-    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
-  ],
-  requestTime: [
-    { required: true, message: '请输入申请时间', trigger: 'change' }
-  ],
-  requestDueTime: [
-    { required: true, message: '请输入要求截止时间', trigger: 'change' }
-  ],
-  status: [
-    { required: true, message: '请选择状态', trigger: 'change' }
-  ],
+  requestNumber: [{ required: true, message: '请选择申请单号', trigger: 'change' }],
+  fromWarehouseCode: [{ required: true, message: '请选择从仓库代码', trigger: 'change' }],
+  fromAreaTypes: [{ required: true, message: '请选择从库区类型范围', trigger: 'change' }],
+  toWarehouseCode: [{ required: true, message: '请选择到仓库代码', trigger: 'change' }],
+  toAreaTypes: [{ required: true, message: '请选择到库区类型范围', trigger: 'change' }],
+  requestTime: [{ required: true, message: '请输入申请时间', trigger: 'change' }],
+  requestDueTime: [{ required: true, message: '请输入要求截止时间', trigger: 'change' }],
+  status: [{ required: true, message: '请选择状态', trigger: 'change' }],
   // jobStageStatus: [
   //   { required: true, message: '请选择阶段状态', trigger: 'change' }
   // ],
-  priority: [
-    { required: true, message: '请输入优先级', trigger: 'blur' }
-  ],
-  priorityIncrement: [
-    { required: true, message: '请输入优先级增量', trigger: 'blur' }
-  ],
-  departmentCode: [
-    { required: true, message: '请输入部门', trigger: 'blur' }
-  ],
-  userPositionCode: [
-    { required: true, message: '请输入岗位', trigger: 'blur' }
-  ],
-  number: [
-    { required: true, message: '请输入单据号', trigger: 'blur' }
-  ],
-  businessType: [
-    { required: true, message: '请输入业务类型', trigger: 'blur' }
-  ],
-  createTime: [
-    { required: true, message: '请输入创建时间', trigger: 'blur' }
-  ],
-  creator: [
-    { required: true, message: '请输入创建者', trigger: 'blur' }
-  ],
+  priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }],
+  priorityIncrement: [{ required: true, message: '请输入优先级增量', trigger: 'blur' }],
+  departmentCode: [{ required: true, message: '请输入部门', trigger: 'blur' }],
+  userPositionCode: [{ required: true, message: '请输入岗位', trigger: 'blur' }],
+  number: [{ required: true, message: '请输入单据号', trigger: 'blur' }],
+  businessType: [{ required: true, message: '请输入业务类型', trigger: 'blur' }],
+  createTime: [{ required: true, message: '请输入创建时间', trigger: 'blur' }],
+  creator: [{ required: true, message: '请输入创建者', trigger: 'blur' }]
 })
 
 /**
  * @returns {Array} 发料任务子表
  */
-export const IssueJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '生产线代码',
-    field: 'productionLineCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    hiddenInMain:true,
-  },
-  {
-    label: '工位代码',
-    field: 'workStationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    hiddenInMain:true,
-  },
-  {
-    label: '在途库库位',
-    field: 'onTheWayLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    hiddenInMain:true,
-  },
-  {
-    label: '包装号',
-    field: 'packingNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch: true,
-    sortTableDefault:5,
-  },
-  {
-    label: '包装规格',
-    field: 'packUnit',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:5,
-  },
-  {
-    label: '包装数量',
-    field: 'packQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-    },
-    sortTableDefault:5,
-  },
-  {
-    label: '器具号',
-    field: 'containerNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain: true,
-    isTable:false,
-  },
-  {
-    label: '批次',
-    field: 'batch',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch: true,
-    sortSearchDefault:3,
-    sortTableDefault:4,
-  },
-  {
-    label: '库存状态',
-    field: 'inventoryStatus',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '采购订单号',
-    field: 'poNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    sortTableDefault:2,
-  },
-  {
-    label: '订单行',
-    field: 'poLine',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    sortTableDefault:2,
-  },
-  {
-    label: '从库位代码',
-    field: 'fromLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch: true,
-  },
-  {
-    label: '到库位代码',
-    field: 'toLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch: true,
-  },
-  {
-    label: '物料代码',
-    field: 'itemCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortSearchDefault:2,
-    isSearch: true,
-    sortTableDefault:3,
-  },
-  {
-    label: '物料名称',
-    field: 'itemName',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:3,
-  },
-  {
-    label: '物料描述1',
-    field: 'itemDesc1',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain: true,
-  },
-  {
-    label: '物料描述2',
-    field: 'itemDesc2',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain: true,
-  },
-  {
-    label: '项目代码',
-    field: 'projectCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain: true,
-  },
-  {
-    label: '数量',
-    field: 'qty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-    },
-    hiddenInMain: true,
-  },
-  {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:6,
-  },
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    hiddenInMain: true,
-  },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain: true,
-  },
-  {
-    label: '从货主代码',
-    field: 'fromOwnerCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain: true,
-  },
-  {
-    label: '到货主代码',
-    field: 'toOwnerCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain: true,
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    hiddenInMain: true,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+export const IssueJobDetail = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '物料代码',
+      field: 'itemCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortSearchDefault: 2,
+      isSearch: true,
+      sortTableDefault: 3
+    },
+    {
+      label: '物料名称',
+      field: 'itemName',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 3
+    },
+    {
+      label: '批次',
+      field: 'batch',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true,
+      sortSearchDefault: 3,
+      sortTableDefault: 4
+    },
+    {
+      label: '数量',
+      field: 'qty',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'InputNumber'
+      },
+      hiddenInMain: true
+    },
+    {
+      label: '计量单位',
+      field: 'uom',
+      dictType: DICT_TYPE.UOM,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 6
+    },
+    {
+      label: '包装规格',
+      field: 'packUnit',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 5
+    },
+    {
+      label: '包装数量',
+      field: 'packQty',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'InputNumber'
+      },
+      sortTableDefault: 5
+    },
+
+    {
+      label: '库存状态',
+      field: 'inventoryStatus',
+      dictType: DICT_TYPE.INVENTORY_STATUS,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      }
+    },
+    {
+      label: '从库位代码',
+      field: 'fromLocationCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true
+    },
+    {
+      label: '到库位代码',
+      field: 'toLocationCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true
+    },
+    {
+      label: '单据号',
+      field: 'number',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      hiddenInMain: true
+    },
+    {
+      label: '物料描述1',
+      field: 'itemDesc1',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true
+    },
+    {
+      label: '物料描述2',
+      field: 'itemDesc2',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true
+    },
+    {
+      label: '项目代码',
+      field: 'projectCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true
+    },
+    {
+      label: '从货主',
+      field: 'fromOwnerCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true
+    },
+    {
+      label: '到货主',
+      field: 'toOwnerCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true
+    },
+    {
+      label: '创建者',
+      field: 'creator',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true
+    },
+    {
+      label: '创建时间',
+      field: 'createTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      hiddenInMain: true,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
     },
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain: true,
-  },
-  {
-    label: '供应商计量数量',
-    field: 'supplierQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    hiddenInMain: true,
-    form: {
-      component: 'InputNumber',
-    }
-  },
-  {
-    label: '供应商计量单位',
-    field: 'supplierUom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    hiddenInMain:true,
-  },
 
+    {
+      label: '生产线代码',
+      field: 'productionLineCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      isDetail: false,
+      hiddenInMain: true
+    },
+    {
+      label: '工位代码',
+      field: 'workStationCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      isDetail: false,
+      hiddenInMain: true
+    },
+    {
+      label: '在途库库位',
+      field: 'onTheWayLocationCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      isDetail: false,
+      hiddenInMain: true
+    },
+    {
+      label: '包装号',
+      field: 'packingNumber',
+      sort: 'custom',
+      isTable: false,
+      table: {
+        width: 150
+      },
+      isSearch: false,
+      isDetail: false,
+      sortTableDefault: 5
+    },
+
+    {
+      label: '器具号',
+      field: 'containerNumber',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true,
+      isDetail: false,
+      isTable: false
+    },
 
-]))
+    // {
+    //   label: '采购订单号',
+    //   field: 'poNumber',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   hiddenInMain: true,
+    //   isDetail: false,
+    //   sortTableDefault: 2
+    // },
+    // {
+    //   label: '订单行',
+    //   field: 'poLine',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   hiddenInMain: true,
+    //   isDetail: false,
+    //   sortTableDefault: 2
+    // },
+
+    {
+      label: '备注',
+      field: 'remark',
+      sort: 'custom',
+      isDetail: false,
+      table: {
+        width: 150
+      },
+      hiddenInMain: true
+    },
+
+    {
+      label: '供应商计量数量',
+      field: 'supplierQty',
+      sort: 'custom',
+      isDetail: false,
+      table: {
+        width: 150
+      },
+      isTable: false,
+      hiddenInMain: true,
+      form: {
+        component: 'InputNumber'
+      }
+    },
+    {
+      label: '供应商计量单位',
+      field: 'supplierUom',
+      dictType: DICT_TYPE.UOM,
+      dictClass: 'string',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      isDetail: false,
+      hiddenInMain: true
+    }
+  ])
+)
 
 //表单校验
 export const IssueJobDetailRules = reactive({
diff --git a/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts b/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts
index f40cdef01..5e39ab54b 100644
--- a/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts
+++ b/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts
@@ -1,825 +1,801 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
 
 /**
  * @returns {Array} 发料记录主表
  */
-export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 180,
-      fixed: 'left'
-    },
-    sortSearchDefault:1,
-    isSearch: true
-  },
-  {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.JOB_STATUS,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:1,
-  },
-  {
-    label: '申请单号',
-    field: 'requestNumber',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: false,
-  },
-  {
-    label: '任务单号',
-    field: 'jobNumber',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: false,
-  },
-  {
-    label: '供应商代码',
-    field: 'supplierCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '车间代码',
-    field: 'workshopCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '出库事务类型',
-    field: 'outTransactionType',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '入库事务类型',
-    field: 'inTransactionType',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '执行时间',
-    field: 'executeTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+export const IssueRecordMain = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '单据号',
+      field: 'number',
+      sort: 'custom',
+      table: {
+        width: 180,
+        fixed: 'left'
+      },
+      sortSearchDefault: 1,
+      isSearch: true
+    },
+    {
+      label: '状态',
+      field: 'status',
+      dictType: DICT_TYPE.JOB_STATUS,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 1
+    },
+    {
+      label: '申请单号',
+      field: 'requestNumber',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false
+    },
+    {
+      label: '任务单号',
+      field: 'jobNumber',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false
+    },
+    {
+      label: '供应商代码',
+      field: 'supplierCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '车间代码',
+      field: 'workshopCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '出库事务类型',
+      field: 'outTransactionType',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '入库事务类型',
+      field: 'inTransactionType',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '执行时间',
+      field: 'executeTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
     },
-  },
-  {
-    label: '生效日期',
-    field: 'activeDate',
-    formatter: dateFormatter2,
-    detail: {
-      dateFormat: 'YYYY-MM-DD'
-    },
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width: '100%'},
-        type: 'date',
-        dateFormat: 'YYYY-MM-DD',
-        valueFormat: 'x',
+    {
+      label: '生效日期',
+      field: 'activeDate',
+      formatter: dateFormatter2,
+      detail: {
+        dateFormat: 'YYYY-MM-DD'
+      },
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'date',
+          dateFormat: 'YYYY-MM-DD',
+          valueFormat: 'x'
+        }
       }
     },
-  },
-  {
-    label: '申请时间',
-    field: 'requestTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '申请时间',
+      field: 'requestTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
     },
-  },
-  {
-    label: '截止时间',
-    field: 'dueTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '截止时间',
+      field: 'dueTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
     },
-  },
-  {
-    label: '部门',
-    field: 'departmentCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '接口类型',
-    field: 'interfaceType',
-    dictType: DICT_TYPE.INTERFACE_TYPE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '业务类型',
-    field: 'businessType',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: 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: true,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '部门',
+      field: 'departmentCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '接口类型',
+      field: 'interfaceType',
+      dictType: DICT_TYPE.INTERFACE_TYPE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
       }
     },
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    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: 'businessType',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '备注',
+      field: 'remark',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+
+    {
+      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: 'code',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
-  {
-    label: '从仓库代码',
-    field: 'fromWarehouseCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '从库区类型范围',
-    field: 'fromAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '从库区代码范围',
-    field: 'fromAreaCodes',
-    dictType: DICT_TYPE.AREA_TYPE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '到仓库代码',
-    field: 'toWarehouseCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '到库区类型范围',
-    field: 'toAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '到库区代码范围',
-    field: 'toAreaCodes',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  // {
-  //   label: '使用在途库',
-  //   field: 'useOnTheWayLocation',
-  //   dictType: DICT_TYPE.TRUE_FALSE,
-  //   dictClass: 'string',
-  //   isTable: false,
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   form: {
-  //     component: 'Switch',
-  //     value: 'TRUE',
-  //     componentProps: {
-  //       inactiveValue: 'FALSE',
-  //       activeValue: 'TRUE'
-  //     }
-  //   }
-  // },
-  {
-    label: '是否可用',
-    field: 'available',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    },
+    {
+      label: '最后更新者',
+      field: 'updater',
+      isDetail: true,
+      isForm: false,
+      isTable: false,
+      table: {
+        width: 150
+      }
+    },
+    // {
+    //   label: '代码',
+    //   field: 'code',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    // },
+    {
+      label: '从仓库代码',
+      field: 'fromWarehouseCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '从库区类型范围',
+      field: 'fromAreaTypes',
+      dictType: DICT_TYPE.AREA_TYPE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      }
+    },
+    {
+      label: '从库区代码范围',
+      field: 'fromAreaCodes',
+      dictType: DICT_TYPE.AREA_TYPE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
       }
+    },
+    {
+      label: '到仓库代码',
+      field: 'toWarehouseCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '到库区类型范围',
+      field: 'toAreaTypes',
+      dictType: DICT_TYPE.AREA_TYPE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      }
+    },
+    {
+      label: '到库区代码范围',
+      field: 'toAreaCodes',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    // {
+    //   label: '使用在途库',
+    //   field: 'useOnTheWayLocation',
+    //   dictType: DICT_TYPE.TRUE_FALSE,
+    //   dictClass: 'string',
+    //   isTable: false,
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   form: {
+    //     component: 'Switch',
+    //     value: 'TRUE',
+    //     componentProps: {
+    //       inactiveValue: 'FALSE',
+    //       activeValue: 'TRUE'
+    //     }
+    //   }
+    // },
+    {
+      label: '是否可用',
+      field: 'available',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
+      }
+    },
+    {
+      label: '包装号', //  子表数据 只是为了展示
+      field: 'fromPackingNumber',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 6
+    },
+    {
+      label: '批次', //  子表数据 只是为了展示
+      field: 'fromBatch',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 5
     }
-  },
-  {
-    label: '包装号',   //  子表数据 只是为了展示
-    field: 'fromPackingNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:6,
-  },
-  {
-    label: '批次',     //  子表数据 只是为了展示
-    field: 'fromBatch',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:5,
-  },
-]))
+  ])
+)
 
 //表单校验
 export const IssueRecordMainRules = reactive({
-  requestNumber: [
-    { required: true, message: '请选择申请单号', trigger: 'change' }
-  ],
-  fromWarehouseCode: [
-    { required: true, message: '请选择从仓库代码', trigger: 'change' }
-  ],
-  fromAreaTypes: [
-    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
-  ],
-  toWarehouseCode: [
-    { required: true, message: '请选择到仓库代码', trigger: 'change' }
-  ],
-  toAreaTypes: [
-    { required: true, message: '请选择库位类型范围', trigger: 'change' }
-  ],
-  outTransaction: [
-    { required: true, message: '请输入出库事务类型', trigger: 'blur' }
-  ],
-  inTransaction: [
-    { required: true, message: '请输入入库事务类型', trigger: 'blur' }
-  ],
-  executeTime: [
-    { required: true, message: '请输入执行时间', trigger: 'change' }
-  ],
-  activeDate: [
-    { required: true, message: '请输入生效日期', trigger: 'change' }
-  ],
-  available: [
-    { required: true, message: '请输入是否可用', trigger: 'blur' }
-  ],
-  departmentCode: [
-    { required: true, message: '请输入部门', trigger: 'blur' }
-  ],
-  interfaceType: [
-    { required: true, message: '请选择接口类型', trigger: 'change' }
-  ],
-  number: [
-    { required: true, message: '请输入单据号', trigger: 'blur' }
-  ],
-  businessType: [
-    { required: true, message: '请输入业务类型', trigger: 'blur' }
-  ],
-  createTime: [
-    { required: true, message: '请输入创建时间', trigger: 'blur' }
-  ],
-  creator: [
-    { required: true, message: '请输入创建者', trigger: 'blur' }
-  ],
+  requestNumber: [{ required: true, message: '请选择申请单号', trigger: 'change' }],
+  fromWarehouseCode: [{ required: true, message: '请选择从仓库代码', trigger: 'change' }],
+  fromAreaTypes: [{ required: true, message: '请选择从库区类型范围', trigger: 'change' }],
+  toWarehouseCode: [{ required: true, message: '请选择到仓库代码', trigger: 'change' }],
+  toAreaTypes: [{ required: true, message: '请选择库位类型范围', trigger: 'change' }],
+  outTransaction: [{ required: true, message: '请输入出库事务类型', trigger: 'blur' }],
+  inTransaction: [{ required: true, message: '请输入入库事务类型', trigger: 'blur' }],
+  executeTime: [{ required: true, message: '请输入执行时间', trigger: 'change' }],
+  activeDate: [{ required: true, message: '请输入生效日期', trigger: 'change' }],
+  available: [{ required: true, message: '请输入是否可用', trigger: 'blur' }],
+  departmentCode: [{ required: true, message: '请输入部门', trigger: 'blur' }],
+  interfaceType: [{ required: true, message: '请选择接口类型', trigger: 'change' }],
+  number: [{ required: true, message: '请输入单据号', trigger: 'blur' }],
+  businessType: [{ required: true, message: '请输入业务类型', trigger: 'blur' }],
+  createTime: [{ required: true, message: '请输入创建时间', trigger: 'blur' }],
+  creator: [{ required: true, message: '请输入创建者', trigger: 'blur' }]
 })
 
 /**
  * @returns {Array} 发料记录子表
  */
-export const IssueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '从包装号',
-    field: 'fromPackingNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch: true,
-    hiddenInMain: true
-  },
-  {
-    label: '到包装号',
-    field: 'toPackingNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch: true,
-    hiddenInMain: true
-  },
-  {
-    label: '包装规格',
-    field: 'packUnit',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:8,
-  },
-  {
-    label: '包装数量',
-    field: 'packQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:8,
-  },
-  {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:9,
-  },
-  {
-    label: '从批次',
-    field: 'fromBatch',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortSearchDefault:3,
-    isSearch: true,
-    hiddenInMain: true
-  },
-  {
-    label: '到批次',
-    field: 'toBatch',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortSearchDefault:4,
-    isSearch: true,
-    hiddenInMain: true
-  },
-  {
-    label: '库存状态',
-    field: 'inventoryStatus',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '采购订单号',
-    field: 'poNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    sortTableDefault:2,
-  },
-  {
-    label: '订单行',
-    field: 'poLine',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    sortTableDefault:3,
-  },
-  {
-    label: '生产线代码',
-    field: 'productionLineCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false
-  },
-  {
-    label: '工位代码',
-    field: 'workStationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false
-  },
-  {
-    label: '在途库库位',
-    field: 'onTheWayLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false
-  },
-
-  {
-    label: '供应商代码',
-    field: 'supplierCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-  },
-  {
-    label: '从货主代码',
-    field: 'fromOwnerCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-  },
-  {
-    label: '从库位代码',
-    field: 'fromLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch: true,
-  },
-  {
-    label: '从库位组代码',
-    field: 'fromLocationGroupCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-  },
-  {
-    label: '从库区代码',
-    field: 'fromAreaCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-  },
-  {
-    label: '到货主代码',
-    field: 'toOwnerCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-  },
-  {
-    label: '到库位代码',
-    field: 'toLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch: true,
-  },
-  {
-    label: '到库位组代码',
-    field: 'toLocationGroupCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-  },
-
-  {
-    label: '到库区代码',
-    field: 'toAreaCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-  },
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    hiddenInMain:true,
+export const IssueRecordDetail = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '物料代码',
+      field: 'itemCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true,
+      sortSearchDefault: 2,
+      sortTableDefault: 4
+    },
+    {
+      label: '物料名称',
+      field: 'itemName',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 4
+    },
+    {
+      label: '数量',
+      field: 'qty',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true
+    },
+    {
+      label: '计量单位',
+      field: 'uom',
+      dictType: DICT_TYPE.UOM,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 9
+    },
+    {
+      label: '物料描述1',
+      field: 'itemDesc1',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true
+    },
+    {
+      label: '物料描述2',
+      field: 'itemDesc2',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true
+    },
+    {
+      label: '从包装号',
+      field: 'fromPackingNumber',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true,
+      hiddenInMain: true
+    },
+    {
+      label: '到包装号',
+      field: 'toPackingNumber',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true,
+      hiddenInMain: true
+    },
+    {
+      label: '包装规格',
+      field: 'packUnit',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 8
+    },
+    {
+      label: '包装数量',
+      field: 'packQty',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 8
+    },
 
-  },
-  {
-    label: '物料代码',
-    field: 'itemCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch: true,
-    sortSearchDefault:2,
-    sortTableDefault:4,
-  },
-  {
-    label: '物料名称',
-    field: 'itemName',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:4,
-  },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
+    {
+      label: '从批次',
+      field: 'fromBatch',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortSearchDefault: 3,
+      isSearch: true,
+      hiddenInMain: true
+    },
+    {
+      label: '到批次',
+      field: 'toBatch',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortSearchDefault: 4,
+      isSearch: true,
+      hiddenInMain: true
+    },
+    {
+      label: '库存状态',
+      field: 'inventoryStatus',
+      dictType: DICT_TYPE.INVENTORY_STATUS,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      }
+    },
+    // {
+    //   label: '采购订单号',
+    //   field: 'poNumber',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   hiddenInMain: true,
+    //   sortTableDefault: 2
+    // },
+    // {
+    //   label: '订单行',
+    //   field: 'poLine',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   hiddenInMain: true,
+    //   sortTableDefault: 3
+    // },
+    // {
+    //   label: '生产线代码',
+    //   field: 'productionLineCode',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   isTable: false
+    // },
+    // {
+    //   label: '工位代码',
+    //   field: 'workStationCode',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   isTable: false
+    // },
+    // {
+    //   label: '在途库库位',
+    //   field: 'onTheWayLocationCode',
+    //   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
-    },
-    hiddenInMain:true,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    // {
+    //   label: '供应商代码',
+    //   field: 'supplierCode',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   isTable: false
+    // },
+    {
+      label: '从货主代码',
+      field: 'fromOwnerCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true
+    },
+    {
+      label: '从库位代码',
+      field: 'fromLocationCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true
+    },
+    {
+      label: '从库位组代码',
+      field: 'fromLocationGroupCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true
+    },
+    {
+      label: '从库区代码',
+      field: 'fromAreaCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true
+    },
+    {
+      label: '到货主代码',
+      field: 'toOwnerCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true
+    },
+    {
+      label: '到库位代码',
+      field: 'toLocationCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true
+    },
+    {
+      label: '创建者',
+      field: 'creator',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: true,
+      isDetail: false
+    },
+    {
+      label: '创建时间',
+      field: 'createTime',
+      formatter: dateFormatter,
+      isDetail: false,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: true,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
     },
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-  },
-  {
-    label: '物料描述1',
-    field: 'itemDesc1',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-  },
-  {
-    label: '物料描述2',
-    field: 'itemDesc2',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-  },
-  {
-    label: '项目代码',
-    field: 'projectCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-  },
-  {
-    label: '数量',
-    field: 'qty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
+    {
+      label: '到库位组代码',
+      field: 'toLocationGroupCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true
+    },
+
+    {
+      label: '到库区代码',
+      field: 'toAreaCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true
+    },
+    // {
+    //   label: '单据号',
+    //   field: 'number',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 180
+    //   },
+    //   hiddenInMain: true
+    // },
+
+    // {
+    //   label: '备注',
+    //   field: 'remark',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   hiddenInMain: true
+    // },
+    // {
+    //   label: '创建时间',
+    //   field: 'createTime',
+    //   formatter: dateFormatter,
+    //   detail: {
+    //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    //   },
+    //   sort: 'custom',
+    //   table: {
+    //     width: 180
+    //   },
+    //   hiddenInMain: true,
+    //   form: {
+    //     component: 'DatePicker',
+    //     componentProps: {
+    //       type: 'datetime',
+    //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+    //       valueFormat: 'x'
+    //     }
+    //   }
+    // },
+    // {
+    //   label: '创建者',
+    //   field: 'creator',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   hiddenInMain: true
+    // },
+
+    // {
+    //   label: '项目代码',
+    //   field: 'projectCode',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   hiddenInMain: true
+    // },
 
-  },
-  {
-    label: '接口类型',
-    field: 'interfaceType',
-    dictType: DICT_TYPE.INTERFACE_TYPE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-  },
-  {
-    label: '从器具号',
-    field: 'fromContainerNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-  },
-  {
-    label: '到器具号',
-    field: 'toContainerNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-  },
+    // {
+    //   label: '接口类型',
+    //   field: 'interfaceType',
+    //   dictType: DICT_TYPE.INTERFACE_TYPE,
+    //   dictClass: 'string',
+    //   isTable: true,
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   hiddenInMain: true
+    // },
+    // {
+    //   label: '从器具号',
+    //   field: 'fromContainerNumber',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   hiddenInMain: true
+    // },
+    // {
+    //   label: '到器具号',
+    //   field: 'toContainerNumber',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   hiddenInMain: true
+    // }
 
-  // {
-  //   label: '代码',
-  //   field: 'code',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
+    // {
+    //   label: '代码',
+    //   field: 'code',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    // },
 
-  // {
-  //   label: '任务明细ID',
-  //   field: 'jobDetailId',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
-]))
+    // {
+    //   label: '任务明细ID',
+    //   field: 'jobDetailId',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    // },
+  ])
+)
 
 //表单校验
 export const IssueRecordDetailRules = reactive({
diff --git a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
index 26d259db7..022e7787d 100644
--- a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
+++ b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
@@ -1,6 +1,6 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
-import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
 
 import * as ProductionlineApi from '@/api/wms/productionline'
 import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data'
@@ -24,1044 +24,1072 @@ const { t } = useI18n() // 国际化
 
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
 const queryParams = {
-  pageSize:10,
-  pageNo:1,
-  code:'IssueRequest'
+  pageSize: 10,
+  pageNo: 1,
+  code: 'IssueRequest'
 }
- const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
- const requestsettingData =data?.list[0]||{}
+const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+const requestsettingData = data?.list[0] || {}
 
- // 获取当前操作人的部门
- import { useUserStore } from '@/store/modules/user'
- import { TableColumn } from '@/types/table'
- const userStore = useUserStore()
- const userDept = userStore.userSelfInfo.dept
- // id 转str 否则form回显匹配不到
- userDept.id = userDept.id.toString()
- const userDeptArray:any = [userDept]
+// 获取当前操作人的部门
+import { useUserStore } from '@/store/modules/user'
+import { TableColumn } from '@/types/table'
+const userStore = useUserStore()
+const userDept = userStore.userSelfInfo.dept
+// id 转str 否则form回显匹配不到
+userDept.id = userDept.id.toString()
+const userDeptArray: any = [userDept]
 
 /**
  * @returns {Array} 发料申请主表
  */
-export const IssueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 180,
-      fixed: 'left'
-    },
-    isForm: false,
-    isSearch: true,
-    sortSearchDefault:1,
-  },
-  {
-    label: '车间代码',
-    field: 'workshopCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        enterSearch:true,
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择车间代码', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '车间信息', // 查询弹窗标题
-        searchAllSchemas: Workshop.allSchemas, // 查询弹窗所需类
-        searchPage: WorkshopApi.getWorkshopPage, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
+export const IssueRequestMain = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '单据号',
+      field: 'number',
+      sort: 'custom',
+      table: {
+        width: 180,
+        fixed: 'left'
+      },
+      isForm: false,
+      isSearch: true,
+      sortSearchDefault: 1
+    },
+    {
+      label: '车间代码',
+      field: 'workshopCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择车间代码', // 输入框占位文本
+          searchField: 'code', // 查询弹窗赋值字段
+          searchTitle: '车间信息', // 查询弹窗标题
+          searchAllSchemas: Workshop.allSchemas, // 查询弹窗所需类
+          searchPage: WorkshopApi.getWorkshopPage, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            }
+          ]
+        }
       }
-    }
-  },
-  {
-    label: '生产线代码',
-    field: 'productionLineCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    hiddenInMain:true,
-    tableForm:{
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
-      searchField: 'code', // 查询弹窗赋值字段
-      searchTitle: '生产线信息', // 查询弹窗标题
-      searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
-      searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
-      searchCondition: [{
-        key:'workshopCode',
-        value:'workshopCode',
-        message: '请填写车间代码！',
-        isMainValue: true
-      },{
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
-      }]
     },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
+    {
+      label: '生产线代码',
+      field: 'productionLineCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      hiddenInMain: true,
+      tableForm: {
+        isInpuFocusShow: true,
         searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '生产线信息', // 查询弹窗标题
         searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
         searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key:'workshopCode',
-          value:'workshopCode',
-          message: '请填写车间代码！',
-          isMainValue: true
-        },{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
+        searchCondition: [
+          {
+            key: 'workshopCode',
+            value: 'workshopCode',
+            message: '请填写车间代码！',
+            isMainValue: true
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+        ]
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+          searchField: 'code', // 查询弹窗赋值字段
+          searchTitle: '生产线信息', // 查询弹窗标题
+          searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
+          searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'workshopCode',
+              value: 'workshopCode',
+              message: '请填写车间代码！',
+              isMainValue: true
+            },
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            }
+          ]
+        }
       }
-    }
-  },
-  {
-    label: '工位代码',
-    field: 'workStationCode',
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    isTable:false,
-    hiddenInMain:true,
-    tableForm:{
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择工位代码', // 输入框占位文本
-      searchField: 'code', // 查询弹窗赋值字段
-      searchTitle: '工位信息', // 查询弹窗标题
-      searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
-      searchPage: WorkstationApi.getWorkstationPage, // 查询弹窗所需分页方法
-      searchCondition: [{
-        key:'productionLineCode',
-        value:'productionLineCode',
-        message: '请填写生产线代码！',
-        isMainValue: true
-      },{
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
-      }]
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        enterSearch:true,
-        isSearchList: true, // 开启查询弹窗
+    {
+      label: '工位代码',
+      field: 'workStationCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      hiddenInMain: true,
+      tableForm: {
+        isInpuFocusShow: true,
         searchListPlaceholder: '请选择工位代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '工位信息', // 查询弹窗标题
         searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
         searchPage: WorkstationApi.getWorkstationPage, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key:'productionLineCode',
-          value:'productionLineCode',
-          message: '请填写生产线代码！',
-          isMainValue: true
-        },{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
-      }
-    }
-  },
-  {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.REQUEST_STATUS,
-    dictClass: 'string',
-    isForm:false,
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:1,
-    form: {
-      value: '1',
-      componentProps: {
-        disabled: true
+        searchCondition: [
+          {
+            key: 'productionLineCode',
+            value: 'productionLineCode',
+            message: '请填写生产线代码！',
+            isMainValue: true
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+        ]
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择工位代码', // 输入框占位文本
+          searchField: 'code', // 查询弹窗赋值字段
+          searchTitle: '工位信息', // 查询弹窗标题
+          searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
+          searchPage: WorkstationApi.getWorkstationPage, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'productionLineCode',
+              value: 'productionLineCode',
+              message: '请填写生产线代码！',
+              isMainValue: true
+            },
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            }
+          ]
+        }
       }
-    }
-  },
-  {
-    label: '申请时间',
-    field: 'requestTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
     },
-    isTable:false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '状态',
+      field: 'status',
+      dictType: DICT_TYPE.REQUEST_STATUS,
+      dictClass: 'string',
+      isForm: false,
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 1,
+      form: {
+        value: '1',
+        componentProps: {
+          disabled: true
+        }
       }
     },
-    isForm: false,
-  },
-  {
-    label: '截止时间',
-    field: 'dueTime',
-    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',
+    {
+      label: '申请时间',
+      field: 'requestTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      },
+      isForm: false
+    },
+    {
+      label: '截止时间',
+      field: 'dueTime',
+      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'
+        }
       }
     },
-  },
-  {
-    label: '从库区类型范围',
-    field: 'fromAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
-    dictClass: 'string',
-    isTable:false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false
-  },
-  {
-    label: '到库区类型范围',
-    field: 'toAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
-    dictClass: 'string',
-    isTable:false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false
-  },
-  {
-    label: '从库区代码范围',
-    field: 'fromAreaCodes',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    isForm: false
-  },
-  {
-    label: '到库区代码范围',
-    field: 'toAreaCodes',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    isForm: false
-  },
-  // {
-  //   label: '从仓库代码',
-  //   field: 'fromWarehouseCode',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   isTable:false,
-  //   form: {
-  //     // labelMessage: '信息提示说明！！！',
-  //     componentProps: {
-  //       isSearchList: true, // 开启查询弹窗
-  //       searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
-  //       searchField: 'code', // 查询弹窗赋值字段
-  //       searchTitle: '仓库信息', // 查询弹窗标题
-  //       searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
-  //       searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
-  //       searchCondition: [{
-  //         key: 'available',
-  //         value: 'TRUE',
-  //         isMainValue: false
-  //       }]
-  //     }
-  //   }
-  // },
-  // {
-  //   label: '到仓库代码',
-  //   field: 'toWarehouseCode',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   isTable:false,
-  //   form: {
-  //     componentProps: {
-  //       disabled: true
-  //     }
-  //   }
-  // },
-  {
-    label: '业务类型',
-    field: 'businessType',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    form: {
-      value: 'Issue',
-      componentProps: {
-        disabled: true
+    {
+      label: '从库区类型范围',
+      field: 'fromAreaTypes',
+      dictType: DICT_TYPE.AREA_TYPE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isForm: false
+    },
+    {
+      label: '到库区类型范围',
+      field: 'toAreaTypes',
+      dictType: DICT_TYPE.AREA_TYPE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isForm: false
+    },
+    {
+      label: '从库区代码范围',
+      field: 'fromAreaCodes',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      isForm: false
+    },
+    {
+      label: '到库区代码范围',
+      field: 'toAreaCodes',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      isForm: false
+    },
+    // {
+    //   label: '从仓库代码',
+    //   field: 'fromWarehouseCode',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   isTable:false,
+    //   form: {
+    //     // labelMessage: '信息提示说明！！！',
+    //     componentProps: {
+    //       isSearchList: true, // 开启查询弹窗
+    //       searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+    //       searchField: 'code', // 查询弹窗赋值字段
+    //       searchTitle: '仓库信息', // 查询弹窗标题
+    //       searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
+    //       searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
+    //       searchCondition: [{
+    //         key: 'available',
+    //         value: 'TRUE',
+    //         isMainValue: false
+    //       }]
+    //     }
+    //   }
+    // },
+    // {
+    //   label: '到仓库代码',
+    //   field: 'toWarehouseCode',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   isTable:false,
+    //   form: {
+    //     componentProps: {
+    //       disabled: true
+    //     }
+    //   }
+    // },
+    {
+      label: '业务类型',
+      field: 'businessType',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      form: {
+        value: 'Issue',
+        componentProps: {
+          disabled: true
+        }
+      },
+      isForm: false
+    },
+    {
+      label: '部门',
+      field: 'departmentCode',
+      sort: 'custom',
+      isForm: false,
+      table: {
+        width: 150
+      },
+      isTable: false,
+      formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+        return userDeptArray.find((account) => account.id == cellValue)?.name
+      },
+      form: {
+        value: userDept.id,
+        component: 'Select',
+        api: () => userDeptArray,
+        componentProps: {
+          disabled: true,
+          optionsAlias: {
+            labelField: 'name',
+            valueField: 'id'
+          }
+        }
       }
     },
-    isForm: false
-  },
-  {
-    label: '部门',
-    field: 'departmentCode',
-    sort: 'custom',
-    isForm:false,
-    table: {
-      width: 150
-    },
-    isTable:false,
-    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-      return userDeptArray.find((account) => account.id == cellValue)?.name
-    },
-    form: {
-      value: userDept.id,
-      component: 'Select',
-      api: () => userDeptArray,
-      componentProps: {
-        disabled: true,
-        optionsAlias: {
-          labelField: 'name',
-          valueField: 'id'
+    {
+      label: '备注',
+      field: 'remark',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    // {
+    //   label: '使用在途库',
+    //   field: 'useOnTheWayLocation',
+    //   dictType: DICT_TYPE.TRUE_FALSE,
+    //   dictClass: 'string',
+    //   isTable:false,
+    //   isForm:false,
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   form: {
+    //     component: 'Switch',
+    //     value: 'TRUE',
+    //     componentProps: {
+    //       inactiveValue: 'FALSE',
+    //       activeValue: 'TRUE'
+    //     }
+    //   }
+    // },
+    {
+      label: '自动提交',
+      field: 'autoCommit',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      isForm: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: requestsettingData.autoCommit,
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE',
+          disabled: true
         }
       }
-    }
-  },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  // {
-  //   label: '使用在途库',
-  //   field: 'useOnTheWayLocation',
-  //   dictType: DICT_TYPE.TRUE_FALSE,
-  //   dictClass: 'string',
-  //   isTable:false,
-  //   isForm:false,
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   form: {
-  //     component: 'Switch',
-  //     value: 'TRUE',
-  //     componentProps: {
-  //       inactiveValue: 'FALSE',
-  //       activeValue: 'TRUE'
-  //     }
-  //   }
-  // },
-  {
-    label: '自动提交',
-    field: 'autoCommit',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable:false,
-    isForm:false,
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.autoCommit,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true
+    {
+      label: '自动通过',
+      field: 'autoAgree',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isForm: false,
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: requestsettingData.autoAgree,
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE',
+          disabled: true
+        }
       }
-    }
-  },
-  {
-    label: '自动通过',
-    field: 'autoAgree',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isForm:false,
-    isTable:false,
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.autoAgree,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true
+    {
+      label: '自动执行',
+      field: 'autoExecute',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isForm: false,
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: requestsettingData.autoExecute,
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE',
+          disabled: true
+        }
       }
-    }
-  },
-  {
-    label: '自动执行',
-    field: 'autoExecute',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isForm:false,
-    isTable:false,
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.autoExecute,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true
+    {
+      label: '直接生成记录',
+      field: 'directCreateRecord',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isForm: false,
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: requestsettingData.directCreateRecord,
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE',
+          disabled: true
+        }
       }
-    }
-  },
-  {
-    label: '直接生成记录',
-    field: 'directCreateRecord',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isForm: false,
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.directCreateRecord,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true
+    {
+      label: '创建时间',
+      field: 'createTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: true,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      },
+      isForm: false
+    },
+    {
+      label: '创建者',
+      field: 'creator',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: true,
+      isForm: false
+    },
+    {
+      label: '最后更新时间',
+      field: 'updateTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      },
+      isForm: false
+    },
+    {
+      label: '最后更新者',
+      field: 'updater',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      isForm: false
+    },
+    {
+      label: '操作',
+      field: 'action',
+      isDetail: false,
+      isForm: false,
+      table: {
+        width: 230,
+        fixed: 'right'
       }
     }
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable:true,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-    isForm: false,
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:true,
-    isForm: false,
-  },
-  {
-    label: '最后更新时间',
-    field: 'updateTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable:false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-    isForm: false,
-  },
-  {
-    label: '最后更新者',
-    field: 'updater',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    isForm: false,
-  },
-  {
-    label: '操作',
-    field: 'action',
-    isDetail: false,
-    isForm: false,
-    table: {
-      width: 230,
-      fixed: 'right'
-    },
-  },
-]))
+  ])
+)
 
 export const IssueRequestMainRules = reactive({
-  workshopCode: [
-    { required: true, message: '请选择车间代码', trigger: 'change' }
-  ],
-  productionLineCode: [
-    { required: true, message: '请选择生产线代码', trigger: 'change' }
-  ],
+  workshopCode: [{ required: true, message: '请选择车间代码', trigger: 'change' }],
+  productionLineCode: [{ required: true, message: '请选择生产线代码', trigger: 'change' }],
   // fromWarehouseCode: [
   //   { required: true, message: '请选择从仓库代码', trigger: 'change' }
   // ],
   // dueTime: [
   //   { required: true, message: '请选择截止时间', trigger: 'change' }
   // ],
-  remark:  [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
-  ],
+  remark: [{ max: 50, message: '不得超过50个字符', trigger: 'blur' }]
 })
 
 /**
  * @returns {Array} 发料申请子表
  */
-export const IssueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
-  // {
-  //   label: '生产线代码',
-  //   field: 'productionLineCode',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   isTable:false,
-  //   hiddenInMain:true,
-  //   tableForm:{
-  //     isInpuFocusShow: true,
-  //     searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
-  //     searchField: 'code', // 查询弹窗赋值字段
-  //     searchTitle: '生产线信息', // 查询弹窗标题
-  //     searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
-  //     searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
-  //     searchCondition: [{
-  //       key:'workshopCode',
-  //       value:'workshopCode',
-  //       message: '请填写车间代码！',
-  //       isMainValue: true
-  //     },{
-  //       key: 'available',
-  //       value: 'TRUE',
-  //       isMainValue: false
-  //     }]
-  //   },
-  //   form: {
-  //     // labelMessage: '信息提示说明！！！',
-  //     componentProps: {
-  //       isSearchList: true, // 开启查询弹窗
-  //       searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
-  //       searchField: 'code', // 查询弹窗赋值字段
-  //       searchTitle: '生产线信息', // 查询弹窗标题
-  //       searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
-  //       searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
-  //       searchCondition: [{
-  //         key:'workshopCode',
-  //         value:'workshopCode',
-  //         message: '请填写车间代码！',
-  //         isMainValue: true
-  //       },{
-  //         key: 'available',
-  //         value: 'TRUE',
-  //         isMainValue: false
-  //       }]
-  //     }
-  //   }
-  // },
-  // {
-  //   label: '工位代码',
-  //   field: 'workStationCode',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   isTable:false,
-  //   hiddenInMain:true,
-  //   tableForm:{
-  //     isInpuFocusShow: true,
-  //     searchListPlaceholder: '请选择工位代码', // 输入框占位文本
-  //     searchField: 'code', // 查询弹窗赋值字段
-  //     searchTitle: '工位信息', // 查询弹窗标题
-  //     searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
-  //     searchPage: WorkstationApi.getWorkstationPage, // 查询弹窗所需分页方法
-  //     searchCondition: [{
-  //       key:'productionLineCode',
-  //       value:'productionLineCode',
-  //       message: '请填写生产线代码！',
-  //       isMainValue: true
-  //     },{
-  //       key: 'available',
-  //       value: 'TRUE',
-  //       isMainValue: false
-  //     }]
-  //   },
-  //   form: {
-  //     // labelMessage: '信息提示说明！！！',
-  //     componentProps: {
-  //       isSearchList: true, // 开启查询弹窗
-  //       searchListPlaceholder: '请选择工位代码', // 输入框占位文本
-  //       searchField: 'code', // 查询弹窗赋值字段
-  //       searchTitle: '工位信息', // 查询弹窗标题
-  //       searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
-  //       searchPage: WorkstationApi.getWorkstationPage, // 查询弹窗所需分页方法
-  //       searchCondition: [{
-  //         key:'productionLineCode',
-  //         value:'productionLineCode',
-  //         message: '请填写生产线代码！',
-  //         isMainValue: true
-  //       },{
-  //         key: 'available',
-  //         value: 'TRUE',
-  //         isMainValue: false
-  //       }]
-  //     }
-  //   }
-  // },
-  {
-    label: '包装号',
-    field: 'packingNumber',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable:false,
-    isSearch: false,
-    sortSearchDefault:4,
-    sortTableDefault:6,
-    isTableForm: false,
-    isForm: false,
-  },
-  {
-    label: '器具号',
-    field: 'containerNumber',
-    sort: 'custom',
-    table: {
-      width: 150
+export const IssueRequestDetail = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    // {
+    //   label: '生产线代码',
+    //   field: 'productionLineCode',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   isTable:false,
+    //   hiddenInMain:true,
+    //   tableForm:{
+    //     isInpuFocusShow: true,
+    //     searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+    //     searchField: 'code', // 查询弹窗赋值字段
+    //     searchTitle: '生产线信息', // 查询弹窗标题
+    //     searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
+    //     searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
+    //     searchCondition: [{
+    //       key:'workshopCode',
+    //       value:'workshopCode',
+    //       message: '请填写车间代码！',
+    //       isMainValue: true
+    //     },{
+    //       key: 'available',
+    //       value: 'TRUE',
+    //       isMainValue: false
+    //     }]
+    //   },
+    //   form: {
+    //     // labelMessage: '信息提示说明！！！',
+    //     componentProps: {
+    //       isSearchList: true, // 开启查询弹窗
+    //       searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+    //       searchField: 'code', // 查询弹窗赋值字段
+    //       searchTitle: '生产线信息', // 查询弹窗标题
+    //       searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
+    //       searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
+    //       searchCondition: [{
+    //         key:'workshopCode',
+    //         value:'workshopCode',
+    //         message: '请填写车间代码！',
+    //         isMainValue: true
+    //       },{
+    //         key: 'available',
+    //         value: 'TRUE',
+    //         isMainValue: false
+    //       }]
+    //     }
+    //   }
+    // },
+    // {
+    //   label: '工位代码',
+    //   field: 'workStationCode',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   isTable:false,
+    //   hiddenInMain:true,
+    //   tableForm:{
+    //     isInpuFocusShow: true,
+    //     searchListPlaceholder: '请选择工位代码', // 输入框占位文本
+    //     searchField: 'code', // 查询弹窗赋值字段
+    //     searchTitle: '工位信息', // 查询弹窗标题
+    //     searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
+    //     searchPage: WorkstationApi.getWorkstationPage, // 查询弹窗所需分页方法
+    //     searchCondition: [{
+    //       key:'productionLineCode',
+    //       value:'productionLineCode',
+    //       message: '请填写生产线代码！',
+    //       isMainValue: true
+    //     },{
+    //       key: 'available',
+    //       value: 'TRUE',
+    //       isMainValue: false
+    //     }]
+    //   },
+    //   form: {
+    //     // labelMessage: '信息提示说明！！！',
+    //     componentProps: {
+    //       isSearchList: true, // 开启查询弹窗
+    //       searchListPlaceholder: '请选择工位代码', // 输入框占位文本
+    //       searchField: 'code', // 查询弹窗赋值字段
+    //       searchTitle: '工位信息', // 查询弹窗标题
+    //       searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
+    //       searchPage: WorkstationApi.getWorkstationPage, // 查询弹窗所需分页方法
+    //       searchCondition: [{
+    //         key:'productionLineCode',
+    //         value:'productionLineCode',
+    //         message: '请填写生产线代码！',
+    //         isMainValue: true
+    //       },{
+    //         key: 'available',
+    //         value: 'TRUE',
+    //         isMainValue: false
+    //       }]
+    //     }
+    //   }
+    // },
+    {
+      label: '包装号',
+      field: 'packingNumber',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      isSearch: false,
+      sortSearchDefault: 4,
+      sortTableDefault: 6,
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '器具号',
+      field: 'containerNumber',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true,
+      isTableForm: false,
+      isForm: false,
+      isTable: false
+    },
+    {
+      label: '批次',
+      field: 'batch',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      isSearch: false,
+      sortTableDefault: 5,
+      sortSearchDefault: 3,
+      isTableForm: false,
+      isForm: false
     },
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false,
-    isTable: false,
 
-  },
-  {
-    label: '批次',
-    field: 'batch',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    isSearch: false,
-    sortTableDefault:5,
-    sortSearchDefault:3,
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '库存状态',
-    field: 'inventoryStatus',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false
-  },
-  // {
-  //   label: '从库位代码',
-  //   field: 'fromLocationCode',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   isSearch: true,
-  //   hiddenInMain:true,
-  //   sortSearchDefault:6,
-  // },
-  {
-    label: '到库位代码',
-    field: 'toLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch: false,
-    isTable:false,
-    sortSearchDefault:6,
-    sortTableDefault:1100,
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '物料代码',
-    field: 'itemCode',
-    sort: 'custom',
-    table: {
-      width: 250
-    },
-    isSearch:true,
-    sortSearchDefault:2,
-    sortTableDefault:3,
-    tableForm:{
-      multiple: true,
-      enterSearch:true,
-      isInpuFocusShow: true,
-      isSearchList: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择物料代码', // 输入框占位文本
-      searchField: 'code', // 查询弹窗赋值字段
-      searchTitle: '物料信息', // 查询弹窗标题
-      searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
-      searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
-      searchCondition: [{
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
+    // {
+    //   label: '从库位代码',
+    //   field: 'fromLocationCode',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   isSearch: true,
+    //   hiddenInMain:true,
+    //   sortSearchDefault:6,
+    // },
+    {
+      label: '到库位代码',
+      field: 'toLocationCode',
+      sort: 'custom',
+      table: {
+        width: 150
       },
-      // ,{
-      //   key:'productionLineCode',
-      //   value:'productionLineCode',
-      //   message: '请填写生产线代码！',
-      //   isMainValue: true
-      // },
-      {
-        key: 'businessTypeCode',
-        value: 'Issue',
-        isMainValue: false
-      }
-    ]
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
+      isSearch: false,
+      isTable: false,
+      sortSearchDefault: 6,
+      sortTableDefault: 1100,
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '物料代码',
+      field: 'itemCode',
+      sort: 'custom',
+      table: {
+        width: 250
+      },
+      isSearch: true,
+      sortSearchDefault: 2,
+      sortTableDefault: 3,
+      tableForm: {
+        multiple: true,
+        enterSearch: true,
+        isInpuFocusShow: true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择物料代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '物料信息', // 查询弹窗标题
         searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
         searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
+        searchCondition: [
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          },
+          // ,{
+          //   key:'productionLineCode',
+          //   value:'productionLineCode',
+          //   message: '请填写生产线代码！',
+          //   isMainValue: true
+          // },
+          {
+            key: 'businessTypeCode',
+            value: 'Issue',
+            isMainValue: false
+          }
+        ]
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+          searchField: 'code', // 查询弹窗赋值字段
+          searchTitle: '物料信息', // 查询弹窗标题
+          searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
+          searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            }
+          ]
+        }
       }
-    }
-  },
-  {
-    label: '数量',
-    field: 'qty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    tableForm: {
-      type: 'InputNumber',
-      min: 0,
-      precision: 6
     },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
+    {
+      label: '物料名称',
+      field: 'itemName',
+      sort: 'custom',
+      table: {
+        width: 300
+      },
+      sortTableDefault: 4,
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '数量',
+      field: 'qty',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true,
+      tableForm: {
+        type: 'InputNumber',
         min: 0,
         precision: 6
+      },
+      form: {
+        component: 'InputNumber',
+        componentProps: {
+          min: 0,
+          precision: 6
+        }
       }
-    }
-  },
-
-  {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:9,
-    tableForm:{
-      type: 'Select',
-      disabled: true
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
-  // {
-  //   label: '采购订单号',
-  //   field: 'poNumber',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   hiddenInMain:true,
-  //   sortTableDefault:1,
-  // },
-  // {
-  //   label: '订单行',
-  //   field: 'poLine',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   hiddenInMain:true,
-  //   sortTableDefault:2,
-  // },
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 180
     },
-    isTableForm: false,
-    hiddenInMain:true,
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
 
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '计量单位',
+      field: 'uom',
+      dictType: DICT_TYPE.UOM,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 6,
+      tableForm: {
+        type: 'Select',
+        disabled: true
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
       }
     },
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    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: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '库存状态',
+      field: 'inventoryStatus',
+      dictType: DICT_TYPE.INVENTORY_STATUS,
+      dictClass: 'string',
+      sortTableDefault: 7,
+      isTable: true,
+      isDetail: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '物料描述1',
+      field: 'itemDesc1',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true,
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '物料描述2',
+      field: 'itemDesc2',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true,
+      isTableForm: false,
+      isForm: false
+    },
+    // {
+    //   label: '采购订单号',
+    //   field: 'poNumber',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   hiddenInMain:true,
+    //   sortTableDefault:1,
+    // },
+    // {
+    //   label: '订单行',
+    //   field: 'poLine',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   hiddenInMain:true,
+    //   sortTableDefault:2,
+    // },
+    {
+      label: '单据号',
+      field: 'number',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTableForm: false,
+      hiddenInMain: true,
+      form: {
+        componentProps: {
+          disabled: true
+        }
       }
     },
-    isTable:false,
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false,
-  },
-  {
-    label: '最后更新者',
-    field: 'updater',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '物料名称',
-    field: 'itemName',
-    sort: 'custom',
-    table: {
-      width: 300
-    },
-    sortTableDefault:4,
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '物料描述1',
-    field: 'itemDesc1',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '物料描述2',
-    field: 'itemDesc2',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '项目代码',
-    field: 'projectCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false
-  },
-  
-  {
-    label: '从货主代码',
-    field: 'fromOwnerCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '到货主代码',
-    field: 'toOwnerCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '未执行任务数量',
-    field: 'unexecutedQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
+    {
+      label: '数量',
+      field: 'qty',
+      sort: 'custom',
+      table: {
+        width: 300
+      },
+      sortTableDefault: 5,
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '未执行任务数量',
+      field: 'unexecutedQty',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'InputNumber'
+      },
+      isTableForm: false,
+      hiddenInMain: true
+    },
+    // {
+    //   label: '备注',
+    //   field: 'remark',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   hiddenInMain: true
+    // },
+    {
+      label: '创建者',
+      field: 'creator',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true,
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '创建时间',
+      field: 'createTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      },
+      hiddenInMain: true,
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '项目代码',
+      field: 'projectCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true,
+      isTableForm: false,
+      isForm: false
     },
-    isTableForm:false,
-    hiddenInMain:true,
-  },
-  {
-    label: '操作',
-    field: 'action',
-    hiddenInMain:true,
-    isDetail: false,
-    isForm: false ,
-    table: {
-      width: 200,
-      fixed: 'right'
+
+    {
+      label: '从货主',
+      field: 'fromOwnerCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true,
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '到货主',
+      field: 'toOwnerCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true,
+      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: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      },
+      isTable: false,
+      hiddenInMain: true,
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '最后更新者',
+      field: 'updater',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      hiddenInMain: true,
+      isTableForm: false,
+      isForm: false
     },
-    isTableForm:false,
-  }
-]))
+
+    {
+      label: '操作',
+      field: 'action',
+      hiddenInMain: true,
+      isDetail: false,
+      isForm: false,
+      table: {
+        width: 200,
+        fixed: 'right'
+      },
+      isTableForm: false
+    }
+  ])
+)
 
 //表单校验
 export const IssueRequestDetailRules = reactive({

From e8c72eb7c9f66f9fa1c6e27334839fe46ac65a23 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 11 Jul 2024 16:24:46 +0800
Subject: [PATCH 351/408] =?UTF-8?q?=E7=89=A9=E6=96=99=E9=99=8D=E7=BA=A7?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../relegate/relegateRequest/relegateRequestMain.data.ts       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
index 9111450eb..64ce34152 100644
--- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
@@ -319,8 +319,9 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     tableForm:{
+      disabled:true,
       multiple:true,
-      isInpuFocusShow: true,
+      // isInpuFocusShow: true,
       searchListPlaceholder: '请选择物料代码', // 输入框占位文本
       searchField: 'itemCode', // 查询弹窗赋值字段
       searchTitle: '库存余额信息', // 查询弹窗标题

From 4e82ffa7acf948de546d2d811342b6addfb05af2 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 11 Jul 2024 16:41:20 +0800
Subject: [PATCH 352/408] =?UTF-8?q?=E6=97=A5=E7=A8=8B=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliver/purchasePlanMain/index.vue       |  6 +++++-
 .../purchasePlanMain/purchasePlanMain.data.ts        | 12 ++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index 1e234687a..bb9d87c5d 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@@ -78,7 +78,7 @@
     fieldTableColumn="poLine"
 
   />
-
+  采购订单信息
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/wms/purchase-plan-main/import" :importTemplateData="importTemplateData"
     @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
@@ -689,6 +689,10 @@ const handleSelectionPublish = async ()=>{
     if('supplierCode'==field){
       //供应商代码
       formRef.value.opensearchTable('poNumber', 'number', '采购订单信息', PurchaseMain.allSchemas, PurchaseMainApi.getPurchaseMainPage,[{
+          key: 'type',
+          value: 'SCHEDULE',
+          isMainValue: false
+        },{
           key: 'available',
           value: 'TRUE',
           isMainValue: false
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
index b77397b3b..2f5c2006f 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: '采购订单信息3',
+        searchTitle: '采购订单信息',
         searchAllSchemas: PurchaseMain.allSchemas,
         searchPage: PurchaseMainApi.getPurchaseMainPage,
         searchCondition: [{
@@ -520,7 +520,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
         isSearchList: true,
         searchListPlaceholder: '请选择采购订单',
         searchField: 'number',
-        searchTitle: '采购订单信息5',
+        searchTitle: '采购订单信息',
         searchAllSchemas: PurchaseMain.allSchemas,
         searchPage: PurchaseMainApi.getPurchaseMainPage,
         searchCondition: [{
@@ -554,7 +554,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
       isInpuFocusShow: false,
       searchListPlaceholder: '请选择订单号',
       searchField: 'number',
-      searchTitle: '采购订单信息4',
+      searchTitle: '采购订单信息',
       searchAllSchemas: PurchaseMain.allSchemas,
       searchPage: PurchaseMainApi.getPurchaseMainPage,
       searchCondition: [{
@@ -580,7 +580,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
         isSearchList: false,
         searchListPlaceholder: '请选择订单号',
         searchField: 'number',
-        searchTitle: '采购订单信息6',
+        searchTitle: '采购订单信息',
         searchAllSchemas: PurchaseMain.allSchemas,
         searchPage: PurchaseMainApi.getPurchaseMainPage,
         searchCondition: [{
@@ -635,7 +635,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
         isSearchList: false,
         searchListPlaceholder: '请选择订单行',
         searchField: 'lineNumber',
-        searchTitle: '采购订单信息2',
+        searchTitle: '采购订单信息',
         searchAllSchemas: PurchaseDetail.allSchemas,
         searchPage: PurchaseDetailApi.getPurchaseDetailPagePoNumber,
         searchCondition: [{
@@ -656,7 +656,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
       isInpuFocusShow: false,
       searchListPlaceholder: '请选择订单行',
       searchField: 'lineNumber',
-      searchTitle: '采购订单信息1',
+      searchTitle: '采购订单信息',
       searchAllSchemas: PurchaseDetail.allSchemas,
       searchPage: PurchaseDetailApi.getPurchaseDetailPagePoNumber,
       searchCondition: [{

From ca2f31534ddf1a67f6fe05a304a1b5a1911f1e8b Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 11 Jul 2024 16:44:08 +0800
Subject: [PATCH 353/408] =?UTF-8?q?=E8=B4=A7=E8=BF=90=E5=8D=95=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoiceRecordMain.data.ts             | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
index a73fe67a4..3a1513866 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
@@ -82,6 +82,21 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  //子表数据，仅是查询条件
+  {
+    label: '货运单号',
+    field: 'asnBillNum',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isTableForm:false,
+    isTable:false,
+    isDetail:false,
+    isSearch: true,
+    isForm: false,
+  },
   // {
   //   label: '申请单号',
   //   field: 'requestNumber',

From f14319229aa36fde9bfbb944fa6ac0f2007d3a7d Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 11 Jul 2024 16:45:30 +0800
Subject: [PATCH 354/408] =?UTF-8?q?=E6=8D=A2=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoiceRecordMain.data.ts         | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
index 3a1513866..99aeb5367 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
@@ -82,21 +82,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  //子表数据，仅是查询条件
-  {
-    label: '货运单号',
-    field: 'asnBillNum',
-    sort: 'custom',
-    table: {
-      width: 180,
-      fixed: 'left'
-    },
-    isTableForm:false,
-    isTable:false,
-    isDetail:false,
-    isSearch: true,
-    isForm: false,
-  },
+  
   // {
   //   label: '申请单号',
   //   field: 'requestNumber',
@@ -449,6 +435,21 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
+  //子表数据，仅是查询条件
+  {
+    label: '货运单号',
+    field: 'asnBillNum',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isTableForm:false,
+    isTable:false,
+    isDetail:false,
+    isSearch: true,
+    isForm: false,
+  },
   {
     label: '财务凭证号',
     field: 'voucherNumber',

From d10c3215a02c9b36748a361639fca43a6d6d12eb Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 11 Jul 2024 16:52:05 +0800
Subject: [PATCH 355/408] =?UTF-8?q?=E6=89=98=E8=A7=84=E6=A0=BC=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliverRequestMain/index.vue      | 98 +++++++++----------
 1 file changed, 49 insertions(+), 49 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 85b694f7a..f80b4e3e1 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -154,7 +154,6 @@
     :footButttondata="footButttondata"
     @footButtonClick="footButtonClick"
     @formSelectChange="formSelectChangeLabel"
-    @visibleChange='visibleChange'
   />
   <!-- 上传质量报告 -->
   <BasicForm
@@ -607,7 +606,7 @@ const buttonTableClick = async (val, row) => {
             }
             genLabelId.value = row.masterId
             // await getDetailList()
-            await  getGenerateLabelList(row)
+            await getGenerateLabelList(row)
             formLabelRef.value.open('create', row, null, 'createLabel') //创建标签页面 createLabel 标题
           }
         })
@@ -628,27 +627,33 @@ const footButttondata = ref([
   defaultButtons.formCloseBtn(null) // BOM关闭
 ])
 // 获取箱规格
-const getGenerateLabelList=async(row)=>{
+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
-        } 
-        item.secondPackUnit= ''
-        item.secondPackQty = ''
-      })
+    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
+      item.secondPackUnitInitOptions = item.palletPackaging || []
+      let obj = item?.boxPackaging[0]
+      if (obj) {
+        item.packUnit = obj.packUnit
+        item.packQty = obj.packQty
+      }
+      // 有托规格显示托规格，没有显示第一条规格
+      item.secondPackUnit = obj.parentPackUnit
+        ? obj.parentPackUnit
+        : item?.secondPackUnitInitOptions[0]?.packUnit
+      item.secondPackQty = obj.parentPackUnit
+        ? obj.parentPackQty
+        : item?.secondPackUnitInitOptions[0]?.packQty
     })
+  })
 }
 // 下一步
 const labelFormRef = ref()
@@ -658,12 +663,12 @@ const footButtonClick = async (val) => {
     if (!validateForm) {
       return
     }
-    let isNext = detatableData1.value.some((item)=>{
-      return !item.packUnit  || !item.packQty
+    let isNext = detatableData1.value.some((item) => {
+      return !item.packUnit || !item.packQty
     })
-    if(isNext){
+    if (isNext) {
       message.warning('有数据没有选择箱规格')
-      return;
+      return
     }
     const data = JSON.parse(JSON.stringify(detatableData1.value))
     labelFormRef.value.openLabel(data)
@@ -677,12 +682,25 @@ const formSelectChangeLabel = (field, val, row) => {
     let obj = row.boxPackaging.find((item) => item.packUnit == val)
     if (obj) {
       row.packQty = obj.packQty
+      // 获取托规格
+      const params1 = {
+        itemCode: row.itemCode,
+        packUnit: row.packUnit
+      }
+      SupplierdeliverRequestDetailApi.getGenerateLabelParentList(params1).then((res) => {
+        if (res?.length > 0) {
+          row.secondPackUnit = res[0].packUnit
+          row.secondPackQty = res[0].packQty
+        } else {
+          row.secondPackUnit = row?.secondPackUnitInitOptions[0]?.packUnit
+          row.secondPackQty = row?.secondPackUnitInitOptions[0]?.packQty
+        }
+      })
     } else {
       row.packQty = ''
+      row.secondPackUnit = ''
+      row.secondPackQty = ''
     }
-    row.secondPackUnit = ''
-    row.secondPackQty = ''
-   
   }
   // 设置托
   if (field == 'secondPackUnit') {
@@ -694,23 +712,7 @@ const formSelectChangeLabel = (field, val, row) => {
     }
   }
 }
-// tableForm下拉框弹出隐藏
-const visibleChange=(field, val, row, index)=>{
-  row.secondPackUnitInitOptions=[]
-  if(field=='secondPackUnit'){
-    if(val){
-  // 获取托规格
-    const params1 = {
-      itemCode: row.itemCode,
-      packUnit: row.packUnit
-    }
-    SupplierdeliverRequestDetailApi.getGenerateLabelParentList(params1).then((res) => {
-      row.secondPackUnitInitOptions  = res
-    })
-    }
-  }
 
-}
 
 // 获取部门 用于详情 部门回显
 const { wsCache } = useCache()
@@ -1000,10 +1002,9 @@ const { getList: getDetailList } = detatableMethods
 // 生成标签按钮操作
 const submitFormLabel = async (list) => {
   try {
-    
-   let data = {
-    subList:list
-   }
+    let data = {
+      subList: list
+    }
     await message.confirm(t('ts.是否为此数据生成标签？'))
     labelFormRef.value.isLoading = true
     await SupplierdeliverRequestMainApi.genLabel(data)
@@ -1016,7 +1017,6 @@ const submitFormLabel = async (list) => {
     labelFormRef.value.formLoading = false
     labelFormRef.value.dialogTableVisible = false
     labelFormRef.value.isLoading = false
-    
   }
 }
 const clearInput = async (field, row, index) => {

From 61c6309855627077ab402652b1852226edaa9cee Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Thu, 11 Jul 2024 16:53:40 +0800
Subject: [PATCH 356/408] =?UTF-8?q?WMS=20=E2=80=94=E2=80=94>=20bug=20=20?=
 =?UTF-8?q?=E5=8C=85=E8=A3=85=E8=A7=84=E6=A0=BC=E4=B8=AD=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E7=88=B6=E5=8C=85=E8=A3=85=E5=90=8E=EF=BC=8C=E5=BA=94=E8=AF=A5?=
 =?UTF-8?q?=E5=B8=A6=E5=87=BA=E5=8C=85=E8=A3=85=E7=B1=BB=E5=9E=8B=E4=B8=94?=
 =?UTF-8?q?=E4=B8=8D=E5=8F=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../itemManage/packageunit/index.vue                | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/views/wms/basicDataManage/itemManage/packageunit/index.vue b/src/views/wms/basicDataManage/itemManage/packageunit/index.vue
index 1e2341a23..a648c1948 100644
--- a/src/views/wms/basicDataManage/itemManage/packageunit/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/packageunit/index.vue
@@ -80,11 +80,10 @@ const tableColumns = ref(Packageunit.allSchemas.tableColumns)
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
   nextTick(() => {
-    // if(val[0].parentCode){
-    //   message.error('该规格为子包装，请重新选择')
-    //   return
-    // }
     const setV = {}
+    if(formField == 'parentCode'){
+      setV['type'] = val[0]['type']
+    }
     setV[formField] = val[0][searchField]
     formRef.setValues(setV)
   })
@@ -178,6 +177,9 @@ const openForm = (type: string, row?: any) => {
             if (item.field == 'manageBalance') {
               item.componentProps.disabled = true
             }
+            if (item.field == 'type') {
+              item.componentProps.disabled = false
+            }
           })       
   }else {
     Packageunit.allSchemas.formSchema.forEach((item) => {
@@ -190,6 +192,9 @@ const openForm = (type: string, row?: any) => {
       if (item.field == 'manageBalance') {
         item.componentProps.disabled = false
       }
+      if (item.field == 'type') {
+        item.componentProps.disabled = true
+      }
     })  
   }
   basicFormRef.value.open(type, row)

From 43fd5a23271685c08379f7bf2207a7af18df45fd Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Thu, 11 Jul 2024 17:22:56 +0800
Subject: [PATCH 357/408] =?UTF-8?q?WMS:=20=E2=80=94=E2=80=94>=20bug=20=20?=
 =?UTF-8?q?=E5=8F=91=E8=B4=A7=E8=AE=B0=E5=BD=95=E5=8C=85=E8=A3=85=E8=A7=84?=
 =?UTF-8?q?=E6=A0=BC=E6=B2=A1=E6=9C=89=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deliver/deliverRecordMain/deliverRecordMain.data.ts       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts
index 2192b55f1..c5249f5e5 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts
@@ -530,6 +530,10 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '包装规格',
     field: 'packUnit',
+    isSearch: false,
+    isTable: false,
+    isForm:false,
+    isDetail:false,
     sort: 'custom',
     table: {
       width: 150

From 1965e3ae3a37a05a38bd46219d7a6d3b399395ca Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 11 Jul 2024 17:41:35 +0800
Subject: [PATCH 358/408] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=EF=BC=9A=E5=BD=93=E5=AD=98=E5=9C=A8=E6=89=98?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=89=98=E7=9A=84=E5=8C=85=E8=A3=85=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=E8=A6=81=E5=A4=A7=E4=BA=8E=E7=AE=B1=E7=9A=84=E5=8C=85?=
 =?UTF-8?q?=E8=A3=85=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliver/supplierdeliverRequestMain/index.vue   | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index f80b4e3e1..86eff1d93 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -670,6 +670,13 @@ const footButtonClick = async (val) => {
       message.warning('有数据没有选择箱规格')
       return
     }
+    let isNext1 = detatableData1.value.some((item) => {
+      return item.secondPackQty && item.packQty && parseFloat(item.packQty) > parseFloat(item.secondPackQty)
+    })
+    if (isNext1) {
+      message.warning('托的包装数量要大于箱的包装数量,请修改')
+      return
+    }
     const data = JSON.parse(JSON.stringify(detatableData1.value))
     labelFormRef.value.openLabel(data)
   } else if (val == 'close') {

From 5d4292c6a09c7ce585179eda1e2f77b72a259210 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 11 Jul 2024 17:44:14 +0800
Subject: [PATCH 359/408] =?UTF-8?q?=E5=A4=B1=E5=8E=BB=E7=84=A6=E7=82=B9?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicForm.vue    | 170 +++++++++++++-----
 .../itemManage/bom/bom.data.ts                |  22 ++-
 2 files changed, 141 insertions(+), 51 deletions(-)

diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index e162d86d9..0d0a1d608 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -844,79 +844,171 @@ const onBlur = async (field, e) => {
 
   let formSchemaObj = formSchema.value.find((item) => item.field == field)?.componentProps
   if (formSchemaObj?.enterSearch) {
-    if (formSchemaObj.verificationPage) {
-      let searchCondition1 = formSchema.value.find((item) => item.field == field).componentProps
-        .searchCondition //获取data.ts参数信息
-      let verificationParams = formSchema.value.find((item) => item.field == field).componentProps
-        .verificationParams //获取失去焦点参数信息
+    if (formSchemaObj.searchPage) {
+      //获取data.ts参数信息
+      let searchCondition =
+        formSchema.value.find((item) => item.field == field)?.componentProps?.searchCondition || []
+      //获取失去焦点参数信息
+      let verificationParams =
+        formSchema.value.find((item) => item.field == field)?.componentProps?.verificationParams ||
+        []
       console.log('走新方法啦')
+      searchCondition = [...searchCondition, ...verificationParams]
       if (e && isString(e)) {
         let setV = {}
         setV[field] = ''
         let params = {}
         // 循环参数设置参数为key：value格式
-        if (searchCondition1 && searchCondition1.length > 0) {
-          for (let i = 0; i < searchCondition1.length; i++) {
-            if (searchCondition1[i].isMainValue) {
-              params[searchCondition1[i].key] = formRef.value.formModel[searchCondition1[i].value]
-                ? formRef.value.formModel[searchCondition1[i].value]
+        // if (searchCondition1 && searchCondition1.length > 0) {
+        //   for (let i = 0; i < searchCondition1.length; i++) {
+        //     searchCondition1[i].isSearch = true
+        //     if (searchCondition1[i].isMainValue) {
+        //       params[searchCondition1[i].key] = formRef.value.formModel[searchCondition1[i].value]
+        //         ? formRef.value.formModel[searchCondition1[i].value]
+        //         : props.detailData
+        //         ? props.detailData[searchCondition1[i].value]
+        //         : ''
+        //       // 是否含有空参数情况
+        //       let isNull = false
+        //       if (params[searchCondition1[i].key] == '' || params[searchCondition1[i].key] == undefined) {
+        //         isNull = true
+        //       }
+        //       if (isNull) {
+        //         message.warning(
+        //           searchCondition1[i].message ? searchCondition1[i].message : '前置条件未选择！'
+        //         )
+        //         return
+        //       }
+        //     } else {
+        //       // 扩展 转换为筛选条件进行查询
+        //       if (searchCondition1[i].isSearch) {
+        //         if (searchCondition1[i].isFormModel) {
+        //           //用formModel中的值
+        //           if (searchCondition1[i].required) {
+        //             if (
+        //               formRef.value.formModel[searchCondition1[i].value] == '' ||
+        //               formRef.value.formModel[searchCondition1[i].value] == undefined
+        //             ) {
+        //               message.warning(
+        //                 searchCondition1[i].message
+        //                   ? searchCondition1[i].message
+        //                   : '前置条件未选择！'
+        //               )
+        //               return
+        //             }
+        //           }
+        //         }
+        //         params[searchCondition1[i].key] = searchCondition1[i].value
+        //       } else {
+        //         params[searchCondition1[i].key] = searchCondition1[i].value
+        //       }
+        //     }
+        //   }
+        // }
+        // 判断查询条件中，是否存在指向主表的数据
+        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[searchCondition1[i].value]
+                ? props.detailData[searchCondition[i].value]
+                : // : row
+                // ? row[searchCondition[i].value]
+                e
+                ? e.trim()
                 : ''
               // 是否含有空参数情况
               let isNull = false
-              if (params[searchCondition1[i].key] == '' || params[searchCondition1[i].key] == undefined) {
+              if (
+                _searchCondition[searchCondition[i].key] == '' ||
+                _searchCondition[searchCondition[i].key] == undefined
+              ) {
                 isNull = true
               }
               if (isNull) {
                 message.warning(
-                  searchCondition1[i].message ? searchCondition1[i].message : '前置条件未选择！'
+                  searchCondition[i].message ? searchCondition[i].message : '前置条件未选择！'
                 )
                 return
               }
-            } else {
+            }
+            // 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 (searchCondition1[i].isSearch) {
-                if (searchCondition1[i].isFormModel) {
+              if (searchCondition[i].isSearch) {
+                if (searchCondition[i].isFormModel) {
                   //用formModel中的值
-                  if (searchCondition1[i].required) {
+                  if (searchCondition[i].required) {
                     if (
-                      formRef.value.formModel[searchCondition1[i].value] == '' ||
-                      formRef.value.formModel[searchCondition1[i].value] == undefined
+                      formRef.value.formModel[searchCondition[i].value] == '' ||
+                      formRef.value.formModel[searchCondition[i].value] == undefined
                     ) {
                       message.warning(
-                        searchCondition1[i].message
-                          ? searchCondition1[i].message
-                          : '前置条件未选择！'
+                        searchCondition[i].message ? searchCondition[i].message : '前置条件未选择！'
                       )
                       return
                     }
                   }
+                  filters.push({
+                    action: searchCondition[i].action,
+                    column: searchCondition[i].key,
+                    value: formRef.value.formModel[searchCondition[i].value]
+                      ? formRef.value.formModel[searchCondition[i].value]
+                      : e.trim()
+                  })
+                } else {
+                  filters.push({
+                    action: searchCondition[i].action,
+                    column: searchCondition[i].key,
+                    value: searchCondition[i].value
+                  })
                 }
-                params[searchCondition1[i].key] = searchCondition1[i].value
               } else {
-                params[searchCondition1[i].key] = searchCondition1[i].value
+                _searchCondition[searchCondition[i].key] = searchCondition[i].value
               }
             }
           }
-        }
-        // 循环参数设置参数为key：value格式
-        if (verificationParams && verificationParams.length > 0) {
-          for (let i = 0; i < verificationParams.length; i++) {
-              params[verificationParams[i].key] = e?.trim()
+          if (filters.length > 0) {
+            _searchCondition.isSearch = true
+            _searchCondition.filters = filters
           }
         }
-        console.log(333,params)
+        let obj = {
+          by: 'ASC',
+          pageNo: 1,
+          pageSize: 20
+        }
+        params = { ..._searchCondition, ...obj }
+        // console.log(333,params)
         if (!formSchemaObj?.multiple && e.indexOf(',') > -1) {
           message.alert('该输入框只能输入一条数据')
           formRef.value.setValues(setV)
           return
         }
-        await formSchemaObj.verificationPage(params).then((res) => {
+        await formSchemaObj.searchPage(params).then((res) => {
           let arr1 = e.split(',')
           let list = ref([])
-          list.value = res
-          console.log(222, list.value)
+          list.value = res.list
           if (list.value?.length == 0) {
             message.alert('暂无数据')
             formRef.value.setValues(setV)
@@ -932,19 +1024,7 @@ const onBlur = async (field, e) => {
             formRef.value.setValues(setV)
             return
           }
-          // emit('searchTableSuccess', formField, searchField, list.value, formRef.value, 'form')
-          // callback(list.value)
         })
-        // emit(
-        //   'onBlur',
-        //   field,
-        //   e,
-        //   formSchemaObj.componentProps.searchField,
-        //   formSchemaObj,
-        //   formRef.value,
-        //   'form',
-        //   obj
-        // )
       }
     } else {
       if (
diff --git a/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts b/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts
index e8729c17f..31f22135a 100644
--- a/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts
@@ -32,10 +32,13 @@ export const Bom = useCrudSchemas(reactive<CrudSchema[]>([
         searchTitle: '物料基础信息', // 查询弹窗标题
         searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
         searchPage: ItembasicApi.selectItembasicPageToFgAndSemibasicPage, // 查询弹窗所需分页方法
-        verificationPage: ItembasicApi.getItemListByCodes, // 失去焦点校验输入框的数据内容存在
         verificationParams: [{
-          key: 'codes',
+          key: 'code',
+          action: '==',
           value: '',
+          isMainValue: false,
+          isSearch: 'true',
+          isFormModel: true
         }], // 失去焦点校验参数
       }
     }
@@ -58,10 +61,13 @@ export const Bom = useCrudSchemas(reactive<CrudSchema[]>([
         searchTitle: '物料基础信息', // 查询弹窗标题
         searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
         searchPage: ItembasicApi.selectTypeToItembasic, // 查询弹窗所需分页方法
-        verificationPage: ItembasicApi.getItemListByCodes, // 失去焦点校验输入框的数据内容存在
         verificationParams: [{
-          key: 'codes',
+          key: 'code',
+          action: '==',
           value: '',
+          isMainValue: false,
+          isSearch: 'true',
+          isFormModel: true
         }], // 失去焦点校验参数
       }
     }
@@ -114,12 +120,16 @@ export const Bom = useCrudSchemas(reactive<CrudSchema[]>([
         searchCondition: [{
           key: 'available',
           value: 'TRUE',
-          isMainValue: false
+          isMainValue: false,
         }],
         verificationPage: ProcessApi.getProcessByCodes, // 失去焦点校验输入框的数据内容存在
         verificationParams: [{
-          key: 'codes',
+          key: 'code',
+          action: '==',
           value: '',
+          isMainValue: false,
+          isSearch: 'true',
+          isFormModel:true
         }], // 失去焦点校验参数
       }
     }

From 2f36630c543852432186b31591b2771104e1f28f Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 11 Jul 2024 17:46:43 +0800
Subject: [PATCH 360/408] =?UTF-8?q?=E5=A4=B1=E5=8E=BB=E7=84=A6=E7=82=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicForm.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 0d0a1d608..271d790f8 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -841,10 +841,9 @@ const onChange = (field, cur) => {
  */
 const onBlur = async (field, e) => {
   isExecute.value = false
-
   let formSchemaObj = formSchema.value.find((item) => item.field == field)?.componentProps
   if (formSchemaObj?.enterSearch) {
-    if (formSchemaObj.searchPage) {
+    if (formSchemaObj.searchPage && formSchemaObj.verificationParams) {
       //获取data.ts参数信息
       let searchCondition =
         formSchema.value.find((item) => item.field == field)?.componentProps?.searchCondition || []

From 7c309c141b562c7986bc1693a16d7a33fdfd4e68 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 11 Jul 2024 17:55:19 +0800
Subject: [PATCH 361/408] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=8C=85=E8=A3=85?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=EF=BC=8C=E6=A0=87=E5=87=86=E6=88=90=E6=9C=AC?=
 =?UTF-8?q?=E5=A4=B1=E5=8E=BB=E7=84=A6=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     | 12 ++++++++++-
 .../itempackage/itempackage.data.ts           | 20 +++++++++++++++++--
 .../stdcostprice/stdcostprice.data.ts         | 10 +++++++++-
 3 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 7c997d5fa..b50a3f14d 100644
--- a/README.md
+++ b/README.md
@@ -31,6 +31,7 @@ form: {
           isFormModel:true, // filters中添加筛选的数据--取于formModel
           required:true, // 前置添加必有，和isFormModel结合使用
           message: '请选择客户代码！', // 前置添加没填的提示语
+          
         },
         {
           key: 'itemCode',
@@ -44,7 +45,16 @@ form: {
           value:'TRUE', // 指查询具体值
           isMainValue: false // 表示查询条件不是主表的字段的值
         }
-      ]
+      ],
+      // 失去焦点校验参数
+      verificationParams: [{
+        key: 'code',
+        action: '==',
+        value: '',
+        isMainValue: false,
+        isSearch: 'true',
+        isFormModel: true
+      }]
     }
 }
 **tableForm明细列表查询弹窗配置**
diff --git a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts
index fba8c3a25..bc2db8a9f 100644
--- a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts
@@ -34,7 +34,15 @@ export const Itempackaging = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: 'true',
+          isFormModel: true
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -78,7 +86,15 @@ export const Itempackaging = useCrudSchemas(reactive<CrudSchema[]>([
           action: '==',
           isSearch: true,
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: 'true',
+          isFormModel: true
+        }], // 失去焦点校验参数
       }
     }
   },
diff --git a/src/views/wms/basicDataManage/itemManage/stdcostprice/stdcostprice.data.ts b/src/views/wms/basicDataManage/itemManage/stdcostprice/stdcostprice.data.ts
index 6dca2f1d6..2ea5edca4 100644
--- a/src/views/wms/basicDataManage/itemManage/stdcostprice/stdcostprice.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/stdcostprice/stdcostprice.data.ts
@@ -70,7 +70,15 @@ export const Stdcostprice = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+          }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: 'true',
+          isFormModel: true
+        }], // 失去焦点校验参数
       }
     }
   },

From faa422acb49ba54255f65f35164fa2ed40153cb0 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 11 Jul 2024 18:03:29 +0800
Subject: [PATCH 362/408] =?UTF-8?q?SCP=20=E4=BE=9B=E5=BA=94=E5=95=86?=
 =?UTF-8?q?=E5=8F=91=E8=B4=A7=E7=94=B3=E8=AF=B7=20=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliverRequestMain/labelForm.vue  | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
index 65dbdc44a..83247227f 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
@@ -438,24 +438,24 @@ const blurOne = (oneRow, twoRow) => {
   // 托信息修改的時候箱数据自动排列
   // 判断箱信息是否存在
   if (oneRow.packUnit && oneRow.packQty) {
-    oneRow.packageList.forEach((cur, key) => {
-      cur.children = []
+    // oneRow.packageList.forEach((cur, key) => {
+      twoRow.children = []
       // 数量除以托数量获取余数
-      cur.xLastNumber = parseFloat(cur.xNumber) % parseFloat(oneRow.packQty)
-      for (let j = 0; j < cur.xNumber; j++) {
+      twoRow.xLastNumber = parseFloat(twoRow.xNumber) % parseFloat(oneRow.packQty)
+      for (let j = 0; j < twoRow.xNumber; j++) {
         twoId.value++
         // 如果有余数
-        if (cur.xLastNumber) {
+        if (twoRow.xLastNumber) {
           // 最后一条信息直接展示余数的信息
-          if (j == cur.xNumbery - 1) {
-            cur.children.push({
+          if (j == twoRow.xNumbery - 1) {
+            twoRow.children.push({
               id: twoId.value,
               xPoNumber: j + 1,
-              qtyTwo: cur.xLastNumber
+              qtyTwo: twoRow.xLastNumber
             })
           } else {
             // 其他数据展示一托的全部箱数和全部数量
-            cur.children.push({
+            twoRow.children.push({
               id: twoId.value,
               xPoNumber: j + 1,
               qtyTwo: oneRow.packQty
@@ -463,14 +463,14 @@ const blurOne = (oneRow, twoRow) => {
           }
         } else {
           // 如果沒有余数,直接展示一托的全部箱数和全部数量
-          cur.children.push({
+          twoRow.children.push({
             id: twoId.value,
             xPoNumber: j + 1,
             qtyTwo: oneRow.packQty
           })
         }
       }
-    })
+    // })
   }
 }
 //在托下方的箱数量失去焦点

From b5762ad1f375cf16557f06c132e24481d226a76e Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 11 Jul 2024 18:36:43 +0800
Subject: [PATCH 363/408] =?UTF-8?q?SCP=20=E4=BE=9B=E5=BA=94=E5=95=86?=
 =?UTF-8?q?=E5=8F=91=E8=B4=A7=E7=94=B3=E8=AF=B7=20=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=97=B6=EF=BC=8C=E6=83=B3=E5=B0=91=E5=8F=91?=
 =?UTF-8?q?=E5=87=A0=E7=AE=B1=EF=BC=8C=E6=8A=8A=E7=AE=B1=E7=A7=BB=E5=87=BA?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=89=A9=E4=BD=99=E7=AE=B1?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E6=95=B0=E9=87=8F=E3=80=82=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliverRequestMain/labelForm.vue   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
index 83247227f..ee81020ce 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
@@ -475,11 +475,11 @@ const blurOne = (oneRow, twoRow) => {
 }
 //在托下方的箱数量失去焦点
 const blurTwo = (oneRow, twoRow, threeRow) => {
-  if (parseFloat(threeRow.qtyTwo) > parseFloat(oneRow.packQty)) {
-    message.warning('数量最多为' + oneRow.packQty)
-    threeRow.qtyTwo = oneRow.packQty
-    return
-  }
+  // if (parseFloat(threeRow.qtyTwo) > parseFloat(oneRow.packQty)) {
+  //   message.warning('数量最多为' + oneRow.packQty)
+  //   threeRow.qtyTwo = oneRow.packQty
+  //   return
+  // }
   let num = 0
   twoRow.children.forEach((item) => {
     num += parseFloat(item.qtyTwo) || 0
@@ -488,10 +488,10 @@ const blurTwo = (oneRow, twoRow, threeRow) => {
 }
 // 箱数量失去焦点
 const blurThree = (oneRow, twoRow, thereeRow) => {
-  if (parseFloat(thereeRow.qtyTwo) > parseFloat(oneRow.packQty)) {
-    message.warning('每箱个数最多' + oneRow.packQty)
-    thereeRow.qtyTwo = oneRow.packQty
-  }
+  // if (parseFloat(thereeRow.qtyTwo) > parseFloat(oneRow.packQty)) {
+  //   message.warning('每箱个数最多' + oneRow.packQty)
+  //   thereeRow.qtyTwo = oneRow.packQty
+  // }
   let num = 0
   twoRow.children.forEach((item) => {
     num += parseFloat(item.qtyTwo) || 0

From b55f7457e8f1050c6e50ef8b4052b0904285eca5 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 11 Jul 2024 18:40:13 +0800
Subject: [PATCH 364/408] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=80=80=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionreturnJobMain.data.ts           | 16 +++---
 .../productionreturnRecordMain.data.ts        | 56 +++++++++----------
 2 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts
index 805da1f6f..4af5ac021 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts
@@ -672,14 +672,14 @@ export const ProductionreturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '包装规格',
-    field: 'packUnit',
-    sort: 'custom',
-    table: {
-      width: 120
-    },
-  },
+  // {
+  //   label: '包装规格',
+  //   field: 'packUnit',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 120
+  //   },
+  // },
   {
     label: '数量',
     field: 'qty',
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts
index 0a86385ae..b2826ee28 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts
@@ -15,18 +15,18 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
     },
     isSearch: true
   },
-  {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.REQUEST_STATUS,
-    dictClass: 'string',
-    isForm: false,
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  // {
+  //   label: '状态',
+  //   field: 'status',
+  //   dictType: DICT_TYPE.REQUEST_STATUS,
+  //   dictClass: 'string',
+  //   isForm: false,
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
     label: '车间代码',
     field: 'workshopCode',
@@ -504,23 +504,23 @@ export const ProductionreturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]
     },
     hiddenInMain: true,
   },
-  {
-    label: '包装规格',
-    field: 'packUnit',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
+  // {
+  //   label: '包装规格',
+  //   field: 'packUnit',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
 
-  },
-  {
-    label: '包装数量',
-    field: 'packQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  // },
+  // {
+  //   label: '包装数量',
+  //   field: 'packQty',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
     label: '计量单位',
     field: 'uom',

From 2b6fecb79beddc05ac3616eedb9029aa54a0fad1 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 11 Jul 2024 18:52:11 +0800
Subject: [PATCH 365/408] =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E3=80=81=E5=88=B6=E5=93=81=E6=8B=86=E8=A7=A3?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productdismantle/productdismantleRequestMain/index.vue   | 5 ++++-
 .../productreceiptscrapRequestMain/index.vue                 | 5 ++++-
 .../productreceiptscrapRequestMain.data.ts                   | 3 ++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue
index 8f9c31ca3..9cd07b365 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue
@@ -286,12 +286,15 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
             row['bomVersion'] = res.list[0].version
           }
         })
-      } else {
+      } else if(formField == 'productionLineCode'){
         val.forEach(item=>{
           const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
           newRow[formField] = item[searchField]
           tableData.value.push(newRow)
         })
+      }else{
+        row[formField] = val[0][searchField]
+
       }
     } else {
       const setV = {}
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
index e9a80a163..c053bb4b0 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
@@ -220,7 +220,7 @@ const searchTableSuccess = async (formField, searchField, val, formRef, type, ro
             row['bomVersion'] = res.list[0].version
           }
         })
-      }else{
+      }else if(formField == 'productionLineCode'){
         //添加明细
         val.forEach(item=>{
           const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
@@ -228,6 +228,9 @@ const searchTableSuccess = async (formField, searchField, val, formRef, type, ro
           newRow[formField] = item[searchField]
           tableData.value.push(newRow)
         })
+      }else{
+        row[formField] = val[0][searchField]
+
       }
     } else {
       const setV = {}
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
index 668c03dbc..95d6f73fa 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
@@ -523,8 +523,9 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
     tableForm:{
+      disabled:true,
       multiple: true,
-      isInpuFocusShow: true,
+      // isInpuFocusShow: true,
       searchListPlaceholder: '请选择生产线代码',
       searchField: 'code',
       searchTitle: '生产线信息',

From 8712223c6fee19e1bc8167e671f015982123969c Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 11 Jul 2024 19:25:40 +0800
Subject: [PATCH 366/408] get

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

diff --git a/src/api/wms/demandforecastingDetail/index.ts b/src/api/wms/demandforecastingDetail/index.ts
index 059cc4ce2..e3303bbd1 100644
--- a/src/api/wms/demandforecastingDetail/index.ts
+++ b/src/api/wms/demandforecastingDetail/index.ts
@@ -115,6 +115,6 @@ export const getPageTableHead = async (params) => {
 
 
 // 查询版本号
-export const queryVersion = async (data) => {
-  return await request.post({ url: `/wms/demandforecasting-detail/queryVersion`, data })
+export const queryVersion = async (params) => {
+  return await request.get({ url: `/wms/demandforecasting-detail/queryVersion`, params })
 }
\ No newline at end of file

From d46613c38435a7aff35060a2778900368613cf4c Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 11 Jul 2024 19:39:44 +0800
Subject: [PATCH 367/408] =?UTF-8?q?SCP=20=E4=BE=9B=E5=BA=94=E5=95=86?=
 =?UTF-8?q?=E5=8F=91=E7=A5=A8=E7=94=B3=E8=AF=B7=20=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=97=B6=20=E6=97=A2=E6=9C=89=E7=AE=B1?=
 =?UTF-8?q?=E8=A7=84=E6=A0=BC=EF=BC=8C=E4=B9=9F=E6=9C=89=E6=89=98=E8=A7=84?=
 =?UTF-8?q?=E6=A0=BC=E3=80=82=E8=AE=A1=E7=AE=97=E7=BB=93=E6=9E=9C=E4=B8=8D?=
 =?UTF-8?q?=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliverRequestMain/labelForm.vue  | 58 +++++++++++--------
 1 file changed, 34 insertions(+), 24 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
index ee81020ce..64ecf869f 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
@@ -69,7 +69,7 @@
               <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)" />
+                  <el-input v-model="scope1.row.xNumber" @blur="blurOne(scope.row, scope1.row)" onkeyup="value=value.replace(/\D/g,'')" />
                 </template>
               </el-table-column>
               <el-table-column label="数量" width="100" prop="qtyOne" align="center" />
@@ -205,12 +205,22 @@ const intData =async () => {
 const expandChange = (row: any, expandedRows: any[]) => {
   // 判断托信息是否存在
   if (row.secondPackUnit && row.secondPackQty) {
-    // 数量除以托数量获取余数
-    row.lastNumber = parseFloat(row.qty) % parseFloat(row.secondPackQty)
+    // // 托数量/箱数量  一托可以放几箱
+    // row.otherNumber =Math.floor(parseFloat(row.secondPackQty) / parseFloat(row.packQty))
+    // // 数量除以托数量获取余数
+    // row.lastNumber = parseFloat(row.qty) % parseFloat(row.secondPackQty)
+    // // 数量%托数量  获取总共几托
+    // row.allTuoQty = Math.ceil(parseFloat(row.qty) / parseFloat(row.secondPackQty))
+
+    // 总共需要多少箱
+    row.allXiangQty = Math.ceil(parseFloat(row.qty) / parseFloat(row.packQty))
     // 托数量/箱数量  一托可以放几箱
-    row.otherNumber = parseFloat(row.secondPackQty) / parseFloat(row.packQty)
-    // 数量%托数量  获取总共几托
-    row.allTuoQty = Math.ceil(parseFloat(row.qty) / parseFloat(row.secondPackQty))
+    row.otherNumber =Math.floor(parseFloat(row.secondPackQty) / parseFloat(row.packQty))
+  // 数量%托数量  获取总共几托
+    row.allTuoQty = Math.ceil(parseFloat(row.allXiangQty) / parseFloat(row.otherNumber))
+  //  数量除以托数量获取余数
+    row.lastNumber = parseFloat(row.allXiangQty) % parseFloat(row.otherNumber)
+
     row.packageList = []
     // 循环托
     for (let i = 0; i < row.allTuoQty; i++) {
@@ -232,12 +242,12 @@ const expandChange = (row: any, expandedRows: any[]) => {
         } else {
           // 其他数据展示一托的全部箱数和全部数量
           row.packageList[i].xNumber = row.otherNumber
-          row.packageList[i].qtyOne = row.secondPackQty
+          row.packageList[i].qtyOne =  parseFloat(row.otherNumber) * parseFloat(row.packQty)
         }
       } else {
         // 如果沒有余数,直接展示一托的全部箱数和全部数量
         row.packageList[i].xNumber = row.otherNumber
-        row.packageList[i].qtyOne = row.secondPackQty
+        row.packageList[i].qtyOne = parseFloat(row.otherNumber) * parseFloat(row.packQty)
       }
     }
     // 判断箱信息是否存在
@@ -418,23 +428,23 @@ const blurOne = (oneRow, twoRow) => {
   if (!twoRow.xNumber) {
     twoRow.qtyOne = ''
   }
-  if (parseFloat(twoRow.xNumber) > parseFloat(oneRow.otherNumber)) {
-    message.warning('每托箱个数最多' + oneRow.otherNumber + '箱')
-    twoRow.xNumber = oneRow.otherNumber
-    twoRow.children = []
-    twoRow.qtyOne = parseFloat(twoRow.xNumber) * parseFloat(oneRow.packQty)
-  }
+  // if (parseFloat(twoRow.xNumber) > parseFloat(oneRow.otherNumber)) {
+  //   message.warning('每托箱个数最多' + oneRow.otherNumber + '箱')
+  //   twoRow.xNumber = oneRow.otherNumber
+  //   twoRow.children = []
+  //   twoRow.qtyOne = parseFloat(twoRow.xNumber) * parseFloat(oneRow.packQty)
+  // }
   twoRow.qtyOne = parseFloat(twoRow.xNumber) * parseFloat(oneRow.packQty)
-  let num = 0
-  oneRow.packageList.forEach((item) => {
-    num += parseFloat(item.xNumber) || 0
-  })
-  if (num > oneRow.allPackQty) {
-    message.warning('总箱数不可以大于' + oneRow.allPackQty)
-    twoRow.xNumber = ''
-    twoRow.qtyOne = ''
-    return
-  }
+  // let num = 0
+  // oneRow.packageList.forEach((item) => {
+  //   num += parseFloat(item.xNumber) || 0
+  // })
+  // if (num > oneRow.allPackQty) {
+  //   message.warning('总箱数不可以大于' + oneRow.allPackQty)
+  //   twoRow.xNumber = ''
+  //   twoRow.qtyOne = ''
+  //   return
+  // }
   // 托信息修改的時候箱数据自动排列
   // 判断箱信息是否存在
   if (oneRow.packUnit && oneRow.packQty) {

From 1c6bcf66aa28f008cf323e822c00f072096fa386 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 12 Jul 2024 08:50:00 +0800
Subject: [PATCH 368/408] workShopCode

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

diff --git a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts
index e388beb2f..268d5311d 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts
@@ -38,7 +38,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '车间代码',
-    field: 'workshopCode',
+    field: 'workShopCode',
     sort: 'custom',
     table: {
       width: 150

From d4b6afefee8bb677737f10046116c22600832434 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 12 Jul 2024 08:52:29 +0800
Subject: [PATCH 369/408] productionLineCode

---
 .../productreceiptAssembleJobMain.data.ts                      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts
index b5ffc30ab..007f65edc 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts
@@ -47,7 +47,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '生产线代码',
-    field: 'productionPlanNumber',
+    field: 'productionLineCode',
     sort: 'custom',
     table: {
       width: 150
@@ -626,6 +626,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true
   },
   {
     label: '工位代码',

From d6a086d93e3b12db3df71f1e870675c166c26395 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 12 Jul 2024 08:53:22 +0800
Subject: [PATCH 370/408] =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/productreceiptscrapJobMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/productreceiptscrapJobMain.data.ts
index 1c13b442b..08a551d97 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/productreceiptscrapJobMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/productreceiptscrapJobMain.data.ts
@@ -38,7 +38,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '车间代码',
-    field: 'workshopCode',
+    field: 'workShopCode',
     sort: 'custom',
     table: {
       width: 150

From 81244ff04cc78658cb3782b18a5aaba2020d9404 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 12 Jul 2024 08:56:12 +0800
Subject: [PATCH 371/408] =?UTF-8?q?=E8=A3=85=E9=85=8D=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts
index f447fd858..3d838cd3d 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts
@@ -728,7 +728,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     isDetail: false,
     isForm: false ,
     table: {
-      width: 150,
+      width: 220,
       fixed: 'right'
     },
     hiddenInMain: false,

From cd891b1fe8f30202263793978e63e49842460ac9 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 12 Jul 2024 10:20:06 +0800
Subject: [PATCH 372/408] =?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  | 222 +++++++++++-------
 1 file changed, 136 insertions(+), 86 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
index 64ecf869f..2e2eff60e 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
@@ -12,7 +12,7 @@
         <template #default="scope">
           <div
             style="margin-left: 400px; margin-top: -8px; margin-bottom: -8px"
-            v-if="scope.row.secondPackUnit && scope.row.secondPackQty"
+            v-if="scope.row.packUnit && scope.row.packQty && scope.row.secondPackUnit && scope.row.secondPackQty"
           >
             <el-table
               :data="scope.row.packageList"
@@ -25,7 +25,11 @@
                 <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="xPoNumber" align="center">
+                        <template #default="scope2">
+                          {{ scope2.$index + 1 }}
+                        </template>
+                      </el-table-column>
                       <el-table-column label="数量" width="100" prop="qtyTwo" align="center">
                         <template #default="scope2">
                           <el-input
@@ -66,10 +70,18 @@
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column label="托行号" width="100" prop="tPoNumber" align="center" />
+              <el-table-column label="托行号" width="100" prop="tPoNumber" align="center">
+                <template #default="scope">
+                  {{ scope.$index + 1 }}
+                </template>
+              </el-table-column>
               <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)" onkeyup="value=value.replace(/\D/g,'')" />
+                  <el-input
+                    v-model="scope1.row.xNumber"
+                    @blur="blurOne(scope.row, scope1.row)"
+                    onkeyup="value=value.replace(/\D/g,'')"
+                  />
                 </template>
               </el-table-column>
               <el-table-column label="数量" width="100" prop="qtyOne" align="center" />
@@ -90,10 +102,13 @@
               </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-if="scope.row.packUnit && scope.row.packQty && !scope.row.secondPackUnit">
             <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="xPoNumber" align="center" >    <template #default="scope1">
+                          {{ scope1.$index + 1 }}
+                        </template>
+                      </el-table-column>
                 <el-table-column label="数量" width="100" prop="qtyOne" align="center">
                   <template #default="scope1">
                     <el-input
@@ -171,7 +186,7 @@ const tableData = ref([])
 const isLoading = ref(false)
 const oneId = ref(0) //每托的id
 const twoId = ref(0) //每箱的id
-const openLabel =async (tableList) => {
+const openLabel = async (tableList) => {
   dialogTableVisible.value = true
   tableData.value = tableList
   defaultExpandAll.value = false
@@ -188,51 +203,47 @@ const showTableData = () => {
   } else {
     return tableData.value
   }
-  
 }
-const intData =async () => {
+const intData = async () => {
   tableData.value.forEach((row) => {
-    if (row.secondPackUnit && row.secondPackQty) {
-      // 数量%托数量  获取总共几托
-      row.allTuoQty = Math.ceil(parseFloat(row.qty) / parseFloat(row.secondPackQty))
-    } else {
-      // 数量%每箱数量  获取总共几箱
-      row.allTuoQty = Math.ceil(parseFloat(row.qty) / parseFloat(row.packQty))
-    }
-   expandChange(row)
+    expandChange(row)
   })
 }
 const expandChange = (row: any, expandedRows: any[]) => {
-  // 判断托信息是否存在
-  if (row.secondPackUnit && row.secondPackQty) {
-    // // 托数量/箱数量  一托可以放几箱
-    // row.otherNumber =Math.floor(parseFloat(row.secondPackQty) / parseFloat(row.packQty))
-    // // 数量除以托数量获取余数
-    // row.lastNumber = parseFloat(row.qty) % parseFloat(row.secondPackQty)
-    // // 数量%托数量  获取总共几托
-    // row.allTuoQty = Math.ceil(parseFloat(row.qty) / parseFloat(row.secondPackQty))
-
+ 
+  // 判断托信息和箱信息是否都存在
+  if (row.secondPackUnit && row.secondPackQty&&row.packUnit && row.packQty) {
     // 总共需要多少箱
     row.allXiangQty = Math.ceil(parseFloat(row.qty) / parseFloat(row.packQty))
+    // 放满的多少箱
+    row.manXiangQty = Math.floor(parseFloat(row.qty) / parseFloat(row.packQty))
     // 托数量/箱数量  一托可以放几箱
-    row.otherNumber =Math.floor(parseFloat(row.secondPackQty) / parseFloat(row.packQty))
-  // 数量%托数量  获取总共几托
+    row.otherNumber = Math.floor(parseFloat(row.secondPackQty) / parseFloat(row.packQty))
+    // 数量%托数量  获取总共几托
     row.allTuoQty = Math.ceil(parseFloat(row.allXiangQty) / parseFloat(row.otherNumber))
-  //  数量除以托数量获取余数
-    row.lastNumber = parseFloat(row.allXiangQty) % parseFloat(row.otherNumber)
-
-    row.packageList = []
+    // 放满的托数量
+    row.manTuoQty = Math.floor(parseFloat(row.manXiangQty) / parseFloat(row.otherNumber))
+    // 放满的托数量*一托的箱数量*一箱的数量  获取放满的托一共多少数量
+    row.tuoInManNumber =
+      parseFloat(row.manTuoQty) * parseFloat(row.otherNumber) * parseFloat(row.packQty)
+    // 数量除以托数量获取余数
+    row.lastNumber =
+      parseFloat(row.qty) > parseFloat(row.tuoInManNumber)
+        ? parseFloat(row.qty) - parseFloat(row.tuoInManNumber)
+        : parseFloat(row.qty)
     // 循环托
+    row.packageList =[]
     for (let i = 0; i < row.allTuoQty; i++) {
       oneId.value++
       // 先给所有托一个默认对象值
       row.packageList[i] = {
         id: oneId.value,
-        tPoNumber: i + 1,
+        // tPoNumber: i + 1,
         xNumber: '',
         qtyOne: '',
         isTuo: 1 //有托
       }
+
       // 如果有余数
       if (row.lastNumber) {
         // 最后一条信息直接展示余数的信息
@@ -242,7 +253,7 @@ const expandChange = (row: any, expandedRows: any[]) => {
         } else {
           // 其他数据展示一托的全部箱数和全部数量
           row.packageList[i].xNumber = row.otherNumber
-          row.packageList[i].qtyOne =  parseFloat(row.otherNumber) * parseFloat(row.packQty)
+          row.packageList[i].qtyOne = parseFloat(row.otherNumber) * parseFloat(row.packQty)
         }
       } else {
         // 如果沒有余数,直接展示一托的全部箱数和全部数量
@@ -261,7 +272,7 @@ const expandChange = (row: any, expandedRows: any[]) => {
           twoId.value++
           cur.children[j] = {
             id: twoId.value,
-            xPoNumber: j + 1
+            // xPoNumber: j + 1
           }
           // 如果有余数
           if (cur.xLastNumber) {
@@ -279,18 +290,21 @@ const expandChange = (row: any, expandedRows: any[]) => {
         }
       })
     }
-  } else {
+  }
+  // 只有箱规格
+  if(!row.secondPackUnit && row.packUnit && row.packQty){
     // 数量%每箱数量  获取总共几箱
     row.allXiangQty = Math.ceil(parseFloat(row.qty) / parseFloat(row.packQty))
     row.packageList = []
-    row.allTuoQty = 1
+    row.allTuoQty = ''
+    row.allTuoQty1 = 1
     // 循环箱
-    for (let i = 0; i < row.allTuoQty; i++) {
+    for (let i = 0; i < row.allTuoQty1; i++) {
       oneId.value++
       // 先给所有托一个默认对象值
       row.packageList[i] = {
         id: oneId.value,
-        xPoNumber: i + 1,
+        // xPoNumber: i + 1,
         qtyOne: row.qty,
         isTuo: 0 //无托
       }
@@ -301,7 +315,7 @@ const expandChange = (row: any, expandedRows: any[]) => {
         twoId.value++
         cur.children[j] = {
           id: twoId.value,
-          xPoNumber: j + 1
+          // xPoNumber: j + 1
         }
         // 数量除以箱数量获取余数
         cur.lastNumber = parseFloat(row.qty) % parseFloat(row.packQty)
@@ -343,33 +357,59 @@ const buttonBaseClick = (val) => {
 }
 // 保存
 const submitForm = () => {
-  let arr = tableData.value.map((item) => {
-    item.allNumber = 0
-    // 判断托信息是否存在
-    item.packageList.forEach((cur) => {
-      item.allNumber += parseFloat(cur.qtyOne) || 0
+  let isZ = false
+  console.log(tableData.value)
+  setTimeout(() => {
+    tableData.value.forEach((item) => {
+      item.packageList.forEach((cur, key) => {
+        cur.tPoNumber = key + 1
+        if (cur.qtyOne == '' || cur.qtyOne == 0) {
+          isZ = true
+        }
+        cur?.children?.forEach((ele,i) => {
+          ele.xPoNumber = i+1
+          if (ele.qtyTwo == '' || ele.qtyTwo == 0) {
+            isZ = true
+          }
+        })
+      })
     })
-    if (item.allNumber == parseFloat(item.qty)) {
-      return true
-    } else {
-      return false
+    if (isZ) {
+      message.warning('有数量为0或空，请重新填写')
+      return
     }
-  })
-  const isBol = arr.some((item) => item == false)
-  if (isBol) {
-    message.warning('当前添加的数量与总数量不一致')
-    return
-  }
-  emit('submitForm', tableData.value)
+    let obj = tableData.value.find((item) => {
+      item.allNumber = 0
+      item.packageList.forEach((cur) => {
+        item.allNumber += parseFloat(cur.qtyOne) || 0
+      })
+      return item.allNumber != parseFloat(item.qty)
+    })
+    console.log(222, obj)
+    // return
+    // const isBol = arr.some((item) => item == false)
+    if (obj) {
+      message.warning(
+        `物料[${obj.itemCode}],批次[${obj.batch}],${obj.packageList.length}的总和数量${obj.allNumber}不等于发货总数量${obj.qty}`
+      )
+      return
+    }
+    emit('submitForm', tableData.value)
+  }, 300)
 }
 // 添加托
 const addT = (oneRow) => {
   oneId.value++
   oneRow.packageList.push({
     id: oneId.value,
-    tPoNumber: oneRow?.packageList?.length>0?oneRow.packageList[oneRow.packageList.length - 1]?.tPoNumber  + 1 :1, //行号是上一行的行号加1
+    // tPoNumber:oneRow.packageList.length+1 || 1,
+    // tPoNumber:
+    //   oneRow?.packageList?.length > 0
+    //     ? oneRow.packageList[oneRow.packageList.length - 1]?.tPoNumber + 1
+    //     : 1, //行号是上一行的行号加1
     xNumber: '',
-    qtyOne: ''
+    qtyOne: '',
+    isTuo: 1 //有托
   })
   oneRow.allTuoQty = oneRow.packageList.length
 }
@@ -386,16 +426,26 @@ const addX = (oneRow, oneIndex, twoRow, twoIndex, type) => {
     // 在托下添加箱
     twoRow.children.push({
       id: twoId.value,
-      xPoNumber: twoRow?.children?.length>0? twoRow?.children[twoRow.children.length - 1]?.xPoNumber + 1 :1,
-      qtyOne: ''
+      // xPoNumber:
+      //   twoRow?.children?.length > 0
+      //     ? twoRow?.children[twoRow.children.length - 1]?.xPoNumber + 1
+      //     : 1,
+      qtyTwo: oneRow.packQty
     })
     twoRow.xNumber = twoRow.children.length
+     let num = 0
+    twoRow.children.forEach((item) => {
+      num += parseFloat(item.qtyTwo) || 0
+    })
+    twoRow.qtyOne = num
   } else {
     // 直接添加箱
+    oneRow.isTuo= 1 //无托
     twoRow.children.push({
       id: twoId.value,
-      xPoNumber:twoRow.children.length>0? twoRow.children[twoRow.children.length - 1].xPoNumber + 1:1,
-      qtyTwo: ''
+      // xPoNumber:
+      //   twoRow.children.length > 0 ? twoRow.children[twoRow.children.length - 1].xPoNumber + 1 : 1,
+      // qtyTwo: oneRow.packQty
     })
     oneRow.allTuoQty = twoRow.children.length
   }
@@ -449,37 +499,37 @@ const blurOne = (oneRow, twoRow) => {
   // 判断箱信息是否存在
   if (oneRow.packUnit && oneRow.packQty) {
     // oneRow.packageList.forEach((cur, key) => {
-      twoRow.children = []
-      // 数量除以托数量获取余数
-      twoRow.xLastNumber = parseFloat(twoRow.xNumber) % parseFloat(oneRow.packQty)
-      for (let j = 0; j < twoRow.xNumber; j++) {
-        twoId.value++
-        // 如果有余数
-        if (twoRow.xLastNumber) {
-          // 最后一条信息直接展示余数的信息
-          if (j == twoRow.xNumbery - 1) {
-            twoRow.children.push({
-              id: twoId.value,
-              xPoNumber: j + 1,
-              qtyTwo: twoRow.xLastNumber
-            })
-          } else {
-            // 其他数据展示一托的全部箱数和全部数量
-            twoRow.children.push({
-              id: twoId.value,
-              xPoNumber: j + 1,
-              qtyTwo: oneRow.packQty
-            })
-          }
+    twoRow.children = []
+    // 数量除以托数量获取余数
+    twoRow.xLastNumber = parseFloat(twoRow.xNumber) % parseFloat(oneRow.packQty)
+    for (let j = 0; j < twoRow.xNumber; j++) {
+      twoId.value++
+      // 如果有余数
+      if (twoRow.xLastNumber) {
+        // 最后一条信息直接展示余数的信息
+        if (j == twoRow.xNumbery - 1) {
+          twoRow.children.push({
+            id: twoId.value,
+            // xPoNumber: j + 1,
+            qtyTwo: twoRow.xLastNumber
+          })
         } else {
-          // 如果沒有余数,直接展示一托的全部箱数和全部数量
+          // 其他数据展示一托的全部箱数和全部数量
           twoRow.children.push({
             id: twoId.value,
-            xPoNumber: j + 1,
+            // xPoNumber: j + 1,
             qtyTwo: oneRow.packQty
           })
         }
+      } else {
+        // 如果沒有余数,直接展示一托的全部箱数和全部数量
+        twoRow.children.push({
+          id: twoId.value,
+          // xPoNumber: j + 1,
+          qtyTwo: oneRow.packQty
+        })
       }
+    }
     // })
   }
 }

From bd682e3b812ebb88ebf4d94de7fad561a38b566e Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 12 Jul 2024 10:23:54 +0800
Subject: [PATCH 373/408] =?UTF-8?q?=E4=BB=B7=E5=B7=AE=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../index.vue                                 |  325 ++++
 .../supplierinvoiceRecordMain.data.ts         | 1557 +++++++++++++++++
 2 files changed, 1882 insertions(+)
 create mode 100644 src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMainDifference/index.vue
 create mode 100644 src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMainDifference/supplierinvoiceRecordMain.data.ts

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMainDifference/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMainDifference/index.vue
new file mode 100644
index 000000000..2e12c467d
--- /dev/null
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMainDifference/index.vue
@@ -0,0 +1,325 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="SupplierinvoiceRecordMain.allSchemas.searchSchema" @search="searchList" @reset="searchList" >
+      <template #cha>
+        <div style="display:flex;flex-direction: row">
+          <el-input-number />
+          <span>{{' 到 '}}</span>
+          <el-input-number />
+        </div>
+
+      </template>
+    </Search>
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="SupplierinvoiceRecordMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table ref="tableRef"
+    :selection="true" 
+    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"
+      @getSelectionRows="getSelectionRows"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, t('ts.单据号'), row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #differencePrice="{row}">
+        <span :class="{'red-text':row.differencePrice!=0}">{{ row.differencePrice }}</span>
+      </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="SupplierinvoiceRecordMainRules"
+    :formAllSchemas="SupplierinvoiceRecordMain.allSchemas"
+    :tableAllSchemas="SupplierinvoiceRecordDetail.allSchemas"
+    :tableFormRules="SupplierinvoiceRecordDetailRules"
+    :isBusiness="true"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :annexTable="[{
+      label: t('ts.合同附件'),
+      prop: 'Annex',
+      tableName:'contract',
+      showDownload:true,
+      hiddenDelete:true,
+      queryParams:[{
+        queryField:'tableId',
+        rowField:'annexMasterId',
+      }],
+    },{
+      label: t('ts.发票附件'),
+      prop: 'Annex',
+      tableName:'invoice',
+      showDownload:true,
+      hiddenDelete:true,
+      queryParams:[{
+        queryField:'tableId',
+        rowField:'annexMasterId',
+      }],
+    },{
+      label: t('ts.货运单附件'),
+      prop: 'Annex',
+      tableName:'waybill',
+      showDownload:true,
+      hiddenDelete:true,
+      queryParams:[{
+        queryField:'tableId',
+        rowField:'annexMasterId',
+      }],
+    },{
+      label: t('ts.其他附件'),
+      prop: 'Annex',
+      tableName:'invoiceOther',
+      showDownload:true,
+      hiddenDelete:true,
+      queryParams:[{
+        queryField:'tableId',
+        rowField:'annexMasterId',
+      }],
+    }]"
+    :annexAlias="{
+      hidden:true,
+      label:t('ts.其他附件'),
+      showDownload:true,
+      hiddenDelete:true
+    }"
+    :isBasic="false"
+    direction="horizontal"
+    :column="3"
+    :allSchemas="SupplierinvoiceRecordDetailMain.allSchemas"
+    :detailAllSchemas="SupplierinvoiceRecordDetail.allSchemas"
+    :detailAllSchemasRules="SupplierinvoiceRecordDetailRules"
+    :apiPage="SupplierinvoiceRecordDetailApi.getSupplierinvoiceRecordDeatilPage"
+  >
+    <template #differencePrice="{row}">
+      <span :class="{'red-text':row.differencePrice!=0}">{{ row.differencePrice }}</span>
+    </template>
+  </Detail>
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { SupplierinvoiceRecordMain,SupplierinvoiceRecordMainRules,SupplierinvoiceRecordDetail,SupplierinvoiceRecordDetailRules,SupplierinvoiceRecordDetailMain } from './supplierinvoiceRecordMain.data'
+import * as SupplierinvoiceRecordMainApi from '@/api/wms/supplierinvoiceRecordMain'
+import * as SupplierinvoiceRecordDetailApi from '@/api/wms/supplierinvoiceRecordDeatil'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import * as SupplierinvoiceRequestDetailApi from '@/api/wms/supplierinvoiceRequestDetail'
+import * as PackageApi from "@/api/wms/package";
+import {getAccessToken} from "@/utils/auth";
+import {getJmreportBaseUrl} from "@/utils/systemParam";
+
+// 供应商发票记录主
+defineOptions({ name: 'SupplierinvoiceRecordMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(SupplierinvoiceRecordMain.allSchemas.tableColumns)
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: SupplierinvoiceRecordMainApi.getSupplierinvoiceRecordMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:supplierinvoice-record-main:export'}), // 导出
+  defaultButtons.mainLisSelectiontPointBtn(null), // 批量打印
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  }else if (val=='selection_point'){// 批量打印
+    handleSelectionPoint()
+  } 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 BASE_URL = getJmreportBaseUrl()
+const srcPoint = ref(BASE_URL + '/jmreport/view/970966724605804544?token=' + getAccessToken())
+const handleSelectionPoint = async ()=>{
+  let rows:any = []
+  selectionRows.value.forEach(item=>{
+    rows = [...rows,...item.selectionRows.map(item1=>item1.id)]
+  })
+  if(rows.length==0){
+    message.warning('至少选择一条数据！')
+    return
+  }
+  console.log('批量打印',rows.join(','))
+  window.open(srcPoint.value+'&ids='+rows.join(','))
+}
+
+// 列表-操作按钮
+const butttondata = (row,$index) => {
+  return [
+  {
+        label: t('ts.查看明细'),
+        name: 'open_detail',
+        type: 'primary',
+        icon: '',
+        color: '',
+        hasPermi: '',
+        link: true, // 文本展现按钮
+      }
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'open_detail') { // 查看明细
+      openDetail(row, '单据号', row.number)
+    }
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = async (row: any, titleName: any, titleValue: any) => {
+  console.log('openDetail',row)
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  //获取申请中的masterId
+  const { tableObject: requestTableObject, tableMethods:requestTableMethods } = useTable({
+    getListApi: SupplierinvoiceRequestDetailApi.getSupplierinvoiceRequestDetailPage // 分页接口
+  })
+  const { getList:requestGetList } = requestTableMethods
+  requestTableObject.params.number = row.requestNumber
+  await requestGetList()
+  if(requestTableObject.tableList.length>0){
+    row.annexMasterId = requestTableObject.tableList[0].masterId
+  }
+
+
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue)
+}
+const searchList = (model)=>{
+  if(model.postingDate&&model.postingDate.length>1){
+    model.postingDate[1] = model.postingDate[1].replace('00:00:00','23:59:59')
+  }
+  selectionRows.value = []
+  setSearchParams(model)
+}
+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 exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  let rows:any = []
+  selectionRows.value.forEach(item=>{
+    rows = [...rows,...item.selectionRows.map(item1=>item1.number)]
+  })
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await SupplierinvoiceRecordMainApi.exportSupplierinvoiceRecordMain({...tableObject.params,checkNums:rows})
+    download.excel(data, `${t('ts.供应商发票记录主')}.xlsx`)
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
+<style lang="scss" scoped>
+.is-red{
+  border-radius:var(--el-border-radius-base);
+  border:1px solid var(--el-color-danger);
+  box-shadow: 0 0 0 1px var(--el-color-danger) inset;
+}
+.red-text{
+  color:var(--el-color-danger);
+  font-weight:700;
+}
+</style>
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMainDifference/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMainDifference/supplierinvoiceRecordMain.data.ts
new file mode 100644
index 000000000..d8edcb341
--- /dev/null
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMainDifference/supplierinvoiceRecordMain.data.ts
@@ -0,0 +1,1557 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import { accountantFormart } from '@/utils/formatter'
+
+/**
+ * @returns {Array} 供应商发票记录主表
+ */
+export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field:'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: false
+  },
+  {
+    label: '发票申请单号',
+    field:'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    sortSearchDefault:1,
+    sortTableDefault:1,
+    isSearch: true
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:1,
+    isSearch: true
+  },
+  {
+    label: '供应商名称',
+    field: 'supplierName',
+    sort: 'custom',
+    table: {
+      width: 180,
+    },
+    sortTableDefault:2,
+    isForm: false,
+    isSearch: true
+  },
+  {
+    label: '税率',
+    field: 'taxRate',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:3,
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  
+  
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.SUPPLIERINVOICE_REQUEST_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sortTableDefault:7,
+    isForm:false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  
+  // {
+  //   label: '申请单号',
+  //   field: 'requestNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180,
+  //   },
+  //   isTable: false,
+  //   isSearch: true
+  // },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    isTable:false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '金税票号',//金税票号
+    field: 'goldenTaxInvoiceNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:5,
+    isSearch: true
+  },
+  {
+    label: '未税差额',
+    field: 'beforeTaxDiffAmount',
+    formatter: accountantFormart,
+    table: {
+      width: 150
+    },
+    sortTableDefault:5,
+    isForm:false,
+    isTableForm:false
+  },
+  {
+    label: '税额差异',
+    field: 'taxAmountDiff',
+    formatter: accountantFormart,
+    table: {
+      width: 150
+    },
+    sortTableDefault:5,
+    isForm:false,
+    isTableForm:false
+  },
+  {
+    label: '价税合计差额',
+    field: 'totalTaxDiffAmount',
+    formatter: accountantFormart,
+    table: {
+      width: 150
+    },
+    sortTableDefault:5,
+    isForm:false,
+    isTableForm:false
+  },
+  
+  {
+    label: '系统税额',
+    field: 'taxAmount',
+    formatter: accountantFormart,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:8,
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '未税金额',
+    field: 'beforeTaxAmount',
+    formatter: accountantFormart,
+    table: {
+      width: 150
+    },
+    sortTableDefault:3,
+    isForm:false,
+    isTableForm:false
+  },
+  {
+    label: '税额',
+    field: 'totalTaxAmount',
+    formatter: accountantFormart,
+    table: {
+      width: 150
+    },
+    sortTableDefault:3,
+    isForm:false,
+    isTableForm:false
+  },
+  {
+    label: '价税合计金额',
+    field: 'adTaxAmount',
+    formatter: accountantFormart,
+    table: {
+      width: 150
+    },
+    sortTableDefault:3,
+    isForm:false,
+    isTableForm:false
+  },
+  {
+    label: '是否有价差',
+    field: 'balanceStatementStatus',
+    dictType: DICT_TYPE.INVOICE_BALANCE_STATEMENT_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    isForm:false,
+    isSearch:false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:3,
+  },
+  {
+    label: '价差说明',
+    field: 'balanceStatement',
+    isTable: false,
+    isForm:false,
+    isSearch:false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:5,
+  },
+  {
+    label: '系统价税合计',//税后金额
+    field: 'afterTaxAmount',
+    formatter: accountantFormart,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:9,
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  
+  {
+    label: '价差',//总差额
+    field: 'totalDifference',
+    table: {
+      width: 150
+    },
+    isTable: false,
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6,
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6,
+    }
+  },
+
+  {
+    label: '系统未税金额',
+    field: 'amount',
+    formatter: accountantFormart,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:8,
+    form: {
+      component: 'InputNumber',
+    }
+  },
+
+
+
+  {
+    label: '索赔金额',
+    field: 'claimAmount',
+    formatter: accountantFormart,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '调整价差',
+    field: 'discountAmount',
+    formatter: accountantFormart,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isDetail:false,
+    isTable: false,
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '调整税额',
+    field: 'adjustingTaxAmount',
+    formatter: accountantFormart,
+    sort: 'custom',
+    isDetail:false,
+    table: {
+      width: 150
+    },
+    isTable: false,
+    form: {
+      component: 'InputNumber',
+    }
+  },
+
+  {
+    label: '未税差额',
+    field: 'untaxedDifference',
+    formatter: accountantFormart,
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6,
+      }
+    },
+    isTable: false,
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6,
+    }
+  },
+  {
+    label: '含税差额',
+    field: 'taxInclusiveDifference',
+    formatter: accountantFormart,
+    table: {
+      width: 150
+    },
+    isTable: false,
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6,
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6,
+    }
+  },
+  {
+    label: '快递单号',
+    field: 'expressTrackingNumber',
+    sort: 'custom',
+    isTable:false,
+    isForm:false,
+    isSearch:false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '开票日期',
+    field: 'invoiceTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    form:{
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD',//YYYY-MM-DD
+        valueFormat: 'x',//数据转成时间戳
+      }
+    },
+    sortTableDefault:4,
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  // {
+  //   label: '采购审批人',
+  //   field: 'procurementCreatorName',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  //   isTable:true,
+  //   isDetail: true,
+  //   isTableForm: false,
+  //   isForm:false,
+  //   isSearch:false,
+  //   sortTableDefault:10
+  // },
+  {
+    label: '过账日期',
+    field: 'postingDate',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    form:{
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD',//YYYY-MM-DD
+        valueFormat: 'x',//数据转成时间戳
+      }
+    },
+    isTable: true,
+    sortTableDefault:6,
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true,
+    search: {
+      value:[],
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        dateFormat: 'YYYY-MM-DD',
+        type: 'daterange',
+        defaultTime: [new Date('1 '), new Date('1 ')]
+      }
+    },
+  },
+  {
+    label: '创建日期',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    form:{
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD',//YYYY-MM-DD
+        valueFormat: 'x',//数据转成时间戳
+      }
+    },
+    isTable: true,
+    sortTableDefault:6,
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true,
+    search: {
+      value:[],
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        dateFormat: 'YYYY-MM-DD',
+        type: 'daterange',
+        defaultTime: [new Date('1 '), new Date('1 ')]
+      }
+    },
+  },
+  //子表数据，仅是查询条件
+  {
+    label: '货运单号',
+    field: 'asnBillNum',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isTableForm:false,
+    isTable:false,
+    isDetail:false,
+    isSearch: true,
+    isForm: false,
+  },
+  {
+    label: '差价范围',
+    field: 'cha',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isTableForm:false,
+    isTable:false,
+    isDetail:false,
+    isSearch: true,
+    isForm: false,
+  },
+  {
+    label: '财务凭证号',
+    field: 'voucherNumber',
+    sort: 'custom',
+    table: {
+      width: 180,
+    },
+    isTable:true,
+    sortTableDefault:6,
+    isForm: false
+  },
+  {
+    label: '业务类型',
+    field:'businessType',
+    sort: 'custom',
+    isTable:false,
+    isTableForm:false,
+    isDetail:false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransactionType',
+    sort: 'custom',
+    isTable:false,
+    isTableForm:false,
+    isDetail:false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransactionType',
+    isTable:false,
+    isTableForm:false,
+    isDetail:false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '执行时间',
+    field: 'executeTime',
+    isTable:false,
+    isTableForm:false,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '生效日期',
+    field: 'activeDate',
+    isTable:false,
+    isTableForm:false,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    isTable:false,
+    isTableForm:false,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    isTable:false,
+    isTableForm:false,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    isTable:false,
+    isTableForm:false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '代码',
+    field: 'code',
+    isTable:false,
+    isTableForm:false,
+    isDetail:false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable:false,
+    isDetail:false,
+    isTableForm:false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    isTable:false,
+    isTableForm:false,
+    dictClass: 'string',
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    sortTableDefault:1000,
+    isTable: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    isTable: false,
+    sortTableDefault:1001,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '采购审批人',
+    field: 'procurementCreatorName',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTable:true,
+    isDetail: true,
+    isTableForm: false,
+    isForm:false,
+    isSearch:false,
+    sortTableDefault:10
+  },
+  // {
+  //   label: '采购审批人代码',
+  //   field: 'procurementCreator',
+  //   sortTableDefault:1002,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTable: false,
+  //   isForm: false,
+  // },
+  {
+    label: '采购审批时间',
+    field: 'procurementCreateTime',
+    sortTableDefault:11,
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    form:{
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',//YYYY-MM-DD
+        valueFormat: 'x',//数据转成时间戳
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isForm: false,
+  },
+  {
+    label: '财务审批人',
+    field: 'financialCreatorName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:12,
+    isForm: false,
+  },
+  {
+    label: '财务审批时间',
+    field: 'financialCreateTime',
+    sortTableDefault:13,
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    form:{
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',//YYYY-MM-DD
+        valueFormat: 'x',//数据转成时间戳
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isForm: false,
+  },
+  // {
+  //   label: '采购驳回原因',
+  //   field: 'purchaseRejectCause',
+  //   table: {
+  //     width: 180
+  //   },
+  //   sortTableDefault:14,
+  //   isTable: true,
+  //   isSearch: false,
+  //   isForm: false,
+  //   isDetail:false,
+  // },
+  // {
+  //   label: '财务驳回原因',
+  //   field: 'financeRejectCause',
+  //   table: {
+  //     width: 180
+  //   },
+  //   sortTableDefault:15,
+  //   isTable: true,
+  //   isSearch: false,
+  //   isForm: false,
+  //   isDetail:false,
+  // },
+  {
+    label: '供应商审批人',
+    field: 'supplierCreatorName',
+    sort: 'custom',
+    isTable:false,
+    isTableForm:false,
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '供应商审批时间',
+    field: 'supplierCreateTime',
+    isTable:false,
+    isTableForm:false,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isForm: false,
+  },
+  {
+    label: '凭证描述',
+    field: 'voucherNumberRemark',
+    isTable:true,
+    isTableForm:false,
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+  }
+]))
+/**
+ * @returns {Array} 供应商发票在详情展示的主表字段
+ */
+export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '汇总信息',
+    field: '',
+    sort: 'custom',
+    isForm: false,
+    isSearch: false,
+    isTable: false,
+    isDetail: true,
+  },
+  {
+    label: '供应商信息',
+    field: '',
+    sort: 'custom',
+    isForm: false,
+    isSearch: false,
+    isTable: false,
+    isDetail: true,
+  },
+  {
+    label: 'SCP系统数据',
+    field: '',
+    sort: 'custom',
+    isForm: false,
+    isSearch: false,
+    isTable: false,
+    isDetail: true,
+  },
+
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '系统价税合计',
+    field: 'afterTaxAmount',
+    formatter: accountantFormart,
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '财务凭证号',
+    field: 'voucherNumber',
+   
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '供应商名称',
+    field: 'supplierName',
+    sort: 'custom',
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '系统未税金额',
+    field: 'amount',
+    formatter: accountantFormart,
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '供应商创建日期',
+    field: 'supplierDate',
+    sort: 'custom',
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '订单类型',
+    field: 'orderType',
+    dictType: DICT_TYPE.PURCHASE_INVOICE_ORDER_TYPE,
+    dictClass: 'string',
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '系统税额',
+    field: 'taxAmount',
+    formatter: accountantFormart,
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.SUPPLIERINVOICE_REQUEST_STATUS,
+    dictClass: 'string',
+    sort: 'custom',
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '发票号码',
+    field: 'goldenTaxInvoiceNumber',
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '',
+    field: '',
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '采购价格审批人',
+    field: 'procurementCreator',
+    sortTableDefault: 1003,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '开票日期',
+    field: 'invoiceTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '',
+    field: '',
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '采购价格审批时间',
+    field: 'procurementCreateTime',
+    sortTableDefault: 1003,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '税率(%)',
+    field: 'taxRate',
+    dictType: DICT_TYPE.TAX_RATE_DICT,
+    dictClass: 'string',
+    sortTableDefault: 3,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '',
+    field: '',
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '价差通过说明',
+    field: 'balanceStatement',
+    sort: 'custom',
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '价税合计',
+    field: 'adTaxAmount',
+    formatter: accountantFormart,
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '',
+    field: '',
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+
+  {
+    label: '财务审批人',
+    field: 'financialCreatorName',
+    sort: 'custom',
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '未税金额',
+    field: 'beforeTaxAmount',
+    formatter: accountantFormart,
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '差额',
+    field: '',
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '财务审批时间',
+    field: 'financialCreateTime',
+    formatter: dateFormatter,
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '税额',
+    field: 'totalTaxAmount',
+    formatter: accountantFormart,
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '价税合计差额(价税合计-系统价税合计)',
+    field: 'totalTaxDiffAmount',
+    formatter: accountantFormart,
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '财务过账日期',
+    field: 'postingDate',
+    isTable: true,
+    sortTableDefault: 15,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+   
+  },
+  {
+    label: '折扣金额',
+    field: 'discountAmount1',
+    formatter: accountantFormart,
+   
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '未税差额(未税金额-系统未税金额)',
+    field: 'beforeTaxDiffAmount',
+    formatter: accountantFormart,
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+   
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+    detail:{
+      span:2
+    }
+  },
+  {
+    label: '税额差异（税额-系统税额）',
+    field: 'taxAmountDiff',
+    formatter: accountantFormart,
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+]))
+//表单校验
+export const SupplierinvoiceRecordMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  supplierCode: [
+    { required: true, message: '请选择供应商代码', trigger: 'change' }
+  ],
+  outTransaction: [
+    { required: true, message: '请输入出库事务类型', trigger: 'blur' }
+  ],
+  inTransaction: [
+    { required: true, message: '请输入入库事务类型', trigger: 'blur' }
+  ],
+  executeTime: [
+    { required: true, message: '请输入执行时间', trigger: 'blur' }
+  ],
+  activeDate: [
+    { required: true, message: '请输入生效日期', trigger: 'blur' }
+  ],
+  available: [
+    { required: true, message: '请输入是否可用', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  interfaceType: [
+    { required: true, message: '请选择接口类型', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 供应商发票记录子表
+ */
+export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '项目编号',
+    field: 'projectCode',
+    isTable:false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '采购收货记录单号',
+    field: 'qadNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '单据类型',
+    field: 'billType',
+    dictType: DICT_TYPE.BILL_TYPE,
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:7,
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '待开票单据号',
+    field: 'recvBillNum',
+    table: {
+      width: 150
+    },
+    sortTableDefault:9,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    hiddenInMain:true,
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '供应商发货单号',
+    field: 'asnBillNum',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    sortTableDefault:8,
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    sortTableDefault:3,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述',
+    field: 'itemDesc',
+    table: {
+      width: 150
+    },
+    sortTableDefault:4,
+    isForm:false,
+    isTableForm:false,
+    isDetail: false,
+    isTable: true,
+  },
+  {
+    label: '到货时间',
+    field: 'planArriveTime',
+    table: {
+      width: 150
+    },
+    formatter: dateFormatter2,
+    sortTableDefault:5,
+    isForm:false,
+    isTableForm:false,
+    isDetail: false,
+    isTable: true,
+  },
+  {
+    label: '到货数量',
+    field: 'arrivalQty',
+    table: {
+      width: 150
+    },
+    sortTableDefault:6,
+    isForm:false,
+    isTableForm:false,
+    isDetail: false,
+    isTable: true,
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '货币',
+    field: 'currency',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '合同价格',
+    field: 'singlePrice',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '采购价格',
+    field: 'purchasePrice',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '差额',
+    field: 'differencePrice',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm:{
+      type: 'slot',
+      disabled: true
+    }
+  },
+  {
+    label: '未税差额',
+    field: 'untaxedDifference',
+    formatter: accountantFormart,
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6,
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6,
+    }
+  },
+  {
+    label: '含税差额',
+    field: 'taxInclusiveDifference',
+    formatter: accountantFormart,
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6,
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6,
+    }
+  },
+  {
+    label: '收货日期',
+    field: 'deliveryDate',
+    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',
+      }
+    }
+  },
+  {
+    label: '开票数量',
+    field: 'invoicableQuantity',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '财务凭证号',
+    field: 'voucherNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
+
+//表单校验
+export const SupplierinvoiceRecordDetailRules = reactive({
+  packingNumber: [
+    { required: true, message: '请输入包装号', trigger: 'blur' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  poNumber: [
+    { required: true, message: '请输入订单号', trigger: 'blur' }
+  ],
+  poLine: [
+    { required: true, message: '请输入订单行', trigger: 'blur' }
+  ],
+  packQty: [
+    { required: true, message: '请输入包装数量', trigger: 'blur' }
+  ],
+  packUnit: [
+    { required: true, message: '请输入包装规格', trigger: 'blur' }
+  ],
+  convertRate: [
+    { required: true, message: '请输入转换率', trigger: 'blur' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请输入物料代码', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})

From cb9398f3928dc1966d965826287c44a46c8debc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Fri, 12 Jul 2024 10:27:14 +0800
Subject: [PATCH 374/408] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92=20?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83=E5=90=8E=E5=88=9B=E5=BB=BA=E5=A4=87=E6=96=99?=
 =?UTF-8?q?=E5=92=8C=E6=94=B6=E8=B4=A7=E6=8B=86=E5=88=86=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionplan/productionMain/index.vue   | 120 ++++++++++++++++--
 .../productionMain/productionMain.data.ts     |  21 ++-
 .../productionMainAssemble/index.vue          |  94 ++++++++++++--
 .../productionMainAssemble.data.ts            |  21 ++-
 .../productionMainAssembleSparePart/index.vue |  92 ++++++++++++--
 .../productionMainAssembleSparePart.data.ts   |  20 +++
 .../productionMainPredictSparePart/index.vue  |  92 ++++++++++++--
 .../productionMainPredictSparePart.data.ts    |  21 ++-
 8 files changed, 428 insertions(+), 53 deletions(-)

diff --git a/src/views/wms/productionManage/productionplan/productionMain/index.vue b/src/views/wms/productionManage/productionplan/productionMain/index.vue
index a71293867..59b0c44c0 100644
--- a/src/views/wms/productionManage/productionplan/productionMain/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMain/index.vue
@@ -236,6 +236,33 @@ const isShowMainButton = (row,val) => {
   }
 }
 
+// 根据状态返回该按钮是否显示-针对生成备料计划
+const isShowMainButtonBl = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    if (row.preparetoissueIsCreate == 'TRUE') {
+      return true
+    } else {
+      return false
+    }
+  } else {
+    return true
+  }
+}
+
+// 根据状态返回该按钮是否显示-针对生收货申请
+const isShowMainButtonSh = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    if (row.productreceiptIsCreate == 'TRUE') {
+      return true
+    } else {
+      return false
+    }
+  } else {
+    return true
+  }
+}
+
+
 // 列表-操作按钮
 const butttondata = (row,$index) => {
   const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
@@ -252,20 +279,20 @@ const butttondata = (row,$index) => {
     defaultButtons.mainListPlanResBtn({hide:isShowMainButton(row,['4']),hasPermi:'wms:production-main:resetting'}), // 重置
     defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:update'}), // 编辑
     // defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:delete'}), // 删除
-    // {
-    //   label: '生成备料计划',
-    //   name: 'scbljh',
-    //   hide: isShowMainButton(row,['6']),
-    //   type: 'primary',
-    //   icon: 'Select',
-    //   hasPermi:'wms:production-main:publish',
-    //   link: true, // 文本展现按钮
-    //   color: ''
-    // },
+    {
+      label: '生成备料计划',
+      name: 'scbljh',
+      hide: isShowMainButtonBl(row,['6']),
+      type: 'primary',
+      icon: 'Select',
+      hasPermi:'wms:production-main:publish',
+      link: true, // 文本展现按钮
+      color: ''
+    },
     {
       label: '生成收货申请',
       name: 'scshsq',
-      hide: isShowMainButton(row,['6']),
+      hide: isShowMainButtonSh(row,['6']),
       type: 'primary',
       icon: 'Select',
       hasPermi:'wms:production-main:publish',
@@ -302,7 +329,29 @@ const buttonTableClick = async (val, row) => {
     if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
     await message.confirm('确认要提交审批吗？')
     tableObject.loading = true
-    await ProductionMainApi.submit(row.masterId).then(() => {
+    await ProductionMainApi.submit(row.masterId).then((res) => {
+      if (res.status == '6') {
+        // 生成备料计划
+        tableObject.loading = true
+        ProductionMainApi.generatePreparetoissue(row.number).then(() => {
+          // message.success(t('common.createSuccess'))
+          tableObject.loading = false
+          getList()
+        }).catch(err => {
+          tableObject.loading = false
+          console.log(err)
+        })
+        // 生成收货申请
+        tableObject.loading = true
+        ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
+          // message.success(t('common.createSuccess'))
+          tableObject.loading = false
+          getList()
+        }).catch(err => {
+          tableObject.loading = false
+          console.log(err)
+        })
+      }
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -347,6 +396,26 @@ const buttonTableClick = async (val, row) => {
         await message.confirm('物料：【'+rs +'】目前为不可用状态，是否继续发布？').catch(() => {
           isAvailable = false
         })
+        // 生成备料计划
+        tableObject.loading = true
+        await ProductionMainApi.generatePreparetoissue(row.number).then(() => {
+          // message.success(t('common.createSuccess'))
+          tableObject.loading = false
+          getList()
+        }).catch(err => {
+          tableObject.loading = false
+          console.log(err)
+        })
+        // 生成收货申请
+        tableObject.loading = true
+        await ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
+          // message.success(t('common.createSuccess'))
+          tableObject.loading = false
+          getList()
+        }).catch(err => {
+          tableObject.loading = false
+          console.log(err)
+        })
       }
     })
     if (!isAvailable) {
@@ -514,7 +583,31 @@ const submitForm = async (formType, submitData) => {
   try {
     if (formType === 'create') {
       data.subList = tableData.value // 拼接子表数据参数
-      await ProductionMainApi.createProductionMain(data)
+      await ProductionMainApi.createProductionMain(data).then((res) => {
+        // console.log(565,res)
+        if (res.status == '6') {
+          // 生成备料计划
+          tableObject.loading = true
+          ProductionMainApi.generatePreparetoissue(res.number).then(() => {
+            // message.success(t('common.createSuccess'))
+            tableObject.loading = false
+            getList()
+          }).catch(err => {
+            tableObject.loading = false
+            console.log(err)
+          })
+          // 生成收货申请
+          tableObject.loading = true
+          ProductionMainApi.generateProductreceiptRequest(res.number).then(() => {
+            // message.success(t('common.createSuccess'))
+            tableObject.loading = false
+            getList()
+          }).catch(err => {
+            tableObject.loading = false
+            console.log(err)
+          })
+        }
+      })
       message.success(t('common.createSuccess'))
     } else {
       await ProductionMainApi.updateProductionMain(data)
@@ -523,6 +616,7 @@ const submitForm = async (formType, submitData) => {
     formRef.value.dialogVisible = false
     // 刷新当前列表
     getList()
+
   } finally {
     formRef.value.formLoading = false
   }
diff --git a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
index bf0dee7de..74d41a233 100644
--- a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
@@ -399,7 +399,26 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-
+  {
+    label: '是否创建了备料计划',
+    field: 'preparetoissueIsCreate',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+    isForm: false,
+  },
+  {
+    label: '是否创建了收货申请',
+    field: 'productreceiptIsCreate',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+    isForm: false,
+  },
   // {
   //   label: '开始时间',
   //   field: 'beginTime',
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
index 850ebebeb..de3c21983 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
@@ -229,6 +229,32 @@ const isShowMainButton = (row,val) => {
   }
 }
 
+// 根据状态返回该按钮是否显示-针对生成备料计划
+const isShowMainButtonBl = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    if (row.preparetoissueIsCreate == 'TRUE') {
+      return true
+    } else {
+      return false
+    }
+  } else {
+    return true
+  }
+}
+
+// 根据状态返回该按钮是否显示-针对生收货申请
+const isShowMainButtonSh = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    if (row.productreceiptIsCreate == 'TRUE') {
+      return true
+    } else {
+      return false
+    }
+  } else {
+    return true
+  }
+}
+
 // 列表-操作按钮
 const butttondata = (row,$index) => {
   const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
@@ -245,20 +271,20 @@ const butttondata = (row,$index) => {
     defaultButtons.mainListPlanResBtn({hide:isShowMainButton(row,['4']),hasPermi:'wms:production-main:resetting'}), // 重置
     defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:update'}), // 编辑
     // defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:delete'}), // 删除
-    // {
-    //   label: '生成备料计划',
-    //   name: 'scbljh',
-    //   hide: isShowMainButton(row,['6']),
-    //   type: 'primary',
-    //   icon: 'Select',
-    //   hasPermi:'wms:production-main:publish',
-    //   link: true, // 文本展现按钮
-    //   color: ''
-    // },
+    {
+      label: '生成备料计划',
+      name: 'scbljh',
+      hide: isShowMainButtonBl(row,['6']),
+      type: 'primary',
+      icon: 'Select',
+      hasPermi:'wms:production-main:publish',
+      link: true, // 文本展现按钮
+      color: ''
+    },
     {
       label: '生成收货申请',
       name: 'scshsq',
-      hide: isShowMainButton(row,['6']),
+      hide: isShowMainButtonSh(row,['6']),
       type: 'primary',
       icon: 'Select',
       hasPermi:'wms:production-main:publish',
@@ -295,7 +321,29 @@ const buttonTableClick = async (val, row) => {
     if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
     await message.confirm('确认要提交审批吗？')
     tableObject.loading = true
-    await ProductionMainApi.submit(row.masterId).then(() => {
+    await ProductionMainApi.submit(row.masterId).then((res) => {
+      if (res.status == '6') {
+        // 生成备料计划
+        tableObject.loading = true
+        ProductionMainApi.generatePreparetoissue(row.number).then(() => {
+          // message.success(t('common.createSuccess'))
+          tableObject.loading = false
+          getList()
+        }).catch(err => {
+          tableObject.loading = false
+          console.log(err)
+        })
+        // 生成收货申请
+        tableObject.loading = true
+        ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
+          // message.success(t('common.createSuccess'))
+          tableObject.loading = false
+          getList()
+        }).catch(err => {
+          tableObject.loading = false
+          console.log(err)
+        })
+      }
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -340,6 +388,26 @@ const buttonTableClick = async (val, row) => {
         await message.confirm('物料：【'+rs +'】目前为不可用状态，是否继续发布？').catch(() => {
           isAvailable = false
         })
+        // 生成备料计划
+        tableObject.loading = true
+        await ProductionMainApi.generatePreparetoissue(row.number).then(() => {
+          // message.success(t('common.createSuccess'))
+          tableObject.loading = false
+          getList()
+        }).catch(err => {
+          tableObject.loading = false
+          console.log(err)
+        })
+        // 生成收货申请
+        tableObject.loading = true
+        await ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
+          // message.success(t('common.createSuccess'))
+          tableObject.loading = false
+          getList()
+        }).catch(err => {
+          tableObject.loading = false
+          console.log(err)
+        })
       }
     })
     if (!isAvailable) {
@@ -365,7 +433,7 @@ const buttonTableClick = async (val, row) => {
       tableObject.loading = false
       console.log(err)
     })
-  } else if(val == 'scbljh') {
+  }  else if(val == 'scbljh') {
     if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
     await message.confirm('确认要生成备料计划吗？')
     tableObject.loading = true
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
index aec2ca5bf..6cdca9280 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
@@ -398,7 +398,26 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-
+  {
+    label: '是否创建了备料计划',
+    field: 'preparetoissueIsCreate',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+    isForm: false,
+  },
+  {
+    label: '是否创建了收货申请',
+    field: 'productreceiptIsCreate',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+    isForm: false,
+  },
   // {
   //   label: '开始时间',
   //   field: 'beginTime',
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
index 86075935e..cd26ba054 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
@@ -229,6 +229,32 @@ const isShowMainButton = (row,val) => {
   }
 }
 
+// 根据状态返回该按钮是否显示-针对生成备料计划
+const isShowMainButtonBl = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    if (row.preparetoissueIsCreate == 'TRUE') {
+      return true
+    } else {
+      return false
+    }
+  } else {
+    return true
+  }
+}
+
+// 根据状态返回该按钮是否显示-针对生收货申请
+const isShowMainButtonSh = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    if (row.productreceiptIsCreate == 'TRUE') {
+      return true
+    } else {
+      return false
+    }
+  } else {
+    return true
+  }
+}
+
 // 列表-操作按钮
 const butttondata = (row,$index) => {
   const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
@@ -245,20 +271,20 @@ const butttondata = (row,$index) => {
     defaultButtons.mainListPlanResBtn({hide:isShowMainButton(row,['4']),hasPermi:'wms:production-main:resetting'}), // 重置
     defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:update'}), // 编辑
     // defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:delete'}), // 删除
-    // {
-    //   label: '生成备料计划',
-    //   name: 'scbljh',
-    //   hide: isShowMainButton(row,['6']),
-    //   type: 'primary',
-    //   icon: 'Select',
-    //   hasPermi:'wms:production-main:publish',
-    //   link: true, // 文本展现按钮
-    //   color: ''
-    // },
+    {
+      label: '生成备料计划',
+      name: 'scbljh',
+      hide: isShowMainButtonBl(row,['6']),
+      type: 'primary',
+      icon: 'Select',
+      hasPermi:'wms:production-main:publish',
+      link: true, // 文本展现按钮
+      color: ''
+    },
     {
       label: '生成收货申请',
       name: 'scshsq',
-      hide: isShowMainButton(row,['6']),
+      hide: isShowMainButtonSh(row,['6']),
       type: 'primary',
       icon: 'Select',
       hasPermi:'wms:production-main:publish',
@@ -295,7 +321,29 @@ const buttonTableClick = async (val, row) => {
     if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
     await message.confirm('确认要提交审批吗？')
     tableObject.loading = true
-    await ProductionMainApi.submit(row.masterId).then(() => {
+    await ProductionMainApi.submit(row.masterId).then((res) => {
+      if (res.status == '6') {
+        // 生成备料计划
+        tableObject.loading = true
+        ProductionMainApi.generatePreparetoissue(row.number).then(() => {
+          // message.success(t('common.createSuccess'))
+          tableObject.loading = false
+          getList()
+        }).catch(err => {
+          tableObject.loading = false
+          console.log(err)
+        })
+        // 生成收货申请
+        tableObject.loading = true
+        ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
+          // message.success(t('common.createSuccess'))
+          tableObject.loading = false
+          getList()
+        }).catch(err => {
+          tableObject.loading = false
+          console.log(err)
+        })
+      }
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -340,6 +388,26 @@ const buttonTableClick = async (val, row) => {
         await message.confirm('物料：【'+rs +'】目前为不可用状态，是否继续发布？').catch(() => {
           isAvailable = false
         })
+        // 生成备料计划
+        tableObject.loading = true
+        await ProductionMainApi.generatePreparetoissue(row.number).then(() => {
+          // message.success(t('common.createSuccess'))
+          tableObject.loading = false
+          getList()
+        }).catch(err => {
+          tableObject.loading = false
+          console.log(err)
+        })
+        // 生成收货申请
+        tableObject.loading = true
+        await ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
+          // message.success(t('common.createSuccess'))
+          tableObject.loading = false
+          getList()
+        }).catch(err => {
+          tableObject.loading = false
+          console.log(err)
+        })
       }
     })
     if (!isAvailable) {
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
index 4955f8006..76f307cbd 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
@@ -390,6 +390,26 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '是否创建了备料计划',
+    field: 'preparetoissueIsCreate',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+    isForm: false,
+  },
+  {
+    label: '是否创建了收货申请',
+    field: 'productreceiptIsCreate',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+    isForm: false,
+  },
 
   // {
   //   label: '开始时间',
diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
index 15a77d617..60a8f1605 100644
--- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
@@ -229,6 +229,32 @@ const isShowMainButton = (row,val) => {
   }
 }
 
+// 根据状态返回该按钮是否显示-针对生成备料计划
+const isShowMainButtonBl = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    if (row.preparetoissueIsCreate == 'TRUE') {
+      return true
+    } else {
+      return false
+    }
+  } else {
+    return true
+  }
+}
+
+// 根据状态返回该按钮是否显示-针对生收货申请
+const isShowMainButtonSh = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    if (row.productreceiptIsCreate == 'TRUE') {
+      return true
+    } else {
+      return false
+    }
+  } else {
+    return true
+  }
+}
+
 // 列表-操作按钮
 const butttondata = (row,$index) => {
   const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
@@ -245,20 +271,20 @@ const butttondata = (row,$index) => {
     defaultButtons.mainListPlanResBtn({hide:isShowMainButton(row,['4']),hasPermi:'wms:production-main:resetting'}), // 重置
     defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:update'}), // 编辑
     // defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:delete'}), // 删除
-    // {
-    //   label: '生成备料计划',
-    //   name: 'scbljh',
-    //   hide: isShowMainButton(row,['6']),
-    //   type: 'primary',
-    //   icon: 'Select',
-    //   hasPermi:'wms:production-main:publish',
-    //   link: true, // 文本展现按钮
-    //   color: ''
-    // },
+    {
+      label: '生成备料计划',
+      name: 'scbljh',
+      hide: isShowMainButtonBl(row,['6']),
+      type: 'primary',
+      icon: 'Select',
+      hasPermi:'wms:production-main:publish',
+      link: true, // 文本展现按钮
+      color: ''
+    },
     {
       label: '生成收货申请',
       name: 'scshsq',
-      hide: isShowMainButton(row,['6']),
+      hide: isShowMainButtonSh(row,['6']),
       type: 'primary',
       icon: 'Select',
       hasPermi:'wms:production-main:publish',
@@ -295,7 +321,29 @@ const buttonTableClick = async (val, row) => {
     if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
     await message.confirm('确认要提交审批吗？')
     tableObject.loading = true
-    await ProductionMainApi.submit(row.masterId).then(() => {
+    await ProductionMainApi.submit(row.masterId).then((res) => {
+      if (res.status == '6') {
+        // 生成备料计划
+        tableObject.loading = true
+        ProductionMainApi.generatePreparetoissue(row.number).then(() => {
+          // message.success(t('common.createSuccess'))
+          tableObject.loading = false
+          getList()
+        }).catch(err => {
+          tableObject.loading = false
+          console.log(err)
+        })
+        // 生成收货申请
+        tableObject.loading = true
+        ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
+          // message.success(t('common.createSuccess'))
+          tableObject.loading = false
+          getList()
+        }).catch(err => {
+          tableObject.loading = false
+          console.log(err)
+        })
+      }
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -340,6 +388,26 @@ const buttonTableClick = async (val, row) => {
         await message.confirm('物料：【'+rs +'】目前为不可用状态，是否继续发布？').catch(() => {
           isAvailable = false
         })
+        // 生成备料计划
+        tableObject.loading = true
+        await ProductionMainApi.generatePreparetoissue(row.number).then(() => {
+          // message.success(t('common.createSuccess'))
+          tableObject.loading = false
+          getList()
+        }).catch(err => {
+          tableObject.loading = false
+          console.log(err)
+        })
+        // 生成收货申请
+        tableObject.loading = true
+        await ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
+          // message.success(t('common.createSuccess'))
+          tableObject.loading = false
+          getList()
+        }).catch(err => {
+          tableObject.loading = false
+          console.log(err)
+        })
       }
     })
     if (!isAvailable) {
diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
index 1f985f00b..542dbb02b 100644
--- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
@@ -391,7 +391,26 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-
+  {
+    label: '是否创建了备料计划',
+    field: 'preparetoissueIsCreate',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+    isForm: false,
+  },
+  {
+    label: '是否创建了收货申请',
+    field: 'productreceiptIsCreate',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+    isForm: false,
+  },
   // {
   //   label: '开始时间',
   //   field: 'beginTime',

From fde59a65761e3d60c3df5166abcc1fdad404cc5d Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 12 Jul 2024 10:57:01 +0800
Subject: [PATCH 375/408] =?UTF-8?q?QMS=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=89=A7=E8=A1=8C=E5=90=8E=EF=BC=8C=E5=B0=86?=
 =?UTF-8?q?=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1=E5=BC=B9=E6=A1=86=E5=88=86?=
 =?UTF-8?q?=E5=8C=BA=E5=9F=9F=EF=BC=8C=E9=BC=A0=E6=A0=87=E6=82=AC=E5=81=9C?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E6=82=AC=E5=81=9C=E7=9A=84=E5=8C=BA=E5=9F=9F?=
 =?UTF-8?q?=E6=A1=86=E5=8F=AF=E8=BF=9B=E8=A1=8C=E6=BB=9A=E5=8A=A8=E6=BB=91?=
 =?UTF-8?q?=E5=8A=A8=E6=9F=A5=E7=9C=8B=E6=95=B0=E6=8D=AE=E3=80=82=E5=85=B6?=
 =?UTF-8?q?=E4=BB=96=E5=8C=BA=E5=9F=9F=E6=95=B0=E6=8D=AE=E4=B8=8D=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/inspectionJob/addForm.vue | 34 +++++++++++++++++--------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/views/qms/inspectionJob/addForm.vue b/src/views/qms/inspectionJob/addForm.vue
index 592b812f5..0ac554e0c 100644
--- a/src/views/qms/inspectionJob/addForm.vue
+++ b/src/views/qms/inspectionJob/addForm.vue
@@ -12,7 +12,7 @@
         style="max-height: 80vh; overflow-y: auto; padding: 0px 20px"
         ref="mianscroll"
       >
-        <el-backtop :right="40" :bottom="100" target=".box" @click="topScrollClick" />
+        <!-- <el-backtop :right="40" :bottom="100" target=".box" @click="topScrollClick" /> -->
         <Form
           ref="formMainRef"
           :rules="rules"
@@ -35,6 +35,7 @@
             />
           </div>
         </div>
+        
         <el-tabs
           v-model="editableTabsValue"
           class="demo-tabs"
@@ -69,6 +70,7 @@
                 <span>{{ item.processDescribe }}</span>
               </span>
             </template>
+            <div class="tabs-box">
             <div class="small-title">检验工序</div>
             <el-form :model="item" label-width="auto" :rules="rules" ref="formProcessRef">
               <el-row :gutter="20">
@@ -104,7 +106,8 @@
             </el-form>
             <div class="small-title">检验特性</div>
             <el-form :model="item" label-width="auto" :rules="rules" ref="formFeaturesRef">
-              <el-row :gutter="20">
+            <div>
+                <el-row :gutter="20">
                 <el-col :span="12">
                   <el-form-item label="编码">
                     <el-input
@@ -388,14 +391,16 @@
                   v-for="(cur, i) in item.inspectionJobCharacteristicsUpdateReqVO
                     .recordInspectionQuantifyList"
                   :key="i"
+                 
+                >
+                <div
                   style="
                     border: 1px solid #dedede;
                     border-radius: 4px;
                     padding-top: 16px;
                     margin-bottom: 10px;
-                  "
-                >
-                  <el-row>
+                  ">
+                  <el-row :gutter="20">
                     <!-- 汇总录入的时候显示 -->
                     <el-col
                       :span="12"
@@ -461,11 +466,15 @@
                       </el-form-item>
                     </el-col> -->
                   </el-row>
+                  </div>
                 </el-col>
               </el-row>
+            </div>
             </el-form>
+            </div>
           </el-tab-pane>
         </el-tabs>
+        
       </div>
       <template #footer>
         <ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick" />
@@ -1333,11 +1342,11 @@ const changeQualitativeCode = (e, item, cur) => {
 const mianscroll = ref()
 const boxList = ref()
 
-const topScrollClick = () => {
-  nextTick(() => {
-    mianscroll.value.scrollTo({ top: boxList.value.clientHeight + 550, behavior: 'smooth' })
-  })
-}
+// const topScrollClick = () => {
+//   nextTick(() => {
+//     mianscroll.value.scrollTo({ top: boxList.value.clientHeight + 550, behavior: 'smooth' })
+//   })
+// }
 const inspectionValueInput = (item, cur) => {
   for ( let i = 0;i < item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.length;i++) {
     item.isPass = true
@@ -1431,6 +1440,11 @@ const inspectionValueInput = (item, cur) => {
   color: #1a8bfc;
   font-size: 16px;
 }
+.tabs-box{
+  max-height:calc(80vh - 40px) ;
+  overflow-x: hidden;
+  overflow-y: auto;
+}
 </style>
 <style>
 .el-tabs--left .el-tabs__header.is-left {

From ccc0802469469c53f1c75cde6da10f2f307a6780 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com>
Date: Fri, 12 Jul 2024 11:12:48 +0800
Subject: [PATCH 376/408] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/inspectionJob/addForm.vue | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/views/qms/inspectionJob/addForm.vue b/src/views/qms/inspectionJob/addForm.vue
index 0ac554e0c..754a80d8f 100644
--- a/src/views/qms/inspectionJob/addForm.vue
+++ b/src/views/qms/inspectionJob/addForm.vue
@@ -457,6 +457,17 @@
                           />
                         </el-select>
                       </el-form-item>
+                    </el-col>
+                      <el-col
+                      :span="12"
+                    >
+                      <el-form-item label="备注">
+                        <el-input
+                          v-model="cur.remark"
+                          placeholder="请输入备注"
+                          type="text"
+                        />
+                      </el-form-item>
                     </el-col>
                     <!-- <el-col :span="12" v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == '1'" >
                       <el-form-item label="缺陷级别" required>

From 54d7bb6467dc227424e1f0c95e6b8dd4c8f0b6a7 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 12 Jul 2024 11:25:50 +0800
Subject: [PATCH 377/408] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=9C=AA=E7=A8=8E?=
 =?UTF-8?q?=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicForm.vue                  | 4 ++++
 src/components/SearchTable/src/SearchTable.vue              | 1 +
 .../supplierinvoice/supplierinvoiceRequestMain/index.vue    | 6 ++++++
 3 files changed, 11 insertions(+)

diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 271d790f8..881963e63 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -134,6 +134,10 @@
     :showSearchTableQueryFields="showSearchTableQueryFields"
     @searchTableSuccess="searchTableSuccess"
   >
+  
+    <template #selectionsActions="selections">
+      <slot name="searchTableSelectionsActions" :selections="selections"></slot>
+    </template>
     <template v-for="name in Object.keys($slots)" :key="name" #[name]>
       <slot :name="name"></slot>
     </template>
diff --git a/src/components/SearchTable/src/SearchTable.vue b/src/components/SearchTable/src/SearchTable.vue
index fe47330d3..539271296 100644
--- a/src/components/SearchTable/src/SearchTable.vue
+++ b/src/components/SearchTable/src/SearchTable.vue
@@ -37,6 +37,7 @@
     </ContentWrap>
     <template #footer>
       <div class="flex items-center">
+        <slot name="selectionsActions" :selections="searchTableRef?searchTableRef.selections:[]"></slot>
         <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
         <el-button @click="searchDialogVisible = false">取 消</el-button>
 
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index b99976ba2..850ed72db 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -112,6 +112,12 @@
     @submitForm="submitForm"
     @sumFormDataHandle="sumFormDataHandle"
   >      
+  
+  <template #searchTableSelectionsActions="{selections}">
+    <div style="text-align: left;margin-right:10px">
+      系统未税金额:{{selections.selections.reduce((prev, item) => prev + Number(Number(Number(Number(item['purchasePrice']).toFixed(2))*item['invoicableQuantity']).toFixed(2)),0)}}
+    </div>
+  </template>
   <!-- <template #foorter>
     <div style="text-align: left">
       {{ basicFormFooter }}

From 5a32098cb881d47e71e9faa717f7983bb21812da Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 12 Jul 2024 11:38:05 +0800
Subject: [PATCH 378/408] =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E9=9D=A2=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E7=A7=9F=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/UserInfo/src/UserInfo.vue | 10 +++++++---
 src/store/modules/permission.ts                 | 14 +++++++-------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/layout/components/UserInfo/src/UserInfo.vue b/src/layout/components/UserInfo/src/UserInfo.vue
index 9e7f89c23..2603b979c 100644
--- a/src/layout/components/UserInfo/src/UserInfo.vue
+++ b/src/layout/components/UserInfo/src/UserInfo.vue
@@ -6,6 +6,7 @@ import { useDesign } from '@/hooks/web/useDesign'
 import avatarImg from '@/assets/imgs/avatar.gif'
 import { useUserStore } from '@/store/modules/user'
 import { useTagsViewStore } from '@/store/modules/tagsView'
+import {  getTenantId } from '@/utils/auth'
 
 defineOptions({ name: 'UserInfo' })
 
@@ -28,6 +29,8 @@ const user = wsCache.get(CACHE_KEY.USER)
 const avatar = user.user.avatar ? user.user.avatar : avatarImg
 
 const userName = user.user.nickname ? user.user.nickname : 'Admin'
+const names =[{"text":"长春1379","value":1},{"text":"成都1397","value":2},{"text":"长春2379","value":3}]
+const tenant = names.find(item=>item.value == getTenantId())
 
 const loginOut = () => {
   ElMessageBox.confirm(t('common.loginOutMessage'), t('common.reminder'), {
@@ -54,9 +57,10 @@ const toDocument = () => {
   <ElDropdown class="custom-hover custom-hover1" :class="prefixCls" trigger="click">
     <div class="flex items-center">
       <ElAvatar :src="avatar" alt="" class="w-[calc(var(--logo-height)-25px)] rounded-[50%]" />
-      <span class="pl-[5px] text-14px text-[var(--top-header-text-color)] <lg:hidden" style="color:#ffffff">
-        {{ userName }}
-      </span>
+      <div class="pl-[5px] text-14px text-[var(--top-header-text-color)] <lg:hidden"  style="display: flex; flex-direction: column;color:#ffffff">
+        <span> {{ userName }} </span>
+        <span style="margin-top: 5px;text-align:center">{{ tenant.text }}</span>
+      </div>
     </div>
     <template #dropdown>
       <ElDropdownMenu>
diff --git a/src/store/modules/permission.ts b/src/store/modules/permission.ts
index 19a8bcb38..84402e817 100644
--- a/src/store/modules/permission.ts
+++ b/src/store/modules/permission.ts
@@ -34,17 +34,17 @@ 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())
+        // 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']
-            }
-          })
+          // res.forEach(item=>{
+          //   if(item.name == '富维海拉供应商系统'&&tenant){
+          //     item.name = item.name + tenant['text']
+          //   }
+          // })
         }
         console.log('菜单res',res)
         const routerMap: AppRouteRecordRaw[] = generateRoute(res)

From bf2c417b3321a08c55f113233de720b363994947 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 12 Jul 2024 11:55:09 +0800
Subject: [PATCH 379/408] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoiceRecordMain.data.ts               | 13 ++++++++++++-
 .../supplierinvoiceRequestMain.data.ts              |  6 +++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
index 99aeb5367..23823cded 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
@@ -605,7 +605,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '创建时间',
     field: 'createTime',
-    isTable: false,
+    isTable: true,
     sortTableDefault:1001,
     formatter: dateFormatter,
     detail: {
@@ -665,6 +665,16 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false,
   },
+  {
+    label: '采购价格审批人',
+    field: 'procurementCreator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:12,
+    isForm: false,
+  },
   {
     label: '财务审批人',
     field: 'financialCreatorName',
@@ -675,6 +685,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     sortTableDefault:12,
     isForm: false,
   },
+  
   {
     label: '财务审批时间',
     field: 'financialCreateTime',
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index 232cc7af4..90e359762 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -718,7 +718,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
   {
     label: '创建时间',
     field: 'createTime',
-    isTable:false,
+    isTable:true,
     formatter: dateFormatter,
     sortTableDefault:1000,
     detail: {
@@ -766,12 +766,12 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
   {
     label: '采购价格审批人',
     field: 'procurementCreator',
-    sortTableDefault:1003,
     table: {
       width: 150
     },
+    sortTableDefault:14,
     isForm: true,
-    isTable:false,
+    isTable:true,
     isDetail:false,
     form: {
       component: 'Select',

From 816ecad73f5b8be37b1d7beb0b7a375d5e136f19 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 12 Jul 2024 13:30:16 +0800
Subject: [PATCH 380/408] =?UTF-8?q?=E8=A3=85=E9=85=8D=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productreceiptAssembleRecordMain/index.vue    | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue
index ea1a36e30..94a762bc6 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue
@@ -241,8 +241,23 @@ const butttondata = (row,$index) => {
 const buttonTableClick = async (val, row) => {
   if (val == 'point') { // 标签打印
     labelPrint(row)
+  }else  if(val == 'inspectRequest'){//生成到货检验申请
+    handleCreateInspectRequest(row.number)
   }
 }
+/** 生成到货检验申请按钮操作 */
+const handleCreateInspectRequest = async (number:string) => {
+  try{
+    await message.confirm(t('ts.确认生成到货检验申请吗？'))
+    tableObject.loading = true
+    await ProductreceiptRecordMainApi.createInspectRequest(number)
+    message.success(t('ts.到货检验申请生成成功'))
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
 const searchTableRef = ref()
 const labelType = ref('') // 标签类别 采购还是制造等 
 const labelPrint = async (row) => {

From 329b806485ef1ee9a7d33c6280133bface575018 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 12 Jul 2024 13:44:11 +0800
Subject: [PATCH 381/408] =?UTF-8?q?SCP=E4=BE=9B=E5=BA=94=E5=95=86=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E4=B8=8D=E5=B1=95=E7=A4=BA=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicDataManage/supplierManage/supplieritem/index.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue b/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue
index 83ad11f01..b9692daa0 100644
--- a/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue
+++ b/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue
@@ -76,12 +76,16 @@ const route = useRoute() //路由信息
 const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref(Supplieritem.allSchemas.tableColumns)
-
+if(routeName.value.includes('SCP')){
+  tableColumns.value = tableColumns.value.filter(item=>item.field!='action')
+}
 //字段设置 更新主列表字段
 const updataTableColumns = (val) => {
+  if(routeName.value.includes('SCP')){
+    val = val.filter(item=>item.field!='action')
+  }
   tableColumns.value = val
 }
-
 const { tableObject, tableMethods } = useTable({
   getListApi: routeName.value.includes('SCP')?SupplieritemApi.getSupplieritemPageSCP:SupplieritemApi.getSupplieritemPage // 分页接口
 })

From ec4395bf8d81f128ec468abb4c3de87578e22830 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 12 Jul 2024 14:03:38 +0800
Subject: [PATCH 382/408] =?UTF-8?q?=E7=94=9F=E6=88=90=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
index 2e2eff60e..ad0d66033 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
@@ -390,7 +390,7 @@ const submitForm = () => {
     // const isBol = arr.some((item) => item == false)
     if (obj) {
       message.warning(
-        `物料[${obj.itemCode}],批次[${obj.batch}],${obj.packageList.length}的总和数量${obj.allNumber}不等于发货总数量${obj.qty}`
+        `物料【${obj.itemCode}】,批次【${obj.batch}】,${obj.packageList.length}托的总和数量【${obj.allNumber}】不等于发货总数量【${obj.qty}】`
       )
       return
     }

From c73f23fa262b64b24dc784b6ff09b05b2575fea7 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 12 Jul 2024 14:31:26 +0800
Subject: [PATCH 383/408] =?UTF-8?q?=E6=9C=89=E7=AE=B1=E8=A7=84=E6=A0=BC?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=95=B0=E6=8D=AE=EF=BC=8C=E5=A4=B1=E5=8E=BB?=
 =?UTF-8?q?=E7=84=A6=E7=82=B9=E6=96=B9=E6=B3=95=E6=94=B9=E6=88=90=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliverRequestMain/index.vue               | 10 ++++++++--
 .../supplierdeliverRequestMain/labelForm.vue           |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 86eff1d93..cbe18f856 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -184,6 +184,7 @@
     ref="labelFormRef"
     :tableAllSchemas="SupplierdeliverRequestDetailLabel.allSchemas"
     @submitForm="submitFormLabel"
+    :key="count"
   />
 </template>
 
@@ -224,6 +225,7 @@ const { t } = useI18n() // 国际化
 const genLabelId = ref()
 const route = useRoute() // 路由信息
 const routeName = ref()
+const count = ref(0)
 routeName.value = route.name
 
 const tableColumns = ref([
@@ -590,6 +592,7 @@ const buttonTableClick = async (val, row) => {
     genLabelId.value = row.masterId
     // await getDetailList()
     await getGenerateLabelList(row)
+    count.value++
     formLabelRef.value.open('create', row, null, 'createLabel') //创建标签页面 createLabel 标题
   } else if (val == 'ressbq') {
     console.log('重新生成标签')
@@ -606,6 +609,7 @@ const buttonTableClick = async (val, row) => {
             }
             genLabelId.value = row.masterId
             // await getDetailList()
+            count.value++
             await getGenerateLabelList(row)
             formLabelRef.value.open('create', row, null, 'createLabel') //创建标签页面 createLabel 标题
           }
@@ -638,6 +642,8 @@ const getGenerateLabelList = async (row) => {
   await SupplierdeliverRequestDetailApi.getGenerateLabelList(params1).then((res) => {
     detatableData1.value = res
     detatableData1.value.forEach((item) => {
+      // console.log(3333, item?.boxPackaging[0])
+      item.boxPackaging =item.boxPackaging ? item.boxPackaging:[]
       item.packUnitInitOptions = item.boxPackaging
       item.secondPackUnitInitOptions = item.palletPackaging || []
       let obj = item?.boxPackaging[0]
@@ -646,10 +652,10 @@ const getGenerateLabelList = async (row) => {
         item.packQty = obj.packQty
       }
       // 有托规格显示托规格，没有显示第一条规格
-      item.secondPackUnit = obj.parentPackUnit
+      item.secondPackUnit = obj?.parentPackUnit
         ? obj.parentPackUnit
         : item?.secondPackUnitInitOptions[0]?.packUnit
-      item.secondPackQty = obj.parentPackUnit
+      item.secondPackQty = obj?.parentPackUnit
         ? obj.parentPackQty
         : item?.secondPackUnitInitOptions[0]?.packQty
     })
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
index ad0d66033..d098eb51c 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
@@ -79,7 +79,7 @@
                 <template #default="scope1">
                   <el-input
                     v-model="scope1.row.xNumber"
-                    @blur="blurOne(scope.row, scope1.row)"
+                    @input="blurOne(scope.row, scope1.row)"
                     onkeyup="value=value.replace(/\D/g,'')"
                   />
                 </template>

From c8a05307f9f310c06499170f3cb1f4762fb6a496 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 12 Jul 2024 14:57:48 +0800
Subject: [PATCH 384/408] =?UTF-8?q?=E5=A4=B1=E5=8E=BB=E7=84=A6=E7=82=B9?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/areabasic/index.ts                |   5 +
 src/components/BasicForm/src/BasicForm.vue    | 117 ++++++++----------
 .../itemManage/itemarea/itemarea.data.ts      |  67 +++++++++-
 .../itemwarehouse/itemwarehouse.data.ts       |  20 ++-
 .../packageunit/packageunit.data.ts           |  11 +-
 .../productionlineitem.data.ts                |   8 ++
 6 files changed, 156 insertions(+), 72 deletions(-)

diff --git a/src/api/wms/areabasic/index.ts b/src/api/wms/areabasic/index.ts
index 1295c4629..2a3e2bb07 100644
--- a/src/api/wms/areabasic/index.ts
+++ b/src/api/wms/areabasic/index.ts
@@ -65,4 +65,9 @@ export const exportArea = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/areabasic/get-import-template' })
+}
+
+// 根据code获取数据列表
+export const getAreabasicByCodes = async (params) => {
+  return await request.get({ url: `/wms/areabasic/listByCodes`, params })
 }
\ No newline at end of file
diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 881963e63..e8a2d681f 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -856,63 +856,16 @@ const onBlur = async (field, e) => {
         formSchema.value.find((item) => item.field == field)?.componentProps?.verificationParams ||
         []
       console.log('走新方法啦')
-      searchCondition = [...searchCondition, ...verificationParams]
+      // searchCondition = [...searchCondition, ...verificationParams]
+
       if (e && isString(e)) {
         let setV = {}
         setV[field] = ''
         let params = {}
-        // 循环参数设置参数为key：value格式
-        // if (searchCondition1 && searchCondition1.length > 0) {
-        //   for (let i = 0; i < searchCondition1.length; i++) {
-        //     searchCondition1[i].isSearch = true
-        //     if (searchCondition1[i].isMainValue) {
-        //       params[searchCondition1[i].key] = formRef.value.formModel[searchCondition1[i].value]
-        //         ? formRef.value.formModel[searchCondition1[i].value]
-        //         : props.detailData
-        //         ? props.detailData[searchCondition1[i].value]
-        //         : ''
-        //       // 是否含有空参数情况
-        //       let isNull = false
-        //       if (params[searchCondition1[i].key] == '' || params[searchCondition1[i].key] == undefined) {
-        //         isNull = true
-        //       }
-        //       if (isNull) {
-        //         message.warning(
-        //           searchCondition1[i].message ? searchCondition1[i].message : '前置条件未选择！'
-        //         )
-        //         return
-        //       }
-        //     } else {
-        //       // 扩展 转换为筛选条件进行查询
-        //       if (searchCondition1[i].isSearch) {
-        //         if (searchCondition1[i].isFormModel) {
-        //           //用formModel中的值
-        //           if (searchCondition1[i].required) {
-        //             if (
-        //               formRef.value.formModel[searchCondition1[i].value] == '' ||
-        //               formRef.value.formModel[searchCondition1[i].value] == undefined
-        //             ) {
-        //               message.warning(
-        //                 searchCondition1[i].message
-        //                   ? searchCondition1[i].message
-        //                   : '前置条件未选择！'
-        //               )
-        //               return
-        //             }
-        //           }
-        //         }
-        //         params[searchCondition1[i].key] = searchCondition1[i].value
-        //       } else {
-        //         params[searchCondition1[i].key] = searchCondition1[i].value
-        //       }
-        //     }
-        //   }
-        // }
-        // 判断查询条件中，是否存在指向主表的数据
         const _searchCondition = {}
+        let filters: any[] = []
         if (searchCondition && searchCondition.length > 0) {
           // 转换筛选条件所需
-          let filters: any[] = []
           for (var i = 0; i < searchCondition.length; i++) {
             // searchCondition.forEach((item) => {
             // 查询条件为主表某字段，需要赋值主表数据，数据来源是详情的，赋值需要从row中获取
@@ -924,10 +877,8 @@ const onBlur = async (field, e) => {
                 : props.detailData
                 ? props.detailData[searchCondition[i].value]
                 : // : row
-                // ? row[searchCondition[i].value]
-                e
-                ? e.trim()
-                : ''
+                  // ? row[searchCondition[i].value]
+                  ''
               // 是否含有空参数情况
               let isNull = false
               if (
@@ -942,7 +893,13 @@ const onBlur = async (field, e) => {
                 )
                 return
               }
+              filters.push({
+                action: searchCondition[i].action || '==',
+                column: searchCondition[i].key,
+                value: formRef.value.formModel[searchCondition[i].value]
+              })
             }
+
             // else if (searchCondition[i].isTableRowValue) {
             //   if (searchCondition[i].required) {
             //     if (row[searchCondition[i].value] == '' || row[searchCondition[i].value] == undefined) {
@@ -973,35 +930,68 @@ const onBlur = async (field, e) => {
                     }
                   }
                   filters.push({
-                    action: searchCondition[i].action,
+                    action: searchCondition[i].action || '==',
                     column: searchCondition[i].key,
                     value: formRef.value.formModel[searchCondition[i].value]
-                      ? formRef.value.formModel[searchCondition[i].value]
-                      : e.trim()
                   })
                 } else {
                   filters.push({
-                    action: searchCondition[i].action,
+                    action: searchCondition[i].action || '==',
                     column: searchCondition[i].key,
                     value: searchCondition[i].value
                   })
                 }
               } else {
-                _searchCondition[searchCondition[i].key] = searchCondition[i].value
+                filters.push({
+                action: searchCondition[i].action || '==',
+                column: searchCondition[i].key,
+                value: searchCondition[i].value
+              })
               }
             }
           }
-          if (filters.length > 0) {
-            _searchCondition.isSearch = true
-            _searchCondition.filters = filters
+        }
+        if (verificationParams && verificationParams.length > 0) {
+          // 转换筛选条件所需
+          for (var i = 0; i < verificationParams.length; i++) {
+            // 扩展 转换为筛选条件进行查询
+            if (verificationParams[i].isSearch) {
+              if (verificationParams[i].isFormModel) {
+                filters.push({
+                  action: verificationParams[i].action,
+                  column: verificationParams[i].key,
+                  value: formRef.value.formModel[verificationParams[i].value]
+                    ? formRef.value.formModel[verificationParams[i].value]
+                    : e.trim()
+                })
+              } else {
+                filters.push({
+                  action: verificationParams[i].action,
+                  column: verificationParams[i].key,
+                  value: verificationParams[i].value
+                })
+              }
+            } else {
+              _searchCondition[verificationParams[i].key] = verificationParams[i].value
+            }
           }
         }
+        if (filters.length > 0) {
+          _searchCondition.isSearch = true
+          _searchCondition.filters = filters
+        }
+        console.log(4545, _searchCondition)
         let obj = {
           by: 'ASC',
           pageNo: 1,
           pageSize: 20
         }
-        params = { ..._searchCondition, ...obj }
+        console.log(888,_searchCondition)
+        params = {
+          isSearch:_searchCondition.isSearch,
+          filters:_searchCondition.filters,
+          ...obj
+        }
         // console.log(333,params)
         if (!formSchemaObj?.multiple && e.indexOf(',') > -1) {
           message.alert('该输入框只能输入一条数据')
@@ -1059,6 +1049,7 @@ const onBlur = async (field, e) => {
   isExecute.value = true
 }
 
+
 // 批量增加
 const batchAdd = async (val) => {
   const row = {}
diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
index d68758f60..275ff5890 100644
--- a/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
@@ -38,7 +38,15 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -64,7 +72,15 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -106,7 +122,15 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
         searchCondition: [{
           key: 'available',
           value: 'TRUE',
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -136,7 +160,17 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
           value: 'itemCode',
           message: "请选择物料代码",
           isMainValue: true
-        }]
+          }],
+        verificationParams: [{
+          key: 'packUnit',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+          required: true,
+          message: '请选择物料代码',
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -166,7 +200,18 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
           value: 'itemCode',
           message: "请选择物料代码",
           isMainValue: true
-        }]
+          }],
+        verificationParams: [{
+          key: 'packUnit',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+          required: true,
+          message: '请选择物料代码',
+          isBlurParams:true,//是否是失去焦点的方法的参数
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -270,7 +315,17 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+          required: true,
+          message: '请选择物料代码',
+        }], // 失去焦点校验参数
       }
     }
   },
diff --git a/src/views/wms/basicDataManage/itemManage/itemwarehouse/itemwarehouse.data.ts b/src/views/wms/basicDataManage/itemManage/itemwarehouse/itemwarehouse.data.ts
index 1f1c1c619..97a56f508 100644
--- a/src/views/wms/basicDataManage/itemManage/itemwarehouse/itemwarehouse.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itemwarehouse/itemwarehouse.data.ts
@@ -32,7 +32,15 @@ export const Itemwarehouse = useCrudSchemas(reactive<CrudSchema[]>([
           action: '==',
           isSearch: true,
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: 'true',
+          isFormModel: true
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -60,7 +68,15 @@ export const Itemwarehouse = useCrudSchemas(reactive<CrudSchema[]>([
           action: '==',
           isSearch: true,
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: 'true',
+          isFormModel: true
+        }], // 失去焦点校验参数
       }
     }
   },
diff --git a/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts b/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts
index 33fdc3d71..1c20eec7f 100644
--- a/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts
@@ -334,6 +334,7 @@ export const Packageunit = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch: true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择父包装代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
@@ -344,7 +345,15 @@ export const Packageunit = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: 'true',
+          isFormModel: true
+        }], // 失去焦点校验参数
       }
     }
   },
diff --git a/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts b/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts
index 39ccfe830..3349d07b3 100644
--- a/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts
@@ -116,6 +116,14 @@ export const Productionlineitem = useCrudSchemas(reactive<CrudSchema[]>([
         searchTitle: '物料信息',
         searchAllSchemas: Itembasic.allSchemas,
         searchPage: ItembasicApi.getItembasicPage,
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: 'true',
+          isFormModel: true
+        }], // 失去焦点校验参数
         searchCondition: [
         {
           key:'enableMake',

From dfbfc0f87c0c19083beb18095850c3a678c66129 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 12 Jul 2024 15:29:08 +0800
Subject: [PATCH 385/408] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../transferissueRequestMain/index.vue        | 28 +++++++++++++------
 .../transferissueRequestMain.data.ts          |  3 +-
 .../index.vue                                 |  2 ++
 .../supplierinvoiceRecordMain.data.ts         | 17 +++++++++--
 .../supplierinvoiceRecordMain.data.ts         |  2 +-
 .../supplierinvoiceRequestMain/index.vue      |  2 +-
 .../supplierinvoiceRequestMain.data.ts        | 18 ++++++++++--
 7 files changed, 56 insertions(+), 16 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue
index c10f1bcc4..11ecd8cc3 100644
--- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue
@@ -114,17 +114,27 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
     if (type == 'tableForm') {
       // 明细查询页赋值
       if (formField == 'packingNumber') {
+        let itemCodes = []
         val.forEach(item=>{
-          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
-          newRow['packingNumber'] = item['packingNumber']
-          newRow['containerNumber'] = item['containerNumber']
-          newRow['batch'] = item['batch']
-          newRow['uom'] = item['uom']
-          newRow['inventoryStatus'] = item['inventoryStatus']
-          newRow['fromLocationCode'] = item['locationCode']
-          newRow['itemCode'] = item['itemCode']
-          tableData.value.push(newRow)
+          const findIndex = tableData.value.findIndex(valItem=>valItem['itemCode']==item.itemCode&&valItem['batch']==item.batch&&valItem['packingNumber']==item.packingNumber) 
+          if(findIndex == -1){
+            const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+            newRow['packingNumber'] = item['packingNumber']
+            newRow['containerNumber'] = item['containerNumber']
+            newRow['batch'] = item['batch']
+            newRow['uom'] = item['uom']
+            newRow['inventoryStatus'] = item['inventoryStatus']
+            newRow['fromLocationCode'] = item['locationCode']
+            newRow['itemCode'] = item['itemCode']
+            tableData.value.push(newRow)
+          }else{
+            itemCodes.push(item['packingNumber'])
+          }
         })
+        if(itemCodes.length>0){
+          message.warning(`${t('ts.包装号')}${itemCodes.join(',')}${t('ts.已经存在')}`);
+        }
+
       } else {
         row[formField] = val[0][searchField]
       }
diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
index 1d3630a91..dd15cd5ef 100644
--- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
@@ -619,8 +619,9 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
     tableForm:{
+      disabled:true,
       multiple:true,
-      isInpuFocusShow: true, // 开启查询弹窗
+      // isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择包装号',
       searchField: 'packingNumber',
       searchTitle: '库存余额信息',
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
index a066d3239..cc0ccf7cf 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
@@ -236,6 +236,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           newRow[formField] = item[searchField]
           tableData.value.push(newRow)
         })
+      }else{
+        row[formField] = val[0][searchField]
       }
     } else {
       const setV = {}
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
index 23823cded..0894abf29 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
@@ -667,7 +667,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '采购价格审批人',
-    field: 'procurementCreator',
+    field: 'procurementCreatorName',
     sort: 'custom',
     table: {
       width: 150
@@ -943,7 +943,7 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
   },
   {
     label: '采购价格审批人',
-    field: 'procurementCreator',
+    field: 'procurementCreatorName',
     sortTableDefault: 1003,
     isForm: false,
     isTable: false,
@@ -1156,6 +1156,19 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
     isSearch: false,
     isDetail: true,
   },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    sortTableDefault:1000,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  }
 ]))
 //表单校验
 export const SupplierinvoiceRecordMainRules = reactive({
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMainDifference/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMainDifference/supplierinvoiceRecordMain.data.ts
index d8edcb341..750b54375 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMainDifference/supplierinvoiceRecordMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMainDifference/supplierinvoiceRecordMain.data.ts
@@ -981,7 +981,7 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
   },
   {
     label: '采购价格审批人',
-    field: 'procurementCreator',
+    field: 'procurementCreatorName',
     sortTableDefault: 1003,
     isForm: false,
     isTable: false,
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 850ed72db..b1990ebc4 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -115,7 +115,7 @@
   
   <template #searchTableSelectionsActions="{selections}">
     <div style="text-align: left;margin-right:10px">
-      系统未税金额:{{selections.selections.reduce((prev, item) => prev + Number(Number(Number(Number(item['purchasePrice']).toFixed(2))*item['invoicableQuantity']).toFixed(2)),0)}}
+      系统未税金额:{{Number(selections.selections.reduce((prev, item) => prev + Number(Number(Number(Number(item['purchasePrice']).toFixed(2))*item['invoicableQuantity']).toFixed(2)),0)).toFixed(2)}}
     </div>
   </template>
   <!-- <template #foorter>
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index 90e359762..1eafe9afa 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -765,7 +765,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
   },
   {
     label: '采购价格审批人',
-    field: 'procurementCreator',
+    field: 'procurementCreatorName',
     table: {
       width: 150
     },
@@ -1219,7 +1219,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
   },
   {
     label: '采购价格审批人',
-    field: 'procurementCreator',
+    field: 'procurementCreatorName',
     sortTableDefault: 1003,
     isForm: false,
     isTable: false,
@@ -1432,6 +1432,20 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isSearch: false,
     isDetail: true,
   },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    sortTableDefault:1000,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+
 ]))
 const singlePriceFormart = (row, column, cellValue) => {
   cellValue= Number(cellValue).toFixed(2)

From dddfaee650217e867fa08e2a9fbe9a6e4347445e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com>
Date: Fri, 12 Jul 2024 15:38:44 +0800
Subject: [PATCH 386/408] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/aql/aql.data.ts                 | 1177 +++++++++--------
 src/views/qms/counter/counter.data.ts         |  333 +++--
 src/views/qms/dynamicRule/dynamicRule.data.ts |  170 ++-
 .../inspectionJob/inspectionJobMain.data.ts   |   68 +-
 .../inspectionMethod/inspectionMethod.data.ts |  218 +--
 .../inspectionRecordMain.data.ts              |   61 +-
 .../inspectionRequestMain.data.ts             |   81 +-
 .../inspectionScheme/inspectionScheme.data.ts |  489 +++----
 .../inspectionTemplate.data.ts                |  253 ++--
 .../qualityNotice/qualityNoticeMain.data.ts   |  629 +++++----
 src/views/qms/sampleCode/sampleCode.data.ts   |  302 +++--
 .../samplingProcess/samplingProcess.data.ts   |  265 ++--
 .../qms/samplingScheme/samplingScheme.data.ts |  166 ++-
 src/views/qms/selectedSet/selectedSet.data.ts |  152 ++-
 14 files changed, 2542 insertions(+), 1822 deletions(-)

diff --git a/src/views/qms/aql/aql.data.ts b/src/views/qms/aql/aql.data.ts
index 4c9fa28fc..f60bf83b7 100644
--- a/src/views/qms/aql/aql.data.ts
+++ b/src/views/qms/aql/aql.data.ts
@@ -1,583 +1,614 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
-import { getSamplingScheme } from "@/api/qms/aql";
-import {validateNum, validateSampleCode} from "@/utils/validator";
+import { getSamplingScheme } from '@/api/qms/aql'
+import { validateNum, validateSampleCode } from '@/utils/validator'
 
 // 表单校验
 export const AqlRules = reactive({
   code: [required],
   inspectionQualification: [required],
-  sampleCharacterCode: [required, {max: 1, message: '长度不得超过1个字符', trigger: 'blur' }, {validator: validateSampleCode, message: '请输入1个大写字母', trigger: 'blur' }],
-  sampleQty: [required,{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  a0separator010: [required,{  validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  r0separator010: [required,{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  a0separator015: [required,{validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  r0separator015: [required,{validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  a0separator025: [required,{validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  r0separator025: [required,{validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  a0separator040: [required,{validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  r0separator040: [required,{validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  a0separator065: [required,{validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  r0separator065: [required,{validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  a0separator10: [required,{validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  r0separator10: [required,{validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  a0separator15: [required,{validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  r0separator15: [required,{validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  a0separator25: [required,{validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  r0separator25: [required,{validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  a0separator40: [required,{validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  r0separator40: [required,{validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  a0separator65: [required,{validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  r0separator65: [required,{validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  a1separator0: [required,{validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  r1separator0: [required,{validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  a1separator5: [required,{validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  r1separator5: [required,{validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  a2separator5: [required,{validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  r2separator5: [required,{validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  a4separator0: [required,{validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  r4separator0: [required,{validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  a6separator5: [required,{validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  r6separator5: [required,{validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  a10: [required,{validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  r10: [required,{validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  a15: [required,{validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  r15: [required,{validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  a25: [required,{validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  r25: [required,{validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  a40: [required,{validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  r40: [required,{validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  a65: [required,{validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  r65: [required,{validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  a100: [required,{validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  r100: [required,{validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  a150: [required,{validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  r150: [required,{validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  a250: [required,{validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  r250: [required,{validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  a400: [required,{validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  r400: [required,{validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  a650: [required,{validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  r650: [required,{validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  a1000: [required,{validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  r1000: [required,{validator: validateNum, message: '请输入整数', trigger: 'blur' }],
+  sampleCharacterCode: [
+    required,
+    { max: 1, message: '长度不得超过1个字符', trigger: 'blur' },
+    { validator: validateSampleCode, message: '请输入1个大写字母', trigger: 'blur' }
+  ],
+  sampleQty: [required, { validator: validateNum, message: '请输入整数', trigger: 'blur' }],
+  a0separator010: [required, { validator: validateNum, message: '请输入整数', trigger: 'blur' }],
+  r0separator010: [required, { validator: validateNum, message: '请输入整数', trigger: 'blur' }],
+  a0separator015: [required, { validator: validateNum, message: '请输入整数', trigger: 'blur' }],
+  r0separator015: [required, { validator: validateNum, message: '请输入整数', trigger: 'blur' }],
+  a0separator025: [required, { validator: validateNum, message: '请输入整数', trigger: 'blur' }],
+  r0separator025: [required, { validator: validateNum, message: '请输入整数', trigger: 'blur' }],
+  a0separator040: [required, { validator: validateNum, message: '请输入整数', trigger: 'blur' }],
+  r0separator040: [required, { validator: validateNum, message: '请输入整数', trigger: 'blur' }],
+  a0separator065: [required, { validator: validateNum, message: '请输入整数', trigger: 'blur' }],
+  r0separator065: [required, { validator: validateNum, message: '请输入整数', trigger: 'blur' }],
+  a0separator10: [required, { validator: validateNum, message: '请输入整数', trigger: 'blur' }],
+  r0separator10: [required, { validator: validateNum, message: '请输入整数', trigger: 'blur' }],
+  a0separator15: [required, { validator: validateNum, message: '请输入整数', trigger: 'blur' }],
+  r0separator15: [required, { validator: validateNum, message: '请输入整数', trigger: 'blur' }],
+  a0separator25: [required, { validator: validateNum, message: '请输入整数', trigger: 'blur' }],
+  r0separator25: [required, { validator: validateNum, message: '请输入整数', trigger: 'blur' }],
+  a0separator40: [required, { validator: validateNum, message: '请输入整数', trigger: 'blur' }],
+  r0separator40: [required, { validator: validateNum, message: '请输入整数', trigger: 'blur' }],
+  a0separator65: [required, { validator: validateNum, message: '请输入整数', trigger: 'blur' }],
+  r0separator65: [required, { validator: validateNum, message: '请输入整数', trigger: 'blur' }],
+  a1separator0: [required, { validator: validateNum, message: '请输入整数', trigger: 'blur' }],
+  r1separator0: [required, { validator: validateNum, message: '请输入整数', trigger: 'blur' }],
+  a1separator5: [required, { validator: validateNum, message: '请输入整数', trigger: 'blur' }],
+  r1separator5: [required, { validator: validateNum, message: '请输入整数', trigger: 'blur' }],
+  a2separator5: [required, { validator: validateNum, message: '请输入整数', trigger: 'blur' }],
+  r2separator5: [required, { validator: validateNum, message: '请输入整数', trigger: 'blur' }],
+  a4separator0: [required, { validator: validateNum, message: '请输入整数', trigger: 'blur' }],
+  r4separator0: [required, { validator: validateNum, message: '请输入整数', trigger: 'blur' }],
+  a6separator5: [required, { validator: validateNum, message: '请输入整数', trigger: 'blur' }],
+  r6separator5: [required, { validator: validateNum, message: '请输入整数', trigger: 'blur' }],
+  a10: [required, { validator: validateNum, message: '请输入整数', trigger: 'blur' }],
+  r10: [required, { validator: validateNum, message: '请输入整数', trigger: 'blur' }],
+  a15: [required, { validator: validateNum, message: '请输入整数', trigger: 'blur' }],
+  r15: [required, { validator: validateNum, message: '请输入整数', trigger: 'blur' }],
+  a25: [required, { validator: validateNum, message: '请输入整数', trigger: 'blur' }],
+  r25: [required, { validator: validateNum, message: '请输入整数', trigger: 'blur' }],
+  a40: [required, { validator: validateNum, message: '请输入整数', trigger: 'blur' }],
+  r40: [required, { validator: validateNum, message: '请输入整数', trigger: 'blur' }],
+  a65: [required, { validator: validateNum, message: '请输入整数', trigger: 'blur' }],
+  r65: [required, { validator: validateNum, message: '请输入整数', trigger: 'blur' }],
+  a100: [required, { validator: validateNum, message: '请输入整数', trigger: 'blur' }],
+  r100: [required, { validator: validateNum, message: '请输入整数', trigger: 'blur' }],
+  a150: [required, { validator: validateNum, message: '请输入整数', trigger: 'blur' }],
+  r150: [required, { validator: validateNum, message: '请输入整数', trigger: 'blur' }],
+  a250: [required, { validator: validateNum, message: '请输入整数', trigger: 'blur' }],
+  r250: [required, { validator: validateNum, message: '请输入整数', trigger: 'blur' }],
+  a400: [required, { validator: validateNum, message: '请输入整数', trigger: 'blur' }],
+  r400: [required, { validator: validateNum, message: '请输入整数', trigger: 'blur' }],
+  a650: [required, { validator: validateNum, message: '请输入整数', trigger: 'blur' }],
+  r650: [required, { validator: validateNum, message: '请输入整数', trigger: 'blur' }],
+  a1000: [required, { validator: validateNum, message: '请输入整数', trigger: 'blur' }],
+  r1000: [required, { validator: validateNum, message: '请输入整数', trigger: 'blur' }]
 })
 const samplingSchemeList = await getSamplingScheme()
-export const Aql = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '采样方案编码',
-    field: 'code',
-    sort: 'custom',
-    isSearch: true,
-    form: {
-      component: 'Select',
-      componentProps: {
-        options: samplingSchemeList,
-        optionsAlias: {
-          labelField: 'description',
-          valueField: 'code'
-        },
-      }
-    },
-    table: {
-      width: 175,
-      fixed: 'left'
-    }
-  },
-  {
-    label: '检验严格性',
-    field: 'inspectionQualification',
-    sort: 'custom',
-    dictType: DICT_TYPE.INSPECTION_SEVERITY,
-    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    isSearch: true,
-    form: {
-      component: 'Select'
-    },
-    table: {
-      width: 130
-    }
-  },
-  {
-    label: '样本字码',
-    field: 'sampleCharacterCode',
-    sort: 'custom',
-    isSearch: true,
-    table: {
-      width: 110
-    }
-  },
-  {
-    label: '样品份数',
-    field: 'sampleQty',
-    sort: 'custom',
-    table: {
-      width: 95
-    }
-  },
-  {
-    label: 'A0.01',
-    field: 'a0separator010',
-    sort: 'custom',
-    table: {
-      width: 105
-    }
-  },
-  {
-    label: 'R0.01',
-    field: 'r0separator010',
-    sort: 'custom',
-    table: {
-      width: 105
-    }
-  },
-  {
-    label: 'A0.015',
-    field: 'a0separator015',
-    sort: 'custom',
-    table: {
-      width: 105
-    }
-  },
-  {
-    label: 'R0.015',
-    field: 'r0separator015',
-    sort: 'custom',
-    table: {
-      width: 105
-    }
-  },
-  {
-    label: 'A0.025',
-    field: 'a0separator025',
-    sort: 'custom',
-    table: {
-      width: 105
-    }
-  },
-  {
-    label: 'R0.025',
-    field: 'r0separator025',
-    sort: 'custom',
-    table: {
-      width: 105
-    }
-  },
-  {
-    label: 'A0.04',
-    field: 'a0separator040',
-    sort: 'custom',
-    table: {
-      width: 105
-    }
-  },
-  {
-    label: 'R0.04',
-    field: 'r0separator040',
-    sort: 'custom',
-    table: {
-      width: 105
-    }
-  },
-  {
-    label: 'A0.065',
-    field: 'a0separator065',
-    sort: 'custom',
-    table: {
-      width: 105
-    }
-  },
-  {
-    label: 'R0.065',
-    field: 'r0separator065',
-    sort: 'custom',
-    table: {
-      width: 105
-    }
-  },
-  {
-    label: 'A0.1',
-    field: 'a0separator10',
-    sort: 'custom',
-    table: {
-      width: 105
-    }
-  },
-  {
-    label: 'R0.1',
-    field: 'r0separator10',
-    sort: 'custom',
-    table: {
-      width: 105
-    }
-  },
-  {
-    label: 'A0.15',
-    field: 'a0separator15',
-    sort: 'custom',
-    table: {
-      width: 105
-    }
-  },
-  {
-    label: 'R0.15',
-    field: 'r0separator15',
-    sort: 'custom',
-    table: {
-      width: 105
-    }
-  },
-  {
-    label: 'A0.25',
-    field: 'a0separator25',
-    sort: 'custom',
-    table: {
-      width: 105
-    }
-  },
-  {
-    label: 'R0.25',
-    field: 'r0separator25',
-    sort: 'custom',
-    table: {
-      width: 105
-    }
-  },
-  {
-    label: 'A0.4',
-    field: 'a0separator40',
-    sort: 'custom',
-    table: {
-      width: 105
-    }
-  },
-  {
-    label: 'R0.4',
-    field: 'r0separator40',
-    sort: 'custom',
-    table: {
-      width: 105
-    }
-  },
-  {
-    label: 'A0.65',
-    field: 'a0separator65',
-    sort: 'custom',
-    table: {
-      width: 105
-    }
-  },
-  {
-    label: 'R0.65',
-    field: 'r0separator65',
-    sort: 'custom',
-    table: {
-      width: 105
-    }
-  },
-  {
-    label: 'A1.0',
-    field: 'a1separator0',
-    sort: 'custom',
-    table: {
-      width: 105
-    }
-  },
-  {
-    label: 'R1.0',
-    field: 'r1separator0',
-    sort: 'custom',
-    table: {
-      width: 105
-    }
-  },
-  {
-    label: 'A1.5',
-    field: 'a1separator5',
-    sort: 'custom',
-    table: {
-      width: 105
-    }
-  },
-  {
-    label: 'R1.5',
-    field: 'r1separator5',
-    sort: 'custom',
-    table: {
-      width: 105
-    }
-  },
-  {
-    label: 'A2.5',
-    field: 'a2separator5',
-    sort: 'custom',
-    table: {
-      width: 105
-    }
-  },
-  {
-    label: 'R2.5',
-    field: 'r2separator5',
-    sort: 'custom',
-    table: {
-      width: 105
-    }
-  },
-  {
-    label: 'A4.0',
-    field: 'a4separator0',
-    sort: 'custom',
-    table: {
-      width: 105
-    }
-  },
-  {
-    label: 'R4.0',
-    field: 'r4separator0',
-    sort: 'custom',
-    table: {
-      width: 105
-    }
-  },
-  {
-    label: 'A6.5',
-    field: 'a6separator5',
-    sort: 'custom',
-    table: {
-      width: 105
-    }
-  },
-  {
-    label: 'R6.5',
-    field: 'r6separator5',
-    sort: 'custom',
-    table: {
-      width: 105
-    }
-  },
-  {
-    label: 'A10',
-    field: 'a10',
-    sort: 'custom',
-    table: {
-      width: 105
-    }
-  },
-  {
-    label: 'R10',
-    field: 'r10',
-    sort: 'custom',
-    table: {
-      width: 105
-    }
-  },
-  {
-    label: 'A15',
-    field: 'a15',
-    sort: 'custom',
-    table: {
-      width: 105
-    }
-  },
-  {
-    label: 'R15',
-    field: 'r15',
-    sort: 'custom',
-    table: {
-      width: 105
-    }
-  },
-  {
-    label: 'A25',
-    field: 'a25',
-    sort: 'custom',
-    table: {
-      width: 105
-    }
-  },
-  {
-    label: 'R25',
-    field: 'r25',
-    sort: 'custom',
-    table: {
-      width: 105
-    }
-  },
-  {
-    label: 'A40',
-    field: 'a40',
-    sort: 'custom',
-    table: {
-      width: 105
-    }
-  },
-  {
-    label: 'R40',
-    field: 'r40',
-    sort: 'custom',
-    table: {
-      width: 105
-    }
-  },
-  {
-    label: 'A65',
-    field: 'a65',
-    sort: 'custom',
-    table: {
-      width: 105
-    }
-  },
-  {
-    label: 'R65',
-    field: 'r65',
-    sort: 'custom',
-    table: {
-      width: 105
-    }
-  },
-  {
-    label: 'A100',
-    field: 'a100',
-    sort: 'custom',
-    table: {
-      width: 105
-    }
-  },
-  {
-    label: 'R100',
-    field: 'r100',
-    sort: 'custom',
-    table: {
-      width: 105
-    }
-  },
-  {
-    label: 'A150',
-    field: 'a150',
-    sort: 'custom',
-    table: {
-      width: 105
-    }
-  },
-  {
-    label: 'R150',
-    field: 'r150',
-    sort: 'custom',
-    table: {
-      width: 105
-    }
-  },
-  {
-    label: 'A250',
-    field: 'a250',
-    sort: 'custom',
-    table: {
-      width: 105
-    }
-  },
-  {
-    label: 'R250',
-    field: 'r250',
-    sort: 'custom',
-    table: {
-      width: 105
-    }
-  },
-  {
-    label: 'A400',
-    field: 'a400',
-    sort: 'custom',
-    table: {
-      width: 105
-    }
-  },
-  {
-    label: 'R400',
-    field: 'r400',
-    sort: 'custom',
-    table: {
-      width: 105
-    }
-  },
-  {
-    label: 'A650',
-    field: 'a650',
-    sort: 'custom',
-    table: {
-      width: 105
-    }
-  },
-  {
-    label: 'R650',
-    field: 'r650',
-    sort: 'custom',
-    table: {
-      width: 105
-    }
-  },
-  {
-    label: 'A1000',
-    field: 'a1000',
-    sort: 'custom',
-    table: {
-      width: 105
-    }
-  },
-  {
-    label: 'R1000',
-    field: 'r1000',
-    sort: 'custom',
-    table: {
-      width: 105
-    }
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isForm: false,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: { width: '100%' },
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-    table: {
-      width: 175
-    }
-  },
-  // {
-  //   label: '是否可用',
-  //   field: 'available',
-  //   sort: 'custom',
-  //   dictType: DICT_TYPE.TRUE_FALSE,
-  //   dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-  //   form: {
-  //     component: 'Switch',
-  //     value: 'TRUE',
-  //     componentProps: {
-  //       inactiveValue: 'FALSE',
-  //       activeValue: 'TRUE'
-  //     }
-  //   },
-  //   table: {
-  //     width: 110
-  //   }
-  // },
-  {
-    label: '操作',
-    field: 'action',
-    isForm: false,
-    table: {
-      width: 150,
-      fixed: 'right'
+export const Aql = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '采样方案编码',
+      field: 'code',
+      sort: 'custom',
+      isSearch: true,
+      form: {
+        component: 'Select',
+        componentProps: {
+          options: samplingSchemeList,
+          optionsAlias: {
+            labelField: 'description',
+            valueField: 'code'
+          }
+        }
+      },
+      table: {
+        width: 175,
+        fixed: 'left'
+      }
+    },
+    {
+      label: '检验严格性',
+      field: 'inspectionQualification',
+      sort: 'custom',
+      dictType: DICT_TYPE.INSPECTION_SEVERITY,
+      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+      isSearch: true,
+      form: {
+        component: 'Select'
+      },
+      table: {
+        width: 130
+      }
+    },
+    {
+      label: '样本字码',
+      field: 'sampleCharacterCode',
+      sort: 'custom',
+      isSearch: true,
+      table: {
+        width: 110
+      }
+    },
+    {
+      label: '样品份数',
+      field: 'sampleQty',
+      sort: 'custom',
+      table: {
+        width: 95
+      }
+    },
+    {
+      label: 'A0.01',
+      field: 'a0separator010',
+      sort: 'custom',
+      table: {
+        width: 105
+      }
+    },
+    {
+      label: 'R0.01',
+      field: 'r0separator010',
+      sort: 'custom',
+      table: {
+        width: 105
+      }
+    },
+    {
+      label: 'A0.015',
+      field: 'a0separator015',
+      sort: 'custom',
+      table: {
+        width: 105
+      }
+    },
+    {
+      label: 'R0.015',
+      field: 'r0separator015',
+      sort: 'custom',
+      table: {
+        width: 105
+      }
+    },
+    {
+      label: 'A0.025',
+      field: 'a0separator025',
+      sort: 'custom',
+      table: {
+        width: 105
+      }
+    },
+    {
+      label: 'R0.025',
+      field: 'r0separator025',
+      sort: 'custom',
+      table: {
+        width: 105
+      }
+    },
+    {
+      label: 'A0.04',
+      field: 'a0separator040',
+      sort: 'custom',
+      table: {
+        width: 105
+      }
+    },
+    {
+      label: 'R0.04',
+      field: 'r0separator040',
+      sort: 'custom',
+      table: {
+        width: 105
+      }
+    },
+    {
+      label: 'A0.065',
+      field: 'a0separator065',
+      sort: 'custom',
+      table: {
+        width: 105
+      }
+    },
+    {
+      label: 'R0.065',
+      field: 'r0separator065',
+      sort: 'custom',
+      table: {
+        width: 105
+      }
+    },
+    {
+      label: 'A0.1',
+      field: 'a0separator10',
+      sort: 'custom',
+      table: {
+        width: 105
+      }
+    },
+    {
+      label: 'R0.1',
+      field: 'r0separator10',
+      sort: 'custom',
+      table: {
+        width: 105
+      }
+    },
+    {
+      label: 'A0.15',
+      field: 'a0separator15',
+      sort: 'custom',
+      table: {
+        width: 105
+      }
+    },
+    {
+      label: 'R0.15',
+      field: 'r0separator15',
+      sort: 'custom',
+      table: {
+        width: 105
+      }
+    },
+    {
+      label: 'A0.25',
+      field: 'a0separator25',
+      sort: 'custom',
+      table: {
+        width: 105
+      }
+    },
+    {
+      label: 'R0.25',
+      field: 'r0separator25',
+      sort: 'custom',
+      table: {
+        width: 105
+      }
+    },
+    {
+      label: 'A0.4',
+      field: 'a0separator40',
+      sort: 'custom',
+      table: {
+        width: 105
+      }
+    },
+    {
+      label: 'R0.4',
+      field: 'r0separator40',
+      sort: 'custom',
+      table: {
+        width: 105
+      }
+    },
+    {
+      label: 'A0.65',
+      field: 'a0separator65',
+      sort: 'custom',
+      table: {
+        width: 105
+      }
+    },
+    {
+      label: 'R0.65',
+      field: 'r0separator65',
+      sort: 'custom',
+      table: {
+        width: 105
+      }
+    },
+    {
+      label: 'A1.0',
+      field: 'a1separator0',
+      sort: 'custom',
+      table: {
+        width: 105
+      }
+    },
+    {
+      label: 'R1.0',
+      field: 'r1separator0',
+      sort: 'custom',
+      table: {
+        width: 105
+      }
+    },
+    {
+      label: 'A1.5',
+      field: 'a1separator5',
+      sort: 'custom',
+      table: {
+        width: 105
+      }
+    },
+    {
+      label: 'R1.5',
+      field: 'r1separator5',
+      sort: 'custom',
+      table: {
+        width: 105
+      }
+    },
+    {
+      label: 'A2.5',
+      field: 'a2separator5',
+      sort: 'custom',
+      table: {
+        width: 105
+      }
+    },
+    {
+      label: 'R2.5',
+      field: 'r2separator5',
+      sort: 'custom',
+      table: {
+        width: 105
+      }
+    },
+    {
+      label: 'A4.0',
+      field: 'a4separator0',
+      sort: 'custom',
+      table: {
+        width: 105
+      }
+    },
+    {
+      label: 'R4.0',
+      field: 'r4separator0',
+      sort: 'custom',
+      table: {
+        width: 105
+      }
+    },
+    {
+      label: 'A6.5',
+      field: 'a6separator5',
+      sort: 'custom',
+      table: {
+        width: 105
+      }
+    },
+    {
+      label: 'R6.5',
+      field: 'r6separator5',
+      sort: 'custom',
+      table: {
+        width: 105
+      }
+    },
+    {
+      label: 'A10',
+      field: 'a10',
+      sort: 'custom',
+      table: {
+        width: 105
+      }
+    },
+    {
+      label: 'R10',
+      field: 'r10',
+      sort: 'custom',
+      table: {
+        width: 105
+      }
+    },
+    {
+      label: 'A15',
+      field: 'a15',
+      sort: 'custom',
+      table: {
+        width: 105
+      }
+    },
+    {
+      label: 'R15',
+      field: 'r15',
+      sort: 'custom',
+      table: {
+        width: 105
+      }
+    },
+    {
+      label: 'A25',
+      field: 'a25',
+      sort: 'custom',
+      table: {
+        width: 105
+      }
+    },
+    {
+      label: 'R25',
+      field: 'r25',
+      sort: 'custom',
+      table: {
+        width: 105
+      }
+    },
+    {
+      label: 'A40',
+      field: 'a40',
+      sort: 'custom',
+      table: {
+        width: 105
+      }
+    },
+    {
+      label: 'R40',
+      field: 'r40',
+      sort: 'custom',
+      table: {
+        width: 105
+      }
+    },
+    {
+      label: 'A65',
+      field: 'a65',
+      sort: 'custom',
+      table: {
+        width: 105
+      }
+    },
+    {
+      label: 'R65',
+      field: 'r65',
+      sort: 'custom',
+      table: {
+        width: 105
+      }
+    },
+    {
+      label: 'A100',
+      field: 'a100',
+      sort: 'custom',
+      table: {
+        width: 105
+      }
+    },
+    {
+      label: 'R100',
+      field: 'r100',
+      sort: 'custom',
+      table: {
+        width: 105
+      }
+    },
+    {
+      label: 'A150',
+      field: 'a150',
+      sort: 'custom',
+      table: {
+        width: 105
+      }
+    },
+    {
+      label: 'R150',
+      field: 'r150',
+      sort: 'custom',
+      table: {
+        width: 105
+      }
+    },
+    {
+      label: 'A250',
+      field: 'a250',
+      sort: 'custom',
+      table: {
+        width: 105
+      }
+    },
+    {
+      label: 'R250',
+      field: 'r250',
+      sort: 'custom',
+      table: {
+        width: 105
+      }
+    },
+    {
+      label: 'A400',
+      field: 'a400',
+      sort: 'custom',
+      table: {
+        width: 105
+      }
+    },
+    {
+      label: 'R400',
+      field: 'r400',
+      sort: 'custom',
+      table: {
+        width: 105
+      }
+    },
+    {
+      label: 'A650',
+      field: 'a650',
+      sort: 'custom',
+      table: {
+        width: 105
+      }
+    },
+    {
+      label: 'R650',
+      field: 'r650',
+      sort: 'custom',
+      table: {
+        width: 105
+      }
+    },
+    {
+      label: 'A1000',
+      field: 'a1000',
+      sort: 'custom',
+      table: {
+        width: 105
+      }
+    },
+    {
+      label: 'R1000',
+      field: 'r1000',
+      sort: 'custom',
+      table: {
+        width: 105
+      }
+    },
+    {
+      label: '创建时间',
+      field: 'createTime',
+      isForm: false,
+      table: {
+        width: 180
+      },
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      }
+    },
+    {
+      label: '创建者',
+      field: 'creator',
+      table: {
+        width: 130
+      },
+      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: 'action',
+      isForm: false,
+      isDetail: false,
+      table: {
+        width: 150,
+        fixed: 'right'
+      }
     }
-  }
-]))
+  ])
+)
diff --git a/src/views/qms/counter/counter.data.ts b/src/views/qms/counter/counter.data.ts
index 5d17afaae..96a3cb3ea 100644
--- a/src/views/qms/counter/counter.data.ts
+++ b/src/views/qms/counter/counter.data.ts
@@ -13,147 +13,214 @@ export const CounterRules = reactive({
   concurrencyStamp: [required]
 })
 
-export const Counter = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '物料编码',
-    field: 'itemCode',
-    sort: 'custom',
-    isSearch: true,
-    fixed: 'left',
-    table: {
+export const Counter = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '物料编码',
+      field: 'itemCode',
+      sort: 'custom',
+      isSearch: true,
       fixed: 'left',
-      width: 175
-    }
-  },
-  {
-    label: '检验类型编码',
-    field: 'inspectionType',
-    sort: 'custom',
-    isSearch: true,
-    dictType: DICT_TYPE.INSPECTION_TYPE,
-    table: {
-      width: 175
-    }
-  },
-  {
-    label: '供应商编码',
-    field: 'supplierCode',
-    sort: 'custom',
-    isSearch: true,
-    table: {
-      width: 175
-    }
-  },
-  {
-    label: '连续合格次数',
-    field: 'qualifiedTimes',
-    sort: 'custom',
-    isSearch: false,
-    table: {
-      width: 140
-    }
-  },
-  {
-    label: '最后合格批次',
-    field: 'lastQualifiedBatch',
-    sort: 'custom',
-    isSearch: false,
-    table: {
-      width: 140
-    }
-  },
-  {
-    label: '最后合格时间',
-    field: 'lastQualifiedTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: true,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      table: {
+        fixed: 'left',
+        width: 175
       }
     },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
+    {
+      label: '检验类型编码',
+      field: 'inspectionType',
+      sort: 'custom',
+      isSearch: true,
+      dictType: DICT_TYPE.INSPECTION_TYPE,
+      table: {
+        width: 175
       }
     },
-    table: {
-      width: 175
-    }
-  },
-  {
-    label: '连续不合格次数',
-    field: 'unqualifiedTimes',
-    sort: 'custom',
-    isSearch: false,
-    form: {
-      component: 'InputNumber',
-      value: 0
+    {
+      label: '供应商编码',
+      field: 'supplierCode',
+      sort: 'custom',
+      isSearch: true,
+      table: {
+        width: 175
+      }
+    },
+    {
+      label: '连续合格次数',
+      field: 'qualifiedTimes',
+      sort: 'custom',
+      isSearch: false,
+      table: {
+        width: 140
+      }
+    },
+    {
+      label: '最后合格批次',
+      field: 'lastQualifiedBatch',
+      sort: 'custom',
+      isSearch: false,
+      table: {
+        width: 140
+      }
+    },
+    {
+      label: '最后合格时间',
+      field: 'lastQualifiedTime',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isSearch: true,
+      search: {
+        component: 'DatePicker',
+        componentProps: {
+          valueFormat: 'YYYY-MM-DD HH:mm:ss',
+          type: 'daterange',
+          defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+        }
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          valueFormat: 'x'
+        }
+      },
+      table: {
+        width: 175
+      }
+    },
+    {
+      label: '连续不合格次数',
+      field: 'unqualifiedTimes',
+      sort: 'custom',
+      isSearch: false,
+      form: {
+        component: 'InputNumber',
+        value: 0
+      },
+      table: {
+        width: 140
+      }
+    },
+    {
+      label: '最后不合格批次',
+      field: 'lastUnqualifiedBatch',
+      sort: 'custom',
+      isSearch: false,
+      form: {
+        component: 'InputNumber',
+        value: 0
+      },
+      table: {
+        width: 175
+      }
+    },
+    {
+      label: '最后不合格时间',
+      field: 'lastUnqualifiedTime',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isSearch: false,
+      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'
+        }
+      },
+      table: {
+        width: 175
+      }
+    },
+    {
+      label: '下一检验阶段',
+      field: 'nextStage',
+      sort: 'custom',
+      isSearch: false,
+      table: {
+        width: 140
+      }
+    },
+    {
+      label: '创建时间',
+      field: 'createTime',
+      isForm: false,
+      table: {
+        width: 180
+      },
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      }
     },
-    table: {
-      width: 140
-    }
-  },
-  {
-    label: '最后不合格批次',
-    field: 'lastUnqualifiedBatch',
-    sort: 'custom',
-    isSearch: false,
-    form: {
-      component: 'InputNumber',
-      value: 0
+    {
+      label: '创建者',
+      field: 'creator',
+      table: {
+        width: 130
+      },
+      isForm: false,
+      isTable: true
     },
-    table: {
-      width: 175
-    }
-  },
-  {
-    label: '最后不合格时间',
-    field: 'lastUnqualifiedTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: false,
-    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: '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'
+        }
       }
     },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
+    {
+      label: '最后更新者',
+      field: 'updater',
+      isDetail: true,
+      isForm: false,
+      isTable: false,
+      table: {
+        width: 150
       }
     },
-    table: {
-      width: 175
-    }
-  },
-  {
-    label: '下一检验阶段',
-    field: 'nextStage',
-    sort: 'custom',
-    isSearch: false,
-    table: {
-      width: 140
-    }
-  },
-  // {
-  //   label: '操作',
-  //   field: 'action',
-  //   isForm: false,
-  //   table: {
-  //     width: 150,
-  //     fixed: 'right'
-  //   }
-  // }
-]))
+    
+    // {
+    //   label: '操作',
+    //   field: 'action',
+    //   isForm: false,
+    //   table: {
+    //     width: 150,
+    //     fixed: 'right'
+    //   }
+    // }
+  ])
+)
diff --git a/src/views/qms/dynamicRule/dynamicRule.data.ts b/src/views/qms/dynamicRule/dynamicRule.data.ts
index 55c0c56fa..3bf0ed6ca 100644
--- a/src/views/qms/dynamicRule/dynamicRule.data.ts
+++ b/src/views/qms/dynamicRule/dynamicRule.data.ts
@@ -2,63 +2,129 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
 import { string } from 'vue-types'
 
-const trueFalse = [{
-  label: '是',
-  value: true
-}, {
-  label: '否',
-  value: false
-}]
+const trueFalse = [
+  {
+    label: '是',
+    value: true
+  },
+  {
+    label: '否',
+    value: false
+  }
+]
 
 // 表单校验
 export const DynamicRuleRules = reactive({
-  description: [
-    required,
-    { max: 1024, message: '不得超过1024个字符', trigger: 'blur' },
-  ]
+  description: [required, { max: 1024, message: '不得超过1024个字符', trigger: 'blur' }]
 })
 
-export const DynamicRule = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '编码',
-    field: 'code',
-    sort: 'custom',
-    isSearch: true,
-    isForm: false,
-    fixed: 'left'
-  },
-  {
-    label: '描述',
-    field: 'description',
-    sort: 'custom',
-    isSearch: true
-  },
-  {
-    label: '是否可用',
-    field: 'available',
-    sort: 'custom',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+export const DynamicRule = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '编码',
+      field: 'code',
+      sort: 'custom',
+      isSearch: true,
+      isForm: false,
+      fixed: 'left'
+    },
+    {
+      label: '描述',
+      field: 'description',
+      sort: 'custom',
+      isSearch: true
+    },
+    {
+      label: '是否可用',
+      field: 'available',
+      sort: 'custom',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
+      },
+      table: {
+        width: 110
       }
     },
-    table: {
-      width: 110
+    {
+      label: '创建时间',
+      field: 'createTime',
+      isForm: false,
+      table: {
+        width: 180
+      },
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      }
+    },
+    {
+      label: '创建者',
+      field: 'creator',
+      table: {
+        width: 130
+      },
+      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: 'action',
+      isForm: false,
+      isDetail: false,
+      table: {
+        width: 150,
+        fixed: 'right'
+      }
     }
-  },
- {
-   label: '操作',
-   field: 'action',
-   isDetail: false,
-   isForm: false,
-   table: {
-     width: 330,
-     fixed: 'right'
-   },
- }
-]))
+  ])
+)
diff --git a/src/views/qms/inspectionJob/inspectionJobMain.data.ts b/src/views/qms/inspectionJob/inspectionJobMain.data.ts
index cf3999056..e9f6f983b 100644
--- a/src/views/qms/inspectionJob/inspectionJobMain.data.ts
+++ b/src/views/qms/inspectionJob/inspectionJobMain.data.ts
@@ -438,13 +438,77 @@ export const InspectionJobMain = useCrudSchemas(
     //     }
     //   }
     // },
+    {
+      label: '创建时间',
+      field: 'createTime',
+      isForm: false,
+      table: {
+        width: 180
+      },
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      }
+    },
+    {
+      label: '创建者',
+      field: 'creator',
+      table: {
+        width: 130
+      },
+      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: 'action',
-      isDetail: false,
       isForm: false,
+      isDetail: false,
       table: {
-        width: 300,
+        width: 150,
         fixed: 'right'
       }
     }
diff --git a/src/views/qms/inspectionMethod/inspectionMethod.data.ts b/src/views/qms/inspectionMethod/inspectionMethod.data.ts
index 3079f5f52..821f809d9 100644
--- a/src/views/qms/inspectionMethod/inspectionMethod.data.ts
+++ b/src/views/qms/inspectionMethod/inspectionMethod.data.ts
@@ -3,99 +3,145 @@ import { dateFormatter } from '@/utils/formatTime'
 
 // 表单校验
 export const InspectionMethodRules = reactive({
-  description: [required],
+  description: [required]
 })
 
-export const InspectionMethod = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '编码',
-    field: 'code',
-    sort: 'custom',
-    isSearch: true,
-    isForm:false,
-    table: {
-      fixed: 'left'
-    }
-  },
-  {
-    label: '描述',
-    field: 'description',
-    sort: 'custom',
-  },
-  {
-    label: '版本',
-    field: 'version',
-    sort: 'custom',
-  },
-  {
-    label: '操作指导',
-    field: 'operationGuidance',
-    sort: 'custom',
-  },
-  {
-    label: '文件',
-    field: 'videoAddress',
-    sort: 'custom',
-    isTable: false,
-    table: {
+export const InspectionMethod = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '编码',
+      field: 'code',
+      sort: 'custom',
+      isSearch: true,
+      isForm: false,
+      table: {
+        fixed: 'left'
+      }
+    },
+    {
+      label: '描述',
+      field: 'description',
+      sort: 'custom'
+    },
+    {
+      label: '版本',
+      field: 'version',
+      sort: 'custom'
+    },
+    {
+      label: '操作指导',
+      field: 'operationGuidance',
+      sort: 'custom'
     },
-    form: {
-      component: 'UploadFile',
-      componentProps: {
-        upData:{
-          tableName:'basicInspectionMethod',
-          tableId:'',
-        },
-        fileType:['doc', 'xls', 'ppt', 'txt'],
-        modelValue:[]
+    {
+      label: '文件',
+      field: 'videoAddress',
+      sort: 'custom',
+      isTable: false,
+      table: {},
+      form: {
+        component: 'UploadFile',
+        componentProps: {
+          upData: {
+            tableName: 'basicInspectionMethod',
+            tableId: ''
+          },
+          fileType: ['doc', 'xls', 'ppt', 'txt'],
+          modelValue: []
+        }
+      }
+    },
+    {
+      label: '是否可用',
+      field: 'available',
+      sort: 'custom',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
       },
-      
-    }
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isForm: false,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      table: {
+        width: 110
+      }
     },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width: '100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '创建时间',
+      field: 'createTime',
+      isForm: false,
+      table: {
+        width: 180
+      },
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
     },
-  },
-  {
-    label: '是否可用',
-    field: 'available',
-    sort: 'custom',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    {
+      label: '创建者',
+      field: 'creator',
+      table: {
+        width: 130
+      },
+      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'
+        }
       }
     },
-    table: {
-      width: 110
-    }
-  },
-  {
-    label: '操作',
-    field: 'action',
-    isForm: false,
-    table: {
-      width: 150,
-      fixed: 'right'
+    {
+      label: '最后更新者',
+      field: 'updater',
+      isDetail: true,
+      isForm: false,
+      isTable: false,
+      table: {
+        width: 150
+      }
+    },
+    {
+      label: '操作',
+      field: 'action',
+      isForm: false,
+      isDetail: false,
+      table: {
+        width: 150,
+        fixed: 'right'
+      }
     }
-  },
-]))
+  ])
+)
diff --git a/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts b/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts
index 8837aa808..356557dd2 100644
--- a/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts
+++ b/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts
@@ -399,33 +399,74 @@ export const InspectionRecordMain = useCrudSchemas(
     {
       label: '创建时间',
       field: 'createTime',
-      sort: 'custom',
+      isForm: false,
+      table: {
+        width: 180
+      },
       formatter: dateFormatter,
-      isSearch: false,
-      search: {
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      form: {
         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')]
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
         }
+      }
+    },
+    {
+      label: '创建者',
+      field: 'creator',
+      table: {
+        width: 130
       },
       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: 175
+        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: 'action',
-      isDetail: false,
       isForm: false,
+      isDetail: false,
       table: {
-        width: 200,
+        width: 150,
         fixed: 'right'
       }
     }
diff --git a/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts b/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts
index c7af0319c..af771ca97 100644
--- a/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts
+++ b/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts
@@ -388,14 +388,79 @@ export const InspectionMain = useCrudSchemas(
       }
     },
     {
-      label: '操作',
-      field: 'action',
-      isForm: false,
-      table: {
-        width: 240,
-        fixed: 'right'
-      }
-    }
+      label: '创建时间',
+      field: 'createTime',
+      isForm: false,
+      table: {
+        width: 180
+      },
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      }
+    },
+    {
+      label: '创建者',
+      field: 'creator',
+      table: {
+        width: 130
+      },
+      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: 'action',
+      isForm: false,
+      isDetail: false,
+      table: {
+        width: 150,
+        fixed: 'right'
+      }
+    }
   ])
 )
 
diff --git a/src/views/qms/inspectionScheme/inspectionScheme.data.ts b/src/views/qms/inspectionScheme/inspectionScheme.data.ts
index df35c591c..ceca52b8e 100644
--- a/src/views/qms/inspectionScheme/inspectionScheme.data.ts
+++ b/src/views/qms/inspectionScheme/inspectionScheme.data.ts
@@ -4,241 +4,272 @@ import { dateFormatter } from '@/utils/formatTime'
 // 表单校验
 
 export const InspectionTemplateRules = reactive({
-  description: [
-    { required: true, message: '请填写描述', trigger: 'blur' }
-  ],
-  version: [
-    { required: true, message: '请填写版本', trigger: 'blur' }
-  ],
-  inspectionCode: [
-    { required: true, message: '请选择检验方案模板编码', trigger: 'blur' }
-  ],
-  sequenceCode: [
-    { required: true, message: '请填写顺序号', trigger: 'blur' }
-  ],
-  inspectionCharCode: [
-    { required: true, message: '请选择检验特性编码', trigger: 'blur' }
-  ],
-  describe: [
-    { required: true, message: '请填写描述', trigger: 'blur' }
-  ],
-  inspectionMethodCode: [
-    { required: true, message: '请选择检验方法编码', trigger: 'blur' }
-  ],
-  dynamicUpdateCode: [
-    { required: true, message: '请选择采样过程编码', trigger: 'blur' }
-  ],
-  inspectionMethod: [
-    { required: true, message: '请选择动态修改规则编码', trigger: 'blur' }
-  ],
-  isCanUpdate: [
-    { required: true, message: '请选择是否允许修改特征值', trigger: 'blur' }
-  ],
-  isDestructionInspection: [
-    { required: true, message: '请选择是否破坏性检验', trigger: 'blur' }
-  ],
-  resultEntryMethod: [
-    { required: true, message: '请选择结果录入方式', trigger: 'blur' }
-  ],
-  featureType: [
-    { required: true, message: '请选择特征类型', trigger: 'blur' }
-  ],
-  quantifyIsCapping: [
-    { required: true, message: '请选择是否设定上限', trigger: 'blur' }
-  ],
-  quantifyIsLowlimit: [
-    { required: true, message: '请选择是否设定下限', trigger: 'blur' }
-  ],
-  quantifyTarget: [
-    { required: true, message: '请输入目标值', trigger: 'blur' }
-  ],
-  quantifyCapping: [
-    { required: true, message: '请输入上限值', trigger: 'blur' }
-  ],
-  quantifyLowlimit: [
-    { required: true, message: '请输入下限值', trigger: 'blur' }
-  ],
-  quantifyquantifyUomLowlimit: [
-    { required: true, message: '请选择计量单位', trigger: 'blur' }
-  ],
-  quantifyDecimal: [
-    { required: true, message: '请输入小数位', trigger: 'blur' }
-  ],
-  quantifyQuantifyCode: [
-    { required: true, message: '请输入选择集编码', trigger: 'blur' }
-  ],
+  description: [{ required: true, message: '请填写描述', trigger: 'blur' }],
+  version: [{ required: true, message: '请填写版本', trigger: 'blur' }],
+  inspectionCode: [{ required: true, message: '请选择检验方案模板编码', trigger: 'blur' }],
+  sequenceCode: [{ required: true, message: '请填写顺序号', trigger: 'blur' }],
+  inspectionCharCode: [{ required: true, message: '请选择检验特性编码', trigger: 'blur' }],
+  describe: [{ required: true, message: '请填写描述', trigger: 'blur' }],
+  inspectionMethodCode: [{ required: true, message: '请选择检验方法编码', trigger: 'blur' }],
+  dynamicUpdateCode: [{ required: true, message: '请选择采样过程编码', trigger: 'blur' }],
+  inspectionMethod: [{ required: true, message: '请选择动态修改规则编码', trigger: 'blur' }],
+  isCanUpdate: [{ required: true, message: '请选择是否允许修改特征值', trigger: 'blur' }],
+  isDestructionInspection: [{ required: true, message: '请选择是否破坏性检验', trigger: 'blur' }],
+  resultEntryMethod: [{ required: true, message: '请选择结果录入方式', trigger: 'blur' }],
+  featureType: [{ required: true, message: '请选择特征类型', trigger: 'blur' }],
+  quantifyIsCapping: [{ required: true, message: '请选择是否设定上限', trigger: 'blur' }],
+  quantifyIsLowlimit: [{ required: true, message: '请选择是否设定下限', trigger: 'blur' }],
+  quantifyTarget: [{ required: true, message: '请输入目标值', trigger: 'blur' }],
+  quantifyCapping: [{ required: true, message: '请输入上限值', trigger: 'blur' }],
+  quantifyLowlimit: [{ required: true, message: '请输入下限值', trigger: 'blur' }],
+  quantifyquantifyUomLowlimit: [{ required: true, message: '请选择计量单位', trigger: 'blur' }],
+  quantifyDecimal: [{ required: true, message: '请输入小数位', trigger: 'blur' }],
+  quantifyQuantifyCode: [{ required: true, message: '请输入选择集编码', trigger: 'blur' }]
 })
-export const InspectionSchemeMain = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '编码',
-    field: 'code',
-    sort: 'custom',
-    table: {
-      width: 220,
-      fixed: 'left'
-    },
-    isSearch: true,
-    form: {
-      componentProps: {
-        disabled: true,
-        placeholder: '系统自动获取'
+export const InspectionSchemeMain = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '编码',
+      field: 'code',
+      sort: 'custom',
+      table: {
+        width: 220,
+        fixed: 'left'
+      },
+      isSearch: true,
+      form: {
+        componentProps: {
+          disabled: true,
+          placeholder: '系统自动获取'
+        }
       }
-    }
-  },
-  {
-    label: '物料名称',
-    field: 'itemName',
-    sort: 'custom',
-    table: {
-      width: 200
-    },
-    isSearch: true,
-  },
-  {
-    label: '物料编码',
-    field: 'itemCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch: true,
-  }, {
-    label: '描述',
-    field: 'description',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  }, {
-    label: '版本',
-    field: 'version',
-    sort: 'custom',
-    table: {
-      width: 150
-    }
-  }, {
-    label: '检验类型编码',
-    field: 'inspectionType',
-    dictType: DICT_TYPE.INSPECTION_TYPE,
-    dictClass: 'string',
-    sort: 'custom',
-    table: {
-      width: 175
-    }
-  }, {
-    label: '检验模板编码',
-    field: 'programmeTemplateCode',
-    sort: 'custom',
-    table: {
-      width: 175
-    }
-  }, {
-    label: '拆分规则',
-    field: 'splitRule',
-    sort: 'custom',
-    dictType: DICT_TYPE.SPLIT_RULES,
-    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    table: {
-      width: 175
-    },
-  }, {
-    label: 'aql',
-    field: 'aql',
-    sort: 'custom',
-    dictType: DICT_TYPE.BASIC_AQL,
-    dictClass: 'string',
-    table: {
-      width: 150
-    }
-  }, {
-    label: '检验水平',
-    field: 'inspectionLevel',
-    sort: 'custom',
-    dictType: DICT_TYPE.INSPECTION_LEVEL,
-    dictClass: 'string',
-    table: {
-      width: 150
-    },
-    isSearch: true,
-  },
-  {
-    label: '每份样品量',
-    field: 'samplePieceSize',
-    sort: 'custom',
-    table: {
-      width: 140
-    }
-  },
-  {
-    label: '生效时间',
-    field: 'effectiveDate',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isForm: false,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: { width: '100%' },
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    },
+    {
+      label: '物料名称',
+      field: 'itemName',
+      sort: 'custom',
+      table: {
+        width: 200
+      },
+      isSearch: true
+    },
+    {
+      label: '物料编码',
+      field: 'itemCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true
+    },
+    {
+      label: '描述',
+      field: 'description',
+      sort: 'custom',
+      table: {
+        width: 150
+      }
+    },
+    {
+      label: '版本',
+      field: 'version',
+      sort: 'custom',
+      table: {
+        width: 150
+      }
+    },
+    {
+      label: '检验类型编码',
+      field: 'inspectionType',
+      dictType: DICT_TYPE.INSPECTION_TYPE,
+      dictClass: 'string',
+      sort: 'custom',
+      table: {
+        width: 175
+      }
+    },
+    {
+      label: '检验模板编码',
+      field: 'programmeTemplateCode',
+      sort: 'custom',
+      table: {
+        width: 175
+      }
+    },
+    {
+      label: '拆分规则',
+      field: 'splitRule',
+      sort: 'custom',
+      dictType: DICT_TYPE.SPLIT_RULES,
+      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+      table: {
+        width: 175
+      }
+    },
+    {
+      label: 'aql',
+      field: 'aql',
+      sort: 'custom',
+      dictType: DICT_TYPE.BASIC_AQL,
+      dictClass: 'string',
+      table: {
+        width: 150
+      }
+    },
+    {
+      label: '检验水平',
+      field: 'inspectionLevel',
+      sort: 'custom',
+      dictType: DICT_TYPE.INSPECTION_LEVEL,
+      dictClass: 'string',
+      table: {
+        width: 150
+      },
+      isSearch: true
+    },
+    {
+      label: '每份样品量',
+      field: 'samplePieceSize',
+      sort: 'custom',
+      table: {
+        width: 140
+      }
+    },
+    {
+      label: '生效时间',
+      field: 'effectiveDate',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isForm: false,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      },
+      table: {
+        width: 175
       }
     },
-    table: {
-      width: 175
-    },
-  },
-  {
-    label: '失效时间',
-    field: 'expirationDate',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isForm: false,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: { width: '100%' },
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '失效时间',
+      field: 'expirationDate',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isForm: false,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      },
+      table: {
+        width: 175
       }
     },
-    table: {
-      width: 175
-    },
-  },
-  {
-    label: '是否可用',
-    field: 'available',
-    sort: 'custom',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    {
+      label: '是否可用',
+      field: 'available',
+      sort: 'custom',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
+      },
+      table: {
+        width: 110
       }
     },
-    table: {
-      width: 110
+    {
+      label: '创建时间',
+      field: 'createTime',
+      isForm: false,
+      table: {
+        width: 180
+      },
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      }
+    },
+    {
+      label: '创建者',
+      field: 'creator',
+      table: {
+        width: 130
+      },
+      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: 'action',
+      isForm: false,
+      isDetail: false,
+      table: {
+        width: 150,
+        fixed: 'right'
+      }
     }
-  },
-  {
-    label: '操作',
-    field: 'action',
-    isDetail: false,
-    isForm: false,
-    table: {
-      width: 150,
-      fixed: 'right'
-    },
-  }
-]))
+  ])
+)
diff --git a/src/views/qms/inspectionTemplate/inspectionTemplate.data.ts b/src/views/qms/inspectionTemplate/inspectionTemplate.data.ts
index fd906fac4..03ba803a2 100644
--- a/src/views/qms/inspectionTemplate/inspectionTemplate.data.ts
+++ b/src/views/qms/inspectionTemplate/inspectionTemplate.data.ts
@@ -4,124 +4,151 @@ import { dateFormatter } from '@/utils/formatTime'
 // 表单校验
 
 export const InspectionTemplateRules = reactive({
-  description: [
-    { required: true , message: '请填写描述', trigger: 'blur' }
-  ],
-  version: [
-    { required: true , message: '请填写版本', trigger: 'blur' }
-  ],
-  inspectionCode: [
-    { required: true, message: '请选择检验方案模板编码', trigger: 'blur' }
-  ],
-  sequenceCode: [
-    { required: true, message: '请填写顺序号', trigger: 'blur' }
-  ],
-  inspectionCharCode: [
-    { required: true, message: '请选择检验特性编码', trigger: 'blur' }
-  ],
-  describe: [
-    { required: true, message: '请填写描述', trigger: 'blur' }
-  ],
-  inspectionMethodCode: [
-    { required: true, message: '请选择检验方法编码', trigger: 'blur' }
-  ],
-  dynamicUpdateCode: [
-    { required: true, message: '请选择采样过程编码', trigger: 'blur' }
-  ],
-  inspectionMethod: [
-    { required: true, message: '请选择动态修改规则编码', trigger: 'blur' }
-  ],
-  isCanUpdate: [
-    { required: true, message: '请选择是否允许修改特征值', trigger: 'blur' }
-  ],
-  isDestructionInspection: [
-    { required: true, message: '请选择是否破坏性检验', trigger: 'blur' }
-  ],
-  resultEntryMethod: [
-    { required: true, message: '请选择结果录入方式', trigger: 'blur' }
-  ],
-  featureType: [
-    { required: true, message: '请选择特征类型', trigger: 'blur' }
-  ],
-  quantifyIsCapping: [
-    { required: true, message: '请选择是否设定上限', trigger: 'blur' }
-  ],
-  quantifyIsLowlimit: [
-    { required: true, message: '请选择是否设定下限', trigger: 'blur' }
-  ],
-  quantifyTarget: [
-    { required: true, message: '请输入目标值', trigger: 'blur' }
-  ],
-  quantifyCapping: [
-    { required: true, message: '请输入上限值', trigger: 'blur' }
-  ],
-  quantifyLowlimit: [
-    { required: true, message: '请输入下限值', trigger: 'blur' }
-  ],
-  quantifyquantifyUomLowlimit: [
-    { required: true, message: '请选择计量单位', trigger: 'blur' }
-  ],
-  quantifyDecimal: [
-    { required: true, message: '请输入小数位', trigger: 'blur' }
-  ],
-  quantifyQuantifyCode: [
-    { required: true, message: '请输入选择集编码', trigger: 'blur' }
-  ],
+  description: [{ required: true, message: '请填写描述', trigger: 'blur' }],
+  version: [{ required: true, message: '请填写版本', trigger: 'blur' }],
+  inspectionCode: [{ required: true, message: '请选择检验方案模板编码', trigger: 'blur' }],
+  sequenceCode: [{ required: true, message: '请填写顺序号', trigger: 'blur' }],
+  inspectionCharCode: [{ required: true, message: '请选择检验特性编码', trigger: 'blur' }],
+  describe: [{ required: true, message: '请填写描述', trigger: 'blur' }],
+  inspectionMethodCode: [{ required: true, message: '请选择检验方法编码', trigger: 'blur' }],
+  dynamicUpdateCode: [{ required: true, message: '请选择采样过程编码', trigger: 'blur' }],
+  inspectionMethod: [{ required: true, message: '请选择动态修改规则编码', trigger: 'blur' }],
+  isCanUpdate: [{ required: true, message: '请选择是否允许修改特征值', trigger: 'blur' }],
+  isDestructionInspection: [{ required: true, message: '请选择是否破坏性检验', trigger: 'blur' }],
+  resultEntryMethod: [{ required: true, message: '请选择结果录入方式', trigger: 'blur' }],
+  featureType: [{ required: true, message: '请选择特征类型', trigger: 'blur' }],
+  quantifyIsCapping: [{ required: true, message: '请选择是否设定上限', trigger: 'blur' }],
+  quantifyIsLowlimit: [{ required: true, message: '请选择是否设定下限', trigger: 'blur' }],
+  quantifyTarget: [{ required: true, message: '请输入目标值', trigger: 'blur' }],
+  quantifyCapping: [{ required: true, message: '请输入上限值', trigger: 'blur' }],
+  quantifyLowlimit: [{ required: true, message: '请输入下限值', trigger: 'blur' }],
+  quantifyquantifyUomLowlimit: [{ required: true, message: '请选择计量单位', trigger: 'blur' }],
+  quantifyDecimal: [{ required: true, message: '请输入小数位', trigger: 'blur' }],
+  quantifyQuantifyCode: [{ required: true, message: '请输入选择集编码', trigger: 'blur' }]
 })
-export const InspectionTemplateMain = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '编码',
-    field: 'code',
-    sort: 'custom',
-    isSearch:true,
-    form:{
-      componentProps:{
-        disabled:true,
-        placeholder:'系统自动获取'
+export const InspectionTemplateMain = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '编码',
+      field: 'code',
+      sort: 'custom',
+      isSearch: true,
+      form: {
+        componentProps: {
+          disabled: true,
+          placeholder: '系统自动获取'
+        }
       }
-    }
-  },
-  {
-    label: '描述',
-    field: 'description',
-    sort: 'custom',
-  },{
-    label: '动态修改规则',
-    field: 'dynamicUpdateName',
-    sort: 'custom',
-  },{
-    label: '版本',
-    field: 'version',
-    sort: 'custom',
-  },
-  {
-    label: '是否可用',
-    field: 'available',
-    sort: 'custom',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    },
+    {
+      label: '描述',
+      field: 'description',
+      sort: 'custom'
+    },
+    {
+      label: '动态修改规则',
+      field: 'dynamicUpdateName',
+      sort: 'custom'
+    },
+    {
+      label: '版本',
+      field: 'version',
+      sort: 'custom'
+    },
+    {
+      label: '是否可用',
+      field: 'available',
+      sort: 'custom',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
+      },
+      table: {
+        width: 110
       }
     },
-    table: {
-      width: 110
-    }
-  },
-  {
-    label: '操作',
-    field: 'action',
-    isForm: false,
-    table: {
-      width: 150,
-      fixed: 'right'
+    {
+      label: '创建时间',
+      field: 'createTime',
+      isForm: false,
+      table: {
+        width: 180
+      },
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      }
+    },
+    {
+      label: '创建者',
+      field: 'creator',
+      table: {
+        width: 130
+      },
+      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: 'action',
+      isForm: false,
+      isDetail: false,
+      table: {
+        width: 150,
+        fixed: 'right'
+      }
     }
-  }
-]))
+  ])
+)
 export const InspectionTemplateProcess = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '编码',
diff --git a/src/views/qms/qualityNotice/qualityNoticeMain.data.ts b/src/views/qms/qualityNotice/qualityNoticeMain.data.ts
index b38140725..00d24e626 100644
--- a/src/views/qms/qualityNotice/qualityNoticeMain.data.ts
+++ b/src/views/qms/qualityNotice/qualityNoticeMain.data.ts
@@ -8,324 +8,391 @@ const { t } = useI18n() // 国际化
 /**
  * @returns {Array}质量通知主表
  */
-export const QualityNoticeMain = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '编码',
-    field: 'number',
-    sort: 'custom',
-    isSearch: true,
-    isForm: false,
-    table: {
-      width: 200,
-      fixed: 'left'
-    }
-  },
-  {
-    label: '类型',
-    field: 'type',
-    dictType: DICT_TYPE.QUALITY_NOTIFICATION_TYPE,
-    sort: 'custom',
-    isSearch: true,
-    isForm: false,
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '描述',
-    field: 'description',
-    sort: 'custom',
-    isSearch: false,
-    isForm: false,
-    table: {
-      width: 200
-    }
-  },
-  {
-    label: '详情',
-    field: 'detail',
-    sort: 'custom',
-    isSearch: false,
-    isForm: false,
-    table: {
-      width: 200
-    }
-  }, {
-    label: '优先级',
-    field: 'priority',
-    sort: 'custom',
-    isSearch: false,
-    isForm: false,
-    table: {
-      width: 150
-    },
-    form: {
-      componentProps: {
-        disabled: true
+export const QualityNoticeMain = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '编码',
+      field: 'number',
+      sort: 'custom',
+      isSearch: true,
+      isForm: false,
+      table: {
+        width: 200,
+        fixed: 'left'
       }
     },
-  },
-  {
-    label: '状态',
-    field: 'status',
-    sort: 'custom',
-    isSearch: false,
-    isForm: false,
-    table: {
-      width: 150
-    },
-    form: {
-      componentProps: {
-        disabled: true
+    {
+      label: '类型',
+      field: 'type',
+      dictType: DICT_TYPE.QUALITY_NOTIFICATION_TYPE,
+      sort: 'custom',
+      isSearch: true,
+      isForm: false,
+      table: {
+        width: 150
       }
     },
-  },
-  {
-    label: '报告人',
-    field: 'reporter',
-    sort: 'custom',
-    isSearch: false,
-    isForm: false,
-    table: {
-      width: 150
+    {
+      label: '描述',
+      field: 'description',
+      sort: 'custom',
+      isSearch: false,
+      isForm: false,
+      table: {
+        width: 200
+      }
     },
-    form: {
-      componentProps: {
-        disabled: true
+    {
+      label: '详情',
+      field: 'detail',
+      sort: 'custom',
+      isSearch: false,
+      isForm: false,
+      table: {
+        width: 200
       }
     },
-  },
-  {
-    label: '报告时间',
-    field: 'reportTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: false,
-    isForm: false,
-    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: 'priority',
+      sort: 'custom',
+      isSearch: false,
+      isForm: false,
+      table: {
+        width: 150
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
       }
     },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
+    {
+      label: '状态',
+      field: 'status',
+      sort: 'custom',
+      isSearch: false,
+      isForm: false,
+      table: {
+        width: 150
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
       }
     },
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    {
+      label: '报告人',
+      field: 'reporter',
+      sort: 'custom',
+      isSearch: false,
+      isForm: false,
+      table: {
+        width: 150
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      }
     },
-    table: {
-      width: 175
-    }
-  },
-  {
-    label: '要求开始时间',
-    field: 'requestStartTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: false,
-    isForm: false,
-    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: 'reportTime',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isSearch: false,
+      isForm: false,
+      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'
+        }
+      },
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      table: {
+        width: 175
       }
     },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
+    {
+      label: '要求开始时间',
+      field: 'requestStartTime',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isSearch: false,
+      isForm: false,
+      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'
+        }
+      },
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      table: {
+        width: 175
       }
     },
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    {
+      label: '要求结束时间',
+      field: 'requestEndTime',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isSearch: false,
+      isForm: false,
+      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'
+        }
+      },
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      table: {
+        width: 175
+      }
     },
-    table: {
-      width: 175
-    }
-  },
-  {
-    label: '要求结束时间',
-    field: 'requestEndTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: false,
-    isForm: false,
-    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: 'whetherCausesMachineHalt',
+      dictType: DICT_TYPE.FALSE_OR_TRUE,
+      sort: 'custom',
+      isSearch: false,
+      isForm: false,
+      table: {
+        width: 150
       }
     },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
+    {
+      label: '停机开始时间',
+      field: 'machineHaltStartTime',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isSearch: false,
+      isForm: false,
+      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'
+        }
+      },
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      table: {
+        width: 175
       }
     },
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    {
+      label: '停机结束时间',
+      field: 'machineHaltEndTime',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isSearch: false,
+      isForm: false,
+      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'
+        }
+      },
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      table: {
+        width: 175
+      }
     },
-    table: {
-      width: 175
-    }
-  },
-  {
-    label: '是否造成停机',
-    field: 'whetherCausesMachineHalt',
-    dictType: DICT_TYPE.FALSE_OR_TRUE,
-    sort: 'custom',
-    isSearch: false,
-    isForm: false,
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '停机开始时间',
-    field: 'machineHaltStartTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: false,
-    isForm: false,
-    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: 'coordinator',
+      sort: 'custom',
+      isSearch: false,
+      isForm: false,
+      table: {
+        width: 150
       }
     },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
+    {
+      label: '任务模板编号',
+      field: 'taskTemplateCode',
+      sort: 'custom',
+      isSearch: false,
+      isForm: false,
+      table: {
+        width: 150
       }
     },
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    {
+      label: '完成时间',
+      field: 'finishTime',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isSearch: false,
+      isForm: false,
+      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'
+        }
+      },
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      table: {
+        width: 175
+      }
     },
-    table: {
-      width: 175
-    }
-  },
-  {
-    label: '停机结束时间',
-    field: 'machineHaltEndTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: false,
-    isForm: false,
-    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')]
+    {
+      // reference_certificate_row
+      label: '参考通知编号',
+      field: 'referenceNoticeCode',
+      sort: 'custom',
+      isSearch: false,
+      isForm: false,
+      form: {
+        component: 'InputNumber',
+        value: 0
+      },
+      table: {
+        width: 175
       }
     },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
+    {
+      label: '创建时间',
+      field: 'createTime',
+      isForm: false,
+      table: {
+        width: 180
+      },
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
     },
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    {
+      label: '创建者',
+      field: 'creator',
+      table: {
+        width: 130
+      },
+      isForm: false,
+      isTable: true
     },
-    table: {
-      width: 175
-    }
-  },
-  {
-    label: '协调人',
-    field: 'coordinator',
-    sort: 'custom',
-    isSearch: false,
-    isForm: false,
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '任务模板编号',
-    field: 'taskTemplateCode',
-    sort: 'custom',
-    isSearch: false,
-    isForm: false,
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '完成时间',
-    field: 'finishTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: false,
-    isForm: false,
-    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: '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'
+        }
       }
     },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
+    {
+      label: '最后更新者',
+      field: 'updater',
+      isDetail: true,
+      isForm: false,
+      isTable: false,
+      table: {
+        width: 150
       }
     },
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    table: {
-      width: 175
-    }
-  },
-  {
-    // reference_certificate_row
-    label: '参考通知编号',
-    field: 'referenceNoticeCode',
-    sort: 'custom',
-    isSearch: false,
-    isForm: false,
-    form: {
-      component: 'InputNumber',
-      value: 0
-    },
-    table: {
-      width: 175
-    }
-  },
-  {
-    label: '操作',
-    field: 'action',
-    isDetail: false,
-    isForm: false,
-    table: {
-      width: 200,
-      fixed: 'right'
+    {
+      label: '操作',
+      field: 'action',
+      isForm: false,
+      isDetail: false,
+      table: {
+        width: 150,
+        fixed: 'right'
+      }
     }
-  }
-]))
+  ])
+)
 
 //表单校验
 export const QualityNoticeMainRules = reactive({
diff --git a/src/views/qms/sampleCode/sampleCode.data.ts b/src/views/qms/sampleCode/sampleCode.data.ts
index 3c7a5eaee..330f5dec9 100644
--- a/src/views/qms/sampleCode/sampleCode.data.ts
+++ b/src/views/qms/sampleCode/sampleCode.data.ts
@@ -1,145 +1,193 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
-import {getSamplingScheme} from '@/api/qms/sampleCode/index'
-import {validateNum} from "@/utils/validator";
+import { getSamplingScheme } from '@/api/qms/sampleCode/index'
+import { validateNum } from '@/utils/validator'
 
 // 表单校验
 export const SampleCodeRules = reactive({
   code: [required],
-  batchLowLimiting:  [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}],
-  batchUpperLimiting:  [{ required:true, message: '该项为必填', trigger: 'blur'}, { validator:validateNum, message: '请输入整数', trigger: 'blur'}],
-  s1: [ required ],
-  s2: [required ],
-  s3: [ required ],
-  s4: [ required ],
-  g1: [ required ],
-  g2: [ required ],
-  g3: [ required ]
+  batchLowLimiting: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
+  batchUpperLimiting: [
+    { required: true, message: '该项为必填', trigger: 'blur' },
+    { validator: validateNum, message: '请输入整数', trigger: 'blur' }
+  ],
+  s1: [required],
+  s2: [required],
+  s3: [required],
+  s4: [required],
+  g1: [required],
+  g2: [required],
+  g3: [required]
 })
 const samplingSchemeList = await getSamplingScheme()
-export const SampleCode = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '采样方案编码',
-    field: 'code',
-    sort: 'custom',
-    isSearch: true,
-    form: {
-      component: 'Select',
-      componentProps: {
-        options: samplingSchemeList,
-        optionsAlias: {
-          labelField: 'code',
-          valueField: 'code'
-        },
+export const SampleCode = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '采样方案编码',
+      field: 'code',
+      sort: 'custom',
+      isSearch: true,
+      form: {
+        component: 'Select',
+        componentProps: {
+          options: samplingSchemeList,
+          optionsAlias: {
+            labelField: 'code',
+            valueField: 'code'
+          }
+        }
+      },
+      table: {
+        width: 175,
+        fixed: 'left'
       }
     },
-    table: {
-      width: 175,
-      fixed: 'left'
-    }
-  },
-  {
-    label: '批量下限',
-    field: 'batchLowLimiting',
-    sort: 'custom',
-    isSearch: true,
-    form: {
-      component: 'InputNumber',
-      value: 0
+    {
+      label: '批量下限',
+      field: 'batchLowLimiting',
+      sort: 'custom',
+      isSearch: true,
+      form: {
+        component: 'InputNumber',
+        value: 0
+      }
+    },
+    {
+      label: '批量上限',
+      field: 'batchUpperLimiting',
+      sort: 'custom',
+      isSearch: true,
+      form: {
+        component: 'InputNumber',
+        value: 0
+      }
+    },
+    {
+      label: 's1',
+      field: 's1',
+      sort: 'custom'
+    },
+    {
+      label: 's2',
+      field: 's2',
+      sort: 'custom'
+    },
+    {
+      label: 's3',
+      field: 's3',
+      sort: 'custom'
+    },
+    {
+      label: 's4',
+      field: 's4',
+      sort: 'custom'
+    },
+    {
+      label: 'g1',
+      field: 'g1',
+      sort: 'custom'
     },
-  },
-  {
-    label: '批量上限',
-    field: 'batchUpperLimiting',
-    sort: 'custom',
-    isSearch: true,
-    form: {
-      component: 'InputNumber',
-      value: 0
+    {
+      label: 'g2',
+      field: 'g2',
+      sort: 'custom'
     },
-  },
-  {
-    label: 's1',
-    field: 's1',
-    sort: 'custom',
-  },
-  {
-    label: 's2',
-    field: 's2',
-    sort: 'custom',
-  },
-  {
-    label: 's3',
-    field: 's3',
-    sort: 'custom',
-  },
-  {
-    label: 's4',
-    field: 's4',
-    sort: 'custom',
-  },
-  {
-    label: 'g1',
-    field: 'g1',
-    sort: 'custom',
-  },
-  {
-    label: 'g2',
-    field: 'g2',
-    sort: 'custom',
-  },
-  {
-    label: 'g3',
-    field: 'g3',
-    sort: 'custom',
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isForm: false,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    {
+      label: 'g3',
+      field: 'g3',
+      sort: 'custom'
     },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width: '100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '是否可用',
+      field: 'available',
+      sort: 'custom',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
+      },
+      table: {
+        width: 110
       }
     },
-    table: {
-      width: 175
-    }
-  },
-  {
-    label: '是否可用',
-    field: 'available',
-    sort: 'custom',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    {
+      label: '创建时间',
+      field: 'createTime',
+      isForm: false,
+      table: {
+        width: 180
+      },
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
     },
-    table: {
-      width: 110
-    }
-  },
-  {
-    label: '操作',
-    field: 'action',
-    isForm: false,
-    table: {
-      width: 150,
-      fixed: 'right'
+    {
+      label: '创建者',
+      field: 'creator',
+      table: {
+        width: 130
+      },
+      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: 'action',
+      isForm: false,
+      isDetail: false,
+      table: {
+        width: 150,
+        fixed: 'right'
+      }
     }
-  }
-]))
+  ])
+)
diff --git a/src/views/qms/samplingProcess/samplingProcess.data.ts b/src/views/qms/samplingProcess/samplingProcess.data.ts
index e8d087169..08d418c6e 100644
--- a/src/views/qms/samplingProcess/samplingProcess.data.ts
+++ b/src/views/qms/samplingProcess/samplingProcess.data.ts
@@ -1,118 +1,173 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
-import {getSamplingScheme} from "@/api/qms/samplingProcess";
-import { validateInteger ,validateTwoNum} from '@/utils/validator'
+import { getSamplingScheme } from '@/api/qms/samplingProcess'
+import { validateInteger, validateTwoNum } from '@/utils/validator'
 
 // 表单校验
 export const SamplingProcessRules = reactive({
   sampleType: [required],
   evaluationMode: [required],
   description: [required],
-  sampleQty:[{ required: true, message: '该项为必填项', trigger: 'blur' },{validator:validateTwoNum, message: '小数点后最多2位', trigger: 'blur'}],
-  sampleProgCode:[{ required: true, message: '该项为必填项', trigger: 'blur' }],
-  inspectionQty: [required, {validator:validateInteger, message: '请输入正确的整数', trigger: 'blur'}]
+  sampleQty: [
+    { required: true, message: '该项为必填项', trigger: 'blur' },
+    { validator: validateTwoNum, message: '小数点后最多2位', trigger: 'blur' }
+  ],
+  sampleProgCode: [{ required: true, message: '该项为必填项', trigger: 'blur' }],
+  inspectionQty: [
+    required,
+    { validator: validateInteger, message: '请输入正确的整数', trigger: 'blur' }
+  ]
 })
 const samplingSchemeList = await getSamplingScheme()
-export const SamplingProcess = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '编码',
-    field: 'code',
-    sort: 'custom',
-    isSearch: true,
-    isForm: false,
-    table: {
-      width: 175,
-      fixed: 'left'
-    }
-  },
-  {
-    label: '描述',
-    field: 'description',
-    sort: 'custom',
-    isSearch: true
-  },
-  {
-    label: '取样类型',
-    field: 'sampleType',
-    sort: 'custom',
-    dictType: DICT_TYPE.SAMPLING_TYPE,
-    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    isSearch: true,
-    form: {
-      component: 'Select'
-    }
-  },
-  {
-    label: '评估模式',
-    field: 'evaluationMode',
-    sort: 'custom',
-    dictType: DICT_TYPE.EVALUATION_MODE,
-    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    form: {
-      component: 'Select'
-    }
-  },
-  {
-    label: '样品份数',
-    field: 'sampleQty',
-    sort: 'custom'
-  },
-  {
-    label: '采样方案编码',
-    field: 'sampleProgCode',
-    sort: 'custom',
-    form: {
-      component: 'Select',
-      componentProps: {
-        options: samplingSchemeList,
-        optionsAlias: {
-          labelField: 'description',
-          valueField: 'code'
-        },
+export const SamplingProcess = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '编码',
+      field: 'code',
+      sort: 'custom',
+      isSearch: true,
+      isForm: false,
+      table: {
+        width: 175,
+        fixed: 'left'
       }
-    }
-  },
- {
-   label: '创建时间',
-   field: 'createTime',
-   sort: 'custom',
-   formatter: dateFormatter,
-   isForm: false,
-   detail: {
-     dateFormat: 'YYYY-MM-DD HH:mm:ss'
-   },
-   form: {
-     component: 'DatePicker',
-     componentProps: {
-       style: {width: '100%'},
-       type: 'datetime',
-       dateFormat: 'YYYY-MM-DD HH:mm:ss',
-       valueFormat: 'x',
-     }
-   }
- },
-  {
-    label: '是否可用',
-    field: 'available',
-    sort: 'custom',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    },
+    {
+      label: '描述',
+      field: 'description',
+      sort: 'custom',
+      isSearch: true
+    },
+    {
+      label: '取样类型',
+      field: 'sampleType',
+      sort: 'custom',
+      dictType: DICT_TYPE.SAMPLING_TYPE,
+      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+      isSearch: true,
+      form: {
+        component: 'Select'
+      }
+    },
+    {
+      label: '评估模式',
+      field: 'evaluationMode',
+      sort: 'custom',
+      dictType: DICT_TYPE.EVALUATION_MODE,
+      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+      form: {
+        component: 'Select'
+      }
+    },
+    {
+      label: '样品份数',
+      field: 'sampleQty',
+      sort: 'custom'
+    },
+    {
+      label: '采样方案编码',
+      field: 'sampleProgCode',
+      sort: 'custom',
+      form: {
+        component: 'Select',
+        componentProps: {
+          options: samplingSchemeList,
+          optionsAlias: {
+            labelField: 'description',
+            valueField: 'code'
+          }
+        }
+      }
+    },
+
+    {
+      label: '是否可用',
+      field: 'available',
+      sort: 'custom',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
+      }
+    },
+    {
+      label: '创建时间',
+      field: 'createTime',
+      isForm: false,
+      table: {
+        width: 180
+      },
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      }
+    },
+    {
+      label: '创建者',
+      field: 'creator',
+      table: {
+        width: 130
+      },
+      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: 'action',
+      isForm: false,
+      isDetail: false,
+      table: {
+        width: 150,
+        fixed: 'right'
       }
     }
-  },
-  {
-    label: '操作',
-    field: 'action',
-    isForm: false,
-    table: {
-      width: 150,
-      fixed: 'right'
-    }
-  }
-]))
+  ])
+)
diff --git a/src/views/qms/samplingScheme/samplingScheme.data.ts b/src/views/qms/samplingScheme/samplingScheme.data.ts
index 4085ec49d..7ede5cd2f 100644
--- a/src/views/qms/samplingScheme/samplingScheme.data.ts
+++ b/src/views/qms/samplingScheme/samplingScheme.data.ts
@@ -3,70 +3,118 @@ import { dateFormatter } from '@/utils/formatTime'
 
 // 表单校验
 export const SamplingSchemeRules = reactive({
-  description: [required],
+  description: [required]
 })
 
-export const SamplingScheme = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '编码',
-    field: 'code',
-    sort: 'custom',
-    isSearch: true,
-    isForm: false,
-    table: {
-      fixed: 'left'
-    }
-  },
-  {
-    label: '描述',
-    field: 'description',
-    sort: 'custom',
-    isSearch: true,
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isForm: false,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+export const SamplingScheme = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '编码',
+      field: 'code',
+      sort: 'custom',
+      isSearch: true,
+      isForm: false,
+      table: {
+        fixed: 'left'
+      }
+    },
+    {
+      label: '描述',
+      field: 'description',
+      sort: 'custom',
+      isSearch: true
     },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width: '100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '是否可用',
+      field: 'available',
+      sort: 'custom',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
+      },
+      table: {
+        width: 110
       }
     },
-  },
-  {
-    label: '是否可用',
-    field: 'available',
-    sort: 'custom',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    {
+      label: '创建时间',
+      field: 'createTime',
+      isForm: false,
+      table: {
+        width: 180
+      },
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
     },
-    table: {
-      width: 110
-    }
-  },
-  {
-    label: '操作',
-    field: 'action',
-    isForm: false,
-    table: {
-      width: 150,
-      fixed: 'right'
+    {
+      label: '创建者',
+      field: 'creator',
+      table: {
+        width: 130
+      },
+      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: 'action',
+      isForm: false,
+      isDetail: false,
+      table: {
+        width: 150,
+        fixed: 'right'
+      }
     }
-  }
-]))
+  ])
+)
diff --git a/src/views/qms/selectedSet/selectedSet.data.ts b/src/views/qms/selectedSet/selectedSet.data.ts
index 9bd2e1a8c..b13c7af2d 100644
--- a/src/views/qms/selectedSet/selectedSet.data.ts
+++ b/src/views/qms/selectedSet/selectedSet.data.ts
@@ -1,6 +1,6 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import * as DictTypeApi from '@/api/system/dict/dict.type'
-
+import { dateFormatter } from '@/utils/formatTime'
 
 // 表单校验
 export const SelectedSetRules = reactive({
@@ -10,49 +10,113 @@ export const SelectedSetRules = reactive({
   concurrencyStamp: [required]
 })
 
-export const SelectedSet = useCrudSchemas(reactive<CrudSchema[]>([
-
-  {
-    label: '编码',
-    field: 'code',
-    sort: 'custom',
-    isForm: false,
-    isSearch: true,
-    fixed: 'left'
-  },
-  {
-    label: '描述',
-    field: 'description',
-    sort: 'custom',
-    isSearch: true
-  },
-  {
-    label: '是否可用',
-    field: 'available',
-    sort: 'custom',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+export const SelectedSet = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '编码',
+      field: 'code',
+      sort: 'custom',
+      isForm: false,
+      isSearch: true,
+      fixed: 'left'
+    },
+    {
+      label: '描述',
+      field: 'description',
+      sort: 'custom',
+      isSearch: true
+    },
+    {
+      label: '是否可用',
+      field: 'available',
+      sort: 'custom',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
+      },
+      table: {
+        width: 110
       }
     },
-    table: {
-      width: 110
-    }
-  },
-  {
-    label: '操作',
-    field: 'action',
-    isForm: false,
-    table: {
-      width: 150,
-      fixed: 'right'
+    {
+      label: '创建时间',
+      field: 'createTime',
+      isForm: false,
+      table: {
+        width: 180
+      },
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      }
+    },
+    {
+      label: '创建者',
+      field: 'creator',
+      table: {
+        width: 130
+      },
+      isForm: false,
+      isTable: true
     },
-    isTableForm: false,
-    isDetail: false
-  }
-]))
+    {
+      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: 'action',
+      isForm: false,
+      isDetail: false,
+      table: {
+        width: 150,
+        fixed: 'right'
+      }
+    }
+  ])
+)

From e4b1fa678847e068349b2d26b7177eea594ff39b Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 12 Jul 2024 15:49:22 +0800
Subject: [PATCH 387/408] =?UTF-8?q?SCP=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7=E7=94=B3=E8=AF=B7=20=E7=94=9F=E6=88=90=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E6=97=B6=EF=BC=8C=E5=A1=AB=E5=86=99=E4=B8=BA=E7=A9=BA?=
 =?UTF-8?q?=EF=BC=8C=E7=A7=BB=E5=87=BA=E7=84=A6=E7=82=B9=EF=BC=8C=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
index d098eb51c..aca148dcb 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
@@ -484,7 +484,7 @@ const blurOne = (oneRow, twoRow) => {
   //   twoRow.children = []
   //   twoRow.qtyOne = parseFloat(twoRow.xNumber) * parseFloat(oneRow.packQty)
   // }
-  twoRow.qtyOne = parseFloat(twoRow.xNumber) * parseFloat(oneRow.packQty)
+  twoRow.qtyOne = parseFloat(twoRow.xNumber)?  parseFloat(twoRow.xNumber)* parseFloat(oneRow.packQty) : ''
   // let num = 0
   // oneRow.packageList.forEach((item) => {
   //   num += parseFloat(item.xNumber) || 0

From b05bf48da2313a6dccb1c5b301be33a07243a950 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com>
Date: Fri, 12 Jul 2024 15:52:55 +0800
Subject: [PATCH 388/408] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts
index 188819bec..f13024157 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts
@@ -508,7 +508,7 @@ export const CustomerreturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
   },
   {
     label: '批次',
-    field: 'batch',
+    field: 'toBatch',
     sort: 'custom',
     table: {
       width: 150
@@ -516,7 +516,7 @@ export const CustomerreturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
   },
   {
     label: '包装号',
-    field: 'packingNumber',
+    field: 'toPackingNumber',
     sort: 'custom',
     table: {
       width: 150

From 06e926182b3956580b018d0c744ec22588c9cb0b Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 12 Jul 2024 16:06:59 +0800
Subject: [PATCH 389/408] =?UTF-8?q?=E9=80=89=E4=B8=8D=E4=B8=8A=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../itemManage/itemarea/index.vue             | 27 ++++++-----
 .../deliverplan/deliverPlanMain/index.vue     |  5 ++-
 .../saleShipmentMainRequest/index.vue         |  2 +
 .../scrap/scrapRequestMain/index.vue          | 35 ++++++++-------
 .../index.vue                                 | 27 ++++++-----
 .../unplannedissueRequestMain/index.vue       |  8 ++--
 .../preparetoissueMain/index.vue              |  4 +-
 .../inventorychangeRequestMain/index.vue      |  2 +
 .../processproductionRequest/index.vue        | 11 +++--
 .../productionMainAssemble/index.vue          | 45 ++++++++++---------
 .../productionMainAssemble.data.ts            |  2 +-
 .../productionMainAssembleSparePart/index.vue | 44 +++++++++---------
 .../productionMainPredictSparePart/index.vue  | 44 +++++++++---------
 .../index.vue                                 | 31 +++++++------
 .../productscrapRequestMain/index.vue         |  2 +
 .../purchasereceiptRequestMain/index.vue      |  2 +
 .../sparereceiptRequestMain/index.vue         |  2 +
 17 files changed, 170 insertions(+), 123 deletions(-)

diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
index b4bd4fd9d..ffb5fdd0a 100644
--- a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
@@ -122,17 +122,22 @@ const updataTableColumns = (val) => {
 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
   nextTick(() => {
     if (type == 'tableForm') {
-      val.forEach(item=>{
-        const newRow = {...row}
-        if(formField == 'locationCode') {
-          if(tableData.value.find(item1=>item1['locationCode'] == item['code'])) return
-          newRow['locationCode'] = item['code']
-        }else{ 
-          newRow[formField] = item[searchField]
-        }
-        newRow['id'] = item['id']
-        tableData.value.push(newRow)
-      })
+      if(formField == 'locationCode'){
+        val.forEach(item=>{
+          const newRow = {...row}
+          if(formField == 'locationCode') {
+            if(tableData.value.find(item1=>item1['locationCode'] == item['code'])) return
+            newRow['locationCode'] = item['code']
+          }else{ 
+            newRow[formField] = item[searchField]
+          }
+          newRow['id'] = item['id']
+          tableData.value.push(newRow)
+        })
+      } else {
+        row[formField] = val[0][searchField]
+      }
+      
 
     }else{
       const setV = {}      
diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue
index c98a71cd7..043524a2a 100644
--- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue
@@ -160,16 +160,19 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         val.forEach(item=>{
           if(tableData.value.find(item1=>item1['itemCode'] == item['itemCode'])) return
           const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+          row[formField] = item[searchField]
           newRow['uom'] = item['customerUom']
           newRow['id'] = item['id']
           tableData.value.push(newRow)
         })
+      }else{
+        row[formField] = val[0][searchField]
       }
       // if(formField == 'itemCode') {
       //   row['uom'] = val[0]['customerUom']
       // }
       // 明细查询页赋值
-      row[formField] = val[0][searchField]
+      
     } else {
       const setV = {}
       if(formField == 'customerDockCode') {
diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
index f34280f34..e0eecb53b 100644
--- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
+++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
@@ -123,6 +123,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         
       }else if(formField == 'fromLocationCode'){
         row['fromLocationCode'] = val[0]['defaultLocationCode']
+      }else{
+        row[formField] = val[0][searchField]
       }
     }else {
       const setV = {}
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
index 62613ab63..9a5679c56 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
@@ -128,22 +128,27 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       //   tableData.value.push(newRow)
       // })
       // 查询标准价格
-      let param = {'itemCodes':val.map(item=>item.itemCode).join(',') as string}
-      StdcostpriceApi.queryStdcostpriceByItemCode(param).then(res => {
-        val.forEach(item=>{
-          const itemCode = res.find(item1=>item1['itemCode']==item['itemCode'])
-          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
-          newRow[formField] = item[searchField]
-          newRow['packingNumber'] = item['packingNumber']
-          newRow['batch'] = item['batch']
-          newRow['fromLocationCode'] = item['locationCode']
-          newRow['itemCode'] = item['itemCode']
-          newRow['uom'] = item['uom']
-          newRow['singlePrice'] = itemCode?itemCode['price']:''
-          tableData.value.push(newRow)
+      if(formField == 'packingNumber'){
+        let param = {'itemCodes':val.map(item=>item.itemCode).join(',') as string}
+        StdcostpriceApi.queryStdcostpriceByItemCode(param).then(res => {
+          val.forEach(item=>{
+            const itemCode = res.find(item1=>item1['itemCode']==item['itemCode'])
+            const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+            newRow[formField] = item[searchField]
+            newRow['packingNumber'] = item['packingNumber']
+            newRow['batch'] = item['batch']
+            newRow['fromLocationCode'] = item['locationCode']
+            newRow['itemCode'] = item['itemCode']
+            newRow['uom'] = item['uom']
+            newRow['singlePrice'] = itemCode?itemCode['price']:''
+            tableData.value.push(newRow)
+          })
+          // row['singlePrice'] = res.price
         })
-        // row['singlePrice'] = res.price
-      })
+      } else {
+        row[formField] = val[0][searchField]
+      }
+      
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]
diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
index bc3ae5443..79a4547e5 100644
--- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
@@ -113,17 +113,22 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
   nextTick(() => {
     if (type == 'tableForm') {
       // 明细查询页赋值
-      let newRow = JSON.parse(JSON.stringify(tableFormKeys))
-      val.forEach(item=>{
-        newRow['packingNumber'] = item['packingNumber']
-        newRow['containerNumber'] = item['containerNumber']
-        newRow['batch'] = item['batch']
-        newRow['inventoryStatus'] = item['inventoryStatus']
-        newRow['fromLocationCode'] = item['locationCode']
-        newRow['itemCode'] = item['itemCode']
-        newRow['uom'] = item['uom']
-        tableData.value.push(newRow)
-      })
+      if(formField=='itemCode'){
+        val.forEach(item=>{
+          let newRow = JSON.parse(JSON.stringify(tableFormKeys))
+          newRow['packingNumber'] = item['packingNumber']
+          newRow['containerNumber'] = item['containerNumber']
+          newRow['batch'] = item['batch']
+          newRow['inventoryStatus'] = item['inventoryStatus']
+          newRow['fromLocationCode'] = item['locationCode']
+          newRow['itemCode'] = item['itemCode']
+          newRow['uom'] = item['uom']
+          tableData.value.push(newRow)
+        })
+      } else {
+        row[formField] = val[0][searchField]
+      }
+      
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue
index 1433448b5..3049ec147 100644
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue
@@ -127,12 +127,12 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           newRow['qty'] = item['qty']
           tableData.value.push(newRow)
         })
-      }
-      if(formField === 'costcentreCode'){
+      }else if(formField === 'costcentreCode'){
         row['costcentreCode'] = val[0]['costcentreCode']
-      }
-      if(formField === 'qadProjectCode'){
+      }else if(formField === 'qadProjectCode'){
         row['qadProjectCode'] = val[0]['projectCode']
+      } else {
+        row[formField] = val[0][searchField]
       }
     } else {
       const setV = {}
diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue
index 81cccfca0..fa9344e05 100644
--- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue
+++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue
@@ -114,13 +114,15 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       if (formField == 'itemCode') {
         row['itemCode'] = val[0]['componentItemCode']
         row['uom'] = val[0]['componentUom']
-      } else {
+      } else if(formField == 'workStation'){
         val.forEach(item=>{
           const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
           newRow[formField] = item[searchField]
           newRow['toLocationCode'] = item['rawLocationCode']
           tableData.value.push(newRow)
         })
+      } else {
+        row[formField] = val[0][searchField]
       }
     } else {
       const setV = {}
diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
index aefda2d5c..63fc24a71 100644
--- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
+++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
@@ -160,6 +160,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           newRow['uom'] = item['uom']
           tableData.value.push(newRow)
         })
+      } else {
+        row[formField] = val[0][searchField]
       }
       
     } else {
diff --git a/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue b/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue
index 02730bae1..16efcd877 100644
--- a/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue
+++ b/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue
@@ -135,15 +135,14 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           }) 
           tableData.value.push(newRow)
         })
-      }
-      if(formField === 'processCode'){
+      }else if(formField === 'processCode'){
         row['processCode']=val[0]['code']
-      }
-      if(formField === 'locationCode'){
+      }else if(formField === 'locationCode'){
         row['locationCode']=val[0]['code']
-      }
-      if(formField === 'componentItemCode'){
+      }else if(formField === 'componentItemCode'){
         row['componentItemCode']=val[0]['componentItemCode']
+      } else {
+        row[formField] = val[0][searchField]
       }
     }else{
       const setV = {}
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
index de3c21983..b562f868a 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
@@ -117,27 +117,32 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       // }).catch(err =>{
       //   console.log(err);
       // })
-      val.forEach(async item=>{
-        const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
-        newRow[formField] = item[searchField]
-        newRow['uom'] = item['uom']
-        // 查看BOM版本
-        const param1 =  {
-            productItemCode: item['itemCode'],
-            available: 'TRUE',
-            pageSize: 20,
-            pageNo: 1,
-            sort: '',
-            by: 'ASC',
-          }
-          await BomApi.getBomPage(param1).then(res => {
-            console.log(res)
-            if(res?.list?.length>0){
-              newRow['bomVersion'] = res.list[0].version
+      if(formField == 'itemCode'){
+        val.forEach(async item=>{
+          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+          newRow[formField] = item[searchField]
+          newRow['uom'] = item['uom']
+          // 查看BOM版本
+          const param1 =  {
+              productItemCode: item['itemCode'],
+              available: 'TRUE',
+              pageSize: 20,
+              pageNo: 1,
+              sort: '',
+              by: 'ASC',
             }
-          }) 
-        tableData.value.push(newRow)
-      })
+            await BomApi.getBomPage(param1).then(res => {
+              console.log(res)
+              if(res?.list?.length>0){
+                newRow['bomVersion'] = res.list[0].version
+              }
+            }) 
+          tableData.value.push(newRow)
+        })
+      } else {
+        row[formField] = val[0][searchField]
+      }
+      
     } else {
       const setV = {}
       if(formField == 'workshop'){
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
index 6cdca9280..cce78d9d4 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
@@ -656,7 +656,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
     tableForm:{
       multiple: true,
       enterSearch:true,
-      isInpuFocusShow: true,
+      // isInpuFocusShow: true,
       searchListPlaceholder: '请选择物料代码', // 输入框占位文本
       searchField: 'itemCode', // 查询弹窗赋值字段
       searchTitle: '生产线物料关系信息', // 查询弹窗标题
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
index cd26ba054..9b81d1f8f 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
@@ -117,27 +117,31 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       // }).catch(err =>{
       //   console.log(err);
       // })
-      val.forEach(async item=>{
-        const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
-        newRow[formField] = item[searchField]
-        newRow['uom'] = item['uom']
-        // 查看BOM版本
-        const param1 =  {
-            productItemCode: item['itemCode'],
-            available: 'TRUE',
-            pageSize: 20,
-            pageNo: 1,
-            sort: '',
-            by: 'ASC',
-          }
-          await BomApi.getBomPage(param1).then(res => {
-            console.log(res)
-            if(res?.list?.length>0){
-              newRow['bomVersion'] = res.list[0].version
+      if(formField == 'itemCode'){
+        val.forEach(async item=>{
+          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+          newRow[formField] = item[searchField]
+          newRow['uom'] = item['uom']
+          // 查看BOM版本
+          const param1 =  {
+              productItemCode: item['itemCode'],
+              available: 'TRUE',
+              pageSize: 20,
+              pageNo: 1,
+              sort: '',
+              by: 'ASC',
             }
-          }) 
-        tableData.value.push(newRow)
-      })
+            await BomApi.getBomPage(param1).then(res => {
+              console.log(res)
+              if(res?.list?.length>0){
+                newRow['bomVersion'] = res.list[0].version
+              }
+            }) 
+          tableData.value.push(newRow)
+        })
+      } else {
+        row[formField] = val[0][searchField]
+      }
     } else {
       const setV = {}
       if(formField == 'workshop'){
diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
index 60a8f1605..b909f6175 100644
--- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
@@ -117,27 +117,31 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       // }).catch(err =>{
       //   console.log(err);
       // })
-      val.forEach(async item=>{
-        const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
-        newRow[formField] = item[searchField]
-        newRow['uom'] = item['uom']
-        // 查看BOM版本
-        const param1 =  {
-            productItemCode: item['itemCode'],
-            available: 'TRUE',
-            pageSize: 20,
-            pageNo: 1,
-            sort: '',
-            by: 'ASC',
-          }
-          await BomApi.getBomPage(param1).then(res => {
-            console.log(res)
-            if(res?.list?.length>0){
-              newRow['bomVersion'] = res.list[0].version
+      if(formField == 'itemCode'){
+        val.forEach(async item=>{
+          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+          newRow[formField] = item[searchField]
+          newRow['uom'] = item['uom']
+          // 查看BOM版本
+          const param1 =  {
+              productItemCode: item['itemCode'],
+              available: 'TRUE',
+              pageSize: 20,
+              pageNo: 1,
+              sort: '',
+              by: 'ASC',
             }
-          }) 
-        tableData.value.push(newRow)
-      })
+            await BomApi.getBomPage(param1).then(res => {
+              console.log(res)
+              if(res?.list?.length>0){
+                newRow['bomVersion'] = res.list[0].version
+              }
+            }) 
+          tableData.value.push(newRow)
+        })
+      } else {
+        row[formField] = val[0][searchField]
+      }
     } else {
       const setV = {}
       if(formField == 'workshop'){
diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue
index 378abf063..956de7a21 100644
--- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue
+++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue
@@ -109,19 +109,24 @@ const updataTableColumns = (val) => {
 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
   nextTick(() => {
     if (type == 'tableForm') {
-      // 明细查询页赋值
-      val.forEach(item=>{
-        const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
-        newRow[formField] = item[searchField]
-        newRow['poLine'] = item['itemCode']
-        newRow['packingNumber'] = item['packingNumber']
-        newRow['containerNumber'] = item['containerNumber']
-        newRow['batch'] = item['batch']
-        newRow['uom'] = item['uom']
-        newRow['inventoryStatus'] = item['inventoryStatus']
-        newRow['fromLocationCode'] = item['locationCode']
-        tableData.value.push(newRow)
-      })
+      if(formField=='itemCode'){
+        // 明细查询页赋值
+        val.forEach(item=>{
+          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+          newRow[formField] = item[searchField]
+          newRow['poLine'] = item['itemCode']
+          newRow['packingNumber'] = item['packingNumber']
+          newRow['containerNumber'] = item['containerNumber']
+          newRow['batch'] = item['batch']
+          newRow['uom'] = item['uom']
+          newRow['inventoryStatus'] = item['inventoryStatus']
+          newRow['fromLocationCode'] = item['locationCode']
+          tableData.value.push(newRow)
+        })
+      } else {
+        row[formField] = val[0][searchField]
+      }
+      
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]
diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
index ceef161d2..55a76f671 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
@@ -342,6 +342,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         }) 
       }else if(formField == 'bomVersion'){
         row['bomVersion'] = val[0]['version']
+      } else {
+        row[formField] = val[0][searchField]
       }
     } else {
       const setV = {}
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
index 7e3031b00..5323a3d6c 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
@@ -246,6 +246,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         row['packUnit'] = val[0]['packUnit']
       }else if(formField == 'defaultToLocationCode'){
         row['defaultToLocationCode'] = val[0]['code']
+      } else {
+        row[formField] = val[0][searchField]
       }
     } else {
       const setV = {}
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
index 45c2359b6..ffd5f3682 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
@@ -193,6 +193,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         row['packUnit'] = val[0]['packUnit']
       }else if(formField == 'defaultToLocationCode'){
         row['defaultToLocationCode'] = val[0]['code']
+      } else {
+        row[formField] = val[0][searchField]
       }
     } else {
       const setV = {}

From 26e2791a019cf7e081f9f549b6120fabe892a330 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Fri, 12 Jul 2024 16:33:44 +0800
Subject: [PATCH 390/408] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionplan/productionMain/index.vue   | 120 +++++++++++-------
 .../productionMainAssemble/index.vue          | 120 +++++++++++++-----
 .../productionMainAssembleSparePart/index.vue | 120 +++++++++++++-----
 .../productionMainPredictSparePart/index.vue  | 120 +++++++++++++-----
 4 files changed, 336 insertions(+), 144 deletions(-)

diff --git a/src/views/wms/productionManage/productionplan/productionMain/index.vue b/src/views/wms/productionManage/productionplan/productionMain/index.vue
index 59b0c44c0..44ab714e5 100644
--- a/src/views/wms/productionManage/productionplan/productionMain/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMain/index.vue
@@ -332,29 +332,39 @@ const buttonTableClick = async (val, row) => {
     await ProductionMainApi.submit(row.masterId).then((res) => {
       if (res.status == '6') {
         // 生成备料计划
-        tableObject.loading = true
+        // tableObject.loading = true
         ProductionMainApi.generatePreparetoissue(row.number).then(() => {
           // message.success(t('common.createSuccess'))
-          tableObject.loading = false
-          getList()
-        }).catch(err => {
-          tableObject.loading = false
-          console.log(err)
-        })
-        // 生成收货申请
-        tableObject.loading = true
-        ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
-          // message.success(t('common.createSuccess'))
-          tableObject.loading = false
-          getList()
+          // tableObject.loading = false
+          // getList()
+          // 生成收货申请
+          // tableObject.loading = true
+          ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
+            message.success(t('common.createSuccess'))
+            tableObject.loading = false
+            getList()
+          }).catch(err => {
+            tableObject.loading = false
+            console.log(err)
+          })
         }).catch(err => {
-          tableObject.loading = false
+          // tableObject.loading = false
           console.log(err)
+          // 生成收货申请
+          // tableObject.loading = true
+          ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
+            message.success(t('common.createSuccess'))
+            tableObject.loading = false
+            getList()
+          }).catch(err => {
+            tableObject.loading = false
+            console.log(err)
+          })
         })
       }
-      message.success(t('common.updateSuccess'))
-      tableObject.loading = false
-      getList()
+      // message.success(t('common.updateSuccess'))
+      // tableObject.loading = false
+      // getList()
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -398,23 +408,33 @@ const buttonTableClick = async (val, row) => {
         })
         // 生成备料计划
         tableObject.loading = true
-        await ProductionMainApi.generatePreparetoissue(row.number).then(() => {
-          // message.success(t('common.createSuccess'))
-          tableObject.loading = false
-          getList()
-        }).catch(err => {
-          tableObject.loading = false
-          console.log(err)
-        })
-        // 生成收货申请
-        tableObject.loading = true
-        await ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
+        ProductionMainApi.generatePreparetoissue(row.number).then(() => {
           // message.success(t('common.createSuccess'))
-          tableObject.loading = false
-          getList()
+          // tableObject.loading = false
+          // getList()
+          // 生成收货申请
+          // tableObject.loading = true
+          ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
+            message.success(t('common.createSuccess'))
+            tableObject.loading = false
+            getList()
+          }).catch(err => {
+            tableObject.loading = false
+            console.log(err)
+          })
         }).catch(err => {
-          tableObject.loading = false
+          // tableObject.loading = false
           console.log(err)
+          // 生成收货申请
+          // tableObject.loading = true
+          ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
+            message.success(t('common.createSuccess'))
+            tableObject.loading = false
+            getList()
+          }).catch(err => {
+            tableObject.loading = false
+            console.log(err)
+          })
         })
       }
     })
@@ -590,25 +610,35 @@ const submitForm = async (formType, submitData) => {
           tableObject.loading = true
           ProductionMainApi.generatePreparetoissue(res.number).then(() => {
             // message.success(t('common.createSuccess'))
-            tableObject.loading = false
-            getList()
-          }).catch(err => {
-            tableObject.loading = false
-            console.log(err)
-          })
-          // 生成收货申请
-          tableObject.loading = true
-          ProductionMainApi.generateProductreceiptRequest(res.number).then(() => {
-            // message.success(t('common.createSuccess'))
-            tableObject.loading = false
-            getList()
+            // tableObject.loading = false
+            // getList()
+            // 生成收货申请
+            // tableObject.loading = true
+            ProductionMainApi.generateProductreceiptRequest(res.number).then(() => {
+              message.success(t('common.createSuccess'))
+              tableObject.loading = false
+              getList()
+            }).catch(err => {
+              tableObject.loading = false
+              console.log(err)
+            })
           }).catch(err => {
-            tableObject.loading = false
+            // tableObject.loading = false
             console.log(err)
+            // 生成收货申请
+            // tableObject.loading = true
+            ProductionMainApi.generateProductreceiptRequest(res.number).then(() => {
+              message.success(t('common.createSuccess'))
+              tableObject.loading = false
+              getList()
+            }).catch(err => {
+              tableObject.loading = false
+              console.log(err)
+            })
           })
         }
       })
-      message.success(t('common.createSuccess'))
+      // message.success(t('common.createSuccess'))
     } else {
       await ProductionMainApi.updateProductionMain(data)
       message.success(t('common.updateSuccess'))
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
index de3c21983..8d0024968 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
@@ -324,29 +324,39 @@ const buttonTableClick = async (val, row) => {
     await ProductionMainApi.submit(row.masterId).then((res) => {
       if (res.status == '6') {
         // 生成备料计划
-        tableObject.loading = true
+        // tableObject.loading = true
         ProductionMainApi.generatePreparetoissue(row.number).then(() => {
           // message.success(t('common.createSuccess'))
-          tableObject.loading = false
-          getList()
-        }).catch(err => {
-          tableObject.loading = false
-          console.log(err)
-        })
-        // 生成收货申请
-        tableObject.loading = true
-        ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
-          // message.success(t('common.createSuccess'))
-          tableObject.loading = false
-          getList()
+          // tableObject.loading = false
+          // getList()
+          // 生成收货申请
+          // tableObject.loading = true
+          ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
+            message.success(t('common.createSuccess'))
+            tableObject.loading = false
+            getList()
+          }).catch(err => {
+            tableObject.loading = false
+            console.log(err)
+          })
         }).catch(err => {
-          tableObject.loading = false
+          // tableObject.loading = false
           console.log(err)
+          // 生成收货申请
+          // tableObject.loading = true
+          ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
+            message.success(t('common.createSuccess'))
+            tableObject.loading = false
+            getList()
+          }).catch(err => {
+            tableObject.loading = false
+            console.log(err)
+          })
         })
       }
-      message.success(t('common.updateSuccess'))
-      tableObject.loading = false
-      getList()
+      // message.success(t('common.updateSuccess'))
+      // tableObject.loading = false
+      // getList()
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -390,23 +400,33 @@ const buttonTableClick = async (val, row) => {
         })
         // 生成备料计划
         tableObject.loading = true
-        await ProductionMainApi.generatePreparetoissue(row.number).then(() => {
-          // message.success(t('common.createSuccess'))
-          tableObject.loading = false
-          getList()
-        }).catch(err => {
-          tableObject.loading = false
-          console.log(err)
-        })
-        // 生成收货申请
-        tableObject.loading = true
-        await ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
+        ProductionMainApi.generatePreparetoissue(row.number).then(() => {
           // message.success(t('common.createSuccess'))
-          tableObject.loading = false
-          getList()
+          // tableObject.loading = false
+          // getList()
+          // 生成收货申请
+          // tableObject.loading = true
+          ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
+            message.success(t('common.createSuccess'))
+            tableObject.loading = false
+            getList()
+          }).catch(err => {
+            tableObject.loading = false
+            console.log(err)
+          })
         }).catch(err => {
-          tableObject.loading = false
+          // tableObject.loading = false
           console.log(err)
+          // 生成收货申请
+          // tableObject.loading = true
+          ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
+            message.success(t('common.createSuccess'))
+            tableObject.loading = false
+            getList()
+          }).catch(err => {
+            tableObject.loading = false
+            console.log(err)
+          })
         })
       }
     })
@@ -574,8 +594,42 @@ const submitForm = async (formType, submitData) => {
   try {
     if (formType === 'create') {
       data.subList = tableData.value // 拼接子表数据参数
-      await ProductionMainApi.createProductionMain(data)
-      message.success(t('common.createSuccess'))
+      await ProductionMainApi.createProductionMain(data).then((res) => {
+        // console.log(565,res)
+        if (res.status == '6') {
+          // 生成备料计划
+          tableObject.loading = true
+          ProductionMainApi.generatePreparetoissue(res.number).then(() => {
+            // message.success(t('common.createSuccess'))
+            // tableObject.loading = false
+            // getList()
+            // 生成收货申请
+            // tableObject.loading = true
+            ProductionMainApi.generateProductreceiptRequest(res.number).then(() => {
+              message.success(t('common.createSuccess'))
+              tableObject.loading = false
+              getList()
+            }).catch(err => {
+              tableObject.loading = false
+              console.log(err)
+            })
+          }).catch(err => {
+            // tableObject.loading = false
+            console.log(err)
+            // 生成收货申请
+            // tableObject.loading = true
+            ProductionMainApi.generateProductreceiptRequest(res.number).then(() => {
+              message.success(t('common.createSuccess'))
+              tableObject.loading = false
+              getList()
+            }).catch(err => {
+              tableObject.loading = false
+              console.log(err)
+            })
+          })
+        }
+      })
+      // message.success(t('common.createSuccess'))
     } else {
       await ProductionMainApi.updateProductionMain(data)
       message.success(t('common.updateSuccess'))
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
index cd26ba054..0efe6c81c 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
@@ -324,29 +324,39 @@ const buttonTableClick = async (val, row) => {
     await ProductionMainApi.submit(row.masterId).then((res) => {
       if (res.status == '6') {
         // 生成备料计划
-        tableObject.loading = true
+        // tableObject.loading = true
         ProductionMainApi.generatePreparetoissue(row.number).then(() => {
           // message.success(t('common.createSuccess'))
-          tableObject.loading = false
-          getList()
-        }).catch(err => {
-          tableObject.loading = false
-          console.log(err)
-        })
-        // 生成收货申请
-        tableObject.loading = true
-        ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
-          // message.success(t('common.createSuccess'))
-          tableObject.loading = false
-          getList()
+          // tableObject.loading = false
+          // getList()
+          // 生成收货申请
+          // tableObject.loading = true
+          ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
+            message.success(t('common.createSuccess'))
+            tableObject.loading = false
+            getList()
+          }).catch(err => {
+            tableObject.loading = false
+            console.log(err)
+          })
         }).catch(err => {
-          tableObject.loading = false
+          // tableObject.loading = false
           console.log(err)
+          // 生成收货申请
+          // tableObject.loading = true
+          ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
+            message.success(t('common.createSuccess'))
+            tableObject.loading = false
+            getList()
+          }).catch(err => {
+            tableObject.loading = false
+            console.log(err)
+          })
         })
       }
-      message.success(t('common.updateSuccess'))
-      tableObject.loading = false
-      getList()
+      // message.success(t('common.updateSuccess'))
+      // tableObject.loading = false
+      // getList()
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -390,23 +400,33 @@ const buttonTableClick = async (val, row) => {
         })
         // 生成备料计划
         tableObject.loading = true
-        await ProductionMainApi.generatePreparetoissue(row.number).then(() => {
-          // message.success(t('common.createSuccess'))
-          tableObject.loading = false
-          getList()
-        }).catch(err => {
-          tableObject.loading = false
-          console.log(err)
-        })
-        // 生成收货申请
-        tableObject.loading = true
-        await ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
+        ProductionMainApi.generatePreparetoissue(row.number).then(() => {
           // message.success(t('common.createSuccess'))
-          tableObject.loading = false
-          getList()
+          // tableObject.loading = false
+          // getList()
+          // 生成收货申请
+          // tableObject.loading = true
+          ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
+            message.success(t('common.createSuccess'))
+            tableObject.loading = false
+            getList()
+          }).catch(err => {
+            tableObject.loading = false
+            console.log(err)
+          })
         }).catch(err => {
-          tableObject.loading = false
+          // tableObject.loading = false
           console.log(err)
+          // 生成收货申请
+          // tableObject.loading = true
+          ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
+            message.success(t('common.createSuccess'))
+            tableObject.loading = false
+            getList()
+          }).catch(err => {
+            tableObject.loading = false
+            console.log(err)
+          })
         })
       }
     })
@@ -573,8 +593,42 @@ const submitForm = async (formType, submitData) => {
   try {
     if (formType === 'create') {
       data.subList = tableData.value // 拼接子表数据参数
-      await ProductionMainApi.createProductionMain(data)
-      message.success(t('common.createSuccess'))
+      await ProductionMainApi.createProductionMain(data).then((res) => {
+        // console.log(565,res)
+        if (res.status == '6') {
+          // 生成备料计划
+          tableObject.loading = true
+          ProductionMainApi.generatePreparetoissue(res.number).then(() => {
+            // message.success(t('common.createSuccess'))
+            // tableObject.loading = false
+            // getList()
+            // 生成收货申请
+            // tableObject.loading = true
+            ProductionMainApi.generateProductreceiptRequest(res.number).then(() => {
+              message.success(t('common.createSuccess'))
+              tableObject.loading = false
+              getList()
+            }).catch(err => {
+              tableObject.loading = false
+              console.log(err)
+            })
+          }).catch(err => {
+            // tableObject.loading = false
+            console.log(err)
+            // 生成收货申请
+            // tableObject.loading = true
+            ProductionMainApi.generateProductreceiptRequest(res.number).then(() => {
+              message.success(t('common.createSuccess'))
+              tableObject.loading = false
+              getList()
+            }).catch(err => {
+              tableObject.loading = false
+              console.log(err)
+            })
+          })
+        }
+      })
+      // message.success(t('common.createSuccess'))
     } else {
       await ProductionMainApi.updateProductionMain(data)
       message.success(t('common.updateSuccess'))
diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
index 60a8f1605..0700a5685 100644
--- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
@@ -324,29 +324,39 @@ const buttonTableClick = async (val, row) => {
     await ProductionMainApi.submit(row.masterId).then((res) => {
       if (res.status == '6') {
         // 生成备料计划
-        tableObject.loading = true
+        // tableObject.loading = true
         ProductionMainApi.generatePreparetoissue(row.number).then(() => {
           // message.success(t('common.createSuccess'))
-          tableObject.loading = false
-          getList()
-        }).catch(err => {
-          tableObject.loading = false
-          console.log(err)
-        })
-        // 生成收货申请
-        tableObject.loading = true
-        ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
-          // message.success(t('common.createSuccess'))
-          tableObject.loading = false
-          getList()
+          // tableObject.loading = false
+          // getList()
+          // 生成收货申请
+          // tableObject.loading = true
+          ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
+            message.success(t('common.createSuccess'))
+            tableObject.loading = false
+            getList()
+          }).catch(err => {
+            tableObject.loading = false
+            console.log(err)
+          })
         }).catch(err => {
-          tableObject.loading = false
+          // tableObject.loading = false
           console.log(err)
+          // 生成收货申请
+          // tableObject.loading = true
+          ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
+            message.success(t('common.createSuccess'))
+            tableObject.loading = false
+            getList()
+          }).catch(err => {
+            tableObject.loading = false
+            console.log(err)
+          })
         })
       }
-      message.success(t('common.updateSuccess'))
-      tableObject.loading = false
-      getList()
+      // message.success(t('common.updateSuccess'))
+      // tableObject.loading = false
+      // getList()
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -390,23 +400,33 @@ const buttonTableClick = async (val, row) => {
         })
         // 生成备料计划
         tableObject.loading = true
-        await ProductionMainApi.generatePreparetoissue(row.number).then(() => {
-          // message.success(t('common.createSuccess'))
-          tableObject.loading = false
-          getList()
-        }).catch(err => {
-          tableObject.loading = false
-          console.log(err)
-        })
-        // 生成收货申请
-        tableObject.loading = true
-        await ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
+        ProductionMainApi.generatePreparetoissue(row.number).then(() => {
           // message.success(t('common.createSuccess'))
-          tableObject.loading = false
-          getList()
+          // tableObject.loading = false
+          // getList()
+          // 生成收货申请
+          // tableObject.loading = true
+          ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
+            message.success(t('common.createSuccess'))
+            tableObject.loading = false
+            getList()
+          }).catch(err => {
+            tableObject.loading = false
+            console.log(err)
+          })
         }).catch(err => {
-          tableObject.loading = false
+          // tableObject.loading = false
           console.log(err)
+          // 生成收货申请
+          // tableObject.loading = true
+          ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
+            message.success(t('common.createSuccess'))
+            tableObject.loading = false
+            getList()
+          }).catch(err => {
+            tableObject.loading = false
+            console.log(err)
+          })
         })
       }
     })
@@ -574,8 +594,42 @@ const submitForm = async (formType, submitData) => {
   try {
     if (formType === 'create') {
       data.subList = tableData.value // 拼接子表数据参数
-      await ProductionMainApi.createProductionMain(data)
-      message.success(t('common.createSuccess'))
+      await ProductionMainApi.createProductionMain(data).then((res) => {
+        // console.log(565,res)
+        if (res.status == '6') {
+          // 生成备料计划
+          tableObject.loading = true
+          ProductionMainApi.generatePreparetoissue(res.number).then(() => {
+            // message.success(t('common.createSuccess'))
+            // tableObject.loading = false
+            // getList()
+            // 生成收货申请
+            // tableObject.loading = true
+            ProductionMainApi.generateProductreceiptRequest(res.number).then(() => {
+              message.success(t('common.createSuccess'))
+              tableObject.loading = false
+              getList()
+            }).catch(err => {
+              tableObject.loading = false
+              console.log(err)
+            })
+          }).catch(err => {
+            // tableObject.loading = false
+            console.log(err)
+            // 生成收货申请
+            // tableObject.loading = true
+            ProductionMainApi.generateProductreceiptRequest(res.number).then(() => {
+              message.success(t('common.createSuccess'))
+              tableObject.loading = false
+              getList()
+            }).catch(err => {
+              tableObject.loading = false
+              console.log(err)
+            })
+          })
+        }
+      })
+      // message.success(t('common.createSuccess'))
     } else {
       await ProductionMainApi.updateProductionMain(data)
       message.success(t('common.updateSuccess'))

From 86dc84c0e53f88abd1f35f220c9389f3c132c1e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com>
Date: Fri, 12 Jul 2024 16:40:39 +0800
Subject: [PATCH 391/408] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/inspectionJob/addForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/qms/inspectionJob/addForm.vue b/src/views/qms/inspectionJob/addForm.vue
index 754a80d8f..f608b5740 100644
--- a/src/views/qms/inspectionJob/addForm.vue
+++ b/src/views/qms/inspectionJob/addForm.vue
@@ -465,7 +465,7 @@
                         <el-input
                           v-model="cur.remark"
                           placeholder="请输入备注"
-                          type="text"
+                          type="text" maxlength="200"
                         />
                       </el-form-item>
                     </el-col>

From f02508c786f24bccf7dcf50579cb50158503c713 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 12 Jul 2024 16:51:39 +0800
Subject: [PATCH 392/408] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/purchasePlanMain/index.ts         | 15 +++++++++
 .../productreceiptRequestMain/index.vue       |  2 ++
 .../index.vue                                 |  1 +
 .../supplierinvoiceRequestMain.data.ts        | 33 ++++++++++++++++---
 4 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/src/api/wms/purchasePlanMain/index.ts b/src/api/wms/purchasePlanMain/index.ts
index 9d5e42230..ce1e68df6 100644
--- a/src/api/wms/purchasePlanMain/index.ts
+++ b/src/api/wms/purchasePlanMain/index.ts
@@ -87,19 +87,34 @@ export const exportPurchasePlanMain = async (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 {
+    params = getPageParams(params)
     return await request.download({ url: `/wms/purchase-plan-main/export-excel-detail`, params })
   }
 }
+// 要货预测-列表和头部请求参数
+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
+}
 // 导出要货计划二维表 Excel
 export const exportTablePurchasePlanMain = async (params) => {
+  params = getPageParams(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 })
   //}
 }
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
index 46c2e7a7b..ac11bd065 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
@@ -233,6 +233,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         val.forEach(item=>{
           const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
           newRow[formField] = item[searchField]
+          newRow.batch = formatTime(new Date(), 'yyyyMMdd')
+
           tableData.value.push(newRow)
         })
       }else{
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
index cc0ccf7cf..be07c0b41 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
@@ -234,6 +234,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         val.forEach(item=>{
           const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
           newRow[formField] = item[searchField]
+          newRow.batch = formatTime(new Date(), 'yyyyMMdd')
           tableData.value.push(newRow)
         })
       }else{
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index 1eafe9afa..18b8a915b 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -765,13 +765,13 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
   },
   {
     label: '采购价格审批人',
-    field: 'procurementCreatorName',
+    field: 'procurementCreator',
     table: {
       width: 150
     },
     sortTableDefault:14,
     isForm: true,
-    isTable:true,
+    isTable:false,
     isDetail:false,
     form: {
       component: 'Select',
@@ -800,7 +800,27 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       // }
     }
   },
-
+  {
+    label: '采购价格审批人',
+    field: 'procurementCreatorName',
+    table: {
+      width: 150
+    },
+    sortTableDefault:14,
+    isForm: false,
+    isTable:true,
+    isDetail:false,
+    form: {
+      component: 'Select',
+      api: () => procurementCreators.list,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'nickname',
+          valueField: 'id'
+        }
+      },
+    }
+  },
   {
     label: '采购审批人',
     field: 'procurementCreatorName',
@@ -1251,6 +1271,9 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
   {
     label: '采购价格审批时间',
     field: 'procurementCreateTime',
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
     sortTableDefault: 1003,
     isForm: false,
     isTable: false,
@@ -1345,7 +1368,9 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     label: '财务审批时间',
     field: 'financialCreateTime',
     formatter: dateFormatter,
-    
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
     sortTableDefault: 6,
     isForm: false,
     isTable: false,

From c038f1f132b7e5e1a56cfb59241ce6556e0445f1 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 12 Jul 2024 16:53:31 +0800
Subject: [PATCH 393/408] =?UTF-8?q?=E6=81=A2=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/purchasePlanMain/index.ts | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/src/api/wms/purchasePlanMain/index.ts b/src/api/wms/purchasePlanMain/index.ts
index ce1e68df6..9d5e42230 100644
--- a/src/api/wms/purchasePlanMain/index.ts
+++ b/src/api/wms/purchasePlanMain/index.ts
@@ -87,34 +87,19 @@ export const exportPurchasePlanMain = async (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 {
-    params = getPageParams(params)
     return await request.download({ url: `/wms/purchase-plan-main/export-excel-detail`, params })
   }
 }
-// 要货预测-列表和头部请求参数
-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
-}
 // 导出要货计划二维表 Excel
 export const exportTablePurchasePlanMain = async (params) => {
-  params = getPageParams(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 })
   //}
 }

From e6415d3f17992c7352e9482c46645195bc4801cc Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 12 Jul 2024 17:08:47 +0800
Subject: [PATCH 394/408] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E7=94=9F=E6=88=90=E6=A0=87=E7=AD=BEEDI?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E8=BE=93=E5=85=A5=E7=94=9F=E4=BA=A7=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=EF=BC=8C=E9=A5=BC=E5=B8=A6=E5=87=BA=E6=89=B9=E6=AC=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereceiptRequestMain/index.vue      | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
index 5323a3d6c..877f821dd 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
@@ -112,6 +112,7 @@
     :isShowReduceButton="false"
     @submitForm="submitFormLabel"
     @searchTableSuccess="searchTableSuccessLabel"
+    @formFormDateChange="onChangeLabel"
   />
   
     <!-- 子包装弹窗 -->
@@ -168,6 +169,7 @@ import * as PurchaseDetailApi from '@/api/wms/purchaseDetail'
 import * as ItembasicApi from '@/api/wms/itembasic'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 import { getReportUrl } from '@/utils/systemParam'
+import { dateFormatter2 } from '@/utils/formatTime'
 
 // 采购收货申请
 defineOptions({ name: 'PurchasereceiptRequestMain' })
@@ -394,6 +396,20 @@ const buttonTableClick = async (val, row) => {
       masterId:row.masterId
      }
     genLabelId.value = row.masterId
+    // 数据来源是EDI默认让输入生产日期
+    if (row.sourceType == 'EDI') {
+      PurchasereceiptRequestDetailLabel.allSchemas.tableFormColumns.forEach(item => {
+          if (item.field == 'produceDate') {
+          item.tableForm.disabled = false
+        }
+      })
+    } else {
+      PurchasereceiptRequestDetailLabel.allSchemas.tableFormColumns.forEach(item => {
+          if (item.field == 'produceDate') {
+          item.tableForm.disabled = true
+        }
+      })
+    }
     await getDetailList()
     formLabelRef.value.open('create', row, null,'createLabel')//创建标签页面 createLabel 标题
   }else if (val == 'point') {
@@ -404,7 +420,12 @@ const buttonTableClick = async (val, row) => {
     checkQualityReport(row)
   }
 }
-
+// 生成标签选择
+const onChangeLabel =(field,e,row, index) => {
+  const arr = dateFormatter2('', '', e)?.split('-')
+  const str = arr[0]+arr[1]+arr[2]
+  row.batch = str
+}
 // 查看质检报告
 const showQualityReport = ref(false)
 const qualityReport = ref('')

From 0e363d4793063f22767184db941889098b1e1aaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com>
Date: Fri, 12 Jul 2024 17:12:53 +0800
Subject: [PATCH 395/408] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/inspectionJob/inspectionJobMain.data.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/qms/inspectionJob/inspectionJobMain.data.ts b/src/views/qms/inspectionJob/inspectionJobMain.data.ts
index e9f6f983b..88f9fd035 100644
--- a/src/views/qms/inspectionJob/inspectionJobMain.data.ts
+++ b/src/views/qms/inspectionJob/inspectionJobMain.data.ts
@@ -508,7 +508,7 @@ export const InspectionJobMain = useCrudSchemas(
       isForm: false,
       isDetail: false,
       table: {
-        width: 150,
+        width: 300,
         fixed: 'right'
       }
     }

From b9f857feb5276e35bb0c7b2340fdba189fc6429c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com>
Date: Fri, 12 Jul 2024 17:23:35 +0800
Subject: [PATCH 396/408] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../moveManage/inventorymove/inventorymoveRequestMain/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
index 30e3cdf70..3d7a9182e 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
@@ -350,7 +350,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           newRow['fromInventoryStatus'] = item['inventoryStatus']
           newRow['fromLocationCode'] = item['locationCode']
           newRow['uom'] = item['uom']
-          newRow['qty'] = item['packQty']
+          newRow['qty'] = item['qty']
           if(routeName.value == 'OktoholdRequestMain'){
             newRow['toInventoryStatus'] = "HOLD"
           }else if(routeName.value == 'NoktoholdRequestMain'){

From c4454e03cf04c835235b3797eedbfa1410642ad7 Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Fri, 12 Jul 2024 18:34:19 +0800
Subject: [PATCH 397/408] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7bug=E4=BF=AE=E5=A4=8D=EF=BC=8C=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E5=88=B0=E8=B4=A7=E6=97=A5=E6=9C=9F=EF=BC=8C=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E6=97=A5=E6=9C=9F=EF=BC=8C=E4=BB=BB=E5=8A=A1=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86ID=EF=BC=8C=E5=8C=85=E8=A3=85=E5=8F=B7=E8=B5=8B?=
 =?UTF-8?q?=E5=80=BC=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereturnRequestMain/index.vue       |   3 +-
 .../purchasereturnRequestMain.data.ts         | 264 +++++++++---------
 2 files changed, 134 insertions(+), 133 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
index de668c94d..0145d5de3 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
@@ -232,7 +232,7 @@ const searchTableSuccess = async (formField, searchField, val, formRef, type, ro
   nextTick(async () => {
     if (type == 'tableForm') {
       // 明细查询页赋值
-      
+
       if (formField == 'purchaseReceiptRecordNumber') {
         row[formField] = val[0][searchField]
         //搜索记录单号--回显数据
@@ -418,6 +418,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
       setV['singlePrice'] = val[0]['singlePrice']
       setV['amount'] = val[0]['amount']
       setV['projectCode'] = val[0]['projectCode']
+      setV['packingNumber'] = val[0]['packingNumber']
 
       if (formField == 'itemCode') {
         setV['batch'] = val[0]['toBatch']
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
index f4a706b9c..bc10f2178 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
@@ -895,7 +895,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       componentProps: {
         min: 0,
         precision: 6,
-        disabled:true
+        disabled:false
       }
     },
     isTable:false,
@@ -1014,28 +1014,28 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       }]
     },
   },
-  {
-    label: '库存余额',
-    field: 'inventoryBalance',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        min: 0,
-        precision: 6
-      }
-    },
-    isForm:false,
-    tableForm:{
-      hidden:false,//控制列是否展示
-      type:'InputNumber',
-      min:0,
-      precision: 6
-    }
-  },
+  // {
+  //   label: '库存余额',
+  //   field: 'inventoryBalance',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'InputNumber',
+  //     componentProps: {
+  //       min: 0,
+  //       precision: 6
+  //     }
+  //   },
+  //   isForm:false,
+  //   tableForm:{
+  //     hidden:false,//控制列是否展示
+  //     type:'InputNumber',
+  //     min:0,
+  //     precision: 6
+  //   }
+  // },
   {
     label: '退货数量',
     field: 'qty',
@@ -1137,115 +1137,115 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       }
     }
   },
-  {
-    label: '到货日期',
-    field: 'arriveDate',
-    formatter: dateFormatter2,
-    detail: {
-      dateFormat: 'YYYY-MM-DD'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    hiddenInMain: true,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width: '100%'},
-        type: 'date',
-        dateFormat: 'YYYY-MM-DD',
-        valueFormat: 'x',
-      }
-    },
-    tableForm:{
-      disabled:true,
-      type: 'FormDate',
-      dateFormat: 'YYYY-MM-DD',
-      valueFormat: 'x',
-    },
-    isTableForm: false
-  },
-  {
-    label: '生产日期',
-    field: 'produceDate',
-    formatter: dateFormatter2,
-    detail: {
-      dateFormat: 'YYYY-MM-DD'
-    },
-    hiddenInMain: true,
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        disabled: true,
-        style: {width: '100%'},
-        type: 'date',
-        dateFormat: 'YYYY-MM-DD',
-        valueFormat: 'x',
-      }
-    },
-    tableForm:{
-      disabled:true,
-      type: 'FormDate',
-      format: 'YYYY-MM-DD',
-      valueFormat: 'x',
-    },
-    isTableForm: false
-  },
-  {
-    label: '过期日期',
-    field: 'expireDate',
-    formatter: dateFormatter2,
-    detail: {
-      dateFormat: 'YYYY-MM-DD'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    hiddenInMain: true,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        disabled: true,
-        style: {width: '100%'},
-        type: 'date',
-        dateFormat: 'YYYY-MM-DD',
-        valueFormat: 'x',
-      }
-    },
-    isTableForm: false,
-    isTable: false,
-    tableForm:{
-      disabled:true,
-      type: 'FormDate',
-      format: 'YYYY-MM-DD',
-      valueFormat: 'x',
-    }
-  },
-  {
-    label: '任务明细ID',
-    field: 'jobDetailId',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm:{
-      disabled:true
-    },
-    isTableForm:false,
-    hiddenInMain: true,
-    isForm:false,
-    form: {
-      componentProps:{
-        disabled:true
-      }
-    },
-  },
+  // {
+  //   label: '到货日期',
+  //   field: 'arriveDate',
+  //   formatter: dateFormatter2,
+  //   detail: {
+  //     dateFormat: 'YYYY-MM-DD'
+  //   },
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  //   hiddenInMain: true,
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       style: {width: '100%'},
+  //       type: 'date',
+  //       dateFormat: 'YYYY-MM-DD',
+  //       valueFormat: 'x',
+  //     }
+  //   },
+  //   tableForm:{
+  //     disabled:true,
+  //     type: 'FormDate',
+  //     dateFormat: 'YYYY-MM-DD',
+  //     valueFormat: 'x',
+  //   },
+  //   isTableForm: false
+  // },
+  // {
+  //   label: '生产日期',
+  //   field: 'produceDate',
+  //   formatter: dateFormatter2,
+  //   detail: {
+  //     dateFormat: 'YYYY-MM-DD'
+  //   },
+  //   hiddenInMain: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       disabled: true,
+  //       style: {width: '100%'},
+  //       type: 'date',
+  //       dateFormat: 'YYYY-MM-DD',
+  //       valueFormat: 'x',
+  //     }
+  //   },
+  //   tableForm:{
+  //     disabled:true,
+  //     type: 'FormDate',
+  //     format: 'YYYY-MM-DD',
+  //     valueFormat: 'x',
+  //   },
+  //   isTableForm: false
+  // },
+  // {
+  //   label: '过期日期',
+  //   field: 'expireDate',
+  //   formatter: dateFormatter2,
+  //   detail: {
+  //     dateFormat: 'YYYY-MM-DD'
+  //   },
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  //   hiddenInMain: true,
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       disabled: true,
+  //       style: {width: '100%'},
+  //       type: 'date',
+  //       dateFormat: 'YYYY-MM-DD',
+  //       valueFormat: 'x',
+  //     }
+  //   },
+  //   isTableForm: false,
+  //   isTable: false,
+  //   tableForm:{
+  //     disabled:true,
+  //     type: 'FormDate',
+  //     format: 'YYYY-MM-DD',
+  //     valueFormat: 'x',
+  //   }
+  // },
+  // {
+  //   label: '任务明细ID',
+  //   field: 'jobDetailId',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   tableForm:{
+  //     disabled:true
+  //   },
+  //   isTableForm:false,
+  //   hiddenInMain: true,
+  //   isForm:false,
+  //   form: {
+  //     componentProps:{
+  //       disabled:true
+  //     }
+  //   },
+  // },
   {
     label: '项目代码',
     field: 'projectCode',

From b976de48c1d35e10456eb343374dd4e509dc14c9 Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Fri, 12 Jul 2024 18:45:40 +0800
Subject: [PATCH 398/408] =?UTF-8?q?=E9=AB=98=E7=BA=A7=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E9=BB=98=E8=AE=A4=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../initialContainerMainRequest/index.vue          |  5 ++++-
 .../productputaway/productputawayJobMain/index.vue |  3 +++
 .../productputawayRecordMain/index.vue             |  3 +++
 .../productputawayRequestMain/index.vue            |  3 +++
 .../productreceipt/productreceiptJobMain/index.vue |  3 +++
 .../productreceiptscrapJobMain/index.vue           |  3 +++
 .../productreceiptscrapRecordMain/index.vue        |  3 +++
 .../productreceiptscrapRequestMain/index.vue       | 14 ++++++++++++--
 8 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue
index 80a5ba071..6024c640f 100644
--- a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue
@@ -139,7 +139,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
           newRow['toInventoryStatus'] = 'OK'
           tableData.value.push(newRow)
         })
-          
+
       }else if(formField == 'toLocationCode'){
         row['toLocationCode'] = val[0]['code']
       }else {
@@ -487,6 +487,9 @@ const searchFormClick = (searchData) => {
     'action':'==',
     'value':'INITIAL'
   }
+  if (!Array.isArray(searchData.filters)) {
+    searchData.filters = [];
+  }
   searchData.filters.push(cmd)
   tableObject.params = {
     isSearch: true,
diff --git a/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
index 83e25ee9b..57a431d19 100644
--- a/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
+++ b/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
@@ -260,6 +260,9 @@ const searchFormClick = (searchData) => {
     'action':'==',
     'value':'predict'
   }
+  if (!Array.isArray(searchData.filters)) {
+    searchData.filters = [];
+  }
   searchData.filters.push(cmd)
   tableObject.params = {
     isSearch: true,
diff --git a/src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue
index 9778c239b..c788adcc7 100644
--- a/src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue
+++ b/src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue
@@ -170,6 +170,9 @@ const searchFormClick = (searchData) => {
     'action':'==',
     'value':'predict'
   }
+  if (!Array.isArray(searchData.filters)) {
+    searchData.filters = [];
+  }
   searchData.filters.push(cmd)
   tableObject.params = {
     isSearch: true,
diff --git a/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue
index 9cfa44045..997469e15 100644
--- a/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue
+++ b/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue
@@ -426,6 +426,9 @@ const searchFormClick = (searchData) => {
     'action':'==',
     'value':'predict'
   }
+  if (!Array.isArray(searchData.filters)) {
+    searchData.filters = [];
+  }
   searchData.filters.push(cmd)
   tableObject.params = {
     isSearch: true,
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue
index 209c2b91b..b9a0ae9fa 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue
@@ -364,6 +364,9 @@ const searchFormClick = (searchData) => {
     'action':'==',
     'value':'predict'
   }
+  if (!Array.isArray(searchData.filters)) {
+    searchData.filters = [];
+  }
   searchData.filters.push(cmd)
   tableObject.params = {
     isSearch: true,
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue
index ce5ab9968..7a96fc26d 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue
@@ -301,6 +301,9 @@ const searchFormClick = (searchData) => {
     'action':'==',
     'value':'scrap'
   }
+  if (!Array.isArray(searchData.filters)) {
+    searchData.filters = [];
+  }
   searchData.filters.push(cmd)
   tableObject.params = {
     isSearch: true,
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue
index e5f369ecc..e9a0eb4cd 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue
@@ -213,6 +213,9 @@ const searchFormClick = (searchData) => {
     'action':'==',
     'value':'scrap'
   }
+  if (!Array.isArray(searchData.filters)) {
+    searchData.filters = [];
+  }
   searchData.filters.push(cmd)
   tableObject.params = {
     isSearch: true,
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
index c053bb4b0..811f90d25 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
@@ -115,7 +115,7 @@
     </Dialog>
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/wms/productreceipt-request-main/import" :importTemplateData="importTemplateData" 
+  <ImportForm ref="importFormRef" url="/wms/productreceipt-request-main/import" :importTemplateData="importTemplateData"
   @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" :extend="'scrap'"/>
   <!-- 标签打印 -->
   <SearchTable style="width:905px" ref="searchTableRef" @searchTableSuccess="searchTableSuccess1" />
@@ -169,7 +169,7 @@ const buttondataTable = ref([{
 const detailListTableColumns = ProductreceiptRequestLabel.allSchemas
 const isCreateLabel = ref(false)
 const formLabelRef = ref()
-const labelType = ref('') // 标签类别 采购还是制造等 
+const labelType = ref('') // 标签类别 采购还是制造等
 const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({
   getListApi: ProductreceiptRequestDetailApi.getProductreceiptRequestDetailPageScrap
 })
@@ -637,6 +637,16 @@ const importSuccess = () => {
 
 // 筛选提交
 const searchFormClick = (searchData) => {
+
+  if (!Array.isArray(searchData.filters)) {
+    searchData.filters = [];
+  }
+  const cmd = {
+    'column':'type',
+    'action':'==',
+    'value':'scrap'
+  };
+  searchData.filters.push(cmd);
   tableObject.params = {
     isSearch: true,
     filters: searchData.filters

From e501bb6495217c56a9dca315aa73c127ae10c65c Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Fri, 12 Jul 2024 18:46:34 +0800
Subject: [PATCH 399/408] =?UTF-8?q?=E9=AB=98=E7=BA=A7=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E9=BB=98=E8=AE=A4=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../containermanage/containerRecordMain/index.vue              | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue
index edfe467ad..1c0177cee 100644
--- a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue
@@ -242,6 +242,9 @@ const searchFormClick = (searchData) => {
     'action':'==',
     'value':'INITIAL'
   }
+  if (!Array.isArray(searchData.filters)) {
+    searchData.filters = [];
+  }
   searchData.filters.push(cmd)
   tableObject.params = {
     isSearch: true,

From 2c1c72b0898fe70da9bfab1ac2626d200c8182b1 Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Fri, 12 Jul 2024 19:03:37 +0800
Subject: [PATCH 400/408] =?UTF-8?q?=E5=A4=87=E6=96=99=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../preparetoissueplan/preparetoissueMain/index.vue   | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue
index fa9344e05..87e0a99fd 100644
--- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue
+++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue
@@ -77,7 +77,8 @@
   />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/wms/preparetoissue-main/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <ImportForm ref="importFormRef" url="/wms/preparetoissue-main/import" :importTemplateData="importTemplateData"
+              @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
 </template>
 
 <script setup lang="ts">
@@ -197,7 +198,7 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultAddBtn({hasPermi:'wms:preparetoissue-main:create'}), // 新增
-  // defaultButtons.defaultImportBtn({hasPermi:'wms:preparetoissue-main:import'}), // 导入
+  defaultButtons.defaultImportBtn({hasPermi:'wms:preparetoissue-main:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:preparetoissue-main:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
@@ -357,7 +358,7 @@ const openForm =async (type: string, row?: number) => {
   if (type == 'update') {
     // 修改 tableform 属性
     PreparetoissueMain.allSchemas.formSchema.map(item => {
-      if(item.field == 'productionPlanNumber' || 
+      if(item.field == 'productionPlanNumber' ||
           item.field == 'workshop' ||
           item.field == 'prodLine' ||
           item.field == 'shift' ||
@@ -370,7 +371,7 @@ const openForm =async (type: string, row?: number) => {
   } else {
     // 修改 tableform 属性
     PreparetoissueMain.allSchemas.formSchema.map(item => {
-      if(item.field == 'productionPlanNumber' || 
+      if(item.field == 'productionPlanNumber' ||
           item.field == 'workshop' ||
           item.field == 'prodLine' ||
           item.field == 'shift' ||
@@ -520,6 +521,6 @@ const resetShow = async () => {
 /** 初始化 **/
 onMounted(async () => {
   getList()
-  // importTemplateData.templateUrl = await PreparetoissueMainApi.importTemplate()
+  importTemplateData.templateUrl = await PreparetoissueMainApi.importTemplate()
 })
 </script>

From 46ddccccd5b797feaa52973fa36922df6a98d6f6 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Sat, 13 Jul 2024 13:06:10 +0800
Subject: [PATCH 401/408] =?UTF-8?q?BOM=E5=AD=97=E6=AE=B5=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E6=89=B9=E6=AC=A1=E7=94=B1=E5=85=A8=E9=83=A8?=
 =?UTF-8?q?=E6=89=8B=E5=B7=A5=E5=A1=AB=E5=86=99=E5=BD=A2=E5=BC=8F=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E7=B3=BB=E7=BB=9F=E9=BB=98=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productscrapRequestMain/index.vue         | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
index 55a76f671..8f48623fe 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
@@ -119,6 +119,7 @@ import * as StdcostpriceApi from '@/api/wms/stdcostprice'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as BomDismantleApi from "@/api/wms/bomDismantle"
 import * as BomApi from "@/api/wms/bom";
+import * as BalanceApi from "@/api/wms/balance";
 
 // 制品报废申请
 defineOptions({ name: 'ProductscrapRequestMain' })
@@ -211,6 +212,22 @@ const buttonBaseClickBom = (val) => {
     detailBomRef.value.dialogVisible = false
   }
 }
+const banchBomPage = async (fromLocationCode,item) => {
+  const params = {
+    location_code:fromLocationCode,
+    itemCode:item.itemCode,
+    pageSize: 20,
+    pageNo: 1,
+    sort:'' ,
+    by: 'ASC',
+  }
+  const list = await BalanceApi.getBanchBomPage(params)
+  const obj =list[0]
+  console.log(list);
+  return obj
+  
+}
+
 // 新增 tableform 按钮
 const buttonOperationClick = async (row, label, index)=> {
   if (row.itemCode == '') {
@@ -227,7 +244,8 @@ const buttonOperationClick = async (row, label, index)=> {
   bomModelVisible.value = true
   await getDetailListBom()
   console.log(row.fromLocationCode);
-  detatableDataBom.tableList.forEach(item => {
+  detatableDataBom.tableList.forEach(async item => {
+    console.log(333,item)
     ProdcutscrapBomScrap.allSchemas.tableFormColumns.map((bomItem) => {
       if (bomItem.field == 'batch') {
         let condition = [{
@@ -256,6 +274,8 @@ const buttonOperationClick = async (row, label, index)=> {
     }else {
       item.qty = item.bomQty * row.qty
     }
+    const obj = await banchBomPage(row.fromLocationCode, item)
+    item.batch = obj.batch
   })
   detailBomRef.value.open('create', row, null,'viewDetail')//查看明细数据
 }

From 9eca17d93d5744afc1afb49695b324f918d1d2da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Sat, 13 Jul 2024 16:37:20 +0800
Subject: [PATCH 402/408] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=88=B0=E5=A4=87=E6=96=99=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E5=8F=8A=E5=A4=87=E6=96=99=E8=AE=A1=E5=88=92=E5=88=B0=E5=8F=91?=
 =?UTF-8?q?=E6=96=99=E7=94=B3=E8=AF=B7=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/preparetoissueMain/index.ts       |  6 ++++
 src/api/wms/productionMain/index.ts           |  5 +++
 .../preparetoissueMain/index.vue              | 32 +++++++++++++++--
 .../productionplan/productionMain/index.vue   | 35 +++++++------------
 .../productionMainAssemble/index.vue          | 33 +++++++----------
 .../productionMainAssembleSparePart/index.vue | 32 +++++++----------
 .../productionMainPredictSparePart/index.vue  | 35 +++++++------------
 7 files changed, 89 insertions(+), 89 deletions(-)

diff --git a/src/api/wms/preparetoissueMain/index.ts b/src/api/wms/preparetoissueMain/index.ts
index b86b6fcd7..2dd0c8d66 100644
--- a/src/api/wms/preparetoissueMain/index.ts
+++ b/src/api/wms/preparetoissueMain/index.ts
@@ -107,3 +107,9 @@ export const publish = (id) => {
 export const resetting = (id) => {
   return request.put({ url: '/wms/preparetoissue-main/resetting?id=' + id })
 }
+
+
+// 创建发料申请
+export const generateIssueRequest = (number) => {
+  return request.post({ url: '/wms/preparetoissue-main/generateIssueRequest?number=' + number })
+}
\ No newline at end of file
diff --git a/src/api/wms/productionMain/index.ts b/src/api/wms/productionMain/index.ts
index 0086aa58e..372b1c85f 100644
--- a/src/api/wms/productionMain/index.ts
+++ b/src/api/wms/productionMain/index.ts
@@ -189,6 +189,11 @@ export const generateProductreceiptRequest = (number) => {
   return request.post({ url: '/wms/production-main/generateProductreceiptRequest?number=' + number })
 }
 
+// 创建发料申请
+export const generateIssueRequest = (number) => {
+  return request.post({ url: '/wms/preparetoissue-main/generateIssueRequest?number=' + number })
+}
+
 
 
 
diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue
index 87e0a99fd..6ede9c549 100644
--- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue
+++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue
@@ -252,7 +252,7 @@ const butttondata = (row,$index) => {
     return []
   }
   return [
-  defaultButtons.mainListPlanOpeBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:preparetoissue-main:open'}), // 打开
+    defaultButtons.mainListPlanOpeBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:preparetoissue-main:open'}), // 打开
     defaultButtons.mainListPlanCloBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:preparetoissue-main:close'}), // 关闭
     defaultButtons.mainListPlanSubBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:preparetoissue-main:submit'}), // 提交审批
     defaultButtons.mainListPlanTurBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:preparetoissue-main:reject'}), // 驳回
@@ -261,6 +261,16 @@ const butttondata = (row,$index) => {
     defaultButtons.mainListPlanResBtn({hide:isShowMainButton(row,['4']),hasPermi:'wms:preparetoissue-main:resetting'}), // 重置
     defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:preparetoissue-main:update'}), // 编辑
     // defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:preparetoissue-main:delete'}), // 删除
+    {
+      label: '生成发料申请',
+      name: 'scflsq',
+      hide: isShowMainButton(row,['6']),
+      type: 'primary',
+      icon: 'Select',
+      hasPermi:'wms:preparetoissue-main:publish',
+      link: true, // 文本展现按钮
+      color: ''
+    },
   ]
 }
 
@@ -329,6 +339,7 @@ const buttonTableClick = async (val, row) => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
+      PreparetoissueMainApi.generateIssueRequest(row.number)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -344,6 +355,18 @@ const buttonTableClick = async (val, row) => {
       tableObject.loading = false
       console.log(err)
     })
+  } else if (val == 'scflsq') { // 生成发料申请
+    if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+    await message.confirm('确认要生成发料申请吗？')
+    tableObject.loading = true
+    await PreparetoissueMainApi.generateIssueRequest(row.number).then(() => {
+      message.success(t('common.createSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
   } else if (val == 'edit') { // 编辑
     openForm('update', row)
   } else if (val == 'delete') { // 删除
@@ -458,7 +481,12 @@ const submitForm = async (formType, submitData) => {
   data.subList = tableData.value // 拼接子表数据参数
   try {
     if (formType === 'create') {
-      await PreparetoissueMainApi.createPreparetoissueMain(data)
+      await PreparetoissueMainApi.createPreparetoissueMain(data).then((res) => {
+        if (res.status == '6') {
+          // 生成发料申请
+          PreparetoissueMainApi.generateIssueRequest(res.number)
+        }
+      })
       message.success(t('common.createSuccess'))
     } else {
       await PreparetoissueMainApi.updatePreparetoissueMain(data)
diff --git a/src/views/wms/productionManage/productionplan/productionMain/index.vue b/src/views/wms/productionManage/productionplan/productionMain/index.vue
index 44ab714e5..642431a99 100644
--- a/src/views/wms/productionManage/productionplan/productionMain/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMain/index.vue
@@ -332,13 +332,8 @@ const buttonTableClick = async (val, row) => {
     await ProductionMainApi.submit(row.masterId).then((res) => {
       if (res.status == '6') {
         // 生成备料计划
-        // tableObject.loading = true
-        ProductionMainApi.generatePreparetoissue(row.number).then(() => {
-          // message.success(t('common.createSuccess'))
-          // tableObject.loading = false
-          // getList()
+        ProductionMainApi.generatePreparetoissue(row.number).then((PreparetoissueRes) => {
           // 生成收货申请
-          // tableObject.loading = true
           ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
             message.success(t('common.createSuccess'))
             tableObject.loading = false
@@ -347,11 +342,11 @@ const buttonTableClick = async (val, row) => {
             tableObject.loading = false
             console.log(err)
           })
+          // 生成发料申请
+          ProductionMainApi.generateIssueRequest(PreparetoissueRes.number)
         }).catch(err => {
-          // tableObject.loading = false
           console.log(err)
           // 生成收货申请
-          // tableObject.loading = true
           ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
             message.success(t('common.createSuccess'))
             tableObject.loading = false
@@ -408,12 +403,8 @@ const buttonTableClick = async (val, row) => {
         })
         // 生成备料计划
         tableObject.loading = true
-        ProductionMainApi.generatePreparetoissue(row.number).then(() => {
-          // message.success(t('common.createSuccess'))
-          // tableObject.loading = false
-          // getList()
+        ProductionMainApi.generatePreparetoissue(row.number).then((PreparetoissueRes) => {
           // 生成收货申请
-          // tableObject.loading = true
           ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
             message.success(t('common.createSuccess'))
             tableObject.loading = false
@@ -422,11 +413,11 @@ const buttonTableClick = async (val, row) => {
             tableObject.loading = false
             console.log(err)
           })
+          // 生成发料申请
+          ProductionMainApi.generateIssueRequest(PreparetoissueRes.number)
         }).catch(err => {
-          // tableObject.loading = false
           console.log(err)
           // 生成收货申请
-          // tableObject.loading = true
           ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
             message.success(t('common.createSuccess'))
             tableObject.loading = false
@@ -465,10 +456,12 @@ const buttonTableClick = async (val, row) => {
     if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
     await message.confirm('确认要生成备料计划吗？')
     tableObject.loading = true
-    await ProductionMainApi.generatePreparetoissue(row.number).then(() => {
+    await ProductionMainApi.generatePreparetoissue(row.number).then((PreparetoissueRes) => {
       message.success(t('common.createSuccess'))
       tableObject.loading = false
       getList()
+      // 生成发料申请
+      ProductionMainApi.generateIssueRequest(PreparetoissueRes.number)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -608,12 +601,8 @@ const submitForm = async (formType, submitData) => {
         if (res.status == '6') {
           // 生成备料计划
           tableObject.loading = true
-          ProductionMainApi.generatePreparetoissue(res.number).then(() => {
-            // message.success(t('common.createSuccess'))
-            // tableObject.loading = false
-            // getList()
+          ProductionMainApi.generatePreparetoissue(res.number).then((PreparetoissueRes) => {
             // 生成收货申请
-            // tableObject.loading = true
             ProductionMainApi.generateProductreceiptRequest(res.number).then(() => {
               message.success(t('common.createSuccess'))
               tableObject.loading = false
@@ -622,11 +611,11 @@ const submitForm = async (formType, submitData) => {
               tableObject.loading = false
               console.log(err)
             })
+            // 生成发料申请
+            ProductionMainApi.generateIssueRequest(PreparetoissueRes.number)
           }).catch(err => {
-            // tableObject.loading = false
             console.log(err)
             // 生成收货申请
-            // tableObject.loading = true
             ProductionMainApi.generateProductreceiptRequest(res.number).then(() => {
               message.success(t('common.createSuccess'))
               tableObject.loading = false
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
index 29cb1a855..1f63f5282 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
@@ -329,13 +329,8 @@ const buttonTableClick = async (val, row) => {
     await ProductionMainApi.submit(row.masterId).then((res) => {
       if (res.status == '6') {
         // 生成备料计划
-        // tableObject.loading = true
-        ProductionMainApi.generatePreparetoissue(row.number).then(() => {
-          // message.success(t('common.createSuccess'))
-          // tableObject.loading = false
-          // getList()
+        ProductionMainApi.generatePreparetoissue(row.number).then((PreparetoissueRes) => {
           // 生成收货申请
-          // tableObject.loading = true
           ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
             message.success(t('common.createSuccess'))
             tableObject.loading = false
@@ -344,6 +339,8 @@ const buttonTableClick = async (val, row) => {
             tableObject.loading = false
             console.log(err)
           })
+          // 生成发料申请
+          ProductionMainApi.generateIssueRequest(PreparetoissueRes.number)
         }).catch(err => {
           // tableObject.loading = false
           console.log(err)
@@ -405,12 +402,8 @@ const buttonTableClick = async (val, row) => {
         })
         // 生成备料计划
         tableObject.loading = true
-        ProductionMainApi.generatePreparetoissue(row.number).then(() => {
-          // message.success(t('common.createSuccess'))
-          // tableObject.loading = false
-          // getList()
+        ProductionMainApi.generatePreparetoissue(row.number).then((PreparetoissueRes) => {
           // 生成收货申请
-          // tableObject.loading = true
           ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
             message.success(t('common.createSuccess'))
             tableObject.loading = false
@@ -419,11 +412,11 @@ const buttonTableClick = async (val, row) => {
             tableObject.loading = false
             console.log(err)
           })
+          // 生成发料申请
+          ProductionMainApi.generateIssueRequest(PreparetoissueRes.number)
         }).catch(err => {
-          // tableObject.loading = false
           console.log(err)
           // 生成收货申请
-          // tableObject.loading = true
           ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
             message.success(t('common.createSuccess'))
             tableObject.loading = false
@@ -462,10 +455,12 @@ const buttonTableClick = async (val, row) => {
     if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
     await message.confirm('确认要生成备料计划吗？')
     tableObject.loading = true
-    await ProductionMainApi.generatePreparetoissue(row.number).then(() => {
+    await ProductionMainApi.generatePreparetoissue(row.number).then((PreparetoissueRes) => {
       message.success(t('common.createSuccess'))
       tableObject.loading = false
       getList()
+      // 生成发料申请
+      ProductionMainApi.generateIssueRequest(PreparetoissueRes.number)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -604,12 +599,8 @@ const submitForm = async (formType, submitData) => {
         if (res.status == '6') {
           // 生成备料计划
           tableObject.loading = true
-          ProductionMainApi.generatePreparetoissue(res.number).then(() => {
-            // message.success(t('common.createSuccess'))
-            // tableObject.loading = false
-            // getList()
+          ProductionMainApi.generatePreparetoissue(res.number).then((PreparetoissueRes) => {
             // 生成收货申请
-            // tableObject.loading = true
             ProductionMainApi.generateProductreceiptRequest(res.number).then(() => {
               message.success(t('common.createSuccess'))
               tableObject.loading = false
@@ -618,11 +609,11 @@ const submitForm = async (formType, submitData) => {
               tableObject.loading = false
               console.log(err)
             })
+            // 生成发料申请
+            ProductionMainApi.generateIssueRequest(PreparetoissueRes.number)
           }).catch(err => {
-            // tableObject.loading = false
             console.log(err)
             // 生成收货申请
-            // tableObject.loading = true
             ProductionMainApi.generateProductreceiptRequest(res.number).then(() => {
               message.success(t('common.createSuccess'))
               tableObject.loading = false
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
index e774525ac..dad69ddeb 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
@@ -328,13 +328,8 @@ const buttonTableClick = async (val, row) => {
     await ProductionMainApi.submit(row.masterId).then((res) => {
       if (res.status == '6') {
         // 生成备料计划
-        // tableObject.loading = true
-        ProductionMainApi.generatePreparetoissue(row.number).then(() => {
-          // message.success(t('common.createSuccess'))
-          // tableObject.loading = false
-          // getList()
+        ProductionMainApi.generatePreparetoissue(row.number).then((PreparetoissueRes) => {
           // 生成收货申请
-          // tableObject.loading = true
           ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
             message.success(t('common.createSuccess'))
             tableObject.loading = false
@@ -343,6 +338,8 @@ const buttonTableClick = async (val, row) => {
             tableObject.loading = false
             console.log(err)
           })
+          // 生成发料申请
+          ProductionMainApi.generateIssueRequest(PreparetoissueRes.number)
         }).catch(err => {
           // tableObject.loading = false
           console.log(err)
@@ -404,12 +401,8 @@ const buttonTableClick = async (val, row) => {
         })
         // 生成备料计划
         tableObject.loading = true
-        ProductionMainApi.generatePreparetoissue(row.number).then(() => {
-          // message.success(t('common.createSuccess'))
-          // tableObject.loading = false
-          // getList()
+        ProductionMainApi.generatePreparetoissue(row.number).then((PreparetoissueRes) => {
           // 生成收货申请
-          // tableObject.loading = true
           ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
             message.success(t('common.createSuccess'))
             tableObject.loading = false
@@ -418,6 +411,8 @@ const buttonTableClick = async (val, row) => {
             tableObject.loading = false
             console.log(err)
           })
+          // 生成发料申请
+          ProductionMainApi.generateIssueRequest(PreparetoissueRes.number)
         }).catch(err => {
           // tableObject.loading = false
           console.log(err)
@@ -461,10 +456,12 @@ const buttonTableClick = async (val, row) => {
     if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
     await message.confirm('确认要生成备料计划吗？')
     tableObject.loading = true
-    await ProductionMainApi.generatePreparetoissue(row.number).then(() => {
+    await ProductionMainApi.generatePreparetoissue(row.number).then((PreparetoissueRes) => {
       message.success(t('common.createSuccess'))
       tableObject.loading = false
       getList()
+      // 生成发料申请
+      ProductionMainApi.generateIssueRequest(PreparetoissueRes.number)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -598,16 +595,11 @@ const submitForm = async (formType, submitData) => {
     if (formType === 'create') {
       data.subList = tableData.value // 拼接子表数据参数
       await ProductionMainApi.createProductionMain(data).then((res) => {
-        // console.log(565,res)
         if (res.status == '6') {
           // 生成备料计划
           tableObject.loading = true
-          ProductionMainApi.generatePreparetoissue(res.number).then(() => {
-            // message.success(t('common.createSuccess'))
-            // tableObject.loading = false
-            // getList()
+          ProductionMainApi.generatePreparetoissue(res.number).then((PreparetoissueRes) => {
             // 生成收货申请
-            // tableObject.loading = true
             ProductionMainApi.generateProductreceiptRequest(res.number).then(() => {
               message.success(t('common.createSuccess'))
               tableObject.loading = false
@@ -616,11 +608,11 @@ const submitForm = async (formType, submitData) => {
               tableObject.loading = false
               console.log(err)
             })
+            // 生成发料申请
+            ProductionMainApi.generateIssueRequest(PreparetoissueRes.number)
           }).catch(err => {
-            // tableObject.loading = false
             console.log(err)
             // 生成收货申请
-            // tableObject.loading = true
             ProductionMainApi.generateProductreceiptRequest(res.number).then(() => {
               message.success(t('common.createSuccess'))
               tableObject.loading = false
diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
index 51facfdb9..6a4e7cdac 100644
--- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
@@ -328,13 +328,8 @@ const buttonTableClick = async (val, row) => {
     await ProductionMainApi.submit(row.masterId).then((res) => {
       if (res.status == '6') {
         // 生成备料计划
-        // tableObject.loading = true
-        ProductionMainApi.generatePreparetoissue(row.number).then(() => {
-          // message.success(t('common.createSuccess'))
-          // tableObject.loading = false
-          // getList()
+        ProductionMainApi.generatePreparetoissue(row.number).then((PreparetoissueRes) => {
           // 生成收货申请
-          // tableObject.loading = true
           ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
             message.success(t('common.createSuccess'))
             tableObject.loading = false
@@ -343,11 +338,11 @@ const buttonTableClick = async (val, row) => {
             tableObject.loading = false
             console.log(err)
           })
+          // 生成发料申请
+          ProductionMainApi.generateIssueRequest(PreparetoissueRes.number)
         }).catch(err => {
-          // tableObject.loading = false
           console.log(err)
           // 生成收货申请
-          // tableObject.loading = true
           ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
             message.success(t('common.createSuccess'))
             tableObject.loading = false
@@ -404,12 +399,8 @@ const buttonTableClick = async (val, row) => {
         })
         // 生成备料计划
         tableObject.loading = true
-        ProductionMainApi.generatePreparetoissue(row.number).then(() => {
-          // message.success(t('common.createSuccess'))
-          // tableObject.loading = false
-          // getList()
+        ProductionMainApi.generatePreparetoissue(row.number).then((PreparetoissueRes) => {
           // 生成收货申请
-          // tableObject.loading = true
           ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
             message.success(t('common.createSuccess'))
             tableObject.loading = false
@@ -418,11 +409,11 @@ const buttonTableClick = async (val, row) => {
             tableObject.loading = false
             console.log(err)
           })
+          // 生成发料申请
+          ProductionMainApi.generateIssueRequest(PreparetoissueRes.number)
         }).catch(err => {
-          // tableObject.loading = false
           console.log(err)
           // 生成收货申请
-          // tableObject.loading = true
           ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
             message.success(t('common.createSuccess'))
             tableObject.loading = false
@@ -461,10 +452,12 @@ const buttonTableClick = async (val, row) => {
     if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
     await message.confirm('确认要生成备料计划吗？')
     tableObject.loading = true
-    await ProductionMainApi.generatePreparetoissue(row.number).then(() => {
+    await ProductionMainApi.generatePreparetoissue(row.number).then((PreparetoissueRes) => {
       message.success(t('common.createSuccess'))
       tableObject.loading = false
       getList()
+      // 生成发料申请
+      ProductionMainApi.generateIssueRequest(PreparetoissueRes.number)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -603,12 +596,8 @@ const submitForm = async (formType, submitData) => {
         if (res.status == '6') {
           // 生成备料计划
           tableObject.loading = true
-          ProductionMainApi.generatePreparetoissue(res.number).then(() => {
-            // message.success(t('common.createSuccess'))
-            // tableObject.loading = false
-            // getList()
+          ProductionMainApi.generatePreparetoissue(res.number).then((PreparetoissueRes) => {
             // 生成收货申请
-            // tableObject.loading = true
             ProductionMainApi.generateProductreceiptRequest(res.number).then(() => {
               message.success(t('common.createSuccess'))
               tableObject.loading = false
@@ -617,11 +606,11 @@ const submitForm = async (formType, submitData) => {
               tableObject.loading = false
               console.log(err)
             })
+            // 生成发料申请
+            ProductionMainApi.generateIssueRequest(PreparetoissueRes.number)
           }).catch(err => {
-            // tableObject.loading = false
             console.log(err)
             // 生成收货申请
-            // tableObject.loading = true
             ProductionMainApi.generateProductreceiptRequest(res.number).then(() => {
               message.success(t('common.createSuccess'))
               tableObject.loading = false

From 9467d532fcbf9240e881e57e2dc0ad6e8e360214 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 15 Jul 2024 08:21:01 +0800
Subject: [PATCH 403/408] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=8C=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereceiptJobMain.data.ts            | 22 +++++++++----------
 .../purchasereceiptRequestMain.data.ts        | 22 +++++++++----------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
index 29ba1c92d..df5ea85df 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
@@ -617,7 +617,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(
     },
     {
       label: '批次', // 实际是子表的到批次，为了不影响页面，单独放上面
-      field: 'toBatch',
+      field: 'batch',
       sort: 'custom',
       isForm: false,
       isTableForm: false,
@@ -628,7 +628,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(
     },
     {
       label: '包装号', // 实际是子表的到包装号，为了不影响页面，单独放上面
-      field: 'toPackingNumber',
+      field: 'packingNumber',
       sort: 'custom',
       isForm: false,
       isTableForm: false,
@@ -847,15 +847,15 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
       hiddenInMain: true,
       sortTableDefault: 1006
     },
-    {
-      label: '来源库位',
-      field: 'fromLocationCode',
-      sort: 'custom',
-      table: {
-        width: 150
-      },
-      sortTableDefault: 1007
-    },
+    // {
+    //   label: '来源库位',
+    //   field: 'fromLocationCode',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   sortTableDefault: 1007
+    // },
     {
       label: '目标库位',
       field: 'toLocationCode',
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
index 7a6b1c876..482baa2e1 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
@@ -1202,17 +1202,17 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       type: 'Select'
     }
   },
-  {
-    label: '从库位代码',
-    field: 'fromLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:12,
-    isTableForm: false,
-    isForm: false
-  },
+  // {
+  //   label: '从库位代码',
+  //   field: 'fromLocationCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   sortTableDefault:12,
+  //   isTableForm: false,
+  //   isForm: false
+  // },
 
   {
     label: '项目代码',

From dbbf96acac898d05fa84244c570340764acf0450 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 15 Jul 2024 08:24:01 +0800
Subject: [PATCH 404/408] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
index 482baa2e1..15bb63b55 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
@@ -824,6 +824,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
         precision: 6
       },
     },
+    hiddenInMain: true,
     sortTableDefault:9,
     tableForm: {
       type: 'InputNumber',

From 1eeb9c4c28df23056c9575542210678c02ab0027 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 15 Jul 2024 08:32:44 +0800
Subject: [PATCH 405/408] =?UTF-8?q?=E9=87=87=E8=B4=AD=E4=BB=B7=E6=A0=BC?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoiceRecordMain.data.ts         | 28 +++++++++----------
 .../supplierinvoiceRequestMain.data.ts        | 28 +++++++++----------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
index 0894abf29..68db0280c 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
@@ -616,20 +616,20 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180
     },
   },
-  {
-    label: '采购审批人',
-    field: 'procurementCreatorName',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable:true,
-    isDetail: true,
-    isTableForm: false,
-    isForm:false,
-    isSearch:false,
-    sortTableDefault:10
-  },
+  // {
+  //   label: '采购审批人',
+  //   field: 'procurementCreatorName',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  //   isTable:true,
+  //   isDetail: true,
+  //   isTableForm: false,
+  //   isForm:false,
+  //   isSearch:false,
+  //   sortTableDefault:10
+  // },
   // {
   //   label: '采购审批人代码',
   //   field: 'procurementCreator',
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index 18b8a915b..a79243100 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -821,20 +821,20 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       },
     }
   },
-  {
-    label: '采购审批人',
-    field: 'procurementCreatorName',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable:true,
-    isDetail: true,
-    isTableForm: false,
-    isForm:false,
-    isSearch:false,
-    sortTableDefault:12
-  },
+  // {
+  //   label: '采购审批人',
+  //   field: 'procurementCreatorName',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  //   isTable:true,
+  //   isDetail: true,
+  //   isTableForm: false,
+  //   isForm:false,
+  //   isSearch:false,
+  //   sortTableDefault:12
+  // },
  
   {
     label: '采购审批时间',

From 3914b5ffac1d66ae0f26052631d8dd55f73ec966 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Mon, 15 Jul 2024 08:50:37 +0800
Subject: [PATCH 406/408] =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BD=99=E9=A2=9D?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/balance/index.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/api/wms/balance/index.ts b/src/api/wms/balance/index.ts
index fbca93edf..0aa246832 100644
--- a/src/api/wms/balance/index.ts
+++ b/src/api/wms/balance/index.ts
@@ -193,4 +193,8 @@ export const getBalanceByBusinessTypeByItemType = async (params) => {
 // 根据code获取数据列表
 export const getBalanceItemListByCodes = async (data) => {
     return await request.get({ url: `/wms/balance/listByCodes`,data })
-  }
\ No newline at end of file
+}
+// 查询bom批次默认数据
+export const getBanchBomPage = async (params) => {
+  return await request.get({ url: `/wms/balance/pageBOM`, params })
+}
\ No newline at end of file

From 0d80d6f5748ca9fe6b5131db3f1fa07730902465 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Mon, 15 Jul 2024 09:26:16 +0800
Subject: [PATCH 407/408] =?UTF-8?q?=E7=B2=BE=E5=BA=A6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliver/supplierdeliverRequestMain/labelForm.vue  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
index aca148dcb..7ff4af19c 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
@@ -168,6 +168,7 @@
 </template>
 <script setup lang="ts">
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as accuracyFun from "@/utils/calculate"
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
@@ -381,7 +382,8 @@ const submitForm = () => {
     let obj = tableData.value.find((item) => {
       item.allNumber = 0
       item.packageList.forEach((cur) => {
-        item.allNumber += parseFloat(cur.qtyOne) || 0
+        item.allNumber = accuracyFun.add(item.allNumber , parseFloat(cur.qtyOne)?parseFloat(cur.qtyOne):0)
+        // item.allNumber += parseFloat(cur.qtyOne) || 0
       })
       return item.allNumber != parseFloat(item.qty)
     })

From 1c8c6217673ba4f4f3e3c8dde7cb053deb2ba868 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Mon, 15 Jul 2024 09:33:48 +0800
Subject: [PATCH 408/408] =?UTF-8?q?=E7=B2=BE=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/calculate.ts | 105 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 105 insertions(+)
 create mode 100644 src/utils/calculate.ts

diff --git a/src/utils/calculate.ts b/src/utils/calculate.ts
new file mode 100644
index 000000000..372378039
--- /dev/null
+++ b/src/utils/calculate.ts
@@ -0,0 +1,105 @@
+
+  // 判断传入的值-是否为整数
+  function isInteger(obj) {
+    return Math.floor(obj) === obj
+  }
+
+  // 将一个浮点数转成整数，返回整数和倍数。如 3.14 >> 314，倍数是 100
+  // @param floatNum { number } 小数
+  // @return { object }
+  // { times: 100, num: 314 }
+
+  // 用于返回整数和倍数
+  function toInteger(floatNum) {
+    // 声明一个对象用来保存倍数和整数
+    const ret = { times: 1, num: 0 }
+    // 第一种情况：是整数
+    if (isInteger(floatNum)) {
+      // 把整数给 ret中的   num
+      ret.num = floatNum
+      return ret //  最后返回 ret
+    }
+
+    // 第二种情况-不是整数，
+    const strfi = floatNum + ''  // 转为字符串  "0.1"
+    const dotPos = strfi.indexOf('.')  // 查询小数点
+    const len = strfi.substr(dotPos + 1).length; //  获取小数点后的长度
+    const times = Math.pow(10, len)  // 放大多少倍
+    const intNum = Number(floatNum.toString().replace('.', ''))  // 返回 转为字符串  截取掉小数点  最后转为数字（整数）
+    // 把获取到的倍数和整数存入对象中
+    ret.times = times
+    ret.num = intNum
+    return ret
+  }
+
+
+  // 核心方法，实现加减乘除运算，确保不丢失精度
+  // 思路：把小数放大为整数（乘），进行算术运算，再缩小为小数（除）
+  // @param a { number } 运算数1
+  // @param b { number } 运算数2
+  // @param digits { number } 精度，保留的小数点数，比如 2, 即保留为两位小数
+  // @param op { string } 运算类型，有加减乘除（add / subtract / multiply / divide）
+
+
+
+  function operation(a, b, digits, op) {
+    // 获取倍数和整数的对象
+    const o1 = toInteger(a)
+    const o2 = toInteger(b)
+    // 提取整数
+    const n1 = o1.num
+    const n2 = o2.num
+    // 提取倍数
+    const t1 = o1.times
+    const t2 = o2.times
+
+    // 获取最大倍数
+    const max = t1 > t2 ? t1 : t2
+    let result = 0  //
+
+    switch (op) {
+      case 'add':
+        if (t1 === t2) { // 两个小数位数相同
+          result = n1 + n2    //  
+        } else if (t1 > t2) { // o1 小数位 大于 o2
+          result = n1 + n2 * (t1 / t2)
+        } else { // o1 小数位 小于 o2
+          result = n1 * (t2 / t1) + n2
+        }
+        return result / max
+      case 'subtract':
+        if (t1 === t2) {
+          result = n1 - n2
+        } else if (t1 > t2) {
+          result = n1 - n2 * (t1 / t2)
+        } else {
+          result = n1 * (t2 / t1) - n2
+        }
+        return result / max
+      case 'multiply':
+        result = (n1 * n2) / (t1 * t2)
+        return result
+      case 'divide':
+        result = (n1 / n2) * (t2 / t1)
+        return result
+    }
+  }
+
+  // 加减乘除的四个接口
+export function add(a, b, digits) {
+    return operation(a, b, digits, 'add')
+  }
+export function subtract(a, b, digits) {
+    return operation(a, b, digits, 'subtract')
+  }
+export function multiply(a, b, digits) {
+    return operation(a, b, digits, 'multiply')
+  }
+export function divide(a, b, digits) {
+    return operation(a, b, digits, 'divide')
+  }
+
+
+
+// console.log(floatObj.add(0.5, 0.2))
+// console.log(floatObj.add(0.12, 0.3))