From add596bc0b92496166b7b31e9e6d45c61b2bfc93 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 22 Nov 2024 10:28:09 +0800
Subject: [PATCH] =?UTF-8?q?YT-1138=E8=A7=84=E5=88=99=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=A1=AB=E5=86=99=EF=BC=8C=E5=A1=AB=E5=86=99=E4=B8=8D=E5=AD=98?=
 =?UTF-8?q?=E5=9C=A8=E7=9A=84=E5=BA=94=E6=8F=90=E7=A4=BA=EF=BC=8C=E5=A6=82?=
 =?UTF-8?q?=E4=BB=93=E5=BA=93=E4=B8=8D=E5=AD=98=E5=9C=A8=EF=BC=8C=E7=8E=B0?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E5=90=8E=E7=9B=B4=E6=8E=A5=E6=B8=85=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../strategy/deliverStrategy/AddForm.vue      | 10 +++---
 .../strategy/downShelfStrategy/AddForm.vue    | 34 +++++++++++--------
 2 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/deliverStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/deliverStrategy/AddForm.vue
index 9034ef56b..1bd789e82 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/deliverStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/deliverStrategy/AddForm.vue
@@ -271,7 +271,7 @@
                   </el-input>
 
                   <!-- 库区 -->
-                  <el-input style="flex:1" v-show="warehouseType == 'AreaCode'" placeholder="请选择从库区" v-model="formData.configuration.AreaCode" @blur="({module:'config',type:'AreaCode'})">
+                  <el-input style="flex:1" v-show="warehouseType == 'AreaCode'" placeholder="请选择从库区" v-model="formData.configuration.AreaCode" @blur="blurWarehouse({module:'config',type:'AreaCode'})">
                     <template #suffix>
                       <el-button type="text" plain style="color:var(--el-button-text-color)" @click.stop="searchWarehouse">
                         <Icon icon="ep:search" class="mr-5px" /> 
@@ -281,7 +281,7 @@
 
                   
                   <!-- 库位组 -->
-                  <el-input style="flex:1" v-show="warehouseType == 'LocationGroupCode'" placeholder="请选择从库位组" v-model="formData.configuration.LocationGroupCode" @blur="({module:'config',type:'LocationGroupCode'})">
+                  <el-input style="flex:1" v-show="warehouseType == 'LocationGroupCode'" placeholder="请选择从库位组" v-model="formData.configuration.LocationGroupCode" @blur="blurWarehouse({module:'config',type:'LocationGroupCode'})">
                     <template #suffix>
                       <el-button type="text" plain style="color:var(--el-button-text-color)" @click.stop="searchWarehouse">
                         <Icon icon="ep:search" class="mr-5px" /> 
@@ -290,7 +290,7 @@
                   </el-input>
 
                   <!-- 库位 -->
-                  <el-input style="flex:1" v-show="warehouseType == 'LocationCode'" placeholder="请选择从库位" v-model="formData.configuration.LocationCode" @blur="({module:'config',type:'LocationCode'})">
+                  <el-input style="flex:1" v-show="warehouseType == 'LocationCode'" placeholder="请选择从库位" v-model="formData.configuration.LocationCode" @blur="blurWarehouse({module:'config',type:'LocationCode'})">
                     <template #suffix>
                       <el-button type="text" plain style="color:var(--el-button-text-color)" @click.stop="searchWarehouse">
                         <Icon icon="ep:search" class="mr-5px" /> 
