修改标题

pages/count/job/countDetail.vue

@@ -47,7 +47,6 @@
 
 	import {
 		goHome,
-		updateTitle,
 		getPackingNumberAndBatch
 	} from '@/common/basic.js';
 
@@ -164,7 +163,6 @@
 							that.fromLocationCode = that.jobContent.locationCode;
 							that.detailList = res.data.subList;
 							that.detailSource = that.getDataSource(that.detailList)
-						   updateTitle(that.jobContent.number);
 						} else {
 							that.showErrorMessage('列表数据为0');
 						}

pages/customerReturn/job/returnDetail.vue

@@ -52,7 +52,6 @@
 	} from '@/api/request2.js';
 	import {
 		goHome,
-		updateTitle,
 		getCurrDateTime,
 		getPackingNumberAndBatch,
 		getInventoryStatusName,
@@ -181,7 +180,6 @@
 							that.tolocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes)
 
 							that.getLocationInfo(that.toLocationCode);
-							updateTitle(that.jobContent.number)
 						} else {
 							that.showMessage('列表数据为0');
 						}

pages/customerReturn/record/returnRecord.vue

@@ -51,7 +51,8 @@
 		getDirectoryItemArray
 	} from '@/common/directory.js';
 	import {
-		goHome
+		goHome,
+		updateTitle
 	} from '@/common/basic.js';
 	
 	import {
@@ -95,9 +96,6 @@
 				detailList: [], //接口返回的任务details
 				detailSource: [], //绑定在页面上的数据源
 				scrollTop: 0,
-				old: {
-					scrollTop: 0
-				},
 				locationTypeList: [],
 				toLocationInfo: {},
 				businessType: {},
@@ -116,6 +114,7 @@
 		},
 		onLoad(option) {
 			this.fromType = option.fromType
+			if(this.fromType=="requestType"){
				updateTitle("客户退货申请")
			}else {
				updateTitle("客户退货记录")
			}
 			var typeCode = "Customerreturn"
 			getBusinessType(typeCode, res => {
 				if (res.success) {

pages/customerReturn/request/customerReturnRequestDetail.vue

@@ -26,7 +26,6 @@
 
 	import {
 		goHome,
-		updateTitle
 	} from '@/common/basic.js';
 
 	import {
@@ -88,7 +87,6 @@
 						that.requestContent = res.data;
 						that.detailList = res.data.subList;
 						that.detailSource = getDataSource(that.detailList);
-						updateTitle(this.requestContent.number);
 					} else {
 						that.showMessage('列表数据为0');
 					}

pages/deliver/job/deliverDetail.vue

@@ -58,7 +58,6 @@
 	
 	import {
 		goHome,
-		updateTitle,
 		getCurrDateTime,
 		getPackingNumberAndBatch
 	} from '@/common/basic.js';
@@ -180,7 +179,6 @@
 							that.tolocationTypeList = getLocationTypeArray(that.jobContent.toLocationTypes)
 							that.detailSource = getDataSource(that.detailList)
 							that.getLocationInfo(that.toLocationCode);
-							updateTitle(that.jobContent.number)
 						} else {
 							that.showMessage('列表数据为0');
 						}

pages/deliver/record/deliverRecord.vue

@@ -56,6 +56,7 @@
 	} from '@/api/request2.js';
 	import {
 		goHome,
+		updateTitle,
 		getInventoryStatusDesc,
 		getDirectoryItemArray
 	} from '@/common/basic.js';
@@ -100,9 +101,6 @@
 				detailList: [], //接口返回的任务details
 				detailSource: [], //绑定在页面上的数据源
 				scrollTop: 0,
-				old: {
-					scrollTop: 0
-				},
 				locationTypeList: [],
 				toLocationInfo: {},
 				businessTypeInfo: {},
@@ -124,6 +122,7 @@
 		},
 		onLoad(option) {
 			this.fromType = option.fromType
+			if(this.fromType=="requestType"){
				updateTitle("制品发货申请")
			}else {
				updateTitle("制品发货记录")
			}
 			var typeCode = "Deliver"
 			getBusinessType(typeCode, res => {
 				if (res.success) {

pages/deliver/request/deliverRequestDetail.vue

@@ -25,7 +25,6 @@
 
 	import {
 		goHome,
-		updateTitle
 	} from '@/common/basic.js';
 
 	import {
@@ -90,7 +89,6 @@
 								res.fromLocationCode = res.toLocationCode
 							})
 							that.detailSource = getDataSource(that.detailList);
-							updateTitle(this.requestContent.number);
 						} else {
 							that.showMessage('列表数据为0');
 						}

pages/inspect/coms/inspectComDetailCard.vue

@@ -16,7 +16,7 @@
 							:right-options="item.scaned?scanOptions:detailOptions">
 							<recommend :detail="item" :record="item.record" :isShowPack="isShowPack"
 								:isShowBatch="isShowBatch" :isShowLocation="isShowLocation"></recommend>
-								<view :class="item.scaned?'scan_view':''" style="font-size: 32rpx;padding-left: 3rpx;">
+								<view v-if="item.failedQty>0||item.crackQty>0" :class="item.scaned?'scan_view':''" style="font-size: 32rpx;padding-left: 3rpx;">
 									<view class="" >
 										不合格数量 ：{{item.failedQty}}
 									</view>
@@ -149,6 +149,7 @@
 							item.notPassedQty = 0;
 							item.inspectResult =""
 							item.failedReason =""
+							item.photos =""
 							this.$forceUpdate()
 							this.$emit('remove', item)
 						}
@@ -159,6 +160,11 @@
 			},
 			getInspectResult(result){
 				this.dataContent.details[this.editIndex]= result;
+				if (this.$refs.collapse1 != undefined) {
+					this.$nextTick(res => {
+						this.$refs.collapse1.resize()
+					})
+				}
 				this.$emit('updateData',)
 			}
 			

pages/inspect/job/inspectDetail.vue

@@ -83,10 +83,6 @@
 				jobContent: {}, //任务内容
 				detailList: [], //接口返回的任务details
 				detailSource: [], //绑定在页面上的数据源
-				scrollTop: 0,
-				old: {
-					scrollTop: 0
-				},
 				toLocationInfo: {},
 				businessTypeInfo: {},
 				locationTypeList: [],
@@ -177,6 +173,7 @@
 							that.jobContent = res.data;
 							that.detailList = res.data.subList;
 							that.detailList.forEach(res => {
+								res.batch =that.jobContent.batch
 								res.goodQty = 0;
 								res.failedQty = 0;
 								res.crackQty = 0;
@@ -401,11 +398,6 @@
 			},
 
 
-			scroll: function(e) {
-				// console.log(e)
-				this.old.scrollTop = e.datacontent.scrollTop;
-			},
-
 			closeCommitMessage() {
 				setTimeout(() => {
 					uni.navigateTo({

pages/inspect/request/inspectRequest.vue

@@ -180,6 +180,7 @@
 						uni.stopPullDownRefresh();
 					}
 					this.loadingType = "";
+					updateTitle("检验单申请");
 					uni.hideLoading();
 					that.showMessage(error)
 				})

pages/inspect/request/inspectRequestDetail.vue

@@ -36,7 +36,6 @@
 
 	import {
 		goHome,
-		updateTitle
 	} from '@/common/basic.js';
 
 	import {
@@ -102,7 +101,6 @@
 						// 	res.packingNumber =res.toPackingNumber
 						// 	res.batch =res.fromBatch
 						// })
-						updateTitle(this.jobContent.number);
 					} else {
 						that.showMessage('列表数据为0');
 					}

pages/inventoryMove/job/inventoryMoveJob.vue

@@ -159,6 +159,7 @@
 						uni.stopPullDownRefresh();
 					}
 					this.loadingType = "";
+					updateTitle("库存转移");
 					uni.hideLoading();
 					that.showMessage(error)
 				})

pages/issue/record/issueRecord.vue

@@ -82,8 +82,8 @@
 			this.goScan()
 		},
 		onLoad(option) {
-			debugger
 			this.fromType = option.fromType
+			if(this.fromType=="requestType"){
				updateTitle("发料申请")
			}else {
				updateTitle("发料记录")
			}
 		},
 		methods: {
 			goScan() {

pages/productPutaway/job/productPutawayDetail.vue

@@ -54,7 +54,6 @@
 
 	import {
 		goHome,
-		updateTitle,
 		getCurrDateTime,
 		getPackingNumberAndBatch,
 		getInventoryStatusName,
@@ -179,7 +178,6 @@
 							that.tolocationTypeList = getLocationTypeArray(that.jobContent.toLocationTypes)
 							that.detailSource = getDataSource(that.detailList)
 							that.getLocationInfo(that.toLocationCode);
-							updateTitle(that.jobContent.number);
 						} else {
 							that.showMessage('列表数据为0');
 						}

pages/productPutaway/request/putawayRequestDetail.vue

@@ -25,7 +25,6 @@
 
 	import {
 		goHome,
-		updateTitle
 	} from '@/common/basic.js';
 
 	import {
@@ -87,7 +86,6 @@
 							that.requestContent = res.data;
 							that.detailList = res.data.subList;
 							that.detailSource = getDataSource(that.detailList);
-							updateTitle(this.requestContent.number);
 						} else {
 							that.showMessage('列表数据为0');
 						}

pages/productReceipt/job/productReceiptDetail.vue

@@ -48,7 +48,6 @@
 	} from '@/api/request2.js';
 	import {
 		goHome,
-		updateTitle,
 		getCurrDateTime,
 		getPackingNumberAndBatch,
 	} from '@/common/basic.js';
@@ -181,7 +180,6 @@
 							that.fromLocationTypeList = getDirectoryItemArray(that.jobContent.fromLocationTypes);
 							that.locationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes)
 							that.detailSource = getDataSource(that.detailList)
