#

zhou zhou

2025-10-23 a1236c9d4238e2f5b8a8a879a7499e8da097d5a8

#

 src/main/webapp/static/install/install_lodop32.exe

Binary files differ

 src/main/webapp/static/install/install_lodop64.exe

Binary files differ

 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'>（注意：如曾安装过Lodop旧版附件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>";

 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);

 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 {