From 5e610f4c9d9870b393720bc5fcc856e97bc2ea4b Mon Sep 17 00:00:00 2001
From: zongzhibin <zongzhibin@weben-smart.com>
Date: 周三, 27 11月 2024 09:36:26 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine
---
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeed/index.vue | 103 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 64 insertions(+), 39 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeed/index.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeed/index.vue
index f57499c..55d7381 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeed/index.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeed/index.vue
@@ -1,19 +1,28 @@
锘�<template>
<div class="wmsSubstituteGood-container">
- <el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
- <el-form :model="queryParams" ref="queryForm" labelWidth="100">
+ <el-card class="full-table" shadow="hover" style="margin-top: 5px">
+ <el-form :model="queryParams" @submit.native.prevent ref="queryForm" labelWidth="100">
<el-row>
<el-col :xs="24" :sm="12" :md="12" :lg="10" :xl="4" class="mb10">
- <el-form-item label="閮ㄤ欢鏉＄爜">
- <el-input v-model="queryParams.upi" ref="materialCodeInput" clearable="" placeholder="璇锋壂閮ㄤ欢鏉＄爜" />
+ <el-form-item label="閮ㄤ欢鏉＄爜" size="large">
+ <el-input
+ size="large"
+ v-model="queryParams.upi"
+ ref="materialCodeInput"
+ clearable=""
+ placeholder="璇锋壂閮ㄤ欢鏉＄爜"
+ @input="handleChange"
+ @keyup.enter.prevent="handleEnter"
+ @confirm.enter.prevent="handleEnter"
+ />
</el-form-item>
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6" class="mb10">
<el-form-item>
<el-button-group style="display: flex; align-items: center">
- <el-button type="primary" icon="ele-Search" @click="handleQuery"> 鏌ヨ </el-button>
- <el-button icon="ele-Refresh" @click="() => queryParams = {}"> 閲嶇疆 </el-button>
+ <el-button size="large" type="primary" icon="ele-Search" @click="handleQuery"> 鏌ヨ </el-button>
+ <el-button size="large" icon="ele-Refresh" @click="() => (queryParams = {})"> 閲嶇疆 </el-button>
<!--
<el-button icon="ele-ZoomIn" @click="changeAdvanceQueryUI" v-if="!showAdvanceQueryUI" style="margin-left:5px;"> 楂樼骇鏌ヨ </el-button>
<el-button icon="ele-ZoomOut" @click="changeAdvanceQueryUI" v-if="showAdvanceQueryUI" style="margin-left:5px;"> 闅愯棌 </el-button> -->
@@ -23,33 +32,18 @@
</el-col>
</el-row>
</el-form>
- </el-card>
- <el-card class="full-table" shadow="hover" style="margin-top: 5px">
+ <br />
<div class="detailBox">
<ul>
- <!-- <li v-for="(item,index) in sourceEnum" :key="index">
- {{ titleP[index] }} : {{ warehousOrderDetails[item] }}
- </li> -->
- <li>
- <span class="text_left">鐗╂枡缂栧彿:</span>
- <span class="text_rt">{{ tableData.Info16 }}</span>
- </li>
- <li>
+ <!-- <li>
<span class="text_left">鏄惁榻愬寘:</span>
<span class="text_rt"></span>
</li>
<li>
<span class="text_left">鏄惁榻愬:</span>
<span class="text_rt"></span>
- </li>
- <li>
- <span class="text_left">鎵规鍙�:</span>
- <span class="text_rt">{{ tableData.planNo }}</span>
- </li>
- <li>
- <span class="text_left">璁㈠崟鍙�:</span>
- <span class="text_rt">{{ tableData.OrderId }}</span>
- </li>
+ </li> -->
+
<li>
<span class="text_left">閮ㄤ欢鏉＄爜:</span>
<span class="text_rt">{{ tableData.upi }}</span>
@@ -57,14 +51,28 @@
<li>
<span class="text_left">閮ㄤ欢鍚嶇О:</span>
- <span class="text_rt">{{ tableData.DetailName }}</span>
- </li>
- <li>
- <span class="text_left">瀹㈡埛鍚嶇О:</span>
- <span class="text_rt">{{ tableData.Info10 }}</span>
+ <span class="text_rt">{{ tableData.detailName }}</span>
</li>
<li>
+ <span class="text_left">鎵规鍙�:</span>
+ <span class="text_rt">{{ tableData.planNo }}</span>
+ </li>
+ <li>
+ <span class="text_left">璁㈠崟鍙�:</span>
+ <span class="text_rt">{{ tableData.orderId }}</span>
+ </li>
+ <br /> <br /> <br /> <br /> <br /> <br />
+ <br /> <br /> <br /> <br /> <br />
+ <br /> <br /> <br /> <br /> <br /> <br />
+
+
+ <!-- <li>
+ <span class="text_left">瀹㈡埛鍚嶇О:</span>
+ <span class="text_rt">{{ tableData.Info10 }}</span>
+ </li> -->
+
+ <!-- <li>
<span class="text_left">闀�:</span>
<span class="text_rt">{{ tableData.length }}</span>
</li>
@@ -87,7 +95,7 @@
<li>
<span class="text_left">鎵撳瓟璁惧缂栧彿:</span>
<span class="text_rt">{{ tableData.dRNum }}</span>
- </li>
+ </li> -->
</ul>
</div>
<!-- 鐢熸垚form 榻愬 榻愬寘 璁剧疆ng鍖� -->
@@ -129,6 +137,7 @@
import printDialog from '/@/views/system/print/component/hiprint/preview.vue';
import editDialog from '/@/views/main/WmsBase/wmsSubstituteGood/component/editDialog.vue';
import { pageWmsSubstituteGood, deleteWmsSubstituteGood } from '/@/api/main/WmsBase/wmsSubstituteGood';
+import { ShortageList } from '/@/api/main/ReportCenter/wmsStockQuan';
const showAdvanceQueryUI = ref(false);
const printDialogRef = ref();
@@ -136,8 +145,7 @@
const loading = ref(false);
const tableData = ref<any>([]);
const queryParams = ref<any>({
- upi:""
-
+ upi: '',
});
const tableParams = ref({
page: 1,
@@ -166,18 +174,22 @@
onMounted(() => {
// 鍦ㄧ粍浠舵寕杞藉悗杩涜鑱氱劍
- materialCodeInput.value.$el.querySelector('input').focus();
+ materialCodeInput.value.$el.querySelector('input').focus();
});
// 鏌ヨ鎿嶄綔 888888888
const handleQuery = async () => {
- console.log("鏌ヨ");
+ console.log('8888888杩涘叆鏂规硶', queryParams.value);
+ if (!queryParams.value.upi) {
+ return;
+ }
+ console.log('鏌ヨ');
loading.value = true;
- var res = await listMes_BatchOrderUPI_New(Object.assign(queryParams.value, tableParams.value));
+ var res = await ShortageList(Object.assign(queryParams.value, tableParams.value));
if (res.data.result.length != 1) {
- ElMessage.warning('娌℃湁鏌ヨ鍒版暟鎹�');
- tableData.value = []
- return;
+ ElMessage.warning('姝ゆ潯鐮佷笉瀛樺湪鎴栦笉鍦ㄧ己鏂欐竻鍗曚腑锛�');
+ tableData.value = [];
+ return;
}
tableData.value = res.data.result[0] ?? [];
loading.value = false;
@@ -258,6 +270,16 @@
text: 'ID',
},
]);
+
+const handleChange = (event: Event) => {
+ console.log('77777777777');
+ handleQuery();
+};
+
+const handleEnter = (event: Event) => {
+ event.preventDefault(); // 闃绘榛樿浜嬩欢
+ handleQuery();
+};
</script>
<style scoped>
:deep(.el-input),
@@ -284,4 +306,7 @@
}
}
}
+.text_left {
+ font-weight: 700;
+}
</style>
--
Gitblit v1.9.3