From 5e610f4c9d9870b393720bc5fcc856e97bc2ea4b Mon Sep 17 00:00:00 2001
From: zongzhibin <zongzhibin@weben-smart.com>
Date: 周三, 27 11月 2024 09:36:26 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine
---
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/packList/index.vue | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/packList/index.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/packList/index.vue
index c248f24..346ab9f 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/packList/index.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/packList/index.vue
@@ -100,7 +100,7 @@
<div class="table-container">
<!-- 宸︿晶琛ㄦ牸 -->
<div class="left-table">
- <p class="text-xtiny">榻愬鍒楄〃</p>
+ <p class="text-xtiny">榻愬寘鍒楄〃</p>
<el-table :data="tableData" style="width: 100%" v-loading="loading" tooltip-effect="light" ref="tableRef" row-key="id" @sort-change="sortChange" :summary-method="getExportTitle" border="">
<el-table-column type="index" label="搴忓彿" width="55" align="center" />
@@ -112,7 +112,9 @@
</span>
</template>
</el-table-column>
- <el-table-column prop="count" label="鏁伴噺" show-overflow-tooltip="" />
+
+ <el-table-column prop="mesTotalCount" 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="" />
@@ -128,7 +130,7 @@
<!-- 鍙充晶琛ㄦ牸 -->
<div class="right-table">
- <p class="text-xtiny">涓嶉綈濂楀垪琛�</p>
+ <p class="text-xtiny">缂哄寘鍒楄〃</p>
<el-table
:data="newTableData"
style="width: 100%"
@@ -149,7 +151,10 @@
</span>
</template>
</el-table-column>
- <el-table-column prop="count" label="鏁伴噺" show-overflow-tooltip="" />
+
+ <el-table-column prop="mesTotalCount" label="鎬绘暟" show-overflow-tooltip="" />
+ <el-table-column prop="count" label="宸叉湁鏁伴噺" show-overflow-tooltip="" />
+ <el-table-column prop="lackCount" 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="" />
@@ -164,6 +169,8 @@
</div>
</div>
</el-card>
+
+
<editDialogWmsOrderDeliver ref="editDialogRefWmsOrderDeliver" :title="editWmsOrderDeliverTitle" @reloadTable="handleQuery" />
<importExcelDialog
@@ -187,6 +194,7 @@
import { formatUtcToData, getTypeStatus } from '/@/utils/formate';
import printDialog from '/@/views/system/print/component/hiprint/preview.vue';
import editDialog from '/@/views/main/WmsOrder/wmsOrderPurchase/component/editDialog.vue';
+
import {
pageWmsOrderPurchase,
deleteWmsOrderPurchase,
--
Gitblit v1.9.3