@@ -755,7 +755,9 @@ const filterMethodWarehouseList = (query: string) => {
 
 const searchTableRef = ref()
 
-const blurWarehouse = async ({module='config',type})=>{
+const blurWarehouse = async ({ module = 'config', type }) => {
+  console.log(22,warehouseType.value)
+  console.log(22,module)
   
   // 校验的值
   let warehouseValue = formData.value.configuration[warehouseType.value]
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
index 824876c28..4bc06a6d2 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
@@ -215,7 +215,7 @@
                   v-else-if="item.ParamCode == 'Project'"
                   :disabled="formData.priority==0&&formType=='update'"
                 />
-                <el-input key="物料" style="flex:1" placeholder="请输入物料，多个物料以逗号分隔" disabled v-else-if="item.ParamCode == 'ItemCode'"v-model="item.Value" :disabled="formData.priority==0&&formType=='update'">
+                <el-input key="物料" style="flex:1" placeholder="请输入物料，多个物料以逗号分隔" v-else-if="item.ParamCode == 'ItemCode'"v-model="item.Value" :disabled="formData.priority==0&&formType=='update'" @blur="blurVerify('ItemCode')">
                     <template #suffix>
                       <el-button :disabled="formData.priority==0&&formType=='update'" type="text" plain style="color:var(--el-button-text-color)" @click.stop="searchItemCode">
                         <Icon icon="ep:search" class="mr-5px" /> 
@@ -341,7 +341,7 @@
                     :key="'生产线Operator'+cur.value"
                   />
                 </el-select>
-                <el-input key="生产线Value" style="flex:1" placeholder="请选择生产线" v-model="item.Value" @blur="blurProductionline" 
+                <el-input key="生产线Value" style="flex:1" placeholder="请选择生产线" v-model="item.Value" @blur="blurVerify('Productionline')" 
                   :disabled="formData.priority==0&&formType=='update'">
                     <template #suffix>
                       <el-button :disabled="formData.priority==0&&formType=='update'" type="text" plain style="color:var(--el-button-text-color)" @click.stop="searchTransactionType">
@@ -659,12 +659,7 @@
 <script setup lang="ts">
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 defineOptions({ name: 'UpShelfStrategyAddForm' })
-import { getSupplierList } from '@/api/wms/supplier'
-import { getCustomerList } from '@/api/wms/customer'
-import { getWarehouseList } from '@/api/wms/warehouse'
-import { getAreaList } from '@/api/wms/areabasic'
-import { getLocationgroupList } from '@/api/wms/locationgroup'
-import { getLocationList } from '@/api/wms/location'
+
 import * as RuleApi from '@/api/wms/rule'
 import * as WarehouseApi from '@/api/wms/warehouse'
 import { Warehouse } from '@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data'
@@ -676,6 +671,8 @@ import { Locationgroup } from '@/views/wms/basicDataManage/factoryModeling/locat
 import * as LocationApi from '@/api/wms/location'
 import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
 import { isString } from '@/utils/is'
+
+
 import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 import * as TransactiontypeApi from '@/api/wms/transactiontype'
 import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data'
@@ -981,6 +978,7 @@ const blurWarehouse = async ()=>{
         message.alert('代码' + str + '没有找到对应数据')
       }
     }else{
+     message.alert('代码' + formData.value.configuration[warehouseType.value]  + '没有找到对应数据')
       formData.value.configuration[warehouseType.value] = ''
     }
   }else if(warehouseType.value == 'LocationGroupCode'){
@@ -1062,13 +1060,21 @@ const searchTransactionType = ()=>{
   )
 }
 // 失去焦点校验
-const blurProductionline= async ()=>{
-  let transactionType = formData.value.condition.find(item => item['ParamCode'] == 'Productionline')
+const blurVerify= async (type)=>{
+  let transactionType = formData.value.condition.find(item => item['ParamCode'] == type)
   console.log(transactionType)
-  if(transactionType&&transactionType.Value){
-    let verifyRes = await ProductionlineApi.getProductionlineByCodes({
-      codes:transactionType.Value
-    })
+  if (transactionType && transactionType.Value) {
+    let verifyRes =null
+    if (type == 'ItemCode') {
+      verifyRes = await ItembasicApi.getItemListByCodes({
+        codes:transactionType.Value
+      })
+    }else if (type == 'Productionline') {
+      verifyRes = await ProductionlineApi.getProductionlineByCodes({
+        codes:transactionType.Value
+      })
+    }
+    
     console.log('事务类型verifyRes',verifyRes)
     if(verifyRes&&verifyRes.length>0){
       let verifyList = verifyRes.map(item=>(item['code']))