diff --git a/index.html b/index.html index 0d76a8f..cbdfd47 100644 --- a/index.html +++ b/index.html @@ -6,11 +6,11 @@ vue-next-admin @@ -18,7 +18,8 @@
+ - + diff --git a/lodop.js b/lodop.js new file mode 100644 index 0000000..7d69ccf --- /dev/null +++ b/lodop.js @@ -0,0 +1,189 @@ +//==本JS是加载Lodop插件或Web打印服务CLodop/Lodop7的综合示例，可直接使用，建议理解后融入自己程序== + +//用双端口加载主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 CreatedOKLodopObject, CLodopIsLocal, LoadJsState; + +//==判断是否需要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; + } +} + +//==检查加载成功与否，如没成功则用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对象的主过程:== +(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(); + } +})(); + +//==获取LODOP对象主过程,判断是否安装、需否升级:== +// eslint-disable-next-line @typescript-eslint/no-unused-vars,no-unused-vars +function getLodop(oOBJECT, oEMBED) { + var strFontTag = "
打印控件"; + var strLodopInstall = strFontTag + "未安装!点击这里执行安装"; + var strLodopUpdate = strFontTag + "需要升级!点击这里执行升级"; + var strLodop64Install = strFontTag + "未安装!点击这里执行安装"; + var strLodop64Update = strFontTag + "需要升级!点击这里执行升级"; + var strCLodopInstallA = "
Web打印服务CLodop未安装启动，点击这里下载执行安装"; + var strCLodopInstallB = "
（若此前已安装过，可点这里直接再次启动）"; + var strCLodopUpdate = "
Web打印服务CLodop需升级!点击这里执行升级"; + var strLodop7FontTag = "
Web打印服务Lodop7"; + var strLodop7HrefX86 = "点击这里下载安装(下载后解压，点击lodop文件开始执行)"; + var strLodop7HrefARM = "点击这里下载安装(下载后解压，点击lodop文件开始执行)"; + var strLodop7Install_X86 = strLodop7FontTag + "未安装启动，" + strLodop7HrefX86; + var strLodop7Install_ARM = strLodop7FontTag + "未安装启动，" + strLodop7HrefARM; + var strLodop7Update_X86 = strLodop7FontTag + "需升级，" + strLodop7HrefX86; + var strLodop7Update_ARM = strLodop7FontTag + "需升级，" + strLodop7HrefARM; + var strInstallOK = "，成功后请刷新本页面或重启浏览器。"; + 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) { /* empty */ } + 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.1.0.1") + strAlertMessage = strLodop7Update_X86; + else if (isLinuxARM && LODOP.CVERSION < "7.1.0.1") + strAlertMessage = strLodop7Update_ARM; + else if (CLODOP.CVERSION < "6.6.2.3") + strAlertMessage = strCLodopUpdate; + + 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("","EE0887D00FCC7D29375A695F728489A6","C94CEE276DB2187AE6B65D56B3FC2848",""); + + //=============================================================================== + return LODOP; + } catch (err) { + alert("getLodop出错:" + err); + } +} + diff --git a/src/App.vue b/src/App.vue index 6f90bb5..a2f5ef7 100644 --- a/src/App.vue +++ b/src/App.vue @@ -49,7 +49,6 @@ onMounted(() => { } else { Avue.locale.use(Local.get('langes') === 'zh-cn' ? zhLocale : enLocale) } - // eslint-disable-next-line no-mixed-spaces-and-tabs // 监听布局配'置弹窗点击打开 mittBus.on('openSetingsDrawer', () => { diff --git a/src/views/materialReceiptNotice/barCode.vue b/src/views/materialReceiptNotice/barCode.vue index c19112b..2b7438a 100644 --- a/src/views/materialReceiptNotice/barCode.vue +++ b/src/views/materialReceiptNotice/barCode.vue @@ -1,17 +1,10 @@ diff --git a/src/views/materialReceiptNotice/index.vue b/src/views/materialReceiptNotice/index.vue index 8673c2b..3e79799 100644 --- a/src/views/materialReceiptNotice/index.vue +++ b/src/views/materialReceiptNotice/index.vue @@ -14,8 +14,8 @@ - - + + 43 + + 43 + + - - - - + @@ -80,11 +92,13 @@ import { reactive, onMounted, computed, ref } from 'vue'; import { listApi } from '/@/api/list'; import { useI18n } from 'vue-i18n'; import SelectedData from '/@/views/materialReceiptNotice/selectedData.vue'; -import componentPrinting from './componentPrinting.vue' -import {ElMessage, ElMessageBox} from "element-plus"; +import componentPrinting from './componentPrinting.vue'; +import { ElMessage, ElMessageBox } from 'element-plus'; +const LODOP = window.LODOP; + const { t } = useI18n(); const crudRef = ref(); -const componentPrintingRef = ref() +const componentPrintingRef = ref(); const state = reactive({ page: { total: 0, @@ -93,7 +107,7 @@ const state = reactive({ }, option: { height: computed(() => window.innerHeight - window.innerHeight * 0.25 + ''), - sortable: true, + sortable: true, tip: false, index: false, menuWidth: 120, @@ -104,24 +118,25 @@ const state = reactive({ selection: false, searchMenuSpan: 3, addBtn: false, - menu:false, + menu: false, column: [ { label: '', prop: 'checkboxBox', width: 35 }, - { label: computed(()=> t('message.index.deliveryDate')), prop: 'deliveryDate' }, - { label: computed(()=> t('message.index.deliveryNote')), prop: 'sheet', width: '135' }, - { label: computed(()=> t('message.index.PO1')), prop: 'purchaseOrderFBillNo', width: '135' }, - { label: computed(()=> t('message.index.maxcessLot')), prop: 'mssSupplierLot' }, - { label: computed(()=> t('message.index.supplierLot')), prop: 'fSupplierLot' }, - { label: computed(()=> t('message.index.partNumber')), prop: 'materialCode', width: '120' }, - { label: computed(()=> t('message.index.materialName')), prop: 'materialName' }, + { label: computed(() => t('message.index.deliveryDate')), prop: 'deliveryDate' }, + { label: computed(() => t('message.index.deliveryNote')), prop: 'sheet', width: '135' }, + { label: '收料通知单单号', prop: 'fBillNo', width: '135' }, + { label: computed(() => t('message.index.PO1')), prop: 'purchaseOrderFBillNo', width: '135' }, + { label: computed(() => t('message.index.maxcessLot')), prop: 'mssSupplierLot' }, + { label: computed(() => t('message.index.supplierLot')), prop: 'fSupplierLot' }, + { label: computed(() => t('message.index.partNumber')), prop: 'materialCode', width: '120' }, + { label: computed(() => t('message.index.materialName')), prop: 'materialName' }, { label: computed(() => t('message.index.supplierCode')), prop: 'supplierId', width: '90' }, { label: computed(() => t('message.index.supplierName')), prop: 'supplierName', width: '120' }, // { label: computed(() => t('message.index.receivedQTY')), prop: 'sendedQty', width: '110' }, { label: computed(() => t('message.index.shipmentQTY')), prop: 'qty' }, { label: computed(() => t('message.index.POQTY')), prop: 'purchaseQty' }, { label: computed(() => t('message.index.unit')), prop: 'unitName' }, - { label: computed(() => t('message.index.print')), prop: 'print',width: 80 }, - { label: computed(() => t('message.index.deleteText')), prop: 'deleteText',width: 80 }, + { label: computed(() => t('message.index.print')), prop: 'print', width: 80 }, + { label: computed(() => t('message.index.deleteText')), prop: 'deleteText', width: 80 }, ], }, data: [], @@ -137,36 +152,37 @@ const state = reactive({ loading: false, }); const elDatePickerFun = (val: any) => { - state.formData.fDateBegin = val[0]; - state.formData.fDateEmd = val[1]; + state.formData.fDateBegin = val[0]; + state.formData.fDateEmd = val[1]; +}; +const invoiceOrderDeleteOrderFun = (row: any) => { + ElMessageBox({ + closeOnClickModal: false, + closeOnPressEscape: false, + title: t('message.index.prompt'), + message: t('message.index.scqd'), + confirmButtonText: t('message.index.confirm'), + cancelButtonText: t('message.user.logOutCancel'), + showCancelButton: true, + buttonSize: 'default', + beforeClose: (action, instance, done) => { + if (action === 'confirm') { + instance.confirmButtonLoading = true; + listApi() + .invoiceOrderDeleteOrder({ id: row.id }) + .then((res: any) => { + done(); + getList(); + if (res.resultCode === 0) { + ElMessage.success(t('message.index.success')); + } + }); + } else { + done(); + } + }, + }); }; -const invoiceOrderDeleteOrderFun = (row:any) => { - ElMessageBox({ - closeOnClickModal: false, - closeOnPressEscape: false, - title: t('message.index.prompt'), - message: t('message.index.scqd'), - confirmButtonText: t('message.index.confirm'), - cancelButtonText: t('message.user.logOutCancel'), - showCancelButton: true, - buttonSize: 'default', - beforeClose: (action, instance, done) => { - if (action === 'confirm') { - instance.confirmButtonLoading = true; - listApi().invoiceOrderDeleteOrder({id:row.id}).then((res:any) => { - done() - getList() - if(res.resultCode === 0){ - ElMessage.success(t('message.index.success')) - } - }) - } else { - done(); - } - }, - }); - -} const selectionChange = (row: any) => { if (row.checkboxBox == '1') { state.data.forEach((item: any) => { @@ -195,9 +211,9 @@ const selectionChange = (row: any) => { state.selectedData = []; } }; -const componentPrintingFunDataRow = (row:any) => { - componentPrintingRef.value.openShowDataFun(row) -} +const componentPrintingFunDataRow = (row: any) => { + componentPrintingRef.value.openShowDataFun(row); +}; //接口数据处理 const selectFun = () => { state.page.currentPage = 1; @@ -241,30 +257,31 @@ const getList = () => { }); }; // 页面加载时 -onMounted(() => {}); +onMounted(() => {console.log( window.LODOP)});