From 8cdebed044953ad6bbb6f8b8cb83db98e8f75177 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Fri, 8 Dec 2023 17:11:23 +0800
Subject: [PATCH 01/13] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=A4=96=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E8=AF=B7=E6=B1=82=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/unplannedreceiptRequestMain/index.ts  | 34 +++++++-
 .../unplannedreceiptJobMain/index.vue         |  6 +-
 .../unplannedreceiptRequestMain/index.vue     | 85 +++++++++++++++++--
 3 files changed, 110 insertions(+), 15 deletions(-)

diff --git a/src/api/wms/unplannedreceiptRequestMain/index.ts b/src/api/wms/unplannedreceiptRequestMain/index.ts
index 5c2982d11..30b024382 100644
--- a/src/api/wms/unplannedreceiptRequestMain/index.ts
+++ b/src/api/wms/unplannedreceiptRequestMain/index.ts
@@ -62,9 +62,37 @@ export const exportUnplannedreceiptRequestMain = async (params) => {
   }
 }
 
-
-
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/unplannedreceipt-request-main/get-import-template' })
-}
\ No newline at end of file
+}
+
+// 关闭-计划外入库申请
+export const closeUnplannedreceiptRequestMain = async (id) => {
+  return await request.put({ url: `/wms/unplannedreceipt-request-main/close?id=` + id })
+}
+
+// 重新添加-计划外入库申请
+export const reAddUnplannedreceiptRequestMain = async (id) => {
+  return await request.put({ url: `/wms/unplannedreceipt-request-main/reAdd?id=` + id })
+}
+
+// 提交审批-计划外入库申请
+export const submitUnplannedreceiptRequestMain = async (id) => {
+  return await request.put({ url: `/wms/unplannedreceipt-request-main/submit?id=` + id })
+}
+
+// 审批驳回-计划外入库申请
+export const refusedUnplannedreceiptRequestMain = async (id) => {
+  return await request.put({ url: `/wms/unplannedreceipt-request-main/refused?id=` + id })
+}
+
+// 审批通过-计划外入库申请
+export const agreeUnplannedreceiptRequestMain = async (id) => {
+  return await request.put({ url: `/wms/unplannedreceipt-request-main/agree?id=` + id })
+}
+
+// 处理-计划外入库申请
+export const handleUnplannedreceiptRequestMain = async (id) => {
+  return await request.put({ url: `/wms/unplannedreceipt-request-main/handle?id=` + id })
+}
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue
index 5af25be42..d6ff45ff7 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue
@@ -174,9 +174,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'])}), // 关闭
+    // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
     // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
   ]
 }
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
index f92b205b4..a470839db 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
@@ -198,30 +198,37 @@ 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:unplannedreceipt-request-main:update'}), // 编辑
-        defaultButtons.mainListDeleteBtn({hasPermi:'wms:unplannedreceipt-request-main:delete'}), // 删除
+        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:unplannedreceipt-request-main:close'}), // 关闭
+        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:unplannedreceipt-request-main:reAdd'}), // 重新添加
+        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:unplannedreceipt-request-main:submit'}), // 提交审批
+        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:unplannedreceipt-request-main:refused'}), // 驳回
+        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:unplannedreceipt-request-main:agree'}), // 审批通过
+        defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:unplannedreceipt-request-main:handle'}), // 处理
+        defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:unplannedreceipt-request-main:update'}), // 编辑
+        // defaultButtons.mainListDeleteBtn({hasPermi:'wms:unplannedreceipt-request-main:delete'}), // 删除
     ]
 }
 
-
-
 // 列表-操作按钮事件
 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') { // 处理
+    console.log('列表-操作按钮事件-处理')
+    handleHandle(row.id)
   } else if (val == 'edit') { // 编辑
     openForm('update', row)
   } else if (val == 'delete') { // 删除
@@ -229,6 +236,66 @@ const buttonTableClick = async (val, row) => {
   }
 }
 
