From 35c02b30e93f74196bb234d5e03f17e93d3b5e63 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, 5 Dec 2023 17:44:10 +0800
Subject: [PATCH 1/4] =?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=20=E6=96=87=E6=A1=A3=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliverRequestMain/index.vue      | 887 +++++++++---------
 1 file changed, 442 insertions(+), 445 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index fb672c6b2..41d0eed8a 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -13,16 +13,16 @@
   <!-- 列表 -->
   <ContentWrap>
     <Table :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
-        total: tableObject.total
-      }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
+      total: tableObject.total
+    }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort">
-      <template #number="{row}">
+      <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>
@@ -38,8 +38,7 @@
 
   <!-- 详情 -->
   <Detail ref="detailRef" :isBasic="false" :allSchemas="SupplierdeliverRequestMain.allSchemas"
-    :detailAllSchemas="SupplierdeliverRequestDetail.allSchemas"
-    :detailAllSchemasRules="SupplierdeliverRequestDetailRules"
+    :detailAllSchemas="SupplierdeliverRequestDetail.allSchemas" :detailAllSchemasRules="SupplierdeliverRequestDetailRules"
     :apiCreate="SupplierdeliverRequestDetailApi.createSupplierdeliverRequestDetail"
     :apiUpdate="SupplierdeliverRequestDetailApi.updateSupplierdeliverRequestDetail"
     :apiPage="SupplierdeliverRequestDetailApi.getSupplierdeliverRequestDetailPage"
@@ -47,18 +46,16 @@
     @searchTableSuccessDetail="searchTableSuccessDetail" />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/wms/supplierdeliver-request-main/import"
-    :importTemplateData="importTemplateData" @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true"
-    :mode="2" />
+  <ImportForm ref="importFormRef" url="/wms/supplierdeliver-request-main/import" :importTemplateData="importTemplateData"
+    @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
 
   <!-- 打印 -->
-  <el-dialog v-model="dialogVisible " :title="dialogTitle" width="60%">
-    <Table :columns="detailListTableColumns" :data="detatableData.tableList" :loading="detatableData.loading"
-      :pagination="{
-        total: detatableData.total
-      }" v-model:pageSize="detatableData.pageSize" v-model:currentPage="detatableData.currentPage"
+  <el-dialog v-model="dialogVisible" :title="dialogTitle" width="60%">
+    <Table :columns="detailListTableColumns" :data="detatableData.tableList" :loading="detatableData.loading" :pagination="{
+      total: detatableData.total
+    }" v-model:pageSize="detatableData.pageSize" v-model:currentPage="detatableData.currentPage"
       v-model:sort="detatableData.sort">
-      <template #batch="{row}">
+      <template #batch="{ row }">
         <el-input v-model="row.batch">{{ row.batch }}</el-input>
       </template>
     </Table>
@@ -70,449 +67,449 @@
 </template>
 
 <script setup lang="ts">
-  import download from '@/utils/download'
-  import { getAccessToken } from '@/utils/auth'
-  import { SupplierdeliverRequestMain, SupplierdeliverRequestMainRules, SupplierdeliverRequestDetail, SupplierdeliverRequestDetailRules } from './supplierdeliverRequestMain.data'
-  import * as SupplierdeliverRequestMainApi from '@/api/wms/supplierdeliverRequestMain'
-  import * as SupplierdeliverRequestDetailApi from '@/api/wms/supplierdeliverRequestDetail'
-  import * as defaultButtons from '@/utils/disposition/defaultButtons'
-  // import * as PackageApi from '@/api/wms/package'
-  // import * as BarbasicApi from '@/api/wms/barbasic'
-
-  // 供应商发货申请
-  defineOptions({ name: 'SupplierdeliverRequestMain' })
-
-  const message = useMessage() // 消息弹窗
-  const { t } = useI18n() // 国际化
-
-  const route = useRoute() // 路由信息
-  const routeName = ref()
-  routeName.value = route.name
-  const tableColumns = ref(SupplierdeliverRequestMain.allSchemas.tableColumns)
-
-  // 字段设置 更新主列表字段
-  const updataTableColumns = (val) => {
-    tableColumns.value = val
-  }
-
-  // 查询页面返回
-  const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
-    nextTick(() => {
-      if (type == 'tableForm') {
-        // 明细查询页赋值
-        row[formField] = val[0][searchField]
-      } else {
-        const setV = {}
-        setV[formField] = val[0][searchField]
-        formRef.setValues(setV)
-      }
-    })
-  }
-  // 查询页面返回——详情
-  const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
-    nextTick(() => {
+import download from '@/utils/download'
+import { getAccessToken } from '@/utils/auth'
+import { SupplierdeliverRequestMain, SupplierdeliverRequestMainRules, SupplierdeliverRequestDetail, SupplierdeliverRequestDetailRules } from './supplierdeliverRequestMain.data'
+import * as SupplierdeliverRequestMainApi from '@/api/wms/supplierdeliverRequestMain'
+import * as SupplierdeliverRequestDetailApi from '@/api/wms/supplierdeliverRequestDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+// import * as PackageApi from '@/api/wms/package'
+// import * as BarbasicApi from '@/api/wms/barbasic'
+
+// 供应商发货申请
+defineOptions({ name: 'SupplierdeliverRequestMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(SupplierdeliverRequestMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      row[formField] = val[0][searchField]
+    } else {
       const setV = {}
       setV[formField] = val[0][searchField]
       formRef.setValues(setV)
-    })
-  }
-
-  // 子表新增的时候选择表格之后需要会显得字段
-  // const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
-  const Echo = []
-
-  const { tableObject, tableMethods } = useTable({
-    getListApi: SupplierdeliverRequestMainApi.getSupplierdeliverRequestMainPage // 分页接口
-  })
-
-  // 获得表格的各种操作
-  const { getList, setSearchParams } = tableMethods
-
-  // 列表头部按钮
-  const HeadButttondata = [
-    defaultButtons.defaultAddBtn({ hasPermi: 'wms:supplierdeliver-request-main:create' }), // 新增——需要手动修改下权限
-    defaultButtons.defaultImportBtn({ hasPermi: 'wms:supplierdeliver-request-main:import' }), // 导入
-    defaultButtons.defaultExportBtn({ hasPermi: 'wms:supplierdeliver-request-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') { // 筛选
-    }
-  }
-
-  // 根据状态返回该按钮是否显示
-  const isShowMainButton = (row, val) => {
-    if (val.indexOf(row.status) > -1) {
-      return false
-    } else {
-      return true
-    }
-  }
-
-  // 列表-操作按钮
-  const butttondata = (row) => {
-    return [
-      defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['5']) }), // 打开
-      defaultButtons.mainListPurchasePlanCloBtn({ hide: isShowMainButton(row, ['1', '2', '3', '4']) }), // 关闭
-      defaultButtons.mainListPlanSubBtn({ hide: isShowMainButton(row, ['1']) }), // 提交审批
-      defaultButtons.mainListPlanAppBtn({ hide: isShowMainButton(row, ['2']) }), // 审批通过
-      defaultButtons.mainListPlanTurBtn({ hide: isShowMainButton(row, ['2']) }), // 驳回按钮
-      defaultButtons.mainListEditBtn({ hasPermi: 'wms:supplierdeliver-request-main:update' }), // 编辑
-      defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:supplierdeliver-request-main:delete' }), // 删除
-      defaultButtons.mainListPointBtn(null), // 标签打印
-      defaultButtons.mainListDocumentPrintBtn(null), // 单据打印
-    ]
-  }
-
-  // 列表-操作按钮事件
-  const buttonTableClick = async (val, row) => {
-    if (val == 'mainPurPlanOpe') { // 打开
-      handleOpe(row.id)
-    } else if (val == 'mainPurPlanClo') {// 关闭
-      handleClo(row.id)
-    } else if (val == 'mainPlanSub') { // 提交审批
-      handleSub(row.id)
-    } else if (val == 'mainPlanApp') { // 审批通过
-      handleApp(row.id)
-    } else if (val == 'mainPlanTur') { // 驳回按钮
-      handleTur(row.id)
-    } else if (val == 'edit') { // 编辑
-      openForm('update', row)
-    } else if (val == 'delete') { // 删除
-      handleDelete(row.id)
-    } else if (val == 'point') { // 标签打印
-      handlePoint(row)
-    } else if (val == 'documentPrint') { // 单据打印
-      handleDocumentPrint(row.id)
     }
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+// 子表新增的时候选择表格之后需要会显得字段
+// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+const Echo = []
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: SupplierdeliverRequestMainApi.getSupplierdeliverRequestMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({ hasPermi: 'wms:supplierdeliver-request-main:create' }), // 新增——需要手动修改下权限
+  defaultButtons.defaultImportBtn({ hasPermi: 'wms:supplierdeliver-request-main:import' }), // 导入
+  defaultButtons.defaultExportBtn({ hasPermi: 'wms:supplierdeliver-request-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') { // 筛选
   }
-
-  /** 添加/修改操作 */
-  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)
-  }
-
-  /** 删除按钮操作 */
-  const handleDelete = async (id : number) => {
-    try {
-      // 删除的二次确认
-      await message.delConfirm()
-      // 发起删除
-      await SupplierdeliverRequestMainApi.deleteSupplierdeliverRequestMain(id)
-      message.success(t('common.delSuccess'))
-      // 刷新列表
-      await getList()
-    } catch { }
-  }
-
-  /** 关闭按钮操作 */
-  const handleClo = async (id : number) => {
-    try {
-      // 关闭的二次确认
-      await message.confirm('是否关闭所选中数据？')
-      // 发起关闭
-      await SupplierdeliverRequestMainApi.cloSupplierdeliverRequestMain(id)
-      message.success(t('关闭成功!'))
-      // 刷新列表
-      await getList()
-    } catch { }
-  }
-
-  /** 打开按钮操作 */
-  const handleOpe = async (id : number) => {
-    try {
-      // 打开的二次确认
-      await message.confirm('是否打开所选中数据？')
-      // 发起打开
-      await SupplierdeliverRequestMainApi.opeSupplierdeliverRequestMain(id)
-      message.success(t('打开成功!'))
-      // 刷新列表
-      await getList()
-    } catch { }
-  }
-
-  /** 提交审批按钮操作 */
-  const handleSub = async (id : number) => {
-    try {
-      // 提交审批的二次确认
-      await message.confirm('是否提交审批所选中数据？')
-      // 发起提交审批
-      await SupplierdeliverRequestMainApi.subSupplierdeliverRequestMain(id)
-      message.success(t('提交审批成功!'))
-      // 刷新列表
-      await getList()
-    } catch { }
-  }
-
-  /** 审批通过按钮操作 */
-  const handleApp = async (id : number) => {
-    try {
-      // 审批通过的二次确认
-      await message.confirm('是否审批通过所选中数据？')
-      // 发起审批通过
-      await SupplierdeliverRequestMainApi.appSupplierdeliverRequestMain(id)
-      message.success(t('审批通过成功!'))
-      // 刷新列表
-      await getList()
-    } catch { }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row, val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
   }
-
-  /** 驳回按钮操作 */
-  const handleTur = async (id : number) => {
-    try {
-      // 驳回的二次确认
-      await message.confirm('是否驳回所选中数据？')
-      // 发起驳回
-      await SupplierdeliverRequestMainApi.rejSupplierdeliverRequestMain(id)
-      message.success(t('驳回成功!'))
-      // 刷新列表
-      await getList()
-    } catch { }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['5']) }), // 打开
+    defaultButtons.mainListPurchasePlanCloBtn({ hide: isShowMainButton(row, ['1', '2', '3', '4']) }), // 关闭
+    defaultButtons.mainListPlanSubBtn({ hide: isShowMainButton(row, ['1']) }), // 提交审批
+    defaultButtons.mainListPlanAppBtn({ hide: isShowMainButton(row, ['2']) }), // 审批通过
+    defaultButtons.mainListPlanTurBtn({ hide: isShowMainButton(row, ['2']) }), // 驳回按钮
+    defaultButtons.mainListEditBtn({ hasPermi: 'wms:supplierdeliver-request-main:update' }), // 编辑
+    defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:supplierdeliver-request-main:delete' }), // 删除
+    defaultButtons.mainListPointBtn(null), // 标签打印
+    defaultButtons.mainListDocumentPrintBtn(null), // 单据打印
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainPurPlanOpe') { // 打开
+    handleOpe(row.id)
+  } else if (val == 'mainPurPlanClo') {// 关闭
+    handleClo(row.id)
+  } else if (val == 'mainPlanSub') { // 提交审批
+    handleSub(row.id)
+  } else if (val == 'mainPlanApp') { // 审批通过
+    handleApp(row.id)
+  } else if (val == 'mainPlanTur') { // 驳回按钮
+    handleTur(row.id)
+  } else if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  } else if (val == 'point') { // 标签打印
+    handlePoint(row)
+  } else if (val == 'documentPrint') { // 单据打印
+    handleDocumentPrint(row.id)
   }
