From 3a3f01d6a8909dae4cf408e4a23ac576bfad0dbb Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Tue, 23 Jul 2024 13:58:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/detail/comDetailCard.vue | 14 +++++++-------
 src/mycomponents/job/jobFilter.vue        | 15 ++++++++-------
 src/pages/issue/coms/comIssueJobCard.vue  |  7 ++++++-
 src/pages/issue/job/issueJob.vue          |  3 +++
 src/pages/putaway/job/putawayDetail.vue   |  6 ++++++
 5 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/src/mycomponents/detail/comDetailCard.vue b/src/mycomponents/detail/comDetailCard.vue
index b15bb0fa..9a968002 100644
--- a/src/mycomponents/detail/comDetailCard.vue
+++ b/src/mycomponents/detail/comDetailCard.vue
@@ -107,14 +107,14 @@
 		},
 
 		mounted() {
-			// if (this.detailOptions.length == 0) {
-			// 	this.detailOptions = getDetailOption();
-			// }
-			// if (this.scanOptions.length == 0) {
-			// 	this.scanOptions = getPurchaseReceiptOption(this.settingParam.allowModifyQty, false)
-			// }
+			if (this.detailOptions.length == 0) {
+				this.detailOptions = getDetailOption();
+			}
+			if (this.scanOptions.length == 0) {
+				this.scanOptions = getPurchaseReceiptOption(this.settingParam.allowModifyQty, false)
+			}
 			
-			this.showLocation();
+			// this.showLocation();
 		},
 
 		methods: {
diff --git a/src/mycomponents/job/jobFilter.vue b/src/mycomponents/job/jobFilter.vue
index af91fa70..12df735d 100644
--- a/src/mycomponents/job/jobFilter.vue
+++ b/src/mycomponents/job/jobFilter.vue
@@ -128,13 +128,14 @@
 		},
 		methods: {
 			// 生产线
-			productionLineCodeConfirm(){
-				var lineCode=""
-				this.productionline.forEach(item=>{
-					if(item.text==this.productionLineCode){
-						lineCode=item.value
-					}
-				})
+			productionLineCodeConfirm(e){
+				var lineCode=e
+				// this.productionline.forEach(item=>{
+				// 	if(item.value==this.productionLineCode){
+				// 		lineCode=item.value
+				// 	}
+				// })
+				console.log("生产线+++"+lineCode)
 				this.$emit("productionLineCode", lineCode)
 				
 			},
diff --git a/src/pages/issue/coms/comIssueJobCard.vue b/src/pages/issue/coms/comIssueJobCard.vue
index d8a43bf2..f6b15788 100644
--- a/src/pages/issue/coms/comIssueJobCard.vue
+++ b/src/pages/issue/coms/comIssueJobCard.vue
@@ -1,7 +1,12 @@
 <template>
  	<job-com-main-card :dataContent="dataContent">
 		<jobComMainDetailCard  :dataContent="dataContent"></jobComMainDetailCard>
- 	</job-com-main-card>
+		<view class="" v-if ="dataContent.productionLineCode">
+			<text style="font-size: 32rpx; margin-left: 35rpx;">生产线</text>
+			<text style="font-size: 35rpx; margin-left: 10rpx; font-weight: bold;" >{{dataContent.productionLineCode}}</text>
+			
+		</view>
+	</job-com-main-card>
  </template>
 
  <script>
diff --git a/src/pages/issue/job/issueJob.vue b/src/pages/issue/job/issueJob.vue
index b4c20dfb..2bc2b06b 100644
--- a/src/pages/issue/job/issueJob.vue
+++ b/src/pages/issue/job/issueJob.vue
@@ -11,7 +11,9 @@
 				<view v-for="(item, index) in jobList" :key="index">
 					<uni-swipe-action-item :right-options="item.status=='2'?detailGiveupOptions:detailOptions"
 						@click="swipeClick($event,item)">
+						
 						<com-issue-job-card :dataContent="item" @click='openJobDetail(item)'></com-issue-job-card>
+						
 					</uni-swipe-action-item>
 				</view>
 			</uni-swipe-action>
@@ -202,6 +204,7 @@
 						uni.stopPullDownRefresh();
 					}
 					var list = res.data.list;
+					
 					this.totalCount = res.data.total
 					updateTitle(this.title+"(" + this.totalCount + ")");
 					this.loadingType = "loadmore";
diff --git a/src/pages/putaway/job/putawayDetail.vue b/src/pages/putaway/job/putawayDetail.vue
index 09cda247..a4c319a3 100644
--- a/src/pages/putaway/job/putawayDetail.vue
+++ b/src/pages/putaway/job/putawayDetail.vue
@@ -305,6 +305,11 @@
 					var qty = result.label.qty;
 					var itemCode = result.label.itemCode;
 					var locationCode = result.fromLocationCode;
+					
+					if(!result.balance){
+						this.showMessage("箱码【" + packingNumber + "】没有库存余额")
+						return;
+					}
 
 					// var inventoryStatus = "OK";
 					var detail = this.detailSource.find(r => r.itemCode == itemCode);
@@ -364,6 +369,7 @@
 									scanedLength++;
 								}
 							})
+							
 							//大哥让加的
 							itemDetail.fromInventoryStatus = result.balance.inventoryStatus;