@@ -1028,7 +1028,13 @@ export default {
arr.splice(newIndex-1, 0, currCol);
that.storageList = arr;
- that.updateTable();
+
+ console.log("====>setHeaderSortable===>",that.storageList)
+ this.storeTplToLocal(that.storageList)
+ this.initStorage()
+ this.updateTable()
+ this.initSort();
+ // that.updateTable();
// this.refreshKeyId=Math.random().toString(36).substring(3,10);
// const currCol = vnode.context.storageList.splice(oldIndex-1, 1)[0];
@@ -1175,10 +1181,11 @@ export default {
list = storage[this.saveStorageName] ? storage[this.saveStorageName] : []
}
+ // || node.componentOptions.propsData.type
// 不管是否初次还是要做一下处理,万一页面有修改,做一下更新,以最新的node节点数组为准
this.$vnode.componentOptions.children.forEach(node => {
// 以prop为准,因为可能会改文本
- if (!(!node.componentOptions || node.componentOptions.propsData.type) && list.findIndex(i => i.prop === node.componentOptions.propsData.prop) < 0) {
+ if (!(!node.componentOptions ) && 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) {
@@ -1225,10 +1232,10 @@ export default {
if (item.show) {
const node = this.$vnode.componentOptions.children.find(n => n.componentOptions && n.componentOptions.propsData.prop === item.prop)
if (node) {
- // let nodeItem=node.componentOptions.propsData;
- // if(item.label != nodeItem.label){
- // item.label=nodeItem.label;
- // }
+ let nodeItem=node.componentOptions.propsData;
+ if(item.label != nodeItem.label){
+ item.label=nodeItem.label;
+ }
node.componentOptions.propsData.fixed = item.fixed
childrenNodes.push(node)
}
diff --git a/src/views/emis/emisSettleBill/panel/ChargeBillMoneyPanel.vue b/src/views/emis/emisSettleBill/panel/ChargeBillMoneyPanel.vue
index e1d90294..cbc0c40b 100644
--- a/src/views/emis/emisSettleBill/panel/ChargeBillMoneyPanel.vue
+++ b/src/views/emis/emisSettleBill/panel/ChargeBillMoneyPanel.vue
@@ -170,7 +170,7 @@
- 未开票
+ 未开票
已开票
部分开票
不开票
diff --git a/src/views/emis/emisSettleBill/panel/ChargeBillMonthPanel.vue b/src/views/emis/emisSettleBill/panel/ChargeBillMonthPanel.vue
index f736db22..0d19428d 100644
--- a/src/views/emis/emisSettleBill/panel/ChargeBillMonthPanel.vue
+++ b/src/views/emis/emisSettleBill/panel/ChargeBillMonthPanel.vue
@@ -181,7 +181,7 @@
- 未开票
+ 未开票
已开票
部分开票
不开票
diff --git a/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue b/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue
index c4ecf4ae..6d47c1da 100644
--- a/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue
+++ b/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue
@@ -163,7 +163,7 @@
- 未开票
+ 未开票
已开票
部分开票
不开票
diff --git a/src/views/emis/emisSettleBill/panel/SiteWaitOpenBillPanel.vue b/src/views/emis/emisSettleBill/panel/SiteWaitOpenBillPanel.vue
index 813f971d..b8bf04b4 100644
--- a/src/views/emis/emisSettleBill/panel/SiteWaitOpenBillPanel.vue
+++ b/src/views/emis/emisSettleBill/panel/SiteWaitOpenBillPanel.vue
@@ -65,6 +65,10 @@
+
@@ -145,6 +150,7 @@
+
@@ -162,7 +168,7 @@
- 未开票
+ 未开票
已开票
部分开票
不开票
@@ -385,7 +391,6 @@ export default {
handleNotOpenBill(row) {
const ids = row.id || this.ids;
this.$modal.confirm('确认不开票').then(function() {
- NotOpenBill
return confirmNotOpenBillBySite(ids);
}).then(() => {
this.getList();
diff --git a/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordApplyListPanel.vue b/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordApplyListPanel.vue
index ec3a265c..97b192a3 100644
--- a/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordApplyListPanel.vue
+++ b/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordApplyListPanel.vue
@@ -344,7 +344,7 @@
slot="pageContent"
slot-scope="slotProps"
- :height="(slotProps.contentHeight)+'px'"
+ :height="(slotProps.contentHeight-100)+'px'"
v-loading="loading"
border
@@ -454,7 +454,7 @@
-
+
@@ -648,10 +648,19 @@ export default {
this.titleForm = "修改";
},
handleDownPDF(row) {
- const ids = row.id || this.ids;
- this.currentId= row.id;
+ // const ids = row.id || this.ids;
+ // this.currentId= row.id;
// this.openForm = true;
// this.titleForm = "修改";
+ // 根据序号查询到航信记录
+
+
+ },
+ downLink(url){
+ var elemIF = document.createElement("iframe");
+ elemIF.src = url;
+ elemIF.style.display = "none";
+ document.body.appendChild(elemIF);
},
handleView(row) {
this.id=row.id;
diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue
index 5d1f825d..41244ef9 100644
--- a/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue
+++ b/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue
@@ -196,7 +196,7 @@