From ddeb76c0a65dcfa418e67662178b6305981cdbd1 Mon Sep 17 00:00:00 2001
From: zhang_li <li.zhang@ccwin-in.com>
Date: Tue, 17 Jun 2025 13:57:20 +0800
Subject: [PATCH] =?UTF-8?q?YT-2758=E4=BA=8C=E5=88=86=E4=B9=8B=E4=B8=80?=
 =?UTF-8?q?=E7=9B=98=E7=82=B9=E7=9A=84=E7=89=A9=E6=96=99=EF=BC=8CPDA?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E4=BB=BB=E5=8A=A1=E6=97=B6=EF=BC=8C=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=BA=8C=E5=88=86=E4=B9=8B=E4=B8=80=E7=9A=84=E6=A0=87?=
 =?UTF-8?q?=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/directory.js                      | 18 ++++++++++++++++++
 src/common/style/new_style.css               | 14 ++++++++++++++
 src/mycomponents/item/item.vue               | 15 ++++++++++++++-
 src/pages/count/coms/comCountDetailcards.vue |  8 ++++++--
 src/pages/count/job/countLightDetail.vue     |  2 +-
 src/pages/index/index.vue                    |  2 +-
 6 files changed, 54 insertions(+), 5 deletions(-)

diff --git a/src/common/directory.js b/src/common/directory.js
index d7b17ef1..8f8f4c69 100644
--- a/src/common/directory.js
+++ b/src/common/directory.js
@@ -25,6 +25,7 @@ let businessList = [];
 let countScopeTypeList = [];
 let priorityList  = []
 let shiftList = []
+let inventoryModeList = []
 
 
 
@@ -70,6 +71,7 @@ export function clearCacheData() {
 	countScopeTypeList = []
 	priorityList  = []
 	shiftList = []
+	inventoryModeList=[]
 }
 
 //获取字典信息
@@ -708,4 +710,20 @@ export function getShiftName(value) {
 		}
 	}
 	return resultInfo
+}
+//获取抽检方式
+export function getInventoryMode(value) {
+	var resultInfo = "";
+	if (inventoryModeList.length == 0) {
+		inventoryModeList = getDirectoryInfo("inventory_mode")
+	}
+	if (inventoryModeList.length > 0) {
+		for (let item of inventoryModeList) {
+			if (item.value == value) {
+				resultInfo = item.label
+				break;
+			}
+		}
+	}
+	return resultInfo
 }
\ No newline at end of file
diff --git a/src/common/style/new_style.css b/src/common/style/new_style.css
index 3a68a14b..a3531e79 100644
--- a/src/common/style/new_style.css
+++ b/src/common/style/new_style.css
@@ -2040,6 +2040,20 @@ button::after {
 	/* width: 210rpx; */
 	word-wrap: break-word;
 	word-break: break-all;
+	display: flex;
+}
+.countType{
+	background-color: #3C9CFF;
+	border-radius: 30rpx;
+	padding: 4rpx 12rpx;
+	font-weight: 100;
+	font-size: 28rpx;
+	margin-left: 20rpx;
+	display: flex;
+	line-height: 28rpx;
+	align-items: center;
+	justify-items: center;
+	color: white;
 }
 .card_itemName_time{
 	color: #3315EB;
diff --git a/src/mycomponents/item/item.vue b/src/mycomponents/item/item.vue
index d5ed479e..9de8938d 100644
--- a/src/mycomponents/item/item.vue
+++ b/src/mycomponents/item/item.vue
@@ -3,7 +3,10 @@
 		<view class="uni-flex u-col-center space-between ">
 			<view >
 				<view class="card_itemCode" :class="openPopup(dataContent)">
-					{{dataContent.itemCode}}
+					<view>{{dataContent.itemCode}}</view>
+					
+					{{dataContent.countType}}
+					<view class="countType" v-if="showCountType &&dataContent.countType == 1">1/2</view>
 				</view>
 				<view class="card_itemName" style="word-break:break-all;overflow:hidden;white-space:normal;display: flex;align-items: center;" :class="isSpecial ? 'special':''">
 					<view style="max-width:280rpx;overflow: hidden;white-space: nowrap;">{{dataContent.itemName}}</view>
@@ -16,6 +19,9 @@
 </template>
 
 <script>
+	import {
+			getInventoryMode
+		} from '@/common/directory.js';
 	export default {
 		components: {
 
@@ -35,6 +41,10 @@
 				type: Boolean,
 				default: false
 			},
+			showCountType: {
+				type: Boolean,
+				default: false
+			},
 		},
 		watch: {
 
@@ -44,6 +54,9 @@
 
 				// console.log(JSON.stringify(val));
 			},
+			handleGetInventoryMode(val){
+				return getInventoryMode(val)
+			}
 		},
 	}
 </script>
diff --git a/src/pages/count/coms/comCountDetailcards.vue b/src/pages/count/coms/comCountDetailcards.vue
index c03afdb1..93707921 100644
--- a/src/pages/count/coms/comCountDetailcards.vue
+++ b/src/pages/count/coms/comCountDetailcards.vue
@@ -2,7 +2,7 @@
 	<view :class="backClass" style="width: 100%; padding: 10rpx; border-radius: 10rpx;">
 		<view class="uni-flex uni-row space-between " style="">
 			<view class="">
-				<item :dataContent="dataContent" style="margin-left: 15rpx;"></item>
+				<item :dataContent="dataContent" style="margin-left: 15rpx;" :showCountType='showCountType'></item>
 				<batch :batch="dataContent.batch"></batch>
 			</view>
 			<view class="">
@@ -104,7 +104,11 @@
 			isShowRecommendQty: {
 				type: Boolean,
 				default: true
-			}
+			},
+			showCountType: {
+				type: Boolean,
+				default: false
+			},
 		},
 		watch: {
 			dataContent: {
diff --git a/src/pages/count/job/countLightDetail.vue b/src/pages/count/job/countLightDetail.vue
index c5aad2ca..24468616 100644
--- a/src/pages/count/job/countLightDetail.vue
+++ b/src/pages/count/job/countLightDetail.vue
@@ -25,7 +25,7 @@
 						<view class="uni-flex uni-row " style="align-items: center; margin: 10rpx; border-radius: 10rpx   ;">
 							<comCountDetailcards :ref="'countDetail_'+index" :dataContent="item" :index="index" @editItem="editItem"
 								:settingParam="jobContent" @remove="updateData" @summCount="summCount" @currentCount="currentCount"
-								@updateData="updateData">
+								@updateData="updateData" :showCountType='true'>
 							</comCountDetailcards>
 						</view>
 					</uni-swipe-action-item>
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index aca3c477..6ea71147 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -364,7 +364,7 @@
 						"unplanned_issue_reason", "scrap_reason", "inspect_failed_reason",
 						"request_status", "inspect_type", "next_action", "sample_method", "transfer_mode",
 						"count_stage", "inspect_result", "area_type","count_scope_type","priority",
-						"receive_status",'deliver_method','duty','duty_details','shift'
+						"receive_status",'deliver_method','duty','duty_details','shift','inventory_mode'
 					]
 				}
 				getDictionaryItem(params).then(res => {