+/** 关闭按钮操作 */
+const handleClose = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmColse'))
+    await UnplannedreceiptRequestMainApi.closeUnplannedreceiptRequestMain(id)
+    message.success(t('common.closeSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 重新添加按钮操作 */
+const handleReAdd = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmReAdd'))
+    await UnplannedreceiptRequestMainApi.reAddUnplannedreceiptRequestMain(id)
+    message.success(t('common.reAddSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 提交按钮操作 */
+const handleSubmit = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmSubmit'))
+    await UnplannedreceiptRequestMainApi.submitUnplannedreceiptRequestMain(id)
+    message.success(t('common.submitSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 审批驳回按钮操作 */
+const handleRefused = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmRefused'))
+    await UnplannedreceiptRequestMainApi.refusedUnplannedreceiptRequestMain(id)
+    message.success(t('common.refusedSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 审批通过按钮操作 */
+const handleAgree = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmAgree'))
+    await UnplannedreceiptRequestMainApi.agreeUnplannedreceiptRequestMain(id)
+    message.success(t('common.agreeSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 处理按钮操作 */
+const handleHandle = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmHandle'))
+    await UnplannedreceiptRequestMainApi.handleUnplannedreceiptRequestMain(id)
+    message.success(t('common.handleSuccess'))
+    await getList()
+  } catch {}
+}
+
 /** 添加/修改操作 */
 const formRef = ref()
 const openForm =async (type: string, row?: number) => {

From 548f1f4289c2a2d472030f479a5416e6f741e662 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 8 Dec 2023 17:20:10 +0800
Subject: [PATCH 02/13] =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E7=AD=96=E7=95=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ImportForm/src/ImportForm.vue  |   3 +-
 .../strategy/upShelfStrategy/AddForm.vue      | 702 +++++++++++++-----
 2 files changed, 516 insertions(+), 189 deletions(-)

diff --git a/src/components/ImportForm/src/ImportForm.vue b/src/components/ImportForm/src/ImportForm.vue
index d911a51be..0f90df135 100644
--- a/src/components/ImportForm/src/ImportForm.vue
+++ b/src/components/ImportForm/src/ImportForm.vue
@@ -1,6 +1,6 @@
 <!-- 导入组件 -->
 <template>
-  <Dialog v-model="dialogVisible" title="导入" width="600">
+  <Dialog v-model="dialogVisible" title="导入" width="600" :close-on-click-modal="false">
     <el-upload
       ref="uploadRef"
       v-model:file-list="fileList"
@@ -25,6 +25,7 @@
       :accept="accept"
       drag
       style="width: 300px; margin: 0 auto"
+      v-loading="formLoading"
     >
       <Icon icon="ep:upload-filled" color="#c0c4cc" size="60" />
       <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
index 6c51d21ef..bd2b34118 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
@@ -1,135 +1,287 @@
 <!-- 上架策略弹窗 -->
 <template>
-      <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px;">
-        <div class="p-20px m--10px" style="max-height: 50vh;overflow-y: auto;">
-      <el-form ref="formRef" :model="formData" :rules="rules" label-width="120px" label-position="left">
+  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px">
+    <div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto">
+      <el-form
+        ref="formRef"
+        :model="formData"
+        :rules="rules"
+        label-width="120px"
+        label-position="left"
+      >
         <!-- 规则 -->
-          <div class="item">
-            <div class="title">规则</div>
-            <el-row>
-              <el-col :span="24">
-                <el-form-item label="代码" prop="strategyCode">
-                  <el-input v-model="formData.strategyCode" placeholder="请输入代码" clearable disabled />
-                </el-form-item>
-              </el-col>
-              <el-col :span="24">
-                <el-form-item label="名称" prop="name">
-                  <el-input v-model="formData.name" placeholder="请输入名称" clearable />
-                </el-form-item>
-              </el-col>
-              <el-col :span="24">
-                <el-form-item label="描述" prop="description">
-                  <el-input v-model="formData.description" placeholder="请输入描述" clearable />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="优先级" prop="priority">
-                  <el-input-number v-model="formData.priority" :min="0" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="状态" prop="status">
-                  <el-switch v-model="formData.status" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </div>
+        <div class="item">
+          <div class="title">规则</div>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="代码" prop="strategyCode">
+                <el-input
+                  v-model="formData.strategyCode"
+                  placeholder="请输入代码"
+                  clearable
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="名称" prop="name">
+                <el-input v-model="formData.name" placeholder="请输入名称" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="描述" prop="description">
+                <el-input v-model="formData.description" placeholder="请输入描述" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="优先级" prop="priority">
+                <el-input-number v-model="formData.priority" :min="0" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="状态" prop="status">
+                <el-switch v-model="formData.status" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
 
         <!-- 规则条件 -->
 
         <div class="item mt-20px">
-
           <div class="title">规则条件</div>
           <el-row>
             <el-col :span="24" v-for="(item, index) in formData.condition" :key="index">
               <!-- 选择供应商和客户 -->
               <el-form-item label="" label-width="0" class="err-240" v-if="index == 0">
-                <el-select v-model="item.ParamCode" placeholder="" style="width: 110px;margin-right: 10px;"
-                  @change="changeSupplierCustomer">
-                  <el-option :label="cur.label" :value="cur.value" v-for="(cur, index) in options.typeOptions"
-                    :key="index" />
+                <el-select
+                  v-model="item.ParamCode"
+                  placeholder=""
+                  style="width: 110px; margin-right: 10px"
+                  @change="changeSupplierCustomer"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="(cur, index) in options.typeOptions"
+                    :key="index"
+                  />
                 </el-select>
-                <el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;">
-                  <el-option :label="cur.label" :value="cur.value" v-for="cur in options.rangeOptions1"
-                    :key="cur.value" />
+                <el-select
+                  v-model="item.Operator"
+                  placeholder="请选择范围"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.rangeOptions1"
+                    :key="cur.value"
+                  />
                 </el-select>
-                <el-select v-model="item.Value" :placeholder="`请选择${item.ParamCode == 'SupplierCode' ? '供应商' : '客户'}`"
-                  style="flex: 1;" clearable>
-                  <el-option v-for="cur in options.supplierList" :key="cur.id" :label="cur.name" :value="cur.id" />
+                <el-select
+                  v-model="item.Value"
+                  :placeholder="`请选择${item.ParamCode == 'SupplierCode' ? '供应商' : '客户'}`"
+                  style="flex: 1"
+                  clearable
+                >
+                  <el-option
+                    v-for="cur in options.supplierList"
+                    :key="cur.id"
+                    :label="cur.name"
+                    :value="cur.id"
+                  />
                 </el-select>
               </el-form-item>
               <!-- 选择物品类型 -->
               <el-form-item label="" label-width="0" class="err-240" v-if="index == 1">
-                <el-select v-model="item.ParamCode" placeholder="" @change="changeItemsType"
-                  style="width: 110px;margin-right: 10px;">
-                  <el-option :label="item.label" :value="item.value" v-for="item in options.itemTypeOptions"
-                    :key="item.value" />
+                <el-select
+                  v-model="item.ParamCode"
+                  placeholder=""
+                  @change="changeItemsType"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="item.label"
+                    :value="item.value"
+                    v-for="item in options.itemTypeOptions"
+                    :key="item.value"
+                  />
                 </el-select>
-                <el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;">
-                  <el-option :label="cur.label" :value="cur.value" v-for="cur in options.rangeOptions1"
-                    :key="cur.value" />
+                <el-select
+                  v-model="item.Operator"
+                  placeholder="请选择范围"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.rangeOptions1"
+                    :key="cur.value"
+                  />
                 </el-select>
-                <el-select v-model="item.Value" placeholder="请选择物品类型" style="flex: 1;" clearable
-                  v-if="item.ParamCode == 'ItemType'">
-                  <el-option v-for="cur in getStrDictOptions(DICT_TYPE.ITEM_TYPE)" :key="cur.value" :label="cur.label"
-                    :value="cur.value" />
+                <el-select
+                  v-model="item.Value"
+                  placeholder="请选择物品类型"
+                  style="flex: 1"
+                  clearable
+                  v-if="item.ParamCode == 'ItemType'"
+                >
+                  <el-option
+                    v-for="cur in getStrDictOptions(DICT_TYPE.ITEM_TYPE)"
+                    :key="cur.value"
+                    :label="cur.label"
+                    :value="cur.value"
+                  />
                 </el-select>
-                <el-select v-model="item.Value" placeholder="请选择ABC类" style="flex: 1;" clearable
-                  v-else-if="item.ParamCode == 'AbcClass'">
-                  <el-option v-for="cur in getStrDictOptions(DICT_TYPE.ABC_CLASS)" :key="cur.value" :label="cur.label"
-                    :value="cur.value" />
+                <el-select
+                  v-model="item.Value"
+                  placeholder="请选择ABC类"
+                  style="flex: 1"
+                  clearable
+                  v-else-if="item.ParamCode == 'AbcClass'"
+                >
+                  <el-option
+                    v-for="cur in getStrDictOptions(DICT_TYPE.ABC_CLASS)"
+                    :key="cur.value"
+                    :label="cur.label"
+                    :value="cur.value"
+                  />
                 </el-select>
-                <el-input v-model="item.Value" placeholder="请输入物品分组" clearable style="flex: 1;"
-                  v-else-if="item.ParamCode == 'ItemGroup'" />
-                <el-input v-model="item.Value" placeholder="请输入项目" clearable style="flex: 1;"
-                  v-else-if="item.ParamCode == 'Project'" />
-                <el-input v-model="item.Value" placeholder="请输入物品" clearable style="flex: 1;"
-                  v-else-if="item.ParamCode == 'ItemCode'" />
+                <el-input
+                  v-model="item.Value"
+                  placeholder="请输入物品分组"
+                  clearable
+                  style="flex: 1"
+                  v-else-if="item.ParamCode == 'ItemGroup'"
+                />
+                <el-input
+                  v-model="item.Value"
+                  placeholder="请输入项目"
+                  clearable
+                  style="flex: 1"
+                  v-else-if="item.ParamCode == 'Project'"
+                />
+                <el-input
+                  v-model="item.Value"
+                  placeholder="请输入物品"
+                  clearable
+                  style="flex: 1"
+                  v-else-if="item.ParamCode == 'ItemCode'"
+                />
               </el-form-item>
               <!-- 选择重量体积还是面积 -->
               <el-form-item label="" label-width="0" class="err-240" v-if="index == 2">
-                <el-select v-model="item.ParamCode" placeholder="" @change="changeCalculation"
-                  style="width: 110px;margin-right: 10px;">
-                  <el-option :label="cur.label" :value="cur.value" v-for="cur in options.calculationTypeOptions"
-                    :key="cur.value" />
+                <el-select
+                  v-model="item.ParamCode"
+                  placeholder=""
+                  @change="changeCalculation"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.calculationTypeOptions"
+                    :key="cur.value"
+                  />
                 </el-select>
-                <el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;">
-                  <el-option :label="cur.label" :value="cur.value" v-for="cur in options.rangeOptions2"
-                    :key="cur.value" />
+                <el-select
+                  v-model="item.Operator"
+                  placeholder="请选择范围"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.rangeOptions2"
+                    :key="cur.value"
+                  />
                 </el-select>
-                <el-input v-model="item.Value"
-                  :placeholder="`请输入${item.ParamCode == 'Weight' ? '重量' : item.ParamCode == 'Area' ? '面积' : '体积'}`"
-                  clearable style="flex: 1;" />
+                <el-input
+                  v-model="item.Value"
+                  :placeholder="`请输入${
+                    item.ParamCode == 'Weight' ? '重量' : item.ParamCode == 'Area' ? '面积' : '体积'
+                  }`"
+                  clearable
+                  style="flex: 1"
+                />
               </el-form-item>
               <!-- 库存状态 -->
               <el-form-item label="库存状态" class="err-120" v-if="index == 3">
-                <el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;">
-                  <el-option :label="cur.label" :value="cur.value" v-for="cur in options.rangeOptions1"
-                    :key="cur.value" />
+                <el-select
+                  v-model="item.Operator"
+                  placeholder="请选择范围"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.rangeOptions1"
+                    :key="cur.value"
+                  />
                 </el-select>
-                <el-select v-model="item.Value" placeholder="请选择库存状态" style="flex: 1;" clearable>
-                  <el-option v-for="cur in getStrDictOptions(DICT_TYPE.INVENTORY_STATUS)" :key="cur.value"
-                    :label="cur.label" :value="cur.value" />
+                <el-select
+                  v-model="item.Value"
+                  placeholder="请选择库存状态"
+                  style="flex: 1"
+                  clearable
+                >
+                  <el-option
+                    v-for="cur in getStrDictOptions(DICT_TYPE.INVENTORY_STATUS)"
+                    :key="cur.value"
+                    :label="cur.label"
+                    :value="cur.value"
+                  />
                 </el-select>
               </el-form-item>
               <!-- 存储类型 -->
               <el-form-item label="存储类型" class="err-120" v-if="index == 4">
-                <el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;">
-                  <el-option :label="cur.label" :value="cur.value" v-for="cur in options.rangeOptions1"
-                    :key="cur.value" />
+                <el-select
+                  v-model="item.Operator"
+                  placeholder="请选择范围"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.rangeOptions1"
+                    :key="cur.value"
+                  />
                 </el-select>
-                <el-select v-model="item.Value" placeholder="请选择存储类型" style="flex: 1;" clearable>
-                  <el-option v-for="cur in getStrDictOptions(DICT_TYPE.STORAGE_TYPE)" :key="cur.value" :label="cur.label"
-                    :value="cur.value" />
+                <el-select
+                  v-model="item.Value"
+                  placeholder="请选择存储类型"
+                  style="flex: 1"
+                  clearable
+                >
+                  <el-option
+                    v-for="cur in getStrDictOptions(DICT_TYPE.STORAGE_TYPE)"
+                    :key="cur.value"
+                    :label="cur.label"
+                    :value="cur.value"
+                  />
                 </el-select>
               </el-form-item>
               <!-- 库存事务 -->
               <el-form-item label="库存事务" class="err-120" v-if="index == 5">
-                <el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;margin-right: 10px;">
-                  <el-option :label="cur.label" :value="cur.value" v-for="cur in options.rangeOptions1"
-                    :key="cur.value" />
+                <el-select
+                  v-model="item.Operator"
+                  placeholder="请选择范围"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.rangeOptions1"
+                    :key="cur.value"
+                  />
                 </el-select>
-                <el-input v-model="item.Value" placeholder="请输入库存事务" clearable style="flex: 1;" />
+                <el-input
+                  v-model="item.Value"
+                  placeholder="请输入库存事务"
+                  clearable
+                  style="flex: 1"
+                />
               </el-form-item>
             </el-col>
           </el-row>
@@ -142,54 +294,186 @@
             <!-- 仓库 库区  库位组 库位 -->
             <el-col :span="24">
               <el-form-item label="" label-width="0" prop="warehouse" class="err-120">
-                <el-select v-model="warehouseType" placeholder="" style="width: 110px;margin-right: 10px;"
-                  @change="changeWarehouse">
-                  <el-option :label="cur.label" :value="cur.value" v-for="(cur, index) in options.warehouseTypeOptions"
-                    :key="index" />
+                <el-select
+                  v-model="warehouseType"
+                  placeholder=""
+                  style="width: 110px; margin-right: 10px"
+                  @change="changeWarehouse"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="(cur, index) in options.warehouseTypeOptions"
+                    :key="index"
+                  />
                 </el-select>
-                <el-select v-model="formData.configuration.WarehouseCode" v-if="warehouseType == 'WarehouseCode'" placeholder="请选择仓库"  clearable style="flex: 1;">
-                  <el-option v-for="cur in options.warehouseList" :key="cur.code" :label="cur.name" :value="cur.code" />
+                <el-select
+                  v-model="formData.configuration.WarehouseCode"
+                  v-if="warehouseType == 'WarehouseCode'"
+                  placeholder="请选择仓库"
+                  clearable
+                  style="flex: 1"
+                >
+                  <el-option
+                    v-for="cur in options.warehouseList"
+                    :key="cur.code"
+                    :label="cur.name"
+                    :value="cur.code"
+                  />
                 </el-select>
-                <el-select v-model="formData.configuration.AreaCode" v-if="warehouseType == 'AreaCode'" placeholder="请选择库区"  clearable style="flex: 1;">
-                  <el-option v-for="cur in options.warehouseList" :key="cur.code" :label="cur.name" :value="cur.code" />
+                <el-select
+                  v-model="formData.configuration.AreaCode"
+                  v-if="warehouseType == 'AreaCode'"
+                  placeholder="请选择库区"
+                  clearable
+                  style="flex: 1"
+                >
+                  <el-option
+                    v-for="cur in options.warehouseList"
+                    :key="cur.code"
+                    :label="cur.name"
+                    :value="cur.code"
+                  />
                 </el-select>
-                <el-select v-model="formData.configuration.LocationGroupCode" v-if="warehouseType == 'LocationGroupCode'" placeholder="请选择库位组"  clearable style="flex: 1;">
-                  <el-option v-for="cur in options.warehouseList" :key="cur.code" :label="cur.name" :value="cur.code" />
+                <el-select
+                  v-model="formData.configuration.LocationGroupCode"
+                  v-if="warehouseType == 'LocationGroupCode'"
+                  placeholder="请选择库位组"
+                  clearable
+                  style="flex: 1"
+                >
+                  <el-option
+                    v-for="cur in options.warehouseList"
+                    :key="cur.code"
+                    :label="cur.name"
+                    :value="cur.code"
+                  />
                 </el-select>
 
-                <el-select v-model="formData.configuration.LocationCode" v-if="warehouseType == 'LocationCode'" placeholder="请选择库位"  clearable style="flex: 1;">
-                  <el-option v-for="cur in options.warehouseList" :key="cur.code" :label="cur.name" :value="cur.code" />
+                <el-select
+                  v-model="formData.configuration.LocationCode"
+                  v-if="warehouseType == 'LocationCode'"
+                  placeholder="请选择库位"
+                  clearable
+                  style="flex: 1"
+                >
+                  <el-option
+                    v-for="cur in options.warehouseList"
+                    :key="cur.code"
+                    :label="cur.name"
+                    :value="cur.code"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
-              <!-- 优先空位库 -->
+            <!-- 优先空位库 -->
             <el-col :span="24">
               <el-form-item label="优先空位库">
-                <el-switch v-model="formData.configuration.EmptyLocationFirst" active-value="TRUE" inactive-value="FALSE"/>
+                <el-switch
+                  v-model="formData.configuration.EmptyLocationFirst"
+                  active-value="TRUE"
+                  inactive-value="FALSE"
+                />
               </el-form-item>
             </el-col>
-              <!-- 优先非空位库 -->
+            <!-- 优先非空位库 -->
             <el-col :span="24">
               <el-form-item label="优先非空位库">
-                <el-switch v-model="formData.configuration.NotEmptyLocationFirst" active-value="TRUE" inactive-value="FALSE"/>
+                <el-switch
+                  v-model="formData.configuration.NotEmptyLocationFirst"
+                  active-value="TRUE"
+                  inactive-value="FALSE"
+                />
               </el-form-item>
             </el-col>
-              <!-- 可以混物品 -->
+            <!-- 可以混物品 -->
             <el-col :span="24">
               <el-form-item label="可以混物品">
-                <el-switch v-model="formData.configuration.EnableMixItem" active-value="TRUE" inactive-value="FALSE"/>
+                <el-switch
+                  v-model="formData.configuration.EnableMixItem"
+                  active-value="TRUE"
+                  inactive-value="FALSE"
+                />
               </el-form-item>
             </el-col>
-              <!-- 可以混批次 -->
+            <!-- 可以混批次 -->
             <el-col :span="24">
               <el-form-item label="可以混批次">
-                <el-switch v-model="formData.configuration.EnableMixLot" active-value="TRUE" inactive-value="FALSE"/>
+                <el-switch
+                  v-model="formData.configuration.EnableMixLot"
+                  active-value="TRUE"
+                  inactive-value="FALSE"
+                />
               </el-form-item>
             </el-col>
-              <!-- 可以混状态 -->
+            <!-- 可以混状态 -->
             <el-col :span="24">
               <el-form-item label="可以混状态">
-                <el-switch v-model="formData.configuration.EnableMixStatus" active-value="TRUE" inactive-value="FALSE"/>
+                <el-switch
+                  v-model="formData.configuration.EnableMixStatus"
+                  active-value="TRUE"
+                  inactive-value="FALSE"
+                />
+              </el-form-item>
+            </el-col>
+            <!-- 巷道排序方向 -->
+            <el-col :span="24">
+              <el-form-item label="巷道排序方向" class="flex-top">
+                <div class="checkbox">
+                  <el-radio-group v-model="formData.configuration.AisleOrder">
+                    <el-radio
+                      :label="cur.value"
+                      v-for="cur in getStrDictOptions(DICT_TYPE.BATCH_DIRECTION)"
+                      :key="cur.value"
+                      >{{ cur.label }}</el-radio
+                    >
+                  </el-radio-group>
+                </div>
+              </el-form-item>
+            </el-col>
+            <!-- 货架排序方向 -->
+            <el-col :span="24">
+              <el-form-item label="货架排序方向" class="flex-top">
+                <div class="checkbox">
+                  <el-radio-group v-model="formData.configuration.ShelfOrder">
+                    <el-radio
+                      :label="cur.value"
+                      v-for="cur in getStrDictOptions(DICT_TYPE.BATCH_DIRECTION)"
+                      :key="cur.value"
+                      >{{ cur.label }}</el-radio
+                    >
+                  </el-radio-group>
+                </div>
+              </el-form-item>
+            </el-col>
+            <!-- 货架排序方向 -->
+            <el-col :span="24">
+              <el-form-item label="货架排序方向" class="flex-top">
+                <div class="checkbox">
+                  <el-radio-group v-model="formData.configuration.RowOrder">
+                    <el-radio
+                      :label="cur.value"
+                      v-for="cur in getStrDictOptions(DICT_TYPE.BATCH_DIRECTION)"
+                      :key="cur.value"
+                      >{{ cur.label }}</el-radio
+                    >
+                  </el-radio-group>
+                </div>
+              </el-form-item>
+            </el-col>
+            <!-- 列排序方向 -->
+            <el-col :span="24">
+              <el-form-item label="列排序方向" class="flex-top">
+                <div class="checkbox">
+                  <el-radio-group v-model="formData.configuration.ColumOrder">
+                    <el-radio
+                      :label="cur.value"
+                      v-for="cur in getStrDictOptions(DICT_TYPE.BATCH_DIRECTION)"
+                      :key="cur.value"
+                      >{{ cur.label }}</el-radio
+                    >
+                  </el-radio-group>
+                </div>
               </el-form-item>
             </el-col>
           </el-row>
@@ -224,7 +508,6 @@ const formLoading = ref(false) // 表单的加载中：1）修改时的数据加
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formRef = ref() // 表单 Ref
 
-
 const formStrategyCode = ref('')
 
 // 仓库类型
@@ -233,45 +516,53 @@ const warehouseType = ref('WarehouseCode')
 // form表单数据
 const formData = ref({
   id: '',
-  strategyCode: formStrategyCode.value,//策略代码id
-  name: '',//名称
-  description: '',//描述
-  priority: '',//优先级
-  status: true,//状态
+  strategyCode: formStrategyCode.value, //策略代码id
+  name: '', //名称
+  description: '', //描述
+  priority: '', //优先级
+  status: true, //状态
   //规则条件集合
   condition: [
     // 供应商
-    { ParamCode: 'SupplierCode', Operator: "IN", Value: "" },
+    { ParamCode: 'SupplierCode', Operator: 'IN', Value: '' },
     // 物品类型/物品分组/物品/abc类/项目/
-    { ParamCode: 'ItemType', Operator: "IN", Value: "" },
+    { ParamCode: 'ItemType', Operator: 'IN', Value: '' },
     // 重量/体积/面积
-    { ParamCode: 'Weight', Operator: ">", Value: [] },
+    { ParamCode: 'Weight', Operator: '>', Value: [] },
     // 库存状态
-    { ParamCode: 'InventoryStatus', Operator: "IN", Value: [] },
+    { ParamCode: 'InventoryStatus', Operator: 'IN', Value: [] },
     // 存储类型
-    { ParamCode: 'StorageType', Operator: "IN", Value: [] },
+    { ParamCode: 'StorageType', Operator: 'IN', Value: [] },
     // 库存事务
-    { ParamCode: 'TransactionType', Operator: "IN", Value: [] }
+    { ParamCode: 'TransactionType', Operator: 'IN', Value: [] }
   ],
   configuration: {
     // 仓库代码
-    WarehouseCode:"",
+    WarehouseCode: '',
     // 库区代码
-    AreaCode:"",
+    AreaCode: '',
     // 库位组代码
-    LocationGroupCode:"",
+    LocationGroupCode: '',
     // 库位代码
-    LocationCode:"",
+    LocationCode: '',
     // 优先空库位
-    EmptyLocationFirst:'FALSE',
+    EmptyLocationFirst: 'FALSE',
     // 优先非空库位
-    NotEmptyLocationFirst:'FALSE',
+    NotEmptyLocationFirst: 'FALSE',
     // 可以混物品
-    EnableMixItem:'TRUE',
+    EnableMixItem: 'TRUE',
     // 可以混批次
-    EnableMixLot:'TRUE',
+    EnableMixLot: 'TRUE',
     // 可以混状态
-    EnableMixStatus:'TRUE',
+    EnableMixStatus: 'TRUE',
+    // 巷道排序方向
+    AisleOrder: 'ASC',
+    // 货架排序方向
+    ShelfOrder: 'ASC',
+    // 行排序方向
+    RowOrder: 'ASC',
+    // 列排序方向
+    ColumOrder: 'ASC'
   }
 })
 // 验证规则
@@ -279,8 +570,7 @@ const rules = ref({
   strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' }],
   name: [{ required: true, message: '请输入名字', trigger: 'blur' }],
   description: [{ required: true, message: '请输入描述', trigger: 'blur' }],
-  priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }],
-
+  priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }]
 })
 
 // 所有的范围类型
@@ -294,11 +584,11 @@ const rangeOptions = [
   { value: 'IN', label: '包含' },
   { value: 'NOT IN', label: '不包含' },
   { value: 'NULL', label: '为空' },
-  { value: 'NOT NULL', label: '不为空' },
+  { value: 'NOT NULL', label: '不为空' }
 ]
 const formatRangeOptions = (...rest) => {
   // 交集
-  let result = rangeOptions.filter(aItem => rest.some(bItem => aItem.value === bItem));
+  let result = rangeOptions.filter((aItem) => rest.some((bItem) => aItem.value === bItem))
   return result
 }
 
@@ -308,27 +598,45 @@ const options = reactive({
   rangeOptions1: formatRangeOptions('IN', 'NOT IN'),
   rangeOptions2: formatRangeOptions('>', '<', '>=', '<='),
   // 供应商客户下拉框列表
-  typeOptions: [{ value: 'SupplierCode', label: '供应商' }, { value: 'CustomerCode', label: '客户' }],
+  typeOptions: [
+    { value: 'SupplierCode', label: '供应商' },
+    { value: 'CustomerCode', label: '客户' }
+  ],
   //供应商列表
   supplierList: [],
   // 物品类型列表
-  itemTypeOptions: [{ value: 'ItemType', label: '物品类型' }, { value: 'ItemGroup', label: '物品分组' }, { value: 'ItemCode', label: '物品' }, { value: 'Project', label: '项目' }, { value: 'AbcClass', label: 'ABC类' }],
+  itemTypeOptions: [
+    { value: 'ItemType', label: '物品类型' },
+    { value: 'ItemGroup', label: '物品分组' },
+    { value: 'ItemCode', label: '物品' },
+    { value: 'Project', label: '项目' },
+    { value: 'AbcClass', label: 'ABC类' }
+  ],
 
   // 重量体积面积类型列表
-  calculationTypeOptions: [{ value: 'Weight', label: '重量' }, { value: 'Volume', label: '体积' }, { value: 'Area', label: '面积' }],
+  calculationTypeOptions: [
+    { value: 'Weight', label: '重量' },
+    { value: 'Volume', label: '体积' },
+    { value: 'Area', label: '面积' }
+  ],
 
-  warehouseTypeOptions: [{ value: 'WarehouseCode', label: '仓库' }, { value: 'AreaCode', label: '库区' }, { value: 'LocationGroupCode', label: '库位组' }, { value: 'LocationCode', label: '库位' }],
+  warehouseTypeOptions: [
+    { value: 'WarehouseCode', label: '仓库' },
+    { value: 'AreaCode', label: '库区' },
+    { value: 'LocationGroupCode', label: '库位组' },
+    { value: 'LocationCode', label: '库位' }
+  ],
   //仓库列表
-  warehouseList: [],
+  warehouseList: []
 })
 
 // 获取供应商列表
 const getFormSupplierList = async () => {
-  options.supplierList = await getSupplierList();
+  options.supplierList = await getSupplierList()
 }
 // 获取客户列表
 const getFormCustomerList = async () => {
-  options.supplierList = await getCustomerList();
+  options.supplierList = await getCustomerList()
 }
 // 选择客户还是承运商
 const changeSupplierCustomer = (e) => {
@@ -350,27 +658,27 @@ const changeCalculation = () => {
 }
 // 获取仓库列表
 const getFormWarehouseList = async () => {
-  options.warehouseList = await getWarehouseList();
+  options.warehouseList = await getWarehouseList()
 }
 // 获取库区列表
 const getFormAreaList = async () => {
-  options.warehouseList = await getAreaList();
+  options.warehouseList = await getAreaList()
 }
 // 获取库位组列表
 const getFormLocationgrouList = async () => {
-  options.warehouseList = await getLocationgroupList();
+  options.warehouseList = await getLocationgroupList()
 }
 // 获取库位列表
 const getFormLocationList = async () => {
-  options.warehouseList = await getLocationList();
+  options.warehouseList = await getLocationList()
 }
 getFormLocationList()
 // 选择仓库/库位/库位组/库区
 const changeWarehouse = (e) => {
-    formData.value.configuration.WarehouseCode = ''
-    formData.value.configuration.AreaCode = ''
-    formData.value.configuration.LocationGroupCode = ''
-    formData.value.configuration.LocationCode = ''
+  formData.value.configuration.WarehouseCode = ''
+  formData.value.configuration.AreaCode = ''
+  formData.value.configuration.LocationGroupCode = ''
+  formData.value.configuration.LocationCode = ''
   if (e == 'WarehouseCode') {
     getFormWarehouseList()
   } else if (e == 'AreaCode') {
@@ -407,26 +715,37 @@ const open = async (type: string, strategyCode: string, id?: number) => {
         formData.value.configuration = JSON.parse(data.configuration)
       }
       // 判断是获取客户列表还是供应上列表
-      if(formData.value.condition[0].ParamCode == 'SupplierCode'){
+      if (formData.value.condition[0].ParamCode == 'SupplierCode') {
         getFormSupplierList()
-      }else{
+      } else {
         getFormCustomerList()
       }
       // 判断是获取仓库/库位/库位组/库区列表
-      if ('WarehouseCode' in formData.value.configuration && formData.value.configuration.WarehouseCode) {
+      if (
+        'WarehouseCode' in formData.value.configuration &&
+        formData.value.configuration.WarehouseCode
+      ) {
         warehouseType.value = 'WarehouseCode'
         getFormWarehouseList()
-      } else if ('AreaCode' in formData.value.configuration && formData.value.configuration.AreaCode) {
+      } else if (
+        'AreaCode' in formData.value.configuration &&
+        formData.value.configuration.AreaCode
+      ) {
         warehouseType.value = 'AreaCode'
         getFormAreaList()
-      } else if ('LocationGroupCode' in formData.value.configuration && formData.value.configuration.LocationGroupCode) {
+      } else if (
+        'LocationGroupCode' in formData.value.configuration &&
+        formData.value.configuration.LocationGroupCode
+      ) {
         warehouseType.value = 'LocationGroupCode'
         getFormLocationgrouList()
-      } else if ('LocationCode' in formData.value.configuration && formData.value.configuration.LocationCode) {
+      } else if (
+        'LocationCode' in formData.value.configuration &&
+        formData.value.configuration.LocationCode
+      ) {
         warehouseType.value = 'LocationCode'
         getFormLocationList()
       }
-
     } finally {
       formLoading.value = false
     }
@@ -446,11 +765,11 @@ const submitForm = async () => {
   try {
     let data = {
       id: formData.value.id,
-      strategyCode: formData.value.strategyCode,//策略代码
-      name: formData.value.name,//名称
-      description: formData.value.description,//描述
-      priority: formData.value.priority,//优先级
-      status: formData.value.status ? 0 : 1,//状态
+      strategyCode: formData.value.strategyCode, //策略代码
+      name: formData.value.name, //名称
+      description: formData.value.description, //描述
+      priority: formData.value.priority, //优先级
+      status: formData.value.status ? 0 : 1, //状态
       //规则条件集合
       condition: JSON.stringify(formData.value.condition),
       configuration: JSON.stringify(formData.value.configuration)
@@ -474,45 +793,53 @@ const submitForm = async () => {
 const resetForm = () => {
   formData.value = {
     id: '',
-    strategyCode: formStrategyCode.value,//策略代码id
-    name: '',//名称
-    description: '',//描述
-    priority: '',//优先级
-    status: true,//状态
+    strategyCode: formStrategyCode.value, //策略代码id
+    name: '', //名称
+    description: '', //描述
+    priority: '', //优先级
+    status: true, //状态
     //规则条件集合
     condition: [
       // 供应商
-      { ParamCode: 'SupplierCode', Operator: "IN", Value: "" },
+      { ParamCode: 'SupplierCode', Operator: 'IN', Value: '' },
       // 物品类型/物品分组/物品/abc类/项目/
-      { ParamCode: 'ItemType', Operator: "IN", Value: "" },
+      { ParamCode: 'ItemType', Operator: 'IN', Value: '' },
       // /重量/体积/面积
-      { ParamCode: 'Weight', Operator: ">", Value: [] },
+      { ParamCode: 'Weight', Operator: '>', Value: [] },
       // 库存状态
-      { ParamCode: 'InventoryStatus', Operator: "IN", Value: [] },
+      { ParamCode: 'InventoryStatus', Operator: 'IN', Value: [] },
       // 存储类型
-      { ParamCode: 'StorageType', Operator: "IN", Value: [] },
+      { ParamCode: 'StorageType', Operator: 'IN', Value: [] },
       // 库存事务
-      { ParamCode: 'TransactionType', Operator: "IN", Value: [] }
+      { ParamCode: 'TransactionType', Operator: 'IN', Value: [] }
     ],
     configuration: {
       // 仓库代码
-      WarehouseCode:"",
+      WarehouseCode: '',
       // 库区代码
-      AreaCode:"",
+      AreaCode: '',
       // 库位组代码
-      LocationGroupCode:"",
+      LocationGroupCode: '',
       // 库位代码
-      LocationCode:"",
+      LocationCode: '',
       // 优先空库位
-      EmptyLocationFirst:'FALSE',
+      EmptyLocationFirst: 'FALSE',
       // 优先非空库位
-      NotEmptyLocationFirst:'FALSE',
+      NotEmptyLocationFirst: 'FALSE',
       // 可以混物品
-      EnableMixItem:'TRUE',
+      EnableMixItem: 'TRUE',
       // 可以混批次
-      EnableMixLot:'TRUE',
+      EnableMixLot: 'TRUE',
       // 可以混状态
-      EnableMixStatus:'TRUE',
+      EnableMixStatus: 'TRUE',
+      // 巷道排序方向
+      AisleOrder: 'ASC',
+      // 货架排序方向
+      ShelfOrder: 'ASC',
+      // 行排序方向
+      RowOrder: 'ASC',
+      // 列排序方向
+      ColumOrder: 'ASC'
     }
   }
 }
@@ -520,9 +847,9 @@ const resetForm = () => {
 // 弹窗按钮
 const Butttondata = [
   defaultButtons.formSaveBtn(null), // 保存
-  defaultButtons.formCloseBtn(null), // 关闭
+  defaultButtons.formCloseBtn(null) // 关闭
 ]
-// 按钮事件 
+// 按钮事件
 const buttonBaseClick = (val, item) => {
   // 保存
   if (val == 'save') {
@@ -533,7 +860,6 @@ const buttonBaseClick = (val, item) => {
     dialogVisible.value = false
   }
 }
-
 </script>
 <style scoped lang="scss">
 .item {

From 83192f23857fea99e76225abb65ebca260345f2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Mon, 11 Dec 2023 07:50:53 +0800
Subject: [PATCH 03/13] =?UTF-8?q?=E8=AF=A6=E6=83=85=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E6=89=A9=E5=B1=95=E6=93=8D=E4=BD=9C=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Detail/src/Detail.vue | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue
index ce5ca2ba3..6513ba26d 100644
--- a/src/components/Detail/src/Detail.vue
+++ b/src/components/Detail/src/Detail.vue
@@ -230,6 +230,14 @@ const props = defineProps({
     type: Array,
     required: false,
     default: null
+  },
+  // 详情列表扩展操作按钮
+  buttondataTable: {
+    type: Array,
+    required: false,
+    default: ()=>{
+      return []
+    }
   }
 })
 const isShowDrawer = ref(false)
@@ -364,13 +372,14 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName:
       }
 
       // 动态显示操作列按钮
-      buttondata.value = [
+      buttondata.value = [...[
         defaultButtons.mainListEditBtn({
           hide: isShowMainButton(row, ['1'])
         }), // 编辑
         defaultButtons.mainListDeleteBtn({
           hide: isShowMainButton(row, ['1'])
-        }) // 删除
+        })], // 删除
+        ...props.buttondataTable
       ]
     } finally {
       detailLoading.value = false
@@ -459,6 +468,8 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'delete') {
     // 删除
     handleDelete(row.id)
+  } else {
+    emit('tableFormButton',val, row)
   }
 }
 /** 添加/修改操作 */
@@ -497,7 +508,8 @@ const emit = defineEmits([
   'searchTableSuccessDetail',
   'changeTabs',
   'selectChangeDetail',
-  'detailOpenForm'
+  'detailOpenForm',
+  'tableFormButton'
 ])
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {

From 96523854f9a016447be47ecedb33d364103e2af4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Mon, 11 Dec 2023 07:52:10 +0800
Subject: [PATCH 04/13] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=80=80=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionreturnRequestMain.data.ts       | 104 +++----
 .../productionreturnRequestMainNo/index.vue   |  18 +-
 .../productionreturnRequestMainNo.data.ts     | 272 ++++++++++++++++++
 3 files changed, 334 insertions(+), 60 deletions(-)

diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
index a969e17bd..81ccad349 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
@@ -939,14 +939,14 @@ export const ProductionreturnRequestDetailLabel = useCrudSchemas(reactive<CrudSc
     }
   },
   {
-    label: '来源生产线代码',
-    field: 'productionLineCode',
+    label: '批次',
+    field: 'batch',
     sort: 'custom',
     table: {
       width: 150
     },
     tableForm: {
-      disabled: true
+      disabled: true,
     },
     form: {
       componentProps: {
@@ -955,8 +955,8 @@ export const ProductionreturnRequestDetailLabel = useCrudSchemas(reactive<CrudSc
     }
   },
   {
-    label: '来源生产线代码',
-    field: 'productionLineCode',
+    label: '数量',
+    field: 'qty',
     sort: 'custom',
     table: {
       width: 150
@@ -971,8 +971,11 @@ export const ProductionreturnRequestDetailLabel = useCrudSchemas(reactive<CrudSc
     }
   },
   {
-    label: '来源工位代码',
-    field: 'workStationCode',
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
@@ -987,13 +990,17 @@ export const ProductionreturnRequestDetailLabel = useCrudSchemas(reactive<CrudSc
     }
   },
   {
-    label: '来源库位代码',
-    field: 'fromLocationCode',
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
     tableForm: {
+      type: 'Select',
       disabled: true
     },
     form: {
@@ -1003,18 +1010,24 @@ export const ProductionreturnRequestDetailLabel = useCrudSchemas(reactive<CrudSc
     }
   },
   {
-    label: '物品名称',
-    field: 'itemName',
+    label: '来源生产线代码',
+    field: 'productionLineCode',
     sort: 'custom',
     table: {
       width: 150
     },
-    isTableForm: false,
-    isForm: false,
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
   },
   {
-    label: '数量',
-    field: 'qty',
+    label: '来源生产线代码',
+    field: 'productionLineCode',
     sort: 'custom',
     table: {
       width: 150
@@ -1029,11 +1042,8 @@ export const ProductionreturnRequestDetailLabel = useCrudSchemas(reactive<CrudSc
     }
   },
   {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
+    label: '来源工位代码',
+    field: 'workStationCode',
     sort: 'custom',
     table: {
       width: 150
@@ -1048,18 +1058,24 @@ export const ProductionreturnRequestDetailLabel = useCrudSchemas(reactive<CrudSc
     }
   },
   {
-    label: '物品描述1',
-    field: 'itemDesc1',
+    label: '来源库位代码',
+    field: 'fromLocationCode',
     sort: 'custom',
     table: {
       width: 150
     },
-    isTableForm: false,
-    isForm: false,
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
   },
   {
-    label: '物品描述2',
-    field: 'itemDesc2',
+    label: '物品名称',
+    field: 'itemName',
     sort: 'custom',
     table: {
       width: 150
@@ -1068,8 +1084,8 @@ export const ProductionreturnRequestDetailLabel = useCrudSchemas(reactive<CrudSc
     isForm: false,
   },
   {
-    label: '项目代码',
-    field: 'projectCode',
+    label: '物品描述1',
+    field: 'itemDesc1',
     sort: 'custom',
     table: {
       width: 150
@@ -1078,40 +1094,24 @@ export const ProductionreturnRequestDetailLabel = useCrudSchemas(reactive<CrudSc
     isForm: false,
   },
   {
-    label: '库存状态',
-    field: 'inventoryStatus',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
-    dictClass: 'string',
-    isTable: true,
+    label: '物品描述2',
+    field: 'itemDesc2',
     sort: 'custom',
     table: {
       width: 150
     },
-    tableForm: {
-      type: 'Select',
-      disabled: true
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
+    isTableForm: false,
+    isForm: false,
   },
   {
-    label: '批次',
-    field: 'batch',
+    label: '项目代码',
+    field: 'projectCode',
     sort: 'custom',
     table: {
       width: 150
     },
-    tableForm: {
-      disabled: true,
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
+    isTableForm: false,
+    isForm: false,
   },
   {
     label: '单据号',
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
index b3542a7e8..8e16f91b9 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
@@ -75,7 +75,7 @@
       ref="formLabelRef"
       @success="getList"
       :tableAllSchemas="detailListTableColumns"
-      :tableFormRules="ProductionreturnRequestDetailLabelRules"
+      :tableFormRules="ProductionreturnRequestDetailNoLabelRules"
       :tableData="detatableData.tableList"
       :isBusiness="true"
       :isShowButton="false"
@@ -88,14 +88,16 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { ProductionreturnRequestMain,ProductionreturnRequestMainRules,ProductionreturnRequestDetail,ProductionreturnRequestDetailRules,ProductionreturnRequestDetailLabel,ProductionreturnRequestDetailLabelRules } from '../productionreturnRequestMain/productionreturnRequestMain.data'
+import { ProductionreturnRequestMain,ProductionreturnRequestMainRules,ProductionreturnRequestDetail,ProductionreturnRequestDetailRules } from '../productionreturnRequestMain/productionreturnRequestMain.data'
+import { ProductionreturnRequestDetailNoLabel, ProductionreturnRequestDetailNoLabelRules } from './productionreturnRequestMainNo.data'
+
 import * as ProductionreturnRequestMainNoApi from '@/api/wms/productionreturnRequestMainNo'
 import * as ProductionreturnRequestDetailNoApi from '@/api/wms/productionreturnRequestDetailNo'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as ItembasicApi from '@/api/wms/itembasic'
 import * as PackageApi from '@/api/wms/package'
 
-// 不合格生产退料申请
+// 隔离退料申请
 defineOptions({ name: 'ProductionreturnRequestMainNo' })
 
 const message = useMessage() // 消息弹窗
@@ -107,7 +109,7 @@ routeName.value = route.name
 const tableColumns = ref(ProductionreturnRequestMain.allSchemas.tableColumns)
 
 //创建标签
-const detailListTableColumns = ProductionreturnRequestDetailLabel.allSchemas
+const detailListTableColumns = ProductionreturnRequestDetailNoLabel.allSchemas
 const isCreateLabel = ref(false)
 const formLabelRef = ref()
 const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({
@@ -317,12 +319,12 @@ const buttonTableClick = async (val, row) => {
             if(item.field == 'productionLineCodePackage') {
               item.tableForm.isInpuFocusShow = false
               item.tableForm.disabled = true
-              ProductionreturnRequestDetailLabelRules.productionLineCodePackage[0].required = false
+              ProductionreturnRequestDetailNoLabelRules.productionLineCodePackage[0].required = false
             }
             if(item.field == 'supplierItemCode') {
               item.tableForm.isInpuFocusShow = true
               item.tableForm.disabled = false
-              ProductionreturnRequestDetailLabelRules.supplierItemCode[0].required = true
+              ProductionreturnRequestDetailNoLabelRules.supplierItemCode[0].required = true
             }
           })
           } else {
@@ -331,12 +333,12 @@ const buttonTableClick = async (val, row) => {
             if(item.field == 'supplierItemCode') {
               item.tableForm.isInpuFocusShow = false
               item.tableForm.disabled = true
-              ProductionreturnRequestDetailLabelRules.supplierItemCode[0].required = false
+              ProductionreturnRequestDetailNoLabelRules.supplierItemCode[0].required = false
             }
             if(item.field == 'productionLineCodePackage') {
               item.tableForm.isInpuFocusShow = true
               item.tableForm.disabled = false
-              ProductionreturnRequestDetailLabelRules.productionLineCodePackage[0].required = true
+              ProductionreturnRequestDetailNoLabelRules.productionLineCodePackage[0].required = true
             }
           })
           }
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts
index 87c4af95b..78b219bf7 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.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() // 国际化
 
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
@@ -801,4 +807,270 @@ export const ProductionreturnRequestDetailRules = reactive({
   itemCode: [
     { required: true, message: '请输入物品代码', trigger: 'blur' }
   ],
+})
+
+/**
+ * @returns {Array} 隔离退料申请子表创建标签
+ */
+export const ProductionreturnRequestDetailNoLabel = 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: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: false,
+    },
+    form: {
+      componentProps: {
+        disabled: 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: '库存状态',
+    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: '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: '物品描述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: 'number',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+]))
+
+//表单校验
+export const ProductionreturnRequestDetailNoLabelRules = reactive({
+  supplierItemCode: [
+    { required: true, message: '请选择供应商', trigger: 'change' }
+  ],
+  productionLineCodePackage: [
+    { required: true, message: '请选择生产线', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ]
 })
\ No newline at end of file

From 5c45185d7c3c7d65aed79b8444d6b661879b86f9 Mon Sep 17 00:00:00 2001
From: yejiaxing <591141169@qq.com>
Date: Tue, 12 Dec 2023 09:02:09 +0800
Subject: [PATCH 05/13] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliverRequestMain.data.ts        | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index d71759e18..cc30b4bca 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -31,21 +31,22 @@ const userDept = userStore.userSelfInfo.dept
  */
 export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '要货计划单号',
-    field: 'ppNumber',
+    label: '供应商代码',
+    field: 'supplierCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    isSearch: true,
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择要货计划单号', // 输入框占位文本
-        searchField: 'number', // 查询弹窗赋值字段
-        searchTitle: '要货计划信息', // 查询弹窗标题
-        searchAllSchemas: PurchasePlanMain.allSchemas, // 查询弹窗所需类
-        searchPage: PurchasePlanMainApi.getPurchasePlanMainPage // 查询弹窗所需分页方法
+        searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '供应商信息', // 查询弹窗标题
+        searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
+        searchPage: SupplierApi.getSupplierPage // 查询弹窗所需分页方法
       }
     }
   },
@@ -60,22 +61,21 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     isForm: true
   },
   {
-    label: '供应商代码',
-    field: 'supplierCode',
+    label: '要货计划单号',
+    field: 'ppNumber',
     sort: 'custom',
     table: {
       width: 150
     },
-    isSearch: true,
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '供应商信息', // 查询弹窗标题
-        searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
-        searchPage: SupplierApi.getSupplierPage // 查询弹窗所需分页方法
+        searchListPlaceholder: '请选择要货计划单号', // 输入框占位文本
+        searchField: 'number', // 查询弹窗赋值字段
+        searchTitle: '要货计划信息', // 查询弹窗标题
+        searchAllSchemas: PurchasePlanMain.allSchemas, // 查询弹窗所需类
+        searchPage: PurchasePlanMainApi.getPurchasePlanMainPage // 查询弹窗所需分页方法
       }
     }
   },

From 34beacdfbc1d85f0a5ba66c1c22b6296bc4c7e5f 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, 12 Dec 2023 10:39:21 +0800
Subject: [PATCH 06/13] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=94=B6=E8=B4=A7=20?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=A0=87=E7=AD=BE=20=20=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E9=80=80=E6=96=99=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionreturnRequestDetail/index.ts    |   5 +
 .../wms/productreceiptRequestDetail/index.ts  |   7 +-
 .../wms/productreceiptRequestMain/index.ts    |  37 +-
 .../labelManage/manufacturePackage/index.vue  |   9 +-
 .../labelManage/purchasePackage/index.vue     |   9 +-
 .../labelManage/utensilPackage/index.vue      |   9 +-
 .../productionreturnRequestMain/index.vue     |   7 +
 .../productreceiptRequestMain/index.vue       | 252 ++++++++++-
 .../productreceiptRequestMain.data.ts         | 337 +++++++++++---
 .../supplierdeliver/supplierPackage/index.vue | 268 +++++++++++
 .../supplierPackage/supplierPackage.data.ts   | 420 ++++++++++++++++++
 11 files changed, 1275 insertions(+), 85 deletions(-)
 create mode 100644 src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/index.vue
 create mode 100644 src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/supplierPackage.data.ts

diff --git a/src/api/wms/productionreturnRequestDetail/index.ts b/src/api/wms/productionreturnRequestDetail/index.ts
index 66dd5921d..0b7bdd7c6 100644
--- a/src/api/wms/productionreturnRequestDetail/index.ts
+++ b/src/api/wms/productionreturnRequestDetail/index.ts
@@ -64,4 +64,9 @@ export const exportProductionreturnRequestDetail = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/productionreturn-request-detail/get-import-template' })
+}
+
+// 创建包装信息后更新子表数据packingNumber
+export const updateDetailPackingNumber = async (id: number, number) => {
+  return await request.put({ url: '/wms/productionreturn-request-detail/updateDetailPackingNumber?id=' + id + '&number=' + number })
 }
\ No newline at end of file
diff --git a/src/api/wms/productreceiptRequestDetail/index.ts b/src/api/wms/productreceiptRequestDetail/index.ts
index 2a0430801..6f11ce799 100644
--- a/src/api/wms/productreceiptRequestDetail/index.ts
+++ b/src/api/wms/productreceiptRequestDetail/index.ts
@@ -69,4 +69,9 @@ export const exportProductreceiptRequestDetail = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/productreceipt-request-detail/get-import-template' })
-}
\ No newline at end of file
+}
+
+// 创建包装信息后更新子表数据packingNumber
+export const updateDetailPackingNumber = async (id: number, number) => {
+  return await request.put({ url: '/wms/productreceipt-request-detail/updateDetailPackingNumber?id=' + id + '&number=' + number })
+}
diff --git a/src/api/wms/productreceiptRequestMain/index.ts b/src/api/wms/productreceiptRequestMain/index.ts
index 9a049f627..3934a8155 100644
--- a/src/api/wms/productreceiptRequestMain/index.ts
+++ b/src/api/wms/productreceiptRequestMain/index.ts
@@ -58,10 +58,45 @@ export const deleteProductreceiptRequestMain = async (id: number) => {
 
 // 导出制品收货申请主 Excel
 export const exportProductreceiptRequestMain = async (params) => {
-  return await request.download({ url: `/wms/productreceipt-request-main/export-excel`, params })
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/productreceipt-request-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/productreceipt-request-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/productreceipt-request-main/get-import-template' })
 }
+
+// 关闭
+export const close = (id) => {
+  return request.put({ url: '/wms/productreceipt-request-main/close?id=' + id })
+}
+
+// 重新添加
+export const reAdd = (id) => {
+  return request.put({ url: '/wms/productreceipt-request-main/reAdd?id=' + id })
+}
+
+// 提交审批
+export const submit = (id) => {
+  return request.put({ url: '/wms/productreceipt-request-main/submit?id=' + id })
+}
+
+// 驳回
+export const refused = (id) => {
+  return request.put({ url: '/wms/productreceipt-request-main/refused?id=' + id })
+}
+
+// 审批通过
+export const agree = (id) => {
+  return request.put({ url: '/wms/productreceipt-request-main/agree?id=' + id })
+}
+
+// 处理
+export const handle = (id) => {
+  return request.put({ url: '/wms/productreceipt-request-main/handle?id=' + id })
+}
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue b/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue
index 2903750d2..4444c0470 100644
--- a/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue
@@ -77,11 +77,12 @@ const tableColumns = ref(Package.allSchemas.tableColumns)
 
 
 /**
- * Package2 regularParams = procure采购件标签记录页面   
- * Package3 regularParams = manufacture  制造件标签记录页面
- * Package4 regularParams = utensil  器具标签记录页面
+ * PurchasePackage regularParams = procure采购件标签记录页面   
+ * ManufacturePackage regularParams = manufacture  制造件标签记录页面
+ * UtensilPackage regularParams = utensil  器具标签记录页面
+ * SupplierPackage regularParams = procure  供应商发货标签记录(用采购标签)
  */
-const regularParams = ref(route.name == 'Package2'?'procure':route.name == 'Package3'?'manufacture':route.name == 'Package4'?'utensil':'')
+ const regularParams = ref(route.name == 'PurchasePackage'?'procure':route.name == 'ManufacturePackage'?'manufacture':route.name == 'UtensilPackage'?'utensil':route.name == 'SupplierPackage'?'procure':'')
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
diff --git a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue
index d1759be6f..61a2347fe 100644
--- a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue
@@ -77,11 +77,12 @@ const tableColumns = ref(Package.allSchemas.tableColumns)
 
 
 /**
- * Package2 regularParams = procure采购件标签记录页面   
- * Package3 regularParams = manufacture  制造件标签记录页面
- * Package4 regularParams = utensil  器具标签记录页面
+ * PurchasePackage regularParams = procure采购件标签记录页面   
+ * ManufacturePackage regularParams = manufacture  制造件标签记录页面
+ * UtensilPackage regularParams = utensil  器具标签记录页面
+ * SupplierPackage regularParams = procure  供应商发货标签记录(用采购标签)
  */
-const regularParams = ref(route.name == 'Package2'?'procure':route.name == 'Package3'?'manufacture':route.name == 'Package4'?'utensil':'')
+const regularParams = ref(route.name == 'PurchasePackage'?'procure':route.name == 'ManufacturePackage'?'manufacture':route.name == 'UtensilPackage'?'utensil':route.name == 'SupplierPackage'?'procure':'')
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
diff --git a/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue b/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue
index 23f915255..b62e0bbf8 100644
--- a/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue
@@ -77,11 +77,12 @@ const tableColumns = ref(Package.allSchemas.tableColumns)
 
 
 /**
- * Package2 regularParams = procure采购件标签记录页面   
- * Package3 regularParams = manufacture  制造件标签记录页面
- * Package4 regularParams = utensil  器具标签记录页面
+ * PurchasePackage regularParams = procure采购件标签记录页面   
+ * ManufacturePackage regularParams = manufacture  制造件标签记录页面
+ * UtensilPackage regularParams = utensil  器具标签记录页面
+ * SupplierPackage regularParams = procure  供应商发货标签记录(用采购标签)
  */
-const regularParams = ref(route.name == 'Package2'?'procure':route.name == 'Package3'?'manufacture':route.name == 'Package4'?'utensil':'')
+ const regularParams = ref(route.name == 'PurchasePackage'?'procure':route.name == 'ManufacturePackage'?'manufacture':route.name == 'UtensilPackage'?'utensil':route.name == 'SupplierPackage'?'procure':'')
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
index 010f8a109..ade468c5e 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
@@ -348,6 +348,9 @@ const buttonTableClick = async (val, row) => {
     })
 
   } else if (val == 'mainHandle') { // 处理
+    if (row.packingNumber) {
+      isCreateLabel.value = true
+    }
     if (!isCreateLabel.value) {
       message.warning('请先创建标签')
       return
@@ -453,6 +456,10 @@ const submitFormLabel = async (formType, data) => {
   try {
     detatableData.tableList.forEach(async (item) => {
       await PackageApi.createPackageLabel(item).then(res => {
+        if (res) {
+          // 更新申请子表数据包装号
+          ProductionreturnRequestDetailApi.updateDetailPackingNumber(res.id,res.number)
+        }
         isCreateLabel.value = true
         message.success('创建标签成功')
       }).catch(err => {
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
index 945e41ed8..570fa03a8 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
@@ -69,8 +69,46 @@
     :apiDelete="ProductreceiptRequestDetailApi.deleteProductreceiptRequestDetail"
     :Echo="Echo"
     @searchTableSuccessDetail="searchTableSuccessDetail"
+    :buttondataTable="buttondataTable"
+    @tableFormButton="tableFormButton"
   />
 
+    <!-- 创建标签 -->
+    <BasicForm
+      ref="formLabelRef"
+      @success="getList"
+      :tableAllSchemas="detailListTableColumns"
+      :tableFormRules="ProductionreturnRequestDetailLabelRules"
+      :tableData="detatableData.tableList"
+      :isBusiness="true"
+      :isShowButton="false"
+      @handleAddTable="handleAddTable"
+      @handleDeleteTable="handleDeleteTable"
+      @searchTableSuccess="searchTableSuccess"
+      @submitForm="submitFormLabel"
+    />
+
+    <!-- bom列表 -->
+    <Dialog
+      :title="DialogTitle"
+      v-model="bomModelVisible"
+      width="80%"
+      :scroll="true"
+      max-height="450px"
+    >
+      <Table
+        :columns="BackflushDetailRequest.allSchemas.tableColumns"
+        :data="detatableDataBom.tableList"
+        :loading="detatableDataBom.loading"
+        :pagination="{
+          total: detatableDataBom.total
+        }"
+        v-model:pageSize="detatableDataBom.pageSize"
+        v-model:currentPage="detatableDataBom.currentPage"
+        v-model:sort="detatableDataBom.sort"
+      />
+    </Dialog>
+
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/wms/productreceipt-request-main/import" :importTemplateData="importTemplateData" 
   @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
@@ -78,10 +116,15 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { ProductreceiptRequestMain,ProductreceiptRequestMainRules,ProductreceiptRequestDetail,ProductreceiptRequestDetailRules } from './productreceiptRequestMain.data'
+import { ProductreceiptRequestMain,ProductreceiptRequestMainRules,ProductreceiptRequestDetail,ProductreceiptRequestDetailRules, BackflushDetailRequest } from './productreceiptRequestMain.data'
+import {ProductionreturnRequestDetailLabel,ProductionreturnRequestDetailLabelRules} from '../../../issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data'
 import * as ProductreceiptRequestMainApi from '@/api/wms/productreceiptRequestMain'
 import * as ProductreceiptRequestDetailApi from '@/api/wms/productreceiptRequestDetail'
+import * as BackflushRequestDetailbApi from '@/api/wms/backflushRequestDetailb'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as ItembasicApi from '@/api/wms/itembasic'
+import * as PackageApi from '@/api/wms/package'
+import { formatTime } from '@/utils/index'
 
 // 制品收货申请
 defineOptions({ name: 'ProductreceiptRequestMain' })
@@ -93,6 +136,35 @@ const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref(ProductreceiptRequestMain.allSchemas.tableColumns)
+// 详情 table 操作扩展 按钮
+const buttondataTable = ref([{
+    label: 'Bom',
+    name: 'bom',
+    hide: false,
+    type: 'primary',
+    icon: '',
+    color: '',
+    hasPermi: '',
+    link: true, // 文本展现按钮
+  }])
+
+//创建标签
+const detailListTableColumns = ProductionreturnRequestDetailLabel.allSchemas
+const isCreateLabel = ref(false)
+const formLabelRef = ref()
+const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({
+  getListApi: ProductreceiptRequestDetailApi.getProductreceiptRequestDetailPage
+})
+const { getList:getDetailList } = detatableMethods
+
+// Bom查看
+const DialogTitle = ref('Bom信息')
+const bomModelVisible = ref(false)
+const { tableObject: detatableDataBom, tableMethods: detatableMethodsBom } =useTable({
+  getListApi: BackflushRequestDetailbApi.getBackflushRequestDetailbPage
+})
+const { getList:getDetailListBom } = detatableMethodsBom
+
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -178,13 +250,24 @@ 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:productreceipt-request-main:update'}), // 编辑
-        defaultButtons.mainListDeleteBtn({hasPermi:'wms:productreceipt-request-main:delete'}), // 删除
+    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']), hasPermi:'wms:productreceipt-request-main:close'}), // 关闭
+      defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:productreceipt-request-main:reAdd'}), // 重新添加
+      defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productreceipt-request-main:submit'}), // 提交审批
+      defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productreceipt-request-main:refused'}), // 驳回
+      defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productreceipt-request-main:agree'}), // 审批通过
+      defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']), hasPermi:'wms:productreceipt-request-main:handle'}), // 处理
+      defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productreceipt-request-main:update'}), // 编辑
+      {
+        label: '创建标签',
+        name: 'cjbq',
+        hide: isShowMainButton(row,['3']),
+        type: 'primary',
+        icon: '',
+        color: '',
+        hasPermi: '',
+        link: true, // 文本展现按钮
+      },
+        // defaultButtons.mainListDeleteBtn({hasPermi:'wms:productreceipt-request-main:delete'}), // 删除
     ]
 }
 
@@ -193,15 +276,119 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
   if (val == 'mainClose') { // 关闭
-    console.log('列表-操作按钮事件-关闭')
+    await message.confirm('确认要关闭吗？')
+    ProductreceiptRequestMainApi.close(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      getList()
+    }).catch(err => {
+      console.log(err)
+    })
   } else if (val == 'mainReAdd') { // 重新添加
-    console.log('列表-操作按钮事件-重新添加')
+    await message.confirm('确认要重新添加吗？')
+    ProductreceiptRequestMainApi.reAdd(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      getList()
+    }).catch(err => {
+      console.log(err)
+    })
   } else if (val == 'mainSubmit') { // 提交审批
-    console.log('列表-操作按钮事件-提交审批')
+    await message.confirm('确认要重新添加吗？')
+    ProductreceiptRequestMainApi.submit(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      getList()
+    }).catch(err => {
+      console.log(err)
+    })
   } else if (val == 'mainTurnDown') { // 驳回
-    console.log('列表-操作按钮事件-驳回')
+    await message.confirm('确认要重新添加吗？')
+    ProductreceiptRequestMainApi.refused(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      getList()
+    }).catch(err => {
+      console.log(err)
+    })
   } else if (val == 'mainApprove') { // 审批通过
-    console.log('列表-操作按钮事件-审批通过')
+    await message.confirm('确认要审批通过吗？')
+    ProductreceiptRequestMainApi.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) => {
+      // 查询物品类型 原料 只能选择 供应商代码 半成品成品其他 只能选择 生产线
+      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 (row.packingNumber) {
+      isCreateLabel.value = true
+    }
+    if (!isCreateLabel.value) {
+      message.warning('请先创建标签')
+      return
+    }
+    ProductreceiptRequestMainApi.handle(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      getList()
+    }).catch(err => {
+      console.log(err)
+    })
   } else if (val == 'edit') { // 编辑
     openForm('update', row)
   } else if (val == 'delete') { // 删除
@@ -262,7 +449,9 @@ const tableData = ref([])
 
 // 添加明细
 const handleAddTable = () => {
-  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+  let tfk = JSON.parse(JSON.stringify(tableFormKeys))
+  tfk.batch = formatTime(new Date(), 'yyyyMMdd')
+  tableData.value.push(tfk)
 }
 // 删除明细
 const handleDeleteTable = (item, index) => {
@@ -314,6 +503,41 @@ const searchFormClick = (searchData) => {
   getList() // 刷新当前列表
 }
 
+// 创建标签
+const submitFormLabel = async (formType, data) => {
+  try {
+    detatableData.tableList.forEach(async (item) => {
+      await PackageApi.createPackageLabel(item).then(res => {
+        if (res) {
+          // 更新申请子表数据包装号
+          ProductreceiptRequestDetailApi.updateDetailPackingNumber(res.id,res.number)
+        }
+        isCreateLabel.value = true
+        message.success('创建标签成功')
+      }).catch(err => {
+        isCreateLabel.value = false
+        console.log(err)
+        message.error('创建标签失败')
+      })
+    })
+  } finally {
+    formLabelRef.value.formLoading = false
+    formLabelRef.value.dialogVisible = false
+  }
+}
+
+// 查看 Bom 按钮回调事件
+const tableFormButton = async (val , row) => {
+  if (val == 'bom') { // 查看 bom
+    bomModelVisible.value = true
+    DialogTitle.value = '物品代码【' + row.itemCode + '】——Bom信息'
+    detatableDataBom.params = {
+      masterId: row.id
+    }
+    await getDetailListBom()
+  }
+}
+
 /** 初始化 **/
 onMounted(async () => {
   getList()
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
index 40631a9ae..4de3fb594 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
@@ -23,6 +23,9 @@ import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/produ
 import * as ProductionlineApi from '@/api/wms/productionline'
 import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data'
 
+import * as BomApi from '@/api/wms/bom'
+import { Bom } from '@/views/wms/basicDataManage/itemManage/bom/bom.data'
+
 const { t } = useI18n() // 国际化
 
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
@@ -422,18 +425,18 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
 
 //表单校验
 export const ProductreceiptRequestMainRules = reactive({
-  // toWarehouseCode: [
-  //   { required: true, message: '请输入到仓库代码', trigger: 'blur' }
-  // ],
-  // toLocationTypes: [
-  //   { required: true, message: '请选择到库位类型范围', trigger: 'change' }
-  // ],
-  // toAreaCodes: [
-  //   { required: true, message: '请输入到库区代码范围', trigger: 'blur' }
-  // ],
-  departmentCode: [
-    { required: true, message: '请输入部门', trigger: 'blur' }
+  workshopCode: [
+    { required: true, message: '请选择车间代码', trigger: 'change' }
+  ],
+  team: [
+    { required: true, message: '请选择班组代码', trigger: 'change' }
   ],
+  shift: [
+    { required: true, message: '请选择班次代码', trigger: 'change' }
+  ],
+  // departmentCode: [
+  //   { required: true, message: '请输入部门', trigger: 'blur' }
+  // ],
   autoCommit: [
     { required: true, message: '请选择是否自动提交', trigger: 'change' }
   ],
@@ -602,16 +605,6 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     isTableForm: false,
     isForm: false
   },
-  {
-    label: '批次',
-    field: 'batch',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false
-  },
   {
     label: '生产日期',
     field: 'produceDate',
@@ -789,45 +782,57 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '备注',
-    field: 'remark',
+    label: 'Bom版本',
+    field: 'bomVersion',
     sort: 'custom',
     table: {
       width: 150
     },
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
+    tableForm: {
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
+      searchField: 'version', // 查询弹窗赋值字段
+      searchTitle: '物料清单信息', // 查询弹窗标题
+      searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
+      searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key:'productItemCode',
+        value:'itemCode',
+        isMainValue: true
+      },{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
     },
     form: {
-      component: 'DatePicker',
+      // labelMessage: '信息提示说明！！！',
       componentProps: {
-        style: {width: '100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
+        searchField: 'version', // 查询弹窗赋值字段
+        searchTitle: '物料清单信息', // 查询弹窗标题
+        searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
+        searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'productItemCode',
+          value:'itemCode',
+          isMainValue: true
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
       }
     },
-    isTableForm: false,
-    isForm: false
   },
   {
-    label: '创建者',
-    field: 'creator',
+    label: '批次',
+    field: 'batch',
     sort: 'custom',
     table: {
       width: 150
     },
-    isTableForm: false,
-    isForm: false
   },
   {
     label: '物品名称',
@@ -903,6 +908,47 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       type: 'Select'
     }
   },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
   {
     label: '最后更新时间',
     field: 'updateTime',
@@ -957,9 +1003,6 @@ export const ProductreceiptRequestDetailRules = reactive({
   // packingNumber: [
   //   { required: true, message: '请输入包装号', trigger: 'change' }
   // ],
-  // batch: [
-  //   { required: true, message: '请输入批次', trigger: 'blur' }
-  // ],
   // produceDate: [
   //   { required: true, message: '请选择生产日期', trigger: 'change' }
   // ],
@@ -981,9 +1024,24 @@ export const ProductreceiptRequestDetailRules = reactive({
   // stdPackUnit: [
   //   { required: true, message: '请选择标包单位', trigger: 'change' }
   // ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
   itemCode: [
     { required: true, message: '请选择物品代码', trigger: 'change' }
   ],
+  bomVersion: [
+    { required: true, message: '请选择Bom版本', trigger: 'change' }
+  ],
+  workStationCode: [
+    { required: true, message: '请选择工位代码', trigger: 'change' }
+  ],
+  uom: [
+    { required: true, message: '请选择计量单位', trigger: 'change' }
+  ],
+  productionLineCode: [
+    { required: true, message: '请选择生产线代码', trigger: 'change' }
+  ],
 })
 
 /**
@@ -998,14 +1056,6 @@ export const BackflushRequestDetailb = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: 'BOM版本',
-    field: 'bomVersion',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
   {
     label: '单据号',
     field: 'number',
@@ -1156,4 +1206,177 @@ export const BackflushRequestDetailbRules = reactive({
   creator: [
     { required: true, message: '请输入创建者', trigger: 'blur' }
   ],
-})
\ No newline at end of file
+  
+})
+
+
+
+
+
+/**
+ * @returns {Array} 制品收货申请子表二子表
+ */
+export const BackflushDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '工序代码',
+    field: 'processCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: 'BOM版本',
+    field: 'bomVersion',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物品代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物品名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物品描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物品描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 150,
+      fixed: 'left'
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+]))
\ No newline at end of file
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/index.vue
new file mode 100644
index 000000000..8b07bf673
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/index.vue
@@ -0,0 +1,268 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Package.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="Package.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="getList" 
+    :rules="PackageRules" 
+    :formAllSchemas="Package.allSchemas" 
+    :searchTableParams="searchTableParams"
+    :apiUpdate="PackageApi.updatePackage"
+    :apiCreate="PackageApi.createPackage"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Package.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/package/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { getAccessToken } from '@/utils/auth'
+import { Package,PackageRules } from './supplierPackage.data'
+import * as PackageApi from '@/api/wms/package'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+
+defineOptions({ name: 'PurchasePackage' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Package.allSchemas.tableColumns)
+
+
+/**
+ * PurchasePackage regularParams = procure采购件标签记录页面   
+ * ManufacturePackage regularParams = manufacture  制造件标签记录页面
+ * UtensilPackage regularParams = utensil  器具标签记录页面
+ * SupplierPackage regularParams = procure  供应商发货标签记录(用采购标签)
+ */
+const regularParams = ref(route.name == 'PurchasePackage'?'procure':route.name == 'ManufacturePackage'?'manufacture':route.name == 'UtensilPackage'?'utensil':route.name == 'SupplierPackage'?'procure':'')
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+//{
+//  formField: 'productItemCode',
+//  searchTableTitle: '物料信息',
+//  searchTableAllSchemas: Itembasic.allSchemas,
+//  searchTablePage: ItembasicApi.getItembasicPage
+//}
+])
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, basicFormRef, type, row ) => {
+  nextTick(() => {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      basicFormRef.setValues(setV)
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: PackageApi.getPackagePage // 分页接口
+})
+tableObject.params.regularParams = regularParams.value
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:package:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:package:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:package:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+// const isShowMainButton = (row,val) => {
+//   if (val.indexOf(row.status) > -1) {
+//     return false
+//   } else {
+//     return true
+//   }
+// }
+
+// 列表-操作按钮
+// const butttondata = (row) => {
+//     return [
+//         defaultButtons.mainListEditBtn({hasPermi:'wms:package:update'}), // 编辑
+//         defaultButtons.mainListDeleteBtn({hasPermi:'wms:package:delete'}), // 删除
+//         defaultButtons.mainListPointBtn(null), // 标签打印
+//     ]
+// }
+
+// 列表-操作按钮
+const butttondata = [
+  // defaultButtons.mainListEditBtn({hasPermi:'wms:package:update'}), // 编辑
+  // defaultButtons.mainListDeleteBtn({hasPermi:'wms:package:delete'}), // 删除
+  defaultButtons.mainListPointBtn(null), // 标签打印
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  } else if (val == 'point') { // 标签打印
+    handlePoint(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm =async (type: string, row?: number) => {
+  basicFormRef.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 PackageApi.deletePackage(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await PackageApi.exportPackage(tableObject.params)
+    download.excel(data, '包装.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+const BASE_URL = 'http://dev.ccwin-in.com:25110'
+const src = ref(BASE_URL + '/jmreport/view/881303562245316608?token=' + getAccessToken())
+// 标签打印
+const handlePoint = async (id) => {
+  window.open(src.value+'&id='+id)
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '包装导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters,
+    regularParams:regularParams.value
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/supplierPackage.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/supplierPackage.data.ts
new file mode 100644
index 000000000..c7d72ffcd
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/supplierPackage.data.ts
@@ -0,0 +1,420 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const PackageRules = reactive({
+  number: [required],
+  itemCode: [required],
+  itemName: [required],
+})
+export const Package2 = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '包装号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150,
+      fixed: 'left'
+    },
+  },
+]))
+export const Package = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '包装号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150,
+      fixed: 'left'
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '物品名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '物品描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '物品描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '替代批次',
+    field: 'altBatch',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    sort: 'custom',
+    formatter: dateFormatter,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+    table: {
+      width: 180,
+    },
+  },
+  {
+    label: '有效期(日)',
+    field: 'validityDays',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0
+      },
+      value: 0
+    },
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '失效日期',
+    field: 'expireDate',
+    sort: 'custom',
+    formatter: dateFormatter,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+    table: {
+      width: 180,
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    sort: 'custom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    form: {
+      component: 'SelectV2'
+    },
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '替代计量单位',
+    field: 'altUom',
+    sort: 'custom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    form: {
+      component: 'SelectV2'
+    },
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '替代数量',
+    field: 'altQty',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '转换率',
+    field: 'convertRate',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '标包数量',
+    field: 'stdPackQty',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '标包单位',
+    field: 'stdPackUnit',
+    sort: 'custom',
+    dictType: DICT_TYPE.PACK_UNIT,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    form: {
+      component: 'SelectV2'
+    },
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '月台代码',
+    field: 'toDockCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '供应商物品代码',
+    field: 'supplierItemCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '采购订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '采购订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '采购计划单号',
+    field: 'rpNumber',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '发货单号',
+    field: 'asnNumber',
+    sort: 'custom',
+    table: {
+      width: 182,
+    },
+  },
+  {
+    label: '生产订单号',
+    field: 'woNumber',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '生产订单行',
+    field: 'woLine',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '班组代码',
+    field: 'teamCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '班次代码',
+    field: 'shiftCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '客户代码',
+    field: 'customerCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '客户月台代码',
+    field: 'customerDockCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '客户物品代码',
+    field: 'customerItemCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '销售订单号',
+    field: 'soNumber',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '销售订单行',
+    field: 'soLine',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '质量等级',
+    field: 'eqLevel',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '货主代码',
+    field: 'ownerCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '重量',
+    field: 'weight',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '面积',
+    field: 'area',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '体积',
+    field: 'volume',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))

From 05126e571ee5832dc0336322954130d1a6981d90 Mon Sep 17 00:00:00 2001
From: yejiaxing <591141169@qq.com>
Date: Tue, 12 Dec 2023 14:46:38 +0800
Subject: [PATCH 07/13] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/purchasePlanDetail/index.ts       |    5 +
 .../wms/supplierdeliverRequestMain/index.ts   |    1 +
 .../supplierdeliverRequestMain/index.vue      | 1035 +++++++++--------
 .../supplierdeliverRequestMain.data.ts        |   67 +-
 4 files changed, 566 insertions(+), 542 deletions(-)

diff --git a/src/api/wms/purchasePlanDetail/index.ts b/src/api/wms/purchasePlanDetail/index.ts
index 5daf8c30e..3c1cb2730 100644
--- a/src/api/wms/purchasePlanDetail/index.ts
+++ b/src/api/wms/purchasePlanDetail/index.ts
@@ -21,6 +21,11 @@ export const getPurchasePlanDetailPage = async (params) => {
   return await request.get({ url: `/wms/purchase-plan-detail/page`, params })
 }
 
+// 查询采购收货记录子列表
+export const getPurchasePlanDetailList = async (params) => {
+    return await request.get({ url: `/wms/purchase-plan-detail/allList`, params })
+}
+
 // 查询要货计划子详情
 export const getPurchasePlanDetail = async (id: number) => {
   return await request.get({ url: `/wms/purchase-plan-detail/get?id=` + id })
diff --git a/src/api/wms/supplierdeliverRequestMain/index.ts b/src/api/wms/supplierdeliverRequestMain/index.ts
index 7b29c5f5d..82ac6b9c5 100644
--- a/src/api/wms/supplierdeliverRequestMain/index.ts
+++ b/src/api/wms/supplierdeliverRequestMain/index.ts
@@ -100,3 +100,4 @@ export const exportSupplierdeliverRequestMain = async (params) => {
 export const importTemplate = () => {
   return request.download({ url: '/wms/supplierdeliver-request-main/get-import-template' })
 }
+
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 0f4e0c040..23e066730 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -1,314 +1,321 @@
-<template>
-  <ContentWrap>
-    <!-- 搜索工作栏 -->
-    <Search :schema="SupplierdeliverRequestMain.allSchemas.searchSchema" @search="setSearchParams"
-      @reset="setSearchParams" />
-  </ContentWrap>
-
-  <!-- 列表头部 -->
-  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
-    @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick"
-    :allSchemas="SupplierdeliverRequestMain.allSchemas" />
-
-  <!-- 列表 -->
-  <ContentWrap>
-    <Table :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
-      total: tableObject.total
-    }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
-      v-model:sort="tableObject.sort">
-      <template #number="{ row }">
-        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
-          <span>{{ row.number }}</span>
-        </el-button>
-      </template>
-      <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event, row)" />
-      </template>
-    </Table>
-  </ContentWrap>
-
-  <!-- 表单弹窗：添加/修改 -->
-  <BasicForm ref="formRef" @success="getList" :rules="SupplierdeliverRequestMainRules"
-    :formAllSchemas="SupplierdeliverRequestMain.allSchemas" :tableAllSchemas="SupplierdeliverRequestDetail.allSchemas"
-    :tableFormRules="SupplierdeliverRequestDetailRules" :tableData="tableData"
-    :apiUpdate="SupplierdeliverRequestMainApi.updateSupplierdeliverRequestMain"
-    :apiCreate="SupplierdeliverRequestMainApi.createSupplierdeliverRequestMain" :isBusiness="true"
-    @handleAddTable="handleAddTable" @handleDeleteTable="handleDeleteTable" @searchTableSuccess="searchTableSuccess"
-    @submitForm="submitForm" />
-
-  <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="false" :allSchemas="SupplierdeliverRequestMain.allSchemas"
-    :detailAllSchemas="SupplierdeliverRequestDetail.allSchemas"
-    :detailAllSchemasRules="SupplierdeliverRequestDetailRules"
-    :apiCreate="SupplierdeliverRequestDetailApi.createSupplierdeliverRequestDetail"
-    :apiUpdate="SupplierdeliverRequestDetailApi.updateSupplierdeliverRequestDetail"
-    :apiPage="SupplierdeliverRequestDetailApi.getSupplierdeliverRequestDetailPage"
-    :apiDelete="SupplierdeliverRequestDetailApi.deleteSupplierdeliverRequestDetail" :Echo="Echo"
-    @searchTableSuccessDetail="searchTableSuccessDetail" />
-
-  <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/wms/supplierdeliver-request-main/import"
-    :importTemplateData="importTemplateData" @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true"
-    :mode="2" />
-
-  <!-- 打印 -->
-  <point ref='pointRef' :detailListTableColumns='detailListTableColumns' />
-  <!-- <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 }">
-        <el-input v-model="row.batch">{{ row.batch }}</el-input>
-      </template>
-    </Table>
-    <el-button @click="closeDialog">关闭</el-button>
-    <el-button @click="genLabel()">生成标签</el-button>
-
-    <el-button @click="print">打印</el-button>
-  </el-dialog> -->
-</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'
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="SupplierdeliverRequestMain.allSchemas.searchSchema" @search="setSearchParams"
+      @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
+    @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick"
+    :allSchemas="SupplierdeliverRequestMain.allSchemas" />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
+      total: tableObject.total
+    }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort">
+      <template #number="{ row }">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event, row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm ref="formRef" @success="getList" :rules="SupplierdeliverRequestMainRules"
+    :formAllSchemas="SupplierdeliverRequestMain.allSchemas" :tableAllSchemas="SupplierdeliverRequestDetail.allSchemas"
+    :tableFormRules="SupplierdeliverRequestDetailRules" :tableData="tableData"
+    :apiUpdate="SupplierdeliverRequestMainApi.updateSupplierdeliverRequestMain"
+    :apiCreate="SupplierdeliverRequestMainApi.createSupplierdeliverRequestMain" :isBusiness="true"
+    @handleAddTable="handleAddTable" @handleDeleteTable="handleDeleteTable" @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm" />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="false" :allSchemas="SupplierdeliverRequestMain.allSchemas"
+    :detailAllSchemas="SupplierdeliverRequestDetail.allSchemas"
+    :detailAllSchemasRules="SupplierdeliverRequestDetailRules"
+    :apiCreate="SupplierdeliverRequestDetailApi.createSupplierdeliverRequestDetail"
+    :apiUpdate="SupplierdeliverRequestDetailApi.updateSupplierdeliverRequestDetail"
+    :apiPage="SupplierdeliverRequestDetailApi.getSupplierdeliverRequestDetailPage"
+    :apiDelete="SupplierdeliverRequestDetailApi.deleteSupplierdeliverRequestDetail" :Echo="Echo"
+    @searchTableSuccessDetail="searchTableSuccessDetail" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/supplierdeliver-request-main/import"
+    :importTemplateData="importTemplateData" @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true"
+    :mode="2" />
+
+  <!-- 打印 -->
+  <point ref='pointRef' :detailListTableColumns='detailListTableColumns' />
+  <!-- <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 }">
+        <el-input v-model="row.batch">{{ row.batch }}</el-input>
+      </template>
+    </Table>
+    <el-button @click="closeDialog">关闭</el-button>
+    <el-button @click="genLabel()">生成标签</el-button>
+
+    <el-button @click="print">打印</el-button>
+  </el-dialog> -->
+</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 point from '@/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/point.vue'
-  // 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 = {}
+  import * as PurchasePlanDetailApi from '@/api/wms/purchasePlanDetail'
+  import * as defaultButtons from '@/utils/disposition/defaultButtons'
+  import point from '@/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/point.vue'
+  // 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(() => {
-      const setV = {}
+       
+       if(formField=='ppNumber'){
+         // 获取子表数据 getBomDisassemble
+        PurchasePlanDetailApi.getPurchasePlanDetailList({
          poNumber: val[0]['number']}).then(res => {
            if (res) tableData.value = res;
            tableData.value.forEach(item=>{
              item.batch = item.toBatch
            })
          }).catch(err => {
            console.log(err)
          })
+       }
+        
+        formRef.setValues(setV)
+      }
+    })
+  }
+  // 查询页面返回——详情
+  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 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',  '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), // 单据打印
-      // 生成记录
-      {
-        label: '处理',
-        name: 'genRecords',
-        hide: isShowMainButton(row, ['3']),
-        type: 'primary',
-        icon: '',
-        color: '',
-        hasPermi: '',
-        link: true, // 文本展现按钮
-      },
-    ]
-  }
-
-  // 列表-操作按钮事件
-  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 == 'genRecords') { // 驳回按钮
-      genRecords(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 detailRef = ref()
-  const openDetail = (row : any, titleName : any, titleValue : any) => {
-    detailRef.value.openDetail(row, titleName, titleValue)
+      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',  '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), // 单据打印
+      // 生成记录
+      {
+        label: '处理',
+        name: 'genRecords',
+        hide: isShowMainButton(row, ['3']),
+        type: 'primary',
+        icon: '',
+        color: '',
+        hasPermi: '',
+        link: true, // 文本展现按钮
+      },
+    ]
+  }
+
+  // 列表-操作按钮事件
+  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 == 'genRecords') { // 驳回按钮
+      genRecords(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 detailRef = ref()
+  const openDetail = (row : any, titleName : any, titleValue : any) => {
+    detailRef.value.openDetail(row, titleName, titleValue)
   }
   //添加/修改操作
    const formRef = ref()
   const openForm = async (type: string, row?: number) => {
     tableData.value = [] // 重置明细数据
     formRef.value.open(type, row)
-  }
-
-  /** 删除按钮操作 */
-  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 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 { }
   }
   
   /** 处理按钮操作 */
@@ -322,216 +329,216 @@
       // 刷新列表
       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 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 pointRef = ref()
-  const handlePoint = async (row) => {
-
-    pointRef.value.openPoint(row.id)
-    // console.log(tableObject.params);
-    // 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
-    }
-  }
-
-  /** 导入 */
-  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
-    }
-    getList() // 刷新当前列表
-  }
-
-  /** 初始化 **/
-  onMounted(async () => {
-    getList()
-    importTemplateData.templateUrl = await SupplierdeliverRequestMainApi.importTemplate()
-  })
+  }
+
+  /** 导出按钮操作 */
+  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 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 pointRef = ref()
+  const handlePoint = async (row) => {
+
+    pointRef.value.openPoint(row.id)
+    // console.log(tableObject.params);
+    // 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
+    }
+  }
+
+  /** 导入 */
+  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
+    }
+    getList() // 刷新当前列表
+  }
+
+  /** 初始化 **/
+  onMounted(async () => {
+    getList()
+    importTemplateData.templateUrl = await SupplierdeliverRequestMainApi.importTemplate()
+  })
 </script>
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index cc30b4bca..b8398c2fe 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -3,7 +3,7 @@ import { dateFormatter } from '@/utils/formatTime'
 import * as SupplierApi from '@/api/wms/supplier'
 import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
 const { t } = useI18n() // 国际化
-import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
 import * as ItembasicApi from '@/api/wms/itembasic'
 import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
 import { PurchasePlanMain } from '../purchasePlanMain/purchasePlanMain.data'
@@ -14,14 +14,14 @@ import { PurchaseDetail, PurchaseMain } from '../purchaseMain/purchaseMain.data'
 
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
 const queryParams = {
-  pageSize:10,
-  pageNo:1,
-  code:'SupplierDeliverRequest'
+  pageSize: 10,
+  pageNo: 1,
+  code: 'SupplierDeliverRequest'
 }
- const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
- const requestsettingData =data?.list[0]||{}
+const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+const requestsettingData = data?.list[0] || {}
 
- // 获取当前操作人的部门
+// 获取当前操作人的部门
 import { useUserStore } from '@/store/modules/user'
 const userStore = useUserStore()
 const userDept = userStore.userSelfInfo.dept
@@ -75,7 +75,18 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
         searchField: 'number', // 查询弹窗赋值字段
         searchTitle: '要货计划信息', // 查询弹窗标题
         searchAllSchemas: PurchasePlanMain.allSchemas, // 查询弹窗所需类
-        searchPage: PurchasePlanMainApi.getPurchasePlanMainPage // 查询弹窗所需分页方法
+        searchPage: PurchasePlanMainApi.getPurchasePlanMainPage, // 查询弹窗所需分页方法
+        searchCondition: [
+          {
+            key: 'supplierCode',
+            value: 'supplierCode',
+            isMainValue: true
+          },
+          {
+            key: 'status',
+            value: 4,
+            isMainValue: false
+          }]
       }
     }
   },
@@ -159,7 +170,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width:'100%'},
+        style: { width: '100%' },
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -210,8 +221,8 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     },
     form: {
       value: 'SupplierDeliver',
-      componentProps:{
-        disabled:true,
+      componentProps: {
+        disabled: true,
       }
     }
   },
@@ -238,7 +249,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width:'100%'},
+        style: { width: '100%' },
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -269,7 +280,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width:'100%'},
+        style: { width: '100%' },
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -291,7 +302,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width:'100%'},
+        style: { width: '100%' },
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -308,8 +319,8 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     },
     form: {
       value: userDept.name,
-      componentProps:{
-        disabled:true,
+      componentProps: {
+        disabled: true,
       }
     }
   },
@@ -345,7 +356,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width:'100%'},
+        style: { width: '100%' },
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -378,7 +389,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       componentProps: {
         inactiveValue: 'FALSE',
         activeValue: 'TRUE',
-        disabled:true,
+        disabled: true,
       }
     }
   },
@@ -398,7 +409,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       componentProps: {
         inactiveValue: 'FALSE',
         activeValue: 'TRUE',
-        disabled:true,
+        disabled: true,
       }
     }
   },
@@ -418,7 +429,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       componentProps: {
         inactiveValue: 'FALSE',
         activeValue: 'TRUE',
-        disabled:true,
+        disabled: true,
       }
     }
   },
@@ -438,7 +449,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       componentProps: {
         inactiveValue: 'FALSE',
         activeValue: 'TRUE',
-        disabled:true,
+        disabled: true,
       }
     }
   },
@@ -543,7 +554,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width:'100%'},
+        style: { width: '100%' },
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -569,7 +580,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width:'100%'},
+        style: { width: '100%' },
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -595,7 +606,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width:'100%'},
+        style: { width: '100%' },
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -910,7 +921,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width:'100%'},
+        style: { width: '100%' },
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -943,7 +954,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width:'100%'},
+        style: { width: '100%' },
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -970,12 +981,12 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     label: '操作',
     field: 'action',
     isDetail: false,
-    isForm: false ,
+    isForm: false,
     table: {
       width: 150,
       fixed: 'right'
     },
-    isTableForm:false,
+    isTableForm: false,
   }
 ]))
 

From f952b3258b83c99f8ef0382b0153408e435fd9af Mon Sep 17 00:00:00 2001
From: liuchen864 <23082234@qq.com>
Date: Tue, 12 Dec 2023 15:16:11 +0800
Subject: [PATCH 08/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
index cf857c523..3a96de847 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
@@ -302,7 +302,7 @@ const handleSubmit = async (id: number) => {
   try {
     await message.confirm(t('common.confirmSubmit'))
     await PurchasereturnRequestMainApi.submitPurchasereturnRequestMain(id)
-    message.success(t('common.closeSuccess'))
+    message.success(t('common.submitSuccess'))
     await getList()
   } catch {}
 }

From 3434a569308cc3d80817e37ce78bb848828b12a9 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Tue, 12 Dec 2023 15:17:35 +0800
Subject: [PATCH 09/13] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=A4=96=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E5=88=9B=E5=BB=BA=E6=A0=87=E7=AD=BE=E5=BC=80=E5=8F=91?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../unplannedreceiptRequestDetail/index.ts    |   7 +-
 .../transferissueRequestMain.data.ts          |  48 +-
 .../unplannedreceiptRequestMain/index.vue     | 173 ++++++-
 .../unplannedreceiptRequestMain.data.ts       | 432 ++++++++++++++++--
 4 files changed, 577 insertions(+), 83 deletions(-)

diff --git a/src/api/wms/unplannedreceiptRequestDetail/index.ts b/src/api/wms/unplannedreceiptRequestDetail/index.ts
index 51629781d..c62a7e13f 100644
--- a/src/api/wms/unplannedreceiptRequestDetail/index.ts
+++ b/src/api/wms/unplannedreceiptRequestDetail/index.ts
@@ -66,4 +66,9 @@ export const exportUnplannedreceiptRequestDetail = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/unplannedreceipt-request-detail/get-import-template' })
-}
\ No newline at end of file
+}
+
+// 创建包装信息后更新子表数据packingNumber
+export const updateDetailPackingNumber = async (id: number, number) => {
+  return await request.put({ url: '/wms/unplannedreceipt-request-detail/updateDetailPackingNumber?id=' + id + '&number=' + number })
+}
diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
index 9ecf41aa1..1b19dcba9 100644
--- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
@@ -164,7 +164,12 @@ export const TransferissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       searchField: 'code',
       searchTitle: '仓库信息',
       searchAllSchemas: Warehouse.allSchemas,
-      searchPage: WarehouseApi.getWarehousePage
+      searchPage: WarehouseApi.getWarehousePage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
     },
     form: {
       // labelMessage: '信息提示说明！！！',
@@ -677,6 +682,21 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       disabled: true,
     }
   },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+      type: 'Select'
+    }
+  },
   {
     label: '到库位代码',
     field: 'toLocationCode',
@@ -690,7 +710,16 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       searchField: 'code',
       searchTitle: '库位信息',
       searchAllSchemas: Location.allSchemas,
-      searchPage: LocationApi.getLocationPage
+      searchPage: LocationApi.getLocationPage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'warehouseCode',
+        value: 'toWarehouseCode',
+        isMainValue: true,
+      }]
     },
     form: {
       // labelMessage: '信息提示说明！！！',
@@ -713,21 +742,6 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       }
     }
   },
-  {
-    label: '库存状态',
-    field: 'inventoryStatus',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true,
-      type: 'Select'
-    }
-  },
   {
     label: '从货主代码',
     field: 'fromOwnerCode',
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
index a470839db..67338db68 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
@@ -71,6 +71,21 @@
     @searchTableSuccessDetail="searchTableSuccessDetail"
   />
 
+  <!-- 创建标签 -->
+  <BasicForm
+    ref="formLabelRef"
+    @success="getList"
+    :tableAllSchemas="detailListTableColumns"
+    :tableFormRules="UnplannedreceiptRequestDetailLabelRules"
+    :tableData="detatableData.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitFormLabel"
+  />
+
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/wms/unplannedreceipt-request-main/import" :importTemplateData="importTemplateData" 
   @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
@@ -78,10 +93,24 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { UnplannedreceiptRequestMain,UnplannedreceiptRequestMainRules,UnplannedreceiptRequestDetail,UnplannedreceiptRequestDetailRules } from './unplannedreceiptRequestMain.data'
+import {
+  UnplannedreceiptRequestMain,
+  UnplannedreceiptRequestMainRules,
+  UnplannedreceiptRequestDetail,
+  UnplannedreceiptRequestDetailRules,
+  UnplannedreceiptRequestDetailLabelRules, UnplannedreceiptRequestDetailLabel
+} from './unplannedreceiptRequestMain.data'
 import * as UnplannedreceiptRequestMainApi from '@/api/wms/unplannedreceiptRequestMain'
 import * as UnplannedreceiptRequestDetailApi from '@/api/wms/unplannedreceiptRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import {
+  ProductionreturnRequestDetailLabel, ProductionreturnRequestDetailLabelRules
+} from "@/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data";
+import * as ProductionreturnRequestDetailApi from "@/api/wms/productionreturnRequestDetail";
+import * as ItembasicApi from "@/api/wms/itembasic";
+import * as PackageApi from "@/api/wms/package";
+import {UnplannedreceiptRequestDetailVO} from "@/api/wms/unplannedreceiptRequestDetail";
+import { formatTime } from '@/utils/index'
 
 // 计划外入库申请
 defineOptions({ name: 'UnplannedreceiptRequestMain' })
@@ -94,6 +123,15 @@ const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref(UnplannedreceiptRequestMain.allSchemas.tableColumns)
 
+//创建标签
+const detailListTableColumns = UnplannedreceiptRequestDetailLabel.allSchemas
+const isCreateLabel = ref(false)
+const formLabelRef = ref()
+const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({
+  getListApi: UnplannedreceiptRequestDetailApi.getUnplannedreceiptRequestDetailPage
+})
+const { getList:getDetailList } = detatableMethods
+
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
   tableColumns.value = val
@@ -104,17 +142,14 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
   nextTick(() => {
     if (type == 'tableForm') {
       // 明细查询页赋值
+      if(formField == 'toLocationCode'){
+        row['toLocationCode'] = val[0]['code']
+      }
+      if(formField == 'itemCode'){
+        row['itemCode'] = val[0]['code']
+        row['uom'] = val[0]['uom']
+      }
       row[formField] = val[0][searchField]
-      row['packingNumber'] = val[0]['packingNumber']
-      row['containerNumber'] = val[0]['containerNumber']
-      row['batch'] = val[0]['batch']
-      row['altBatch'] = val[0]['altBatch']
-      row['arriveDate'] = val[0]['arriveDate']
-      row['produceDate'] = val[0]['produceDate']
-      row['expireDate'] = val[0]['expireDate']
-      row['inventoryStatus'] = val[0]['inventoryStatus']
-      row['toLocationCode'] = val[0]['locationCode']
-      row['itemCode'] = val[0]['itemCode']
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]
@@ -127,16 +162,13 @@ 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['altBatch'] = val[0]['altBatch']
-    setV['arriveDate'] = val[0]['arriveDate']
-    setV['produceDate'] = val[0]['produceDate']
-    setV['expireDate'] = val[0]['expireDate']
-    setV['inventoryStatus'] = val[0]['inventoryStatus']
-    setV['toLocationCode'] = val[0]['locationCode']
-    setV['itemCode'] = val[0]['itemCode']
+    if(formField == 'toLocationCode'){
+      setV['toLocationCode'] = val[0]['code']
+    }
+    if(formField == 'itemCode'){
+      setV['itemCode'] = val[0]['code']
+      setV['uom'] = val[0]['uom']
+    }
     formRef.setValues(setV)
   })
 }
@@ -206,11 +238,22 @@ const butttondata = (row) => {
         defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:unplannedreceipt-request-main:handle'}), // 处理
         defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:unplannedreceipt-request-main:update'}), // 编辑
         // defaultButtons.mainListDeleteBtn({hasPermi:'wms:unplannedreceipt-request-main:delete'}), // 删除
+      {
+        label: '创建标签',
+        name: 'cjbq',
+        hide: isShowMainButton(row,['3']),
+        type: 'primary',
+        icon: '',
+        color: '',
+        hasPermi: '',
+        link: true, // 文本展现按钮
+      },
     ]
 }
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
+  console.log("val",val)
   if (val == 'mainClose') { // 关闭
     console.log('列表-操作按钮事件-关闭')
     handleClose(row.id)
@@ -233,6 +276,66 @@ const buttonTableClick = async (val, row) => {
     openForm('update', row)
   } else if (val == 'delete') { // 删除
     handleDelete(row.id)
+  } else if( val == 'cjbq'){// 创建标签
+    console.log("列表-操作按钮事件-创建标签")
+    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) => {
+      // 查询物品类型 原料 只能选择 供应商代码 半成品成品其他 只能选择 生产线
+      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
+                UnplannedreceiptRequestDetailLabelRules.productionLineCodePackage[0].required = false
+              }
+              if(item.field == 'supplierItemCode') {
+                item.tableForm.isInpuFocusShow = true
+                item.tableForm.disabled = false
+                UnplannedreceiptRequestDetailLabelRules.supplierItemCode[0].required = true
+              }
+            })
+          } else {
+            // 修改 tableform 属性
+            detailListTableColumns.tableFormColumns.map(item => {
+              if(item.field == 'supplierItemCode') {
+                item.tableForm.isInpuFocusShow = false
+                item.tableForm.disabled = true
+                UnplannedreceiptRequestDetailLabelRules.supplierItemCode[0].required = false
+              }
+              if(item.field == 'productionLineCodePackage') {
+                item.tableForm.isInpuFocusShow = true
+                item.tableForm.disabled = false
+                UnplannedreceiptRequestDetailLabelRules.productionLineCodePackage[0].required = true
+              }
+            })
+          }
+        } else {
+          message.warning('没有查询到物品代码：【' + item.itemCode + '】')
+          return
+        }
+      })
+    })
   }
 }
 
@@ -349,7 +452,9 @@ const tableData = ref([])
 
 // 添加明细
 const handleAddTable = () => {
-  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+  let tfk = JSON.parse(JSON.stringify(tableFormKeys))
+  tfk.batch = formatTime(new Date(), 'yyyyMMdd')
+  tableData.value.push(tfk)
 }
 // 删除明细
 const handleDeleteTable = (item, index) => {
@@ -401,6 +506,30 @@ const searchFormClick = (searchData) => {
   getList() // 刷新当前列表
 }
 
+// 创建标签
+const submitFormLabel = async (formType, data) => {
+  try {
+    detatableData.tableList.forEach(async (item) => {
+      await PackageApi.createPackageLabel(item).then(res => {
+        console.log("BBBBB",res)
+        if (res) {
+          // 更新申请子表数据包装号
+          UnplannedreceiptRequestDetailApi.updateDetailPackingNumber(res.id,res.number)
+        }
+        isCreateLabel.value = true
+        message.success('创建标签成功')
+      }).catch(err => {
+        isCreateLabel.value = false
+        console.log(err)
+        message.error('创建标签失败')
+      })
+    })
+  } finally {
+    formLabelRef.value.formLoading = false
+    formLabelRef.value.dialogVisible = false
+  }
+}
+
 /** 初始化 **/
 onMounted(async () => {
   getList()
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
index 69265deea..fc24f0964 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
@@ -5,6 +5,11 @@ import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
 import * as BalanceApi  from '@/api/wms/balance'
 import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
 
+import * as ItembasicApi from '@/api/wms/itembasic'
+import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
+
+
+
 const { t } = useI18n() // 国际化
 
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
@@ -18,6 +23,18 @@ 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";
+import {Location} from "@/views/wms/basicDataManage/factoryModeling/location/location.data";
+import * as LocationApi from "@/api/wms/location";
+import {
+  Productionlineitem
+} from "@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data";
+import * as ProductionlineitemApi from "@/api/wms/productionlineitem";
+import {
+  Supplieritem
+} from "@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data";
+import * as SupplieritemApi from "@/api/wms/supplieritem";
 const userStore = useUserStore()
 const userDept = userStore.userSelfInfo.dept
 
@@ -104,7 +121,30 @@ export const UnplannedreceiptRequestMain = 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: '到库位类型范围',
@@ -376,8 +416,37 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 150
     },
-    tableForm: {
-      disabled: true
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择物品代码',// 输入框占位文本
+      searchField: 'code',// 查询弹窗赋值字段
+      searchTitle: '物品基础信息',
+      searchAllSchemas: Itembasic.allSchemas,
+      searchPage: ItembasicApi.getItembasicPage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        action: '==',
+        isSearch: true,
+        isMainValue: false
+      }]
+    },
+    form: {
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物品代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '物品基础信息', // 查询弹窗标题
+        searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
+        searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          action: '==',
+          isSearch: true,
+          isMainValue: false
+        }]
+      }
     }
   },
   {
@@ -429,23 +498,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
       width: 150
     },
     tableForm:{
-      isInpuFocusShow: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择包装号',
-      searchField: 'packingNumber',
-      searchTitle: '库存余额信息',
-      searchAllSchemas: Balance.allSchemas,
-      searchPage: BalanceApi.getBalancePage
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择包装号',
-        searchField: 'packingNumber',
-        searchTitle: '库存余额信息',
-        searchAllSchemas: Balance.allSchemas,
-        searchPage: BalanceApi.getBalancePage
-      }
+      disabled: true
     }
   },
   {
@@ -501,7 +554,41 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
       width: 150
     },
     tableForm: {
-      disabled: true
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择库位代码',
+      searchField: 'code',
+      searchTitle: '库位信息',
+      searchAllSchemas: Location.allSchemas,
+      searchPage: LocationApi.getLocationPage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'warehouseCode',
+        value: 'toWarehouseCode',
+        isMainValue: true,
+      }]
+    },
+    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,
+        }]
+      }
     }
   },
   {
@@ -515,21 +602,9 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
       width: 150
     },
     tableForm: {
-      disabled: true,
       type: 'Select'
     }
   },
-  {
-    label: '替代批次',
-    field: 'altBatch',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true
-    }
-  },
   {
     label: '到货日期',
     field: 'arriveDate',
@@ -550,7 +625,6 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
       }
     },
     tableForm: {
-      disabled: true,
       type: 'FormDateTime',
       dateFormat: 'YYYY-MM-DD HH:mm:ss',
       valueFormat: 'x',
@@ -576,7 +650,6 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
       }
     },
     tableForm: {
-      disabled: true,
       type: 'FormDateTime',
       dateFormat: 'YYYY-MM-DD HH:mm:ss',
       valueFormat: 'x',
@@ -602,7 +675,6 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
       }
     },
     tableForm: {
-      disabled: true,
       type: 'FormDateTime',
       dateFormat: 'YYYY-MM-DD HH:mm:ss',
       valueFormat: 'x',
@@ -730,12 +802,6 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
 
 //表单校验
 export const UnplannedreceiptRequestDetailRules = reactive({
-  packingNumber: [
-    { required: true, message: '请选择包装号', trigger: 'change' }
-  ],
-  batch: [
-    { required: true, message: '请输入批次', trigger: 'blur' }
-  ],
   arriveDate: [
     { required: true, message: '请选择到货日期', trigger: 'change' }
   ],
@@ -754,4 +820,284 @@ export const UnplannedreceiptRequestDetailRules = reactive({
   itemCode: [
     { required: true, message: '请选择物品代码', trigger: 'change' }
   ],
-})
\ No newline at end of file
+})
+
+
+/**
+ * @returns {Array} 生产退料申请子表创建标签
+ */
+export const UnplannedreceiptRequestDetailLabel = 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: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    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: '库存状态',
+    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: '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: '物品描述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: 'number',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  }
+]))
+
+//表单校验
+export const UnplannedreceiptRequestDetailLabelRules = reactive({
+  supplierItemCode: [
+    { required: true, message: '请选择供应商', trigger: 'change' }
+  ],
+  productionLineCodePackage: [
+    { required: true, message: '请选择生产线', trigger: 'change' }
+  ]
+})

From 71b036a564347dc832974e22760a776ec6175096 Mon Sep 17 00:00:00 2001
From: yejiaxing <591141169@qq.com>
Date: Tue, 12 Dec 2023 17:01:59 +0800
Subject: [PATCH 10/13] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasePlanMain/index.vue                |  6 +-
 .../purchasePlanMain/purchasePlanMain.data.ts | 55 ++++---------------
 2 files changed, 17 insertions(+), 44 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index 04a3dba55..50a7783be 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@@ -76,6 +76,7 @@
   const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
     nextTick(async () => {
       if (type == 'tableForm') {
+         
         // 明细查询页赋值
         row[formField] = val[0][searchField]
         row['itemCode'] = val[0]['code']
@@ -83,13 +84,16 @@
         row['poLine'] = val[0]['lineNumber']
         await PurchaseDetailApi.getPurchaseDetailPage({
           number: row['poNumber'],
-          lineNumber: row['poLine'],
+          poLine: row['lineNumber'],
         }).then(res => {
           if (res.list.length == 1) {
             row['itemCode'] = res.list[0].itemCode
+            row['poLine'] = res.list[0].lineNumber
+            row['uom'] = res.list[0].uom
           }
         })
       } else {
+        console.log(456)
         const setV = {}
         setV[formField] = val[0][searchField]
         formRef.setValues(setV)
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
index c38816691..981796a9b 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
@@ -292,51 +292,20 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '订单行',
     field: 'poLine',
     sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择订单行',
-      searchField: 'lineNumber',
-      searchTitle: '采购订单信息',
-      searchAllSchemas: PurchaseDetail.allSchemas,
-      searchPage: PurchaseDetailApi.getPurchaseDetailPage,
-      searchCondition: [{
-        key: 'number',
-        value: 'number',
-        isMainValue: true
-      },
-      {
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
-      }]
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true,
-        searchListPlaceholder: '请选择订单行',
-        searchField: 'lineNumber',
-        searchTitle: '采购订单信息',
-        searchAllSchemas: PurchaseDetail.allSchemas,
-        searchPage: PurchaseDetailApi.getPurchaseDetailPage,
-        searchCondition: [{
-          key: 'number',
-          value: 'poNumber',
-          isMainValue: true
-        },
-        {
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
-      }
-    }
+   table: {
+     width: 150
+   },
+   form: {
+     componentProps: {
+       disabled: true
+     }
+   },
+   tableForm: {
+     disabled: true
+   }
   },
   {
-    label: '单据号',
+    label: '单据号11',
     field: 'number',
     sort: 'custom',
     isTableForm: false,

From 34e90e31a41efdd2e86312a134689d69302de667 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Tue, 12 Dec 2023 19:21:32 +0800
Subject: [PATCH 11/13] =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/scrapRequestMain/index.ts         | 32 ++++++-
 .../scrap/scrapJobMain/index.vue              |  6 +-
 .../scrap/scrapRequestMain/index.vue          | 84 +++++++++++++++++--
 .../scrapRequestMain/scrapRequestMain.data.ts | 71 +++++++++++++++-
 4 files changed, 176 insertions(+), 17 deletions(-)

diff --git a/src/api/wms/scrapRequestMain/index.ts b/src/api/wms/scrapRequestMain/index.ts
index 0f4ddf2d9..6a6ef1f40 100644
--- a/src/api/wms/scrapRequestMain/index.ts
+++ b/src/api/wms/scrapRequestMain/index.ts
@@ -65,4 +65,34 @@ export const exportScrapRequestMain = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/scrap-request-main/get-import-template' })
-}
\ No newline at end of file
+}
+
+// 关闭-报废出库申请
+export const closeScrapRequestMain = async (id) => {
+  return await request.put({ url: `/wms/scrap-request-main/close?id=` + id })
+}
+
+// 重新添加-报废出库申请
+export const reAddScrapRequestMain = async (id) => {
+  return await request.put({ url: `/wms/scrap-request-main/reAdd?id=` + id })
+}
+
+// 提交审批-报废出库申请
+export const submitScrapRequestMain = async (id) => {
+  return await request.put({ url: `/wms/scrap-request-main/submit?id=` + id })
+}
+
+// 审批驳回-报废出库申请
+export const refusedScrapRequestMain = async (id) => {
+  return await request.put({ url: `/wms/scrap-request-main/refused?id=` + id })
+}
+
+// 审批通过-报废出库申请
+export const agreeScrapRequestMain = async (id) => {
+  return await request.put({ url: `/wms/scrap-request-main/agree?id=` + id })
+}
+
+// 处理-报废出库申请
+export const handleScrapRequestMain = async (id) => {
+  return await request.put({ url: `/wms/scrap-request-main/handle?id=` + id })
+}
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue
index 1e63ae62f..c393ddab1 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue
+++ b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue
@@ -174,9 +174,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'])}), // 关闭
+    // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
     // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
   ]
 }
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
index 7905f7b7b..50d4fb319 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
@@ -186,30 +186,36 @@ 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:scrap-request-main:update'}), // 编辑
-        defaultButtons.mainListDeleteBtn({hasPermi:'wms:scrap-request-main:delete'}), // 删除
+        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:scrap-request-main:close'}), // 关闭
+        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:scrap-request-main:reAdd'}), // 重新添加
+        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:scrap-request-main:submit'}), // 提交审批
+        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:scrap-request-main:refused'}), // 驳回
+        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:scrap-request-main:agree'}), // 审批通过
+        defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:scrap-request-main:handle'}), // 处理
+        defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:scrap-request-main:update'}), // 编辑
+        // defaultButtons.mainListDeleteBtn({hasPermi:'wms:scrap-request-main:delete'}), // 删除
     ]
 }
 
-
-
 // 列表-操作按钮事件
 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') { // 删除
@@ -217,6 +223,66 @@ const buttonTableClick = async (val, row) => {
   }
 }
 
+/** 关闭按钮操作 */
+const handleClose = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmColse'))
+    await ScrapRequestMainApi.closeScrapRequestMain(id)
+    message.success(t('common.closeSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 重新添加按钮操作 */
+const handleReAdd = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmReAdd'))
+    await ScrapRequestMainApi.reAddScrapRequestMain(id)
+    message.success(t('common.reAddSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 提交按钮操作 */
+const handleSubmit = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmSubmit'))
+    await ScrapRequestMainApi.submitScrapRequestMain(id)
+    message.success(t('common.submitSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 审批驳回按钮操作 */
+const handleRefused = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmRefused'))
+    await ScrapRequestMainApi.refusedScrapRequestMain(id)
+    message.success(t('common.refusedSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 审批通过按钮操作 */
+const handleAgree = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmAgree'))
+    await ScrapRequestMainApi.agreeScrapRequestMain(id)
+    message.success(t('common.agreeSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 处理按钮操作 */
+const handleHandle = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmHandle'))
+    await ScrapRequestMainApi.handleScrapRequestMain(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/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
index 2f4d3e21f..ae33afd0f 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
@@ -18,6 +18,8 @@ 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
 
@@ -105,7 +107,35 @@ export const ScrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isSearch: true,
-    isForm: false,
+    tableForm: {
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择仓库代码',
+      searchField: 'code',
+      searchTitle: '仓库信息',
+      searchAllSchemas: Warehouse.allSchemas,
+      searchPage: WarehouseApi.getWarehousePage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '仓库信息', // 查询弹窗标题
+        searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
+        searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
   },
   {
     label: '从库位类型范围',
@@ -377,6 +407,9 @@ export const ScrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    tableForm: {
+      disabled: true
+    }
   },
   {
     label: '物品名称',
@@ -387,6 +420,9 @@ export const ScrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTableForm: false,
     isForm: false,
+    tableForm: {
+      disabled: true
+    }
   },
   {
     label: '物品描述1',
@@ -415,6 +451,9 @@ export const ScrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    tableForm: {
+      disabled: true
+    }
   },
   {
     label: '包装号',
@@ -429,7 +468,16 @@ export const ScrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       searchField: 'packingNumber',
       searchTitle: '库存余额信息',
       searchAllSchemas: Balance.allSchemas,
-      searchPage: BalanceApi.getBalancePage
+      searchPage: BalanceApi.getBalancePage,
+      searchCondition: [{
+        key: 'warehouseCode',
+        value: 'fromWarehouseCode',
+        isMainValue: true
+      },{
+        key: 'inventoryStatus',
+        value: 'SCRAP',
+        isMainValue: false
+      }]
     },
     form: {
       // labelMessage: '信息提示说明！！！',
@@ -439,7 +487,16 @@ export const ScrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
         searchField: 'packingNumber',
         searchTitle: '库存余额信息',
         searchAllSchemas: Balance.allSchemas,
-        searchPage: BalanceApi.getBalancePage
+        searchPage: BalanceApi.getBalancePage,
+        searchCondition: [{
+          key: 'warehouseCode',
+          value: 'fromWarehouseCode',
+          isMainValue: true
+        },{
+          key: 'inventoryStatus',
+          value: 'SCRAP',
+          isMainValue: false
+        }]
       }
     }
   },
@@ -450,6 +507,9 @@ export const ScrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    tableForm: {
+      disabled: true
+    }
   },
   {
     label: '数量',
@@ -492,6 +552,9 @@ export const ScrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    tableForm: {
+      disabled: true
+    }
   },
   {
     label: '库存状态',
@@ -647,4 +710,4 @@ export const ScrapRequestDetailRules = reactive({
   itemCode: [
     { required: true, message: '请选择物品代码', trigger: 'change' }
   ],
-})
\ No newline at end of file
+})

From c237dbfdf901ebfe993aef8b4f6546fe15f80c8b 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, 12 Dec 2023 19:28:44 +0800
Subject: [PATCH 12/13] =?UTF-8?q?=E6=A1=8C=E9=9D=A2=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2=E5=B1=95=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Home/Index.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/Home/Index.vue b/src/views/Home/Index.vue
index 2006758a8..8c6be92e4 100644
--- a/src/views/Home/Index.vue
+++ b/src/views/Home/Index.vue
@@ -1,9 +1,9 @@
 <template>
   <div>
-    <supplierIndex/>
-    <warehouseKeeper v-hasRole="['role2']"/>
-    <productWarehouseKeeper v-hasRole="['role3']"/>
-    <productionManager v-hasRole="['role4']"/>
+    <supplierIndex v-hasRole="['super_admin','supplier']"/>
+    <warehouseKeeper v-hasRole="['super_admin']"/>
+    <productWarehouseKeeper v-hasRole="['super_admin']"/>
+    <productionManager v-hasRole="['super_admin']"/>
   </div>
 </template>
 <script lang="ts" setup>

From b567b54f323abe7f67a5f58de57d6bff2fb1b8fa 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, 12 Dec 2023 19:52:20 +0800
Subject: [PATCH 13/13] =?UTF-8?q?=E5=88=B6=E5=93=81=E6=94=B6=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/productreceiptJobMain/index.ts    |  27 +++-
 .../productreceiptJobMain/index.vue           | 118 +++++++++++++-----
 .../productreceiptJobMain.data.ts             |  20 +--
 .../productreceiptRecordMain/index.vue        |  57 ++++++++-
 .../productreceiptRecordMain.data.ts          |  13 +-
 .../productreceiptRequestMain/index.vue       |   5 -
 6 files changed, 193 insertions(+), 47 deletions(-)

diff --git a/src/api/wms/productreceiptJobMain/index.ts b/src/api/wms/productreceiptJobMain/index.ts
index cff1dd556..b22dae6b4 100644
--- a/src/api/wms/productreceiptJobMain/index.ts
+++ b/src/api/wms/productreceiptJobMain/index.ts
@@ -75,10 +75,35 @@ export const deleteProductreceiptJobMain = async (id: number) => {
 
 // 导出制品收货任务主 Excel
 export const exportProductreceiptJobMain = async (params) => {
-  return await request.download({ url: `/wms/productreceipt-job-main/export-excel`, params })
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/productreceipt-job-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/productreceipt-job-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/productreceipt-job-main/get-import-template' })
+}
+
+// 承接发料任务
+export const acceptProductreceiptMain = async (id) => {
+  return await request.put({ url: `/wms/productreceipt-job-main/accept?id=` + id })
+}
+
+// 放弃发料任务
+export const abandonProductreceiptMain = async (id) => {
+  return await request.put({ url: `/wms/productreceipt-job-main/abandon?id=` + id })
+}
+
+// 关闭发料任务
+export const closeProductreceiptMain = async (id) => {
+  return await request.put({ url: `/wms/productreceipt-job-main/close?id=` + id })
+}
+
+// 执行发料任务
+export const executeProductreceiptMain = async (data) => {
+  return await request.put({ url: `/wms/productreceipt-job-main/execute`, data})
 }
\ No newline at end of file
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue
index 97ccbb965..cdc3167ab 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue
@@ -90,12 +90,6 @@ const updataTableColumns = (val) => {
 
 // 查询列表页面参数设置
 const searchTableParams = ref([
-//{
-//  formField: 'productItemCode',
-//  searchTableTitle: '物料信息',
-//  searchTableAllSchemas: Itembasic.allSchemas,
-//  searchTablePage: ItembasicApi.getItembasicPage
-//}
 ])
 
 // 查询页面返回
@@ -103,29 +97,14 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
   nextTick(() => {
     if (type == 'tableForm') {
       // 明细查询页赋值
-      //row[formField] = val[0][searchField]
-      //row['poLine'] = val[0]['poLine']
-      //row['batch'] = val[0]['toBatch']
-      //row['altBatch'] = val[0]['altBatch']
-      //row['itemCode'] = val[0]['itemCode']
-      //row['itemName'] = val[0]['itemName']
-      //row['itemDesc1'] = val[0]['itemDesc1']
-      //row['itemDesc2'] = val[0]['itemDesc2']
-      //row['projectCode'] = val[0]['projectCode']
-      //row['qty'] = val[0]['qty']
-      //row['uom'] = val[0]['uom']
+      row[formField] = val[0][searchField]
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]
-      //setV['ppNumber'] = val[0]['ppNumber']
-      //setV['supplierCode'] = val[0]['supplierCode']
       formRef.setValues(setV)
     }
   })
 }
-// 子表新增的时候选择表格之后需要会显得字段
-// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
-const Echo =  []
 
 const { tableObject, tableMethods } = useTable({
   getListApi: ProductreceiptJobMainApi.getProductreceiptJobMainPage // 分页接口
@@ -177,20 +156,101 @@ const butttondata = (row) => {
     defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
     defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
     defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
-    // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
+    defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
   ]
 }
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
   if (val == 'mainJobExe') { // 执行
-    console.log('列表-操作按钮事件-执行')
+    let aaa = {
+    "id": "1809190001478278226",
+    "requestNumber": "REC4620231212-0011",
+    "productionPlanNumber": "WP20231212-0002",
+    "workShopCode": "work2",
+    "team": "7",
+    "shift": "8",
+    "details": null,
+    "requestTime": 1702376849000,
+    "requestDueTime": null,
+    "status": "2",
+    "expiredTime": null,
+    "updateTime": 1702376904000,
+    "updater": "超级管理员",
+    "jobStageStatus": null,
+    "priority": null,
+    "priorityIncrement": null,
+    "departmentCode": "103",
+    "acceptUserId": "1",
+    "acceptTime": 1702376913000,
+    "completeUserId": "1",
+    "completeTime": 1702377036000,
+    "toWarehouseCode": null,
+    "toAreaCodes": "",
+    "fromLocationTypes": "WIP",
+    "toLocationTypes": "WIP",
+    "number": "JOB2120231212-0001",
+    "businessType": "ProductReceipt",
+    "remark": null,
+    "createTime": 1702376904000,
+    "creator": "超级管理员",
+    "autoComplete": "FALSE",
+    "allowModifyLocation": "FALSE",
+    "allowModifyQty": "TRUE",
+    "allowBiggerQty": "TRUE",
+    "allowSmallerQty": "TRUE",
+    "allowModifyInventoryStatus": "TRUE",
+    "allowContinuousScanning": "TRUE",
+    "allowPartialComplete": "TRUE",
+    "allowModifyBatch": "FALSE",
+    "allowModifyPackingNumber": "FALSE",
+    "inInventoryStatuses": "OK",
+    "outInventoryStatuses": "OK",
+    "concurrencyStamp": null,
+      subList: [
+      {
+    "id": "1809190000003953999",
+    "productionLineCode": "line4",
+    "workStationCode": "station4",
+    "processCode": null,
+    "packingNumber": "PN-00113",
+    "containerNumber": null,
+    "batch": "20231212",
+    "produceDate": null,
+    "expireDate": null,
+    "inventoryStatus": "OK",
+    "woNumber": null,
+    "woLine": null,
+    "stdPackQty": 8,
+    "stdPackUnit": "BOX",
+    "itemCode": "item01",
+    "itemName": "物品01",
+    "itemDesc1": "",
+    "itemDesc2": "",
+    "projectCode": "xm01",
+    "qty": 2,
+    "uom": "EA",
+    "number": "JOB2120231212-0001",
+    "remark": null,
+    "createTime": 1702376904000,
+    "creator": "1",
+    "toOwnerCode": null,
+          handleQty: 10,
+          toPackingNumber: '12',
+          toContainerNumber: '001',
+          toBatch: '21',
+          toInventoryStatus: 'OK',
+          toLocationCode: 'H03',
+        }
+      ]
+    }
+    ProductreceiptJobMainApi.executeProductreceiptMain(aaa)
   } else if (val == 'mainJobAba') { // 放弃
-    console.log('列表-操作按钮事件-放弃')
+    ProductreceiptJobMainApi.abandonProductreceiptMain(row.id)
   } else if (val == 'mainJobClo') { // 关闭
-    console.log('列表-操作按钮事件-关闭')
+    ProductreceiptJobMainApi.closeProductreceiptMain(row.id)
   } else if (val == 'mainJobAcc') { // 承接
-    console.log('列表-操作按钮事件-承接')
+    ProductreceiptJobMainApi.acceptProductreceiptMain(row.id)
   }
 }
 
@@ -208,8 +268,8 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await ProductreceiptJobMainApi.exportProductreceiptJobMain(setSearchParams)
-    download.excel(data, '制品收货任务主.xlsx')
+    const data = await ProductreceiptJobMainApi.exportProductreceiptJobMain(tableObject.params)
+    download.excel(data, '制品收货任务.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts
index 147ded08f..099526119 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts
@@ -522,16 +522,16 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '操作',
-    field: 'action',
-    isDetail: false,
-    isForm: false,
-    table: {
-      width: 120,
-      fixed: 'right'
-    },
-  }
+  // {
+  //   label: '操作',
+  //   field: 'action',
+  //   isDetail: false,
+  //   isForm: false,
+  //   table: {
+  //     width: 120,
+  //     fixed: 'right'
+  //   },
+  // }
 ]))
 
 //表单校验
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
index 75b52130c..1ba1b1db3 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
@@ -57,15 +57,39 @@
     :detailAllSchemas="ProductreceiptRecordDetail.allSchemas"
     :detailAllSchemasRules="ProductreceiptRecordDetailRules"
     :apiPage="ProductreceiptRecordDetailApi.getProductreceiptRecordDetailPage"
+    :buttondataTable="buttondataTable"
+    @tableFormButton="tableFormButton"
   />
+
+  <!-- bom列表 -->
+  <Dialog
+      :title="DialogTitle"
+      v-model="bomModelVisible"
+      width="80%"
+      :scroll="true"
+      max-height="450px"
+    >
+      <Table
+        :columns="BackflushRecordDetailb.allSchemas.tableColumns"
+        :data="detatableDataBom.tableList"
+        :loading="detatableDataBom.loading"
+        :pagination="{
+          total: detatableDataBom.total
+        }"
+        v-model:pageSize="detatableDataBom.pageSize"
+        v-model:currentPage="detatableDataBom.currentPage"
+        v-model:sort="detatableDataBom.sort"
+      />
+    </Dialog>
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { ProductreceiptRecordMain,ProductreceiptRecordMainRules,ProductreceiptRecordDetail,ProductreceiptRecordDetailRules } from './productreceiptRecordMain.data'
+import { ProductreceiptRecordMain,ProductreceiptRecordMainRules,ProductreceiptRecordDetail,ProductreceiptRecordDetailRules, BackflushRecordDetailb } from './productreceiptRecordMain.data'
 import * as ProductreceiptRecordMainApi from '@/api/wms/productreceiptRecordMain'
 import * as ProductreceiptRecordDetailApi from '@/api/wms/productreceiptRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as BackflushRecordDetailbApi from '@/api/wms/backflushRecordDetailb'
 
 // 制品收货记录主
 defineOptions({ name: 'ProductreceiptRecordMain' })
@@ -77,6 +101,25 @@ const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref(ProductreceiptRecordMain.allSchemas.tableColumns)
+// 详情 table 操作扩展 按钮
+const buttondataTable = ref([{
+    label: 'Bom',
+    name: 'bom',
+    hide: false,
+    type: 'primary',
+    icon: '',
+    color: '',
+    hasPermi: '',
+    link: true, // 文本展现按钮
+  }])
+
+// Bom查看
+const DialogTitle = ref('Bom信息')
+const bomModelVisible = ref(false)
+const { tableObject: detatableDataBom, tableMethods: detatableMethodsBom } =useTable({
+  getListApi: BackflushRecordDetailbApi.getBackflushRecordDetailbPage
+})
+const { getList:getDetailListBom } = detatableMethodsBom
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -158,6 +201,18 @@ const searchFormClick = (searchData) => {
   getList() // 刷新当前列表
 }
 
+// 查看 Bom 按钮回调事件
+const tableFormButton = async (val , row) => {
+  if (val == 'bom') { // 查看 bom
+    bomModelVisible.value = true
+    DialogTitle.value = '物品代码【' + row.itemCode + '】——Bom信息'
+    detatableDataBom.params = {
+      masterId: row.id
+    }
+    await getDetailListBom()
+  }
+}
+
 /** 初始化 **/
 onMounted(async () => {
   getList()
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts
index ab1cdc077..df5a44962 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts
@@ -336,7 +336,7 @@ export const ProductreceiptRecordMainRules = reactive({
 export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '生产线代码',
-    field: 'productionLineCode',
+    field: 'productionlineCode',
     sort: 'custom',
     table: {
       width: 150
@@ -636,6 +636,17 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
   },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+  }
 ]))
 
 //表单校验
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
index 570fa03a8..339680630 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
@@ -67,7 +67,6 @@
     :apiUpdate="ProductreceiptRequestDetailApi.updateProductreceiptRequestDetail"
     :apiPage="ProductreceiptRequestDetailApi.getProductreceiptRequestDetailPage"
     :apiDelete="ProductreceiptRequestDetailApi.deleteProductreceiptRequestDetail"
-    :Echo="Echo"
     @searchTableSuccessDetail="searchTableSuccessDetail"
     :buttondataTable="buttondataTable"
     @tableFormButton="tableFormButton"
@@ -193,10 +192,6 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
   })
 }
 
-// 子表新增的时候选择表格之后需要会显得字段
-// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
-const Echo =  []
-
 const { tableObject, tableMethods } = useTable({
   getListApi: ProductreceiptRequestMainApi.getProductreceiptRequestMainPage // 分页接口
 })