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

# Conflicts:
#	src/common/style/new_style.css

src/api/request2.js

@@ -4236,3 +4236,32 @@ export  function getBusinessType() {
 		data:{}
 	});
 }
+
+/**
+ * 获取生产计划信息通过生产线和日期
+ * @param {*}  
+ */
+
+export  function getPlaneInfoByproductLine(productionLine,planDate) {
+	return  request({
+		url: baseApi + "/wms/production-main/getPlanProductionByProductionLineAndPlanDate?productionLine="+productionLine+"&planDate="+planDate,
+		method: "get",
+		data:{}
+	});
+}
+
+/**
+ * 按
+ * @param {*}  
+ */
+
+export  function planReceiptSubmit(params) {
+	return  request({
+		url: baseApi + "/wms/production-main/getPlanProductionByProductionLineAndPlanDate",
+		method: "post",
+		data:params
+	});
+}
+
+
+

src/common/basic.js

@@ -3,7 +3,9 @@ export {
 	maxPageSize
 }
 
-import { calc } from '@/common/calc'
+import {
+	calc
+} from '@/common/calc'
 
 let jobStatusList = [];
 let itemStatusList = [];
@@ -17,8 +19,8 @@ let unplannedReceiptReasonList = [];
 let unplannedIissueReason = [];
 let scrapReasonList = [];
 let inspectFailedReasonList = [];
-let switchList=[]
+let switchList = []
-let businessList=[]
+let businessList = []
 
 
 //获取字典信息
@@ -35,8 +37,8 @@ export function clearCacheData() {
 	unplannedIissueReason = [];
 	scrapReasonList = [];
 	inspectFailedReasonList = [];
-	switchList=[]
+	switchList = []
-	businessList=[]
+	businessList = []
 
 }
 
@@ -352,7 +354,7 @@ export function getSwitchInfoByCode(code) {
 			break;
 		}
 	}
-	isCheck =resultInfo.effectiveSetValue=="TRUE"?true:false
+	isCheck = resultInfo.effectiveSetValue == "TRUE" ? true : false
 	return isCheck;
 }
 
@@ -854,7 +856,7 @@ export function getCurrDateTimes() {
 	var time = (new Date()).getTime();
 	return time;
 }
