From e6b22d9fca8134de9a6ebc9faf5ee8ff1ce82064 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Mon, 20 May 2024 09:12:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E9=99=8D=E7=BA=A7=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../relegate/relegateRequest/index.vue        | 238 +++++++++++-------
 .../relegateRequestMain.data.ts               | 220 +++++++++++++---
 .../purchasereturnRequestMain/index.vue       |   6 +-
 3 files changed, 325 insertions(+), 139 deletions(-)

diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
index 637efc95c..36313533a 100644
--- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
@@ -1,90 +1,74 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="[...RelegateRequestMain.allSchemas.searchSchema,...RelegateRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...RelegateRequestMain.allSchemas.searchSchema, ...RelegateRequestDetail.allSchemas.searchSchema]"
+      @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
-    <!-- 列表头部 -->
-    <TableHead
-      :HeadButttondata="HeadButttondata"
-      @button-base-click="buttonBaseClick"
-      :routeName="routeName"
-      @updataTableColumns="updataTableColumns"
-      @searchFormClick="searchFormClick"
-      :allSchemas="RelegateRequestMain.allSchemas"
-      :detailAllSchemas="RelegateRequestDetail.allSchemas"
-    />
+  <!-- 列表头部 -->
+  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
+    @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick"
+    :allSchemas="RelegateRequestMain.allSchemas" :detailAllSchemas="RelegateRequestDetail.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}">
+    <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,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+      <template #action="{ row, $index }">
+        <ButtonBase :Butttondata="butttondata(row, $index)" @button-base-click="buttonTableClick($event, row)" />
       </template>
     </Table>
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <BasicForm
-    ref="basicFormRef"
-    :isOpenSearchTable="true"
-    fieldTableColumn="itemCode"
+  <BasicForm ref="basicFormRef" 
+    :isOpenSearchTable="false" 
+    fieldTableColumn="itemCode" 
     @success="getList"
-    :rules="RelegateRequestMainRules"
+    :rules="RelegateRequestMainRules" 
     :formAllSchemas="RelegateRequestMain.allSchemas"
-    :tableAllSchemas="RelegateRequestDetail.allSchemas"
+    :tableAllSchemas="RelegateRequestDetail.allSchemas" 
     :tableFormRules="RelegateRequestDetailRules"
-    :tableData="tableData"
+    :tableData="tableData" 
     :apiUpdate="RelegateRequestMainApi.updateRelegateRequestMain"
-    :apiCreate="RelegateRequestMainApi.createRelegateRequestMain"
-    :isBusiness="true"
-    fromeWhere="RelegateRequestMain"
-    @handleAddTable="handleAddTable"
-    @handleDeleteTable="handleDeleteTable"
+    :apiCreate="RelegateRequestMainApi.createRelegateRequestMain" 
+    :isBusiness="true" fromeWhere="RelegateRequestMain"
+    @handleAddTable="handleAddTable" 
+    @handleDeleteTable="handleDeleteTable" 
     @searchTableSuccess="searchTableSuccess"
     @submitForm="submitForm"
-    :isShowButton = isShowButton
-  />
+    :isShowButton=isShowButton />
 
   <!-- 详情 -->
-  <Detail 
-    ref="detailRef" 
+  <Detail ref="detailRef" 
     :isBasic="true" 
-    :allSchemas="RelegateRequestMain.allSchemas" 
-    :detailAllSchemas="RelegateRequestDetail.allSchemas"
+    :allSchemas="RelegateRequestMain.allSchemas"
+    :detailAllSchemas="RelegateRequestDetail.allSchemas" 
     :detailAllSchemasRules="RelegateRequestDetailRules"
     :apiCreate="RelegateRequestDetailApi.createRelegateRequestDetail"
     :apiUpdate="RelegateRequestDetailApi.updateRelegateRequestDetail"
     :apiPage="RelegateRequestDetailApi.getRelegateRequestDetailPage"
