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

common/style/pdabasic.css

@@ -716,7 +716,20 @@ page {
 	height: 100%;
 }
 
+.page-header {
+	background-color: #fff;
+	font-size: 35rpx;
+	padding: 10rpx 20rpx;
+}
 
+.page-header .header_item {
+	/* padding-left: 10rpx; */
+	padding: 5rpx 10rpx;
+}
+
+.page-header .header_job_top {
+	padding:5rpx 0rpx;
+}
 .page-main {
 	flex: 1;
 	position: relative;

mycomponents/item/itemQty.vue

@@ -5,6 +5,9 @@
 		</view>
 		<view>
 			<balanceQty v-if="showItemQty" :dataContent="dataContent"></balanceQty>
+			<compare-qty v-else :dataContent="dataContent" :recommendQty="Number(dataContent.qty)"
+				:handleQty="Number(handleQty)" :isShowStatus="false">
+			</compare-qty>
 		</view>
 		<!-- 	<view v-else>
 			<recommend-qty v-if="handleQty==0" :dataContent="dataContent" :isShowStatus="false"></recommend-qty>
@@ -17,11 +20,13 @@
 <script>
 	import item from '@/mycomponents/item/item.vue'
 	import balanceQty from '@/mycomponents/qty/balanceQty.vue'
+	import compareQty from '@/mycomponents/qty/compareQty.vue'
 
 	export default {
 		components: {
 			item,
-			balanceQty
+			balanceQty,
+			compareQty
 		},
 		data() {
 			return {

pages/issue/coms/comIssueDetailCard.vue

@@ -9,6 +9,8 @@
 					<template v-slot:title>
 						<!-- 物品 -->
 						<item-qty :dataContent="item" :handleQty="item.handleQty"></item-qty>
+			<!-- 			<com-issue-request-info :workShopCode="dataContent.workShopCode" :dataContent="dataContent">
+						</com-issue-request-info> -->
 					</template>
 					<u-line />
 					<view v-for="(loacation,index) in item.Locations">
@@ -63,7 +65,7 @@
 	import location from '@/mycomponents/balance/location.vue'
 	import comMessage from '@/mycomponents/common/comMessage.vue'
 	import detailInfoPopup from '@/pages/productionReceipt/coms/detailInfoPopup.vue'
-
+	import comIssueRequestInfo from '@/pages/issue/coms/comIssueRequestInfo.vue'
 	import {
 		getDetailOption,
 		getEditRemoveOption
@@ -81,7 +83,8 @@
 			balanceQtyEdit,
 			location,
 			comMessage,
-			detailInfoPopup
+			detailInfoPopup,
+			comIssueRequestInfo
 		},
 		props: {
 			dataContent: {

pages/issue/coms/comScanIssuePack.vue

@@ -7,7 +7,7 @@
 						扫描箱码
 						<text class="fr" @click="closeScanPopup()">关闭</text>
 					</view>
-				<!-- 	<view class="uni-flex uni-row" style="align-items: center;
+					<!-- 	<view class="uni-flex uni-row" style="align-items: center;
 						background-color: #fff; 
 						margin-left: 20rpx;
 						margin-right: 20rpx;
@@ -145,7 +145,7 @@
 				positionInfo: "请选择位置",
 				positionList: [],
 				defaultValueList: [],
-				fromInventoryStatuses :"",
+				fromInventoryStatuses: "",
 			}
 		},
 		created() {
@@ -186,26 +186,26 @@
 					that.fromLocationList = that.getFromLocationList();
 				}
 			},
+
 			showBalanceSelect(items) {
 				this.$refs.balanceSelect.openPopup(items);
 			},
 
 			getFromLocationList() {
 				let list = [];
-				let location = this.dataContent.find(r => r.toLocationCode == this.toLocationCode);
+				this.dataContent.forEach(location => {
-				if (location != undefined) {
 					location.Items.forEach(item => {
 						item.Locations.forEach(f => {
-							list.push(f.fromLocationCode)
+							let item = list.find(l => l == f.fromLocationCode);
+							if (item == undefined) {
+								list.push(f.fromLocationCode)
+							}
 						})
 					})
-					this.fromLocationCode = list[0];
+				});
-					return list;
+
-				} else {
+				this.fromLocationCode = list[0];
-					this.$refs.comMessage.showErrorMessages('需求库位【' + this.toLocationCode + '】不存在', res => {
+				return list;
-						this.toLocationCode = '';
-					});
-				}
 			},
 
 			fromLocationUpdate(fromlocation) {
@@ -215,10 +215,78 @@
 					this.showErrorMessage('发料库位【' + fromlocation + '】不存在')
 				}
 			},
-			onScan(result) {
+			onScan1(result) {
 				try {
 					let that = this;
+					if (that.fromLocationCode == '') {
+						that.showErrorMessage('请选择来源库位', res => {
+							that.$refs.toLocationCombox.onFocus();
+						});
+						return;
+					}
+					let packageInfo = result.package;
+					let itemCode = result.label.itemCode;
+					let packingCode = result.label.packingNumber;
+					let lot = result.label.batch;
+
+
+					that.dataContent.forEach(l => {
+						let item = l.Items.find(r => r.itemCode == itemCode);
+						if (item == undefined) {
+							continue;
+							// that.showErrorMessage('未查找到零件【' + itemCode + '】的发料明细',
+							// 	res => {
+							// 		that.getfocus();
+							// 	}
+							// )
+							// return;
+						} else {
+							//查找库存信息
+							uni.showLoading({
+								title: '加载中',
+								mask: true
+							})
+							
+							
+							
+							
+							
+							
+							getBalanceByManagementPrecision(result.label, that.fromLocationCode, that
+								.fromInventoryStatuses,
+								balanceRes => {
+									if (balanceRes.success) {
+										if (balanceRes.data.list.length == 0) {
+											this.showErrorMessage('在来源库位[' + this.fromLocationCode +
+												'],未查找到该包装的库存记录',
+												res => {
+													this.packGetFocus();
+												})
+										} else if (balanceRes.data.list.length == 1) {
+											let balance = balanceRes.data.list[0];
+											this.afterGetBalance(result.label, balance, packageInfo);
+										} else {
+											this.showBalanceSelect(balanceRes.data.list);
+										}
+									} else {
+										this.showErrorMessage(balanceRes.message.message);
+									}
+									uni.hideLoading();
+								});
+						}
+
 
+					})
+
+				} catch (e) {
+					this.showErrorMessage(e.stack)
+					uni.hideLoading();
+				}
+			},
+
+			onScan(result) {
+				try {
+					let that = this;
 					if (that.fromLocationCode == '') {
 						that.showErrorMessage('请选择来源库位', res => {
 							that.$refs.toLocationCombox.onFocus();
@@ -243,35 +311,37 @@
 							title: '加载中',
 							mask: true
 						})
-						getBalanceByManagementPrecision(result.label, that.fromLocationCode, that.fromInventoryStatuses, balanceRes => {
+						getBalanceByManagementPrecision(result.label, that.fromLocationCode, that.fromInventoryStatuses,
-							if (balanceRes.success) {
+							balanceRes => {
-								if (balanceRes.data.list.length == 0) {
+								if (balanceRes.success) {
-									this.showErrorMessage('在来源库位[' + this.fromLocationCode + '],未查找到该包装的库存记录',
+									if (balanceRes.data.list.length == 0) {
-										res => {
+										this.showErrorMessage('在来源库位[' + this.fromLocationCode + '],未查找到该包装的库存记录',
-											this.packGetFocus();
+											res => {
-										})
+												this.packGetFocus();
-								} else if (balanceRes.data.list.length == 1) {
+											})
-									let balance = balanceRes.data.list[0];
+									} else if (balanceRes.data.list.length == 1) {
-									this.afterGetBalance(result.label, balance,packageInfo);
+										let balance = balanceRes.data.list[0];
+										this.afterGetBalance(result.label, balance, packageInfo);
+									} else {
+										this.showBalanceSelect(balanceRes.data.list);
+									}
 								} else {
-									this.showBalanceSelect(balanceRes.data.list);
+									this.showErrorMessage(balanceRes.message.message);
 								}
-							} else {
+								uni.hideLoading();
-								this.showErrorMessage(balanceRes.message.message);
+							});
-							}
-							uni.hideLoading();
-						});
 					}
 				} catch (e) {
 					this.showErrorMessage(e.stack)
 					uni.hideLoading();
 				}
 			},
+
 			selectBalanceItem(balance) {
 				this.afterGetBalance(this.label, balance);
 			},
 
-			afterGetBalance(label, balance,packageInfo) {
+			afterGetBalance(label, balance, packageInfo) {
 				try {
 					let that = this;
 					let itemCode = label.itemCode;
@@ -292,11 +362,11 @@
 								if (batch.Recommends.length > 0) {
 									let recommend = batch.Recommends.find(r => r.packingNumber == packingCode);
 									if (recommend != undefined) {
-										that.addRecord(batch, label, balance,packageInfo)
+										that.addRecord(batch, label, balance, packageInfo)
 									} else {
 										//允许修改箱码
 										if (this.jobContent.allowModifyPackingNumber == 'TRUE') {
-											that.addRecord(batch, label, balance,packageInfo);
+											that.addRecord(batch, label, balance, packageInfo);
 										} else {
 											that.showErrorMessage('未查找到该箱码【' + packingCode + '】的明细',
 												res => {
@@ -306,7 +376,7 @@
 										}
 									}
 								} else {
-									that.addRecord(batch, label, balance,packageInfo)
+									that.addRecord(batch, label, balance, packageInfo)
 								}
 							} else {
 								that.showErrorMessage('箱码【' + packingCode + '】已经扫描,请继续扫描下一箱',
@@ -361,14 +431,14 @@
 				return batch;
 			},
 
-			creatRecord(label, balance,packageInfo) {
+			creatRecord(label, balance, packageInfo) {
 				balance.stdPackQty = packageInfo.stdPackQty
 				balance.stdPackUnit = packageInfo.stdPackUnit
 				let record = {
 					itemCode: label.itemCode,
 					packingNumber: label.packingNumber,
 					batch: label.batch,
-					qty: Number(label.qty)>Number(balance.qty)?Number(balance.qty):Number(label.qty),
+					qty: Number(label.qty) > Number(balance.qty) ? Number(balance.qty) : Number(label.qty),
 					uom: balance.uom,
 					inventoryStatus: balance.inventoryStatus,
 					balance: balance,
@@ -384,10 +454,11 @@
 					handleQty += Number(res.qty)
 				})
 				batch.handleQty = handleQty;
+				
 			},
 
-			addRecord(batch, label, balance,packageInfo) {
+			addRecord(batch, label, balance, packageInfo) {
-				let record = this.creatRecord(label, balance,packageInfo);
+				let record = this.creatRecord(label, balance, packageInfo);
 				batch.Records.push(record);
 				this.issueRecord.unshift(record)
 				this.calcBatchHandleQty(batch);

pages/issue/job/issueDetail.vue

@@ -1,18 +1,20 @@
 <template>
 	<view class="page-wraper">
 		<view class="page-main">
-			<view style="margin: 5px;">
+			<view class="page-header">
-				<job-top :dataContent="jobContent"></job-top>
+				<view class="header_job_top">
-				<view class="card_content">
+					<job-top :dataContent="jobContent"></job-top>
+				</view>
+				<view class="header_item">
 					申请单号 : {{jobContent.requestNumber}}
 				</view>
-				<u-line />
-			</view>
 
+			</view>
 			<scroll-view scroll-y="true" class="">
 				<view v-for="(toLocation, index) in detailSource">
 					<com-issue-request-info :workShopCode="jobContent.workShopCode" :dataContent="toLocation">
 					</com-issue-request-info>
+					<u-line />
 					<com-issue-detail-card ref='comIssueDetailCard' :dataContent="toLocation" @updateData='updateData'>
 					</com-issue-detail-card>
 				</view>
@@ -22,6 +24,7 @@
 		<div class="btn_bottom">
 			<view class="" style="display: flex;flex-direction: row;">
 				<view class="">
+					<!-- <button class="btn_commit" hover-class="btn_commit_after" @click="resizeCollapse()">刷新UI</button> -->
 					<button class="btn_commit" hover-class="btn_commit_after" @click="submit()">提交</button>
 				</view>
 			</view>
@@ -132,10 +135,25 @@
 			},
 		},
 		mounted: function() {
-
+			// this.resizeCollapse();
 		},
 
 		methods: {
+			resizeCollapse() {
+				this.$nextTick(r => {
+					// debugger;
+					this.$refs.comIssueDetailCard.forEach(r => {
+						r.resizeCollapse();
+					})
+					// this.$refs.mainCollapse.forEach(r => {
+					// 	r.childrens.forEach(i => {
+					// 		i.init();
+					// 	})
+					// 	r.resize();
+					// })
+				});
+			},
+
 			//接收
 			receive(callback) {
 				if (this.id != null) {
@@ -162,7 +180,11 @@
 							that.jobContent = res.data;
 							that.subList = res.data.subList;
 							that.detailSource = getDataSource(that.detailSource, that.subList)
-							that.resizeCollapse();
+
+							setTimeout(r => {
+								that.resizeCollapse();
+							}, 100)
+
 							uni.hideLoading();
 						} else {
 							that.showMessage('列表数据为0');
@@ -178,14 +200,6 @@
 				this.resizeCollapse();
 			},
 
-			resizeCollapse() {
-				this.$nextTick(r => {
-					this.$refs.comIssueDetailCard.forEach(r => {
-						r.resizeCollapse();
-					})
-				});
-			},
-
 			// submit() {
 			//3.如果是按批次先进先出发料提交时如果扫描的箱码不是先进的批次，则报错
 			//:请扫描XXX批次，改批次满足先进先出规则。否则可以直接提交
@@ -366,7 +380,8 @@
 						}
 					})
 				}
-				// item.handleQty=itemHandleQty;
+				this.resizeCollapse();
+				item.handleQty = itemHandleQty;
 			},
 
 			scanPopupGetFocus() {

pages/productionReceipt/job/productionReceiptDetail.vue

@@ -1,21 +1,29 @@
 <template>
 	<view class="page-wraper">
 		<view class="page-main">
-			<scroll-view scroll-y="true" class="page-main-scroll">
+			<view class="page-header">
+				<view class="header_job_top">
+					<job-top :dataContent="jobContent"></job-top>
+				</view>
+				<view class="header_item">
+					发料任务单号 : {{jobContent.issueJobNumber}}
+				</view>
+				<u-line />
+			</view>
+			<scroll-view scroll-y="true" class="">
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 					<view class="">
 						<com-detail-card :dataContent="item" :index="index" :settingParam="jobContent"
 							@remove="updateData" @updateData="updateData" @openDetail="openDetail"
 							:locationTypeList='tolocationTypeList'>
 						</com-detail-card>
+						<u-line />
 					</view>
-					<u-line />
+					
 				</view>
 			</scroll-view>
 		</view>
 
-
-
 		<view class="page-footer">
 			<view class="uni-flex u-col-center space-between padding_10"
 				style="background-color:ghostwhite; width: 100%; ">
@@ -75,6 +83,8 @@
 
 	import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
 	import detailInfoPopup from '@/pages/productionReceipt/coms/detailInfoPopup.vue'
+	import comIssueRequestInfo from '@/pages/issue/coms/comIssueRequestInfo.vue'
+	import jobTop from '@/mycomponents/job/jobTop.vue'
 
 	export default {
 		components: {
@@ -83,7 +93,9 @@
 			comMessage,
 			requiredLocation,
 			comDetailCard,
-			detailInfoPopup
+			detailInfoPopup,
+			comIssueRequestInfo,
+			jobTop
 		},
 		data() {
 			return {

pages/purchaseReceipt/job/receiptDetail.vue

@@ -1,8 +1,10 @@
 <template>
 	<view class="page-wraper">
-		<view style="margin: 5px;">
+		<view class="page-header">
-			<job-top :dataContent="jobContent"></job-top>
+			<view class="header_job_top">
-			<view class="card_content">
+				<job-top :dataContent="jobContent"></job-top>
+			</view>
+			<view class="header_item">
 				发货单号 : {{jobContent.asnNumber}}
 			</view>
 			<u-line />

pages/purchaseReturn/job/returnDetail.vue

@@ -1,10 +1,13 @@
 <template>
 	<view class="page-wraper">
 		<view class="page-header">
-			<view class="" style="font-size: 35rpx;margin-top: 20rpx;margin-bottom: 20rpx;margin-left: 10rpx;">
+			<view class="header_job_top">
+				<job-top :dataContent="jobContent" ></job-top>
+			</view>
+			<view class="header_item" >
 				发货单：{{jobContent.asnNumber}}
 			</view>
-			<view class="" style="font-size: 35rpx;margin-top: 20rpx;margin-left: 10rpx;">
+			<view class="header_item" >
 				供应商：{{jobContent.supplierCode}}
 			</view>
 			<u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-line>
@@ -75,6 +78,7 @@
 	import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
 	import returnDetailInfoPopup from '@/pages/purchaseReturn/coms/returnDetailInfoPopup.vue'
 	import comMessage from '@/mycomponents/common/comMessage.vue'
+	import jobTop from '@/mycomponents/job/jobTop.vue'
 	
 	export default {
 		name: 'returnDetail',
@@ -84,6 +88,7 @@
 			comDetailCard,
 			returnDetailInfoPopup,
 			comMessage,
+			jobTop
 		},
 		data() {
 			return {