-						    updateTitle(that.jobContent.number)
 						} else {
 							that.showMessage('列表数据为0');
 						}

pages/productionReturn/job/returnDetail.vue

@@ -45,7 +45,6 @@
 	} from '@/api/request2.js';
 	import {
 		goHome,
-		updateTitle,
 		getCurrDateTime,
 		getPackingNumberAndBatch
 	} from '@/common/basic.js';
@@ -184,7 +183,6 @@
 							that.fromLocationCode = that.detailList[0].fromLocationCode
 							that.toLocationCode = that.detailList[0].toLocationCode
 							that.tolocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes)
-						    updateTitle(that.jobContent.number);
 						} else {
 							that.showMessage('列表数据为0');
 						}

pages/productionReturn/request/requestDetail.vue

@@ -24,7 +24,6 @@
 
 	import {
 		goHome,
-		updateTitle
 	} from '@/common/basic.js';
 
 	import {
@@ -86,7 +85,6 @@
 							that.requestContent = res.data;
 							that.detailList = res.data.subList;
 							that.detailSource = getDataSource(that.detailList);
-							updateTitle(this.requestContent.number);
 						} else {
 							that.showMessage('列表数据为0');
 						}

pages/purchaseReceipt/job/receiptDetail.vue

@@ -46,7 +46,6 @@
 
 	import {
 		goHome,
-		updateTitle,
 		getCurrDateTime,
 		getPackingNumberAndBatch,
 	} from '@/common/basic.js';

