From fba327b6ca1fa4880bafdab660e420e4ceae180c Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Tue, 19 Dec 2023 18:39:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=B6=E5=93=81=E8=BF=94=E4=BF=AE=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productrepairRecordMain.data.ts           |  3 ++-
 .../productrepairRequestMain/index.vue        |  5 +++--
 .../productrepairRequestMain.data.ts          | 22 +++++++++++++++++--
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts
index ffe9b6d18..4ab68b185 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts
+++ b/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts
@@ -324,7 +324,8 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'fromOwnerCode',
     sort: 'custom',
     table: {
-      width: 150
+      width: 150,
+      show:false
     },
   },
   {
diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
index 54bf4a040..da82011fd 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
+++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
@@ -211,10 +211,10 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         row['batch'] = val[0]['batch']
         row['uom'] = val[0]['uom']
         row['inventoryStatus'] = val[0]['inventoryStatus']
-        row['fromLocationCode'] = val[0]['locationCode']
       } else if(formField == 'productionLineCode'){
         row['productionLineCode'] = val[0]['code']
       } else if(formField == 'workStationCode'){
+        row['fromLocationCode'] = val[0]['rawLocationCode']
         row['workStationCode'] = val[0]['code']
       } else if(formField == 'formField'){
         row['workStationCode'] = val[0]['code']
@@ -242,10 +242,11 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
       setV['batch'] = val[0]['batch']
       setV['uom'] = val[0]['uom']
       setV['inventoryStatus'] = val[0]['inventoryStatus']
-      setV['fromLocationCode'] = val[0]['locationCode']
+      // setV['fromLocationCode'] = val[0]['locationCode']
     } else if(formField == 'productionLineCode'){
       setV['productionLineCode'] = val[0]['code']
     } else if(formField == 'workStationCode'){
+      setV['fromLocationCode'] = val[0]['rawLocationCode']
       setV['workStationCode'] = val[0]['code']
     } else if(formField == 'formField'){
       setV['workStationCode'] = val[0]['code']
diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
index 9b212e0dd..e12a1a61b 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
+++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
@@ -598,7 +598,16 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
       searchField: 'packingNumber',
       searchTitle: '库存余额信息',
       searchAllSchemas: Balance.allSchemas,
-      searchPage: BalanceApi.getBalancePage
+      searchPage: BalanceApi.getBalancePage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'locationCode',
+        value: 'fromLocationCode',
+        isMainValue: true
+      }]
     },
     form: {
       // labelMessage: '信息提示说明！！！',
@@ -608,7 +617,16 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
         searchField: 'packingNumber',
         searchTitle: '库存余额信息',
         searchAllSchemas: Balance.allSchemas,
-        searchPage: BalanceApi.getBalancePage
+        searchPage: BalanceApi.getBalancePage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'locationCode',
+          value: 'fromLocationCode',
+          isMainValue: true
+        }]
       }
     }
   },