diff --git a/src/components/Pagination/index.vue b/src/components/Pagination/index.vue index 56f5a6b9..704f04b4 100644 --- a/src/components/Pagination/index.vue +++ b/src/components/Pagination/index.vue @@ -42,7 +42,7 @@ export default { // 移动端页码按钮的数量端默认值5 pagerCount: { type: Number, - default: document.body.clientWidth < 992 ? 5 : 7 + default: document.body.clientWidth < 992 ? 3 : 4 }, layout: { type: String, diff --git a/src/components/XdTable/index.vue b/src/components/XdTable/index.vue index f3138101..dc2349f6 100644 --- a/src/components/XdTable/index.vue +++ b/src/components/XdTable/index.vue @@ -100,15 +100,13 @@
-
+
-
- +
this.fullUrl==>", this.fullUrl,this.saveStorageName) this.isNeedDbSaveTpl=false; } - this.getTbShowlList(); + // 读取本地缓存数据 this.initStorage() + + // 查看是否有默认模版 + this.initTbShowlList(); + this.updateTable() + this.initSort(); this.initKeyDown(); this.tableDom=this.getTableDom(); @@ -678,13 +681,15 @@ export default { this.reload(); } }, - getTbShowlList() { + initTbShowlList() { if(!this.isNeedDbSaveTpl){ return; } let queryParams = { tagId:this.saveStorageName }; + + console.log("===>initTbShowlList=1111=>"); this.storeTplList=[]; listSysCustomizeTpl(queryParams).then(response => { if(response.rows&&response.rows.length>0){ @@ -696,13 +701,18 @@ export default { this.curentTbShowTpl=selTplItem.tplCode; } + console.log("===>initTbShowlList=2222=>",this.storeTplList); + console.log("===>this.curentTbShowTpl=2222=>",this.curentTbShowTpl); + + } }); }, savaTbShowTpl(){ if(!this.form.tplName){ - this.$modal.msgError("模版名称必填"); - return; + this.form.tplName='默认' + // this.$modal.msgError("模版名称必填"); + // return; } // 判断模版是否存在，若存在则覆盖 @@ -718,7 +728,7 @@ export default { updateSysCustomizeTpl(this.form).then(response => { this.$modal.msgSuccess("修改成功"); this.openTbShowTplDlg=false; - this.getTbShowlList(); + this.initTbShowlList(); this.curentTbShowTpl=this.form.tplCode; }); } else { @@ -728,7 +738,7 @@ export default { addSysCustomizeTpl(this.form).then(response => { this.$modal.msgSuccess("新增成功"); this.openTbShowTplDlg=false; - this.getTbShowlList(); + this.initTbShowlList(); this.curentTbShowTpl=this.form.tplCode; }); } @@ -738,7 +748,7 @@ export default { this.$modal.confirm('是否确认删除').then(function() { return delSysCustomizeTpl(ids); }).then(() => { - this.getTbShowlList(); + this.initTbShowlList(); this.openTbShowTplDlg=false; this.changeTbShowTpl(null); @@ -1112,9 +1122,10 @@ export default { const storage = window.localStorage.getItem('tableStorage') ? JSON.parse(window.localStorage.getItem('tableStorage')) : {} storage[this.saveStorageName] = this.storageList window.localStorage.setItem('tableStorage', JSON.stringify(storage)) + }else{ + // 清除本地缓存 + window.localStorage.removeItem('tableStorage') } - - // this.setHeaderSortable(); }, } diff --git a/src/views/emis/EmisBaseTools/EmisUserSimplePicker.vue b/src/views/emis/EmisBaseTools/EmisUserSimplePicker.vue index eda4719b..d1d26021 100644 --- a/src/views/emis/EmisBaseTools/EmisUserSimplePicker.vue +++ b/src/views/emis/EmisBaseTools/EmisUserSimplePicker.vue @@ -1,10 +1,12 @@ - + @@ -173,7 +201,9 @@ export default { // 结算子账单表格数据 emisSettleSubBillList: [], - emisSettleBillOptions: [], + emisSettleBillOptions: [], + + selectList:[], billCodeStr:null, // 遮罩层 @@ -255,6 +285,7 @@ export default { this.ids = selection.map(item => item.id) this.single = selection.length!==1 this.multiple = !selection.length + this.selectList=selection }, // 取消按钮 @@ -321,8 +352,13 @@ export default { if (valid) { if (this.form.id != null) { let postData={ - settleBillName:this.form.settleBillName + id:this.form.id, + settleBillName:this.form.settleBillName, + billMonth:this.form.billMonth, + settleStartDate:this.form.settleStartDate, + settleEndDate:this.form.settleEndDate, } + updateEmisSettleBill(postData).then(response => { this.$modal.msgSuccess("修改成功"); this.initData(); @@ -334,6 +370,18 @@ export default { }, handleRemovceBillCode(){ + if(this.emisSettleSubBillList.length<=1){ + this.$modal.msgError("不允许操作,至少保留一单数据"); + return; + } + + if(!this.billCodeStr){ + if(this.selectList&&this.selectList.length>0){ + let tmpBillCodeArr = this.selectList.map(item => item.billCode); + this.billCodeStr=tmpBillCodeArr.join(","); + } + } + let postData={ settleBillNo: this.form.settleBillNo, params:{ @@ -341,6 +389,9 @@ export default { } } + + // this.selectList + // 生成合账单号 removeSubBillFromSettleBill(postData).then(response => { this.$modal.msgSuccess("操作成功"); diff --git a/src/views/emis/emisWaybill/waybillDetailReadOnly.vue b/src/views/emis/emisWaybill/waybillDetailReadOnly.vue index 65869dca..394e08b1 100644 --- a/src/views/emis/emisWaybill/waybillDetailReadOnly.vue +++ b/src/views/emis/emisWaybill/waybillDetailReadOnly.vue @@ -206,7 +206,7 @@ - {{ form.freight }} + {{ form.freight }} {{ form.feeRemark }} diff --git a/src/views/emis/emisWaybill/waybillModify.vue b/src/views/emis/emisWaybill/waybillModify.vue index f47344d1..2cdc4610 100644 --- a/src/views/emis/emisWaybill/waybillModify.vue +++ b/src/views/emis/emisWaybill/waybillModify.vue @@ -802,8 +802,6 @@ import PayeePicker from '@/views/emis/EmisBaseTools/PayeePicker.vue'; import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue'; import ExchangeRatePanel from '@/views/emis/EmisBaseTools/ExchangeRatePanel.vue'; - - import TransProductCasPicker from '@/views/emis/EmisBaseTools/TransProductCasPicker.vue'; // import TransProductCasPicker from '@/views/emis/EmisBaseTools/TransProductCasPicker.vue'; @@ -1834,17 +1832,14 @@ methods: { } newFee=newFee.toFixed(2); - feeRemark= feeRemark+item.feeName+'('+item.currency+"):" + item.realFee+","; - - feeRemark = feeRemark.slice(0, -1); - - + // feeRemark= feeRemark+item.feeName+'('+item.currency+"):" + item.realFee+","; + // feeRemark = feeRemark.slice(0, -1); totalFee=Number(totalFee)+Number(newFee); } } - this.form.feeRemark=feeRemark; + // this.form.feeRemark=feeRemark; this.form.freight = totalFee.toFixed(2); }, // 计算体积重量 diff --git a/src/views/emis/emisWaybill/waybillRecord.vue b/src/views/emis/emisWaybill/waybillRecord.vue index bf6db850..271b0646 100644 --- a/src/views/emis/emisWaybill/waybillRecord.vue +++ b/src/views/emis/emisWaybill/waybillRecord.vue @@ -1215,28 +1215,29 @@ methods: { let childOrderList=[] let subBillArr=this.form.billCodeSub.split(','); - - for(let i=0;i0){ - let subBillItem ={ - "tplCode":"TAN-GC-130", - "printerName":this.$refs.tanexPrinter.getDefaultPrinter(), - "orderList":childOrderList.toString() + if(childOrderList&&childOrderList.length>0){ + let subBillItem ={ + "tplCode":"TAN-GC-130", + "printerName":this.$refs.tanexPrinter.getDefaultPrinter(), + "orderList":childOrderList.toString() + } + printDataList.push(subBillItem); } - printDataList.push(subBillItem); } let billCount=2+childOrderList.length; // 预览主子单 this.$refs.tanexPrinter.printPreviewAdv(printDataList,billCount) - } } else{ @@ -1834,17 +1835,14 @@ methods: { } newFee=newFee.toFixed(2); - feeRemark= feeRemark+item.feeName+'('+item.currency+"):" + item.realFee+","; - - feeRemark = feeRemark.slice(0, -1); - - + // feeRemark= feeRemark+item.feeName+'('+item.currency+"):" + item.realFee+","; + // feeRemark = feeRemark.slice(0, -1); totalFee=Number(totalFee)+Number(newFee); } } - this.form.feeRemark=feeRemark; + // this.form.feeRemark=feeRemark; this.form.freight = totalFee.toFixed(2); }, // 计算体积重量