-    :apiDelete="RelegateRequestDetailApi.deleteRelegateRequestDetail"
+    :apiDelete="RelegateRequestDetailApi.deleteRelegateRequestDetail" 
     fromeWhere="RelegateRequestMain"
-    @searchTableSuccessDetail="searchTableSuccessDetail"
+    @searchTableSuccessDetail="searchTableSuccessDetail" 
     :detailButtonIsShowAdd="trueFalse"
-    :detailButtonIsShowDelete="trueFalse"
-/>
+    :detailButtonIsShowDelete="trueFalse" />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/wms/relegate-request-main/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <ImportForm ref="importFormRef" url="/wms/relegate-request-main/import" :importTemplateData="importTemplateData"
+    @success="importSuccess" />
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { RelegateRequestMain,RelegateRequestMainRules,RelegateRequestDetail,RelegateRequestDetailRules } from './relegateRequestMain.data'
+import { RelegateRequestMain, RelegateRequestMainRules, RelegateRequestDetail, RelegateRequestDetailRules } from './relegateRequestMain.data'
 import * as RelegateRequestMainApi from '@/api/wms/relegateRequestMain'
 import * as RelegateRequestDetailApi from '@/api/wms/relegateRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
@@ -99,34 +83,100 @@ const { t } = useI18n() // 国际化
 
 const route = useRoute() // 路由信息
 const routeName = ref()
+const businessType = 'relegate'
 routeName.value = route.name
-const tableColumns = ref([...RelegateRequestMain.allSchemas.tableColumns,...RelegateRequestDetail.allSchemas.tableMainColumns])
+const tableColumns = ref([...RelegateRequestMain.allSchemas.tableColumns, ...RelegateRequestDetail.allSchemas.tableMainColumns])
 const isShowButton = ref(true)
 //定义  展示子表数据时是否显示新增/修改/删除按钮
 const trueFalse = ref(false)
 
 // 查询页面返回
-const searchTableSuccess = (formField, searchField, val, formRef) => {
+const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
   nextTick(() => {
-    const setV = {}
-    setV[formField] = val[0][searchField]
-    formRef.setValues(setV)
+    if (type == 'tableForm') {
+      if (formField == 'itemCode') {
+        row['itemCode'] = val[0]['itemCode']
+        row['uom'] = val[0]['uom']
+        row['qty'] = val[0]['qty']
+        row['fromBatch'] = val[0]['batch']
+        row['fromPackingNumber'] = val[0]['packingNumber']
+        row['toBatch'] = val[0]['batch']
+        row['toPackingNumber'] = val[0]['packingNumber']
+        row['fromLocationCode'] = val[0]['locationCode']
+        row['fromInventoryStatus'] = val[0]['inventoryStatus']
+      } else if (formField == 'downItemCode') {
+        row['downItemCode'] = val[0]['code']
+      } else if (formField == 'toLocationCode') {
+        row['toLocationCode'] = val[0]['code']
+      } else {
+        row[formField] = val[0][searchField]
+      }
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      if (formField == 'fromWarehouseCode') {
+        setV['fromWarehouseCode'] = val[0]['code']
+      }
+      formRef.setValues(setV)
+    }
   })
 }
 
 // 查询页面返回——详情
-const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
   nextTick(() => {
     const setV = {}
-    if(formField == 'itemCode') {
-      setV['itemCode'] = val[0]['itemCode']
-      setV['uom'] = val[0]['customerUom']    
-    }else {
-      setV[formField] = val[0][searchField]
-    }
+    setV[formField] = val[0][searchField]
     formRef.setValues(setV)
   })
 }