-
-  /** 导出按钮操作 */
-  const exportLoading = ref(false) // 导出的加载中
-  const handleExport = async () => {
-    try {
-      // 导出的二次确认
-      await message.exportConfirm()
-      // 发起导出
-      exportLoading.value = true
-      const data = await SupplierdeliverRequestMainApi.exportSupplierdeliverRequestMain(setSearchParams)
-      download.excel(data, '供应商发货申请主.xls')
-    } catch {
-    } finally {
-      exportLoading.value = false
-    }
+}
+
+/** 添加/修改操作 */
+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)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await SupplierdeliverRequestMainApi.deleteSupplierdeliverRequestMain(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch { }
+}
+
+/** 关闭按钮操作 */
+const handleClo = async (id: number) => {
+  try {
+    // 关闭的二次确认
+    await message.confirm('是否关闭所选中数据？')
+    // 发起关闭
+    await SupplierdeliverRequestMainApi.cloSupplierdeliverRequestMain(id)
+    message.success(t('关闭成功!'))
+    // 刷新列表
+    await getList()
+  } catch { }
+}
+
+/** 打开按钮操作 */
+const handleOpe = async (id: number) => {
+  try {
+    // 打开的二次确认
+    await message.confirm('是否打开所选中数据？')
+    // 发起打开
+    await SupplierdeliverRequestMainApi.opeSupplierdeliverRequestMain(id)
+    message.success(t('打开成功!'))
+    // 刷新列表
+    await getList()
+  } catch { }
+}
+
+/** 提交审批按钮操作 */
+const handleSub = async (id: number) => {
+  try {
+    // 提交审批的二次确认
+    await message.confirm('是否提交审批所选中数据？')
+    // 发起提交审批
+    await SupplierdeliverRequestMainApi.subSupplierdeliverRequestMain(id)
+    message.success(t('提交审批成功!'))
+    // 刷新列表
+    await getList()
+  } catch { }
+}
+
+/** 审批通过按钮操作 */
+const handleApp = async (id: number) => {
+  try {
+    // 审批通过的二次确认
+    await message.confirm('是否审批通过所选中数据？')
+    // 发起审批通过
+    await SupplierdeliverRequestMainApi.appSupplierdeliverRequestMain(id)
+    message.success(t('审批通过成功!'))
+    // 刷新列表
+    await getList()
+  } catch { }
+}
+
+/** 驳回按钮操作 */
+const handleTur = async (id: number) => {
+  try {
+    // 驳回的二次确认
+    await message.confirm('是否驳回所选中数据？')
+    // 发起驳回
+    await SupplierdeliverRequestMainApi.rejSupplierdeliverRequestMain(id)
+    message.success(t('驳回成功!'))
+    // 刷新列表
+    await getList()
+  } catch { }
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await SupplierdeliverRequestMainApi.exportSupplierdeliverRequestMain(setSearchParams)
+    download.excel(data, '供应商发货申请主.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
   }
-
-  //打印
-  const { tableObject: detatableData, tableMethods: detatableMethods } = useTable({
-    getListApi: SupplierdeliverRequestDetailApi.getSupplierdeliverRequestDetailPage
-  })
-
-  const { getList: getDetailList } = detatableMethods
-
-  const detailTableColumns = ref(SupplierdeliverRequestDetail.allSchemas.tableColumns)
-  const detailListTableColumns = detailTableColumns.value.filter(item => item.label != '操作' && item.label != '创建者' && item.label != '创建时间' && item.label != '最后更新者' && item.label != '最后更新时间')
-  const dialogVisible = ref(false)
-  const isShow = ref(false)
-  const dialogTitle = ref('')
-  const closeDialog = () => {
+}
+
+//打印
+const { tableObject: detatableData, tableMethods: detatableMethods } = useTable({
+  getListApi: SupplierdeliverRequestDetailApi.getSupplierdeliverRequestDetailPage
+})
+
+const { getList: getDetailList } = detatableMethods
+
+const detailTableColumns = ref(SupplierdeliverRequestDetail.allSchemas.tableColumns)
+const detailListTableColumns = detailTableColumns.value.filter(item => item.label != '操作' && item.label != '创建者' && item.label != '创建时间' && item.label != '最后更新者' && item.label != '最后更新时间')
+const dialogVisible = ref(false)
+const isShow = ref(false)
+const dialogTitle = ref('')
+const closeDialog = () => {
+  dialogVisible.value = false
+  isShow.value = false
+}
+
+/** 生成标签按钮操作 */
+const genLabel = async () => {
+  try {
+    // 生成标签的二次确认
+    await message.confirm('是否为此数据生成标签？')
+    // 发起生成标签
+    await SupplierdeliverRequestMainApi.genLabel(genLabelId.value)
     dialogVisible.value = false
     isShow.value = false
+    message.success(t('生成标签成功!'))
+    // 刷新列表
+    await getList()
+  } catch { }
+}
+
+const BASE_URL = 'http://dev.ccwin-in.com:25110'
+const src = ref(BASE_URL + '/jmreport/view/881303562245316608?token=' + getAccessToken())
+const genLabelId = ref();
+// 标签打印
+const handlePoint = async (row) => {
+  tableObject.params = {
+    masterId: row.id,
   }
-
-  /** 生成标签按钮操作 */
-  const genLabel = async () => {
-    try {
-      // 生成标签的二次确认
-      await message.confirm('是否为此数据生成标签？')
-      // 发起生成标签
-      await SupplierdeliverRequestMainApi.genLabel(genLabelId.value)
-      dialogVisible.value = false
-      isShow.value = false
-      message.success(t('生成标签成功!'))
-      // 刷新列表
-      await getList()
-    } catch { }
-  }
-
-  const BASE_URL = 'http://dev.ccwin-in.com:25110'
-  const src = ref(BASE_URL + '/jmreport/view/881303562245316608?token=' + getAccessToken())
-  const genLabelId=ref();
-  // 标签打印
-  const handlePoint = async (row) => {
-    tableObject.params = {
-      masterId: row.id,
-    }
-    await getDetailList()
-    dialogVisible.value = true
-    dialogTitle.value = row.number + '单据号'
-    genLabelId.value = row.number
-  }
-
-  const print = async () => {
-    //向包装表里插入数据
-    //   const packageArray:any= ref([])
-    //   let packageObject = {
-    //     itemCode: '',
-    //     itemName: '',
-    //     itemDesc1: '',
-    //     itemDesc2: '',
-    //     batch: '',
-    //     altBatch: '',
-    //     produceDate: '',
-    //     validityDays: '',
-    //     expireDate: '',
-    //     uom: '',
-    //     qty: '',
-    //     altUom: '',
-    //     altQty: '',
-    //     convertRate: '',
-    //     stdPackQty: '',
-    //     stdPackUnit: '',
-    //     toWarehouseCode: '',
-    //     toDockCode: '',
-    //     toLocationCode: '',
-    //     supplierCode: '',
-    //     supplierItemCode: '',
-    //     poNumber: '',
-    //     poLine: '',
-    //     rpNumber: '',
-    //     asnNumber: '',
-    //   }
-    //   //获取主表数据
-    //  await  SupplierdeliverRequestMainApi.getSupplierdeliverRequestMainPage({
-    //     number: detatableData.tableList[0].number
-    //   }).then(res => {
-    //     detatableData.tableList.forEach(item => {
-    //       packageObject.itemCode=item.itemCode
-    //       packageObject.itemName=item.itemName
-    //       packageObject.itemDesc1=item.itemDesc1
-    //       packageObject.itemDesc2=item.itemDesc2
-    //       packageObject.batch=item.batch
-    //       packageObject.altBatch=item.altBatch
-    //       packageObject.produceDate=item.produceDate
-    //       packageObject.expireDate=item.expireDate
-    //       packageObject.uom=item.uom
-    //       packageObject.qty=item.qty
-    //       packageObject.stdPackQty=item.stdPackQty
-    //       packageObject.stdPackUnit=item.stdPackUnit
-    //       packageObject.convertRate=item.convertRate
-    //       packageObject.poNumber=item.poNumber
-    //       packageObject.poLine=item.poLine
-    //       packageObject.supplierCode=res.list[0].supplierCode
-    //       packageObject.rpNumber=res.list[0].ppNumber
-    //       packageArray.value.push(packageObject)
-    //     })
-    //   })
-    //   const barBasicArray:any =ref([])
-    //   let barBasicObject = {
-    //     type: '',
-    //     template: '',
-    //     status: '',
-    //     relateNumber: '',
-    //     barcodeString: '',
-    //     printTimes: '',
-    //     lastPrintTime: '',
-    //     lastPrintUserId: '',
-    //     lastPrintUserName: '',
-    //   }
-    //   // 获取返回的包装号更新标签表
-    //   await PackageApi.createPackage(JSON.parse(JSON.stringify(packageArray.value))).then(res => {
-    //     res.list.forEach(item => {
-    //       barBasicObject.type = 'PurchaseLabel'
-    //       barBasicObject.relateNumber = item.number
-    //       barBasicObject.status = 'NEW'
-    //       barBasicArray.value.push(barBasicObject)
-    //     })
-    //   })
-    //   await BarbasicApi.createBarbasic(JSON.parse(JSON.stringify(barBasicArray.value)))
-    window.open(src.value + '&number=' + detatableData.tableList[0].number)
-  }
-
-  // 单据打印
-  const documentSrc = ref(BASE_URL + '/jmreport/view/884680688168280064?token=' + getAccessToken())
-  const handleDocumentPrint = async (id) => {
-    window.open(documentSrc.value + '&id=' + id)
-  }
-
-  /**
-    * tableForm方法
-  */
-  const tableFormKeys = {}
-  SupplierdeliverRequestDetail.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 SupplierdeliverRequestMainApi.createSupplierdeliverRequestMain(data)
-        message.success(t('common.createSuccess'))
-      } else {
-        await SupplierdeliverRequestMainApi.updateSupplierdeliverRequestMain(data)
-        message.success(t('common.updateSuccess'))
-      }
-      formRef.value.dialogVisible = false
-      // 刷新当前列表
-      getList()
-    } finally {
-      formRef.value.formLoading = false
+  await getDetailList()
+  dialogVisible.value = true
+  dialogTitle.value = row.number + '单据号'
+  genLabelId.value = row.number
+}
+
+const print = async () => {
+  //向包装表里插入数据
+  //   const packageArray:any= ref([])
+  //   let packageObject = {
+  //     itemCode: '',
+  //     itemName: '',
+  //     itemDesc1: '',
+  //     itemDesc2: '',
+  //     batch: '',
+  //     altBatch: '',
+  //     produceDate: '',
+  //     validityDays: '',
+  //     expireDate: '',
+  //     uom: '',
+  //     qty: '',
+  //     altUom: '',
+  //     altQty: '',
+  //     convertRate: '',
+  //     stdPackQty: '',
+  //     stdPackUnit: '',
+  //     toWarehouseCode: '',
+  //     toDockCode: '',
+  //     toLocationCode: '',
+  //     supplierCode: '',
+  //     supplierItemCode: '',
+  //     poNumber: '',
+  //     poLine: '',
+  //     rpNumber: '',
+  //     asnNumber: '',
+  //   }
+  //   //获取主表数据
+  //  await  SupplierdeliverRequestMainApi.getSupplierdeliverRequestMainPage({
+  //     number: detatableData.tableList[0].number
+  //   }).then(res => {
+  //     detatableData.tableList.forEach(item => {
+  //       packageObject.itemCode=item.itemCode
+  //       packageObject.itemName=item.itemName
+  //       packageObject.itemDesc1=item.itemDesc1
+  //       packageObject.itemDesc2=item.itemDesc2
+  //       packageObject.batch=item.batch
+  //       packageObject.altBatch=item.altBatch
+  //       packageObject.produceDate=item.produceDate
+  //       packageObject.expireDate=item.expireDate
+  //       packageObject.uom=item.uom
+  //       packageObject.qty=item.qty
+  //       packageObject.stdPackQty=item.stdPackQty
+  //       packageObject.stdPackUnit=item.stdPackUnit
+  //       packageObject.convertRate=item.convertRate
+  //       packageObject.poNumber=item.poNumber
+  //       packageObject.poLine=item.poLine
+  //       packageObject.supplierCode=res.list[0].supplierCode
+  //       packageObject.rpNumber=res.list[0].ppNumber
+  //       packageArray.value.push(packageObject)
+  //     })
+  //   })
+  //   const barBasicArray:any =ref([])
+  //   let barBasicObject = {
+  //     type: '',
+  //     template: '',
+  //     status: '',
+  //     relateNumber: '',
+  //     barcodeString: '',
+  //     printTimes: '',
+  //     lastPrintTime: '',
+  //     lastPrintUserId: '',
+  //     lastPrintUserName: '',
+  //   }
+  //   // 获取返回的包装号更新标签表
+  //   await PackageApi.createPackage(JSON.parse(JSON.stringify(packageArray.value))).then(res => {
+  //     res.list.forEach(item => {
+  //       barBasicObject.type = 'PurchaseLabel'
+  //       barBasicObject.relateNumber = item.number
+  //       barBasicObject.status = 'NEW'
+  //       barBasicArray.value.push(barBasicObject)
+  //     })
+  //   })
+  //   await BarbasicApi.createBarbasic(JSON.parse(JSON.stringify(barBasicArray.value)))
+  window.open(src.value + '&number=' + detatableData.tableList[0].number)
+}
+
+// 单据打印
+const documentSrc = ref(BASE_URL + '/jmreport/view/884680688168280064?token=' + getAccessToken())
+const handleDocumentPrint = async (id) => {
+  window.open(documentSrc.value + '&id=' + id)
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+SupplierdeliverRequestDetail.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 SupplierdeliverRequestMainApi.createSupplierdeliverRequestMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await SupplierdeliverRequestMainApi.updateSupplierdeliverRequestMain(data)
+      message.success(t('common.updateSuccess'))
     }
