diff --git a/src/api/emis/emisSettleInvoiceRecord.js b/src/api/emis/emisSettleInvoiceRecord.js index 32ad9a4b..aed70676 100644 --- a/src/api/emis/emisSettleInvoiceRecord.js +++ b/src/api/emis/emisSettleInvoiceRecord.js @@ -42,3 +42,12 @@ export function delEmisSettleInvoiceRecord(id) { method: 'delete' }) } + +// 中心审核不通过 +export function auditCenterNoPass(id,note) { + return request({ + url: '/emis/emisSettleInvoiceRecord/auditCenterNoPass/' + id, + method: 'post', + data: {centerConfirmNote: note} + }) +} diff --git a/src/components/XdTable/index.vue b/src/components/XdTable/index.vue index ce0fd376..0e07b50c 100644 --- a/src/components/XdTable/index.vue +++ b/src/components/XdTable/index.vue @@ -662,14 +662,10 @@ export default { this.isNeedDbSaveTpl=false; } - // 查看是否有默认模版 - this.initTbShowlList(); - - // 读取本地缓存数据 + // 初始化默认模版到本地 + this.initDefaultTplList(); this.initStorage() - this.updateTable() - this.initSort(); this.initKeyDown(); this.tableDom=this.getTableDom(); @@ -772,7 +768,7 @@ export default { this.reload(); } }, - initTbShowlList() { + async initDefaultTplList() { if(!this.isNeedDbSaveTpl){ return; } @@ -780,34 +776,23 @@ export default { tagId:this.saveStorageName }; - // // console.log("===>initTbShowlList=1111=>"); + console.log("===>initDefaultTplList=1111=>"); this.storeTplList=[]; - listSysCustomizeTpl(queryParams).then(response => { - if(response.rows&&response.rows.length>0){ + // 获取模版列表 + let res=await listSysCustomizeTpl(queryParams) + if(response.rows&&response.rows.length>0){ this.storeTplList=response.rows; - // 获取默认模版 + // 设置默认模版 const selTplItem=this.storeTplList.find(item=>item.blDefault == '1' ); if(selTplItem){ this.form=selTplItem; this.curentTbShowTpl=selTplItem.tplCode; - this.storageList=JSON.parse(this.form.tplData); - - // // console.log("===>initTbShowlList=111=>",this.storageList); - // 必须在节点数组存在的才有意义 - let list = this.storageList.filter(item => this.$vnode.componentOptions.children.find(n => { - return n.componentOptions && item.prop === n.componentOptions.propsData.prop - })) - - this.storageList = list; - // 保存模版数据到本地 - this.storeTplToLocal(); - - // this.initStorage(); - // this.updateTable(); + const tplColList=JSON.parse(this.form.tplData); + console.log("===>initDefaultTplList=2222=>",tplColList); + // 存储到本地tpl + this.storeTplToLocal(tplColList); } - - } - }); + } }, // 矫正模版数据 @@ -831,7 +816,7 @@ export default { updateSysCustomizeTpl(this.form).then(response => { this.$modal.msgSuccess("修改成功"); this.openTbShowTplDlg=false; - this.initTbShowlList(); + this.initDefaultTplList(); this.curentTbShowTpl=this.form.tplCode; }); } else { @@ -841,7 +826,7 @@ export default { addSysCustomizeTpl(this.form).then(response => { this.$modal.msgSuccess("新增成功"); this.openTbShowTplDlg=false; - this.initTbShowlList(); + this.initDefaultTplList(); this.curentTbShowTpl=this.form.tplCode; }); } @@ -851,7 +836,7 @@ export default { this.$modal.confirm('是否确认删除').then(function() { return delSysCustomizeTpl(ids); }).then(() => { - this.initTbShowlList(); + this.initDefaultTplList(); this.openTbShowTplDlg=false; this.changeTbShowTpl(null); @@ -1191,7 +1176,7 @@ export default { this.$vnode.componentOptions.children.forEach(node => { // 以label为准，因为可能会改文本 - if (!(!node.componentOptions || node.componentOptions.propsData.type) && list.findIndex(i => i.label === node.componentOptions.propsData.label) < 0) { + if (!(!node.componentOptions || node.componentOptions.propsData.type) && list.findIndex(i => i.prop === node.componentOptions.propsData.prop) < 0) { // 非插槽且 不是特殊类型的 找不到就加上 const propsData = JSON.parse(JSON.stringify(node.componentOptions.propsData)) if (propsData.fixed === undefined || propsData.fixed === false) { @@ -1215,13 +1200,20 @@ export default { // 根据缓存的数组进行渲染表格 updateTable() { - // // console.log("===>updateTable==>"); // 特殊类型 const childrenNodes = this.$vnode.componentOptions.children.filter(node => node.componentOptions && node.componentOptions.propsData.type) this.storageList.forEach(item => { if (item.show) { - const node = this.$vnode.componentOptions.children.find(n => n.componentOptions && n.componentOptions.propsData.label === item.label) + const node = this.$vnode.componentOptions.children.find(n => n.componentOptions && n.componentOptions.propsData.prop === item.prop) if (node) { + let nodeItem=node.componentOptions.propsData; + console.log("===========================nodeItem=====",nodeItem) + console.log("===========================item=====",item) + + if(item.label != nodeItem.label){ + item.label=nodeItem.label; + } + node.componentOptions.propsData.fixed = item.fixed childrenNodes.push(node) } @@ -1233,19 +1225,19 @@ export default { this.config.listeners = this.$listeners; // 通过key值触发表格刷新，避免拖拽由于数组长度一致导致diff算法无法识别 - // this.config.key = Math.random() + '' + this.config.key = Math.random() + '' // 控制下表格重新刷新 - this.getInstance()?.doLayout() + // this.getInstance()?.doLayout() if(this.showCustomizeTpl){ - this.storeTplToLocal(); + this.storeTplToLocal(this.storageList); }else{ // 清除本地缓存 - window.localStorage.removeItem('tableStorage') + // window.localStorage.removeItem('tableStorage') } }, - storeTplToLocal(){ + storeTplToLocal(tplColList){ const storage = window.localStorage.getItem('tableStorage') ? JSON.parse(window.localStorage.getItem('tableStorage')) : {} - storage[this.saveStorageName] = this.storageList + storage[this.saveStorageName] = tplColList window.localStorage.setItem('tableStorage', JSON.stringify(storage)) }, /** 导出excel文件操作 */ @@ -1336,7 +1328,6 @@ export default { :deep .seled{ - // background-color: #d9ecff7d !important; background-color: #51dd397d !important; color: black; @@ -1344,7 +1335,6 @@ export default { } :deep .rowSeled{ - // background-color: #d9ecff7d !important; background-color: #ffa5a55e !important; color: black; @@ -1363,39 +1353,6 @@ export default { } - -// :deep .el-table__body tr.current-row>td { -// background: none !important; -// } - -// :deep .el-table__body tr:hover > td { -// background-color: pink !important; -// } - -// :deep .el-table__body .el-table-column--selection { -// .parent { -// background-color: pink !important; -// } -// } - - -// 更改el-table全局的css -// 设置选中行的背景颜色 -// .el-table .selected-row-color { -// background-color: #b8dcff !important; -// } -// // Tags1 --> 这一行样式针对的是操作列中没有进行【fixed】的表格，覆盖hover-row的颜色，实现选中行即添加背景色 -// .el-table--enable-row-hover .el-table__body tr.selected-row-color:hover > td { -// background-color: #b8dcff !important; -// } -// // Tabs2 --> 这两行样式针对的是操作列中存在进行【fixed】固定的表格，强制覆盖hover-row的颜色 -// .el-table__body-wrapper .el-table__body tr.selected-row-color.hover-row > td { -// background-color: #b8dcff !important; -// } -// .el-table__fixed-body-wrapper .el-table__body tr.selected-row-color.hover-row > td { -// background-color: #b8dcff !important; -// } - .drag-ghost { background-color: #e7e7e77d; } .drag-chosen { background-color: #e7e7e77d; } diff --git a/src/views/emis/EmisBaseTools/TanexPrinterPanel.vue b/src/views/emis/EmisBaseTools/TanexPrinterPanel.vue index 2dc34537..0b8bf0ff 100644 --- a/src/views/emis/EmisBaseTools/TanexPrinterPanel.vue +++ b/src/views/emis/EmisBaseTools/TanexPrinterPanel.vue @@ -25,7 +25,7 @@ /> -
+
子单范围: - @@ -296,7 +296,7 @@ } // 打印子单 - if(this.selTplCode=="TAN-GC-130"){ + if(this.selTplCode=="TAN-GC-130" || this.selTplCode=="GC-NOLOGO"){ for(let i=0;i @@ -23,7 +24,7 @@ - +
diff --git a/src/views/emis/emisPrintTpl/emisPrintTplForm.vue b/src/views/emis/emisPrintTpl/emisPrintTplForm.vue index 49344e42..4f6700e1 100644 --- a/src/views/emis/emisPrintTpl/emisPrintTplForm.vue +++ b/src/views/emis/emisPrintTpl/emisPrintTplForm.vue @@ -57,11 +57,13 @@ --> - + + diff --git a/src/views/emis/emisPrintTpl/index.vue b/src/views/emis/emisPrintTpl/index.vue index d44f73ab..34e28979 100644 --- a/src/views/emis/emisPrintTpl/index.vue +++ b/src/views/emis/emisPrintTpl/index.vue @@ -33,6 +33,7 @@ @queryTable="getList" @selection-change="handleSelectionChange" @sort-change="handleSortChange" + :default-sort="{prop: 'orderNum', order: 'descending'}" >
@@ -146,6 +147,7 @@ + diff --git a/src/views/emis/emisSettleBill/CenterInvoiceRecordDeal.vue b/src/views/emis/emisSettleBill/CenterInvoiceRecordDeal.vue index f1cbf433..778a7645 100644 --- a/src/views/emis/emisSettleBill/CenterInvoiceRecordDeal.vue +++ b/src/views/emis/emisSettleBill/CenterInvoiceRecordDeal.vue @@ -7,7 +7,7 @@ - + -
运单号 - 账单号 +
- - - - 开票主体 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + 开票主体 + + + + + + + +
+
开票抬头:{{ form.salerCompanyTaxNo }} {{ form.salerCompanyName }}
+
开票地址:{{ form.salerCompanyAddress }} {{ form.salerCompanyTel }}
+
开票银行:{{ form.salerBankName }} {{ form.salerBankAccNo }}
+
+ + + + + + -
- + + +
+
开票明细
{{ $t('添加货物') }} + >{{ $t('添加货物明细') }} - -
- -
- +
+ + （申请开票金额:￥{{ invoiceApplyData.applyMoney }}) - + - - -
@@ -368,7 +262,6 @@ export default { if(this.applyId !=null) { this.loading = true; getEmisSettleInvoiceRecord(this.applyId).then(response => { - this.invoiceApplyData = response.data; this.form.applySeqNo=this.invoiceApplyData.applySeqNo; this.form.companyName=this.invoiceApplyData.companyName; @@ -379,6 +272,7 @@ export default { this.form.bankAccNo=this.invoiceApplyData.bankAccNo; this.form.contact=this.invoiceApplyData.contact; this.form.phone=this.invoiceApplyData.phone; + this.form.remark=this.invoiceApplyData.remark; console.log("===>getEmisSettleInvoiceRecord==>",this.form) this.loading = false; }); diff --git a/src/views/emis/emisSettleInvoiceRecord/OpenBillForm.vue b/src/views/emis/emisSettleInvoiceRecord/OpenBillForm.vue index 44dadefb..c4af7412 100644 --- a/src/views/emis/emisSettleInvoiceRecord/OpenBillForm.vue +++ b/src/views/emis/emisSettleInvoiceRecord/OpenBillForm.vue @@ -1,36 +1,43 @@