md
This commit is contained in:
parent
ce0d49b41e
commit
bd745b2e28
@ -43,7 +43,7 @@ export default {
|
||||
let h2 = this.$refs.pageHeader.offsetHeight;
|
||||
let contentHeight = h1 - h2-190;
|
||||
this.contentHeight = contentHeight;
|
||||
// console.log("====this.contentHeight==>",this.contentHeight);
|
||||
console.log("====this.contentHeight==>",this.contentHeight);
|
||||
}, 500),
|
||||
},
|
||||
};
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<div class="xd-table" :id="tableId" >
|
||||
<div class="xd-table full-block flex-layout" :id="tableId" >
|
||||
|
||||
<div class="table-operate-btn-content" v-show="showOperateButton">
|
||||
<slot name="operateBtnContent">
|
||||
@ -95,38 +95,42 @@
|
||||
</slot>
|
||||
</div>
|
||||
<div @mouseenter="initKeyDownEvent" @mouseleave="removeKeyDownEvent">
|
||||
<orig-table ref="table" :key="refreshKeyId" tabindex="0" :config="config" v-dragSelect class="xd-tb-wrapper" />
|
||||
<div class="flex-auto">
|
||||
<orig-table ref="table" :key="refreshKeyId" tabindex="0" :config="config" v-dragSelect class="xd-tb-wrapper" />
|
||||
</div>
|
||||
<!-- 统计数据 v-dragColumn-->
|
||||
|
||||
<div v-if="showStatInfo" style="display: inline-flex; width: 100%;">
|
||||
<div style="width:40%" >
|
||||
<div class="pagination-container"><slot name="statInfo" /></div>
|
||||
</div>
|
||||
<div v-if="showPagination" style="width:60%;overflow: hidden;" >
|
||||
<pagination
|
||||
v-show="total>0 "
|
||||
:total="total"
|
||||
:page-sizes="[10,20,50,100,300,500,1000,2000,5000]"
|
||||
:page.sync="queryParams.pageNum"
|
||||
:limit.sync="queryParams.pageSize"
|
||||
:page-size="queryParams.pageSize"
|
||||
@pagination="queryTable"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div v-else >
|
||||
<div v-if="showPagination">
|
||||
<div class="flex-none">
|
||||
<div v-if="showStatInfo" style="display: inline-flex; width: 100%;">
|
||||
<div style="width:40%" >
|
||||
<div class="pagination-container"><slot name="statInfo" /></div>
|
||||
</div>
|
||||
<div v-if="showPagination" style="width:60%;overflow: hidden;" >
|
||||
<pagination
|
||||
v-show="total>0 "
|
||||
:total="total"
|
||||
:page-sizes="[5,10,20,50,100,300,500,1000,2000,5000]"
|
||||
:page-sizes="[10,20,50,100,300,500,1000,2000,5000]"
|
||||
:page.sync="queryParams.pageNum"
|
||||
:limit.sync="queryParams.pageSize"
|
||||
:page-size="queryParams.pageSize"
|
||||
@pagination="queryTable"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div v-else >
|
||||
<div v-if="showPagination">
|
||||
<pagination
|
||||
v-show="total>0 "
|
||||
:total="total"
|
||||
:page-sizes="[5,10,20,50,100,300,500,1000,2000,5000]"
|
||||
:page.sync="queryParams.pageNum"
|
||||
:limit.sync="queryParams.pageSize"
|
||||
:page-size="queryParams.pageSize"
|
||||
@pagination="queryTable"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
@ -1399,6 +1403,22 @@ export default {
|
||||
cursor:pointer;
|
||||
}
|
||||
|
||||
.full-block{
|
||||
height:100%;
|
||||
width:100%;
|
||||
overflow:hidden;
|
||||
}
|
||||
.flex-layout{
|
||||
display:flex;
|
||||
flex-direction:column;
|
||||
}
|
||||
.flex-auto{
|
||||
flex:1 1 auto
|
||||
}
|
||||
.flex-none{
|
||||
flex:none
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
|
||||
|
||||
@ -92,4 +92,10 @@ export default {
|
||||
display: flex !important;
|
||||
flex-wrap: wrap !important;
|
||||
}
|
||||
|
||||
.el-tabs__content{
|
||||
height: calc(100vh - 110px);
|
||||
overflow-y: auto;
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<template>
|
||||
<XdPageContainer >
|
||||
<SearchForm slot="pageHeader" :model="queryParams" ref="queryForm" size="mini" :maxShow="20" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
|
||||
<el-form-item label="" prop="queryCode" label-width="80px">
|
||||
<el-form-item label="" prop="queryCode" label-width="80px">
|
||||
<div slot="label">
|
||||
<el-radio-group class="query-label" v-model="queryOrderType">
|
||||
<el-radio :key="1" label="1">运单号</el-radio>
|
||||
@ -61,13 +61,12 @@
|
||||
<!-- 账单表 -->
|
||||
<!-- slot-scope="slotProps" -->
|
||||
<!-- :height="(slotProps.contentHeight)+'px'" -->
|
||||
<!-- slot="pageContent"
|
||||
slot-scope="slotProps"
|
||||
:height="(slotProps.contentHeight)+'px'" -->
|
||||
|
||||
<XdTable
|
||||
|
||||
slot="pageContent"
|
||||
slot-scope="slotProps"
|
||||
:height="(slotProps.contentHeight-100)+'px'"
|
||||
|
||||
|
||||
v-loading="loading"
|
||||
border
|
||||
@ -346,7 +345,6 @@ export default {
|
||||
confirmSiteCode: null,
|
||||
remark: null,
|
||||
delFlag: null,
|
||||
queryOrderType:null,
|
||||
params:{
|
||||
billCode:null,
|
||||
canOpenBill:1,
|
||||
@ -359,6 +357,11 @@ export default {
|
||||
created() {
|
||||
this.queryParams.openBillStatus='0';
|
||||
this.queryOrderType="1";
|
||||
|
||||
// if(this.$store.getters.ownerSiteCode !='88888'){
|
||||
// this.queryParams.salesmen=this.$store.getters.empName
|
||||
// }
|
||||
|
||||
this.getList();
|
||||
},
|
||||
|
||||
@ -377,9 +380,6 @@ export default {
|
||||
this.queryParams.settleBillNo=this.queryParams.queryCode;
|
||||
}
|
||||
|
||||
if(this.$store.getters.ownerSiteCode !='88888'){
|
||||
this.queryParams.salesmen=this.$store.getters.empName
|
||||
}
|
||||
this.queryParams=this.addDateRange(this.queryParams, this.dateTimeRange);
|
||||
listEmisSettleBill(this.queryParams).then(response => {
|
||||
this.emisSettleBillList = response.rows;
|
||||
|
||||
@ -405,16 +405,23 @@
|
||||
<el-tag v-if="scope.row.invoiceStatus=='0'" type="info">未开票</el-tag>
|
||||
<el-tag v-if="scope.row.invoiceStatus=='1'" type="success">开票中</el-tag>
|
||||
<el-tag v-if="scope.row.invoiceStatus=='2'" type="warning">已开票</el-tag>
|
||||
<el-tag v-if="scope.row.invoiceStatus=='3'" type="warning">开票异常</el-tag>
|
||||
<el-tag v-if="scope.row.invoiceStatus=='3'" type="error">开票异常</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
|
||||
<!-- <el-table-column :label="$t('客户编码')" align="center" prop="customerCode" min-width="100" /> -->
|
||||
<!-- <el-table-column :label="$t('客户名称')" align="center" prop="customerName" min-width="100" /> -->
|
||||
<el-table-column :label="$t('账单编号')" align="center" prop="settleBillNo" min-width="170" />
|
||||
<el-table-column :label="$t('账单名称')" align="center" prop="settleBillName" min-width="100" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('账单编号')" align="center" prop="settleBillNo" min-width="170" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('账单名称')" align="center" prop="settleBillName" min-width="170" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('申请金额')" align="center" prop="applyMoney" min-width="100" />
|
||||
<el-table-column :label="$t('开票类型')" align="center" prop="invoiceType" min-width="100" >
|
||||
<template slot-scope="scope">
|
||||
<el-tag v-if="scope.row.invoiceType=='1'" type="info">增值税电子普通发票</el-tag>
|
||||
<el-tag v-if="scope.row.invoiceType=='2'" type="info">增值税普通发票</el-tag>
|
||||
<el-tag v-if="scope.row.invoiceType=='3'" type="info">增值税专用发票</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- <el-table-column :label="$t('开票类型')" align="center" prop="invoiceType" min-width="100" /> -->
|
||||
<el-table-column :label="$t('开票抬头')" align="center" prop="companyName" min-width="100" :show-overflow-tooltip="true" />
|
||||
<el-table-column :label="$t('开票税号')" align="center" prop="companyTaxNo" min-width="100" :show-overflow-tooltip="true"/>
|
||||
@ -427,9 +434,7 @@
|
||||
<el-table-column :label="$t('开票金额')" align="center" prop="openMoney" min-width="100" />
|
||||
<el-table-column :label="$t('发票号')" align="center" prop="invoiceNo" min-width="100" />
|
||||
<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"/>
|
||||
|
||||
<el-table-column :label="$t('申请人')" align="center" prop="applyManName" min-width="100" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('申请站点')" align="center" prop="applySiteName" min-width="100" :show-overflow-tooltip="true"/>
|
||||
|
||||
@ -481,7 +486,7 @@ export default {
|
||||
components: { elDateSimplePicker,OpenBillForm },
|
||||
props: {
|
||||
invoiceStatus:{
|
||||
type: String,
|
||||
type: [String,Number],
|
||||
required: false
|
||||
},
|
||||
|
||||
@ -570,6 +575,12 @@ export default {
|
||||
},
|
||||
};
|
||||
},
|
||||
watch: {
|
||||
invoiceStatus(newVal,oldVal) {
|
||||
this.queryParams.invoiceStatus=this.invoiceStatus;
|
||||
this.getList();
|
||||
},
|
||||
},
|
||||
created() {
|
||||
this.queryParams.invoiceStatus=this.invoiceStatus;
|
||||
this.getList();
|
||||
@ -578,12 +589,7 @@ export default {
|
||||
handleSendDbClick(row){
|
||||
this.$emit("onSelect",row);
|
||||
},
|
||||
watch: {
|
||||
invoiceStatus(newVal,oldVal) {
|
||||
this.queryParams.invoiceStatus=this.invoiceStatus;
|
||||
this.getList();
|
||||
},
|
||||
},
|
||||
|
||||
handleRefuse(row) {
|
||||
const ids = row.id || this.ids;
|
||||
this.$prompt('请输入驳回原因', "操作确认", {
|
||||
|
||||
@ -2,15 +2,15 @@
|
||||
<XdPageContainer >
|
||||
<SearchForm slot="pageHeader" :model="queryParams" ref="queryForm" size="small" :maxShow="3" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
|
||||
|
||||
<el-form-item label="" prop="settleBillNo" label-width="80px">
|
||||
<el-form-item label="" prop="queryCode" label-width="80px">
|
||||
<div slot="label">
|
||||
<el-radio-group class="query-label" v-model="queryParams.queryOrderType">
|
||||
<el-radio-group class="query-label" v-model="queryOrderType">
|
||||
<el-radio :key="1" label="1">运单号</el-radio>
|
||||
<el-radio :key="2" label="2">账单号</el-radio>
|
||||
</el-radio-group>
|
||||
</div>
|
||||
<XdTextareaInput
|
||||
v-model="queryParams.settleBillNo"
|
||||
v-model="queryParams.queryCode"
|
||||
:placeholder="$t('多个流水号逗号或换行隔开')"
|
||||
clearable
|
||||
:rows="2"
|
||||
@ -25,84 +25,12 @@
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<!-- <el-form-item label="申请序号" prop="applySeqNo">
|
||||
<el-input
|
||||
v-model="queryParams.applySeqNo"
|
||||
:placeholder="$t('申请序号')"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item> -->
|
||||
<!-- <el-form-item label="申请时间" prop="applyDate">
|
||||
<el-date-picker clearable
|
||||
v-model="queryParams.applyDate"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd HH:mm:ss"
|
||||
:placeholder="$t('申请时间')">
|
||||
</el-date-picker>
|
||||
</el-form-item> -->
|
||||
<!-- <el-form-item label="" prop="applyManCode">
|
||||
<el-input
|
||||
v-model="queryParams.applyManCode"
|
||||
:placeholder="$t('审核人')"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="" prop="applySiteCode">
|
||||
<el-input
|
||||
v-model="queryParams.applySiteCode"
|
||||
:placeholder="$t('审核站点')"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="" prop="customerCode">
|
||||
<el-input
|
||||
v-model="queryParams.customerCode"
|
||||
:placeholder="$t('客户编码')"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="" prop="customerName">
|
||||
<el-input
|
||||
v-model="queryParams.customerName"
|
||||
:placeholder="$t('客户名称')"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="" prop="settleBillNo">
|
||||
<el-input
|
||||
v-model="queryParams.settleBillNo"
|
||||
:placeholder="$t('账单号编号')"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="" prop="settleBillName">
|
||||
<el-input
|
||||
v-model="queryParams.settleBillName"
|
||||
:placeholder="$t('账单名称')"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="" prop="applyMoney">
|
||||
<el-input
|
||||
v-model="queryParams.applyMoney"
|
||||
:placeholder="$t('申请开票金额')"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
-->
|
||||
<el-form-item label="开票状态" prop="invoiceStatus">
|
||||
<el-select clearable v-model="queryParams.invoiceStatus" placeholder="请选择" style="width:100%">
|
||||
<el-option label="未开票" :value="0"></el-option>
|
||||
<el-option label="已开票" :value="1"></el-option>
|
||||
<el-option label="开票异常" :value="2"></el-option>
|
||||
<el-option label="开票中" :value="1"></el-option>
|
||||
<el-option label="已开票" :value="2"></el-option>
|
||||
<el-option label="开票异常" :value="3"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
@ -427,24 +355,31 @@
|
||||
<el-table-column :label="$t('开票状态')" align="center" prop="invoiceStatus" width="100" >
|
||||
<template slot-scope="scope">
|
||||
<el-tag v-if="scope.row.invoiceStatus=='0'" type="info">未开票</el-tag>
|
||||
<el-tag v-if="scope.row.invoiceStatus=='1'" type="success">开票中</el-tag>
|
||||
<el-tag v-if="scope.row.invoiceStatus=='2'" type="warning">已开票</el-tag>
|
||||
<el-tag v-if="scope.row.invoiceStatus=='3'" type="warning">开票异常</el-tag>
|
||||
<el-tag v-if="scope.row.invoiceStatus=='1'" type="warning">开票中</el-tag>
|
||||
<el-tag v-if="scope.row.invoiceStatus=='2'" type="success">已开票</el-tag>
|
||||
<el-tag v-if="scope.row.invoiceStatus=='3'" type="error">开票异常</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('审核状态')" align="center" prop="blAudit" width="100" >
|
||||
<template slot-scope="scope">
|
||||
<el-tag v-if="scope.row.blAudit=='0'" type="info">未审核</el-tag>
|
||||
<el-tag v-if="scope.row.blAudit=='1'" type="success">审核通过</el-tag>
|
||||
<el-tag v-if="scope.row.blAudit=='2'" type="warning">审核不通过</el-tag>
|
||||
<el-tag v-if="scope.row.blAudit=='2'" type="error">审核不通过</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- <el-table-column :label="$t('状态描述')" align="center" prop="invoiceStatusDesc" min-width="100" :show-overflow-tooltip="true"/> -->
|
||||
<!-- <el-table-column :label="$t('客户编码')" align="center" prop="customerCode" min-width="100" /> -->
|
||||
<!-- <el-table-column :label="$t('客户名称')" align="center" prop="customerName" min-width="100" /> -->
|
||||
<el-table-column :label="$t('账单编号')" align="center" prop="settleBillNo" min-width="170" />
|
||||
<el-table-column :label="$t('账单编号')" align="center" prop="settleBillNo" min-width="170" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('申请金额')" align="center" prop="applyMoney" min-width="100" />
|
||||
<!-- <el-table-column :label="$t('开票类型')" align="center" prop="invoiceType" min-width="100" /> -->
|
||||
<el-table-column :label="$t('开票类型')" align="center" prop="invoiceType" min-width="100" >
|
||||
<template slot-scope="scope">
|
||||
<el-tag v-if="scope.row.invoiceType=='1'" type="info">增值税电子普通发票</el-tag>
|
||||
<el-tag v-if="scope.row.invoiceType=='2'" type="info">增值税普通发票</el-tag>
|
||||
<el-tag v-if="scope.row.invoiceType=='3'" type="info">增值税专用发票</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column :label="$t('开票抬头')" align="center" prop="companyName" min-width="170" :show-overflow-tooltip="true" />
|
||||
<el-table-column :label="$t('开票税号')" align="center" prop="companyTaxNo" min-width="170" :show-overflow-tooltip="true"/>
|
||||
<!-- <el-table-column :label="$t('开票电话')" align="center" prop="companyTel" min-width="100" :show-overflow-tooltip="true"/> -->
|
||||
@ -456,19 +391,14 @@
|
||||
<!-- <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="filePath" min-width="170" :show-overflow-tooltip="true"/>
|
||||
|
||||
<el-table-column :label="$t('申请序号')" align="center" prop="applySeqNo" min-width="170" :show-overflow-tooltip="true"/>
|
||||
|
||||
<el-table-column :label="$t('申请人')" align="center" prop="createByName" min-width="100" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('申请站点')" align="center" prop="createSiteName" min-width="100" :show-overflow-tooltip="true"/>
|
||||
|
||||
<!-- <el-table-column :label="$t('纸质发票邮寄地址')" align="center" prop="recieveAddress" min-width="100" /> -->
|
||||
<el-table-column :label="$t('邮箱')" align="center" prop="email" min-width="100" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" :show-overflow-tooltip="true"/>
|
||||
|
||||
<el-table-column :label="$t('审核日期')" align="center" prop="auditDate" min-width="170" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('审核人')" align="center" prop="auditManName" min-width="100" />
|
||||
<!-- <el-table-column :label="$t('审核站点')" align="center" prop="auditSiteCode" min-width="100" /> -->
|
||||
<el-table-column :label="$t('操作人')" align="center" prop="opManName" min-width="100" />
|
||||
<!-- <el-table-column :label="$t('操作时间')" align="center" prop="opDate" min-width="100" /> -->
|
||||
<!-- <el-table-column :label="$t('操作站点')" align="center" prop="opSiteCode" min-width="100" /> -->
|
||||
@ -530,6 +460,8 @@ export default {
|
||||
// 开票记录表表格数据
|
||||
emisSettleInvoiceRecordList: [],
|
||||
|
||||
queryOrderType:null,
|
||||
|
||||
currentId:null,
|
||||
openForm: false,
|
||||
titleForm: "",
|
||||
@ -552,6 +484,9 @@ export default {
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 20,
|
||||
|
||||
queryCode:null,
|
||||
|
||||
applySeqNo: null,
|
||||
applyDate: null,
|
||||
applyManCode: null,
|
||||
@ -590,10 +525,14 @@ export default {
|
||||
openChStatusDesc: null,
|
||||
openComCode: null,
|
||||
delFlag: null,
|
||||
params:{
|
||||
billCode:null,
|
||||
}
|
||||
},
|
||||
};
|
||||
},
|
||||
created() {
|
||||
this.queryOrderType="1";
|
||||
this.getList();
|
||||
},
|
||||
methods: {
|
||||
@ -602,6 +541,17 @@ export default {
|
||||
},
|
||||
/** 查询开票记录表列表 */
|
||||
getList() {
|
||||
|
||||
// 按运单查询时的处理
|
||||
if(this.queryOrderType=="1"){
|
||||
this.queryParams.params.billCode=this.queryParams.queryCode;
|
||||
this.queryParams.settleBillNo=null;
|
||||
}
|
||||
else if(this.queryOrderType=="2"){
|
||||
this.queryParams.params.billCode=null;
|
||||
this.queryParams.settleBillNo=this.queryParams.queryCode;
|
||||
}
|
||||
|
||||
this.loading = true;
|
||||
listEmisSettleInvoiceRecord(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
|
||||
this.emisSettleInvoiceRecordList = response.rows;
|
||||
|
||||
@ -157,7 +157,7 @@
|
||||
highlight-current-row
|
||||
|
||||
show-summary :summary-method="getSummaries"
|
||||
>
|
||||
>
|
||||
|
||||
<div slot="toolbar" >
|
||||
<el-row :gutter="10" class="mb8">
|
||||
@ -1057,8 +1057,17 @@ export default {
|
||||
},
|
||||
// 排序 查询字段是表格中字段名字 动态取值排序顺序
|
||||
handleSortChange(column) {
|
||||
this.queryParams.orderByColumn = column.prop;
|
||||
this.queryParams.isAsc = column.order;
|
||||
// this.queryParams.orderByColumn = column.prop;
|
||||
// this.queryParams.isAsc = column.order;
|
||||
|
||||
console.log("==column.prop==>",column.prop);
|
||||
if(column.prop=='billCode'){
|
||||
this.queryParams.params.orderByColumn = 'a.billCode';
|
||||
}
|
||||
else if(column.prop=='waybillDetail.sendDate'){
|
||||
this.queryParams.params.orderByColumn = 'sendDate';
|
||||
}
|
||||
|
||||
this.getList();
|
||||
},
|
||||
|
||||
|
||||
@ -499,7 +499,8 @@ export default {
|
||||
remark: null,
|
||||
params:{
|
||||
queryOrderType:1,
|
||||
queryOrderDateType:1
|
||||
queryOrderDateType:1,
|
||||
isQueryPrintOrder:null,
|
||||
}
|
||||
},
|
||||
};
|
||||
@ -567,6 +568,8 @@ export default {
|
||||
qParam={...this.queryParams}
|
||||
}
|
||||
|
||||
qParam.params.isQueryPrintOrder=1;
|
||||
|
||||
return qParam;
|
||||
},
|
||||
/** 查询运单列表列表 */
|
||||
|
||||
Loading…
Reference in New Issue
Block a user