From a1236c9d4238e2f5b8a8a879a7499e8da097d5a8 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 23 十月 2025 11:43:02 +0800
Subject: [PATCH] #
---
src/main/webapp/static/install/install_lodop64.exe | 0
src/main/webapp/views/erpMaterialuse/materialuse.html | 15 +++++++++------
src/main/webapp/static/js/erp/LodopFuncs.js | 8 ++++----
src/main/webapp/static/install/install_lodop32.exe | 0
src/main/webapp/views/erpReceiving/erpReceiving.html | 4 ++++
5 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/src/main/webapp/static/install/install_lodop32.exe b/src/main/webapp/static/install/install_lodop32.exe
new file mode 100644
index 0000000..93cf607
--- /dev/null
+++ b/src/main/webapp/static/install/install_lodop32.exe
Binary files differ
diff --git a/src/main/webapp/static/install/install_lodop64.exe b/src/main/webapp/static/install/install_lodop64.exe
new file mode 100644
index 0000000..a81c111
--- /dev/null
+++ b/src/main/webapp/static/install/install_lodop64.exe
Binary files differ
diff --git a/src/main/webapp/static/js/erp/LodopFuncs.js b/src/main/webapp/static/js/erp/LodopFuncs.js
index d01dacd..07ad300 100644
--- a/src/main/webapp/static/js/erp/LodopFuncs.js
+++ b/src/main/webapp/static/js/erp/LodopFuncs.js
@@ -50,10 +50,10 @@
//====鑾峰彇LODOP瀵硅薄鐨勪富杩囩▼锛�====
function getLodop(oOBJECT,oEMBED){
- var strHtmInstall = "<br><font color='#FF00FF'>鎵撳嵃鎺т欢鏈畨瑁�!鐐瑰嚮杩欓噷<a href='../../static/install/CLodop_Setup_for_Win32NT.exe' target='_self'>鎵ц瀹夎</a>,瀹夎鍚庤鍒锋柊椤甸潰鎴栭噸鏂拌繘鍏ャ��</font>";
- var strHtmUpdate="<br><font color='#FF00FF'>鎵撳嵃鎺т欢闇�瑕佸崌绾�!鐐瑰嚮杩欓噷<a href='../../static/install/CLodop_Setup_for_Win32NT.exe' target='_self'>鎵ц鍗囩骇</a>,鍗囩骇鍚庤閲嶆柊杩涘叆銆�</font>";
- var strHtm64_Install="<br><font color='#FF00FF'>鎵撳嵃鎺т欢鏈畨瑁�!鐐瑰嚮杩欓噷<a href='../../static/install/CLodop_Setup_for_Win64NT_6.628EN.exe' target='_self'>鎵ц瀹夎</a>,瀹夎鍚庤鍒锋柊椤甸潰鎴栭噸鏂拌繘鍏ャ��</font>";
- var strHtm64_Update="<br><font color='#FF00FF'>鎵撳嵃鎺т欢闇�瑕佸崌绾�!鐐瑰嚮杩欓噷<a href='../../static/install/CLodop_Setup_for_Win64NT_6.628EN.exe' target='_self'>鎵ц鍗囩骇</a>,鍗囩骇鍚庤閲嶆柊杩涘叆銆�</font>";
+ var strHtmInstall = "<br><font color='#FF00FF'>鎵撳嵃鎺т欢鏈畨瑁�!鐐瑰嚮杩欓噷<a href='../../static/install/install_lodop32.exe' target='_self'>鎵ц瀹夎</a>,瀹夎鍚庤鍒锋柊椤甸潰鎴栭噸鏂拌繘鍏ャ��</font>";
+ var strHtmUpdate="<br><font color='#FF00FF'>鎵撳嵃鎺т欢闇�瑕佸崌绾�!鐐瑰嚮杩欓噷<a href='../../static/install/install_lodop32.exe' target='_self'>鎵ц鍗囩骇</a>,鍗囩骇鍚庤閲嶆柊杩涘叆銆�</font>";
+ var strHtm64_Install="<br><font color='#FF00FF'>鎵撳嵃鎺т欢鏈畨瑁�!鐐瑰嚮杩欓噷<a href='../../static/install/install_lodop64.exe' target='_self'>鎵ц瀹夎</a>,瀹夎鍚庤鍒锋柊椤甸潰鎴栭噸鏂拌繘鍏ャ��</font>";
+ var strHtm64_Update="<br><font color='#FF00FF'>鎵撳嵃鎺т欢闇�瑕佸崌绾�!鐐瑰嚮杩欓噷<a href='../../static/install/install_lodop64.exe' target='_self'>鎵ц鍗囩骇</a>,鍗囩骇鍚庤閲嶆柊杩涘叆銆�</font>";
var strHtmFireFox="<br><br><font color='#FF00FF'>锛堟敞鎰忥細濡傛浘瀹夎杩嘗odop鏃х増闄勪欢npActiveXPLugin,璇峰湪銆愬伐鍏枫��->銆愰檮鍔犵粍浠躲��->銆愭墿灞曘�戜腑鍏堝嵏瀹冿級</font>";
var strHtmChrome="<br><br><font color='#FF00FF'>(濡傛灉姝ゅ墠姝ｅ父锛屼粎鍥犳祻瑙堝櫒鍗囩骇鎴栭噸瀹夎鑰屽嚭闂锛岄渶閲嶆柊鎵ц浠ヤ笂瀹夎锛�</font>";
var strCLodopInstall = "<br><font color='#FF00FF'>CLodop浜戞墦鍗版湇鍔�(localhost鏈湴)鏈畨瑁呭惎鍔�!鐐瑰嚮杩欓噷<a href='../../static/install/CLodop_Setup_for_Win64NT_6.628EN.exe' target='_self'>鎵ц瀹夎</a>,瀹夎鍚庤鍒锋柊椤甸潰銆�</font>";
diff --git a/src/main/webapp/views/erpMaterialuse/materialuse.html b/src/main/webapp/views/erpMaterialuse/materialuse.html
index 087b7d0..d4229a0 100644
--- a/src/main/webapp/views/erpMaterialuse/materialuse.html
+++ b/src/main/webapp/views/erpMaterialuse/materialuse.html
@@ -83,11 +83,11 @@
</el-table-column>
<el-table-column prop="invCode" label="鐗╂枡缂栫爜">
</el-table-column>
- <el-table-column prop="invName" label="鐗╂枡鍚嶇О" width="300" :show-overflow-tooltip="true">
+ <el-table-column prop="invName" label="鐗╂枡鍚嶇О" width="250" :show-overflow-tooltip="true">
</el-table-column>
- <el-table-column prop="invStd" label="瑙勬牸" width="200" :show-overflow-tooltip="true">
+ <el-table-column prop="invStd" label="瑙勬牸" width="150" :show-overflow-tooltip="true">
</el-table-column>
- <el-table-column prop="depName" label="杞﹂棿">
+ <el-table-column prop="depName" label="杞﹂棿" width="70">
</el-table-column>
<el-table-column prop="fauxqty" label="鏁伴噺" width="90">
</el-table-column>
@@ -95,9 +95,9 @@
</el-table-column>
<el-table-column prop="fplanfinishdate" label="璁″垝瀹屽伐鏃堕棿">
</el-table-column>
- <el-table-column prop="izSyncReceive" label="鏄惁鍚屾" width="90">
+ <el-table-column prop="izPrint" label="鏄惁鎵撳嵃" width="90">
</el-table-column>
- <el-table-column prop="izSyncReceiveReturn" label="鏄惁閫�鏂�" width="90">
+ <el-table-column prop="izPrintReturn" label="鏄惁鎵撳嵃(绾㈠瓧)" width="90">
</el-table-column>
</el-table>
<!-- <div style="margin-top: 10px">-->
@@ -221,6 +221,7 @@
message: "鎾ら攢鎴愬姛",
type: 'success'
});
+ page()
} else if (res.code === 403) {
top.location.href = baseUrl + "/";
} else {
@@ -252,9 +253,10 @@
loading.close();
if (res.code == 200) {
ElementPlus.ElMessage({
- message: "鎾ら攢鎴愬姛",
+ message: "鎾ら攢绾㈠瓧鎴愬姛",
type: 'success'
});
+ page()
} else if (res.code === 403) {
top.location.href = baseUrl + "/";
} else {
@@ -345,6 +347,7 @@
message: "鑾峰彇鏁版嵁瀹屾垚,绛夊緟鍞よ捣鎵撳嵃",
type: 'success'
});
+ page()
LODOP.PRINT_INITA(0,0,800,1100,"鐢熶骇棰嗘枡鍗�");
LODOP.SET_PRINT_PAGESIZE(1,0,0,"A4");
LODOP.SET_PRINT_MODE("PRINT_NOCOLLATE",1);
diff --git a/src/main/webapp/views/erpReceiving/erpReceiving.html b/src/main/webapp/views/erpReceiving/erpReceiving.html
index 7426e16..24b886e 100644
--- a/src/main/webapp/views/erpReceiving/erpReceiving.html
+++ b/src/main/webapp/views/erpReceiving/erpReceiving.html
@@ -191,6 +191,7 @@
message: "鍚屾瀹屾垚",
type: 'success'
});
+ page()
} else if (res.code === 403) {
top.location.href = baseUrl + "/";
} else {
@@ -225,6 +226,7 @@
message: "鎾ら攢鍚屾瀹屾垚",
type: 'success'
});
+ page()
} else if (res.code === 403) {
top.location.href = baseUrl + "/";
} else {
@@ -259,6 +261,7 @@
message: "閫�鏂欏畬鎴�",
type: 'success'
});
+ page()
} else if (res.code === 403) {
top.location.href = baseUrl + "/";
} else {
@@ -293,6 +296,7 @@
message: "鎾ら攢閫�鏂欏畬鎴�",
type: 'success'
});
+ page()
} else if (res.code === 403) {
top.location.href = baseUrl + "/";
} else {
--
Gitblit v1.9.1