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

# Conflicts:
#	src/pages/fg/receiptNoPlan.vue

.env.development

@@ -1,4 +1,4 @@
-VITE_BASE_URL=http://172.21.32.14:81/api/admin-api
+VITE_BASE_URL=http://192.168.0.128:12080/admin-api
 VITE_BASE_URL_IMAGE=http://172.21.32.14:81/admin-api
 
 # 租户配置

src/pages/fg/coms/comNoReceiptPopup.vue

@@ -158,7 +158,7 @@
 				showProductLineSelect: false,
 				productLineList: [],
 				productionLineName: "请选择生产线",
-				productionLineCode: "",
+				productLineCode: "",
 				batch: "",
 				packUnitName: "请选择包装规格",
 				packUnit: "",
@@ -194,7 +194,7 @@
 			openRequestPopup() {
 				this.initData();
 				this.planDate = getCurrDate()
-				this.batch = getBatch8()
+				this.batch =this.planDate.replace('-','')
 				this.$refs.popup.open('bottom')
 			},
 			initData() {
@@ -208,7 +208,7 @@
 				this.showProductLineSelect = false
 				this.productLineList = []
 				this.productionLineName = "请选择生产线"
-				this.productionLineCode = ""
+				this.productLineCode = ""
 				this.batch = ""
 				this.packUnitName = "请选择包装规格"
 				this.packUnit = "",
@@ -271,7 +271,7 @@
 			callback() {
 				let item = {
 					productionLineName: "",
-					productionLineCode: this.productLineCode, //生产线
+					productionLine: this.productLineCode, //生产线
 					itemCode: this.itemCode,
 					itemName: this.itemName,
 					uom: this.getUomInfo(this.uom),
@@ -303,9 +303,9 @@
 
 			confirmSelectLine(data) {
 				this.productionLineName = data[0].label + "—" + data[1].label
-				this.productionLineCode = data[0].value
+				this.productLineCode = data[0].value
 				this.workStationCode = data[1].value
-				var parent = this.productLineList.filter(res => res.value == this.productionLineCode)
+				var parent = this.productLineList.filter(res => res.value == this.productLineCode)
 				var fgLocation = parent[0].children.filter(children => children.value == this.workStationCode)
 				this.fgLocationCode = fgLocation[0].fgLocationCode;
 				this.workshop = parent[0].workshop;
@@ -365,7 +365,7 @@
 
 			},
 			showSelectItemCode() {
-				if (!this.productionLineCode) {
+				if (!this.productLineCode) {
 					this.showErrorMessage('请先选择生产线');
 					return;
 				}
@@ -373,7 +373,7 @@
 					title: "加载中",
 					mask: true
 				})
-				getBomVersionByProductionline(this.productionLineCode).then(res => {
+				getBomVersionByProductionline(this.productLineCode).then(res => {
 					uni.hideLoading()
 					if (res.data && res.data.length > 0) {
 						this.itemCodeList = res.data

src/pages/fg/coms/comReceiptPopup.vue

@@ -402,7 +402,10 @@
 						// this.showItemCodeSelect = true
 
 						if (this.itemCodeList.length == 1) {
-							this.itemCode = this.itemCodeList[0].itemCode;
+							
+							this.confirmSelectItem([this.itemCodeList[0]]) 
+							
+							// this.itemCode = this.itemCodeList[0].itemCode;
 						} else {
 							this.showItemCodeSelect = true;
 						}

src/pages/fg/receiptByPlan.vue

@@ -6,10 +6,11 @@
 				<com-blank-view @goScan='openFg' v-if="!dataContent"></com-blank-view>
 			</view>
 			<view class="" v-if="dataContent">
+				<view class="page-header">
+				<view class="header-view" >
 				<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">
@@ -31,13 +32,12 @@
 						<view>{{dataContent.noGoodQty}}{{dataContent.uom}}</view>
 					</view>
 				</view>
-				<view class='split_line'></view>
-
-				<view class="" style="padding-top: 10rpx; padding-bottom: 10rpx; margin-left: 10rpx;">
+				</view></view>
+				<view class="" style="padding: 10rpx; margin-left: 10rpx;">
 					<item :dataContent="dataContent"></item>
 				</view>
 				<view class='split_line'></view>
-				<view class="uni-flex uni-row space-between" style="align-items: center">
+				<view class="uni-flex uni-row space-between" style="align-items: center;padding: 0 10rpx;">
 					<view style="word-break: break-all;">
 						<batch :batch="dataContent.batch"></batch>
 						<view class="card_view ">
@@ -442,7 +442,7 @@
 			showCommitSuccessMessage(hint, pointData) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
 					if (pointData.length > 0) {
-						uni.navigateTo({
+						uni.redirectTo({
 							url: `/pages/point/index?points=${JSON.stringify(pointData)}`
 						});
 					}
@@ -480,14 +480,11 @@
 	.header {
 		position: fixed;
 		/* #ifdef H5 */
-		top: 88rpx;
 		/* #endif */
 		left: 0;
 		width: 100%;
 		background-color: #fff;
 		z-index: 10;
-		padding: 10rpx;
-		/* 确保头部在内容之上 */
 	}
 
 	.page-footer {

src/pages/fg/receiptNoPlan.vue

@@ -140,10 +140,12 @@
 		},
 
 		onShow() {},
+
 		onLoad() {
 			this.options = getRemoveOption()
 			this.openFg();
 		},
+
 		onReachBottom() {
 			console.log("onReachBottom")
 			//避免多次触发
@@ -163,7 +165,7 @@
 		},
 
 		mounted() {
-
+		 
 		},
 		methods: {
 			openFg() {
@@ -190,7 +192,7 @@
 					workStationCode: result.workStationCode,
 					fgLocationCode: result.fgLocationCode,
 					subList: [],
-					productionLine: result.productionLineCode,
+					productionLine: result.productionLine,
 					bomVersion: result.bomVersion,
 					workshop: result.workshop,
 					team: "",
@@ -247,7 +249,6 @@
 			},
 
 			async commit() {
-
 				try {
 					uni.showLoading({
 						title: "提交中...",
@@ -259,7 +260,6 @@
 					let list = []
 					var planData = await planReceiptSubmit(params)
 					if (planData.data) {
-
 						planData.data.forEach(item => {
 							list.push({
 								itemCode: item.itemCode, // 物品代码
@@ -302,27 +302,6 @@
 						pageNo: 1,
 						pageSize: 100,
 					}
-
-					var planeInfo = await getPlanByNumber(queryParams);
-					if (planeInfo.data && planeInfo.data.list.length > 0) {
-						if (planeInfo.data.list[0].goodQty >= planeInfo.data.list[0].planQty) {
-							this.clear();
-						} else {
-							this.dataContent.planNumber = planeInfo.data.list[0].number;
-							this.dataContent.handleQty = 0;
-							this.dataContent.planQty = planeInfo.data.list[0].planQty
-							this.dataContent.goodQty = planeInfo.data.list[0].goodQty
-							this.dataContent.noGoodQty = calc.sub(planeInfo.data.list[0].planQty, planeInfo.data.list[
-									0].goodQty),
-								this.dataContent.subList = []
-							this.showList = [];
-							this.allList = []
-							this.index = 1
-						}
-
-					} else {
-						throw new Error("未查找到单据信息")
-					}
 					uni.hideLoading()
 					this.showCommitSuccessMessage("提交成功<br>生成装配收货记录<br>" + list[0].requestNumber, list)
 
@@ -331,7 +310,6 @@
 					var hint = error.message ? error.message : error
 					this.showErrorMessage(hint)
 				}
-
 			},
 
 			setParams() {
@@ -431,7 +409,7 @@
 			showCommitSuccessMessage(hint, pointData) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
 					if (pointData.length > 0) {
-						uni.navigateTo({
+						uni.redirectTo({
 							url: `/pages/point/index?points=${JSON.stringify(pointData)}`
 						});
 					}