pages/purchaseReturn/job/returnDetail.vue

@@ -54,7 +54,6 @@
 		goHome,
 		getCurrDateTime,
 		getPackingNumberAndBatch,
-		updateTitle
 	} from '@/common/basic.js';
 	import {
 		getInventoryStatusName

pages/purchaseReturn/record/returnRecord.vue

@@ -45,6 +45,7 @@
 	} from '@/api/request2.js';
 	import {
 		goHome,
+		updateTitle
 	} from '@/common/basic.js';
 
 	import {
@@ -97,6 +98,11 @@
 		
 		onLoad(option) {
 			this.fromType = option.fromType
+			if(this.fromType=="requestType"){
+				updateTitle("采购退货申请")
+			}else {
+				updateTitle("采购退货记录")
+			}
 			var typeCode = "PurchaseReturn"
 			getBusinessType(typeCode, res => {
 				if (res.success) {

pages/purchaseReturn/request/returnRequestDetail.vue

@@ -25,7 +25,6 @@
 
 	import {
 		goHome,
-		updateTitle
 	} from '@/common/basic.js';
 
 	import {
@@ -90,7 +89,6 @@
 							res.fromLocationCode = res.toLocationCode
 						})
 						that.detailSource = getDataSource(that.detailList);
-						updateTitle(this.requestContent.number);
 					} else {
 						that.showMessage('列表数据为0');
 					}

pages/putaway/job/putawayDetail.vue

@@ -51,7 +51,6 @@
 	} from '@/api/request2.js';
 	import {
 		goHome,
-		updateTitle,
 		getCurrDateTime,
 		getPackingNumberAndBatch,
 	} from '@/common/basic.js';
@@ -181,7 +180,6 @@
 							that.toLocationCode = that.detailList[0].toLocationCode
 							that.tolocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes)
 							that.getLocationInfo(that.toLocationCode);
-							updateTitle(this.jobContent.number);
 							
 						} else {
 							that.showMessage('列表数据为0');

pages/putaway/record/putawayRecord.vue

@@ -43,6 +43,7 @@
 <script>
 	import {
 		goHome,
+		updateTitle
 	} from '@/common/basic.js';
 	import {
 		getInventoryStatusDesc,
@@ -93,9 +94,6 @@
 				detailList: [], //接口返回的任务details
 				detailSource: [], //绑定在页面上的数据源
 				scrollTop: 0,
-				old: {
-					scrollTop: 0
-				},
 				locationTypeList: [],
 				toLocationInfo: {},
 				businessTypeInfo: {},
@@ -115,6 +113,7 @@
 		},
 		onLoad(option) {
 			this.fromType = option.fromType
+			if(this.fromType=="requestType"){
				updateTitle("采购上架申请")
			}else {
				updateTitle("采购上架记录")
			}
 			var typeCode = "PurchasePutaway"
 			getBusinessType(typeCode, res => {
 				if (res.success) {

pages/putaway/request/putawayRequestDetail.vue

@@ -26,7 +26,6 @@
 
 	import {
 		goHome,
-		updateTitle
 	} from '@/common/basic.js';
 
 	import {
@@ -88,7 +87,6 @@
 						that.requestContent = res.data;
 						that.detailList = res.data.subList;
 						that.detailSource = getDataSource(that.detailList);
-						updateTitle(this.requestContent.number);
 					} else {
 						that.showMessage('列表数据为0');
 					}

pages/repleinsh/job/repleinshDetail.vue

@@ -52,7 +52,6 @@
 	} from '@/api/request2.js';
 	import {
 		goHome,
-		updateTitle,
 		getCurrDateTime,
 		getPackingNumberAndBatch,
 		getInventoryStatusName,
@@ -178,7 +177,6 @@
 							that.fromLocationCode = that.detailList[0].fromLocationCode
 							that.toLocationCode = that.detailList[0].toLocationCode
 							that.tolocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes)
-							updateTitle(that.jobContent.number);
 							that.getLocationInfo(that.toLocationCode);
 
 						} else {

pages/repleinsh/record/repleinshRecord.vue

@@ -43,6 +43,7 @@
 <script>
 	import {
 		goHome,
+		updateTitle,
 		getInventoryStatusDesc,
 		getDirectoryItemArray
 	} from '@/common/basic.js';
@@ -90,9 +91,6 @@
 				detailList: [], //接口返回的任务details
 				detailSource: [], //绑定在页面上的数据源
 				scrollTop: 0,
-				old: {
-					scrollTop: 0
-				},
 				locationTypeList: [],
 				toLocationInfo: {},
 				businessTypeInfo: {},
@@ -112,6 +110,7 @@
 		},
 		onLoad(option) {
 			this.fromType = option.fromType
+			if(this.fromType=="requestType"){
				updateTitle("补料申请")
			}else {
				updateTitle("补料记录")
			}
 			var typeCode = "Repleinment"
 			getBusinessType(typeCode, res => {
 				if (res.success) {

pages/scrap/record/scrapRecord.vue

@@ -52,6 +52,7 @@
 <script>
 	import {
 		goHome,
+		updateTitle,
 		getInventoryStatusDesc,
 		getDirectoryItemArray,
 		getScarpReasonList
@@ -95,9 +96,6 @@
 				detailList: [], //接口返回的任务details
 				detailSource: [], //绑定在页面上的数据源
 				scrollTop: 0,
-				old: {
-					scrollTop: 0
-				},
 				locationTypeList: [],
 				toLocationInfo: {},
 				businessTypeInfo: {},
@@ -117,6 +115,7 @@
 		},
 		onLoad(option) {
 			this.fromType = option.fromType
+			if(this.fromType=="requestType"){
				updateTitle("报废申请")
			}else {
				updateTitle("报废记录")
			}
 			this.reasonList = getScarpReasonList();
 			var typeCode = "Scrap"
 			getBusinessType(typeCode, res => {

pages/scrap/request/scrapRequestDetail.vue

@@ -26,7 +26,6 @@
 
 	import {
 		goHome,
-		updateTitle
 	} from '@/common/basic.js';
 
 	import {
@@ -87,7 +86,6 @@
 						that.requestContent = res.data;
 						that.detailList = res.data.subList;
 						that.detailSource = getDataSource(that.detailList);
-						updateTitle(this.requestContent.number);
 					} else {
 						that.showMessage('列表数据为0');
 					}}

pages/transfer/job/transferDetail.vue

@@ -41,7 +41,6 @@
 	} from '@/api/request2.js';
 	import {
 		goHome,
-		updateTitle,
 		getCurrDateTime,
 		getPackingNumberAndBatch,
 		getInventoryStatusName
@@ -166,7 +165,6 @@
 						that.jobContent = res.data[0];
 						that.detailList = res.data[0].details;
 						that.detailSource = that.getDataSource(that.detailList)
-					    updateTitle(this.jobContent.number);
 					} else {
 						that.showMessage('列表数据为0');
 					}

pages/unPlanned/job/receiptJobDetail.vue

@@ -45,7 +45,6 @@
 	import {
 		goHome,
 		getCurrDateTime,
-		updateTitle,
 		getPackingNumberAndBatch,
 		getDirectoryItemArray
 	} from '@/common/basic.js';
@@ -155,7 +154,6 @@
 							that.locationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes);
 							that.detailList = res.data.subList;
 							that.detailSource = that.getDataSource(that.detailList)
-						    updateTitle(this.jobContent.number);
 						} else {
 							that.showErrorMessage('列表数据为0');
 						}

pages/unPlanned/record/issueRecord.vue

@@ -67,6 +67,11 @@
 		calcHandleQty
 	} from '@/common/record.js';
 	
+	import {
+		goHome,
+		updateTitle
+	} from '@/common/basic.js';
+
 	export default {
 		components: {
 			comEmptyView,
@@ -109,6 +114,11 @@
 
 		onLoad(option) {
 		this.fromType = option.fromType
+		if (this.fromType == "requestType") {
+			updateTitle("计划外出库申请")
+		} else {
+			updateTitle("计划外出库记录")
+		}
 		},
 
 		methods: {

pages/unPlanned/record/receiptRecord.vue

@@ -63,6 +63,11 @@
 	import {
 		getBusinessType,
 	} from '@/common/record.js';
+	import {
+		goHome,
+		updateTitle,
+	} from '@/common/basic.js';
+
 
 	export default {
 		components: {
@@ -108,6 +113,11 @@
 
 		onLoad(option) {
 			this.fromType = option.fromType
+			if (this.fromType == "requestType") {
+				updateTitle("计划外入库申请")
+			} else {
+				updateTitle("计划外入库记录")
+			}
 		},
 
 		methods: {

pages/unPlanned/request/issueRequestDetail.vue

@@ -25,7 +25,6 @@
 
 	import {
 		goHome,
-		updateTitle
 	} from '@/common/basic.js';
 
 	import {
@@ -87,7 +86,6 @@
 							that.requestContent = res.data;
 							that.detailList = res.data.subList;
 							that.detailSource = getDataSource(that.detailList);
-							updateTitle(this.requestContent.number);
 						}else {
 							that.showMessage('列表数据为0');
 						}

pages/unPlanned/request/receiptRequestDetail.vue

@@ -26,7 +26,6 @@
 
 	import {
 		goHome,
-		updateTitle
 	} from '@/common/basic.js';
 
 	import {
@@ -91,7 +90,6 @@
 							res.fromLocationCode = res.toLocationCode
 						})
 						that.detailSource = getDataSource(that.detailList);
-						updateTitle(this.requestContent.number);
 					} else {
 						that.showMessage('列表数据为0');
 					}