From f7a9da6a830fc53b3967624034093e56ba8e9e60 Mon Sep 17 00:00:00 2001
From: 18110972313 <780768673@qq.com>
Date: Tue, 13 May 2025 20:52:27 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=87=BA=E5=85=A5=E5=BA=93=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=EF=BC=8C=E6=9F=A5=E8=AF=A2=E4=BA=8B=E4=BB=B6=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StockQuery/StockTransaction/index.vue     |  4 +++
 .../auxiliaryManage/auxiliaryOut/index.vue    |  2 +-
 .../stockOut/shipRequestReserve/index.vue     |  4 ++-
 .../stocked/MoveTransformation/index.vue      | 32 +++++++++++--------
 src/views/stocked/locationMovePage/index.vue  | 32 ++++++++++++++++++-
 5 files changed, 58 insertions(+), 16 deletions(-)

diff --git a/src/views/Query/StockQuery/StockTransaction/index.vue b/src/views/Query/StockQuery/StockTransaction/index.vue
index 5bfaf83..2a368c9 100644
--- a/src/views/Query/StockQuery/StockTransaction/index.vue
+++ b/src/views/Query/StockQuery/StockTransaction/index.vue
@@ -342,6 +342,10 @@ function handleQuery() {
                     FROMDATE: state.queryParams.FROMDATE,
                     TODATE: state.queryParams.TODATE,
                     SITENAME: '',
+                  //'BarCodeToTransferIn','调拨出库','MES消耗','auxiliaryStockOut'，'CompletedShipRequest'
+                    EVENTOUT: ['BarCodeToTransferIn','调拨出库','MES消耗','auxiliaryStockOut','CompletedShipRequestZL','CompletedShipRequestBL','CompletedShipRequestLL','CompletedShipRequestNLCC'],
+                  //'AlloctionStockIn','FGStockIn','ReturnStockIn','NormalStockInForSDK','NoChargeStockIn'
+                    EVENTIN: ['AlloctionStockIn','FGStockIn','ReturnStockIn','NormalStockInForSDK','NoChargeStockIn','NoChargeStockIn',],
                     /*
                     UNDOID: state.queryParams.UNDOID,
                     STOCKSTATE: state.queryParams.STOCKSTATE,
diff --git a/src/views/auxiliaryManage/auxiliaryOut/index.vue b/src/views/auxiliaryManage/auxiliaryOut/index.vue
index 78d3775..4a59a35 100644
--- a/src/views/auxiliaryManage/auxiliaryOut/index.vue
+++ b/src/views/auxiliaryManage/auxiliaryOut/index.vue
@@ -589,7 +589,7 @@ function handleStockOut() {
 function confimStockOut() {
   console.log(state.commitDate)
   if(state.commitDate == null){
-    ElMessageBox.alert('辅材出库失败，过账时间不可清空', {
+    ElMessageBox.alert('辅材出库失败，过账时间不可为空', {
       confirmButtonText: 'OK',
     })
     return;
diff --git a/src/views/stockOut/shipRequestReserve/index.vue b/src/views/stockOut/shipRequestReserve/index.vue
index 86f4696..59b364b 100644
--- a/src/views/stockOut/shipRequestReserve/index.vue
+++ b/src/views/stockOut/shipRequestReserve/index.vue
@@ -1041,7 +1041,9 @@ function handleStockOut() {
     CompleteShipRequestStockUp(params).then((res: any) => {
       
       if (res.success) {
-       
+        ElMessageBox.alert("出库成功", '', {
+          confirmButtonText: 'OK',
+        })
         handleQuery();
         //state.loading = false;
         state.buttonOut_loading = false;
diff --git a/src/views/stocked/MoveTransformation/index.vue b/src/views/stocked/MoveTransformation/index.vue
index 11b3b74..568269e 100644
--- a/src/views/stocked/MoveTransformation/index.vue
+++ b/src/views/stocked/MoveTransformation/index.vue
@@ -132,19 +132,25 @@
     </div>
 
     <el-row class="page-search" justify="end" align="middle">
-      <div class="block" style="float: right">
-        <el-form-item label="备注" prop="state.REMARK">
-          <el-Input v-model="state.REMARK" />
-        </el-form-item>
-      </div>
-      <div class="block" style="float: right">
-        <el-form-item label="过账日期" prop="state.commitDate">
-          <el-date-picker :clearable="true" :editable="true" v-model="state.commitDate" type="date" placeholder="选择过账时间" value-format="YYYY-MM-DD"/>
-        </el-form-item>
-      </div>
-      <div class="page-search-btns">
-        <el-button type="primary" @click="handleStockOut" :disabled="state.buttonOut_state" v-loading="state.buttonOut_loading">转换</el-button>
-      </div>
+      <el-col :span="4" style="padding-top: 12px">
+        <div class="block" style="float: right">
+          <el-form-item label="备注" prop="state.REMARK">
+            <el-Input v-model="state.REMARK" />
+          </el-form-item>
+        </div>
+      </el-col>
+      <el-col :span="4" style="padding-top: 12px">
+        <div class="block">
+          <el-form-item label="过账日期" prop="state.commitDate">
+            <el-date-picker :clearable="true" :editable="true" v-model="state.commitDate" type="date" placeholder="选择过账时间" value-format="YYYY-MM-DD"/>
+          </el-form-item>
+        </div>
+      </el-col>
+      <el-col :span="2" >
+        <div class="page-search-btns" style="float: right">
+          <el-button type="primary" @click="handleStockOut" :disabled="state.buttonOut_state" v-loading="state.buttonOut_loading">转换</el-button>
+        </div>
+      </el-col>
     </el-row>
   </div>
 </template>
diff --git a/src/views/stocked/locationMovePage/index.vue b/src/views/stocked/locationMovePage/index.vue
index 791c37b..9d955e4 100644
--- a/src/views/stocked/locationMovePage/index.vue
+++ b/src/views/stocked/locationMovePage/index.vue
@@ -41,6 +41,22 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="库存货位" prop="LOCATIONNAME">
+              <el-select
+                size="small"
+                filterable
+                v-model="queryParams.params.LOCATIONNAME"
+                placeholder="下拉选择货位"
+                :filter-method="getLocationList"
+              >
+                <el-option
+                  v-for="item in LocationList"
+                  :key="item.STORAGENAME"
+                  :label="item.DESCRIPTION"
+                  :value="item.STORAGENAME"
+                />
+              </el-select>
+            </el-form-item>
+<!--            <el-form-item label="库存货位" prop="LOCATIONNAME">
               <el-select
                 size="small"
                 filterable
@@ -56,7 +72,7 @@
                   :value="item.storageName"
                 />
               </el-select>
-            </el-form-item>
+            </el-form-item>-->
           </el-col>
           <!-- <el-col :span="6">
             <el-form-item label="货位代码" prop="params.LOCATIONNAME">
@@ -717,6 +733,20 @@ async function getStorageSpecLocationList() {
     state.StorageSelectAll = res.resultObj;
   });
 }
+
+function getLocationList(query: any) {
+  let arr = state.StorageSelectAll.filter((item: any) => {
+    return item.DESCRIPTION.includes(query) || item.STORAGENAME.includes(query)
+  })
+  if (arr.length > 50) {
+    state.LocationList = arr.slice(0, 50)
+  } else {
+    state.LocationList = arr
+  }
+  state.LocationList.unshift({
+    ENUMVALUE: ''
+  })
+}
 </script>
 
 <style scoped lang="scss">