fix: 余料退料添加副产品标识

manifest.json

@@ -2,8 +2,8 @@
     "name" : "mes-pda",
     "appid" : "__UNI__FB0FD5F",
     "description" : "MES-PDA",
-    "versionName" : "1.2.3",
-    "versionCode" : 123,
+    "versionName" : "1.2.4",
+    "versionCode" : 124,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/produceReturn/components/oddmentsItem.vue

@@ -7,10 +7,11 @@
 					均摊明细
 				</u-button>
 			</view>
-			<view class="item input">退料数量:<uni-easyinput v-model="num" trim="all" type="text"
+			<view class="item input">退料数量:<uni-easyinput v-model="num" trim="all" type="number"
 					@input="handleChange"></uni-easyinput>/PCS
 			</view>
 			<view class="item">申请数量:{{ batchNum }}/PCS</view>
+			<view class="item">是否副产品:{{ item.coproduct == "Y" ? '是' : '否' }}</view>
 		</view>
 		<view class="listBottom">
 			<view class="bottomTitle" @tap="show = !show">
@@ -27,13 +28,15 @@
 				</view>
 			</view>
 			<view v-if="show" class="bottomBox">
-				<view class="bottomItem" v-for="(ele, idx) in sapList">
+				<view class="bottomItem" v-for="(ele, idx) in sapList" :key="idx">
 					<view class="items">{{ ele.batchNo }}</view>
 					<view class="items">{{ ele.sapItemCode }}<br>{{ele.itemName}}</view>
 					<view class="items">PL号:<br>
-						<view class="items" v-for="p in ele.plNum.split('|')">
+						<template v-if="ele.plNum">
+							<view class="items" v-for="(p, i) in ele.plNum.split('|')" key="i">
 								{{ p }}
 							</view>
+						</template>
 					</view>
 					<view class="items">批次数量:{{ ele.backNum }}/PCS</view>
 					<view class="items">生产日期:{{ ele.produceTime }}</view>
@@ -42,7 +45,7 @@
 		</view>
 		<u-popup class="oddments-popup" v-model="visible" mode="center" :mask-close-able="false">
 			<scroll-view scroll-y="true" style="height: 600rpx;">
-				<view class="content" v-for="(ele, idx) in pordList">
+				<view class="content" v-for="(ele, idx) in pordList" :index="idx">
 					<view class="item">生产单号:{{ ele.workorderCode }}</view>
 					<view class="item">{{ ele.sapItemCode }}<br>{{ele.itemName}}</view>
 					<view class="item">工单计划数:{{ ele.quantity }}/PCS</view>
@@ -141,7 +144,12 @@
 					this.$u.toast("退料数量不可以超过申请数量！");
 				} else {
 					this.sapList.forEach(ele => {
+						if (ele.coproduct == "Y") {
+							ele.ERFMG = val;
+						} else {
 							ele.ERFMG = (val * (ele.quantity / this.totalNum)).toFixed(2);
+						}
+						ele.COPRODUCT = ele.coproduct;
 					})
 				}
 				// }

pages/produceReturn/components/putawayInfo.vue

@@ -24,7 +24,7 @@
 		</view>
 		<ContentLoadingMore class="cardbox" :list='chargaArr'>
 			<scroll-view scroll-y="true" style="height: 680rpx;">
-				<view class="cardContent" v-for="(item, index) in chargaArr">
+				<view class="cardContent" v-for="(item, index) in chargaArr" :key="index">
 					<PutwayItem :item='item' :list='chargaArr' @delGonds="delGonds" />
 				</view>
 			</scroll-view>

pages/sendOutGoodsOff/index.vue

@@ -4,21 +4,10 @@
 			<NavBar title="发货下架"></NavBar>
 			<FactorySelect v-model="lgort" :options="options" />
 			<view class="btn">
