This commit is contained in:
linfso 2024-08-09 10:42:17 +08:00
parent 88370e4780
commit ce0d49b41e
7 changed files with 41 additions and 20 deletions

View File

@ -95,8 +95,8 @@
</slot>
</div>
<div @mouseenter="initKeyDownEvent" @mouseleave="removeKeyDownEvent">
<orig-table ref="table" :key="refreshKeyId" tabindex="0" :config="config" v-dragColumn v-dragSelect class="xd-tb-wrapper" />
<!-- 统计数据 -->
<orig-table ref="table" :key="refreshKeyId" tabindex="0" :config="config" v-dragSelect class="xd-tb-wrapper" />
<!-- 统计数据 v-dragColumn-->
<div v-if="showStatInfo" style="display: inline-flex; width: 100%;">
<div style="width:40%" >
@ -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)
}

View File

@ -170,7 +170,7 @@
</el-table-column>
<el-table-column :label="$t('开票状态')" align="center" prop="openBillStatus" width="100" >
<template slot-scope="scope">
<el-tag v-if="scope.row.paymentStatus=='0'" type="error">未开票</el-tag>
<el-tag v-if="scope.row.openBillStatus=='0'" type="error">未开票</el-tag>
<el-tag v-if="scope.row.openBillStatus=='1'" type="success">已开票</el-tag>
<el-tag v-if="scope.row.openBillStatus=='2'" type="warning">部分开票</el-tag>
<el-tag v-if="scope.row.openBillStatus=='3'" type="warning">不开票</el-tag>

View File

@ -181,7 +181,7 @@
</el-table-column>
<el-table-column :label="$t('开票状态')" align="center" prop="openBillStatus" width="100" >
<template slot-scope="scope">
<el-tag v-if="scope.row.paymentStatus=='0'" type="error">未开票</el-tag>
<el-tag v-if="scope.row.openBillStatus=='0'" type="error">未开票</el-tag>
<el-tag v-if="scope.row.openBillStatus=='1'" type="success">已开票</el-tag>
<el-tag v-if="scope.row.openBillStatus=='2'" type="warning">部分开票</el-tag>
<el-tag v-if="scope.row.openBillStatus=='3'" type="warning">不开票</el-tag>

View File

@ -163,7 +163,7 @@
</el-table-column>
<el-table-column :label="$t('开票状态')" align="center" prop="openBillStatus" width="100" >
<template slot-scope="scope">
<el-tag v-if="scope.row.paymentStatus=='0'" type="error">未开票</el-tag>
<el-tag v-if="scope.row.openBillStatus=='0'" type="error">未开票</el-tag>
<el-tag v-if="scope.row.openBillStatus=='1'" type="success">已开票</el-tag>
<el-tag v-if="scope.row.openBillStatus=='2'" type="warning">部分开票</el-tag>
<el-tag v-if="scope.row.openBillStatus=='3'" type="warning">不开票</el-tag>

View File

@ -65,6 +65,10 @@
<XdTable
slot="pageContent"
slot-scope="slotProps"
:height="(slotProps.contentHeight-100)+'px'"
v-loading="loading"
border
size="mini"
@ -77,9 +81,10 @@
@selection-change="handleSelectionChange"
@sort-change="handleSortChange"
@row-dblclick="handleSendDbClick"
show-summary
:summary-method="getSummaries"
>
<!-- show-summary
:summary-method="getSummaries" -->
<div slot="toolbar">
<el-row :gutter="10" class="mb8">
@ -145,6 +150,7 @@
</el-row>
</div>
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('账单编号')" align="center" prop="settleBillNo" width="170" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('账单名称')" align="left" prop="settleBillName" width="200" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('账单月份')" align="center" prop="billMonth" width="80" />
@ -162,7 +168,7 @@
</el-table-column>
<el-table-column :label="$t('开票状态')" align="center" prop="openBillStatus" width="100" >
<template slot-scope="scope">
<el-tag v-if="scope.row.paymentStatus=='0'" type="error">未开票</el-tag>
<el-tag v-if="scope.row.openBillStatus=='0'" type="error">未开票</el-tag>
<el-tag v-if="scope.row.openBillStatus=='1'" type="success">已开票</el-tag>
<el-tag v-if="scope.row.openBillStatus=='2'" type="warning">部分开票</el-tag>
<el-tag v-if="scope.row.openBillStatus=='3'" type="warning">不开票</el-tag>
@ -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();

View File

@ -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 @@
<!-- <el-table-column :label="$t('税类型')" align="center" prop="realTaxType" min-width="100" /> -->
<!-- <el-table-column :label="$t('开票上限')" align="center" prop="openMoneyMax" min-width="100" /> -->
<!-- <el-table-column :label="$t('实际开票金额')" align="center" prop="openMoney" min-width="150" :show-overflow-tooltip="true" /> -->
<el-table-column :label="$t('发票号')" align="center" prop="invoiceNo" min-width="170" :show-overflow-tooltip="true" />
<!-- <el-table-column :label="$t('发票号')" align="center" prop="invoiceNo" min-width="170" :show-overflow-tooltip="true" /> -->
<el-table-column :label="$t('发票文件')" align="center" prop="filePath" min-width="170" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('申请序号')" align="center" prop="applySeqNo" min-width="170" :show-overflow-tooltip="true"/>
@ -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;

View File

@ -196,7 +196,7 @@
</div>
<div slot="statInfo" style="font-size: 13px;">
总票数:<span class="statInfoValue">{{queryStatInfoMap?queryStatInfoMap.totalNum:0}}</span>,
总票数:<span class="statInfoValue">{{total}}</span>,
总运费:<span class="statInfoValue">{{queryStatInfoMap?queryStatInfoMap.totalBillFee:0}}</span>
</div>