From df59fa3084088233c240bb6bfe331fdbecb58794 Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Tue, 2 Jan 2024 10:04:04 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9index=E9=A1=B5=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{PDA_style.css => PDA_style-delete.css}   |  0
 pages/index/index.vue                         | 35 ++++++++++++-------
 2 files changed, 22 insertions(+), 13 deletions(-)
 rename common/style/{PDA_style.css => PDA_style-delete.css} (100%)

diff --git a/common/style/PDA_style.css b/common/style/PDA_style-delete.css
similarity index 100%
rename from common/style/PDA_style.css
rename to common/style/PDA_style-delete.css
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 4f8488a9..a64e154e 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -22,11 +22,14 @@
 							<text>{{item.name}}</text>
 						</view>
 						<view class="item-container">
-
 							<view class="thumb-box" v-for="(item1, index1) in item.children" :key="index1"
 								@click="openCheck(item1.path)">
 								<view class="" style="position: relative; ">
-									<u-badge v-if="item1.count>0" type="error" :count="item1.count" :offset="position" :showZero ="false"></u-badge>
+								<!-- 	<u-badge  class="item-menu-badge" v-if="item1.count>0" type="error" :count="item1.count" :offset="position"
+										:showZero="false"></u-badge> -->
+									<text class="item-menu-badge"
+										v-if="item1.count>0">{{item1.count>9?'9+':item1.count}}</text>
+
 									<image class="item-menu-image" :src="'/static/menus/'+item1.componentName" mode="">
 									</image>
 									<view class="">
@@ -169,30 +172,30 @@
 				this.timer = setInterval(function() {
 					that.getMainMessage();
 					console.log('刷新菜单');
-				}, 1000*60)
+				}, 1000 * 60)
 			},