-        <uni-easyinput
-          class="boxSelect"
-          prefixIcon="search"
-          v-model.trim="vbeln"
-          placeholder="请扫描交货单"
-		  @confirm="handleConfirm"
-        ></uni-easyinput>
-        <uni-easyinput
-          prefixIcon="search"
-          :disabled="isDisabled"
-          v-model.trim="wxparams"
-          :focus="isFocus"
-          placeholder="请扫描产品包装条码/外箱码"
-		  @confirm="handleConfirmPlnr"
-        ></uni-easyinput>
+				<uni-easyinput class="boxSelect" prefixIcon="search" v-model.trim="vbeln" placeholder="请扫描交货单"
+					@confirm="handleConfirm"></uni-easyinput>
+				<uni-easyinput prefixIcon="search" :disabled="isDisabled" v-model.trim="wxparams" :focus="isFocus"
+					placeholder="请扫描产品包装条码/外箱码" @confirm="handleConfirmPlnr"></uni-easyinput>
 			</view>
 			<!-- <view class="total" v-show="goodsList && goodsList.length > 0">
 				<view class="left">明细</view>
@@ -37,13 +26,15 @@
 </template>
 
 <script>
-import BottomBtn from "@/components/BottomBtn/index.vue";
-import ContentLoadingMore from "@/components/ContentLoadingMore/index.vue";
-import scanningList from "../salesOutbound/scanningList.vue";
-import StickyNavBar from "@/components/StickyNavBar/index.vue";
-import { parseTime } from "@/utils/ruoyi";
+	import BottomBtn from "@/components/BottomBtn/index.vue";
+	import ContentLoadingMore from "@/components/ContentLoadingMore/index.vue";
+	import scanningList from "../salesOutbound/scanningList.vue";
+	import StickyNavBar from "@/components/StickyNavBar/index.vue";
+	import {
+		parseTime
+	} from "@/utils/ruoyi";
 
-export default {
+	export default {
 		components: {
 			StickyNavBar,
 			ContentLoadingMore,
@@ -58,18 +49,15 @@ export default {
 				isDisabled: false,
 				isFocus: false,
 				goodsList: [],
-      options: [
-        {
+				options: [{
 					WERKS: "1000",
 					LGORT: "S000",
 					LGOBE: "发运仓",
 					label: "S000-发运仓",
 					value: "S000",
-        },
-      ],
+				}, ],
 				pls: [], // 已经扫码的pl号
-      btnArr: [
-        {
+				btnArr: [{
 						style: "",
 						type: "warning",
 						text: "返回",
@@ -109,7 +97,7 @@ export default {
 				let params = {
 					ztype: "005",
 				};
-      plnr.startsWith('B') ? (params.ZCODE = plnr) :(params.PLNR = plnr)
+				plnr.startsWith('B') ? (params.ZCODE = plnr) : (params.PLNR = plnr)
 				this.$u.api.sapApi.sapBlpl(params).then((res) => {
 					if (res && res.MSG[0].TYPE === "S") {
 						this.setSalesBoundPL(res.BLPL);
@@ -251,48 +239,49 @@ export default {
 				});
 			},
 		},
-};
+	};
 </script>
 
 <style lang="scss" scoped>
-.lists {
+	.lists {
 		flex: 1;
 		flex-direction: column;
-}
+	}
 
-page {
+	page {
 		background: #f8f8f8;
-}
+	}
 
-/deep/ .u-sticky {
+	/deep/ .u-sticky {
 		top: 0 !important;
 		background: #fff;
-}
+	}
 
-.btn {
+	.btn {
 		padding: 20rpx;
 		background: #fff;
 
 		.boxSelect {
 			margin-bottom: 20rpx;
 		}
-}
+	}
 
-.contentMore {
+	.contentMore {
 		margin: 20rpx;
-}
-.cardbox {
+	}
+
+	.cardbox {
 		padding: 0rpx 20rpx;
 		margin-top: 20rpx;
-}
+	}
 
-.cardContent {
+	.cardContent {
 		border-radius: 8px;
 		background: #fff;
 		margin-bottom: 20rpx;
-}
+	}
 
-.total {
+	.total {
 		background: #fff;
 		color: #000;
 		padding: 0rpx 40rpx;
@@ -303,5 +292,5 @@ page {
 		.line {
 			margin: 0px 10rpx;
 		}
-}
+	}
 </style>
\ No newline at end of file