Merge branch 'master' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp

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,
 	});

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%)
 }
 

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="uni-flex uni-row " v-if='batch.Records.length>0'>
-									<view class="center " style=" width: 20px; color: #0CC2B6; margin-left: 40px;">
+									<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)"

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,

pages/query/container.vue

@@ -63,7 +63,6 @@
 			winScanButton,
 			comMessage,
 			comLocationDetailCard,
-			winScanItem,
 			containerInfo,
 			winScanContainer
 			

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);