java_project
/
logpm_page
4
1
Fork 0
Code Issues Pull Requests Activity
Browse Source

Merge branch 'pre-production'

fix_bug_pro20231227
pref_mail@163.com 1 year ago
parent
ca3d1befb1 dc68dd2e59
commit
ad4d899c3f
13 changed files with 600 additions and 192 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      src/api/basic/basicPda.js
  2. 4
      src/components/basic-container/main.vue
  3. 5
      src/components/tablecmt/tablecmt.vue
  4. 1
      src/css/common.css
  5. 16
      src/router/page/index.js
  6. 1
      src/styles/common.scss
  7. 298
      src/utils/LodopFuncs.js
  8. 130
      src/utils/LodopFuncsback
  9. 82
      src/views/basic/pda/basicPda.vue
  10. 1
      src/views/basic/printTemplate/basicPrintTemplateFrom.vue
  11. 30
      src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
  12. 206
      src/views/datadetail/ToolUpdate.vue
  13. 10
      vite.config.js

8
src/api/basic/basicPda.js
Unescape View File

@ -11,7 +11,13 @@ export const getList = (current, size, params) => {
}
})
}
export const $_TableList = (params) => {
return request({
url: '/api/logpm-basic/pda/list',
method: 'GET',
params,
});
};
export const getDetail = (id) => {
return request({
url: '/api/logpm-basic/pda/detail',

4
src/components/basic-container/main.vue
Unescape View File

@ -34,8 +34,8 @@ export default {
</script>
<style lang="scss">
.basic-container {
padding: 10px 6px;
.basic-container {
height:100%;
box-sizing: border-box;
&--block {

5
src/components/tablecmt/tablecmt.vue
Unescape View File

@ -160,6 +160,9 @@
<el-text class="mx-1 tabtitles" @click.stop @dblclick.stop="copyalls(column)">{{
column.label
}}</el-text>
<el-icon v-if="column.type == 1 || column.type == 2 || column.type == 3"
><DocumentCopy
/></el-icon>
</div>
</div>
</template>
@ -184,7 +187,7 @@ onMounted(() => {
function getWinHight() {
var windowHight = 0;
if (document.body.clientHeight && document.documentElement.clientHeight) {
windowHight =
windowHight =
document.body.clientHeight < document.documentElement.clientHeight
? document.body.clientHeight
: document.documentElement.clientHeight;

1
src/css/common.css
Unescape View File

@ -70,7 +70,6 @@ a {
flex: 1;
overflow-y: auto;
overflow-x: hidden;
margin-bottom: 10px;
}
.avue-view {

16
src/router/page/index.js
Unescape View File

@ -73,6 +73,22 @@ export default [
},
],
},
// 重构演示页面
{
path: '/datadetail/ToolUpdate',
component: Layout,
redirect: '/reservation/order_listFroms',
children: [
{
path: '',
name: '表格重构',
meta: {
i18n: 'dict',
},
component: () => import('@/views/datadetail/ToolUpdate.vue'),
},
],
},
{
path: '/',
name: '主页',

1
src/styles/common.scss
Unescape View File

@ -101,7 +101,6 @@ a {
flex: 1;
overflow-y: auto;
overflow-x: hidden;
margin-bottom: 10px;
}
.avue-view {

298
src/utils/LodopFuncs.js
Unescape View File

@ -1,130 +1,188 @@
var CreatedOKLodop7766=null;
//==本JS是加载Lodop插件或Web打印服务CLodop/Lodop7的综合示例，可直接使用，建议理解后融入自己程序==
//====判断是否需要安装CLodop云打印服务器:====
export function needCLodop(){
try{
var ua=navigator.userAgent;
if (ua.match(/Windows\sPhone/i) !=null) return true;
if (ua.match(/iPhone|iPod/i) != null) return true;
if (ua.match(/Android/i) != null) return true;
if (ua.match(/Edge\D?\d+/i) != null) return true;
//用双端口加载主JS文件Lodop.js(或CLodopfuncs.js兼容老版本)以防其中某端口被占:
var MainJS ="CLodopfuncs.js",
URL_WS1 = "ws://localhost:8000/"+MainJS, //ws用8000/18000
URL_WS2 = "ws://localhost:18000/"+MainJS,
URL_HTTP1 = "http://localhost:8000/"+MainJS, //http用8000/18000
URL_HTTP2 = "http://localhost:18000/"+MainJS,
URL_HTTP3 = "https://localhost.lodop.net:8443/"+MainJS; //https用8000/8443
var verTrident=ua.match(/Trident\D?\d+/i);
var verIE=ua.match(/MSIE\D?\d+/i);
var verOPR=ua.match(/OPR\D?\d+/i);
var verFF=ua.match(/Firefox\D?\d+/i);
var x64=ua.match(/x64/i);
if ((verTrident==null)&&(verIE==null)&&(x64!==null))
return true; else
if ( verFF !== null) {
verFF = verFF[0].match(/\d+/);
if ((verFF[0]>= 42)||(x64!==null)) return true;
} else
if ( verOPR !== null) {
verOPR = verOPR[0].match(/\d+/);
if ( verOPR[0] >= 32 ) return true;
} else
if ((verTrident==null)&&(verIE==null)) {
var verChrome=ua.match(/Chrome\D?\d+/i);
if ( verChrome !== null ) {
verChrome = verChrome[0].match(/\d+/);
if (verChrome[0]>=42) return true;
};
};
return false;
} catch(err) {return true;};
};
var CreatedOKLodopObject, CLodopIsLocal, LoadJsState;
//====页面引用CLodop云打印必须的JS文件：====
if (needCLodop()) {
var head = document.head || document.getElementsByTagName("head")[0] || document.documentElement;
var oscript = document.createElement("script");
oscript.src ="http://localhost:8000/CLodopfuncs.js?priority=1";
head.insertBefore( oscript,head.firstChild );
//==判断是否需要CLodop(那些不支持插件的浏览器):==
function needCLodop() {
try {
var ua = navigator.userAgent;
if (ua.match(/Windows\sPhone/i) ||
ua.match(/iPhone|iPod|iPad/i) ||
ua.match(/Android/i) ||
ua.match(/Edge\D?\d+/i))
return true;
var verTrident = ua.match(/Trident\D?\d+/i);
var verIE = ua.match(/MSIE\D?\d+/i);
var verOPR = ua.match(/OPR\D?\d+/i);
var verFF = ua.match(/Firefox\D?\d+/i);
var x64 = ua.match(/x64/i);
if ((!verTrident) && (!verIE) && (x64)) return true;
else if (verFF) {
verFF = verFF[0].match(/\d+/);
if ((verFF[0] >= 41) || (x64)) return true;
} else if (verOPR) {
verOPR = verOPR[0].match(/\d+/);
if (verOPR[0] >= 32) return true;
} else if ((!verTrident) && (!verIE)) {
var verChrome = ua.match(/Chrome\D?\d+/i);
if (verChrome) {
verChrome = verChrome[0].match(/\d+/);
if (verChrome[0] >= 41) return true;
}
}
return false;
} catch (err) {
return true;
}
}
//引用双端口(8000和18000）避免其中某个被占用：
oscript = document.createElement("script");
oscript.src ="http://localhost:18000/CLodopfuncs.js?priority=0";
head.insertBefore( oscript,head.firstChild );
};
//==检查加载成功与否，如没成功则用http(s)再试==
//==低版本CLODOP6.561/Lodop7.043及前)用本方法==
function checkOrTryHttp() {
if (window.getCLodop) {
LoadJsState = "complete";
return true;
}
if (LoadJsState == "loadingB" || LoadJsState == "complete") return;
LoadJsState = "loadingB";
var head = document.head || document.getElementsByTagName("head")[0] || document.documentElement;
var JS1 = document.createElement("script")
,JS2 = document.createElement("script")
,JS3 = document.createElement("script");
JS1.src = URL_HTTP1;
JS2.src = URL_HTTP2;
JS3.src = URL_HTTP3;
JS1.onload = JS2.onload = JS3.onload = JS2.onerror = JS3.onerror=function(){LoadJsState = "complete";}
JS1.onerror = function(e) {
if (window.location.protocol !== 'https:')
head.insertBefore(JS2, head.firstChild); else
head.insertBefore(JS3, head.firstChild);
}
head.insertBefore(JS1,head.firstChild);
}
//====获取LODOP对象的主过程：====
export function getLodop(oOBJECT,oEMBED){
var strHtmInstall="<br><font color='#FF00FF'>打印控件未安装!点击这里<a href='install_lodop32.exe' target='_self'>执行安装</a>,安装后请刷新页面或重新进入。</font>";
var strHtmUpdate="<br><font color='#FF00FF'>打印控件需要升级!点击这里<a href='install_lodop32.exe' target='_self'>执行升级</a>,升级后请重新进入。</font>";
var strHtm64_Install="<br><font color='#FF00FF'>打印控件未安装!点击这里<a href='install_lodop64.exe' target='_self'>执行安装</a>,安装后请刷新页面或重新进入。</font>";
var strHtm64_Update="<br><font color='#FF00FF'>打印控件需要升级!点击这里<a href='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='http://www.c-lodop.com/download/CLodop_Setup_for_Win32NT_https_3.008Extend.zip' target='_self'>执行安装</a>,安装后请刷新页面。</font>";
var strCLodopUpdate="<br><font color='#FF00FF'>CLodop云打印服务需升级!点击这里<a href='CLodop_Setup_for_Win32NT.exe' target='_self'>执行升级</a>,升级后请刷新页面。</font>";
var LODOP;
try{
var isIE = (navigator.userAgent.indexOf('MSIE')>=0) || (navigator.userAgent.indexOf('Trident')>=0);
if (needCLodop()) {
try{ LODOP=getCLodop();} catch(err) {};
if (!LODOP && document.readyState!=="complete") {alert("C-Lodop没准备好，请稍后再试！"); return;};
if (!LODOP) {
// if (isIE) document.write(strCLodopInstall); else
// document.documentElement.innerHTML=strCLodopInstall+document.documentElement.innerHTML;
// return;
} else {
//==加载Lodop对象的主过程:==
(function loadCLodop(){
if (!needCLodop()) return;
CLodopIsLocal = !!((URL_WS1 + URL_WS2).match(/\/\/localho|\/\/127.0.0./i));
LoadJsState = "loadingA";
if (!window.WebSocket && window.MozWebSocket) window.WebSocket=window.MozWebSocket;
//ws方式速度快(小于200ms)且可避免CORS错误,但要求Lodop版本足够新:
try {
var WSK1=new WebSocket(URL_WS1);
WSK1.onopen = function(e) { setTimeout("checkOrTryHttp();",200); }
WSK1.onmessage = function(e) {if (!window.getCLodop) eval(e.data);}
WSK1.onerror = function(e) {
var WSK2=new WebSocket(URL_WS2);
WSK2.onopen = function(e) {setTimeout("checkOrTryHttp();",200);}
WSK2.onmessage = function(e) {if (!window.getCLodop) eval(e.data);}
WSK2.onerror= function(e) {checkOrTryHttp();}
}
} catch(e){
checkOrTryHttp();
}
})();
if (CLODOP.CVERSION<"3.0.0.2") {
if (isIE) document.write(strCLodopUpdate); else
document.documentElement.innerHTML=strCLodopUpdate+document.documentElement.innerHTML;
};
if (oEMBED && oEMBED.parentNode) oEMBED.parentNode.removeChild(oEMBED);
if (oOBJECT && oOBJECT.parentNode) oOBJECT.parentNode.removeChild(oOBJECT);
};
} else {
var is64IE = isIE && (navigator.userAgent.indexOf('x64')>=0);
//=====如果页面有Lodop就直接使用，没有则新建:==========
if (oOBJECT!=undefined || oEMBED!=undefined) {
if (isIE) LODOP=oOBJECT; else LODOP=oEMBED;
} else if (CreatedOKLodop7766==null){
LODOP=document.createElement("object");
LODOP.setAttribute("width",0);
LODOP.setAttribute("height",0);
LODOP.setAttribute("style","position:absolute;left:0px;top:-100px;width:0px;height:0px;");
if (isIE) LODOP.setAttribute("classid","clsid:2105C259-1E0C-4534-8141-A753534CB4CA");
else LODOP.setAttribute("type","application/x-print-lodop");
document.documentElement.appendChild(LODOP);
CreatedOKLodop7766=LODOP;
} else LODOP=CreatedOKLodop7766;
//=====Lodop插件未安装时提示下载地址:==========
if ((LODOP==null)||(typeof(LODOP.VERSION)=="undefined")) {
if (navigator.userAgent.indexOf('Chrome')>=0)
document.documentElement.innerHTML=strHtmChrome+document.documentElement.innerHTML;
if (navigator.userAgent.indexOf('Firefox')>=0)
document.documentElement.innerHTML=strHtmFireFox+document.documentElement.innerHTML;
if (is64IE) document.write(strHtm64_Install); else
if (isIE) document.write(strHtmInstall); else
document.documentElement.innerHTML=strHtmInstall+document.documentElement.innerHTML;
return LODOP;
};
};
if (LODOP.VERSION<"6.0") {
if (!needCLodop()){
if (is64IE) document.write(strHtm64_Update); else
if (isIE) document.write(strHtmUpdate); else
document.documentElement.innerHTML=strHtmUpdate+document.documentElement.innerHTML;
};
return LODOP;
};
LODOP.SET_LICENSES("","4AE3961B0A17F2B39DCDA3787D40445D677","","");
alert("SET_LICENSES执行了");
//==获取LODOP对象主过程,判断是否安装、需否升级:==
function getLodop(oOBJECT, oEMBED) {
var strFontTag = "<br><font color='#FF00FF'>打印控件";
var strLodopInstall = strFontTag + "未安装!点击这里<a href='install_lodop32.exe' target='_self'>执行安装</a>";
var strLodopUpdate = strFontTag + "需要升级!点击这里<a href='install_lodop32.exe' target='_self'>执行升级</a>";
var strLodop64Install = strFontTag + "未安装!点击这里<a href='install_lodop64.exe' target='_self'>执行安装</a>";
var strLodop64Update = strFontTag + "需要升级!点击这里<a href='install_lodop64.exe' target='_self'>执行升级</a>";
var strCLodopInstallA = "<br><font color='#FF00FF'>Web打印服务CLodop未安装启动，点击这里<a href='CLodop_Setup_for_Win32NT.exe' target='_self'>下载执行安装</a>";
var strCLodopInstallB = "<br>（若此前已安装过，可<a href='CLodop.protocol:setup' target='_self'>点这里直接再次启动</a>）";
var strCLodopUpdate = "<br><font color='#FF00FF'>Web打印服务CLodop需升级!点击这里<a href='CLodop_Setup_for_Win32NT.exe' target='_self'>执行升级</a>";
var strLodop7FontTag = "<br><font color='#FF00FF'>Web打印服务Lodop7";
var strLodop7HrefX86 = "点击这里<a href='Lodop7_Linux_X86_64.tar.gz' target='_self'>下载安装</a>(下载后解压，点击lodop文件开始执行)";
var strLodop7HrefARM = "点击这里<a href='Lodop7_Linux_ARM64.tar.gz' target='_self'>下载安装</a>(下载后解压，点击lodop文件开始执行)";
var strLodop7Install_X86 = strLodop7FontTag + "未安装启动，" + strLodop7HrefX86;
var strLodop7Install_ARM = strLodop7FontTag + "未安装启动，" + strLodop7HrefARM;
var strLodop7Update_X86 = strLodop7FontTag + "需升级，" + strLodop7HrefX86;
var strLodop7Update_ARM = strLodop7FontTag + "需升级，" + strLodop7HrefARM;
var strInstallOK = "，成功后请刷新本页面或重启浏览器。</font>";
var LODOP;
try {
var isWinIE = (/MSIE/i.test(navigator.userAgent)) || (/Trident/i.test(navigator.userAgent));
var isWinIE64 = isWinIE && (/x64/i.test(navigator.userAgent));
var isLinuxX86 = (/Linux/i.test(navigator.platform)) && (/x86/i.test(navigator.platform));
var isLinuxARM = (/Linux/i.test(navigator.platform)) && (/aarch/i.test(navigator.platform));
if (needCLodop() || isLinuxX86 || isLinuxARM) {
try {
LODOP = window.getCLodop();
} catch (err) {}
if (!LODOP && LoadJsState !== "complete") {
if (!LoadJsState)
alert("未曾加载Lodop主JS文件，请先调用loadCLodop过程."); else
alert("网页还没下载完毕，请稍等一下再操作.");
return;
}
var strAlertMessage;
if (!LODOP) {
if (isLinuxX86)
strAlertMessage = strLodop7Install_X86;
else if (isLinuxARM)
strAlertMessage = strLodop7Install_ARM;
else
strAlertMessage = strCLodopInstallA + (CLodopIsLocal ? strCLodopInstallB : "");
document.body.innerHTML = strAlertMessage + strInstallOK + document.body.innerHTML;
return;
} else {
if (isLinuxX86 && LODOP.CVERSION < "7.0.4.3")
strAlertMessage = strLodop7Update_X86;
else if (isLinuxARM && LODOP.CVERSION < "7.0.4.3")
strAlertMessage = strLodop7Update_ARM;
else if (CLODOP.CVERSION < "6.5.7.1")
strAlertMessage = strCLodopUpdate;
// LODOP.SET_LICENSES("","加密的秘钥","",""); // 加密密钥 防止不兼容 （删除水印）、
// LODOP.SET_LICENSES("","13528A153BAEE3A0254B9507DCDE2839","EDE92F75B6A3D917F65910","D60BC84D7CF2DE18156A6F88987304CB6D8");
//===如下空白位置适合调用统一功能(如注册语句、语言选择等):===
//LODOP.SET_LICENSES("北京XXXXX公司","8xxxxxxxxxxxxx5","","");
if (strAlertMessage)
document.body.innerHTML = strAlertMessage + strInstallOK + document.body.innerHTML;
}
} else {
//==如果页面有Lodop插件就直接使用,否则新建:==
if (oOBJECT || oEMBED) {
if (isWinIE)
LODOP = oOBJECT;
else
LODOP = oEMBED;
} else if (!CreatedOKLodopObject) {
LODOP = document.createElement("object");
LODOP.setAttribute("width", 0);
LODOP.setAttribute("height", 0);
LODOP.setAttribute("style", "position:absolute;left:0px;top:-100px;width:0px;height:0px;");
if (isWinIE)
LODOP.setAttribute("classid", "clsid:2105C259-1E0C-4534-8141-A753534CB4CA");
else
LODOP.setAttribute("type", "application/x-print-lodop");
document.documentElement.appendChild(LODOP);
CreatedOKLodopObject = LODOP;
} else
LODOP = CreatedOKLodopObject;
//==Lodop插件未安装时提示下载地址:==
if ((!LODOP) || (!LODOP.VERSION)) {
document.body.innerHTML = (isWinIE64 ? strLodop64Install : strLodopInstall) + strInstallOK + document.body.innerHTML;
return LODOP;
}
if (LODOP.VERSION < "6.2.2.6") {
document.body.innerHTML = (isWinIE64 ? strLodop64Update : strLodopUpdate) + strInstallOK + document.body.innerHTML;
}
}
//===如下空白位置适合调用统一功能(如注册语句、语言选择等):=======================
LODOP.SET_LICENSES("","4AE3961B0A17F2B39DCDA3787D40445D677","","");
//===========================================================
return LODOP;
} catch(err) {
alert("getLodop出错:"+err);
};
};
//===============================================================================
return LODOP;
} catch (err) {
alert("getLodop出错:" + err);
}
}

130
src/utils/LodopFuncsback
Unescape View File

@ -0,0 +1,130 @@
var CreatedOKLodop7766=null;
//====判断是否需要安装CLodop云打印服务器:====
export function needCLodop(){
try{
var ua=navigator.userAgent;
if (ua.match(/Windows\sPhone/i) !=null) return true;
if (ua.match(/iPhone|iPod/i) != null) return true;
if (ua.match(/Android/i) != null) return true;
if (ua.match(/Edge\D?\d+/i) != null) return true;
var verTrident=ua.match(/Trident\D?\d+/i);
var verIE=ua.match(/MSIE\D?\d+/i);
var verOPR=ua.match(/OPR\D?\d+/i);
var verFF=ua.match(/Firefox\D?\d+/i);
var x64=ua.match(/x64/i);
if ((verTrident==null)&&(verIE==null)&&(x64!==null))
return true; else
if ( verFF !== null) {
verFF = verFF[0].match(/\d+/);
if ((verFF[0]>= 42)||(x64!==null)) return true;
} else
if ( verOPR !== null) {
verOPR = verOPR[0].match(/\d+/);
if ( verOPR[0] >= 32 ) return true;
} else
if ((verTrident==null)&&(verIE==null)) {
var verChrome=ua.match(/Chrome\D?\d+/i);
if ( verChrome !== null ) {
verChrome = verChrome[0].match(/\d+/);
if (verChrome[0]>=42) return true;
};
};
return false;
} catch(err) {return true;};
};
//====页面引用CLodop云打印必须的JS文件：====
if (needCLodop()) {
var head = document.head || document.getElementsByTagName("head")[0] || document.documentElement;
var oscript = document.createElement("script");
oscript.src ="http://localhost:8000/CLodopfuncs.js?priority=1";
head.insertBefore( oscript,head.firstChild );
//引用双端口(8000和18000）避免其中某个被占用：
oscript = document.createElement("script");
oscript.src ="http://localhost:18000/CLodopfuncs.js?priority=0";
head.insertBefore( oscript,head.firstChild );
};
//====获取LODOP对象的主过程：====
export function getLodop(oOBJECT,oEMBED){
var strHtmInstall="<br><font color='#FF00FF'>打印控件未安装!点击这里<a href='install_lodop32.exe' target='_self'>执行安装</a>,安装后请刷新页面或重新进入。</font>";
var strHtmUpdate="<br><font color='#FF00FF'>打印控件需要升级!点击这里<a href='install_lodop32.exe' target='_self'>执行升级</a>,升级后请重新进入。</font>";
var strHtm64_Install="<br><font color='#FF00FF'>打印控件未安装!点击这里<a href='install_lodop64.exe' target='_self'>执行安装</a>,安装后请刷新页面或重新进入。</font>";
var strHtm64_Update="<br><font color='#FF00FF'>打印控件需要升级!点击这里<a href='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='http://www.c-lodop.com/download/CLodop_Setup_for_Win32NT_https_3.008Extend.zip' target='_self'>执行安装</a>,安装后请刷新页面。</font>";
var strCLodopUpdate="<br><font color='#FF00FF'>CLodop云打印服务需升级!点击这里<a href='CLodop_Setup_for_Win32NT.exe' target='_self'>执行升级</a>,升级后请刷新页面。</font>";
var LODOP;
try{
var isIE = (navigator.userAgent.indexOf('MSIE')>=0) || (navigator.userAgent.indexOf('Trident')>=0);
if (needCLodop()) {
try{ LODOP=getCLodop();} catch(err) {};
if (!LODOP && document.readyState!=="complete") {alert("C-Lodop没准备好，请稍后再试！"); return;};
if (!LODOP) {
// if (isIE) document.write(strCLodopInstall); else
// document.documentElement.innerHTML=strCLodopInstall+document.documentElement.innerHTML;
// return;
} else {
if (CLODOP.CVERSION<"3.0.0.2") {
if (isIE) document.write(strCLodopUpdate); else
document.documentElement.innerHTML=strCLodopUpdate+document.documentElement.innerHTML;
};
if (oEMBED && oEMBED.parentNode) oEMBED.parentNode.removeChild(oEMBED);
if (oOBJECT && oOBJECT.parentNode) oOBJECT.parentNode.removeChild(oOBJECT);
};
} else {
var is64IE = isIE && (navigator.userAgent.indexOf('x64')>=0);
//=====如果页面有Lodop就直接使用，没有则新建:==========
if (oOBJECT!=undefined || oEMBED!=undefined) {
if (isIE) LODOP=oOBJECT; else LODOP=oEMBED;
} else if (CreatedOKLodop7766==null){
LODOP=document.createElement("object");
LODOP.setAttribute("width",0);
LODOP.setAttribute("height",0);
LODOP.setAttribute("style","position:absolute;left:0px;top:-100px;width:0px;height:0px;");
if (isIE) LODOP.setAttribute("classid","clsid:2105C259-1E0C-4534-8141-A753534CB4CA");
else LODOP.setAttribute("type","application/x-print-lodop");
document.documentElement.appendChild(LODOP);
CreatedOKLodop7766=LODOP;
} else LODOP=CreatedOKLodop7766;
//=====Lodop插件未安装时提示下载地址:==========
if ((LODOP==null)||(typeof(LODOP.VERSION)=="undefined")) {
if (navigator.userAgent.indexOf('Chrome')>=0)
document.documentElement.innerHTML=strHtmChrome+document.documentElement.innerHTML;
if (navigator.userAgent.indexOf('Firefox')>=0)
document.documentElement.innerHTML=strHtmFireFox+document.documentElement.innerHTML;
if (is64IE) document.write(strHtm64_Install); else
if (isIE) document.write(strHtmInstall); else
document.documentElement.innerHTML=strHtmInstall+document.documentElement.innerHTML;
return LODOP;
};
};
if (LODOP.VERSION<"6.0") {
if (!needCLodop()){
if (is64IE) document.write(strHtm64_Update); else
if (isIE) document.write(strHtmUpdate); else
document.documentElement.innerHTML=strHtmUpdate+document.documentElement.innerHTML;
};
return LODOP;
};
LODOP.SET_LICENSES("","4AE3961B0A17F2B39DCDA3787D40445D677","","");
alert("SET_LICENSES执行了");
// LODOP.SET_LICENSES("","加密的秘钥","",""); // 加密密钥 防止不兼容 （删除水印）、
// LODOP.SET_LICENSES("","13528A153BAEE3A0254B9507DCDE2839","EDE92F75B6A3D917F65910","D60BC84D7CF2DE18156A6F88987304CB6D8");
//===如下空白位置适合调用统一功能(如注册语句、语言选择等):===
//LODOP.SET_LICENSES("北京XXXXX公司","8xxxxxxxxxxxxx5","","");
//===========================================================
return LODOP;
} catch(err) {
alert("getLodop出错:"+err);
};
};

82
src/views/basic/pda/basicPda.vue
Unescape View File

@ -23,12 +23,7 @@
@on-load="onLoad"
>
<template #menu-left>
<el-button
type="danger"
icon="el-icon-delete"
plain
v-if="permission.basicdataPda_delete"
@click="handleDelete"
<el-button type="danger" icon="el-icon-delete" plain v-if="permission.basicdataPda_delete" @click="handleDelete"
>删 除
</el-button>
<el-button type="primary" @click="viewrepairs()">查看维修记录</el-button>
@ -38,11 +33,12 @@
<el-button type="primary" text icon="el-icon-view" @click="handleview(row)">查看</el-button>
</template>
</avue-crud>
<basic-pdaform v-if="!edit" @returnpda="returnpda" :pdaformdata="pdaformdata" />
<!-- <basic-pdaform v-if="!edit" @returnpda="returnpda" :pdaformdata="pdaformdata" /> -->
</basic-container>
</template>
<script>
<script>
import { getList, getDetail, add, update, remove } from '@/api/basic/basicPda';
import option from '@/option/basic/basicPda';
import { mapGetters } from 'vuex';
@ -149,6 +145,7 @@ export default {
console.log('返回>>>>', str);
this.edit = true;
},
// 新增数据确定后执行
rowSave(row, done, loading) {
add(row).then(
() => {
@ -165,6 +162,7 @@ export default {
}
);
},
// 数据编辑后触发
rowUpdate(row, index, done, loading) {
update(row).then(
() => {
@ -181,6 +179,7 @@ export default {
}
);
},
// 行删除
rowDel(row) {
this.$confirm('确定将选择数据删除?', {
confirmButtonText: '确定',
@ -264,16 +263,19 @@ export default {
}
done();
},
// 清空搜索回调方法
searchReset() {
this.query = {};
this.onLoad(this.page);
},
// 点击搜索后触发该事件
searchChange(params, done) {
this.query = params;
this.page.currentPage = 1;
this.onLoad(this.page, params);
done();
},
// 当选择项发生变化时会触发该事件
selectionChange(list) {
this.selectionList = list;
},
@ -281,15 +283,20 @@ export default {
this.selectionList = [];
this.$refs.crud.toggleSelection();
},
// 当选择项发生变化时会触发该事件
currentChange(currentPage) {
this.page.currentPage = currentPage;
},
// 点击每页多少条
sizeChange(pageSize) {
this.page.pageSize = pageSize;
},
// 点击刷新
refreshChange() {
this.onLoad(this.page, this.query);
console.log('点击刷新');
},
// 初始化页面
onLoad(page, params = {}) {
this.loading = true;
@ -316,49 +323,36 @@ export default {
};
getList(page.currentPage, page.pageSize, values).then(res => {
console.log(res.data.data.records, 'res');
const data = res.data.data;
this.page.total = data.total;
console.log(data.total, 'sss');
this.data = data.records;
console.log(this.data, 'this.data');
this.loading = false;
this.selectionClear();
});
},
},
};
</script>
<!-- setup -->
<script setup>
</script>
<style scoped lang="scss">
// .el-form-item__label {
// width: auto !important;
// letter-spacing: 2px; /* 设置间距为2像素 */
// padding-right: 0px !important;
// }
// .avue-form__row {
// margin-right: 10px !important;
// }
// .avue-form__menu:last-child {
// display: flex;
// margin-left: -30px !important;
// width: 50px !important;
// justify-content: flex-end;
// }
:deep(.el-form-item__content) {
div:first-child {
width:auto;
width: auto;
}
}
:deep(.el-form-item__label) {
width: 90px !important;
justify-content: flex-start;
}
// .avue-form__group{
// .avue-form__menu:last-child {
// /* 添加样式 */
// }
// }
:deep(.avue-form__menu) {
width: 120px !important;
}
@ -387,23 +381,23 @@ div:last-child {
.avue-form__menu--center {
margin-left: auto !important;
}
:deep(.el-form-item__label){
width:auto !important;
}
:deep(.avue-form__row){
max-width:270px !important;
margin-right:2px;
:deep(.el-form-item__label) {
width: auto !important;
}
:deep(.avue-form__row){
.el-form-item{
margin-right:0;
:deep(.avue-form__row) {
max-width: 270px !important;
margin-right: 2px;
}
:deep(.avue-form__row) {
.el-form-item {
margin-right: 0;
}
}
:deep(.avue-form__group--flex){
:deep(.avue-form__group--flex) {
justify-content: space-between;
}
:deep(.el-form-item__label){
padding-right: 8px;
:deep(.el-form-item__label) {
padding-right: 8px;
}
</style>

1
src/views/basic/printTemplate/basicPrintTemplateFrom.vue
Unescape View File

@ -430,7 +430,6 @@ export default {
flex: 1;
overflow-y: auto;
overflow-x: hidden;
margin-bottom: 10px;
background-color: white;
}
</style>

30
src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
Unescape View File

@ -313,6 +313,9 @@ export default {
search: true,
multiple: true,
span: 12,
expand: true,
maxHeight: '100',
overHidden: true, //表格高度超过多少显示省略
placeholder: '省/市/区',
dicUrl: '/blade-system/region/lazy-listAll',
checkStrictly: true,
@ -1176,26 +1179,25 @@ export default {
}
</style>
<style scoped lang='scss'>
:deep(.avue-form__row){
max-width:300px!important;
<style scoped lang="scss">
:deep(.avue-form__row) {
max-width: 300px !important;
}
:deep(.el-form-item__label){
width:auto !important;
:deep(.el-form-item__label) {
width: auto !important;
}
:deep(.no-print){
:deep(.no-print) {
// margin-left:auto;
max-width:300px !important;
max-width: 300px !important;
margin-left: inherit;
.el-button{
margin-right:0;
.el-button {
margin-right: 0;
}
}
:deep(.el-form-item){
margin-right:0 !important;
:deep(.el-form-item) {
margin-right: 0 !important;
}
:deep(.avue-form__group--flex) {
justify-content: space-between;
justify-content: space-between;
}
</style>
</style>

206
src/views/datadetail/ToolUpdate.vue
Unescape View File

@ -0,0 +1,206 @@
<template>
<!-- 表格组件 -->
<div class='el-content-el' ref='TabHeight'>
<!-- 顶部开始 -->
<div class="el-Cart-button">
<!-- 表格顶部左侧按钮 -->
<div class="el-Cart-button-left">
<el-button type="primary" @click="handleAdd"><el-icon><Plus /></el-icon>新 增</el-button>
<el-button @click="handleDelete"><el-icon><Delete /></el-icon>删 除</el-button>
<el-button @click="handleDelete"><el-icon><Edit /></el-icon>查看维修记录</el-button>
</div>
<!-- 表格顶部右侧按钮 -->
<div class="el-Cart-button-right">
<!-- 刷新按钮 -->
<button>
<el-icon color="#ccc"><Refresh /></el-icon>
</button>
<!-- 功能按钮 -->
<button>
<el-icon color="#ccc"><Operation /></el-icon>
</button>
<!-- 搜索按钮 -->
<button>
<el-icon color="#ccc"><Search /></el-icon>
</button>
</div>
</div>
<!-- 顶部结束 -->
<div class='el-Cart'>
<!-- 表格列开始 -->
<el-table :data="data" border :height="TabHeight+'px'" style="width: 100%; ">
<el-table-column type="selection" width="55" fixed="left"/>
<el-table-column type="index" fixed="left" width="50" height="100" label="#" align="center"/>
<el-table-column prop="name" label="产品名称" width="180" align="center " sortable/>
<el-table-column prop="model" label="型号" width="180" align="center " />
<el-table-column prop="purchaseAmount" label="购买金额" width="180" align="center "/>
<el-table-column prop="state" label="状态" width="180" align="center "/>
<el-table-column prop="currentUsageWarehouse" label="当前使用仓" width="180" align="center "/>
<el-table-column prop="user" label="使用人" width="180" align="center " />
<el-table-column prop="deviceSerialNumber" label="设备序列号S/N" width="180" align="center "/>
<el-table-column prop="userPosition" label="使用人岗位" width="180" align="center "/>
<el-table-column prop="isDeposit" label="是否收取押金" width="180" align="center "/>
<el-table-column prop="deposit" label="押金金额(元)" width="180" align="center "/>
<el-table-column prop="purchasingCompany" label="采购公司" width="180" align="center "/>
<el-table-column prop="buyingTime" label="购买时间" width="180" align="center "/>
<el-table-column prop="warrantyPeriodEndTime" label="保修截止时间" width="180" align="center "/>
<el-table-column prop="notes" label="备注" width="180" align="center "/>
<el-table-column label="商品图片" width="180" align="center" >
<template #default="props">
<img :src="props.row.photo" class='el-Img'>
</template>
</el-table-column>
<el-table-column fixed="right" label="操作" width="280" align="center ">
<template #default>
<el-button link type="primary" icon="el-icon-delete" @click="handleDelete">删除</el-button>
<el-button link type="primary" icon="el-icon-view" @click="handleEdit(row)">编辑</el-button>
<el-button link type="primary" icon="el-icon-view" @click="handleview(row)">查看</el-button>
</template>
</el-table-column>
</el-table>
<!-- 表格翻页功能 -->
<div class="demo-pagination-block">
<el-pagination
v-model:current-page="currentPage"
v-model:page-size="pageSize"
:page-sizes="pageList"
:small="small"
:disabled="disabled"
:background="background"
layout="total, sizes, prev, pager, next, jumper"
:total="2"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
/>
</div>
</div>
</div>
</template>
<script setup>
import { ref, reactive,onMounted } from 'vue';
import { getList, getDetail, add, update, remove,$_TableList } from '@/api/basic/basicPda'; //API
const currentPage = ref(1); // 默认页码
const pageSize = ref(30); // 默认每一页几条
const pageList = ref([5, 10, 50, 100, 200]); // 选择每页显示多少条
const small = ref(false);
const background = ref(true); // 是否开启背景颜色
const disabled = ref(false); // 是否禁止使用页码功能
const data = ref([]); // 表单数据
const TabHeight = ref();//动态获取表格高度
// 获取表格数据
function onLoad(){
// 获取表格数据API（$_TableList）
$_TableList({ current:currentPage.value, size: pageSize.value }).then(res=>{
console.log(res.data.data.records);
//表格信息
data.value=res.data.data.records
})
}
// 动态获取DOM高度给表单防止页面出现滚动条
onMounted(() => {
// 默认值86
TabHeight.value = TabHeight.value.offsetHeight-88;
// 等待DOM高度被复制之后在请求数据，防止被数据撑开高度
onLoad()
})
</script>
<style scoped lang='scss'>
// 最外层 IDV
.el-content-el {
padding: 0 8px;
padding-top:8px;
background-color: #fff;
height: 100%;
box-sizing: border-box;
// 表格顶部按钮
:deep(.el-Cart-button) {
margin-bottom: 5px;
display: flex;
justify-content: space-between;
}
// 表格顶部左侧、右侧按钮样式
.el-Cart-button-left,.el-Cart-button-right{
display: flex;
margin: 0 0px;
justify-content: space-between;
}
.el-Cart-button-left{
:deep( button){
padding: 0 7px;
min-width: 70px;
display: flex;
span{
width: 100%;
display: inline-flex;
align-items: center;
justify-content: space-between;
i{
margin-right: 6px;
}
}
}
}
.el-Cart-button-right {
display: flex;
margin: 0 0px;
justify-content: space-between;
button {
background-color: transparent;
border-radius: 50%;
width: 30px;
height: 30px;
display: flex;
align-items: center;
justify-content: center;
border: 1px solid #ccc;
margin-right: 8px;
&:hover {
background-color: #172e601f;
i {
color: #0e2549;
}
}
// 去掉最后一个按钮右侧边距
&:last-child {
margin-right: 0;
}
}
}
.el-Cart {
// 表格标题颜色
:deep(.el-table__header) {
th {
background-color: #fafafa;
color: #000;
}
}
// 组件样式开始
// 分页样式
.demo-pagination-block {
display: flex;
justify-content: flex-end;
margin-top: 6px;
}
// 表格行高度
:deep(.el-table__row) {
height: 60px;
}
// 表格图片
.el-Img {
width: 100%;
height: 40px;
img {
width: 100%;
height: 100%;
}
}
}
}
</style>

10
vite.config.js
Unescape View File

@ -35,16 +35,12 @@ export default ({ mode, command }) => {
output: {
// 分包
manualChunks(id) {
if (id.includes("node_modules")) {
return id
.toString()
.split("node_modules/")[1]
.split("/")[0]
.toString();
if (id.includes('node_modules')) {
return id.toString().split('node_modules/')[1].split('/')[0].toString();
}
},
},
},
}
},
});
};

Write Preview
Loading…
Cancel
Save