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

src/api/request2.js

@@ -4223,7 +4223,7 @@ export function getRepleinshJobList(params) {
 }
 export function getRepleinshTimeJobList(params) {
 	return request({
-		url: baseApi + "/wms/repleinsh-request-main/senior",
+		url: baseApi + "/wms/repleinsh-request-detail/senior",
 		method: "post",
 		data: params,
 	});

src/mycomponents/job/jobRepleinshTimeQty.vue

@@ -15,8 +15,9 @@
 		</view>
 		<view style="padding-left: 8rpx;padding-right: 8rpx;" >|</view>
 		<view class="uni-flex uni-column align-start" style="flex: 1;">
-			<text style="padding-left: 8rpx;">未料数量</text>
+			<text style="padding-left: 8rpx;">未补料数量</text>
 			<text class="uom_yellow">{{dataContent.unexecutedQty}}{{getUomInfo(dataContent.uom)}}</text>
+			
 		</view>
 	</view>
 </template>

src/pages/count/job/countJob.vue

@@ -310,7 +310,7 @@
 					})
 
 					if (list.length == 0) {
-						that.showMessage('库位' + '【' + result.label.code + '】未关联到盘点任务');
+						that.showMessage('【库位'  + result.label.code + '未关联到盘点任务】');
 					} else if (list.length == 1) {
 						that.selectItem(list[0]);
 					} else {

src/pages/repleinsh/coms/comRepleishDetailCardTime.vue

@@ -22,7 +22,7 @@
 			<view style="" >
 				<view class="text_packQty uni-flex justify-end"  style="margin-top: 5rpx; margin-right: 20rpx;" >
 					<view class="uom_blue uni-flex align-center" >
-						<view class="uom_yellow" style="word-break:break-word;">{{dataContent.recordList.reduce((prev, item) => prev + Number(item['handleQty']),0)}}</view>
+						<view class="uom_yellow" style="word-break:break-word;">{{dataContent.recordList?dataContent.recordList.reduce((prev, item) => prev + Number(item['handleQty']),0):''}}</view>
 						<view class="">/</view>
 						<view class="uom_blue">{{dataContent.unexecutedQty}}{{' '+getUomInfo(dataContent.uom)}}</view>
 					</view>

src/pages/repleinsh/job/repleinshTimeDetail.vue

@@ -310,7 +310,7 @@
 			},
 
 			clickSubmit() {
-			// 未料数量unexecutedQty
+			// 未补料数量unexecutedQty
 			// 已补料数量qty
 				let requestQty = this.jobContent.unexecutedQty+this.jobContent.qty
 				if(this.jobContent.qty>=requestQty){

src/pages/repleinsh/job/repleinshTimeJob.vue

@@ -195,7 +195,7 @@
 						this.fromLocationAreaTypeList = res.fromLocationAreaTypeList
 						// this.openScanPopup();
 					} else {
-						this.showErrorMessage(res.message)
+						this.$refs.comMessage.showErrorMessage(res.message)
 					}
 				});
 			},