修改消息详细，跳转到主页面 回收料收货

fe/PDA/pages.js

@@ -38,7 +38,7 @@ module.exports = () => ({
 			"path": "pages/message/index",
 			"style": {
 				"navigationBarTitleText": "消息",
-				"enablePullDownRefresh": true
+				"enablePullDownRefresh": false
 			}
 
 		},

fe/PDA/pages/message/details.vue

@@ -18,7 +18,15 @@
 	import {
 		messages
 	} from '@/api/index.js';
+	import {
+		goHome
+	} from '@/common/basic.js';
 	export default {
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
 		data() {
 			return {
 				id: '',

fe/PDA/pages/message/index.vue

@@ -61,11 +61,6 @@
 	} from '@/common/basic.js';
 
 	export default {
-		onNavigationBarButtonTap(e) {
-			if (e.index === 0) {
-				goHome();
-			}
-		},
 		data() {
 			return {
 				allMessageList: [],

fe/PDA/pages/task/deliver_detail.vue

@@ -72,7 +72,8 @@
 											<view class="text_black">{{ item.recommendLocationCode }}</view>
 										</uni-th>
 										<uni-th width="120" align="center">
-											<view v-if="item.scaned" class="text_black">{{ item.handledFromLocationCode }}
+											<view v-if="item.scaned" class="text_black">
+												{{ item.handledFromLocationCode }}
 											</view>
 										</uni-th>
 									</uni-tr>
@@ -275,12 +276,29 @@
 					item.handledFromLocationArea = that.balancesItem.locationCode;
 					item.handledQty = that.balancesItem.qty;
 	
-					 // "toLocationCode": "string",
-					 //      "toLocationArea": "string",
-					 //      "toLocationGroup": "string",
-					 //      "toLocationErpCode": "string",
-					 //      "toWarehouseCode": "string",
-					 //      "onTheWayLocationCode": "string"
+
+					// ==================================
+					// item.recommendFromLocationCode = string;
+					// item.recommendFromLocationArea = string;
+					// item.recommendFromLocationGroup = string;
+					// item.recommendFromLocationErpCode = string;
+					// item.recommendFromWarehouseCode = string;
+					// item.uom = string;
+					// item.recommendQty = 0;
+					// item.handledFromLocationCode = string;
+					// item.handledFromLocationArea = string;
+					// item.handledFromLocationGroup = string;
+				 //    item.handledFromLocationErpCode = string;
+					// item.handledFromWarehouseCode = string;
+					// item.handledQty = that.balancesItem.qty;
+					// item.toLocationCode = string;
+					// item.toLocationArea = string;
+					// item.toLocationGroup = string;
+					// item.toLocationErpCode = string;
+					// item.toWarehouseCode = string;
+					// item.onTheWayLocationCode = string;
+
+
 					this.getScanCount();
 					this.closeScanPopup();
 					that.$forceUpdate();
@@ -343,21 +361,20 @@
 					title: "提交中..."
 				});
 
-				that.datacontent.company = localStorage.company;
 				let params = JSON.stringify(that.datacontent);
 				console.log(params);
-				finshDeliverJob(that.id, params)
-					.then(res => {
-						uni.hideLoading();
-						if (res != null) {
-							that.showCommitSuccessMessage();
-							that.backJobList(1000);
-						}
-					})
-					.catch(err => {
-						this.showMessage(err.message);
-						uni.hideLoading();
-					});
+				// finshDeliverJob(that.id, params)
+				// 	.then(res => {
+				// 		uni.hideLoading();
+				// 		if (res != null) {
+				// 			that.showCommitSuccessMessage();
+				// 			that.backJobList(1000);
+				// 		}
+				// 	})
+				// 	.catch(err => {
+				// 		this.showMessage(err.message);
+				// 		uni.hideLoading();
+				// 	});
 			},
 
 			//返回任务列表页

fe/PDA/pages/task/issue_detail.vue

@@ -420,6 +420,7 @@
 				item.handledFromLocationArea = balanceItem.locationArea;
 				item.handledFromLocationGroup = balanceItem.locationErpCode;
 				item.handledFromLocationErpCode = balanceItem.locationGroup;
+				item.handledFromWarehouseCode = balanceItem.warehouseCode;
 				
 				item.toLocationArea =balanceItem.locationArea;
 				item.toLocationGroup= balanceItem.locationGroup;

fe/PDA/pages/task/receipt.vue

@@ -138,7 +138,6 @@
 			},
 
 			getList(type) {
-				this.isToday=false;
 				let that = this;
 				uni.showLoading({
 					title: "加载中....",

fe/PDA/pages/task/receipt_check.vue

@@ -188,6 +188,7 @@
 			//保存
 			save() {
 				let files = this.$refs.uploadImage.getFiles();
+				console.log("文件个数",files.length)
 				if (files.length > 0) {
 					// this.readImageBuffer(files);
 					if (this.dataContent.failedReason || this.dataContent.failedReason.length > 0) {
@@ -204,7 +205,7 @@
 					}
 				} else //零件保存为合格
 				{
-					if (this.dataContent.purchaseReceiptInspectStatus == 3) {
+					if (this.dataContent.purchaseReceiptInspectStatus == 2||this.dataContent.purchaseReceiptInspectStatus == 3) {
 						showConfirmMsg('是否要将零件的状态改为合格?', confirm => {
 							if (confirm) {
 								this.saveResultPass();

fe/PDA/static/config.json

@@ -27,7 +27,7 @@
 		"putawayInventoryStatus": "2",
 		"dev": "http://dev.ccwin-in.com:21093",
 		"print_url": "http://dev.ccwin-in.com:59095",
-		"version_update_url": "http://dev.ccwin-in.com:59081",
+		"version_update_url": "http://dev.ccwin-in.com:21381",
 		"isScrapScanToLocation": false,
 		"isReceiptToday": true,
 		"scrapReason": "ScrapReason",