+
+// 修改 tableform 属性
+RelegateRequestDetail.allSchemas.tableFormColumns.map(item => {
+  if (item.field == 'itemCode') {
+    item.tableForm.searchCondition = [
+      {
+        key: 'businessType',
+        value: businessType,
+        isMainValue: false
+      }
+    ]
+    item.form.componentProps.searchCondition = [
+      {
+        key: 'businessType',
+        value: businessType,
+        isMainValue: false
+      }
+    ]
+  }
+  if (item.field == "toLocationCode") {
+    item.tableForm.searchCondition = [
+      {
+        key: 'businessType',
+        value: businessType,
+        isMainValue: false
+      }]
+    item.form.componentProps.searchCondition = [
+      {
+        key: 'businessType',
+        value: businessType,
+        isMainValue: false
+      }]
+    item.tableForm.searchCondition = [
+      {
+        key: 'businessType',
+        value: businessType,
+        isMainValue: false
+      }]
+    item.form.componentProps.searchCondition = [
+      {
+        key: 'businessType',
+        value: businessType,
+        isMainValue: false
+      }]
+  }
+})
+
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
   tableColumns.value = val
@@ -141,9 +191,9 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:relegate-request-main:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:relegate-request-main:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'wms:relegate-request-main:export'}), // 导出
+  defaultButtons.defaultAddBtn({ hasPermi: 'wms:relegate-request-main:create' }), // 新增
+  defaultButtons.defaultImportBtn({ hasPermi: 'wms:relegate-request-main:import' }), // 导入
+  defaultButtons.defaultExportBtn({ hasPermi: 'wms:relegate-request-main:export' }), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -174,7 +224,7 @@ const buttonBaseClick = (val, item) => {
 }
 
 // 根据状态返回该按钮是否显示
