From ac795c61f3d0b21626cc3487743c39286950fea1 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周五, 29 11月 2024 13:52:00 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine
---
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeedKitting/index.vue | 178 ++++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 126 insertions(+), 52 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeedKitting/index.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeedKitting/index.vue
index 55d7381..780da9e 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeedKitting/index.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeedKitting/index.vue
@@ -4,13 +4,13 @@
<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="閮ㄤ欢鏉＄爜" size="large">
+ <el-form-item label="鍖呰鍙�" size="large">
<el-input
size="large"
- v-model="queryParams.upi"
+ v-model="queryParams.packageCode"
ref="materialCodeInput"
clearable=""
- placeholder="璇锋壂閮ㄤ欢鏉＄爜"
+ placeholder="璇锋壂鍖呰鍙�"
@input="handleChange"
@keyup.enter.prevent="handleEnter"
@confirm.enter.prevent="handleEnter"
@@ -33,17 +33,30 @@
</el-row>
</el-form>
<br />
- <div class="detailBox">
+ <div class="detailBox" style="height: calc(65vh)">
+ <div class="titleTip">
+ <div class="" v-show="isSuccess == '鎴愬姛'">
+ <svg t="1732788314050" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="11359" width="100" height="100">
+ <path
+ d="M874.119618 149.859922A510.816461 510.816461 0 0 0 511.997 0.00208a509.910462 509.910462 0 0 0-362.119618 149.857842c-199.817789 199.679789-199.817789 524.581447 0 724.260236a509.969462 509.969462 0 0 0 362.119618 149.857842A508.872463 508.872463 0 0 0 874.119618 874.120158c199.836789-199.679789 199.836789-524.581447 0-724.260236zM814.94268 378.210681L470.999043 744.132295a15.359984 15.359984 0 0 1-5.887994 4.095996c-1.751998 1.180999-2.913997 2.362998-5.276994 2.913997a34.499964 34.499964 0 0 1-13.469986 2.914997 45.547952 45.547952 0 0 1-12.897986-2.303998l-4.095996-2.363997a45.291952 45.291952 0 0 1-7.009992-4.095996l-196.902793-193.789796a34.126964 34.126964 0 0 1-10.555989-25.186973c0-9.37399 3.583996-18.74698 9.98399-25.186974a36.429962 36.429962 0 0 1 50.372947 0l169.98382 167.423824L763.389735 330.220732a37.059961 37.059961 0 0 1 50.371947-1.732998 33.647965 33.647965 0 0 1 11.165988 25.186973 35.544963 35.544963 0 0 1-9.98399 24.575974v-0.04z m0 0"
+ fill="#52C41A"
+ p-id="11360"
+ ></path>
+ </svg>
+ <p class="okText">鑾峰彇鏍囩淇℃伅鎴愬姛锛�</p>
+ </div>
+ <div class="" v-show="isSuccess && isSuccess != '鎴愬姛'">
+ <svg t="1732842594517" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4303" width="100" height="100">
+ <path
+ d="M549.044706 512l166.189176-166.249412a26.383059 26.383059 0 0 0 0-36.98447 26.383059 26.383059 0 0 0-37.044706 0L512 475.015529l-166.249412-166.249411a26.383059 26.383059 0 0 0-36.98447 0 26.383059 26.383059 0 0 0 0 37.044706L475.015529 512l-166.249411 166.249412a26.383059 26.383059 0 0 0 0 36.98447 26.383059 26.383059 0 0 0 37.044706 0L512 548.984471l166.249412 166.249411a26.383059 26.383059 0 0 0 36.98447 0 26.383059 26.383059 0 0 0 0-37.044706L548.984471 512zM512 1024a512 512 0 1 1 0-1024 512 512 0 0 1 0 1024z"
+ fill="#E84335"
+ p-id="4304"
+ ></path>
+ </svg>
+ <p class="okText">{{ isSuccess }}</p>
+ </div>
+ </div>
<ul>
- <!-- <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.upi }}</span>
@@ -62,40 +75,52 @@
<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.info1 }}</span>
+ </li>
+ <li>
+ <span class="text_left">绾哥瀹�:</span>
+ <span class="text_rt">{{ tableData.info2 }}</span>
+ </li>
+ <li>
+ <span class="text_left">绾哥楂�:</span>
+ <span class="text_rt">{{ tableData.info3 }}</span>
+ </li>
-
- <!-- <li>
+ <li>
+ <span class="text_left">閿�鍞悎鍚屽崟鍙�:</span>
+ <span class="text_rt">{{ tableData.info4 }}</span>
+ </li>
+ <li>
+ <span class="text_left">绗嚑鍖�:</span>
+ <span class="text_rt">{{ tableData.info6 }}</span>
+ </li>
+ <li>
+ <span class="text_left">缁忛攢搴楀悕绉�:</span>
+ <span class="text_rt">{{ tableData.info7 }}</span>
+ </li>
+ <li>
+ <span class="text_left">浜у搧鍚嶇О:</span>
+ <span class="text_rt">{{ tableData.info8 }}</span>
+ </li>
+ <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>
+ <span class="text_rt">{{ tableData.info10 }}</span>
</li>
<li>
- <span class="text_left">瀹�:</span>
- <span class="text_rt">{{ tableData.width }}</span>
+ <span class="text_left">鑷彁鎴栧彂璐�:</span>
+ <span class="text_rt">{{ tableData.info11 }}</span>
</li>
<li>
- <span class="text_left">鍘�:</span>
- <span class="text_rt">{{ tableData.thk }}</span>
+ <span class="text_left">鍖呰閮ㄤ欢鎬绘暟閲�:</span>
+ <span class="text_rt">{{ tableData.info12 }}</span>
</li>
<li>
- <span class="text_left">閮ㄤ欢绾圭悊:</span>
- <span class="text_rt">{{ tableData.matgrid }}</span>
+ <span class="text_left">鍖呰闈㈢Н:</span>
+ <span class="text_rt">{{ tableData.info13 }}</span>
</li>
- <li>
- <span class="text_left">鏄惁灏佽竟:</span>
- <span class="text_rt">{{ tableData.isEB }}</span>
- </li>
- <li>
- <span class="text_left">鎵撳瓟璁惧缂栧彿:</span>
- <span class="text_rt">{{ tableData.dRNum }}</span>
- </li> -->
+
</ul>
</div>
<!-- 鐢熸垚form 榻愬 榻愬寘 璁剧疆ng鍖� -->
@@ -128,7 +153,7 @@
</template>
<script lang="ts" setup="" name="wmsSubstituteGood">
-import { onMounted, ref } from 'vue';
+import { onBeforeUnmount, onMounted, ref } from 'vue';
import { ElMessageBox, ElMessage } from 'element-plus';
import { auth } from '/@/utils/authFunction';
import { getDictDataItem as di, getDictDataList as dl } from '/@/utils/dict-utils';
@@ -137,7 +162,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';
+import { ShortageList, ValdateQiTao } from '/@/api/main/ReportCenter/wmsStockQuan';
const showAdvanceQueryUI = ref(false);
const printDialogRef = ref();
@@ -145,7 +170,7 @@
const loading = ref(false);
const tableData = ref<any>([]);
const queryParams = ref<any>({
- upi: '',
+ packageCode: '',
});
const tableParams = ref({
page: 1,
@@ -169,31 +194,68 @@
const changeAdvanceQueryUI = () => {
showAdvanceQueryUI.value = !showAdvanceQueryUI.value;
};
-// 鐢ㄤ簬寮曠敤杈撳叆妗�
-const materialCodeInput = ref(null);
+
+//=======================榧犳爣瀹氫綅 鐢ㄤ簬寮曠敤杈撳叆妗�=====================
+let materialCodeInput = ref(null);
+let inactivityTimer = null;
+
+// 澶勭悊鐢ㄦ埛娲诲姩鐨勫嚱鏁�
+const handleUserActivity = () => {
+ if (inactivityTimer) {
+ clearTimeout(inactivityTimer);
+ }
+ inactivityTimer = setTimeout(() => {
+ // 娓呯┖杈撳叆妗嗙殑鍊�
+ materialCodeInput.value.$el.querySelector('input').value = '';
+ materialCodeInput.value.$el.querySelector('input').focus();
+ }, 2000); // 璁惧畾2绉掓湭鎿嶄綔鍒欒嚜鍔ㄨ仛鐒�
+};
onMounted(() => {
// 鍦ㄧ粍浠舵寕杞藉悗杩涜鑱氱劍
materialCodeInput.value.$el.querySelector('input').focus();
+ document.addEventListener('mousemove', handleUserActivity);
+ document.addEventListener('keydown', handleUserActivity);
});
+onBeforeUnmount(() => {
+ clearTimeout(inactivityTimer);
+ document.removeEventListener('mousemove', handleUserActivity);
+ document.removeEventListener('keydown', handleUserActivity);
+});
+
+//=======================end榧犳爣瀹氫綅 鐢ㄤ簬寮曠敤杈撳叆妗�=====================
+const isSuccess = ref('');
// 鏌ヨ鎿嶄綔 888888888
const handleQuery = async () => {
console.log('8888888杩涘叆鏂规硶', queryParams.value);
- if (!queryParams.value.upi) {
+ if (!queryParams.value.packageCode) {
return;
}
console.log('鏌ヨ');
loading.value = true;
- var res = await ShortageList(Object.assign(queryParams.value, tableParams.value));
- if (res.data.result.length != 1) {
- ElMessage.warning('姝ゆ潯鐮佷笉瀛樺湪鎴栦笉鍦ㄧ己鏂欐竻鍗曚腑锛�');
- tableData.value = [];
+ var res = await ValdateQiTao(Object.assign(queryParams.value, tableParams.value));
+ queryParams.value.packageCode = '';
+ handleResponse(res);
+
+};
+function handleResponse(res: any) {
+ tableData.value = res.data.result ?? {};
+ materialCodeInput.value.$el.querySelector('input').value = '';
+ materialCodeInput.value.$el.querySelector('input').focus();
+ if (res.data.code == 200) {
+ isSuccess.value = res.data.result ? '鎴愬姛' : res.data.message || '鏈煡璇㈠埌鏁版嵁';
+ } else if (res.data.code == 400) {
+ loading.value = false;
+ isSuccess.value = res.data.message || '鏈煡璇㈠埌鏁版嵁';
+ return;
+ } else {
+ loading.value = false;
+ isSuccess.value = '';
+ ElMessage.warning('缃戠粶寮傚父 璇锋眰澶辫触');
return;
}
- tableData.value = res.data.result[0] ?? [];
- loading.value = false;
-};
+}
// 鍒楁帓搴�
const sortChange = async (column: any) => {
@@ -301,7 +363,8 @@
line-height: 30px;
text-align: left;
list-style-type: none;
- width: 25%;
+ width: 48%;
+ display: inline-block;
word-wrap: break-word;
}
}
@@ -309,4 +372,15 @@
.text_left {
font-weight: 700;
}
+.my-icon {
+ font-size: 36px; /* 璋冩暣瀛椾綋澶у皬 */
+ color: #00ff11; /* 璁剧疆鍥炬爣棰滆壊 */
+}
+.titleTip {
+ text-align: center;
+ font-size: 36px; /* 璋冩暣瀛椾綋澶у皬 */
+ .okText {
+ margin-bottom: 20px;
+ }
+}
</style>
--
Gitblit v1.9.3