From 840d53d52bfdc89ea2ab208f6428e86ba4d43b4f Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周日, 15 12月 2024 18:02:17 +0800
Subject: [PATCH] 修复分组错误
---
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/index.vue | 117 ++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 77 insertions(+), 40 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/index.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/index.vue
index d66d8dd..fe23da5 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/index.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/index.vue
@@ -1,6 +1,6 @@
锘�<template>
<div class="wmsOrderPurchase-container">
- <!-- 榻愬绠＄悊 -->
+ <!-- 榻愬绠＄悊 -->
<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
<el-form :model="queryParams" ref="queryForm" labelWidth="90">
<el-row>
@@ -93,7 +93,7 @@
<el-card class="full-table" shadow="hover" style="margin-top: 5px">
<div class="table-container">
<!-- 宸︿晶琛ㄦ牸 -->
- <div class="left-table">
+ <!-- <div class="left-table">
<p class="text-xtiny">榻愬鍒楄〃</p>
<el-table
@@ -116,21 +116,34 @@
</template>
</el-table-column>
<el-table-column prop="count" label="鏁伴噺" show-overflow-tooltip="" />
- <!-- <el-table-column prop="placeCode" label="搴撲綅缂栫爜" show-overflow-tooltip="" />
- <el-table-column prop="inTime" label="杩涘叆鏃堕棿" width="80" :formatter="formatDate_T_Date" show-overflow-tooltip="" />
- <el-table-column prop="upi" label="閮ㄤ欢鏉＄爜" show-overflow-tooltip="" />
- <el-table-column prop="detailName" label="閮ㄤ欢鍚嶇О" show-overflow-tooltip="" />
- <el-table-column prop="planNo" label="鎵规" show-overflow-tooltip="" />
- <el-table-column prop="orderId" label="璁㈠崟鍙�" show-overflow-tooltip="" />
- <el-table-column prop="length" label="闀�" show-overflow-tooltip="" />
- <el-table-column prop="width" label="瀹�" show-overflow-tooltip="" />
- <el-table-column prop="thk" label="鍘�" show-overflow-tooltip="" /> -->
</el-table>
- </div>
+ </div> -->
+
+ <!-- ///
+ <summary>/// 鐢熶骇鍗曞彿 ///</summary>
+ public string Info5 { get; set; } ///
+ <summary>/// 鎵规鍙� ///</summary>
+ public string PlanNo { get; set; } ///
+ <summary>/// 璁㈠崟鍙� ///</summary>
+ public string OrderId { get; set; } ///
+ <summary>/// 鏄惁榻愬 ///</summary>
+ public bool? IsKitting { get; set; } ///
+ <summary>/// 鍖呮暟 ///</summary>
+ public int PackageNum { get; set; } ///
+ <summary>/// 宸蹭笅绾垮寘鏁� ///</summary>
+ public int UnLinePackageNum { get; set; } ///
+ <summary>/// 鏈笅绾垮寘鏁� ///</summary>
+ public int NoUnLinePackageNum { get; set; } ///
+ <summary>/// 鎬诲寘瑁呴潰绉� ///</summary>
+ public decimal AllPackageArea { get; set; } ///
+ <summary>/// 宸叉壂鎻忓寘瑁呴潰绉� ///</summary>
+ public decimal ScanPackageArea { get; set; } ///
+ <summary>/// 鏈壂鎻忓寘瑁呴潰绉� ///</summary>
+ public decimal NoScanPackageArea { get; set; } -->
<!-- 鍙充晶琛ㄦ牸 -->
<div class="right-table">
- <p class="text-xtiny">缂哄鍒楄〃</p>
+ <!-- <p class="text-xtiny">缂哄鍒楄〃</p> -->
<el-table
:data="newTableData"
style="width: 100%"
@@ -144,29 +157,52 @@
>
<el-table-column type="index" label="搴忓彿" width="55" align="center" />
<!-- <el-table-column prop="packageCode" label="鍖呰鍙�" show-overflow-tooltip="" /> -->
- <el-table-column label="璁㈠崟鍙�" prop="packageCode" width="150" align="left" show-overflow-tooltip>
+ <el-table-column label="鐢熶骇鍗曞彿" prop="info5" width="150" align="left" show-overflow-tooltip>
<template #default="scope">
<span class="under_line" @click="openDrawer(1, scope.row)">
- {{ scope.row.orderId }}
+ {{ scope.row.info5 }}
</span>
</template>
</el-table-column>
- <el-table-column prop="count" label="鏁伴噺" show-overflow-tooltip="" />
- <!-- <el-table-column prop="count" label="鏁伴噺" show-overflow-tooltip="" />
- <el-table-column prop="placeCode" label="搴撲綅缂栫爜" show-overflow-tooltip="" />
- <el-table-column prop="inTime" label="杩涘叆鏃堕棿" width="80" :formatter="formatDate_T_Date" show-overflow-tooltip="" />
- <el-table-column prop="upi" label="閮ㄤ欢鏉＄爜" show-overflow-tooltip="" />
- <el-table-column prop="detailName" label="閮ㄤ欢鍚嶇О" show-overflow-tooltip="" />
- <el-table-column prop="planNo" label="鎵规" show-overflow-tooltip="" />
- <el-table-column prop="orderId" label="璁㈠崟鍙�" show-overflow-tooltip="" />
- <el-table-column prop="length" label="闀�" show-overflow-tooltip="" />
- <el-table-column prop="width" label="瀹�" show-overflow-tooltip="" />
- <el-table-column prop="thk" label="鍘�" show-overflow-tooltip="" /> -->
+ <el-table-column prop="planNo" label="鎵规鍙�" show-overflow-tooltip="" />
+ <el-table-column prop="orderId" label="璁㈠崟鍙�" show-overflow-tooltip="" />
+ <el-table-column prop="isKitting" label="鏄惁榻愬" show-overflow-tooltip="">
+ <template #default="scope">
+ <el-tag v-if="scope.row.isKitting"> 鏄� </el-tag>
+ <el-tag type="danger" v-else> 鍚� </el-tag>
+
+ </template>
+
+ </el-table-column>
+ <el-table-column prop="packageNum" label="鍖呮暟" show-overflow-tooltip="" />
+ <el-table-column prop="unLinePackageNum" label="宸蹭笅绾垮寘鏁�" show-overflow-tooltip="" />
+ <el-table-column prop="noUnLinePackageNum" label="鏈笅绾垮寘鏁�" show-overflow-tooltip="" />
+ <el-table-column prop="allPackageArea" label="鎬诲寘瑁呴潰绉�" show-overflow-tooltip="" />
+ <el-table-column prop="scanPackageArea" label="宸叉壂鎻忓寘瑁呴潰绉�" show-overflow-tooltip="" />
+ <el-table-column prop="noScanPackageArea" label="鏈壂鎻忓寘瑁呴潰绉�" show-overflow-tooltip="" />
+ <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" width="130" :formatter="formatDate_T_Time" show-overflow-tooltip="" />
+ <el-table-column prop="updateTime" label="淇敼鏃堕棿" width="130" :formatter="formatDate_T_Time" show-overflow-tooltip="" />
+ <el-table-column prop="createUserName" label="鍒涘缓浜�" show-overflow-tooltip="" />
+ <el-table-column prop="updateUserName" label="淇敼浜�" show-overflow-tooltip="" />
+
+
+
</el-table>
+ <el-pagination
+ v-model:currentPage="tableParams.page"
+ v-model:page-size="tableParams.pageSize"
+ :total="tableParams.total"
+ :page-sizes="[10, 20, 50, 100, 200, 500]"
+ small=""
+ background=""
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ layout="total, sizes, prev, pager, next, jumper"
+ />
</div>
</div>
</el-card>
-<!--
+ <!--
<editDialogWmsOrderDeliver ref="editDialogRefWmsOrderDeliver" :title="editWmsOrderDeliverTitle" @reloadTable="handleQuery" /> -->
<importExcelDialog
ref="importExcelDialogRefWmsOrderDeliver"
@@ -204,6 +240,7 @@
import { exportPageExcel } from '/@/utils/exportPageExcel'; //寮曞叆瀵煎嚭鏂规硶
import OpenAllprop from './component/openAllprop.vue';
import { ExcellTableDataExport } from '/@/hooks/exportTableDataExcell';
+import { pageMes_Order_Gather } from '/@/api/main/WmsOrder/mes_Order_Gather';
const { proxy }: any = getCurrentInstance(); // 璁块棶瀹炰緥涓婁笅鏂� proxy鍚屾椂鏀寔寮�鍙� 绾夸笂鐜
const moveType = 10; //绉诲姩绫诲瀷 鍏ュ簱
// ------------灏佽瀵煎嚭鍔熻兘--鍓嶇瀵煎嚭+琛ㄦ牸鏍囬---------------
@@ -285,21 +322,21 @@
// 8888888888888鏌ヨ鎿嶄綔 IsKitting
const handleQuery = async () => {
loading.value = true;
- var res = await KittingList(Object.assign(queryParams.value, {
- ...tableParams.value,
- IsKitting:true
- }));
- tableData.value = res.data.result ?? [];
+ // var res = await KittingList(Object.assign(queryParams.value, {
+ // ...tableParams.value,
+ // IsKitting:true
+ // }));
+ // tableData.value = res.data.result ?? [];
+ var res2 = await pageMes_Order_Gather(
+ Object.assign(queryParams.value, {
+ ...tableParams.value,
+ IsKitting: false,
+ })
+ );
- var res2 = await KittingList(Object.assign(queryParams.value, {
- ...tableParams.value,
- IsKitting:false
- }));
-
- newTableData.value = res2.data.result ?? [];
-
- // tableParams.value.total = res.data.result?.total;
+ newTableData.value = res2.data.result.items ?? [];
+ tableParams.value.total = res2.data.result?.total;
loading.value = false;
// getEnumOrderTypeData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('OrderTypeEnum')).data.result ?? [];
--
Gitblit v1.9.3