修改无计划完工

src/pages/fg/coms/comNoReceiptPopup.vue

@@ -34,8 +34,8 @@
 								<view class="customerBorder" @click="showSelectDate">
 									{{planDate}}
 								</view>
-								<u-select v-model="showDateSelect" mode="mutil-column-auto"
-									:list="planDateList" @confirm="confirmSelectDate"></u-select>
+								<u-select v-model="showDateSelect" mode="mutil-column-auto" :list="planDateList"
+									@confirm="confirmSelectDate"></u-select>
 
 								<view class="">
 									<image src="/static/icons/down.svg" mode=""
@@ -49,14 +49,21 @@
 								<view class="customerBorder">
 									{{itemCode}}
 								</view>
-								<view v-if="planQty>0">{{planQty}}({{getUomInfo(uom)}})</view>
 								<u-select v-model="showItemCodeSelect" mode="single-column" :list="itemCodeList"
 									@confirm="confirmSelectItem"></u-select>
 								<view class="">
-									
-									<image src="" mode=""
+									<image src="/static/icons/down.svg" mode=""
 										style=" width: 40rpx;height: 40rpx;margin-left: 20rpx;"
-										>
+										@click="showSelectItemCode">
+									</image>
+								</view>
+							</view>
+
+							<view class="title " style="display: flex;align-items: center;padding: 10rpx;">
+								<text style=" flex-shrink: 0; width: 25%;">数量：</text>
+								<uni-easyinput v-model="planQty"></uni-easyinput><view v-if="uom">({{getUomInfo(uom)}})</view>
+								<view class="">
+									<image src="" mode="" style=" width: 40rpx;height: 40rpx;margin-left: 20rpx;">
 									</image>
 								</view>
 							</view>
@@ -82,13 +89,10 @@
 								<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 src="" mode="" style=" width: 40rpx;height: 40rpx;margin-left: 20rpx;">
 									</image>
 								</view>
 							</view>
-
-							<view class='split_line'></view>
 						</view>
 					</view>
 				</view>
@@ -107,7 +111,8 @@
 		getIssueJobByProductionline,
 		getPlaneInfoByproductLine,
 		getPackUnitByItemCode,
-		getProductionlineAndWorkStation
+		getProductionlineAndWorkStation,
+		getProductionlineItem
 	} from '@/api/request2.js';
 	import {
 		getPackUnitName,
@@ -242,6 +247,11 @@
 					return
 				}
 
+				if (this.planQty <= 0) {
+					this.showErrorMessage("请输入完工数量")
+					return
+				}
+
 				if (this.packUnitName == "请选择包装规格") {
 					this.showErrorMessage("请选择包装规格")
 					return
@@ -252,9 +262,10 @@
 
 			callback() {
 				let item = {
-					productionLineName: this.productionLineName,
-					productionLineCode: this.productionLineCode, //生产线
+					productionLineName: "",
+					productionLineCode: "", //生产线
 					itemCode: this.itemCode,
+					itemName:this.itemName,
 					uom: this.getUomInfo(this.uom),
 					batch: this.batch,
 					packUnitName: this.packUnitName,
@@ -263,7 +274,7 @@
 					packQty: this.packQty,
 					planQty: this.planQty,
 					goodQty: this.goodQty,
-					planNumber: this.planNumber,
+					planNumber: "",
 					workStationCode: this.workStationCode,
 					fgLocationCode: this.fgLocationCode,
 					rawLocationCode: this.rawLocationCode
@@ -347,39 +358,37 @@
 					this.showErrorMessage('请先选择计划日期');
 					return;
 				}
-				if (!this.productionLineCode) {
-					this.showErrorMessage('请先选择生产线');
-					return;
-				}
 				uni.showLoading({
 					title: "加载中",
 					mask: true
 				})
-				getPlaneInfoByproductLine(this.productionLineCode, this.planDate).then(res => {
+				let param = {
+					pageSize: 20,
+					pageNo: 1,
+					productionLineCode: this.productionLineCode
+				};
+
+				getProductionlineItem(param).then(res => {
 					uni.hideLoading()
-					if (res.data && res.data.length > 0) {
-						res.data.forEach(item => {
-							item.label = item.itemCode + "（" + item.planQty + this.getUomInfo(item.uom) + ")" 
+					if (res.data.list && res.data.list.length > 0) {
+						res.data.list.forEach(item => {
+							item.label = item.itemCode
 							item.value = item
 						})
-						this.itemCodeList = res.data
+						this.itemCodeList = res.data.list
 						this.showItemCodeSelect = true
 					} else {
 						this.showErrorMessage('未查找到物料信息');
 					}
-
 				}).catch(error => {
 					uni.hideLoading()
 					this.showErrorMessage(error);
 				})
 			},
 			confirmSelectItem(data) {
-				let productionPlan = data[0].value;
-				this.itemCode = productionPlan.itemCode;
-				this.uom = productionPlan.uom
-				this.planQty = productionPlan.planQty;
-				this.goodQty = productionPlan.goodQty
-				this.planNumber = productionPlan.number
+				let itemInfo = data[0].value;
+				this.itemCode = itemInfo.itemCode;
+				this.uom = itemInfo.uom
 
 				//清除其他数据
 				this.clearPackUnit();

src/pages/fg/receiptNoPlan.vue

@@ -6,11 +6,6 @@
 				<com-blank-view @goScan='openFg' v-if="!dataContent"></com-blank-view>
 			</view>
 			<view class="" v-if="dataContent">
-				<view class="" style="font-size: 35rpx;padding: 10rpx; padding-left: 15rpx;">
-					生产计划：{{dataContent.planNumber}}
-				</view>
-				<view class='split_line'></view>
-
 				<view class="cell_box uni-flex uni-row">
 					<view class="cell_info">
 						<view class="text_lightblue">完工库位</view>
@@ -22,14 +17,6 @@
 						<view class="text_lightblue">计划数</view>
 						<view>{{dataContent.planQty}}{{dataContent.uom}}</view>
 					</view>
-					<view class="cell_info">
-						<view class="text_lightblue">已完工</view>
-						<view>{{ dataContent.goodQty }}{{dataContent.uom}}</view>
-					</view>
-					<view class="cell_info">
-						<view class="text_lightblue">未完工</view>
-						<view>{{dataContent.noGoodQty}}{{dataContent.uom}}</view>
-					</view>
 				</view>
 				<view class='split_line'></view>
 
@@ -49,19 +36,11 @@
 						<text v-if="dataContent.handleQty>0" style="color: #FFA500;">{{dataContent.handleQty}}/</text>
 						{{dataContent.packQtyHint}}
 					</view>
-
-
 				</view>
-				<view class='split_line' v-if="dataContent"></view>
-
 			</view>
-
-
 		</view>
 
-
-		<view style="margin-top: 480rpx; padding-bottom: 160rpx;" v-if="dataContent">
-
+		<view style="margin-top: 350rpx; padding-bottom: 160rpx;" v-if="dataContent">
 			<scroll-view scroll-y="true" class="">
 				<view class="scan_view" v-for="(item, index) in showList" :key="index">
 					<uni-swipe-action>
@@ -388,10 +367,8 @@
 				isCheckMesCode(result.content).then(res => {
 					if (res.data) {
 						if (that.dataContent) {
-
 							var itemIndex = this.allList.findIndex(r =>
-								r.itemCode == result.itemCode &&
-								r.order == result.order);
+								r.content == result.content);
 							//不存在
 							if (itemIndex == -1) {
 								// if (this.allList.length > this.dataContent.packQty) {