From f11e91daa407755f9dadaf31b6fa986c4690fed5 Mon Sep 17 00:00:00 2001
From: 18110972313 <780768673@qq.com>
Date: Tue, 29 Apr 2025 16:22:17 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=BD=A2=E6=80=81=E8=BD=AC=E6=8D=A2?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E6=9C=AA=E5=88=86=E9=85=8D=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E4=BF=A1=E6=81=AF=E5=88=97=E8=A1=A8=E6=9C=AA=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E5=BA=93=E5=AD=98=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=92=8C?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=8F=B3=E7=A7=BB=E6=8C=89=E9=92=AE=E5=B7=B2?=
 =?UTF-8?q?=E5=88=86=E9=85=8D=E6=A0=87=E7=AD=BE=E4=BF=A1=E6=81=AF=E6=9C=AA?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stocked/MoveTransformation/index.vue      | 65 +++++++++++++++++--
 1 file changed, 60 insertions(+), 5 deletions(-)

diff --git a/src/views/stocked/MoveTransformation/index.vue b/src/views/stocked/MoveTransformation/index.vue
index 1eb4492..11b3b74 100644
--- a/src/views/stocked/MoveTransformation/index.vue
+++ b/src/views/stocked/MoveTransformation/index.vue
@@ -41,7 +41,26 @@
                     <div class="page-table-title-left">
                       <span>未分配标签信息</span>
                     </div>
-                    <el-form :model="queryParams" :inline="true" label-width="40px" label-position="left" style="margin-left:20px">
+                    <el-form-item label="货位" prop="params.LOCATION">
+                      <el-select
+                        size="small"
+                        filterable
+                        v-model="state.ChangeLocation"
+                        default-first-option
+                        placeholder="请选择货位"
+                        :filter-method="getlocDec"
+                        style="width: 240px"
+                        @change="searchFn"
+                      >
+                        <el-option
+                          v-for="item in state.LocationList"
+                          :key="item.STORAGENAME"
+                          :label="item.DESCRIPTION"
+                          :value="item.STORAGENAME"
+                        />
+                      </el-select>
+                    </el-form-item>
+<!--                    <el-form :model="queryParams" :inline="true" label-width="40px" label-position="left" style="margin-left:20px">
                       <el-form-item label="货位" prop="params.LOCATION">
                         <el-select v-model="state.ChangeLocation" clearable collapse-tags placeholder="请选择货位"
                                    popper-class="custom-header" :max-collapse-tags="1" style="width: 240px"
@@ -51,6 +70,7 @@
                         </el-select>
                       </el-form-item>
                     </el-form>
+                    -->
                   </div>
                 </div>
               </el-col>
@@ -145,6 +165,7 @@ import { bTableHeight } from "../../../composables/calcTableHeight";
 import { localStorage } from "@/utils/storage";
 import { cals } from '@/utils/cal'
 import { AssignOrDessignShipRequest, MoveTransform } from '@/api/moveTrans'
+import request from '@/utils/request'
 const { tableContainer, tableHeight, updateTableHeight, handleResize } = bTableHeight(400);
 
 const queryFormRef = ref(ElForm);
@@ -179,6 +200,7 @@ const state: any = reactive({
   ChangeERPLocation: [],
   ChangeLocation: [],
   STOCKSELECTLIST: [] as any,
+  locDecListAll: [] as any,
   queryParams: {
     queryId: "",
     version: "",
@@ -200,6 +222,7 @@ const state: any = reactive({
       SHIPREQUESTDETAILNAME: '',
       DESCRIPTION: '',
       CAREER_ASSISTANCE: '',
+      ERPRECEIVELOCATION: '',
     },
   },
   RightqueryParams: {
@@ -329,6 +352,7 @@ onMounted(() => {
   state.commitDate = year + '-' + moth + '-' + day
   updateTableHeight();
   window.addEventListener('resize', handleResize);
+  getStorageSpecLocationList()
 });
 
 function JudgeMentERPLocation() {
@@ -414,14 +438,14 @@ function handle(row: any, event: any, column: any) {
   state.LShipRequestDetailName = row.SHIPREQUESTDETAILNAME
   state.LShipType = row.SHIPREQUESTTYPE
   state.queryParams.params.IsCheck = state.IsCheck
-
+  state.queryParams.params.ERPRECEIVELOCATION = state.ChangeLocation
   getQueryList(state.queryParams).then((res: any) => {
     state.MaterialPackingList = res.data;
     state.MaterialPackingList2 = res.data;
   });
 
   state.RightqueryParams.queryId = 'GetPackingRow';
-  state.RightqueryParams.version = 'Z00002_NEW';
+  state.RightqueryParams.version = 'Z00003_NEW';
   state.RightqueryParams.params.MATERIALSPECNAME = row.MATERIALSPECNAME;
   state.RightqueryParams.params.SHIPREQUESTNAME = row.SHIPREQUESTNAME;
   state.RightqueryParams.params.SDK_ID = row.SDK_ID;
@@ -436,7 +460,7 @@ function handle(row: any, event: any, column: any) {
       return (cals.add(init, current.MATERIALQUANTITY2)).toNumber();
     }, 0)
   });
-
+  /*
   state.queryParams.queryId = 'GetLocationList';
   state.queryParams.version = 'ZWP007_NEW';
   state.queryParams.params.MATERIALSPECNAME = row.MATERIALSPECNAME;
@@ -451,7 +475,7 @@ function handle(row: any, event: any, column: any) {
   getQueryList(state.queryParams).then((res: any) => {
     state.LocationList = res.data;
   });
-
+  */
   tableInfo.value.setCurrentRow(row)
 }
 
@@ -613,6 +637,37 @@ function handleStockOut() {
     state.buttonOut_loading = false;
   }
 }
+
+async function getStorageSpecLocationList() {
+  let erpLocation = JSON.parse(localStorage.get('orgNo'));
+  request({
+    url: '/api/api/storage/getLocationNameForERPLocation',
+    method: 'post',
+    data: {
+      erpLocation: erpLocation,
+      SITENAME: 'SDK',
+    },
+  }).then((res: any) => {
+    state.locDecListAll = res.resultObj;
+  });
+}
+
+function getlocDec(query: any) {
+  // console.log(query)
+  //let arr = state.locDecListAll;
+  let arr = state.locDecListAll.filter((item: any) => {
+    return item.STORAGENAME.includes(query) || item.STORAGENAME.includes(query)
+  })
+  // console.log(arr)
+  if (arr.length > 50) {
+    state.LocationList = arr.slice(0, 50)
+  } else {
+    state.LocationList = arr
+  }
+  state.LocationList.unshift({
+    STORAGENAME: ''
+  })
+}
 </script>
 
 <style scoped lang="scss">