aike/emis-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-08-09 07:33:09 +08:00
parent 9137519523
commit 88370e4780
7 changed files with 21 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/components/XdTable/index.vue
View File

@ -547,16 +547,7 @@ export default {
} }
}, },
focus:{
update: function (el, binding, vnode) {
vnode.context.initKeyDownEvent();
},
},
blur:{
update: function (el, binding, vnode) {
vnode.context.removeKeyDownEvent();
},
},
}, },
data() { data() {
@ -1234,10 +1225,10 @@ export default {
if (item.show) { if (item.show) {
const node = this.$vnode.componentOptions.children.find(n => n.componentOptions && n.componentOptions.propsData.prop === item.prop) const node = this.$vnode.componentOptions.children.find(n => n.componentOptions && n.componentOptions.propsData.prop === item.prop)
if (node) { if (node) {
let nodeItem=node.componentOptions.propsData; // let nodeItem=node.componentOptions.propsData;
if(item.label != nodeItem.label){ // if(item.label != nodeItem.label){
item.label=nodeItem.label; // item.label=nodeItem.label;
} // }
node.componentOptions.propsData.fixed = item.fixed node.componentOptions.propsData.fixed = item.fixed
childrenNodes.push(node) childrenNodes.push(node)
} }

4
src/utils/TanexPrinterSdk.js
View File

@ -448,7 +448,7 @@ class TanexPrinterSdk {
}; };
this.ws.onmessage = e => { this.ws.onmessage = e => {
// console.log('ws onmessage:' + e.data) console.log('ws onmessage:' + e.data)
if (e.data.charAt(0) === "{") { if (e.data.charAt(0) === "{") {
var msg = this.jsonToObj(e.data); var msg = this.jsonToObj(e.data);
if(msg["CMD"]=='printerIsRead'){ if(msg["CMD"]=='printerIsRead'){
@ -627,7 +627,7 @@ class TanexPrinterSdk {
// 发送数据的方法 // 发送数据的方法
send(data) { send(data) {
// console.log("send:"+data) console.log("send:"+data)
if (this.getWSReadyState() === this.WS_OPEN ) { if (this.getWSReadyState() === this.WS_OPEN ) {
this.sendRetryCount = 0 this.sendRetryCount = 0
this.ws.send(data) this.ws.send(data)

7
src/views/emis/EmisBaseTools/TanexPrinterPanel.vue
View File

@ -239,6 +239,9 @@
getDefaultPrinter(){ getDefaultPrinter(){
return this.tanexPrinter.getDefaultPrinter(); return this.tanexPrinter.getDefaultPrinter();
}, },
getSelectPrinter(){
return this.selPrinterName;
},
refreshPrintTpl(){ refreshPrintTpl(){
this.printTplList=[]; this.printTplList=[];
this.selTplCode=null; this.selTplCode=null;
@ -344,7 +347,7 @@
}) })
let orderSeqMap = new Map(); let orderSeqMap = new Map();
// console.log("printPreviewAdv===>",printDataList); console.log("printPreviewAdv===>",printDataList);
let j=0; let j=0;
@ -392,7 +395,7 @@
} }
else if(code == 800){ else if(code == 800){
// 全部获取完成 // 全部获取完成
// console.log("===全部获取完成ADV====>"); console.log("===全部获取完成ADV====>");
that.pdfList.sort((one, two) => { that.pdfList.sort((one, two) => {
let v=one.seqNo-two.seqNo; let v=one.seqNo-two.seqNo;
if(one.seqNo==two.seqNo){ if(one.seqNo==two.seqNo){

2
src/views/emis/emisSite/index.vue
View File

@ -269,7 +269,7 @@ import EmisBrandPicker from '@/views/emis/EmisBaseTools/EmisBrandPicker.vue';
// EmisSiteTreePicker // EmisSiteTreePicker
export default { export default {
name: "emisSite", name: "EmisSite",
components: { components: {
emisSiteForm,CountryTreePicker,CountryPicker,EmisBrandPicker, emisSiteForm,CountryTreePicker,CountryPicker,EmisBrandPicker,
EmisSiteSimplePicker,ProvincePicker,CityPicker,DistrictPicker EmisSiteSimplePicker,ProvincePicker,CityPicker,DistrictPicker

2
src/views/emis/emisUser/index.vue
View File

@ -315,7 +315,7 @@ import CountryTreePicker from '@/views/emis/EmisBaseTools/CountryTreePicker.vue'
export default { export default {
name: "User", name: "EmisUser",
dicts: ['sys_normal_disable', 'sys_user_sex','emis_site_type','sys_biz_enable_status'], dicts: ['sys_normal_disable', 'sys_user_sex','emis_site_type','sys_biz_enable_status'],
components: { DeptmentTreePicker,CountryTreePicker,Treeselect,SysUserForm,EmisSiteSimplePicker,EmisSiteLeftTreePicker,CountryPicker }, components: { DeptmentTreePicker,CountryTreePicker,Treeselect,SysUserForm,EmisSiteSimplePicker,EmisSiteLeftTreePicker,CountryPicker },
data() { data() {

2
src/views/emis/emisWaybill/waybillIsPrinted.vue
View File

@ -350,7 +350,7 @@ export default {
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 20, pageSize: 100,
orderSn: null, orderSn: null,
billCode: null, billCode: null,
billCodeSub: null, billCodeSub: null,

12
src/views/emis/emisWaybill/waybillRecord.vue
View File

@ -1125,7 +1125,7 @@ methods: {
// // 客户联 // // 客户联
// let customerItem ={ // let customerItem ={
// "tplCode":"TAN-CM-130", // "tplCode":"TAN-CM-130",
// "printerName":this.$refs.tanexPrinter.getDefaultPrinter(), // "printerName":this.$refs.tanexPrinter.getSelectPrinter(),
// "orderList":orderList.toString() // "orderList":orderList.toString()
// } // }
// printDataList.push(customerItem); // printDataList.push(customerItem);
@ -1133,7 +1133,7 @@ methods: {
// 主单 // 主单
let mainBillItem ={ let mainBillItem ={
"tplCode":"TAN-GM-130", "tplCode":"TAN-GM-130",
"printerName":this.$refs.tanexPrinter.getDefaultPrinter(), "printerName":this.$refs.tanexPrinter.getSelectPrinter(),
"orderList":orderList.toString() "orderList":orderList.toString()
} }
printDataList.push(mainBillItem); printDataList.push(mainBillItem);
@ -1156,7 +1156,7 @@ methods: {
let subBillItem ={ let subBillItem ={
"tplCode":"TAN-GC-130", "tplCode":"TAN-GC-130",
"printerName":this.$refs.tanexPrinter.getDefaultPrinter(), "printerName":this.$refs.tanexPrinter.getSelectPrinter(),
"orderList":childOrderList.toString() "orderList":childOrderList.toString()
} }
printDataList.push(subBillItem); printDataList.push(subBillItem);
@ -1199,7 +1199,7 @@ methods: {
// 客户联 // 客户联
let customerItem ={ let customerItem ={
"tplCode":"TAN-CM-130", "tplCode":"TAN-CM-130",
"printerName":this.$refs.tanexPrinter.getDefaultPrinter(), "printerName":this.$refs.tanexPrinter.getSelectPrinter(),
"orderList":orderList.toString() "orderList":orderList.toString()
} }
printDataList.push(customerItem); printDataList.push(customerItem);
@ -1207,7 +1207,7 @@ methods: {
// 主单 // 主单
let mainBillItem ={ let mainBillItem ={
"tplCode":"TAN-GM-130", "tplCode":"TAN-GM-130",
"printerName":this.$refs.tanexPrinter.getDefaultPrinter(), "printerName":this.$refs.tanexPrinter.getSelectPrinter(),
"orderList":orderList.toString() "orderList":orderList.toString()
} }
printDataList.push(mainBillItem); printDataList.push(mainBillItem);
@ -1234,7 +1234,7 @@ methods: {
if(childOrderList&&childOrderList.length>0){ if(childOrderList&&childOrderList.length>0){
let subBillItem ={ let subBillItem ={
"tplCode":"TAN-GC-130", "tplCode":"TAN-GC-130",
"printerName":this.$refs.tanexPrinter.getDefaultPrinter(), "printerName":this.$refs.tanexPrinter.getSelectPrinter(),
"orderList":childOrderList.toString() "orderList":childOrderList.toString()
} }
printDataList.push(subBillItem); printDataList.push(subBillItem);