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

src/pages.json

@@ -1234,7 +1234,7 @@
 		{
 			"path": "pages/stockUp/job/stockUpJob",
 			"style": {
-				"navigationBarTitleText": "直接备货任务",
+				"navigationBarTitleText": "备货任务",
 				"enablePullDownRefresh": true,
 				"titleNView": {
 					// "autoBackButton": "true",
@@ -1261,7 +1261,7 @@
 		{
 			"path": "pages/stockUp/job/stockUpJobDetail",
 			"style": {
-				"navigationBarTitleText": "直接备货任务详情",
+				"navigationBarTitleText": "备货任务详情",
 				"enablePullDownRefresh": true
 			}
 		},

src/pages/stockUp/job/stockUpJobDetail.vue

@@ -8,7 +8,7 @@
 				申请单号：{{jobContent.requestNumber}}
 			</view>
 			<u-line color="#D8D8D8"></u-line>
-			<view class="cen_card" style="padding: 5rpx;">
+			<!-- <view class="cen_card" style="padding: 5rpx;">
 				<view class="cell_box uni-flex uni-row">
 					<view class="cell_info">
 						<view class="text_lightblue">客户代码</view>
@@ -20,7 +20,7 @@
 					</view>
 				</view>
 				<u-line />
-			</view>
+			</view> -->
 		</view>
 
 		<view class="page-main">
@@ -32,13 +32,28 @@
 			</scroll-view>
 		</view>
 
-		<div class="btn_bottom">
+
+		<view class="page-footer">
+			<view class="uni-flex u-col-center space-between padding_10"
+				style="background-color:ghostwhite; width: 100%; ">
+				<view class="">
+					<locationCompare ref='comScanLocation' title="目标库位" :recommendLocationCode="jobToLocationCode"
+						:locationCode="toLocationCode" @getLocation='scanLocationCode'
+						:locationAreaTypeList="toLocationAreaTypeList"></locationCompare>
+				</view>
+				<view class=" uni-flex uni-row">
+					<button class="btn_single_commit" hover-class="btn_commit_after" @click="submit">提交</button>
+				</view>
+			</view>
+		</view>
+
+		<!-- <div class="btn_bottom">
 			<view class="" style="display: flex;flex-direction: row;">
 				<view class="">
 					<button class="btn_commit" hover-class="btn_commit_after" @click="submit()">提交</button>
 				</view>
 			</view>
-		</div>
+		</div> -->
 		<win-scan-button @goScan='openScanDetailPopup'></win-scan-button>
 		<comScanStockUpPack ref="comScanIssuePack" @closeScan='closeScan' @updateData='updateData'>
 		</comScanStockUpPack>
@@ -82,6 +97,7 @@
 	import comStockUpDetailCard from '@/pages/stockUp/coms/comStockUpDetailCard.vue'
 	import comScanStockUpPack from '@/pages/stockUp/coms/comScanStockUpPack.vue'
 	import jobTop from '@/mycomponents/job/jobTop.vue'
+	import locationCompare from '@/mycomponents/location/locationCompare.vue'
 
 	export default {
 		name: 'issueDetail',
@@ -90,7 +106,8 @@
 			winScanButton,
 			comStockUpDetailCard,
 			comScanStockUpPack,
-			jobTop
+			jobTop,
+			locationCompare
 		},
 		data() {
 			return {
@@ -102,7 +119,9 @@
 				scanOptions: [],
 				status: "",
 				toLocationCode: "",
-				jobStatus:""
+				jobStatus: "",
+				toLocationAreaTypeList: [],
+				jobToLocationCode: "",
 			};
 		},
 
@@ -134,7 +153,7 @@
 		onBackPress(e) {
 			//已经接收但是没提交任务
 			if (e.from == 'backbutton') {
-				if (this.jobStatus=="2") {
+				if (this.jobStatus == "2") {
 					//取消承接任务	
 					cancleTakeStockUpJob(this.id).then(res => {
 						uni.navigateBack();
@@ -179,7 +198,12 @@
 
 							that.subList = res.data.subList;
 							that.detailSource = getDataSource(that.detailSource, that.subList)
-							that.toLocationCode = that.subList[0].toLocationCode
+							// that.toLocationCode = that.subList[0].toLocationCode
+
+							that.fromLocationCode = that.subList[0].fromLocationCode
+							that.jobToLocationCode = that.subList[0].toLocationCode;
+							that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes)
+
 							that.resizeCollapse();
 						} else {
 							that.showMessage('列表数据为0');
@@ -191,6 +215,17 @@
 				})
 			},
 
+			scanLocationCode(location, code) {
+				// this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
+				this.toLocationCode = code
+				this.detailSource.forEach(item => {
+					item.Items.forEach(detail => {
+						detail.toLocationCode = code
+					})
+				})
+				// })
+			},
+
 			closeScan() {
 				this.resizeCollapse();
 			},
@@ -244,7 +279,7 @@
 				stockUpJobsubmit(params).then(res => {
 					uni.hideLoading()
 					if (res.data) {
-						this.showCommitSuccessMessage("提交成功<br>生成发货记录" + res.data)
+						this.showCommitSuccessMessage("提交成功<br>生成备货记录" + res.data)
 					} else {
 						this.showErrorMessage("提交失败[" + res.msg + "]")
 					}
@@ -277,7 +312,7 @@
 										record.supplierCode = r.supplierCode;
 
 										//使用在途库不改变管理模式
-										if (this.toLocationCode ==null) {
+										if (this.toLocationCode == null) {
 											record.toPackingNumber = r
 												.packingNumber;
 											record.toBatch = r.batch;