From 36bf289d969e2c373e5a30483cd3aeadb517c454 Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Fri, 5 Jan 2024 15:32:31 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E6=96=99?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/style/new_style.css              | 1 +
 pages/issue/coms/comIssueDetailCard.vue | 8 ++++----
 pages/issue/coms/comScanIssuePack.vue   | 3 ++-
 pages/query/container.vue               | 1 -
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/common/style/new_style.css b/common/style/new_style.css
index 3c571912..246ac4f0 100644
--- a/common/style/new_style.css
+++ b/common/style/new_style.css
@@ -2123,6 +2123,7 @@ button::after {
 }
 
 .scan_view {
+	/* #0CC2B6 20% */
 	background: linear-gradient(90deg, rgba(12, 194, 182, 0.2) 0%, rgba(12, 194, 182, 0) 100%)
 }
 
diff --git a/pages/issue/coms/comIssueDetailCard.vue b/pages/issue/coms/comIssueDetailCard.vue
index 03cc180d..99080f29 100644
--- a/pages/issue/coms/comIssueDetailCard.vue
+++ b/pages/issue/coms/comIssueDetailCard.vue
@@ -24,11 +24,11 @@
 								<recommend-balance style='margin-left: 20px;' :detail="batch" :isShowLocation="false"
 									:isShowPack="batch.packingNumber!=null && batch.packingNumber!=''">
 								</recommend-balance>
-								<view class="uni-flex uni-row" v-if='batch.Records.length>0'>
-									<view class="center " style=" width: 20px; color: #0CC2B6; margin-left: 40px;">
-										实际
+								<view class="uni-flex uni-row " v-if='batch.Records.length>0'>
+									<view class="center " style=" width: 20px;background-color: #0CC2B6; color: #fff; margin-left: 40px;padding: 0px 2px;">
+										扫描
 									</view>
-									<view class="uni-flex uni-column" style="width: 100%;">
+									<view class="uni-flex uni-column scan_view" style="width: 100%;">
 										<view v-for="(record,index) in batch.Records">
 											<uni-swipe-action ref="swipeAction">
 												<uni-swipe-action-item @click="swipeClick($event,batch,record,index)"
diff --git a/pages/issue/coms/comScanIssuePack.vue b/pages/issue/coms/comScanIssuePack.vue
index e16c0a78..766ac666 100644
--- a/pages/issue/coms/comScanIssuePack.vue
+++ b/pages/issue/coms/comScanIssuePack.vue
@@ -69,7 +69,7 @@
 													<uni-swipe-action-item @click="swipeClick($event,record,index)"
 														:right-options="scanOptions">
 														<view style="padding: 0px 10px">
-															<balance :dataContent="record" :isShowLocation="false"
+															<balance :dataContent="record" :isShowFromLocation="false"
 																:isShowStdPack="false"></balance>
 														</view>
 													</uni-swipe-action-item>
@@ -370,6 +370,7 @@
 				balance.stdPackQty = packageInfo.stdPackQty
 				balance.stdPackUnit = packageInfo.stdPackUnit
 				let record = {
+					scaned:true,
 					itemCode: label.itemCode,
 					packingNumber: label.packingNumber,
 					batch: label.batch,
diff --git a/pages/query/container.vue b/pages/query/container.vue
index 17e847fe..c91697ff 100644
--- a/pages/query/container.vue
+++ b/pages/query/container.vue
@@ -63,7 +63,6 @@
 			winScanButton,
 			comMessage,
 			comLocationDetailCard,
-			winScanItem,
 			containerInfo,
 			winScanContainer
 			

From 3319c7a85b284da411f4aa716f7bc487150b701a Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Fri, 5 Jan 2024 15:56:44 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9B=B6=E4=BB=B6?=
 =?UTF-8?q?=E6=B1=87=E6=80=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/request2.js      | 6 +++---
 pages/query/item.vue | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/api/request2.js b/api/request2.js
index f481334a..e3886e99 100644
--- a/api/request2.js
+++ b/api/request2.js
@@ -428,11 +428,11 @@ export function getBasicItemByCode(itemCode) {
 /**
  * 按物品查询库存汇总
  * @param {*} itemCode 
- * 
+ * /wms/balance/summary
  */
-export function getBalanceByCodeGroup(params) {
+export function getBalanceSummary(params) {
 	return request({
-		url: baseApi + "/wms/balance/page",
+		url: baseApi + "/wms/balance/summary",
 		method: "get",
 		data: params,
 	});
diff --git a/pages/query/item.vue b/pages/query/item.vue
index 3d6a24b2..1f12e20b 100644
--- a/pages/query/item.vue
+++ b/pages/query/item.vue
@@ -39,7 +39,7 @@
 		getExpectinByItemcode,
 		getBalanceByItemCode,
 		getBasicItemByCode,
-		getBalanceByCodeGroup
+		getBalanceSummary
 	} from '@/api/request2.js';
 	import {
 		goHome
@@ -130,7 +130,7 @@
 					pageSize: pageSize
 				}
 				console.log("getSummary", pageNo)
-				getBalanceByCodeGroup(params).then(res => {
+				getBalanceSummary(params).then(res => {
 					uni.hideLoading();
 					if (res.data.list.length > 0) {
 						this.$refs.paging.complete(res.data.list);