From ead79c455934f654d4ae5fa6f295160fe0304a0b Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周日, 01 12月 2024 17:03:58 +0800
Subject: [PATCH] 打印
---
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/shortageList/component/openAllprop.vue | 1 +
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/index.vue | 17 +++++++++++++++--
LuLiScreen/index.html | 24 +++++++++++++++++++-----
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/WmsStockQuanService.cs | 1 +
LA24030_LuLiPackageLine_Web/src/components/printTableCkd.vue | 10 ++++++----
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/Dto/WmsStockQuanOutput.cs | 5 ++++-
6 files changed, 46 insertions(+), 12 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Web/src/components/printTableCkd.vue b/LA24030_LuLiPackageLine_Web/src/components/printTableCkd.vue
index 79b2d9f..e0d07e8 100644
--- a/LA24030_LuLiPackageLine_Web/src/components/printTableCkd.vue
+++ b/LA24030_LuLiPackageLine_Web/src/components/printTableCkd.vue
@@ -41,7 +41,7 @@
<table cellspacing="0" cellpadding="0">
<tr class="middle_first">
<td class="middle_tree">缂栧彿</td>
- <td class="middle_two">鎵规</td>
+ <td class="middle_two">鏉愭枡</td>
<td class="middle_two">閮ㄤ欢鍚嶇О</td>
<td class="middle_four">灏哄</td>
<td class="middle_one">閮ㄤ欢鏉＄爜</td>
@@ -50,7 +50,7 @@
<td class="middle_tree">{{ item.num }}</td>
<td class="middle_two">
<div>
- {{ item.planNo }}
+ {{ item.info18 }}
</div>
</td>
<td class="middle_two">
@@ -110,8 +110,10 @@
});
deltailList.value = splitArray(deltailListArr, 16);
console.log(deltailList.value);
-
- DateToday.value = '2024-01-01';
+ const currentDate = new Date();
+ const formattedDate = currentDate.toISOString().split('T')[0]; // YYYY-MM-DD 鏍煎紡
+ DateToday.value = formattedDate; // 灏嗗綋鍓嶆棩鏈熻祴鍊肩粰 DateToday
+ // DateToday.value = '2024-01-01';
// DateToday.value = formatUtcToData(
// new Date().toString(),
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 6c4ed12..fe23da5 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/index.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/index.vue
@@ -184,7 +184,21 @@
<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>
@@ -322,8 +336,7 @@
);
newTableData.value = res2.data.result.items ?? [];
-
- // tableParams.value.total = res.data.result?.total;
+ tableParams.value.total = res2.data.result?.total;
loading.value = false;
// getEnumOrderTypeData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('OrderTypeEnum')).data.result ?? [];
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/shortageList/component/openAllprop.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/shortageList/component/openAllprop.vue
index 4fe65c0..b798c53 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/shortageList/component/openAllprop.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/shortageList/component/openAllprop.vue
@@ -51,6 +51,7 @@
<el-table-column prop="packageCode" label="鍖呰鍙�" 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="info18" 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 />
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/Dto/WmsStockQuanOutput.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/Dto/WmsStockQuanOutput.cs
index dc2ac79..84a772a 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/Dto/WmsStockQuanOutput.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/Dto/WmsStockQuanOutput.cs
@@ -288,5 +288,8 @@
/// 閮ㄤ欢灏哄
/// </summary>
public string? Info16 { get; set; }
-
+ /// <summary>
+ /// 鏉愭枡
+ /// </summary>
+ public string? Info18 { get; set; }
}
\ No newline at end of file
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/WmsStockQuanService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/WmsStockQuanService.cs
index 143cc39..0b104e6 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/WmsStockQuanService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/WmsStockQuanService.cs
@@ -459,6 +459,7 @@
//Info14 = item.Info14,
Info15 = item.Info15,
Info16 = item.Info16,
+ Info18 = item.Info18,
Length = item.Length,
Width = item.Width,
Thk = item.Thk
diff --git a/LuLiScreen/index.html b/LuLiScreen/index.html
index cd0bef1..2d1b519 100644
--- a/LuLiScreen/index.html
+++ b/LuLiScreen/index.html
@@ -205,6 +205,7 @@
<script src="./js/jquery-1.8.3.min.js"></script>
<script src="./js/jquery.liMarquee.js"></script>
<script>
+ let isMarqueeInitialized = false; // 鍒濆鍖栨爣蹇�
$(document).on("ready", function () {
function fetchAllData() {
@@ -304,11 +305,24 @@
</li>`;
});
$('#idList3').append(listItems1);
- $('.dowebok2').liMarquee({
- direction: 'up',
- scrollamount: 20,
- runshort: false
- });
+
+ // 浠呭湪鏍囧織涓� false 鏃跺垵濮嬪寲
+ if (!isMarqueeInitialized) {
+ $('.dowebok2').liMarquee({
+ direction: 'up',
+ scrollamount: 20,
+ runshort: false
+ });
+ isMarqueeInitialized = true; // 鍒濆鍖栧悗灏嗘爣蹇楄缃负 true
+ }
+
+
+ // $('.dowebok2').liMarquee('destroy'); // 閿�姣佷箣鍓嶇殑瀹炰緥
+ // $('.dowebok2').liMarquee({
+ // direction: 'up',
+ // scrollamount: 20,
+ // runshort: false
+ // });
}
});
--
Gitblit v1.9.3