-const isShowMainButton = (row,val) => {
+const isShowMainButton = (row, val) => {
   if (val.indexOf(row.status) > -1) {
     return false
   } else {
@@ -183,15 +233,15 @@ const isShowMainButton = (row,val) => {
 }
 
 // 列表-操作按钮
-const butttondata = (row,$index) => {
-  const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
-  if(findIndex>0&&findIndex<$index){
+const butttondata = (row, $index) => {
+  const findIndex = row['masterId'] ? tableObject.tableList.findIndex(item => item['masterId'] == row['masterId']) : -1
+  if (findIndex > 0 && findIndex < $index) {
     return []
   }
-    return [
-  defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:relegate-request-main:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'wms:relegate-request-main:delete'}), // 删除
-]
+  return [
+    defaultButtons.mainListEditBtn({ hide: isShowMainButton(row, ['1']), hasPermi: 'wms:relegate-request-main:update' }), // 编辑
+    defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:relegate-request-main:delete' }), // 删除
+  ]
 }
 
 // 列表-操作按钮事件
@@ -211,46 +261,46 @@ const openForm = (type: string, row?: any) => {
 //为true表示子表数据中存在数量为0的数据
 const flag = ref(false)
 // form表单提交
-const submitForm = async (formType,data) => {
+const submitForm = async (formType, data) => {
   data.subList = tableData.value // 拼接子表数据参数
   let isExist = false
   tableData.value.forEach(item => {
-   let rs =  tableData.value.filter(filterItem => (filterItem.itemCode == item.itemCode))
-   if(rs.length > 1) isExist = true
+    let rs = tableData.value.filter(filterItem => (filterItem.itemCode == item.itemCode))
+    if (rs.length > 1) isExist = true
   })
   if (isExist) {
     basicFormRef.value.formLoading = false
     return message.warning('物料代码重复')
   }
   data.subList.forEach(obj => {
-    if(obj.qty == 0){
+    if (obj.qty == 0) {
       message.warning(`数量不能为0!`)
       flag.value = true
       return;
     }
   })
-  if(flag.value){
+  if (flag.value) {
     basicFormRef.value.formLoading = false
     return
   }
   try {
     if (formType === 'create') {
-      if(tableData.value.length <= 0){
-      message.warning(`子表明细不能为空!`)
-      flag.value = true
-      basicFormRef.value.formLoading = false
-      return;
-  }
-    await RelegateRequestMainApi.createRelegateRequestMain(data)
-    message.success(t('common.createSuccess'))
-  } else {
-    await RelegateRequestMainApi.updateRelegateRequestMain(data)
-    message.success(t('common.updateSuccess'))
-  }
-  basicFormRef.value.dialogVisible = false
-  getList()
-} finally {
-  basicFormRef.value.formLoading = false
+      if (tableData.value.length <= 0) {
+        message.warning(`子表明细不能为空!`)
+        flag.value = true
+        basicFormRef.value.formLoading = false
+        return;
+      }
+      await RelegateRequestMainApi.createRelegateRequestMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await RelegateRequestMainApi.updateRelegateRequestMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    basicFormRef.value.dialogVisible = false
+    getList()
+  } finally {
+    basicFormRef.value.formLoading = false
   }
 }
 
@@ -270,7 +320,7 @@ const handleDelete = async (id: number) => {
     message.success(t('common.delSuccess'))
     // 刷新列表
     await getList()
-  } catch {}
+  } catch { }
 }
 
 /**
diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
index 80f8bb35c..a45b99b30 100644
--- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
@@ -11,6 +11,9 @@ import * as WarehouseApi from "@/api/wms/warehouse";
 import * as BalanceApi from '@/api/wms/balance'
 import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
 
+import * as LocationApi  from '@/api/wms/location'
+import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
+import * as confgiApi  from '@/api/infra/config'
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
 const queryParams = {
   pageSize:10,
@@ -19,6 +22,7 @@ const queryParams = {
 }
  const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
  const requestsettingData =data?.list[0]||{}
+ const confgiData = await confgiApi.queryByKey("relegateItemType")
 // 表单校验
 export const RelegateRequestMainRules = reactive({
   fromWarehouseCode: [required],
@@ -39,7 +43,10 @@ export const RelegateRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     isSearch: true,
-    isForm: false
+    isForm: false,
+    table: {
+      width: 180
+    },
   },
   {
     label: '从仓库代码',
@@ -60,14 +67,16 @@ export const RelegateRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
           isMainValue: false
         }]
       }
-    }
+    },
+    table: {
+      width: 180
+    },
   },
 
   {
     label: '业务类型',
     field: 'businessType',
     sort: 'custom',
-    isSearch: true,
     isForm: false,
     isTable: false
   },
@@ -75,7 +84,6 @@ export const RelegateRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '备注',
     field: 'remark',
     sort: 'custom',
-    isSearch: true,
     isForm: false,
     isTable: false
   },
@@ -269,7 +277,6 @@ export const RelegateRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '原因',
     field: 'reason',
     sort: 'custom',
-    isForm: false,
   },
   {
     label: '操作',
@@ -303,16 +310,33 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
         isSearchList: true,
         searchListPlaceholder: '请选择物料代码',
         searchField: 'itemCode',
-        searchTitle: '物料基础信息',
-        searchAllSchemas: Itembasic.allSchemas,
-        searchPage: ItembasicApi.getItembasicPage,
+        searchTitle: '库存余额信息',
+        searchAllSchemas: Balance.allSchemas,
+        searchPage: BalanceApi.getBalancePageByBusinessTypeByItemType,
         searchCondition: [{
           key: 'available',
           value: 'TRUE',
           isMainValue: false
         }]
       }
-    }
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+      searchField: 'itemCode', // 查询弹窗赋值字段
+      searchTitle: '库存余额信息', // 查询弹窗标题
+      searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类
+      searchPage: BalanceApi.getBalancePageByBusinessTypeByItemType, // 查询弹窗所需分页方法
+      searchCondition:[
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+    },
+    table: {
+      width: 150
+    },
   },
   {
     label: '降级物料代码',
@@ -322,7 +346,7 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         isSearchList: true,
         searchListPlaceholder: '请选择降级物料代码',
-        searchField: 'itemCode',
+        searchField: 'code',
         searchTitle: '物料基础信息',
         searchAllSchemas: Itembasic.allSchemas,
         searchPage: ItembasicApi.getItembasicPage,
@@ -330,10 +354,35 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
+        },{
+          key: 'type',
+          value: confgiData.itemType,
+          isMainValue: false
         }]
       }
     },
-    isSearch: true
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择降级物料代码', // 输入框占位文本
+      searchField: 'itemCode', // 查询弹窗赋值字段
+      searchTitle: '物料基础信息', // 查询弹窗标题
+      searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
+      searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
+      searchCondition:[
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'type',
+          value: confgiData.itemType,
+          isMainValue: false
+        }]
+    },
+    isSearch: true,
+    table: {
+      width: 150
+    },
   },
   {
     label: '计量单位',
@@ -342,7 +391,7 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     dictClass: 'string',
     sort: 'custom',
     table: {
-      width: 150
+      width: 80
     },
     tableForm: {
       type: 'Select',
@@ -358,6 +407,17 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '数量',
     field: 'qty',
     sort: 'custom',
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    },
+    table: {
+      width: 80
+    },
   },
   {
     label: '从批次',
@@ -368,6 +428,12 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
         disabled: true,
       }
     },
+    tableForm: {
+      disabled: true
+    },
+    table: {
+      width: 120
+    },
   },
   {
     label: '从包装号',
@@ -378,6 +444,12 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
         disabled: true,
       }
     },
+    tableForm: {
+      disabled: true
+    },
+    table: {
+      width: 120
+    },
   },
   {
     label: '从库位代码',
@@ -388,90 +460,150 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
         disabled: true,
       }
     },
+    tableForm: {
+      disabled: true
+    },
+    table: {
+      width: 120
+    },
   },
   {
     label: '从库区类型',
     field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: false,
+    isForm: false,
+    isTableForm: false,
     sort: 'custom',
-    isForm:false,
   },
   {
     label: '从库区代码',
     field: 'fromAreaCodes',
     sort: 'custom',
     isForm:false,
-  },
-  {
-    label: '从仓库代码',
-    field: 'fromWarehouseCode',
-    sort: 'custom',
-    isForm:false,
+    isTableForm: false,
+    table: {
+      width: 150
+    },
   },
   {
     label: '到包装号',
     field: 'toPackingNumber',
     sort: 'custom',
+    tableForm: {
+      disabled: true
+    },
+    table: {
+      width: 120
+    },
   },
   {
     label: '到批次',
     field: 'toBatch',
     sort: 'custom',
+    tableForm: {
+      disabled: true
+    },
+    table: {
+      width: 120
+    },
   },
   {
     label: '到库位代码',
     field: 'toLocationCode',
     sort: 'custom',
-  },
-  {
-    label: '到仓库代码',
-    field: 'toWarehouseCode',
-    sort: 'custom',
-    isForm:false,
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择到库位代码',
+      searchField: 'code',
+      searchTitle: '库位信息',
+      searchAllSchemas: Location.allSchemas,
+      searchPage: LocationApi.selectBusinessTypeToLocation,
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择到库位代码',
+        searchField: 'code',
+        searchTitle: '库位信息',
+        searchAllSchemas: Location.allSchemas,
+        searchPage: LocationApi.selectBusinessTypeToLocation,
+      }
+    },
+    table: {
+      width: 120
+    },
   },
   {
     label: '到库区类型',
     field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: false,
     sort: 'custom',
-    isForm:false,
+    isTableForm: false
   },
   {
     label: '到库区代码',
     field: 'toAreaCodes',
     sort: 'custom',
     isForm:false,
+    isTableForm: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    isForm:false,
+    isTableForm: false,
+    table: {
+      width: 150
+    },
   },
   {
     label: '是否可用',
     field: 'available',
     sort: 'custom',
     isForm:false,
+    isTableForm: false,
+    isTable:false,
   },
   {
     label: '备注',
     field: 'remark',
     sort: 'custom',
+    isForm:false,
+    isTableForm: false,
+    isTable:false,
   },
   {
     label: '部门',
     field: 'departmentCode',
     sort: 'custom',
     isForm:false,
+    isTableForm: false,
+    isTable:false,
   },
   {
     label: '地点ID',
     field: 'siteId',
     sort: 'custom',
-    form: {
-      component: 'InputNumber',
-      value: 0
-    },
     isForm:false,
+    isTableForm: false,
+    isTable:false,
   },
   {
     label: '扩展属性',
     field: 'extraProperties',
     sort: 'custom',
     isForm:false,
+    isTableForm: false,
+    isTable:false,
   },
   {
     label: '创建时间',
@@ -486,20 +618,21 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
-    isForm: false,
+    isForm:false,
+    isTableForm: false,
+    isTable:false,
   },
   {
     label: '状态',
     field: 'status',
     dictType: DICT_TYPE.REQUEST_STATUS,
     dictClass: 'string',
-    isSearch: true,
     isForm: false,
     isTable: true,
     sort: 'custom',
-    table: {
-      width: 150
-    },
+    isForm:false,
+    isTableForm: false,
+    isTable:false,
   },
   {
     label: '并发乐观锁',
@@ -510,30 +643,37 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'InputNumber',
       value: 0
     },
+    isForm:false,
+    isTableForm: false,
+    isTable:false,
   },
   {
     label: '工作流流水号',
     field: 'serialNumber',
     isForm:false,
     sort: 'custom',
+    isForm:false,
+    isTableForm: false,
+    isTable:false,
   },
   {
     label: '权限所属人员id',
     field: 'ruleUserId',
     sort: 'custom',
     isForm:false,
-    form: {
-      component: 'InputNumber',
-      value: 0
-    },
+    isForm:false,
+    isTableForm: false,
+    isTable:false,
   },
   {
     label: '操作',
     field: 'action',
     isForm: false,
+    hiddenInMain:true,
     table: {
       width: 150,
       fixed: 'right'
-    }
+    },
+    isTableForm: false
   }
 ]))
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
index 9824170e6..f9096474d 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
@@ -214,7 +214,6 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
       row['itemDesc2'] = val[0]['itemDesc2']
       row['batch'] = val[0]['batch']
       row['altBatch'] = val[0]['altBatch']
-      row['packingNumber'] = val[0]['packingNumber']
       row['containerNumber'] = val[0]['containerNumber']
       row['qty'] = val[0]['qty']
       row['uom'] = val[0]['uom']
@@ -244,7 +243,6 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
 
       if(formField == 'itemCode'){
         row['batch'] = val[0]['toBatch']
-        row['packingNumber'] = val[0]['toPackingNumber']
         row['containerNumber'] = val[0]['toContainerNumber']
         row['containerNumber'] = val[0]['containerNumber']
         row['containerNumber'] = val[0]['containerNumber']
@@ -268,7 +266,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
             if (res) tableData.value = res
             tableData.value.forEach((item) => {
               item.batch = item.toBatch
-              item.packingNumber = item.toPackingNumber
+              item.packingNumber = null
               item.containerNumber = item.toContainerNumber
               item.receiptQty = item.qty
               item.toLocationGroupCode = null
@@ -331,7 +329,6 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
       setV['itemDesc2'] = val[0]['itemDesc2']
       setV['batch'] = val[0]['toBatch']
       setV['altBatch'] = val[0]['altBatch']
-      setV['packingNumber'] = val[0]['toPackingNumber']
       setV['containerNumber'] = val[0]['toContainerNumber']
       setV['receiptQty'] = val[0]['qty']
       setV['qty'] = val[0]['qty']
@@ -362,7 +359,6 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
 
       if(formField == 'itemCode'){
         setV['batch'] = val[0]['toBatch']
-        setV['packingNumber'] = val[0]['toPackingNumber']
         setV['containerNumber'] = val[0]['toContainerNumber']
         setV['containerNumber'] = val[0]['containerNumber']
         setV['containerNumber'] = val[0]['containerNumber']