bug 修改

pages/outsourcedMaterial/outsourcedMaterialItem.vue

@@ -96,9 +96,7 @@ export default {
 		},
 		goBack() {
 			console.log('进来')
-			uni.navigateBack({
-				delta: 0
-			});
+			uni.navigateBack();
 		},
 		goSubmit() {
 			if (this.goodsList.length === 0) {

pages/outsourcedMaterial/outsourcedMaterialList.vue

@@ -97,7 +97,7 @@ export default {
 		goBack() {
 			console.log('进来')
 			uni.navigateBack({
-				delta: 0
+				delta: 1
 			});
 		},
 		goSubmit() {

pages/outsourcedReturn/outsourcedReturnItem.vue

@@ -96,9 +96,7 @@ export default {
 		},
 		goBack() {
 			console.log('进来')
-			uni.navigateBack({
-				delta: 0
-			});
+			uni.navigateBack();
 		},
 		goSubmit() {
 			if (this.goodsList.length === 0) {

pages/outsourcedReturn/outsourcedReturnList.vue

@@ -96,9 +96,7 @@ export default {
 		},
 		goBack() {
 			console.log('进来')
-			uni.navigateBack({
-				delta: 0
-			});
+			uni.navigateBack();
 		},
 		goSubmit() {
 			if (this.goodsList.length === 0) {

pages/packing/relationships.vue

@@ -114,9 +114,7 @@ export default {
 		},
 		goBack() {
 			console.log('进来');
-			uni.navigateBack({
-				delta: 0
-			});
+			uni.navigateBack();
 		},
 		changeTab(index) {
 			this.current = index;

pages/produceReturn/produceReturnItem.vue

@@ -96,9 +96,7 @@ export default {
 		},
 		goBack() {
 			console.log('进来')
-			uni.navigateBack({
-				delta: 0
-			});
+			uni.navigateBack();
 		},
 		goSubmit() {
 			if (this.goodsList.length === 0) {

pages/produceReturn/produceReturnList copy.vue

@@ -96,9 +96,7 @@ export default {
 		},
 		goBack() {
 			console.log('进来')
-			uni.navigateBack({
-				delta: 0
-			});
+			uni.navigateBack();
 		},
 		goSubmit() {
 			if (this.goodsList.length === 0) {

pages/produceReturn/produceReturnList.vue

@@ -150,9 +150,7 @@ export default {
 		},
 		goBack() {
 			console.log('进来')
-			uni.navigateBack({
-				delta: 0
-			});
+			uni.navigateBack();
 		},
 		goSubmit() {
 			if (this.list.length === 0) {

pages/productionIssuance/productionIssuanceItem.vue

@@ -115,9 +115,7 @@ export default {
 		},
 		goBack() {
 			console.log('进来')
-			uni.navigateBack({
-				delta: 0
-			});
+			uni.navigateBack();
 		},
 		goSubmit() {
 			if (this.goodsList.length === 0) {

pages/productionIssuance/productionIssuanceList copy.vue

@@ -169,9 +169,7 @@ export default {
 		},
 		goBack() {
 			console.log('进来')
-			uni.navigateBack({
-				delta: 0
-			});
+			uni.navigateBack();
 		},
 		goSubmit() {
 			if (this.list.length === 0) {

pages/productionIssuance/productionIssuanceList.vue

@@ -172,7 +172,7 @@ export default {
     goBack() {
       console.log("进来");
       uni.navigateBack({
-        delta: 0,
+        delta: 1,
       });
     },
     goSubmit() {
@@ -205,7 +205,6 @@ export default {
       };
 
       console.log(arr, '----')
-
       this.$u.api.sapApi.sapProiss(params).then((res) => {
         this.loading = false;
         if (!Array.isArray(res)) {

pages/purchase/listItem.vue

+<template>
+	<view>
+		<view class="listItemTitle">
+			<view>
+				<view class="item">入库批次：{{ item.CHARG }}</view>
+				<view class="item">物料编号：{{ item.MATNR }}</view>
+				<view class="item">物料描述：{{ item.MAKTX }}</view>
+				<view class="item">入库数量：{{ item.cardNum }}</view>
+			</view>
+		</view>
+		<view class="listBottom">
+			<view class="bottomTitle" @tap="show = !show">
+				<view class="desc">卷条码明细</view>
+				<view class="topIcons">
+					<view v-if="show">
+						<u-icon name="arrow-down" color="#aaa" size="32"></u-icon>
+						展开
+					</view>
+					<view v-else>
+						<u-icon name="arrow-up" color="#aaa" size="32"></u-icon>
+						收起
+					</view>
+				</view>
+			</view>
+			<view v-if="!show" class="bottomBox">
+				<view class="bottomItem"  v-for="(ele, idx) in goodsList" v-if="ele.CHARG === item.CHARG">
+						<view class="items plNum">{{ ele.PLNR }}</view>
+						<view class="item">入库库位：{{ ele.NLPLA }}</view>
+						<view class="items">数量：{{ ele.TOMNG }}</view>
+						<view class="boxBtn">
+							<view class="items">生产日期：{{ ele.BLDAT }}</view>
+							<u-button class="botBtn" size="mini" type="primary" plain @click="deleGonds()">
+								<u-icon name="trash" size="28"></u-icon>
+								删除
+							</u-button>
+						</view>
+				</view>
+			</view>
+		</view>
+	</view>
+	
+</template>
+
+<script>
+import StickyNavBar from '@/components/StickyNavBar/index.vue';
+import ContentLoadingMore from '@/components/ContentLoadingMore/index.vue';
+import BottomBtn from '@/components/BottomBtn/index.vue';
+export default {
+	components: {
+		StickyNavBar,
+		ContentLoadingMore,
+		BottomBtn
+	},
+	props: {
+		item: {
+			type: Object,
+			default: function () {
+				return {};
+			}
+		},
+		goodsList: {
+			type: Array	,
+			default: function () {
+				return [];
+			}
+		},
+		nlpla: {
+			type: String,
+			default: ''
+		}
+	},
+	data() {
+		return {
+			number: 0,
+			totalNum: 0,
+			show: true,
+			wxparams: '',
+			isFocus: false,
+			isDisabled: false,
+			chargaArr: []
+		};
+	},
+	created() {
+	},
+	methods: {
+		deleGonds() {
+			this.$emit('deleGonds',this.item)
+		},
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+page {
+	background: #f8f8f8;
+}
+.btn {
+	padding: 20rpx;
+	background: #fff;
+	.topSearch {
+		margin-bottom: 20rpx;
+	}
+}
+.bottomBtn {
+	position: sticky;
+	padding: 20rpx;
+	display: flex;
+	justify-content: space-between;
+	background: #fff;
+	bottom: 0rpx;
+	margin-top: 20rpx;
+	.u-btn {
+		width: 300rpx;
+	}
+}
+.blue {
+	color: #3f9dcc;
+}
+.total {
+	background: #fff;
+	color: #000;
+	padding: 0rpx 40rpx;
+	display: flex;
+	justify-content: space-between;
+	font-size: 32rpx;
+	.line {
+		margin: 0px 10rpx;
+	}
+}
+.listItemTitle {
+	display: flex;
+	justify-content: space-between;
+	padding: 20rpx;
+	border-bottom: 2px solid #f8f8f8;
+	.u-btn {
+		width: 150rpx;
+		margin: 0px;
+		margin-top: 10rpx;
+	}
+	.item {
+		line-height: 50rpx;
+		color: #000;
+		font-size: 28rpx;
+		font-weight: 500;
+		word-break: break-all;
+	}
+}
+.listBottom {
+	.bottomTitle {
+		height: 80rpx;
+		position: relative;
+		.desc {
+			color: #bbb;
+			font-size: 24rpx;
+			line-height: 80rpx;
+			padding-left: 20rpx;
+		}
+		.topIcons {
+			position: absolute;
+			left: 50%;
+			top: 50%;
+			transform: translate(-50%, -50%);
+			color: #aaa;
+		}
+	}
+	.bottomBox {
+		padding: 20rpx;
+		.bottomItem {
+			background: #f8f8f8;
+			padding: 20rpx;
+			margin-bottom: 20rpx;
+			.items {
+				color: #333;
+				font-size: 24rpx;
+				height: 40rpx;
+				line-height: 40rpx;
+			}
+			.plNum{
+				height: 80rpx;
+				word-break: break-all;
+			}
+		}
+	}
+}
+/deep/ .u-sticky {
+	top: 0 !important;
+	background: #fff;
+}
+.boxBtn{
+	display: flex;
+	justify-content: space-between;
+	/deep/.u-btn{
+		margin-right: 0 !important;
+	}
+}
+.botBtn{
+
+}
+</style>
\ No newline at end of file

pages/purchase/purchaseRemove.vue

+<template>
+	<view class="page">
+		<StickyNavBar>
+			<NavBar title="采购下架扫描"></NavBar>
+			<view class="btn">
+				<uni-easyinput prefixIcon="search" class="topSearch" v-model="nlpla" focus placeholder="请扫描库位" @change="handleInputNlpla"></uni-easyinput>
+				<uni-easyinput
+					prefixIcon="search"
+					:disabled="isDisabled"
+					v-model="wxparams"
+					:focus="isFocus"
+					placeholder="请扫描产品包装条码/外箱码"
+					@input="handleInputPlnr"
+				></uni-easyinput>
+			</view>
+			<view class="total">
+				<view class="left">入库明细</view>
+				<view class="right">
+					批次数：
+					<text class="blue">{{ chargaArr.length }}</text>
+					<text class="line">|</text>
+					总数量：
+					<text class="blue">{{ totalNum }}</text>
+				</view>
+			</view>
+		</StickyNavBar>
+		<ContentLoadingMore class="cardbox"  :list='chargaArr'>
+			<view class="cardContent" v-for="(item, index) in chargaArr">
+				<listItem :item="item" :goodsList="goodsList" :nlpla="nlpla" @deleGonds="deleGonds"/>
+			</view>
+		</ContentLoadingMore>
+		<BottomBtn :btnArr="btnArr" @getBtnHandle="getBtnHandle"></BottomBtn>
+	</view>
+</template>
+
+<script>
+import listItem from "./listItem.vue"
+import StickyNavBar from '@/components/StickyNavBar/index.vue';
+import ContentLoadingMore from '@/components/ContentLoadingMore/index.vue';
+import BottomBtn from '@/components/BottomBtn/index.vue';
+import { parseTime} from "@/utils/ruoyi";
+export default {
+	components: {
+		StickyNavBar,
+		ContentLoadingMore,
+		BottomBtn,
+		listItem
+	},
+	data() {
+		return {
+			number: 0,
+			totalNum: 0,
+			show: true,
+			nlpla: '',
+			wxparams: '',
+			btnArr: [
+				{
+					style: '',
+					type: 'warning',
+					text: '返回',
+					way: 'goBack'
+				},
+				{
+					style: '',
+					type: 'primary',
+					text: '提交',
+					way: 'goSubmit'
+				}
+			],
+			goodsList: [],
+			isFocus: false,
+			isDisabled: false,
+			chargaArr: []
+		};
+	},
+	created() {
+		// this.getPlnr('100001240428000002|00100000000000014.000|10002442800002');
+		// this.getPlnr('100001240428000002|00100000000000019.500|10002442800001');
+	},
+	methods: {
+		deleGonds(detail) {
+			this.goodsList.forEach((ele,idx) => {
+				if(detail.PLNR === ele.PLNR){
+					this.goodsList.splice(idx, 1);
+				}
+			});
+			this.totalNum = 0;
+			this.goodsList.forEach((ele) => {
+				this.totalNum += ele.TOMNG - 0
+				ele.cardNum = 0
+			});
+			this.handleData()
+		},
+		getBtnHandle(row) {
+			this[row.way]();
+		},
+		goBack() {
+			uni.navigateBack();
+		},
+		goSubmit() {
+			if (this.goodsList.length === 0) {
+				return;
+			}
+			const data = JSON.parse(JSON.stringify(this.goodsList))
+			data.forEach(ele => {
+				ele.ERFMG = ele.TOMNG
+			});
+			this.$u.api.sapApi
+				.sapRrm([
+					{
+						BLDAT: parseTime(new Date(),'{y}{m}{d}'),
+						BUDAT: parseTime(new Date(),'{y}{m}{d}'),
+						ZENCODE: 'A014',
+						TYPE: 'CG',
+						ITEM: data
+					}
+				])
+				.then((res) => {
+					this.loading = false;
+					if(!Array.isArray(res)){
+						return
+					}
+					if (res && res.every((item) => item.TYPE === 'S')) {
+						this.goodsList = [];
+						this.chargaArr = []
+						this.totalNum = 0;
+						this.nlpla = '';
+						this.wxparams = '';
+						this.$u.toast('提交成功');
+					}
+					const foundObject = res.find(item => item.TYPE === 'E');
+					if(foundObject && foundObject.MESSAGE){
+						this.$u.toast(foundObject.MESSAGE);
+					}
+				});
+		},
+		handleInputPlnr(e) {
+			this.isFocus = false;
+			// e&& e.length > 79 && this.getPlnr(e);
+			e && this.getPlnr(e);
+		},
+		handleInputNlpla(e) {
+			if (e) {
+				// this.nlpla = e;
+				// this.goodsList.forEach((ele) => {
+				// 	this.totalNum += ele.TOMNG-0;
+				// 	ele.NLPLA = ele.NLPLA || this.nlpla;
+				// });
+			}
+		},
+		getPlnr(plnr) {
+			this.isDisabled = true;
+			if(!this.nlpla){
+				this.$u.toast('请先扫描仓位');
+				setTimeout(() => {
+					this.wxparams = '';
+					this.isFocus = true;
+					this.isDisabled = false;
+				}, 1000);
+				return
+			}
+			this.$u.api.sapApi
+				.sapPlnr({
+					plnr,
+					zType: '001'
+				})
+				.then((res) => {
+					if (res && res.RESULT.TYPE === 'S') {
+						if (this.goodsList.some((item) => item.PLNR === plnr)) {
+							setTimeout(() => {
+								this.isFocus = true;
+								this.isDisabled = false;
+								this.wxparams = '';
+							}, 1000);
+							this.$u.toast('已经存在当前条码');
+							return
+						}
+						const arr = [
+							{
+								...res.DATA[0],
+								NLPLA: this.nlpla
+							}
+						]
+						this.goodsList = this.goodsList.concat(arr);
+						this.totalNum = 0;
+						this.goodsList.forEach((ele) => {
+							this.totalNum += ele.TOMNG - 0
+							ele.cardNum = 0
+						});
+						this.handleData()
+						setTimeout(() => {
+							this.wxparams = '';
+							this.isFocus = true;
+							this.isDisabled = false;
+						}, 1000);
+					} else {
+						setTimeout(() => {
+							this.isFocus = true;
+							this.isDisabled = false;
+							this.wxparams = '';
+						}, 1000);
+						this.$u.toast(res.RESULT.MESSAGE);
+					}
+					this.loading = false;
+				});
+		},
+		handleData(){
+			this.chargaArr = this.goodsList.filter((item, index, self) => {
+				return self.findIndex(t => t.CHARG === item.CHARG) === index;
+			});
+			this.chargaArr.forEach((ele,idx) => {
+				this.goodsList.forEach(item => {
+					if(ele.CHARG === item.CHARG){
+						ele.cardNum += (item.TOMNG - 0)
+						this.$set(this.chargaArr,idx,{...ele})
+					}
+				});
+			});
+		},
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+
+.btn {
+	padding: 20rpx;
+	background: #fff;
+	.topSearch {
+		margin-bottom: 20rpx;
+	}
+}
+.bottomBtn {
+	position: sticky;
+	padding: 20rpx;
+	display: flex;
+	justify-content: space-between;
+	background: #fff;
+	bottom: 0rpx;
+	margin-top: 20rpx;
+	.u-btn {
+		width: 300rpx;
+	}
+}
+.blue {
+	color: #3f9dcc;
+}
+.total {
+	background: #fff;
+	color: #000;
+	padding: 0rpx 40rpx;
+	display: flex;
+	justify-content: space-between;
+	font-size: 32rpx;
+	.line {
+		margin: 0px 10rpx;
+	}
+}
+.cardbox {
+	min-height: calc(100vh - 540rpx);
+	padding: 0rpx 20rpx;
+	margin-top: 20rpx;
+}
+.cardContent {
+	border-radius: 8px;
+	background: #fff;
+	margin-bottom: 20rpx;
+}
+/deep/ .u-sticky {
+	top: 0 !important;
+	background: #fff;
+}
+
+</style>
\ No newline at end of file

pages/recoil/recoilMaterialList.vue

@@ -195,9 +195,7 @@ export default {
     },
     goBack(time = 0) {
       setTimeout(() => {
-        uni.navigateBack({
-          delta: 0,
-        });
+        uni.navigateBack();
       }, time);
     },
     goSubmit() {

pages/salesReturns/salesReturnsList.vue

@@ -120,9 +120,7 @@ export default {
 		},
 		goBack() {
 			console.log('进来')
-			uni.navigateBack({
-				delta: 0
-			});
+			uni.navigateBack();
 		},
 		goSubmit() {
 			if (this.goodsList.length === 0) {