仓库管理-拼箱功能完成

api/warehouse/wmGoodsAction.js

@@ -6,7 +6,7 @@ import request from '@/utils/request'
 */
 export function doConsolidationGoods(data) {
   return request({
-    url: '/mes/wm/doConsolidationGoods',
+    url: '/mes/wm/WmGoodsAction/doConsolidationGoods',
     method: 'post',
     data: data,
   })
@@ -18,7 +18,7 @@ export function doConsolidationGoods(data) {
 */
 export function doUnpackingGoods(data) {
   return request({
-    url: '/mes/wm/doUnpackingGoods',
+    url: '/mes/wm/WmGoodsAction/doUnpackingGoods',
     method: 'post',
     data: data,
   })

pages/consolidation/consolidation.vue

@@ -21,7 +21,8 @@
 			<view class="scroll-view-title">拼箱清单</view>
 			<scroll-view class="scroll-view-box" :scroll-y="true">
 				<view v-for="(item, index) in newMaterialList">
-					<materialItem style="background-color: whitesmoke" :index="index" :materialInfo="item" @click.native="handleDeleteItem(item, index)"></materialItem>
+					<materialItem style="background-color: whitesmoke" :index="index" :materialInfo="item"
+						@click.native="handleDeleteItem(item, index)"></materialItem>
 				</view>
 			</scroll-view>
 			<!-- <packageCard v-if="newMaterialList.length > 0" :packageInfo="newMaterialList[newMaterialList.length - 1]"></packageCard> -->
@@ -35,12 +36,12 @@
 </template>
 
 <script>
-import materialItem from '@/components/material-item/material-item.vue';
-import packageCard from '@/components/package-card/package-card.vue';
-import * as WarehoseApi from '@/api/warehouse/warehose.js';
-import * as GoodsNowApi from '@/api/warehouse/wmGoodsNowProduction.js';
-// 拼箱
-export default {
+	import materialItem from '@/components/material-item/material-item.vue';
+	import packageCard from '@/components/package-card/package-card.vue';
+	import * as WarehoseApi from '@/api/warehouse/warehose.js';
+	import * as GoodsActionApi from '@/api/warehouse/wmGoodsAction.js';
+	// 拼箱
+	export default {
 		components: {
 			materialItem,
 			packageCard
@@ -187,35 +188,35 @@ export default {
 					success: (res) => {
 						if (res.confirm) {
 							let data = {
-							id: this.packageInfo.id,
-							goodsNumAction: this.packageInfo.goodsNumAction
+								packageList: this.newMaterialList,
+								createBy: "admin"
 							};
-						// GoodsNowApi.updateWmGoodsNowProduction(data).then((res) => {
-						// 	if (res.code === 200) {
-						// 		uni.showModal({
-						// 			title: '提示',
-						// 			content: '盘点已完成',
-						// 			showCancel: false,
-						// 			confirmText: '确认'
-						// 		});
-						// 		this.clear();
-						// 	} else {
-						// 		uni.showToast({
-						// 			icon: 'error',
-						// 			title: '盘点失败！'
-						// 		});
-						// 	}
-						// });
+							GoodsActionApi.doConsolidationGoods(data).then((res) => {
+								if (res.code === 200) {
+									uni.showModal({
+										title: '提示',
+										content: '拼箱成功！',
+										showCancel: false,
+										confirmText: '确认'
+									});
+									this.clear();
+								} else {
+									uni.showToast({
+										icon: 'error',
+										title: '拼箱失败！'
+									});
+								}
+							});
 						}
 					}
 				});
 			}
 		}
-};
+	};
 </script>
 
 <style scoped>
-.title-box {
+	.title-box {
 		margin-top: 54px;
 		margin-bottom: 20px;
 		height: 60px;
@@ -224,8 +225,9 @@ export default {
 		flex-direction: column;
 		align-items: center;
 		justify-content: center;
-}
-.warehoseInfo-box {
+	}
+
+	.warehoseInfo-box {
 		font-size: 20px;
 		width: 94%;
 		margin: 0 auto;
@@ -235,39 +237,48 @@ export default {
 		border-radius: 10px;
 		display: flex;
 		flex-direction: column;
-}
-.warehoseInfo-box .row {
+	}
+
+	.warehoseInfo-box .row {
 		display: flex;
 		flex-direction: row;
-}
-.warehoseInfo-box .row .col {
+	}
+
+	.warehoseInfo-box .row .col {
 		width: 50%;
-}
-.aciton-box {
+	}
+
+	.aciton-box {
 		display: flex;
 		flex-direction: column;
 		justify-content: center;
 		align-items: center;
-}
-.color1 {
+	}
+
+	.color1 {
 		color: yellowgreen;
-}
-.color2 {
+	}
+
+	.color2 {
 		color: orange;
-}
-.pda-search-box {
+	}
+
+	.pda-search-box {
 		margin-bottom: 5px;
-}
-.list-box {
+	}
+
+	.list-box {
 		width: 100%;
-}
-.scroll-view-title {
+	}
+
+	.scroll-view-title {
 		font-size: 24px;
 		display: flex;
 		align-items: center;
 		justify-content: center;
-}
-.scroll-view-box {
+	}
+
+	.scroll-view-box {
 		width: 94%;
 		margin: 0 auto;
 		margin-top: 50px;
@@ -275,8 +286,9 @@ export default {
 		padding: 10px;
 		background-color: rgba(179, 179, 179, 0.7);
 		border-radius: 5px;
-}
-.scroll-view-last {
+	}
+
+	.scroll-view-last {
 		width: 100%;
 		height: 60px;
 		font-size: 20px;
@@ -289,16 +301,18 @@ export default {
 		padding-right: 10px;
 		border-radius: 10px;
 		background-color: white;
-}
-.button-box {
+	}
+
+	.button-box {
 		width: 80%;
 		margin: 10px auto;
 		display: flex;
 		flex-direction: row;
-}
-.changeInput {
+	}
+
+	.changeInput {
 		font-size: 20px;
 		background-color: gainsboro;
-	border:1px solid grey;
-}
+		border: 1px solid grey;
+	}
 </style>