From c0ae21753d7e6cc12b5c0ec7f3e5a0e4d69139e9 Mon Sep 17 00:00:00 2001
From: 18110972313 <780768673@qq.com>
Date: Thu, 8 May 2025 15:45:28 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=BE=85=E6=9D=90=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BB=93=E5=BA=93=E3=80=81=E5=BA=93=E4=BD=8D?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/stockIn/NoPoStockIn/index.vue | 43 ++++++++++++++++---------
 1 file changed, 28 insertions(+), 15 deletions(-)

diff --git a/src/views/stockIn/NoPoStockIn/index.vue b/src/views/stockIn/NoPoStockIn/index.vue
index 64db23b..892903f 100644
--- a/src/views/stockIn/NoPoStockIn/index.vue
+++ b/src/views/stockIn/NoPoStockIn/index.vue
@@ -53,14 +53,14 @@
             </el-input>
           </template>
         </el-table-column>
-        <el-table-column prop="ERPLOCATION" label="库位"  width="180">
+        <el-table-column prop="ERPLOCATION" label="仓库"  width="180">
           <template #default="scope">
 <!--            <el-select v-model="scope.row.ERPLOCATION" placeholder="选择仓库" style="width: 170px"
                        default-first-option @focus="getStorageSpec(scope.row.ERPLOCATION)" filterable >-->
             <el-select v-model="scope.row.ERPLOCATION" placeholder="选择仓库" style="width: 170px"
-                       default-first-option filterable >
-              <el-option v-for="item in state.ERPLocationList" :key="item.VALUE" :label="item.LABEL"
-                         :value="item.VALUE" />
+                       default-first-option filterable @change="getStorageSpec">
+              <el-option v-for="item in state.ERPLocationList" :key="item.ENUMVALUE" :label="item.DESCRIPTION"
+                         :value="item.ENUMVALUE" />
             </el-select>
           </template>
         </el-table-column>
@@ -71,8 +71,8 @@
                        default-first-option filterable >-->
             <el-select v-model="scope.row.LOCATIONNAME" placeholder="选择库位" style="width: 170px"
                        default-first-option filterable >
-              <el-option v-for="item in state.POCreateLocationList" :key="item.VALUE" :label="item.LABEL"
-                         :value="item.VALUE" />
+              <el-option v-for="item in state.POCreateLocationList" :key="item.STORAGENAME" :label="item.DESCRIPTION"
+                         :value="item.STORAGENAME" />
             </el-select>
           </template>
         </el-table-column>
@@ -120,6 +120,7 @@ import {getOpCode} from "@/api/opcode";
 import { bTableHeight } from "../../../composables/calcTableHeight";
 import Drawer from '@/views/stockIn/delivery/drawer.vue'
 import { getStoreDetail } from '@/api/delivery'
+import request from '@/utils/request'
 
 const { tableContainer, tableHeight, updateTableHeight, handleResize } = bTableHeight(220);
 const route = useRoute()
@@ -253,8 +254,8 @@ function handleQuery() {
     if (res.resultObj) {
       // 加载库位
       if (res.resultObj.length > 0) {
-        getERPLocation(res.resultObj[0].ERPFACTORY)
-        getStorageSpec(res.resultObj[0].ERPFACTORY)
+        getERPLocation()
+        //getStorageSpec(res.resultObj[0].ERPFACTORY)
       }
       state.MATERIALRECEIVEACT = res.resultObj
     } else {
@@ -373,7 +374,7 @@ function formatDate(date: any) {
   return year + "-" + month + "-" + day;
 }
 function getStorageSpec(value: any) {
-  state.POCreateLocationList = []
+  /*state.POCreateLocationList = []
   getQueryList({
     queryId: "GetLocationForCreatePO",
     version: "00002",
@@ -384,15 +385,27 @@ function getStorageSpec(value: any) {
   }).then((res: any) => {
     state.POCreateLocationList = res.data
 
-  })
+  })*/
+  let erpLocation = JSON.parse(localStorage.get('orgNo'));
+  request({
+    url: '/api/api/storage/getLocationNameForERPLocation',
+    method: 'post',
+    data: {
+      erpLocation: erpLocation,
+      SITENAME: 'SDK',
+    },
+  }).then((res: any) => {
+    state.POCreateLocationList = res.resultObj;
+  });
 }
-function getERPLocation(erpfactory: any) {
+function getERPLocation() {
+  let erpLocation = JSON.parse(localStorage.get('orgNo'));
   getQueryList({
-    queryId: "GetERPLocationForCreatePO",
-    version: "00001",
+    queryId: "GetErpLocationList",
+    version: "WEB00001",
     params: {
-      SITENAME: "SDK",
-      ERPFACTORYNAME: erpfactory,//PO
+      SITENAME: localStorage.get('siteName') || 'SDK',
+      ERPFACTORYNAME: erpLocation,//PO
     } as any,
   }).then((res: any) => {
     state.ERPLocationList = res.data