-  }
-
-  /** 导入 */
-  const importFormRef = ref()
-  const handleImport = () => {
-    importFormRef.value.open()
-  }
-
-  // 导入附件弹窗所需的参数
-  const importTemplateData = reactive({
-    templateUrl: '',
-    templateTitle: '供应商发货申请主导入模版.xls'
-  })
-
-  // 导入成功之后
-  const importSuccess = () => {
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
     getList()
+  } finally {
+    formRef.value.formLoading = false
   }
-
-  // 筛选提交
-  const searchFormClick = (searchData) => {
-    tableObject.params = {
-      isSearch: true,
-      filters: searchData.filters
-    }
-    getList() // 刷新当前列表
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '供应商发货申请主导入模版.xls'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
   }
-
-  /** 初始化 **/
-  onMounted(async () => {
-    getList()
-    importTemplateData.templateUrl = await SupplierdeliverRequestMainApi.importTemplate()
-  })
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await SupplierdeliverRequestMainApi.importTemplate()
+})
 </script>

From a14af6f7dd305eec3d8307b80880c67f4220f2ff Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 5 Dec 2023 19:30:36 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E7=9B=98=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicForm.vue    |  99 +++-
 src/components/Detail/src/Detail.vue          |  11 +-
 src/components/DetailCountPlan/index.ts       |   3 +
 .../DetailCountPlan/src/DetailCountPlan.vue   | 499 ++++++++++++++++++
 src/components/TableForm/src/TableForm.vue    |   9 +-
 src/components/TableFormCountPlan/index.ts    |   3 +
 .../src/TableFormCountPlan.vue                | 193 +++++++
 .../count/countPlanMain/countPlanMain.data.ts |  18 +-
 .../countManage/count/countPlanMain/index.vue | 147 +++---
 9 files changed, 878 insertions(+), 104 deletions(-)
 create mode 100644 src/components/DetailCountPlan/index.ts
 create mode 100644 src/components/DetailCountPlan/src/DetailCountPlan.vue
 create mode 100644 src/components/TableFormCountPlan/index.ts
 create mode 100644 src/components/TableFormCountPlan/src/TableFormCountPlan.vue

diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 01f94218b..4d039ba7b 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -1,5 +1,10 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" :width="isBusiness ? '60%' : '40%'" :close-on-click-modal="false">
+  <Dialog
+    :title="dialogTitle"
+    v-model="dialogVisible"
+    :width="isBusiness ? '60%' : '40%'"
+    :close-on-click-modal="false"
+  >
     <Form
       ref="formRef"
       v-loading="formLoading"
@@ -12,7 +17,11 @@
         <crontab v-model="formSchema.crontab" />
       </template>
       <template #type="formSchema" v-if="fromeWhere == 'countPlan'">
-        <el-select v-model="formSchema.type" placeholder="选择盘点类型" @change="selectChange('type',$event)">
+        <el-select
+          v-model="formSchema.type"
+          placeholder="选择盘点类型"
+          @change="selectChange('type', $event)"
+        >
           <el-option
             v-for="dict in getStrDictOptions(DICT_TYPE.COUNT_TYPE)"
             :key="dict.value"
@@ -22,7 +31,7 @@
         </el-select>
       </template>
     </Form>
-    <div class="table" v-if="isBusiness && formType == 'create'">
+    <div class="table" v-if="isBusiness && formType == 'create' && fromeWhere != 'countPlan'">
       <TableForm
         ref="tableFormRef"
         class="w-[100%]"
@@ -35,13 +44,24 @@
         @tableSelectionChange="tableSelectionChange"
         @extendedButtonsClick="extendedButtonsClick"
         @formSelectChange="formSelectChange"
-        @formSelectvVisibleChange = 'formSelectvVisibleChange'
+        @formSelectvVisibleChange="formSelectvVisibleChange"
         @tableSortChange="tableSortChange"
         @selectCallback="selectCallback"
         @handleTableSelect="handleTableSelect"
         @inpuFocus="inpuFocus"
       />
     </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"
+      />
+    </div>
     <template #footer>
       <ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick" />
     </template>
