From 9597b1df912c1ca4401a74970d9472e268b3a9c2 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周六, 07 12月 2024 15:12:59 +0800
Subject: [PATCH] 33

---
 LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeedKitting/index.vue |   52 ++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 44 insertions(+), 8 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 bff488e..2d4f536 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeedKitting/index.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeedKitting/index.vue
@@ -3,7 +3,7 @@
 		<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-col :xs="24" :sm="24" :md="24" :lg="10" :xl="10" class="mb10">
 						<el-form-item label="鍖呰鍙�" size="large">
 							<el-input
 								size="large"
@@ -21,7 +21,7 @@
 						<el-form-item>
 							<el-button-group style="display: flex; align-items: center">
 								<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 size="large" icon="ele-Refresh" @click="reset"> 閲嶇疆 </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> -->
@@ -34,7 +34,7 @@
 			<br />
 			<div class="detailBox" style="height: calc(65vh)">
 				<div class="titleTip">
-					<div class="" v-show="isSuccess == '鎴愬姛'">
+					<div class="" v-show="isSuccess == '鎴愬姛' && qiTaoReuslt=='榻愬' ">
 						<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"
@@ -42,7 +42,17 @@
 								p-id="11360"
 							></path>
 						</svg>
-						<p class="okText">鑾峰彇鏍囩淇℃伅鎴愬姛锛�</p>
+						 <p class="okText">{{_packageCode}} 銆恵{qiTaoReuslt}}銆戯紒</p> 
+					</div>
+					<div class="" v-show="isSuccess == '鎴愬姛' && qiTaoReuslt=='涓嶉綈濂�' ">
+						<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="no_okText">{{_packageCode}} 銆恵{qiTaoReuslt}}銆戯紒</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">
@@ -52,7 +62,7 @@
 								p-id="4304"
 							></path>
 						</svg>
-						<p class="okText">{{ isSuccess }}</p>
+						<p class="no_okText">{{ isSuccess }}</p>
 					</div>
 				</div>
 				<ul>
@@ -148,7 +158,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, ValdateQiTao } from '/@/api/main/ReportCenter/wmsStockQuan';
+import { ShortageList, ValdateQiTao } from '/@/api/main/ReportCenter/wmsStockQuan_new';
 
 const showAdvanceQueryUI = ref(false);
 const printDialogRef = ref();
@@ -212,6 +222,8 @@
 
 //=======================end榧犳爣瀹氫綅 鐢ㄤ簬寮曠敤杈撳叆妗�=====================
 const isSuccess = ref('');
+const qiTaoReuslt = ref('');
+const _packageCode = ref('');
 // 鏌ヨ鎿嶄綔 888888888
 const handleQuery = async () => {
 	console.log('8888888杩涘叆鏂规硶', queryParams.value);
@@ -221,23 +233,34 @@
 	console.log('鏌ヨ');
 	loading.value = true;
 	var res = await ValdateQiTao(Object.assign(queryParams.value, tableParams.value));
+	_packageCode.value=queryParams.value.packageCode ;
 	queryParams.value.packageCode = '';
 	handleResponse(res);
 
+};
+const reset = async () => {
+	queryParams.value={};
+	tableData.value ={};
+	isSuccess.value ='';
+	qiTaoReuslt.value ='' ;
 };
 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 || '鏈煡璇㈠埌鏁版嵁';
+		isSuccess.value = '鎴愬姛';
+		qiTaoReuslt.value = res.data.result ? res.data.result.qiTaoReuslt : '';
+		//qiTaoReuslt.value ='榻愬';// 妯℃嫙
 	} else if (res.data.code == 400) {
 		loading.value = false;
 		isSuccess.value = res.data.message || '鏈煡璇㈠埌鏁版嵁';
+		qiTaoReuslt.value ='' ;
 		return;
 	} else {
 		loading.value = false;
 		isSuccess.value = '';
+		qiTaoReuslt.value ='' ;
 		ElMessage.warning('缃戠粶寮傚父 璇锋眰澶辫触');
 		return;
 	}
@@ -265,6 +288,7 @@
 		margin: 0;
 		padding: 0;
 		li {
+			margin-top: 20px;
 			display: block;
 			line-height: 30px;
 			text-align: left;
@@ -277,16 +301,28 @@
 }
 .text_left {
 	font-weight: 700;
+	font-size: 40px; /* 璋冩暣瀛椾綋澶у皬 */
+}
+.text_rt {
+	font-weight: 700;
+	color: #00B2EE; /* 璁剧疆鍥炬爣棰滆壊 */
+	font-size: 40px; /* 璋冩暣瀛椾綋澶у皬 */
 }
 .my-icon {
 	font-size: 36px; /* 璋冩暣瀛椾綋澶у皬 */
 	color: #00ff11; /* 璁剧疆鍥炬爣棰滆壊 */
 }
 .titleTip {
+	font-weight: 700;
 	text-align: center;
-	font-size: 36px; /* 璋冩暣瀛椾綋澶у皬 */
+	font-size: 60px; /* 璋冩暣瀛椾綋澶у皬 */
 	.okText {
 		margin-bottom: 20px;
+		color: #52C41A; /* 璁剧疆鍥炬爣棰滆壊 */
+	}
+	.no_okText {
+		margin-bottom: 20px;
+		color: #E84335; /* 璁剧疆鍥炬爣棰滆壊 */
 	}
 }
 </style>

--
Gitblit v1.9.3