修改提示

src/mycomponents/detail/comDetailCard.vue

@@ -107,14 +107,14 @@
 		},
 
 		mounted() {
-			// if (this.detailOptions.length == 0) {
+			if (this.detailOptions.length == 0) {
-			// 	this.detailOptions = getDetailOption();
+				this.detailOptions = getDetailOption();
-			// }
+			}
-			// if (this.scanOptions.length == 0) {
+			if (this.scanOptions.length == 0) {
-			// 	this.scanOptions = getPurchaseReceiptOption(this.settingParam.allowModifyQty, false)
+				this.scanOptions = getPurchaseReceiptOption(this.settingParam.allowModifyQty, false)
-			// }
+			}
 			
-			this.showLocation();
+			// this.showLocation();
 		},
 
 		methods: {

src/mycomponents/job/jobFilter.vue

@@ -128,13 +128,14 @@
 		},
 		methods: {
 			// 生产线
-			productionLineCodeConfirm(){
+			productionLineCodeConfirm(e){
-				var lineCode=""
+				var lineCode=e
-				this.productionline.forEach(item=>{
+				// this.productionline.forEach(item=>{
-					if(item.text==this.productionLineCode){
+				// 	if(item.value==this.productionLineCode){
-						lineCode=item.value
+				// 		lineCode=item.value
-					}
+				// 	}
-				})
+				// })
+				console.log("生产线+++"+lineCode)
 				this.$emit("productionLineCode", lineCode)
 				
 			},

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>

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

src/pages/putaway/job/putawayDetail.vue

@@ -306,6 +306,11 @@
 					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;