-			stopRefresh(){
+			stopRefresh() {
 				if (this.timer) {
 					clearInterval(this.timer);
 					this.timer = null;
 				}
 			},
-			getMainMessage(){
+			getMainMessage() {
 				getMainMessage().then(res => {
 					this.menusCount = res.data;
-					this.tabbar.forEach(item=>{
-						item.children.forEach(rightItem=>{
+					this.tabbar.forEach(item => {
+						item.children.forEach(rightItem => {
 							var count = this.menusCount[rightItem.component]
-							if(count!=undefined){
-								rightItem.count =count;
+							if (count != undefined) {
+								rightItem.count = count;
 							}
 						})
 					})
-					this.$forceUpdate() 
-					
+					this.$forceUpdate()
+
 				});
 			},
-			
+
 			findList(tab) {
 				let res = null
 				for (let i = 0; i < tab.length; i++) {
@@ -472,7 +475,13 @@
 		height: 32px;
 	}
 
-	.index_badge {
+	.item-menu-badge {
+		width: 42rpx;
+		height: 42rpx;
+		top: -5px;
+		right: -5px;
+		font-size: 0.6rem;
+		background-color: #fa3534;
 		position: absolute;
 		right: 0;
 		color: #fff;

From bd9a2716508375a376117750a43cf3d09d57e707 Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Tue, 2 Jan 2024 11:02:04 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=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                    |  5 +++--
 mycomponents/detail/comDetailCard.vue         | 21 -------------------
 pages/deliver/job/deliverDetail.vue           |  2 +-
 .../inventoryMove/job/inventoryMoveDetail.vue |  2 +-
 .../job/productDismantleDetail.vue            |  2 +-
 .../job/productPutawayDetail.vue              |  5 +----
 .../job/productReceiptDetail.vue              |  4 +---
 .../job/productionReceiptDetail.vue           |  2 +-
 pages/productionReturn/job/returnDetail.vue   |  4 +---
 pages/purchaseReceipt/job/receiptDetail.vue   |  4 +---
 pages/purchaseReturn/job/returnDetail.vue     | 16 +++++++-------
 pages/putaway/job/putawayDetail.vue           |  5 +----
 pages/repleinsh/job/repleinshDetail.vue       |  4 +---
 pages/scrap/job/scrapJobDetail.vue            |  4 +---
 pages/transfer/job/receiptDetail.vue          |  4 +---
 pages/transfer/job/transferDetail.vue         |  4 +---
 pages/unPlanned/job/issueJobDetail.vue        |  4 +---
 pages/unPlanned/job/receiptJobDetail.vue      |  4 +---
 18 files changed, 26 insertions(+), 70 deletions(-)

diff --git a/common/style/new_style.css b/common/style/new_style.css
index 0127473d..7bbd4bf6 100644
--- a/common/style/new_style.css
+++ b/common/style/new_style.css
@@ -2100,7 +2100,7 @@ button::after {
 }
 
 .card_location {
-	color: #00A3FF;
+	color: #DA8910;
 	padding: 5px;
 }
 
@@ -2118,7 +2118,8 @@ button::after {
 }
 
 .scan_view {
-	background: linear-gradient(to right, #7ED7BD, #DCEFEE);
+	background: linear-gradient(90deg, rgba(12, 194, 182, 0.2) 0%, rgba(12, 194, 182, 0) 100%)
+
 }
 
 .card_view {
diff --git a/mycomponents/detail/comDetailCard.vue b/mycomponents/detail/comDetailCard.vue
index 79801df8..bfabce80 100644
--- a/mycomponents/detail/comDetailCard.vue
+++ b/mycomponents/detail/comDetailCard.vue
@@ -1,41 +1,20 @@
 <template>
 	<view class="" style="background-color: #fff;">
-		<!-- <view class="cell_box uni-flex uni-row">
-			<view class="cell_info">
-				<view class="text_lightblue">车间</view>
-				<view>{{workShopCode}}</view>
-			</view>
-			<view class="cell_info">
-				<view class="text_lightblue">生产线</view>
-				<view>{{dataContent.productionLineCode}}</view>
-			</view>
-			<view class="cell_info">
-				<view class="text_lightblue">工位</view>
-				<view>{{ dataContent.workStationCode }}</view>
-			</view>
-			<view class="cell_info">
-				<view class="text_lightblue">原材料库</view>
-				<view>{{ dataContent.toLocationCode}}</view>
-			</view>
-		</view> -->
 		<uni-collapse ref="collapse1" @change="">
 			<uni-collapse-item :open="true">
 				<template v-slot:title>
 					<item-compare-qty :dataContent="dataContent" :handleQty="Number(dataContent.handleQty)">
 					</item-compare-qty>
 				</template>
-				<u-line />
 				<view class="" v-for="(item,index) in dataContent.subList">
 					<uni-swipe-action ref="swipeAction">
 						<uni-swipe-action-item @click="swipeClick($event,item)"
 							:right-options="item.scaned?scanOptions:detailOptions">
 							<recommend :detail="item" :isShowToLocation="false">
 							</recommend>
-							<u-line />
 						</uni-swipe-action-item>
 					</uni-swipe-action>
 				</view>
-				
 			</uni-collapse-item>
 		</uni-collapse>
 		<balance-qty-edit ref="qtyEdit" :settingParam="settingParam" @confirm="confirm"></balance-qty-edit>
diff --git a/pages/deliver/job/deliverDetail.vue b/pages/deliver/job/deliverDetail.vue
index 6d090fa0..05e2381f 100644
--- a/pages/deliver/job/deliverDetail.vue
+++ b/pages/deliver/job/deliverDetail.vue
@@ -7,7 +7,7 @@
 			<view class="header_item" >
 				申请单号：{{jobContent.requestNumber}}
 			</view>
-			<u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-line>
+			<u-line color="#D8D8D8"></u-line>
 			<view class="cen_card" style="padding: 5rpx;">
 				<view class="cell_box uni-flex uni-row">
 					<view class="cell_info">
diff --git a/pages/inventoryMove/job/inventoryMoveDetail.vue b/pages/inventoryMove/job/inventoryMoveDetail.vue
index 30856fd3..56d94ad4 100644
--- a/pages/inventoryMove/job/inventoryMoveDetail.vue
+++ b/pages/inventoryMove/job/inventoryMoveDetail.vue
@@ -7,7 +7,7 @@
 			<view class="header_item">
 				申请单号 : {{jobContent.requestNumber}}
 			</view>
-			<u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-line>
+			<u-line color="#D8D8D8"></u-line>
 		</view>
 
 		<view class="page-main">
diff --git a/pages/productDismantle/job/productDismantleDetail.vue b/pages/productDismantle/job/productDismantleDetail.vue
index aff9024c..787d34a0 100644
--- a/pages/productDismantle/job/productDismantleDetail.vue
+++ b/pages/productDismantle/job/productDismantleDetail.vue
@@ -7,7 +7,7 @@
 		<view class="header_item">
 			申请单号 : {{jobContent.requestNumber}}
 		</view>
-		<u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-line>
+		<u-line color="#D8D8D8"></u-line>
 	</view>
 		<view class="page-main">
 			<scroll-view scroll-y="true" class="page-main-scroll">
diff --git a/pages/productPutaway/job/productPutawayDetail.vue b/pages/productPutaway/job/productPutawayDetail.vue
index 661329eb..67500518 100644
--- a/pages/productPutaway/job/productPutawayDetail.vue
+++ b/pages/productPutaway/job/productPutawayDetail.vue
@@ -7,10 +7,7 @@
 			<view class="header_item">
 				申请单号 : {{jobContent.requestNumber}}
 			</view>
-			<u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-line>
-		</view>
-
-		<view class="page-main">
+			<u-line color="#D8D8D8"  >
 			<scroll-view scroll-y="true" class="page-main-scroll">
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 					<view class="">
diff --git a/pages/productReceipt/job/productReceiptDetail.vue b/pages/productReceipt/job/productReceiptDetail.vue
index 5701bce4..8740d36c 100644
--- a/pages/productReceipt/job/productReceiptDetail.vue
+++ b/pages/productReceipt/job/productReceiptDetail.vue
@@ -7,9 +7,7 @@
 			<view class="header_item">
 				申请单号 : {{jobContent.requestNumber}}
 			</view>
-			<u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-line>
-		</view>
-		<view class="page-main">
+			<u-line color="#D8D8D8"  
 			<scroll-view scroll-y="true" class="page-main-scroll">
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 					<view class="">
diff --git a/pages/productionReceipt/job/productionReceiptDetail.vue b/pages/productionReceipt/job/productionReceiptDetail.vue
index 66847d7b..5d150d08 100644
--- a/pages/productionReceipt/job/productionReceiptDetail.vue
+++ b/pages/productionReceipt/job/productionReceiptDetail.vue
@@ -8,7 +8,7 @@
 				<view class="header_item">
 					发料任务单号 : {{jobContent.issueJobNumber}}
 				</view>
-				<u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-line>
+				<u-line color="#D8D8D8"></u-line>
 			</view>
 			<scroll-view scroll-y="true">
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
diff --git a/pages/productionReturn/job/returnDetail.vue b/pages/productionReturn/job/returnDetail.vue
index 542b5fd5..47bab093 100644
--- a/pages/productionReturn/job/returnDetail.vue
+++ b/pages/productionReturn/job/returnDetail.vue
@@ -12,9 +12,7 @@
 				:workStationCode="titleInfo.workStationCode" :rawLocationCode="titleInfo.fromLocationCode">
 			</work-station>
 		</view>
-		<u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-line>
-		<view class="page-main">
-			<scroll-view scroll-y="true" class="page-main-scroll">
+		<u-line color="#D8D8D8"  l-view scroll-y="true" class="page-main-scroll">
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 					<view class="">
 						<comReturnDetailCard :dataContent="item" :index="index" :settingParam="jobContent"
diff --git a/pages/purchaseReceipt/job/receiptDetail.vue b/pages/purchaseReceipt/job/receiptDetail.vue
index 1ea371db..dccc730c 100644
--- a/pages/purchaseReceipt/job/receiptDetail.vue
+++ b/pages/purchaseReceipt/job/receiptDetail.vue
@@ -7,9 +7,7 @@
 			<view class="header_item">
 				发货单号 : {{jobContent.asnNumber}}
 			</view>
-			<u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-line>
-		</view>
-		<view class="page-main">
+			<u-line color="#D8D8D8"  
 			<scroll-view scroll-y="true" class="page-main-scroll">
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 					<view class="">
diff --git a/pages/purchaseReturn/job/returnDetail.vue b/pages/purchaseReturn/job/returnDetail.vue
index 0de659c4..5d57fbb4 100644
--- a/pages/purchaseReturn/job/returnDetail.vue
+++ b/pages/purchaseReturn/job/returnDetail.vue
@@ -7,17 +7,15 @@
 			<view class="header_item">
 				发货单：{{jobContent.asnNumber}}
 			</view>
-			<u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-line>
+			<u-line color="#D8D8D8" ></u-line>
 		</view>
 
 		<view class="page-main">
 			<scroll-view scroll-y="true" class="page-main-scroll">
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
-					<view class="">
-						<com-detail-card :dataContent="item" :settingParam="jobContent" @remove="updateData"
-							@updateData='updateData' @openDetail="openDetail">
-						</com-detail-card>
-					</view>
+					<com-detail-card :dataContent="item" :settingParam="jobContent" @remove="updateData"
+						@updateData='updateData' @openDetail="openDetail">
+					</com-detail-card>
 				</view>
 			</scroll-view>
 		</view>
@@ -239,10 +237,12 @@
 								r.batch == batch && r.fromLocationCode == result.fromLocationCode
 						})
 						if (itemDetail == undefined) {
-							this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【"+result.fromLocationCode+"】不在列表中")
+							this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result
+								.fromLocationCode + "】不在列表中")
 						} else {
 							if (itemDetail.scaned) {
-								this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【"+result.fromLocationCode+"】已经扫描")
+								this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result
+									.fromLocationCode + "】已经扫描")
 							} else {
 								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
 								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
diff --git a/pages/putaway/job/putawayDetail.vue b/pages/putaway/job/putawayDetail.vue
index 30db744a..aa283897 100644
--- a/pages/putaway/job/putawayDetail.vue
+++ b/pages/putaway/job/putawayDetail.vue
@@ -7,10 +7,7 @@
 			<view class="header_item">
 				申请单号 : {{jobContent.requestNumber}}
 			</view>
-			<u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-line>
-		</view>
-		
-		<view class="page-main">
+			<u-line color="#D8D8D8"  n">
 			<scroll-view scroll-y="true" class="page-main-scroll">
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 					<view class="">
diff --git a/pages/repleinsh/job/repleinshDetail.vue b/pages/repleinsh/job/repleinshDetail.vue
index 429f3377..cffa42a1 100644
--- a/pages/repleinsh/job/repleinshDetail.vue
+++ b/pages/repleinsh/job/repleinshDetail.vue
@@ -7,9 +7,7 @@
 			<view class="header_item">
 				申请单号 : {{jobContent.requestNumber}}
 			</view>
-			<u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-line>
-		</view>
-		<view class="page-main">
+			<u-line color="#D8D8D8"  
 			<scroll-view scroll-y="true" class="">
 				<view v-for="(toLocation, index) in detailSource">
 					<com-repleish-detail-card ref='comIssueDetailCard' :dataContent="toLocation"
diff --git a/pages/scrap/job/scrapJobDetail.vue b/pages/scrap/job/scrapJobDetail.vue
index 23884b2b..f3c13ee4 100644
--- a/pages/scrap/job/scrapJobDetail.vue
+++ b/pages/scrap/job/scrapJobDetail.vue
@@ -7,9 +7,7 @@
 			<view class="header_item">
 				申请单号 : {{jobContent.requestNumber}}
 			</view>
-			<u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-line>
-		</view>
-		<view class="page-main">
+			<u-line color="#D8D8D8"  
 			<scroll-view scroll-y="true" class="page-main-scroll">
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 					<view class="">
diff --git a/pages/transfer/job/receiptDetail.vue b/pages/transfer/job/receiptDetail.vue
index 650aeba1..c89f04e0 100644
--- a/pages/transfer/job/receiptDetail.vue
+++ b/pages/transfer/job/receiptDetail.vue
@@ -10,9 +10,7 @@
 			<view class="header_item">
 				来源仓库 : {{jobContent.fromWarehouseCode}}
 			</view>
-			<u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-line>
-		</view>
-		<view class="page-main">
+			<u-line color="#D8D8D8"  
 			<scroll-view scroll-y="true" class="page-main-scroll">
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 					<view class="">
diff --git a/pages/transfer/job/transferDetail.vue b/pages/transfer/job/transferDetail.vue
index 145ad91f..9cf70ef4 100644
--- a/pages/transfer/job/transferDetail.vue
+++ b/pages/transfer/job/transferDetail.vue
@@ -7,9 +7,7 @@
 			<view class="header_item">
 				申请单号 : {{jobContent.requestNumber}}
 			</view>
-			<u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-line>
-		</view>
-		<view class="page-main">
+			<u-line color="#D8D8D8"  
 			<scroll-view scroll-y="true" class="page-main-scroll">
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 					<view class="">
diff --git a/pages/unPlanned/job/issueJobDetail.vue b/pages/unPlanned/job/issueJobDetail.vue
index 8d93fc19..1c66537e 100644
--- a/pages/unPlanned/job/issueJobDetail.vue
+++ b/pages/unPlanned/job/issueJobDetail.vue
@@ -7,9 +7,7 @@
 			<view class="header_item">
 				申请单号 : {{jobContent.requestNumber}}
 			</view>
-			<u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-line>
-		</view>
-		<view class="page-main">
+			<u-line color="#D8D8D8"  
 			<scroll-view scroll-y="true" class="page-main-scroll">
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 					<view class="">
diff --git a/pages/unPlanned/job/receiptJobDetail.vue b/pages/unPlanned/job/receiptJobDetail.vue
index 148232a8..92e64fc5 100644
--- a/pages/unPlanned/job/receiptJobDetail.vue
+++ b/pages/unPlanned/job/receiptJobDetail.vue
@@ -7,9 +7,7 @@
 			<view class="header_item">
 				申请单号 : {{jobContent.requestNumber}}
 			</view>
-			<u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-line>
-		</view>
-		<view class="page-main">
+			<u-line color="#D8D8D8"  
 			<scroll-view scroll-y="true" class="page-main-scroll">
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 					<view class="">