-
+//2024717
 export function getBatch() {
 	var date = new Date();
 	var year = date.getFullYear(); //年
@@ -863,6 +865,19 @@ export function getBatch() {
 	var batch = year.toString() + month.toString() + day.toString()
 	return batch;
 }
+//20270717
+export function getBatch8() {
+	var date = new Date();
+	//获取日期部分
+	var year = date.getFullYear(); //年
+	var month = date.getMonth() + 1; //月
+	var day = date.getDate(); //日
+
+	month = month < 10 ? "0" + month : month;
+	day = day < 10 ? "0" + day : day;
+	return year + month + day;
+}
+
 
 export function getCurrDate() {
 	var date = new Date();
@@ -995,7 +1010,7 @@ export function getDataSource(subList) {
 			item.subList.push(newDetail);
 			items.push(item)
 		} else {
-			item.qty = calc.add(item.qty,detail.qty)
+			item.qty = calc.add(item.qty, detail.qty)
 			let newDetail = createDetailInfo(detail); //
 			item.subList.push(newDetail);
 		}

src/pages/fg/coms/comReceiptPopup.vue

@@ -12,50 +12,80 @@
 					</view>
 					<view class='split_line'></view>
 					<view class="uni-flex uni-column" style="background-color: white; ">
-						<view class="uni-flex uni-column  ">
+						<view class="uni-flex uni-column">
-							<view class="uni-flex uni-row padding title u-col-center" style="width: 100%;">
-								<view class="" style="width:25% ">
-									<text>生产线：</text>
-								</view>
 
-								<view class="" >
+							<view class="title " style="display: flex; align-items: center;padding: 10rpx;">
-									<uni-combox :candidates="productLineList" v-model="productLineCode" placeholder="请扫描来源库位"
+								<text style=" flex-shrink: 0;width: 25%;">生产线：</text>
-										@confirm="handleConfirm" style='height: 30rpx;border:1px solid #fff ;'></uni-combox>
+								<view class="customerBorder" @click="showSelectLine">
+									{{productionLineName}}
 								</view>
+								<u-select v-model="showProductLineSelect" mode="single-column" :list="productLineList"
+									@confirm="confirmSelectLine"></u-select>
 
+								<view class="">
+									<image src="/static/icons/down.svg" mode=""
+										style=" width: 40rpx;height: 40rpx;margin-left: 20rpx;" @click="showSelectLine">
+									</image>
+								</view>
 							</view>
 
+
 							<view class='split_line'></view>
 
-							<view class="title padding" style="display: flex;">
+							<view class="title " style="display: flex;align-items: center;padding: 10rpx;">
-								<text style=" flex-shrink: 0;">物料：</text>
+								<text style=" flex-shrink: 0; width: 25%;">物料代码：</text>
-								<view class="" style="width: 100% ;">
+								<view class="customerBorder">
 									{{itemCode}}
 								</view>
+								<u-select v-model="showItemCodeSelect" mode="single-column" :list="itemCodeList"
+									@confirm="confirmSelectItem"></u-select>
 								<view class="">
-									<image src="/static/search.svg" mode=""
+									<image src="/static/icons/down.svg" mode=""
-										style=" width: 40rpx;height: 40rpx;margin-left: 20rpx;" @click="itemCodeClick">
+										style=" width: 40rpx;height: 40rpx;margin-left: 20rpx;"
+										@click="showSelectItemCode">
 									</image>
 								</view>
 							</view>
+							<view class='split_line'></view>
 
+							<view class="title " style="display: flex;align-items: center;padding: 10rpx;">
+								<text style=" flex-shrink: 0; width: 25%;">批次：</text>
+								<uni-easyinput v-model="batch"></uni-easyinput>
+								<view class="">
+									<image src="" mode="" style=" width: 40rpx;height: 40rpx;margin-left: 20rpx;"
+										@click="showSelectLine">
+									</image>
+								</view>
+							</view>
+							<view class='split_line'></view>
+							<view class="title " style="display: flex;align-items: center;padding: 10rpx;">
+								<text style=" flex-shrink: 0; width: 25%;">计划数量：</text>
+								<view class="customerBorder">
+									{{planQty}}
+								</view>
+								<view class="">
+									<image src="" mode=""
+										style=" width: 40rpx;height: 40rpx;margin-left: 20rpx;"
+										>
+									</image>
+								</view>
+							</view>
 							<view class='split_line'></view>
-							<view class="uni-flex uni-row  padding title u-col-center">
+							<view class="title " style="display: flex;align-items: center;padding: 10rpx;">
-								<text>数量： </text>
+								<text style=" flex-shrink: 0; width: 25%;">包装规格：</text>
-								<view class="uni-flex uni-row uni-center"
+								<view class="customerBorder">
-									style="display: flex; align-items: center;margin-left: 20rpx;justify-content: center;">
+									{{packUnit}}
-
-									<input style="text-align: center;" class="qty_input" v-model="counQty" type="number"
-										@confirm="confirm()" :focus="numberFocus" @input="checkNum"
-										:maxlength="maxlength" />
-
-									<uom :uom="uom"></uom>
-									<view class="" v-if="stdPackInfo!=undefined"
-										style="display: flex;flex-direction: row;margin-left: 10rpx;">
-										(<packQty :dataContent="stdPackInfo"></packQty>)
 								</view>
+								<u-select v-model="showPackUnitSelect" mode="mutil-column-auto" :list="packUnitList"
+									@confirm="confirmSelectPackUnit"></u-select>
+								<view class="">
+									<image src="/static/icons/down.svg" mode=""
+										style=" width: 40rpx;height: 40rpx;margin-left: 20rpx;"
+										@click="showSelectPackUnit">
+									</image>
 								</view>
 							</view>
+
 							<view class='split_line'></view>
 						</view>
 					</view>
@@ -66,25 +96,26 @@
 				</view>
 			</view>
 		</uni-popup>
-		<win-scan-item ref="scanPopup" title='物料代码' @getScanResult='getItemScanResult'
-			:itemCodeTypeList="itemCodeTypeList">
-		</win-scan-item>
 		<comMessage ref="comMessage"></comMessage>
 	</view>
 </template>
 
 <script>
 	import {
-		getBasicItemByCode,
+		getIssueJobByProductionline,
-		getProductionlineItem,
+		getPlaneInfoByproductLine,
-		getWorkShopLineStation,
+		getPackUnitByItemCode
-		getWarehouseCodeList
 	} from '@/api/request2.js';
 	import {
-		getLocationTypeName,
+		getPackUnitName,
-		getListLocationTypeDesc,
+		getUomInfo
-		checkDirectoryItemExist
 	} from '@/common/directory.js';
+
+	import {
+		getCurrDate,
+		getBatch8
+	} from '@/common/basic.js';
+
 	import uom from '@/mycomponents/qty/uom.vue'
 	import packQty from '@/mycomponents/qty/packQty.vue'
 	import balanceStatus from '@/mycomponents/status/balanceStatus.vue'
@@ -99,42 +130,58 @@
 		},
 		data() {
 			return {
-				workshopCode: "", //车间
+				itemCode: '请选择物料信息',
-				workShopName: "",
-				productionLineCode: "", //生产线
-				productionLineName: "",
-				workStationCode: "", //工位
-				workStationName: "",
-				itemCode: '请扫描物料信息',
-				fromWarehouseCode: "请选择仓库代码",
-				itemName: "",
-				qty: 0,
-				rawLocationCode: "",
-				fgLocationCode: "",
-				itemCodeFocus: false,
-				requestInfo: null,
-				itemCodeList: [],
-				counQty: undefined,
-				editPosition: true,
-				numberFocus: false,
 				uom: "",
-				positionInfo: "请选择位置",
+				planQty: 0,
-				show: false,
+				number: "",
-				isModifiedPosition: true,
+				productLineCode: "",
-				positionList: [],
+				showProductLineSelect: false,
-				stdQty: 0, //标包
+				productLineList: [],
-				maxlength: 10,
+				productionLineName: "请选择生产线",
-				stdPackInfo: undefined,
+				productionLineCode: "",
-				wareHouseList: [],
+				batch: "",
-				showWareHouse: false,
+				packUnit: "请选择包装规格",
-				productLineList:[],
+				showPackUnitSelect: false,
-				productLineCode:""
+				itemCodeList: [],
+				showItemCodeSelect: false,
+				packUnitList: [{
+						value: 1,
+						label: '中国',
+						children: [{
+								value: 2,
+								label: '广东',
+
+							},
+							{
+								value: 5,
+								label: '广西',
+
+							}
+						]
+					},
+					{
+						value: 8,
+						label: '美国',
+						children: [{
+								value: 9,
+								label: '纽约',
+
+							},
+							{
+								value: 10,
+								label: '华盛顿',
+
+							}
+						]
+					}
+				]
+
 			}
 		},
 		props: {
 			title: {
 				type: String,
-				default: '完工信息'
+				default: '开工阶段'
 			},
 			itemCodeTypeList: {
 				type: Array,
@@ -142,247 +189,211 @@
 			},
 		},
 		methods: {
-			checkNum(e) {
+			openRequestPopup() {
-				let value = e.detail.value;
+				this.initData();
-				let dot = value.indexOf('.'); //包含小数点
+				this.batch = getBatch8()
-				let reg = /^[0-9]+$/; //正整数
-				if (dot > -1) {
-					this.maxlength = dot + 7; //长度是小数点后两位
-					if (value.length > dot + 7) {
-
-					}
-				}
-				if (reg.test(value)) { //如果是正整数不包含小数点
-					this.maxlength = 10;
-				}
-				this.change(value)
-			},
-			openRequestPopup(editPosition) {
-				if (this.positionList.length == 0) {
-					getWorkShopLineStation().then(res => {
-						if (res.data != null && res.data.length > 0) {
-							this.positionList = res.data
-						} else {
-							this.showErrorMessage('未查找到位置信息');
-						}
-
-					}).catch(error => {
-						this.showErrorMessage(error);
-					})
-				}
-
-
-				this.editPosition = editPosition;
-				if (this.isModifiedPosition) {
-					this.isModifiedPosition = false
-				} else {
-					this.itemCode = "请扫描物料信息";
-					this.show = false
-					this.showWareHouse = false
-					this.uom = ""
-					this.qty = 0;
-					this.stdPackInfo = undefined;
-					this.counQty = undefined;
-					this.numberFocus = false
-					this.itemCodeGetFocus();
-				}
-
-				setTimeout(res => {
 				this.$refs.popup.open('bottom')
-				}, 500)
 			},
 			initData() {
-				this.positionList = [];
+				this.itemCode = '请选择物料信息';
-				this.wareHouseList= [],
-				this.showWareHouse = false
-				this.editPosition =true;
-				this.itemCode = "请扫描物料信息";
-				this.rawLocationCode = ""
-				this.positionInfo = "请选择位置"
-				this.fromWarehouseCode = "请选择仓库代码"
-				this.workshopCode = "" //车间
-				this.workShopName = ""
-				this.productionLineCode = "" //生产线
-				this.productionLineName = ""
-				this.workStationCode = "" //工位
-				this.workStationName = ""
-				this.show = false
 				this.uom = ""
-				this.qty = 0;
+				this.planQty = 0
-				this.stdPackInfo = undefined;
+				this.number = ""
-				this.counQty = undefined;
+				this.productLineCode = ""
-				this.numberFocus = false
+				this.showProductLineSelect = false
+				this.productLineList = []
+				this.productionLineName = "请选择生产线"
+				this.productionLineCode = ""
+				this.batch = ""
+				this.packUnit = "请选择包装规格"
+				this.showPackUnitSelect = false
+				// this.packUnitList = []
+				this.itemCodeList = []
+				this.showItemCodeSelect = false
 			},
 
 			closeRequestPopup() {
 				this.$refs.popup.close()
 			},
-			locationConfirm() {
-				//查询库位信息
-				this.checkLocatioCode();
-			},
-			itemCodeClick() {
-				this.$refs.scanPopup.openScanPopup();
-			},
-
-			itemCodeGetFocus() {
-				this.itemCodeFocus = true;
-			},
 			itemCodeLoseFocus() {
 				this.itemCodeFocus = false;
 			},
 
 			confirm() {
-				if (this.positionInfo == "请选择位置") {
+				if (this.productionLineName == "请选择生产线") {
-					this.showErrorMessage("请选择位置")
+					this.showErrorMessage("请选择生产线")
 					return
 				}
 
-				if (this.fromWarehouseCode == "请选择仓库代码") {
+				if (!this.batch) {
-					this.showErrorMessage("请选择仓库代码")
+					this.showErrorMessage("请输入批次例如:20200101")
 					return
 				}
 
-
+				if (this.itemCode == "请选择物料信息") {
-				if (this.itemCode == "请扫描物料信息") {
+					this.showErrorMessage("请选择物料信息")
-					this.showErrorMessage("请输入物料", "itemCode")
-					return
-				}
-				if (this.counQty == undefined) {
-					this.showErrorMessage("请输入数量")
 					return
 				}
 
-				if (this.qty == 0) {
+				if (this.itemCode == "请选择包装规格") {
-					this.showErrorMessage("数量必须大于0")
+					this.showErrorMessage("请选择包装规格")
 					return
 				}
 
-				if (this.rawLocationCode == '') {
+				this.callback();
-					this.showErrorMessage(this.workStationName + "的原材料库位为空")
-					return
-				}
-				this.callback('add');
 			},
 
-			callback(action) {
+			callback() {
 				let item = {
-					positionInfo: this.positionInfo,
-					workshopCode: this.workshopCode, //车间
-					workShopName: this.workShopName,
-					productionLineCode: this.productionLineCode, //生产线
 					productionLineName: this.productionLineName,
-					workStationCode: this.workStationCode, //工位
+					productionLineCode: this.productionLineCode, //生产线
-					workStationName: this.workStationName,
-					rawLocationCode: this.rawLocationCode,
-					fgLocationCode: this.fgLocationCode,
-					fromWarehouseCode: this.fromWarehouseCode,
-					toWarehouseCode: this.fromWarehouseCode,
 					itemCode: this.itemCode,
-					itemName: this.itemName,
 					uom: this.uom,
-					qty: this.qty
+					batch: this.batch,
+					packUnit: "packUnit",
+					planQty: this.planQty,
+					number: this.number
+
 				};
 				this.closeRequestPopup();
-				this.$emit("confirm", action, item);
+				this.$emit("confirm", item);
 			},
 
 			showErrorMessage(message, type) {
 				setTimeout(r => {
-					this.$refs.comMessage.showErrorMessage(message, res => {
+					this.$refs.comMessage.showErrorMessage(message, res => {})
-						if (type == "itemCode") {
-							this.itemCodeGetFocus();
-						} else {
-							this.numberFocus = true;
-						}
 				})
-					if (type == "itemCode") {
-						this.itemCode = "请扫描物料信息"
-					}
-				})
-			},
-			change(value) {
-				this.qty = value;
 			},
 			cancel(e) {
 				this.closeRequestPopup();
 			},
-			showSelect() {
+
-				if (this.editPosition) {
+			confirmSelectLine(data) {
-					this.show = true
+				this.productionLineName = data[0].label
-				}
+				this.productionLineCode = data[0].value
 			},
 
-			showWarseHouseSelect() {
+			showSelectLine() {
-				if (this.editPosition) {
+				if (this.productLineList.length == 0) {
-					this.wareHouseClick();
+					uni.showLoading({
+						title: "加载中",
+						mask: true
+					})
+					getIssueJobByProductionline().then(res => {
+						uni.hideLoading()
+						if (res.data && res.data.length > 0) {
+							res.data.forEach(item => {
+								item.label = item.name
+							})
+							this.productLineList = res.data
+							this.showProductLineSelect = true
+						} else {
+							this.showErrorMessage('未查找到生产线信息');
+						}
+
+					}).catch(error => {
+						uni.hideLoading()
+						this.showErrorMessage(error);
+					})
+				} else {
+					this.showProductLineSelect = true
 				}
-			},
 
-			confirmSelect(e) {
+
-				this.positionInfo = e[0].label + "-" + e[1].label + "-" + e[2].label
+			},
-				console.log("位置", this.positionInfo)
+			showSelectItemCode() {
-				this.workshopCode = e[0].value
+				if (!this.productionLineCode) {
-				this.productionLineCode = e[1].value
+					this.showErrorMessage('请先选择生产线');
-				this.workStationCode = e[2].value
-				this.workShopName = e[0].label
-				this.productionLineName = e[1].label
-				this.workStationName = e[2].label
-
-				let shop = this.positionList.find(shop => shop.value == this.workshopCode);
-				if (shop != undefined && shop.children != undefined) {
-					let prodLine = shop.children.find(line => line.value == this.productionLineCode);
-					if (prodLine != undefined && prodLine.children != undefined) {
-						let station = prodLine.children.find(r => r.value == this.workStationCode);
-						if (station.rawLocationCode == '' && station.rawLocationCode == null) {
-							this.showErrorMessage(this.workStationName + "的原材料库位为空,请重新选择")
 					return;
-						} else {
-							this.rawLocationCode = station.rawLocationCode;
-							this.fgLocationCode = station.fgLocationCode;
 				}
+
+				if (this.itemCodeList.length == 0) {
+					console.log("当天", getCurrDate())
+					uni.showLoading({
+						title: "加载中",
+						mask: true
+					})
+					getPlaneInfoByproductLine(this.productionLineCode, getCurrDate()).then(res => {
+						uni.hideLoading()
+						if (res.data && res.data.length > 0) {
+							res.data.forEach(item => {
+								item.label = item.itemCode
+							})
+							this.itemCodeList = res.data
+							this.showItemCodeSelect = true
 						} else {
-						this.showErrorMessage("生产线-工位基础信息维护错误")
+							this.showErrorMessage('未查找到物料信息');
 						}
+
+					}).catch(error => {
+						uni.hideLoading()
+						this.showErrorMessage(error);
+					})
 				} else {
-					this.showErrorMessage("车间-生产线基础信息维护错误")
+					this.showItemCodeSelect = true
 				}
-			},
 
-			getItemScanResult(code, scanResult) {
-				this.itemCode = code;
-				this.itemName = scanResult.name
-				this.uom = scanResult.uom
-				this.stdPackInfo = scanResult.package;
-				this.numberFocus = true
 			},
-			wareHouseClick() {
+			confirmSelectItem(data) {
+				this.itemCode = data[0].label
+				var item = this.itemCodeList.find(res => res.itemCode == this.itemCode)
+				this.uom = item.uom
+				this.planQty = item.planQty
+				this.number = item.number
+			},
+
+			showSelectPackUnit() {
+				if (this.packUnitList.length == 0) {
+					if (this.itemCode == "请选择物料信息") {
+						this.showErrorMessage('请先选择物料');
+						return;
+					}
+
 					uni.showLoading({
-					title: "查询中....",
+						title: "加载中",
 						mask: true
-				});
+					})
-				getWarehouseCodeList(1, 100).then(res => {
+					getPackUnitByItemCode(this.itemCode).then(res => {
 						uni.hideLoading()
-					if (res.data != null && res.data.list.length > 0) {
+						if (res.data && res.data.list.length > 0) {
 							res.data.list.forEach(item => {
-							item.value = item.code;
+								item.value = item.packUnit
-							item.label = item.name;
+								item.label = getPackUnitName(item.packUnit) + "(" + item.packQty + this
+									.getUomInfo(item.uom) + ")";
 							})
-						this.wareHouseList = res.data.list
+							// this.packUnitList = res.data.list
-						this.showWareHouse = true
+							this.showPackUnitSelect = true
 						} else {
-						this.showErrorMessage('未查找到仓库代码');
+							this.showErrorMessage('未查找到包装信息');
 						}
+
 					}).catch(error => {
 						uni.hideLoading()
 						this.showErrorMessage(error);
 					})
+				} else {
+					this.showPackUnitSelect = true
+				}
+
 			},
 
+			confirmSelectPackUnit(data) {
+
+				let pack = this.packUnitList.filter(r => r.packUnit == data[0].value)[0];
+				// this.packUnit = pack.packQty;
+				this.packUnit = data[0].label
 
-			confirmWareHouse(e) {
-				this.fromWarehouseCode = e[0].value;
 			},
+			getUomInfo(uom) {
+				let item = getUomInfo(uom);
+				if (item == '') {
+					return uom;
+				} else {
+					return item.label
+				}
+			},
+
+
 
 
 
@@ -394,4 +405,11 @@
 	.title {
 		font-size: 30rpx;
 	}
+
+	.customerBorder {
+		width: 100%;
+		border: 1rpx solid lightgray;
+		border-radius: 5rpx;
+		padding: 15rpx;
+	}
 </style>

src/pages/fg/receiptByPlan.vue

@@ -1,36 +1,223 @@
 <template>
+	<view class="page-wraper" style="background-color: #fff;">
 		<view class="">
+			<com-blank-view @goScan='openFg' v-if="!dataContent"></com-blank-view>
+		</view>
+
+		<view class="page-wraper" v-if="dataContent">
+			<view class="" style="font-size: 35rpx;padding: 10rpx; padding-left: 15rpx;">
+				生产计划：{{dataContent.number}}
+			</view>
+			<view class='split_line'></view>
+			<view class="">
+				<item-qty :dataContent="dataContent" :isShowBalanceQty="false"></item-qty>
+			</view>
+			<view class='split_line'></view>
+			<view class="" style="margin-left: 20rpx;">
+				<batch :batch="dataContent.batch"></batch>
+				<view class="card_view ">
+					<text style="color: #FFA500;padding: 5px;font-size: 35rpx;">包装规格</text>
+					<text class="card_content ">{{dataContent.packUnit}}</text>
+				</view>
+			</view>
+			<view class='split_line'></view>
+			<view class="page-main">
+				<uni-swipe-action>
+					<view class="scan_view" v-for="(item, index) in dataContent.subList" :key="index">
+						<uni-swipe-action-item :right-options="options" @click="swipeClick($event,item,index)">
+							<view class="" style="margin-left: 40rpx; padding-top: 10rpx; padding-bottom: 10rpx;">
+								<text style="font-size: 35rpx;color: #B66463;">唯一码</text>
+								<text style="font-size: 35rpx;"> {{item.code}}</text>
+							</view>
+						</uni-swipe-action-item>
+
+					</view>
+				</uni-swipe-action>
+			</view>
+			<view class="page-footer">
+				<view class="uni-flex u-col-center space-between padding_10"
+					style="background-color:ghostwhite; width: 100%; ">
 					<view class="">
-			<com-blank-view @goScan='openFg' v-if="detailSource.length==0"></com-blank-view>
+						<view class="uni-flex uni-row">
+						</view>
+
+					</view>
+					<view class=" uni-flex uni-row">
+						<button class="btn_single_clear" style="margin-right: 50rpx;" hover-class="btn_clear_after"
+							@click="clear">清空</button>
+						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
 					</view>
-		<comReceiptPopup ref="comReceiptPopup" @confirm='requestConfirm' ></comReceiptPopup>
+				</view>
+			</view>
+
+
+		</view>
+		<comReceiptPopup ref="comReceiptPopup" @confirm='requestConfirm'></comReceiptPopup>
+		<win-scan-button v-if="dataContent" @goScan='openScanPopup'></win-scan-button>
+		<win-scan-fg-label ref="scanPopup" @getResult='getScanResult' title='制品标签'></win-scan-fg-label>
+		<comMessage ref="comMessage"></comMessage>
 	</view>
 </template>
 
 <script>
+	import {
+		isCheckMesCode,
+		planReceiptSubmit
+	} from '@/api/request2.js';
+	import {
+		getRemoveOption
+	} from '@/common/basic.js';
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
 	import comBlankView from '@/mycomponents/common/comBlankView.vue'
 	import comReceiptPopup from '@/pages/fg/coms/comReceiptPopup.vue'
+	import itemQty from '@/mycomponents/item/itemQty.vue'
+	import batch from '@/mycomponents/balance/batch.vue'
+	import pack from '@/mycomponents/balance/pack.vue'
+	import winScanFgLabel from "@/mycomponents/scan/winScanFgLabel.vue"
 	export default {
 		components: {
 			comBlankView,
-			comReceiptPopup
+			comReceiptPopup,
+			itemQty,
+			batch,
+			pack,
+			winScanButton,
+			winScanFgLabel
 		},
 		data() {
 			return {
-				detailSource:[]
+				dataContent: null,
+				options: []
+
 			};
 		},
 
-		onShow() {
+		onShow() {},
+		onLoad() {
+			this.options = getRemoveOption()
+			this.openFg();
 		},
 
 		mounted() {
 
 		},
 		methods: {
-			openFg(){
+			openFg() {
-				this.$refs.comReceiptPopup.openRequestPopup("");
+				setTimeout(res => {
+					if (this.$refs.comReceiptPopup) {
+						this.$refs.comReceiptPopup.openRequestPopup();
+					}
+				}, 600)
+
+			},
+			requestConfirm(result) {
+				this.dataContent = {
+					itemCode: result.itemCode,
+					number: result.number, //计划单号
+					handleQty: 0,
+					qty: result.planQty,
+					batch: result.batch,
+					packUnit: "3031",
+					uom: result.uom,
+					subList: [{
+							code: "1234"
+
+						},
+						{
+							code: "12345"
+
+						}
+
+					]
+				}
+			},
+			swipeClick(e, dataContent,index) {
+				if (e.content.text == "移除") {
+					this.dataContent.subList.splice(index,1);
+				} 
+
+			},
+			commit() {
+				planReceiptSubmit(params).then(res => {
+					uni.hideLoading()
+					if (res.data) {
+						this.showCommitSuccessMessage(res.data)
+					} else {
+						this.showErrorMessage("提交失败[" + res.msg + "]")
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
+			clear() {
+
+			},
+			openScanPopup() {
+				var itemCode = this.dataContent.itemCode
+				// itemCode = "015553147"
+				console.log("物料", itemCode)
+				this.$refs.scanPopup.openScanPopup(itemCode);
+			},
+			getScanResult(result) {
+					let that = this;
+				//TODO缺少零件号的对应关系
+				//查询mes码是否完工
+				isCheckMesCode(result.content).then(res=>{
+					if(res.data){
+						if (that.dataContent) {
+							let list = that.dataContent.subList; //应该按零件号查找
+							
+							var itemIndex = list.findIndex(r =>
+								r.itemCode == result.itemCode &&
+								// r.productDate == result.productDate &&
+								r.order == result.order);
+								//不存在
+							if (itemIndex == -1) {
+								list.push(result);
+								that.calcFgQty();
+							} else {
+								this.showErrorMessage("标签【" + result.content + '】已经扫描，是否移除', confirm => {
+									list.splice(itemIndex, 1)
+									that.calcFgQty();
+								})
 							}
+							setTimeout(r => {
+								this.scanPopupGetFocus();
+							}, 500)
+							
+							
+						}
+					}
+				}).catch(error=>{
+					this.showErrorMessage(error)
+				})
+				
+			},
+			
+			calcFgQty() {
+				this.dataContent.handleQty =this.dataContent.subList.length;
+				if (this.dataContent.handleQty == this.dataContent.qty) {
+					this.commit()
+				}
+			},
+			
+			scanPopupGetFocus() {
+				if (this.$refs.scanPopup) {
+					this.$refs.scanPopup.getfocus();
+				}
+			},
+			scanPopupLoseFocus() {
+				if (this.$refs.scanPopup ) {
+					this.$refs.scanPopup.losefocus();
+				}
+			},
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					this.dataContent=null;
+					this.openFg();
+				})
+			},
 		}
 
 	}

src/pages/productReceipt/job/ccProductReceiptDetail.vue

@@ -139,9 +139,11 @@
 			};
 		},
 		onLoad(option) {
+			setTimeout(res=>{
 				uni.setNavigationBarTitle({
 				  title: option.title+'详情'
 				})
+			},50)
 			
 			this.id = option.id;
 			this.scanedPackingNumber = option.scaned || '';
@@ -419,7 +421,7 @@
 						ccProductReceiptJobsubmit(params).then(res => {
 							uni.hideLoading()
 							if (res.data) {
-								this.showCommitSuccessMessage("提交成功<br>生成预生产收货记录<br>" + res.data, )
+								this.showCommitSuccessMessage("提交成功<br>生成装配收货记录<br>" + res.data )
 							} else {
 								this.showErrorMessage("提交失败[" + res.msg + "]")
 							}

src/pages/productReceipt/job/ccProductReceiptJob.vue

@@ -80,25 +80,28 @@
 				detailOptions: [],
 				detailGiveupOptions: [],
 				type: 'assemble',
+				title:""
 			};
 		},
 		// 装配收货：type = 'assemble'
 		// 预生产收货：type = 'predict'
-		props: {
+		// props: {
-			title: {
+		// 	title: {
-				type: String,
+		// 		type: String,
-				default: ''
+		// 		default: ''
-			},
+		// 	},
+		// },
+		
+		onLoad(option){
+			this.title = option.title
 		},
 		
-		mounted() {
+		onShow(){
 			this.detailOptions = getDetailOption();
 			this.detailGiveupOptions = getDetailGiveupOption();
 			this.getList('refresh');
 		},
 
-
-
 		onPullDownRefresh() {
 			this.getList('refresh');
 		},
@@ -123,7 +126,6 @@
 			}
 		},
 		
-		methods: {
 		onReachBottom() {
 			console.log('onReachBottom', this.loadingType)
 			//避免多次触发
@@ -132,9 +134,8 @@
 			}
 			this.getList("more");
 		},
-			refresh() {
+
-				this.getList('refresh');
+		methods: {
-			},
 			getList(type) {
 				let that = this;
 				uni.showLoading({

src/static/icons/down.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1721183536347" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1545" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M76.4 290.3c-17.5 17.5-17.5 45.8 0 63.3l370.2 370.2c35 35 91.7 35 126.6 0l372.9-372.9c17.3-17.3 17.5-45.3 0.5-62.8-17.4-17.9-46.1-18.1-63.8-0.5L541.6 628.9c-17.5 17.5-45.8 17.5-63.3 0L139.8 290.3c-17.5-17.4-45.9-17.4-63.4 0z" p-id="1546" fill="#8a8a8a"></path></svg>