From 7ae027b72d32d843da3cfada2b29ec476a26c9bb Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 2 Aug 2024 19:52:24 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=AE=E6=A0=87=E5=BA=93=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionreturnRequestMain.data.ts       | 52 ++++++++++++++++++
 .../productionreturnRequestMainNo.data.ts     | 54 ++++++++++++++++++-
 2 files changed, 104 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
index 916c1c6ee..0c9f20e76 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
@@ -22,6 +22,8 @@ import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackag
 
 import * as SupplieritemApi  from '@/api/wms/supplieritem'
 import { Supplieritem } from '@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data'
+import * as LocationApi from '@/api/wms/location'
+import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
 
 const { t } = useI18n() // 国际化
 
@@ -639,6 +641,53 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
       }], // 失去焦点校验参数
     },
   },
+  {
+    label: '目标库位',
+    field: 'toLocationCode',
+    sort: 'custom',
+    tableForm: {
+      multiple: true,//多选
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+      searchField: 'code', // 查询弹窗赋值字段
+      searchTitle: '库位基础信息', // 查询弹窗标题
+      searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+      searchPage: LocationApi.selectBusinessTypeOutLocation, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key: 'businessType',
+        value: 'ReturnToHold', // 隔离退料
+        isMainValue: false
+      },
+      {
+        key: 'isIn',
+        value: 'in',
+        isMainValue: false
+        }
+    ]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        multiple: true,//多选
+        searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库位基础信息', // 查询弹窗标题
+        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+        searchPage: LocationApi.selectBusinessTypeOutLocation, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'businessType',
+          value: 'ReturnToHold', // 隔离退料
+          isMainValue: false
+        },
+        {
+          key: 'isIn',
+          value: 'in',
+          isMainValue: false
+          }]
+      }
+    }
+  },
   {
     label: '原料库位',
     field: 'fromLocationCode',
@@ -1115,6 +1164,9 @@ export const ProductionreturnRequestDetailRules = reactive({
   workStationCode: [
     { required: true, message: '请选择工位代码', trigger: 'change' }
   ],
+  toLocationCode: [
+    { required: true, message: '请选择目标库位', trigger: 'change' }
+  ],
   productionLineCode: [
     { required: true, message: '请选择生产线代码', trigger: 'change' }
   ],
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts
index bd3ec8374..753a35d25 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts
@@ -15,7 +15,8 @@ import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
 
 import * as ItempackagingApi from '@/api/wms/itempackage'
 import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
-
+import * as LocationApi from '@/api/wms/location'
+import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
 const { t } = useI18n() // 国际化
 
 /**
@@ -158,7 +159,53 @@ export const ProductionreturnRequestDetail = useCrudSchemas(
         ] // 失去焦点校验参数
       }
     },
-
+    {
+      label: '目标库位',
+      field: 'toLocationCode',
+      sort: 'custom',
+      tableForm: {
+        multiple: true,//多选
+        isInpuFocusShow: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库位基础信息', // 查询弹窗标题
+        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+        searchPage: LocationApi.selectBusinessTypeOutLocation, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'businessType',
+          value: 'ReturnToHold', // 隔离退料
+          isMainValue: false
+        },
+        {
+          key: 'isIn',
+          value: 'in',
+          isMainValue: false
+          }
+      ]
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          isSearchList: true, // 开启查询弹窗
+          multiple: true,//多选
+          searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+          searchField: 'code', // 查询弹窗赋值字段
+          searchTitle: '库位基础信息', // 查询弹窗标题
+          searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+          searchPage: LocationApi.selectBusinessTypeOutLocation, // 查询弹窗所需分页方法
+          searchCondition: [{
+            key: 'businessType',
+            value: 'ReturnToHold', // 隔离退料
+            isMainValue: false
+          },
+          {
+            key: 'isIn',
+            value: 'in',
+            isMainValue: false
+            }]
+        }
+      }
+    },
     {
       label: '物料代码',
       field: 'itemCode',
@@ -614,6 +661,9 @@ export const ProductionreturnRequestDetailRules = reactive({
   workStationCode: [
     { required: true, message: '请选择工位代码', trigger: 'change' }
   ],
+  toLocationCode: [
+    { required: true, message: '请选择目标库位', trigger: 'change' }
+  ],
   productionLineCode: [
     { required: true, message: '请选择生产线代码', trigger: 'change' }
   ],