@@ -53,6 +73,7 @@ import { SearchTable } from '@/components/SearchTable'
 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'
 
 const props = defineProps({
@@ -143,6 +164,11 @@ const props = defineProps({
     type: String,
     required: false,
     default: ''
+  },
+  countScopeType: {
+    type: Array,
+    required: false,
+    default: null
   }
 })
 
@@ -156,7 +182,9 @@ const formType = ref('') // 表单的类型：create - 新增；update - 修改
 
 const formRef = ref() // 表单 Ref
 const formSchema = ref(props.formAllSchemas?.formSchema)
-console.log('props.formAllSchemas',props.formAllSchemas)
+const tableAllSchemas = ref(props.tableAllSchemas)
+const tableFormRules = ref(props.tableFormRules)
+console.log('tableAllSchemas', tableAllSchemas.value)
 
 /** 弹层操作 */
 // formField form表单中的字段
@@ -179,7 +207,7 @@ const opensearchTable = (
   // 判断查询条件中，是否存在指向主表的数据
   if (searchCondition && searchCondition.length > 0) {
     // 转换筛选条件所需
-    let filters:any[] = []
+    let filters: any[] = []
     searchCondition.forEach((item) => {
       // 查询条件为主表某字段，需要赋值主表数据，数据来源是详情的，赋值需要从row中获取
       // 20231127 row[item.value]?row[item.value] 修改为 row?row[item.value] 返回'null' 为了查询不到任何数据
@@ -348,14 +376,15 @@ const emit = defineEmits([
   'searchTableSuccess',
   'opensearchTable',
   'submitForm',
-  'selectChange'
+  'selectChange',
+  'tableFormChange'
 ])
 //普通下拉改变事件
-const formSelectChange = (field, val,row) => {
-  emit('formSelectChange', field, val,row)
+const formSelectChange = (field, val, row) => {
+  emit('formSelectChange', field, val, row)
 }
-const formSelectvVisibleChange = (field, val,row) => {
-  emit('formSelectvVisibleChange', field, val,row)
+const formSelectvVisibleChange = (field, val, row) => {
+  emit('formSelectvVisibleChange', field, val, row)
 }
 // 点击selection框
 const tableSelectionChange = (val) => {
@@ -385,8 +414,6 @@ const handleAddTable = () => {
 }
 // 输入框聚焦
 const inpuFocus = (headerItem, row, index) => {
-  console.log(headerItem.tableForm.multiple)
-
   opensearchTable(
     headerItem.field,
     headerItem.tableForm.searchField,
@@ -399,16 +426,56 @@ const inpuFocus = (headerItem, row, index) => {
     row
   )
 }
+
 // 修改盘点类型
-const selectChange=((field,val)=>{
-emit('selectChange',field,val)
-})
+const selectChange = (field, val) => {
+  emit('selectChange', field, val)
+}
+
+const tableFormChange = (field, val, row) => {
+  emit('tableFormChange', field, val, row)
+}
 </script>
 <style lang="scss" scoped>
 .table {
   border: 1px solid #dedede;
   border-radius: 8px;
   padding: 10px;
+  width: calc(100% - 20px);
   display: flex;
 }
+::v-deep(.el-table__body) {
+  padding: 10px 0px;
+}
+::v-deep(.el-table--default .el-table__cell) {
+  padding: 2px 0px;
+  border: none;
+}
+
+::v-deep(.el-table td.el-table__cell .el-form-item__content) {
+  display: flex !important;
+  align-items: center !important;
+  justify-content: center !important;
+}
+::v-deep(.el-table td.el-table__cell div) {
+  overflow: visible;
+}
+
+::v-deep(.el-icon) {
+  display: block;
+}button
+.button {
+  > div {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    cursor: pointer;
+
+    > div {
+      margin-left: 6px;
+      text-decoration: underline;
+      color: #409eff;
+    }
+  }
+}
 </style>
diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue
index a221dd247..0eddf4f7d 100644
--- a/src/components/Detail/src/Detail.vue
+++ b/src/components/Detail/src/Detail.vue
@@ -46,7 +46,7 @@
             :columns="2"
           />
           <Table
-            v-if="!isBasic"
+            v-if="!isBasic && fromeWhere != 'countPlan'"
             :columns="detailAllSchemasRef.tableColumns"
             :data="tableObjectRef.tableList"
             :loading="tableObjectRef.loading"
@@ -61,6 +61,7 @@
               />
             </template>
           </Table>
+
         </ContentWrap>
         <ContentWrap class="w-[27%] ml-16px">
           <!-- 附件组件 -->
@@ -180,7 +181,13 @@ const props = defineProps({
     type: Function,
     required: false,
     default: null
-  }
+  },
+  // 来源 countPlan盘点计划进入
+  fromeWhere: {
+    type: String,
+    required: false,
+    default: ''
+  },
 })
 const isShowDrawer = ref(false)
 const detailLoading = ref(false)
diff --git a/src/components/DetailCountPlan/index.ts b/src/components/DetailCountPlan/index.ts
new file mode 100644
index 000000000..2acd32a21
--- /dev/null
+++ b/src/components/DetailCountPlan/index.ts
@@ -0,0 +1,3 @@
+import DetailCountPlan from './src/DetailCountPlan.vue'
+
+export { DetailCountPlan }
diff --git a/src/components/DetailCountPlan/src/DetailCountPlan.vue b/src/components/DetailCountPlan/src/DetailCountPlan.vue
new file mode 100644
index 000000000..80a59f6e2
--- /dev/null
+++ b/src/components/DetailCountPlan/src/DetailCountPlan.vue
@@ -0,0 +1,499 @@
+<template>
+  <div>
+    <el-drawer
+      v-model="isShowDrawer"
+      title="详情"
+      direction="rtl"
+      size="80%"
+      v-loading="detailLoading"
+    >
+      <template #header>
+        <div class="font-size-18px">
+          {{ titleValueRef }} <span class="ml-20px font-size-16px">{{ titleNameRef }}</span>
+        </div>
+      </template>
+      <ContentWrap v-if="!isBasic">
+        <Descriptions
+          :data="detailData"
+          labelClassName="label-class-name"
+          label-align="left"
+          direction="vertical"
+          :column="8"
+          :schema="allSchemas.detailSchema"
+          :columns="2"
+          width="200px"
+        />
+      </ContentWrap>
+      <Tabs :tabsList="tabsList" :current="current" @change="change" />
+      <div class="flex">
+        <!-- 详情 -->
+        <ContentWrap class="w-[73%]">
+          <!-- 列表头部 -->
+          <TableHead
+            v-if="!isBasic"
+            :HeadButttondata="HeadButttondata"
+            :masterId="masterParmas.masterId"
+            @button-base-click="buttonBaseClick"
+            :routeName="routeName"
+            @searchFormClick="searchFormClick"
+            :allSchemas="detailAllSchemas"
+          />
+          <Descriptions
+            v-if="isBasic"
+            :data="detailData"
+            :schema="allSchemas.detailSchema"
+            :columns="2"
+          />
+          <Table
+            v-if="!isBasic"
+            :columns="detailAllSchemasRef.tableColumns"
+            :data="tableObjectRef.tableList"
+            :loading="tableObjectRef.loading"
+            :pagination="{ total: tableObjectRef.total }"
+            v-model:pageSize="tableObjectRef.pageSize"
+            v-model:currentPage="tableObjectRef.currentPage"
+          >
+            <template #action="{ row }">
+              <ButtonBase
+                :Butttondata="buttondata"
+                @button-base-click="buttonTableClick($event, row)"
+              />
+            </template>
+          </Table>
+        </ContentWrap>
+        <ContentWrap class="w-[27%] ml-16px">
+          <!-- 附件组件 -->
+          <Annex
+            :annexData="annexData"
+            @handleAnnexSuccess="handleAnnexSuccess"
+            @deleteAnnexSuccess="deleteAnnexSuccess"
+            :upData="remarksData.data"
+          />
+          <!-- 备注组件 -->
+          <Remarks
+            :remarksData="remarksData"
+            class="mt-20px"
+            @remarksSubmitScuess="remarksSubmitScuess"
+          />
+          <!-- 变更记录组件 -->
+          <ChangeRecord :changeRecordData="changeRecordData" class="mt-20px" />
+        </ContentWrap>
+      </div>
+    </el-drawer>
+    <!-- 表单弹窗：添加/修改 -->
+    <BasicForm
+      ref="formRef"
+      @success="submitForm"
+      :rules="detailAllSchemasRules"
+      :formAllSchemas="detailAllSchemas"
+      :isBusiness="false"
+      :apiUpdate="apiUpdate"
+      :apiCreate="apiCreate"
+      @searchTableSuccess="searchTableSuccess"
+      :detailData="detailData"
+      @submitForm="submitForm"
+    />
+  </div>
+</template>
+
+<script lang="ts" setup>
+import Annex from '@/components/Annex/src/Annex.vue'
+import Remarks from '@/components/Remarks/src/Remarks.vue'
+import ChangeRecord from '@/components/ChangeRecord/src/ChangeRecord.vue'
+import Tabs from '@/components/Tabs/src/Tabs.vue'
+import * as RemarkApi from '@/api/wms/remark'
+import * as FileApi from '@/api/wms/file'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+
+defineOptions({ name: 'DetailCountPlan' })
+
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+routeName.value = routeName.value.substring(0, routeName.value.length - 4) + 'Detail'
+
+
+const props = defineProps({
+  // 标签参数
+  tabs: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 是否是基础数据 展现详情顶部表单
+  isBasic: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
+  // 表单，列表 相关信息
+  allSchemas: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 明细列表相关信息
+  detailAllSchemas: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  //  明细验证
+  detailAllSchemasRules: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 子表新增API
+  apiCreate: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  // 子表编辑API
+  apiUpdate: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  // 子表分页列表API
+  apiPage: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  // 子表删除API
+  apiDelete: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  // 子表新增修改校验
+  detailValidate: {
+    type: Function,
+    required: false,
+    default: null
+  }
+})
+const isShowDrawer = ref(false)
+const detailLoading = ref(false)
+const tabsList = ref(JSON.parse(JSON.stringify(props.tabs ? props.tabs : '')))
+
+if (props.isBasic == true) {
+  if (tabsList.value && tabsList.value.length > 0) {
+    tabsList.value.unshift({
+      label: '详情',
+      prop: 'Detail'
+    })
+  }
+} else {
+  if (tabsList.value && tabsList.value.length > 0) {
+  } else {
+    tabsList.value = [
+      {
+        label: '明细',
+        prop: 'Detail'
+      }
+    ]
+  }
+}
+if (tabsList.value) {
+}
+
+// 附件默认数据
+const annexData = reactive({
+  annexList: []
+})
+
+// 备注数据
+const remarksData = reactive({
+  remarksList: [],
+  data: {}
+})
+
+// 变更记录默认数据
+const changeRecordData = reactive({
+  changeRecordList: []
+})
+const detailData = ref({}) //详情数据
+// 获取附件列表篇
+const getFileList = async () => {
+  detailLoading.value = true
+  try {
+    annexData.annexList = await FileApi.getFileList(remarksData.data)
+  } finally {
+    detailLoading.value = false
+  }
+}
+/** 添加附件 */
+const handleAnnexSuccess = () => {
+  getFileList()
+  getChangeRecordList()
+}
+// 删除附件成功之后所走的方法
+const deleteAnnexSuccess = async () => {
+  getFileList()
+  getChangeRecordList()
+}
+
+// Tabs当前选择
+const current = ref(0)
+const change = (item, index) => {
+  current.value = index
+  emit('changeTabs', item)
+}
+
+//主表所需的参数
+const masterParmas = ref({
+  masterId: '', //主表id
+  number: '', //主表单据号
+  status: '' //主表状态 用于控制子表新增编辑按钮显示情况
+})
+
+// 列表头部按钮
+const HeadButttondata = ref()
+// 列表-操作按钮
+const buttondata = ref()
+
+/** 打开弹窗 */
+const titleNameRef = ref()
+const titleValueRef = ref()
+const openDetail = async (row: any, titleName: any, titleValue: any, tableName: any) => {
+  titleNameRef.value = titleName
+  titleValueRef.value = titleValue
+  remarksData.data = {
+    tableId: row.id,
+    tableName: tableName
+  }
+  // 加载明细列表
+  if (!props.isBasic) {
+    // 设置主表id
+    masterParmas.value.masterId = row.id
+    masterParmas.value.number = row.number
+    masterParmas.value.status = row.status
+    tableObjectRef.value.params = {
+      masterId: row.id
+    }
+    getList()
+  }
+  isShowDrawer.value = true
+  if (row) {
+    detailLoading.value = true
+    try {
+      detailData.value = row
+      getRemarkList()
+      getFileList()
+      getChangeRecordList()
+      // 判断详情新增按钮是否显示
+      if(routeName.value.indexOf('Job') > -1){
+        HeadButttondata.value = [
+          defaultButtons.defaultFilterBtn(null) // 筛选
+        ]
+      }else{
+        HeadButttondata.value = [
+          defaultButtons.defaultAddBtn({
+            hide: isShowMainButton(row, ['1'])
+          }), // 新增
+          defaultButtons.defaultFilterBtn(null) // 筛选
+        ]
+      }
+      // 动态显示操作列按钮
+      buttondata.value = [
+        defaultButtons.mainListEditBtn({
+          hide: isShowMainButton(row, ['1'])
+        }), // 编辑
+        defaultButtons.mainListDeleteBtn({
+          hide: isShowMainButton(row, ['1'])
+        }) // 删除
+      ]
+    } finally {
+      detailLoading.value = false
+    }
+  }
+}
+defineExpose({ openDetail }) // 提供 open 方法，用于打开弹窗
+
+// 获取备注列表
+const getRemarkList = async () => {
+  detailLoading.value = true
+  try {
+    remarksData.remarksList = await RemarkApi.getRemarkPage(remarksData.data)
+  } finally {
+    detailLoading.value = false
+  }
+}
+// 备注提交成功之后
+const remarksSubmitScuess = async (remark) => {
+  detailLoading.value = false
+  getRemarkList()
+  getChangeRecordList()
+}
+// 获取变更记录
+const getChangeRecordList = async () => {
+  changeRecordData.changeRecordList = await RemarkApi.getChangeRecordPage(remarksData.data)
+}
+
+
+const tableObjectRef = ref()
+const tableMethodsRef = ref()
+const detailAllSchemasRef = ref()
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: props.apiPage // 分页接口
+})
+
+tableObjectRef.value = tableObject
+tableMethodsRef.value = tableMethods
+detailAllSchemasRef.value = props.detailAllSchemas
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row, val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 获得表格的各种操作
+const { getList } = tableMethodsRef.value
+
+// 头部按钮事件
+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 updataTableColumns = (val) => {
+//   detailAllSchemas.tableColumns.value = val
+// }
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') {
+    // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') {
+    // 删除
+    handleDelete(row.id)
+  }
+}
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = async (type: string, row?: number) => {
+  formRef.value.open(type, row, masterParmas.value)
+}
+// form 提交
+const submitForm = async (formType, data) => {
+  try {
+    // 子表新增编辑校验 如果业务需要子表提交校验 需在主页详情组件添加 detailValidate 参数及方法
+    const rs = await props.detailValidate?props.detailValidate(data):true
+    if (!rs) return
+    if (formType === 'create') {
+      await props.apiCreate(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await props.apiUpdate(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  emit('searchTableSuccessDetail', formField, searchField, val, formRef)
+}
+// 传递给父类
+const emit = defineEmits(['searchTableSuccessDetail', 'changeTabs'])
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await props.apiDelete(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+// 筛选提交
+const searchFormClick = (searchData) => {
+  const { tableObject, tableMethods } = useTable({
+      getListApi: props.apiPage // 分页接口
+    })
+    tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+      ? searchData.filters
+      : [{ column: 'masterId', action: '==', value: masterParmas.value.masterId }]
+  }
+  detailAllSchemasRef.value = props.detailAllSchemas
+    tableObjectRef.value = tableObject
+    tableMethodsRef.value = tableMethods
+  tableObjectRef.value.tableList = []
+    const { getList } = tableMethods
+    getList()
+  // tableObjectRef.value.params = {
+  //   isSearch: true,
+  //   filters: searchData.filters
+  //     ? searchData.filters
+  //     : [{ column: 'masterId', action: '==', value: masterParmas.value.masterId }]
+  // }
+  // getList() // 刷新当前列表
+}
+
+//监视属性
+watch(
+  () =>props.apiPage,
+  () => {
+    const { tableObject, tableMethods } = useTable({
+      getListApi: props.apiPage // 分页接口
+    })
+    tableObject.params.masterId = masterParmas.value.masterId
+    detailAllSchemasRef.value = props.detailAllSchemas
+    tableObjectRef.value = tableObject
+    tableMethodsRef.value = tableMethods
+    const { getList } = tableMethods
+    getList()
+  },
+)
+</script>
+<style lang="scss">
+.el-drawer__body {
+  background: #f5f5f5 !important;
+}
+
+::v-deep(.label-class-name) {
+  color: #dedede;
+}
+</style>
+<style scoped lang="scss"></style>
diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue
index 527d2ad9e..2fbdd83eb 100644
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@@ -112,8 +112,7 @@
               :allow-create="headerItem?.tableForm.allowCreate"
               style="width: 100%" 
               :placeholder="headerItem?.tableForm?.placeholder || '请选择' + headerItem.label"
-              @change="formSelectChange(headerItem.field, $event,row)"
-              @visible-change="formSelectvVisibleChange(headerItem.field, $event,row)">
+              @change="formSelectChange(headerItem.field, $event,row)">
               <el-option 
                 v-for="op in initSelectOptions(headerItem)" 
                 :label="op.label" 
@@ -326,7 +325,6 @@ const emit = defineEmits([
   'tableSelectionChange',
   'extendedButtonsClick',
   'formSelectChange',
-  'formSelectvVisibleChange',
   'tableSortChange',
   'selectCallback',
   'handleTableSelect',
@@ -342,9 +340,7 @@ const initSelectOptions = (item) => {
 const formSelectChange = (field, val,row) => {
   emit('formSelectChange', field, val,row)
 }
-const formSelectvVisibleChange = (field, val,row) => {
-  emit('formSelectvVisibleChange', field, val,row)
-}
+
 // 点击selection框
 const tableSelectionChange = (val) => {
   emit('tableSelectionChange', val)
@@ -381,6 +377,7 @@ const TableBaseForm_Ref = ref()
    */
 
 const validateForm = () => {
+  console.log(TableBaseForm_Ref.value)
   let _lists = TableBaseForm_Ref.value?.map(v => v.validate())
   return Promise.all(_lists).then(() => {
     return true
diff --git a/src/components/TableFormCountPlan/index.ts b/src/components/TableFormCountPlan/index.ts
new file mode 100644
index 000000000..2f51d1abc
--- /dev/null
+++ b/src/components/TableFormCountPlan/index.ts
@@ -0,0 +1,3 @@
+import TableFormCountPlan from './src/TableFormCountPlan.vue'
+
+export { TableFormCountPlan }
diff --git a/src/components/TableFormCountPlan/src/TableFormCountPlan.vue b/src/components/TableFormCountPlan/src/TableFormCountPlan.vue
new file mode 100644
index 000000000..12bc0bf5a
--- /dev/null
+++ b/src/components/TableFormCountPlan/src/TableFormCountPlan.vue
@@ -0,0 +1,193 @@
+<!-- 附件组件 -->
+<template>
+  <!-- 盘点计划的子表 -->
+  <div class="table">
+    <el-table :data="tableData" stripe style="width: 100%"
+      ref="TableBaseComponents_Ref" >
+      <el-table-column fixed="left" :width="50" v-slot="{ row, $index }">
+        <Icon
+          icon="ep:remove"
+          color="#757575"
+          size="26"
+          style="cursor: pointer;margin-top: -16px;"
+          @click="handleDeleteTable(row, $index)"
+        />
+      </el-table-column>
+      <el-table-column  :label="tableFields[0].label" align="center">
+        <template v-slot="{ row }">
+          <el-form 
+          ref="TableBaseForm_Ref" 
+          :model="row" 
+          style="width: 100%;" 
+          :rules="tableFormRules"
+          :class="tableFormRules ? '' : 'noRulesForm'">
+          <el-form-item :prop="tableFields[0].field">
+          <el-select
+            v-model="row.type"
+            :placeholder="tableFields[0].placeholder || '请输入' + tableFields[0].label"
+            @change="tableFormChange(tableFields[0].field, $event, row)"
+          >
+            <el-option
+              v-for="dict in countScopeType"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+          </el-form-item>
+          </el-form>
+        </template>
+      </el-table-column>
+      <el-table-column
+        :prop="tableFields[1].field"
+        :label="tableFields[1].label"
+        align="center"
+      >
+        <template v-slot="{ row }">
+          <el-form 
+          ref="TableBaseForm_Ref1" 
+          :model="row" 
+          style="width: 100%;" 
+          :rules="tableFormRules"
+          :class="tableFormRules ? '' : 'noRulesForm'">
+          <el-form-item :prop="tableFields[1].field">
+          <el-select
+            v-model="row.value"
+            :placeholder="
+              tableFields[1].placeholder ||
+              '请输入' + tableFields[1].label
+            "
+            v-if="
+              row.type == 'OWNER' ||
+              row.type == 'SUPPLIER' ||
+              row.type == 'CUSTOMER' ||
+              row.type == 'ABC' ||
+              row.type == 'ITEMS_TYPE' ||
+              row.type == 'ITEMS_GROUP' ||
+              row.type == 'ITEMS_CODE' ||
+              row.type == 'WAREHOUSE_CODE' ||
+              row.type == 'AREABASIC_CODE' ||
+              row.type == 'LOCATIONGROUP_CODE' ||
+              row.type == 'LOCATION_CODE'
+            "
+          >
+            <el-option
+              v-for="item in row.initOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+          <el-input
+            v-model="row.value"
+            :placeholder="
+              tableFields[1].placeholder ||
+              '请输入' + tableFields[1].label
+            "
+            v-else
+          />
+          </el-form-item>
+          </el-form>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="button flex">
+      <div class="p-12px" @click="handleAddTable">
+        <Icon icon="ep:circle-plus" color="#409eff" size="26" style="cursor: pointer" />
+        <div>添加明细</div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+defineComponent({
+  name: 'TableFormCountPlan'
+})
+const props = defineProps({
+  // 列表头定义
+  tableFields: {
+    type: Array,
+    default: () => {
+      return []
+    }
+  },
+  // 列表数据
+  tableData: {
+    type: Array,
+    default: () => {
+      return []
+    }
+  },
+  tableFormRules: {
+    type: Array,
+    required: true,
+    default: null
+  },
+  countScopeType: {
+    type: Array,
+    required: false,
+    default: null
+  },
+})
+const tableData = props.tableData
+const tableFields = props.tableFields
+const TableBaseComponents_Ref = ref()
+const TableBaseForm_Ref = ref()
+const TableBaseForm_Ref1 = ref()
+const tableFormRules = ref(props.tableFormRules)
+console.log('tableFormRules',tableFormRules.value)
+/**
+   * 验证表单是否符合rules
+   * @param {*} success 如果验证【成功】走的方法
+   * @param {*} error 如果验证【不成功】走的方法
+   */
+
+   const validateForm = () => {
+    let TableBaseForm_Arr = []
+    TableBaseForm_Arr.push(TableBaseForm_Ref.value)
+    TableBaseForm_Arr.push(TableBaseForm_Ref1.value)
+  let _lists = TableBaseForm_Arr?.map(v => v.validate())
+  return Promise.all(_lists).then(() => {
+    return true
+  }).catch(() => {
+    return false
+  })
+}
+// 传递给父类
+const emit = defineEmits(['handleAddTable', 'selectChange', 'tableFormChange'])
+// 修改盘点类型
+const selectChange = (field, val) => {
+  emit('selectChange', field, val)
+}
+
+const tableFormChange = (field, val, row) => {
+  emit('tableFormChange', field, val, row)
+}
+// 添加数据
+const handleAddTable = () => {
+  emit('handleAddTable')
+}
+// setup 语法糖 抛出方法
+defineExpose({
+  TableBaseComponents_Ref,
+  validateForm
+})
+
+</script>
+<style scoped lang="scss">
+.button {
+  > div {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    cursor: pointer;
+
+    > div {
+      margin-left: 6px;
+      text-decoration: underline;
+      color: #409eff;
+    }
+  }
+}
+</style>
diff --git a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
index 92dd2e5d5..22be31675 100644
--- a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
+++ b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
@@ -648,7 +648,6 @@ export const CountPlanDetail = useCrudSchemas(<CrudSchema[]>([
       width: 300
     },
     tableForm: {
-      type: 'InputString',
       width: '300',
     }
   },
@@ -665,19 +664,10 @@ export const CountPlanDetail = useCrudSchemas(<CrudSchema[]>([
   }
 ]))
 export const CountPlanDetailRules = reactive({
-  available: [
-    { required: true, message: '请选择是否可用', trigger: 'change' }
-  ],
-  uom: [
-    { required: true, message: '请选择计量单位', trigger: 'change' }
-  ],
-  planQty: [
-    { required: true, message: '请输入计划数量', trigger: 'blur' }
-  ],
-  number: [
-    { required: true, message: '请输入单据号', trigger: 'blur' }
+  type: [
+    { required: true, message: '请选择盘点范围类型', trigger: 'change' }
   ],
-  itemCode: [
-    { required: true, message: '请选择物品代码', trigger: 'change' }
+  value: [
+    { required: true, message: '请选择盘点范围值', trigger: 'change' }
   ],
 })
\ No newline at end of file
diff --git a/src/views/wms/countManage/count/countPlanMain/index.vue b/src/views/wms/countManage/count/countPlanMain/index.vue
index ab9350ad8..c5363524f 100644
--- a/src/views/wms/countManage/count/countPlanMain/index.vue
+++ b/src/views/wms/countManage/count/countPlanMain/index.vue
@@ -57,6 +57,7 @@
     :apiUpdate="CountPlanMainApi.updateCountPlanMain"
     :apiCreate="CountPlanMainApi.createCountPlanMain"
     fromeWhere="countPlan"
+    :countScopeType="getStrDictOptions(DICT_TYPE.COUNT_SCOPE_TYPE)"
     @handleAddTable="handleAddTable"
     @handleDeleteTable="handleDeleteTable"
     @searchTableSuccess="searchTableSuccess"
@@ -64,6 +65,7 @@
     @formSelectChange="formSelectChange"
     @formSelectvVisibleChange="formSelectvVisibleChange"
     @selectChange="selectChange"
+    @tableFormChange="tableFormChange"
   />
 
   <!-- 详情 -->
@@ -79,6 +81,7 @@
     :apiPage="CountPlanDetailApi.getCountPlanDetailPage"
     :apiDelete="CountPlanDetailApi.deleteCountPlanDetail"
     :Echo="Echo"
+    fromeWhere="countPlan"
   />
 
   <!-- 导入 -->
@@ -112,6 +115,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as ItembasicApi from '@/api/wms/itembasic'
 import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
 import { DICT_TYPE, getIntDictOptions, getStrDictOptions } from '@/utils/dict'
+console.log('CountPlanDetail.allSchemas', CountPlanDetail.allSchemas)
 
 // 盘点计划主
 defineOptions({ name: 'CountPlanMain' })
@@ -290,7 +294,10 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const formRef = ref()
 const openForm = async (type: string, row?: number) => {
-  tableData.value = [] // 重置明细数据
+  tableData.value = [ {
+    type: '',
+    value: ''
+  }] // 重置明细数据
   formRef.value.open(type, row)
 
   getOwnerAllList()
@@ -341,16 +348,22 @@ const handleExport = async () => {
 /**
  * tableForm方法
  */
-const tableFormKeys = {}
+let tableFormKeys = {}
 CountPlanDetail.allSchemas.tableFormColumns.forEach((item) => {
   tableFormKeys[item.field] = item.default ? item.default : ''
 })
-const tableData = ref([])
+const tableData = ref([{
+    type: '',
+    value: ''
+  }])
 
 // 添加明细
 const handleAddTable = () => {
-  console.log(tableFormKeys)
-  tableFormKeys.formType = 'Select'
+  // tableFormKeys.formType=''
+  tableFormKeys = {
+    type: '',
+    value: ''
+  }
   tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
 }
 // 删除明细
@@ -360,7 +373,13 @@ const handleDeleteTable = (item, index) => {
 
 // 主子数据 提交
 const submitForm = async (formType, data) => {
-  data.subList = tableData.value // 拼接子表数据参数
+  data.subList = tableData.value.map(item=>{
+    return{
+      type:item.type,
+      value:item.value,
+    }
+  }) // 拼接子表数据参数
+  console.log(tableData.value)
   try {
     if (formType === 'create') {
       await CountPlanMainApi.createCountPlanMain(data)
@@ -404,7 +423,6 @@ const searchFormClick = (searchData) => {
 }
 // 选择盘点类型的时候针对限值的操作
 const selectChange = (field, val) => {
-  console.log(val)
   if (field == 'type') {
     if (val == 'DYNAMIC') {
       CountPlanMain.allSchemas.formSchema[3].label = '限值（%）'
@@ -421,74 +439,71 @@ const selectChange = (field, val) => {
     }
   }
 }
-let valueList = []
 // 选择盘点范围类型
-const formSelectChange = async (field, val, row) => {
-  console.log(row[field])
+const tableFormChange = async (field, val, row) => {
   console.log(field)
   console.log(val)
   if (field == 'type') {
     row.value = ''
-    if (row.type == 'OWNER' || row.type == 'SUPPLIER'|| row.type == 'CUSTOMER'|| row.type == 'ABC'|| row.type == 'ITEMS_TYPE'|| row.type == 'ITEMS_GROUP'||row.type == 'ITEMS_CODE'||row.type == 'WAREHOUSE_CODE'||row.type == 'AREABASIC_CODE'||row.type == 'LOCATIONGROUP_CODE'||row.type == 'LOCATION_CODE') {
+    if (
+      row.type == 'OWNER' ||
+      row.type == 'SUPPLIER' ||
+      row.type == 'CUSTOMER' ||
+      row.type == 'ABC' ||
+      row.type == 'ITEMS_TYPE' ||
+      row.type == 'ITEMS_GROUP' ||
+      row.type == 'ITEMS_CODE' ||
+      row.type == 'WAREHOUSE_CODE' ||
+      row.type == 'AREABASIC_CODE' ||
+      row.type == 'LOCATIONGROUP_CODE' ||
+      row.type == 'LOCATION_CODE'
+    ) {
+      row.formType = 'Select'
+      switch (row.type) {
+        case 'OWNER':
+          row.initOptions = ownerAllList.value
+          break
+        case 'SUPPLIER':
+          row.initOptions = supplierAllList.value
+          break
+        case 'CUSTOMER':
+          row.initOptions = customerAllList.value
+          break
+        case 'ABC':
+          row.initOptions = getStrDictOptions(DICT_TYPE.ABC_CLASS)
+          break
+        case 'ITEMS_TYPE':
+          row.initOptions = getStrDictOptions(DICT_TYPE.ITEM_TYPE)
+          break
+        case 'ITEMS_GROUP':
+          row.initOptions = getStrDictOptions(DICT_TYPE.ITEM_GROUP)
+          break
+        case 'ITEMS_CODE':
+          row.initOptions = itembasicAllList.value
+          break
+        case 'WAREHOUSE_CODE':
+          row.initOptions = warehouseAllList.value
+          break
+        case 'AREABASIC_CODE':
+          row.initOptions = areaAllList.value
+          break
+        case 'LOCATIONGROUP_CODE':
+          row.initOptions = locationgroupAllList.value
+          break
+        case 'LOCATION_CODE':
+          row.initOptions = locationAllList.value
+          break
+      }
+    } else if (row.type == 'PROJECT') {
       row.formType = 'InputString'
-      // row.initOptions = valueList
-    }else if(row.type == 'PROJECT'){
-      // row = {
-      //   type: 'InputString',
-      //   width: '300',
-      //   initOptions: valueList
-      // }
     }
   }
 }
 
-const formSelectvVisibleChange = async (field, val, row) => {
-  console.log(getStrDictOptions(DICT_TYPE.ABC_CLASS))
-  switch (row.type) {
-    case 'OWNER':
-      valueList = ownerAllList.value
-      break;
-    case 'SUPPLIER':
-      valueList = supplierAllList.value
-      break;
-    case 'CUSTOMER':
-    valueList = customerAllList.value
-    break;
-    case 'ABC':
-      valueList = getStrDictOptions(DICT_TYPE.ABC_CLASS)
-      break;
-    case 'ITEMS_TYPE':
-      valueList = getStrDictOptions(DICT_TYPE.ITEM_TYPE)
-      break;
-    case 'ITEMS_GROUP':
-      valueList = getStrDictOptions(DICT_TYPE.ITEM_GROUP)
-      break;
-    case 'ITEMS_CODE':
-      valueList =  itembasicAllList.value
-      break;
-    case 'WAREHOUSE_CODE':
-      valueList =  warehouseAllList.value
-      break
-    case 'AREABASIC_CODE':
-      valueList =  areaAllList.value
-      break
-    case 'LOCATIONGROUP_CODE':
-      valueList =  locationgroupAllList.value
-      break
-    case 'LOCATION_CODE':
-      valueList =  locationAllList.value
-      break
-  }
-  CountPlanDetail.allSchemas.tableFormColumns[1].tableForm = {
-    type: 'Select',
-    width: '300',
-    initOptions: valueList
-  }
-}
 const ownerAllList = ref()
 const supplierAllList = ref()
 const customerAllList = ref()
-const itembasicAllList =  ref()
+const itembasicAllList = ref()
 const warehouseAllList = ref()
 const areaAllList = ref()
 const locationgroupAllList = ref()
@@ -535,7 +550,7 @@ const getItembasicAllList = async () => {
 }
 // 获取仓库列表
 const getWarehouseAllList = async () => {
-  await WarehouseApi.getWarehouseList({available:'TRUE'}).then((res) => {
+  await WarehouseApi.getWarehouseList({ available: 'TRUE' }).then((res) => {
     res.forEach((element) => {
       element.value = element.code
       element.label = element.name
@@ -545,7 +560,7 @@ const getWarehouseAllList = async () => {
 }
 // 获取库区列表
 const getAreaAllList = async () => {
-  await AreaApi.getAreaList({available:'TRUE'}).then((res) => {
+  await AreaApi.getAreaList({ available: 'TRUE' }).then((res) => {
     res.forEach((element) => {
       element.value = element.code
       element.label = element.name
@@ -555,7 +570,7 @@ const getAreaAllList = async () => {
 }
 // 获取库位组列表
 const getLocationgroupAllList = async () => {
-  await LocationgroupApi.getLocationgroupList({available:'TRUE'}).then((res) => {
+  await LocationgroupApi.getLocationgroupList({ available: 'TRUE' }).then((res) => {
     res.forEach((element) => {
       element.value = element.code
       element.label = element.name
@@ -565,7 +580,7 @@ const getLocationgroupAllList = async () => {
 }
 // 获取库位列表
 const getLocationAllList = async () => {
-  await LocationpApi.getLocationList({available:'TRUE'}).then((res) => {
+  await LocationpApi.getLocationList({ available: 'TRUE' }).then((res) => {
     res.forEach((element) => {
       element.value = element.code
       element.label = element.name

From ca1b60ba0fdc9b9d2bf278d120c3b8586ca4eb7e Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Wed, 6 Dec 2023 13:33:18 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E8=B0=83=E6=8B=A8=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91=E8=B0=83=E8=AF=95=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/transferissueJobMain/index.ts     |  17 ++-
 .../wms/transferissueRequestDetail/index.ts   |   3 +-
 src/api/wms/transferissueRequestMain/index.ts |  40 +++++-
 .../transferissueJobMain/index.vue            |  41 +++++-
 .../transferissueRequestMain/index.vue        | 118 ++++++++++++++----
 .../transferissueRequestMain.data.ts          | 115 +++++++++++++++--
 6 files changed, 295 insertions(+), 39 deletions(-)

diff --git a/src/api/wms/transferissueJobMain/index.ts b/src/api/wms/transferissueJobMain/index.ts
index feecdcdf0..53e7e3293 100644
--- a/src/api/wms/transferissueJobMain/index.ts
+++ b/src/api/wms/transferissueJobMain/index.ts
@@ -83,4 +83,19 @@ export const exportTransferissueJobMain = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/transferissue-job-main/get-import-template' })
-}
\ No newline at end of file
+}
+
+// 关闭-调拨出库任务主
+export const closeTransferissueJobMain = (id: number) => {
+  return request.download({ url: '/wms/transferissue-job-main/close?id=' + id })
+}
+
+// 承接-调拨出库任务主
+export const acceptTransferissueJobMain = (id: number) => {
+  return request.download({ url: '/wms/transferissue-job-main/accept?id=' + id })
+}
+
+// 放弃-调拨出库任务主
+export const abandonTransferissueJobMain = (id: number) => {
+  return request.download({ url: '/wms/transferissue-job-main/abandon?id=' + id })
+}
diff --git a/src/api/wms/transferissueRequestDetail/index.ts b/src/api/wms/transferissueRequestDetail/index.ts
index 1b8fe8d36..06092fb23 100644
--- a/src/api/wms/transferissueRequestDetail/index.ts
+++ b/src/api/wms/transferissueRequestDetail/index.ts
@@ -21,6 +21,7 @@ export interface TransferissueRequestDetailVO {
   updateTime: Date
   updater: string
   fromOwnerCode: string
+  fromLocationCode: string
 }
 
 // 查询调拨出库申请子列表
@@ -62,4 +63,4 @@ export const exportTransferissueRequestDetail = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/transferissue-request-detail/get-import-template' })
-}
\ No newline at end of file
+}
diff --git a/src/api/wms/transferissueRequestMain/index.ts b/src/api/wms/transferissueRequestMain/index.ts
index 475cf5ee2..28425411a 100644
--- a/src/api/wms/transferissueRequestMain/index.ts
+++ b/src/api/wms/transferissueRequestMain/index.ts
@@ -44,22 +44,22 @@ export const getTransferissueRequestMain = async (id: number) => {
   return await request.get({ url: `/wms/transferissue-request-main/get?id=` + id })
 }
 
-// 新增调拨出库申请主
+// 新增-调拨出库申请主
 export const createTransferissueRequestMain = async (data: TransferissueRequestMainVO) => {
   return await request.post({ url: `/wms/transferissue-request-main/create`, data })
 }
 
-// 修改调拨出库申请主
+// 修改-调拨出库申请主
 export const updateTransferissueRequestMain = async (data: TransferissueRequestMainVO) => {
   return await request.put({ url: `/wms/transferissue-request-main/update`, data })
 }
 
-// 删除调拨出库申请主
+// 删除-调拨出库申请主
 export const deleteTransferissueRequestMain = async (id: number) => {
   return await request.delete({ url: `/wms/transferissue-request-main/delete?id=` + id })
 }
 
-// 导出调拨出库申请主 Excel
+// 导出-调拨出库申请主 Excel
 export const exportTransferissueRequestMain = async (params) => {
   return await request.download({ url: `/wms/transferissue-request-main/export-excel`, params })
 }
@@ -67,4 +67,34 @@ export const exportTransferissueRequestMain = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/transferissue-request-main/get-import-template' })
-}
\ No newline at end of file
+}
+
+// 关闭-调拨出库申请
+export const closeTransferissueRequestMain = async (id) => {
+  return await request.put({ url: `/wms/transferissue-request-main/close?id=` + id })
+}
+
+// 重新添加-调拨出库申请
+export const reAddTransferissueRequestMain = async (id) => {
+  return await request.put({ url: `/wms/transferissue-request-main/reAdd?id=` + id })
+}
+
+// 提交审批-调拨出库申请
+export const submitTransferissueRequestMain = async (id) => {
+  return await request.put({ url: `/wms/transferissue-request-main/submit?id=` + id })
+}
+
+// 审批驳回-调拨出库申请
+export const refusedTransferissueRequestMain = async (id) => {
+  return await request.put({ url: `/wms/transferissue-request-main/refused?id=` + id })
+}
+
+// 审批通过-调拨出库申请
+export const agreeTransferissueRequestMain = async (id) => {
+  return await request.put({ url: `/wms/transferissue-request-main/agree?id=` + id })
+}
+
+// 处理-调拨出库申请
+export const handleTransferissueRequestMain = async (id) => {
+  return await request.put({ url: `/wms/transferissue-request-main/handle?id=` + id })
+}
diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/index.vue b/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/index.vue
index 759a8a1f7..7dc2baa98 100644
--- a/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/index.vue
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/index.vue
@@ -71,6 +71,8 @@ import { TransferissueJobMain,TransferissueJobMainRules,TransferissueJobDetail,T
 import * as TransferissueJobMainApi from '@/api/wms/transferissueJobMain'
 import * as TransferissueJobDetailApi from '@/api/wms/transferissueJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as PurchasereceiptJobMainApi from "@/api/wms/purchasereceiptJobMain";
+import {acceptTransferissueJobMain} from "@/api/wms/transferissueJobMain";
 
 // 调拨出库任务主
 defineOptions({ name: 'TransferissueJobMain' })
@@ -174,9 +176,9 @@ const isShowMainButton = (row,val) => {
 // 列表-操作按钮
 const butttondata = (row) => {
   return [
-    defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
-    defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
-    defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    // defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:transferissue-job-main:close'}), // 关闭
+    //defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
     // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
   ]
 }
@@ -187,13 +189,46 @@ const buttonTableClick = async (val, row) => {
     console.log('列表-操作按钮事件-执行')
   } else if (val == 'mainJobAba') { // 放弃
     console.log('列表-操作按钮事件-放弃')
+    handleAbandon(row.id)
   } else if (val == 'mainJobClo') { // 关闭
     console.log('列表-操作按钮事件-关闭')
+    handleClose(row.id)
   } else if (val == 'mainJobAcc') { // 承接
     console.log('列表-操作按钮事件-承接')
+    handleAccept(row.id)
   }
 }
 
+/** 放弃按钮操作 */
+const handleAbandon = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmColse'))
+    await TransferissueJobMainApi.abandonTransferissueJobMain(id)
+    message.success(t('common.closeSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 关闭按钮操作 */
+const handleClose = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmColse'))
+    await TransferissueJobMainApi.closeTransferissueJobMain(id)
+    message.success(t('common.closeSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 承接按钮操作 */
+const handleAccept = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmColse'))
+    await TransferissueJobMainApi.acceptTransferissueJobMain(id)
+    message.success(t('common.closeSuccess'))
+    await getList()
+  } catch {}
+}
+
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue
index 8e9812e9d..dd9744398 100644
--- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue
@@ -82,6 +82,9 @@ import { TransferissueRequestMain,TransferissueRequestMainRules,TransferissueReq
 import * as TransferissueRequestMainApi from '@/api/wms/transferissueRequestMain'
 import * as TransferissueRequestDetailApi from '@/api/wms/transferissueRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as PurchasereturnRequestMainApi from "@/api/wms/purchasereturnRequestMain";
+import {closeTransferissueRequestMain} from "@/api/wms/transferissueRequestMain";
+import * as PurchasereceiptRequestMainApi from "@/api/wms/purchasereceiptRequestMain";
 
 // 调拨出库申请
 defineOptions({ name: 'TransferissueRequestMain' })
@@ -104,13 +107,16 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
   nextTick(() => {
     if (type == 'tableForm') {
       // 明细查询页赋值
-      row[formField] = val[0][searchField]
-      row['packingNumber'] = val[0]['packingNumber']
-      row['containerNumber'] = val[0]['containerNumber']
-      row['batch'] = val[0]['batch']
-      row['inventoryStatus'] = val[0]['inventoryStatus']
-      row['toLocationCode'] = val[0]['locationCode']
-      row['itemCode'] = val[0]['itemCode']
+      if (formField == 'packingNumber') {
+        row['packingNumber'] = val[0]['packingNumber']
+        row['containerNumber'] = val[0]['containerNumber']
+        row['batch'] = val[0]['batch']
+        row['inventoryStatus'] = val[0]['inventoryStatus']
+        row['fromLocationCode'] = val[0]['locationCode']
+        row['itemCode'] = val[0]['itemCode']
+      } else {
+        row[formField] = val[0][searchField]
+      }
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]
@@ -122,13 +128,16 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
 const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
   nextTick(() => {
     const setV = {}
-    setV[formField] = val[0][searchField]
-    setV['packingNumber'] = val[0]['packingNumber']
-    setV['containerNumber'] = val[0]['containerNumber']
-    setV['batch'] = val[0]['batch']
-    setV['inventoryStatus'] = val[0]['inventoryStatus']
-    setV['toLocationCode'] = val[0]['locationCode']
-    setV['itemCode'] = val[0]['itemCode']
+    if(formField == 'packingNumber'){
+      setV['packingNumber'] = val[0]['packingNumber']
+      setV['containerNumber'] = val[0]['containerNumber']
+      setV['batch'] = val[0]['batch']
+      setV['inventoryStatus'] = val[0]['inventoryStatus']
+      setV['fromLocationCode'] = val[0]['locationCode']
+      setV['itemCode'] = val[0]['itemCode']
+    }else {
+      setV[formField] = val[0][searchField]
+    }
     formRef.setValues(setV)
   })
 }
@@ -190,13 +199,13 @@ const isShowMainButton = (row,val) => {
 // 列表-操作按钮
 const butttondata = (row) => {
     return [
-        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6'])}), // 关闭
-        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5'])}), // 重新添加
-        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1'])}), // 提交审批
-        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2'])}), // 驳回
-        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2'])}), // 审批通过
-        defaultButtons.mainListEditBtn({hasPermi:'wms:transferissue-request-main:update'}), // 编辑
-        defaultButtons.mainListDeleteBtn({hasPermi:'wms:transferissue-request-main:delete'}), // 删除
+        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:transferissue-request-main:close'}), // 关闭
+        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:transferissue-request-main:reAdd'}), // 重新添加
+        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:transferissue-request-main:submit'}), // 提交审批
+        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:transferissue-request-main:refused'}), // 驳回
+        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:transferissue-request-main:agree'}), // 审批通过
+        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:transferissue-request-main:handle'}), // 处理
+        defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:transferissue-request-main:update'}), // 编辑
     ]
 }
 
@@ -206,14 +215,21 @@ const butttondata = (row) => {
 const buttonTableClick = async (val, row) => {
   if (val == 'mainClose') { // 关闭
     console.log('列表-操作按钮事件-关闭')
+    handleClose(row.id)
   } else if (val == 'mainReAdd') { // 重新添加
     console.log('列表-操作按钮事件-重新添加')
+    handleReAdd(row.id)
   } else if (val == 'mainSubmit') { // 提交审批
     console.log('列表-操作按钮事件-提交审批')
+    handleSubmit(row.id)
   } else if (val == 'mainTurnDown') { // 驳回
     console.log('列表-操作按钮事件-驳回')
+    handleRefused(row.id)
   } else if (val == 'mainApprove') { // 审批通过
     console.log('列表-操作按钮事件-审批通过')
+    handleAgree(row.id)
+  } else if (val == 'mainHandle') { // 处理
+    handleHandle(row.id)
   } else if (val == 'edit') { // 编辑
     openForm('update', row)
   } else if (val == 'delete') { // 删除
@@ -221,6 +237,66 @@ const buttonTableClick = async (val, row) => {
   }
 }
 
+/** 关闭按钮操作 */
+const handleClose = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmColse'))
+    await TransferissueRequestMainApi.closeTransferissueRequestMain(id)
+    message.success(t('common.closeSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 重新添加按钮操作 */
+const handleReAdd = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmReAdd'))
+    await TransferissueRequestMainApi.reAddTransferissueRequestMain(id)
+    message.success(t('common.reAddSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 提交按钮操作 */
+const handleSubmit = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmSubmit'))
+    await TransferissueRequestMainApi.submitTransferissueRequestMain(id)
+    message.success(t('common.submitSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 审批驳回按钮操作 */
+const handleRefused = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmRefused'))
+    await TransferissueRequestMainApi.refusedTransferissueRequestMain(id)
+    message.success(t('common.refusedSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 审批通过按钮操作 */
+const handleAgree = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmAgree'))
+    await TransferissueRequestMainApi.agreeTransferissueRequestMain(id)
+    message.success(t('common.agreeSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 处理按钮操作 */
+const handleHandle = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmHandle'))
+    await TransferissueRequestMainApi.handleTransferissueRequestMain(id)
+    message.success(t('common.handleSuccess'))
+    await getList()
+  } catch {}
+}
+
 /** 添加/修改操作 */
 const formRef = ref()
 const openForm =async (type: string, row?: number) => {
diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
index 8424b14bc..28fdba5e6 100644
--- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
@@ -11,6 +11,9 @@ import { Dock } from '@/views/wms/basicDataManage/factoryModeling/dock/dock.data
 import * as BalanceApi  from '@/api/wms/balance'
 import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
 
+import * as LocationApi from '@/api/wms/location'
+import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
+
 const { t } = useI18n() // 国际化
 
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
@@ -24,6 +27,9 @@ const queryParams = {
 
  // 获取当前操作人的部门
 import { useUserStore } from '@/store/modules/user'
+import {Warehouse} from "@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data";
+import * as WarehouseApi from "@/api/wms/warehouse";
+
 const userStore = useUserStore()
 const userDept = userStore.userSelfInfo.dept
 
@@ -88,10 +94,11 @@ export const TransferissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '运输方式',
     field: 'transferMode',
     sort: 'custom',
+    dictType: DICT_TYPE.TRANSFER_MODE,
+    dictClass: 'string',
     table: {
       width: 150
     },
-    isSearch: true,
   },
   {
     label: '车牌号',
@@ -151,7 +158,30 @@ export const TransferissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isForm: false,
+    tableForm: {
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择仓库代码',
+      searchField: 'code',
+      searchTitle: '仓库信息',
+      searchAllSchemas: Warehouse.allSchemas,
+      searchPage: WarehouseApi.getWarehousePage
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '仓库信息', // 查询弹窗标题
+        searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
+        searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
   },
   {
     label: '到仓库代码',
@@ -160,7 +190,30 @@ export const TransferissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isForm: false,
+    tableForm: {
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择仓库代码',
+      searchField: 'code',
+      searchTitle: '仓库信息',
+      searchAllSchemas: Warehouse.allSchemas,
+      searchPage: WarehouseApi.getWarehousePage
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '仓库信息', // 查询弹窗标题
+        searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
+        searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
   },
   {
     label: '从库位类型范围',
@@ -189,7 +242,7 @@ export const TransferissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '从库区代码范围',
-    field: 'fromAreaCode',
+    field: 'fromAreaCodes',
     sort: 'custom',
     table: {
       width: 150
@@ -544,7 +597,12 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       searchField: 'packingNumber',
       searchTitle: '库存余额信息',
       searchAllSchemas: Balance.allSchemas,
-      searchPage: BalanceApi.getBalancePage
+      searchPage: BalanceApi.getBalancePage,
+      searchCondition: [{
+        key: 'warehouseCode',
+        value: 'fromWarehouseCode',
+        isMainValue: true,
+      }]
     },
     form: {
       // labelMessage: '信息提示说明！！！',
@@ -554,7 +612,12 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
         searchField: 'packingNumber',
         searchTitle: '库存余额信息',
         searchAllSchemas: Balance.allSchemas,
-        searchPage: BalanceApi.getBalancePage
+        searchPage: BalanceApi.getBalancePage,
+        searchCondition: [{
+          key: 'warehouseCode',
+          value: 'fromWarehouseCode',
+          isMainValue: true,
+        }]
       }
     }
   },
@@ -603,6 +666,17 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       type: 'Select'
     }
   },
+  {
+    label: '来源库位',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
   {
     label: '到库位代码',
     field: 'toLocationCode',
@@ -611,7 +685,32 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
     tableForm: {
-      disabled: true,
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择库位代码',
+      searchField: 'code',
+      searchTitle: '库位信息',
+      searchAllSchemas: Location.allSchemas,
+      searchPage: LocationApi.getLocationPage
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库位信息', // 查询弹窗标题
+        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+        searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'warehouseCode',
+          value: 'toWarehouseCode',
+          isMainValue: true,
+        }]
+      }
     }
   },
   {
@@ -758,4 +857,4 @@ export const TransferissueRequestDetailRules = reactive({
   itemCode: [
     { required: true, message: '请选择物品代码', trigger: 'change' }
   ],
-})
\ No newline at end of file
+})

From d4d55de0c9d2a1c477aad87bcdeb0c35d8e3be36 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, 6 Dec 2023 14:39:54 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=80=80=E6=96=99?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/package/index.ts                  |   7 +-
 .../productionreturnRequestMain/index.vue     | 151 ++++++++-
 .../productionreturnRequestMain.data.ts       | 296 +++++++++++++++++-
 3 files changed, 437 insertions(+), 17 deletions(-)

diff --git a/src/api/wms/package/index.ts b/src/api/wms/package/index.ts
index dc46da4ea..fdb147004 100644
--- a/src/api/wms/package/index.ts
+++ b/src/api/wms/package/index.ts
@@ -83,4 +83,9 @@ export const exportPackage = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/package/get-import-template' })
-}
\ No newline at end of file
+}
+
+// 创建标签
+export const createPackageLabel = async (data: PackageVO) => {
+  return await request.post({ url: `/wms/package/createLabel`, data })
+}
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
index c60dd2d38..f982259cf 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
@@ -70,14 +70,30 @@
     @searchTableSuccessDetail="searchTableSuccessDetail"
   />
 
+  <!-- 创建标签 -->
+    <BasicForm
+      ref="formLabelRef"
+      @success="getList"
+      :tableAllSchemas="detailListTableColumns"
+      :tableFormRules="ProductionreturnRequestDetailLabelRules"
+      :tableData="detatableData.tableList"
+      :isBusiness="true"
+      :isShowButton="false"
+      @handleAddTable="handleAddTable"
+      @handleDeleteTable="handleDeleteTable"
+      @searchTableSuccess="searchTableSuccess"
+      @submitForm="submitFormLabel"
+    />
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { ProductionreturnRequestMain,ProductionreturnRequestMainRules,ProductionreturnRequestDetail,ProductionreturnRequestDetailRules } from './productionreturnRequestMain.data'
+import { ProductionreturnRequestMain,ProductionreturnRequestMainRules,ProductionreturnRequestDetail,ProductionreturnRequestDetailRules,ProductionreturnRequestDetailLabel,ProductionreturnRequestDetailLabelRules } from './productionreturnRequestMain.data'
 import * as ProductionreturnRequestMainApi from '@/api/wms/productionreturnRequestMain'
 import * as ProductionreturnRequestDetailApi from '@/api/wms/productionreturnRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as ItembasicApi from '@/api/wms/itembasic'
+import * as PackageApi from '@/api/wms/package'
 
 // 生产退料申请
 defineOptions({ name: 'ProductionreturnRequestMain' })
@@ -90,6 +106,24 @@ const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref(ProductionreturnRequestMain.allSchemas.tableColumns)
 
+//创建标签
+const dialogVisible = ref(false)
+const dialogTitle = ref('创建标签')
+const detailListTableColumns = ProductionreturnRequestDetailLabel.allSchemas
+const isCreateLabel = ref(false)
+const formLabelRef = ref()
+//创建标签
+const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({
+  getListApi: ProductionreturnRequestDetailApi.getProductionreturnRequestDetailPage
+})
+const { getList:getDetailList } = detatableMethods
+
+//创建标签保存
+const saveLabel = () => {
+
+  isCreateLabel.value = true
+}
+
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
   tableColumns.value = val
@@ -132,12 +166,21 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
 const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
   nextTick(() => {
     const setV = {}
-    if(formField == 'packingNumber') {
-      setV['packingNumber'] = val[0]['packingNumber']
-      setV['containerNumber'] = val[0]['containerNumber']
+    if(formField == 'itemCode') {
       setV['batch'] = val[0]['batch']
       setV['itemCode'] = val[0]['itemCode']
       setV['uom'] = val[0]['uom']
+      setV['inventoryStatus'] = val[0]['inventoryStatus']
+      setV['qty'] = val[0]['qty']
+      // 修改 tableform 属性 数量最大值设置为库存余额中数量
+      ProductionreturnRequestDetail.allSchemas.tableFormColumns.map(item => {
+        if(item.field == 'qty') {
+          item.tableForm.max = val[0]['qty']
+        }
+      })
+    } else if(formField == 'workStationCode') {
+      setV['workStationCode'] = val[0]['code']
+      setV['fromLocationCode'] = val[0]['rawLocationCode']
     } else {
       setV[formField] = val[0][searchField]
     }
@@ -192,10 +235,21 @@ const butttondata = (row) => {
       defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:productionreturn-request-main:reAdd'}), // 重新添加
       defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productionreturn-request-main:submit'}), // 提交审批
       defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productionreturn-request-main:refused'}), // 驳回
-      defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productionreturn-request-main:handle'}), // 审批通过
-      defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']), hasPermi:'wms:productionreturn-request-main:update'}), // 处理
+      defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productionreturn-request-main:agree'}), // 审批通过
+      defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']), hasPermi:'wms:productionreturn-request-main:handle'}), // 处理
       defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productionreturn-request-main:update'}), // 编辑
       // defaultButtons.mainListDeleteBtn({hasPermi:'wms:productionreturn-request-main:delete'}), // 删除
+      // 创建标签
+      {
+        label: '创建标签',
+        name: 'cjbq',
+        hide: isShowMainButton(row,['3']),
+        type: 'primary',
+        icon: '',
+        color: '',
+        hasPermi: '',
+        link: true, // 文本展现按钮
+      },
     ]
 }
 
@@ -234,13 +288,79 @@ const buttonTableClick = async (val, row) => {
       console.log(err)
     })
   } else if (val == 'mainApprove') { // 审批通过
+    await message.confirm('确认要审批通过吗？')
     ProductionreturnRequestMainApi.agree(row.id).then(() => {
       message.success(t('common.updateSuccess'))
       getList()
     }).catch(err => {
       console.log(err)
     })
+  } else if (val == 'cjbq') { // 创建标签
+    detatableData.params = {
+      masterId:row.id
+    }
+    await getDetailList()
+    // 判断 是否已创建标签
+    if (detatableData.tableList[0].packingNumber) {
+      message.warning('已创建过标签！！！')
+      return
+    }
+    // 打开创建标签页面
+    // dialogVisible.value = true
+    formLabelRef.value.open('create', row)
+    detatableData.tableList.map((item) => {
+      item.batch = '000000'
+      // 查询物品类型 原料 只能选择 供应商代码 半成品成品其他 只能选择 生产线
+      ItembasicApi.getItembasicPage({
+        pageSize: 10,
+        pageNo: 1,
+        code: item.itemCode,
+        sort: '',
+        by: 'ASC',
+      }).then(res => {
+        if (res.list.length > 0) {
+          // 判断物品类型 是否 原料
+          if (res.list[0].type == "RAW") {
+            // 修改 tableform 属性
+            detailListTableColumns.tableFormColumns.map(item => {
+            if(item.field == 'productionLineCodePackage') {
+              item.tableForm.isInpuFocusShow = false
+              item.tableForm.disabled = true
+              ProductionreturnRequestDetailLabelRules.productionLineCodePackage[0].required = false
+            }
+            if(item.field == 'supplierItemCode') {
+              item.tableForm.isInpuFocusShow = true
+              item.tableForm.disabled = false
+              ProductionreturnRequestDetailLabelRules.supplierItemCode[0].required = true
+            }
+          })
+          } else {
+            // 修改 tableform 属性
+            detailListTableColumns.tableFormColumns.map(item => {
+            if(item.field == 'supplierItemCode') {
+              item.tableForm.isInpuFocusShow = false
+              item.tableForm.disabled = true
+              ProductionreturnRequestDetailLabelRules.supplierItemCode[0].required = false
+            }
+            if(item.field == 'productionLineCodePackage') {
+              item.tableForm.isInpuFocusShow = true
+              item.tableForm.disabled = false
+              ProductionreturnRequestDetailLabelRules.productionLineCodePackage[0].required = true
+            }
+          })
+          }
+        } else {
+          message.warning('没有查询到物品代码：【' + item.itemCode + '】')
+          return
+        }
+      })
+    })
+
   } else if (val == 'mainHandle') { // 处理
+    if (!isCreateLabel.value) {
+      message.warning('请先创建标签')
+      return
+    }
     ProductionreturnRequestMainApi.handle(row.id).then(() => {
       message.success(t('common.updateSuccess'))
       getList()
@@ -335,6 +455,25 @@ const submitForm = async (formType, data) => {
   }
 }
 
+// 创建标签
+const submitFormLabel = async (formType, data) => {
+  try {
+    detatableData.tableList.forEach(async (item) => {
+      await PackageApi.createPackageLabel(item).then(res => {
+        isCreateLabel.value = true
+        message.success('创建标签成功')
+      }).catch(err => {
+        isCreateLabel.value = false
+        console.log(err)
+        message.error('创建标签失败')
+      })
+    })
+  } finally {
+    formLabelRef.value.formLoading = false
+    formLabelRef.value.dialogVisible = false
+  }
+}
+
 // 筛选提交
 const searchFormClick = (searchData) => {
   tableObject.params = {
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
index 77beca909..c533702b6 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
@@ -14,6 +14,12 @@ import { Workstation } from '@/views/wms/basicDataManage/factoryModeling/worksta
 import * as BalanceApi  from '@/api/wms/balance'
 import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
 
+import * as ProductionlineitemApi  from '@/api/wms/productionlineitem'
+import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data'
+
+import * as SupplieritemApi  from '@/api/wms/supplieritem'
+import { Supplieritem } from '@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data'
+
 const { t } = useI18n() // 国际化
 
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
@@ -715,23 +721,29 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
     }
   },
   {
-    label: '从库位代码',
-    field: 'fromLocationCode',
+    label: '单据号',
+    field: 'number',
     sort: 'custom',
     table: {
       width: 150
     },
     isTableForm: false,
-    isForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
   },
   {
-    label: '单据号',
-    field: 'number',
+    label: '包装号',
+    field: 'packingNumber',
     sort: 'custom',
     table: {
       width: 150
     },
-    isTableForm: false,
+    tableForm: {
+      disabled: true
+    },
     form: {
       componentProps: {
         disabled: true
@@ -847,9 +859,9 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
 
 //表单校验
 export const ProductionreturnRequestDetailRules = reactive({
-  packingNumber: [
-    { required: true, message: '请选择包装号', trigger: 'change' }
-  ],
+  // packingNumber: [
+  //   { required: true, message: '请选择包装号', trigger: 'change' }
+  // ],
   batch: [
     { required: true, message: '请输入批次', trigger: 'blur' }
   ],
@@ -862,4 +874,268 @@ export const ProductionreturnRequestDetailRules = reactive({
   itemCode: [
     { required: true, message: '请输入物品代码', trigger: 'blur' }
   ],
-})
\ No newline at end of file
+})
+
+/**
+ * @returns {Array} 生产退料申请子表创建标签
+ */
+export const ProductionreturnRequestDetailLabel = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '生产线代码',
+    field: 'productionLineCodePackage',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+      searchField: 'productionLineCode', // 查询弹窗赋值字段
+      searchTitle: '生产线物品关系信息', // 查询弹窗标题
+      searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
+      searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
+      searchCondition:[{
+        key: 'itemCode',
+        value: 'itemCode',
+        isMainValue: true
+      }]
+    }
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierItemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+      searchField: 'supplierCode', // 查询弹窗赋值字段
+      searchTitle: '供应商信息', // 查询弹窗标题
+      searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
+      searchPage: SupplieritemApi.getSupplieritemPage, // 查询弹窗所需分页方法
+      searchCondition:[{
+        key: 'itemCode',
+        value: 'itemCode',
+        isMainValue: true
+      }]
+    }
+  },
+  {
+    label: '物品代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '来源生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '来源生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '来源工位代码',
+    field: 'workStationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '来源库位代码',
+    field: 'fromLocationCode',
+    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: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    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: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+]))
+
+//表单校验
+export const ProductionreturnRequestDetailLabelRules = reactive({
+  supplierItemCode: [
+    { required: true, message: '请选择供应商', trigger: 'change' }
+  ],
+  productionLineCodePackage: [
+    { required: true, message: '请选择生产线', trigger: 'change' }
+  ]
+})
+