This commit is contained in:
linfso 2024-08-06 00:01:28 +08:00
parent e29513162f
commit c1e549a566
22 changed files with 372 additions and 507 deletions

View File

@ -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}
})
}

View File

@ -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; }

View File

@ -25,7 +25,7 @@
/>
</el-select>
</div>
<div v-if="selTplCode=='TAN-GC-130' && isShowSubBillRange" class="subBillRange" style="display: inline-flex;font-size: 12px; line-height: 28px; font-weight: 600;">
<div v-if="(selTplCode=='TAN-GC-130' || selTplCode=='GC-NOLOGO') && isShowSubBillRange" class="subBillRange" style="display: inline-flex;font-size: 12px; line-height: 28px; font-weight: 600;">
<span >子单范围:
<el-input size="mini" style="width:40px" v-model="subBillStart" type="text" maxlength="4" ></el-input>
-
@ -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<this.orderList.length;i++){
let billCode=this.orderList[i];
let subBillStart=1;
@ -439,7 +439,7 @@
}
// 打印子单
if(this.selTplCode=="TAN-GC-130"){
if(this.selTplCode=="TAN-GC-130"|| this.selTplCode=='GC-NOLOGO'){
for(let i=0;i<this.orderList.length;i++){
let billCode=this.orderList[i];
let subBillStart=1;
@ -555,7 +555,7 @@
}
// 打印子单
if(this.selTplCode=="TAN-GC-130"){
if(this.selTplCode=="TAN-GC-130" || this.selTplCode=='GC-NOLOGO'){
for(let i=0;i<this.orderList.length;i++){
let billCode=this.orderList[i];
// 循环子单范围

View File

@ -15,6 +15,7 @@
@row-click="onRowClick"
:row-key="row => row.goodsCode"
stripe
size="mini"
:row-style="isRed"
element-loading-text="Loading"
>
@ -23,7 +24,7 @@
<span v-text="getIndex(scope.$index)"> </span>
</template>
</el-table-column>
<el-table-column label="货物名称" align="left" prop="goodsName" width="100" />
<el-table-column label="货物名称" align="left" prop="goodsName" width="150" />
</el-table>
</div>

View File

@ -57,11 +57,13 @@
<el-input v-model="form.tplPicUrl" placeholder="请输入在线图片" />
</el-form-item>
</el-col> -->
<!-- <el-col :span="24">
<el-form-item label="0-初始" prop="status">
<el-input v-model="form.status" placeholder="请输入0-初始" />
<el-col :span="24">
<el-form-item label="排序" prop="orderNum">
<el-input v-model="form.orderNum" placeholder="排序" />
</el-form-item>
</el-col> -->
</el-col>
<el-col :span="24">
<el-form-item label="备注" prop="remark">

View File

@ -33,6 +33,7 @@
@queryTable="getList"
@selection-change="handleSelectionChange"
@sort-change="handleSortChange"
:default-sort="{prop: 'orderNum', order: 'descending'}"
>
<!-- :row-style="{ backgroundColor: '#f5f5f5' }" -->
<div slot="toolbar">
@ -146,6 +147,7 @@
<el-table-column :label="$t('模板版本')" align="center" prop="version" width="80" />
<!-- <el-table-column :label="$t('公共模板标识')" align="center" prop="isPublic" min-width="100" /> -->
<el-table-column :label="$t('快递类型')" align="center" prop="expressType" min-width="100" />
<el-table-column :label="$t('排序')" align="center" prop="orderNum" min-width="80" :sort-orders="['descending','ascending']" sortable="custom" />
<!-- <el-table-column :label="$t('在线图片')" align="center" prop="tplPicUrl" min-width="100" /> -->
<!-- <el-table-column :label="$t('0-初始')" align="center" prop="status" min-width="100" /> -->
<!-- <el-table-column :label="$t('删除标志(0代表存在')" align="center" prop="delFlag" min-width="100" /> -->

View File

@ -7,7 +7,7 @@
<CenterInvoiceRecordDealListPanel @onSelect="onSelectApply"> </CenterInvoiceRecordDealListPanel>
</el-tab-pane>
<el-tab-pane label="已开票" name="hasOpenBillList" >
<CenterInvoiceRecordDealListPanel @onSelect="onSelectApply"> </CenterInvoiceRecordDealListPanel>
<CenterInvoiceRecordDealListPanel :invoiceStatus="2" @onSelect="onSelectApply"> </CenterInvoiceRecordDealListPanel>
</el-tab-pane>
<!-- <el-tab-pane label="开票申请记录" name="invoiceApplyList" >
<ChargeBillMoneyPanel @onSelect="onSelectBill"> </ChargeBillMoneyPanel>
@ -65,7 +65,7 @@ export default {
var self=this;
let tabs = self.billTabs;
self.billTabs = tabs.filter(tab => tab.applySeqNo !== applySeqNo);
self.billTabs = tabs.filter(tab => tab.applySeqNo !== targetName);
if(self.billTabs.length>0){
this.activeTab=self.billTabs[self.billTabs.length-1].applySeqNo;
}else{

View File

@ -55,7 +55,7 @@ export default {
var self=this;
let tabs = self.billTabs;
self.billTabs = tabs.filter(tab => tab.applySeqNo !== applySeqNo);
self.billTabs = tabs.filter(tab => tab.applySeqNo !== targetName);
if(self.billTabs.length>0){
this.activeTab=self.billTabs[self.billTabs.length-1].applySeqNo;
}else{

View File

@ -1,24 +1,15 @@
<template>
<div >
<SearchForm :model="queryParams" ref="queryForm" size="mini" :maxShow="20" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<!-- <el-form-item label="账单号" prop="settleBillNo">
<XdTextareaInput
v-model="queryParams.settleBillNo"
:placeholder="$t('多个编号逗号或换行隔开')"
clearable
:rows="1"
/>
</el-form-item> -->
<el-form-item label="" prop="billCode" label-width="80px">
<div slot="label">
<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 :key="2" label="2">账单号</el-radio> -->
</el-radio-group>
</div>
<XdTextareaInput
v-model="queryParams.settleBillNo"
v-model="queryParams.billCode"
:placeholder="$t('多个流水号逗号或换行隔开')"
clearable
:rows="2"

View File

@ -3,6 +3,7 @@
<XdTable v-loading="loading"
border stripe
size="mini"
storageName="emisSettleInvoiceChRecordList_main_240702"
:data="emisSettleInvoiceChRecordList"
:showSearch.sync="showSearch"
:queryParams="queryParams"

View File

@ -2,61 +2,30 @@
<div >
<el-form ref="form" :model="form" size="mini" :rules="rules" label-width="80px">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="8">
<el-form-item label="开票主体" prop="salerCompanyTaxNo">
<span slot="label">
<span style="color: red">开票主体</span>
</span>
<BaseInvoiceInfoPicker v-model="form.salerCompanyTaxNo" placeholder="开票主体" @onChange="onBaseInvoiceInSelect" > </BaseInvoiceInfoPicker>
</el-form-item>
</el-col>
<!-- <el-col :span="8">
<el-form-item label="主体名称" prop="salerCompanyName">
<el-input v-model="form.salerCompanyName" placeholder="请输入销方开票名称" />
</el-form-item>
<!-- <el-col :span="24">
<div>客户开票主体</div>
<div style="padding: 10px;
color: #6f6f6f;
font-size: 14px;
font-weight: 600;
border: 1px solid #eff0f4;
border-radius: 5px;">
<div> <span style="color: blue">抬头:</span>{{ form.companyTaxNo }} {{ form.companyName }}</div>
<div> <span style="color: blue">地址:</span>{{ form.companyAddress }} {{ form.companyTel }} </div>
<div> <span style="color: blue">银行:</span>{{ form.bankName }} {{ form.bankAccNo }}</div>
</div>
</el-col> -->
<el-col :span="8">
<el-form-item label="主体税号" prop="salerCompanyTaxNo">
<el-input v-model="form.salerCompanyTaxNo" placeholder="请输入销方开票税号" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="主体电话" prop="salerCompanyTel">
<el-input v-model="form.salerCompanyTel" placeholder="请输入销方开票电话" disabled/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="主体地址" prop="salerCompanyAddress">
<el-input v-model="form.salerCompanyAddress" placeholder="请输入销方开票地址" disabled/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="主体银行" prop="salerBankName">
<el-input v-model="form.salerBankName" placeholder="请输入销方开户行" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="银行账号" prop="salerBankAccNo">
<el-input v-model="form.salerBankAccNo" placeholder="请输入销方开户账号" disabled/>
</el-form-item>
</el-col>
<!-- <el-col :span="8">
<el-form-item label="电子发票" prop="blEcinv">
<el-select clearable v-model="form.blEcinv" placeholder="请选择" style="width:100%">
<el-option label="是" :value="1"></el-option>
<el-option label="否" :value="0"></el-option>
</el-select>
</el-form-item>
</el-col> -->
<!-- <el-col :span="8">
<el-form-item label="开票类型" prop="invoiceType">
<el-input v-model="form.invoiceType" placeholder="请输入开票类型" />
</el-form-item>
</el-col> -->
<el-col :span="8">
<el-form-item label="开票类型" prop="realInvoiceType">
<el-select clearable v-model="form.realInvoiceType" placeholder="请选择">
<el-col :span="24">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="8">
<el-form-item label="开票主体" prop="salerCompanyTaxNo">
<span slot="label">
<span style="color: red">开票主体</span>
</span>
<BaseInvoiceInfoPicker v-model="form.salerCompanyTaxNo" placeholder="开票主体" @onChange="onBaseInvoiceInSelect" > </BaseInvoiceInfoPicker>
</el-form-item>
<el-form-item label="开票类型" prop="realInvoiceType">
<el-select clearable v-model="form.realInvoiceType" placeholder="请选择" style="width:100%">
<el-option
v-for="dict in dict.type.emis_invoice_ch_type"
:key="dict.value"
@ -65,38 +34,32 @@
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="16">
<div style="padding: 10px;
color: #6f6f6f;
font-size: 14px;
font-weight: 600;
border: 1px solid #eff0f4;
border-radius: 5px;">
<div> <span style="color: blue">开票抬头:</span>{{ form.salerCompanyTaxNo }} {{ form.salerCompanyName }}</div>
<div> <span style="color: blue">开票地址:</span>{{ form.salerCompanyAddress }} {{ form.salerCompanyTel }} </div>
<div> <span style="color: blue">开票银行:</span>{{ form.salerBankName }} {{ form.salerBankAccNo }}</div>
</div>
</el-col>
</el-row>
</el-col>
<!-- <el-col :span="8">
<el-form-item label="开票名称" prop="companyName">
<el-input v-model="form.companyName" placeholder="请输入开票名称" />
<el-form-item label="开票类型" prop="invoiceType">
<el-input v-model="form.invoiceType" placeholder="请输入开票类型" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="开票税号" prop="companyTaxNo">
<el-input v-model="form.companyTaxNo" placeholder="请输入开票税号" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="开票电话" prop="companyTel">
<el-input v-model="form.companyTel" placeholder="请输入开票电话" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="开票地址" prop="companyAddress">
<el-input v-model="form.companyAddress" placeholder="请输入开票地址" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="开户行" prop="bankName">
<el-input v-model="form.bankName" placeholder="请输入开户行" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="开户账号" prop="bankAccNo">
<el-input v-model="form.bankAccNo" placeholder="请输入开户账号" />
</el-form-item>
</el-col>
</el-col> -->
<!--
<el-col :span="8">
<el-form-item label="联系人" prop="contact">
<el-input v-model="form.contact" placeholder="请输入联系人" />
@ -120,8 +83,10 @@
</el-col> -->
<el-col :span="24">
<div style="display:inline-flex">
<!-- <div>申报货物列表</div> -->
<el-form-item label="" prop="dtl" label-width="0px">
<div style="display:inline-flex">
<div>开票明细</div>
<div>
<el-button
size="mini"
@ -129,14 +94,10 @@
style="cursor:hand;font-weight:700;border:1px dotted #e2d8d8;padding: 2px 5px;font-size: 12px;"
class="iconfont icon-add"
@click="handleAddGoods"
>{{ $t('添加货物') }}
>{{ $t('添加货物明细') }}
</el-button>
<!-- <GoodsTablePicker style="cursor:hand;font-weight:700;border:1px dotted #e2d8d8;padding: 2px 5px;font-size: 12px;" v-model="form.goodsType" @onChange="onGoodsChange" placeholder=""></GoodsTablePicker> -->
</div>
</div>
<el-form-item label="开票明细" prop="dtl">
</div>
<el-table
class="cargoList"
:cell-style="{
@ -206,84 +167,17 @@
</el-table>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="10">
<el-form-item label="开票金额" prop="openMoney">
<el-input-number v-model="form.openMoney" placeholder="" :min="1.0" :controls="false" :precision="2"></el-input-number>
<span style="font-size: 12px;color:red">(申请开票金额:¥{{ invoiceApplyData.applyMoney }})</span>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="开票备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
<el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
</el-form-item>
</el-col>
<!-- <el-col :span="8">
<el-form-item label="发票投递邮箱" prop="email">
<el-input v-model="form.email" placeholder="请输入发票投递邮箱" />
</el-form-item>
</el-col> -->
<!--
<el-col :span="8">
<el-form-item label="销方联系人" prop="salerContact">
<el-input v-model="form.salerContact" placeholder="请输入销方联系人" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="销方联系电话" prop="salerPhone">
<el-input v-model="form.salerPhone" placeholder="请输入销方联系电话" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="发票号" prop="invoiceNo">
<el-input v-model="form.invoiceNo" placeholder="请输入发票号" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="pdf下载路径" prop="filePath">
<el-input v-model="form.filePath" placeholder="请输入pdf下载路径" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="qr路径" prop="qrPath">
<el-input v-model="form.qrPath" placeholder="请输入qr路径" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="操作人" prop="opManCode">
<el-input v-model="form.opManCode" placeholder="请输入操作人" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="操作时间" prop="opDate">
<el-date-picker clearable
v-model="form.opDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择操作时间">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="操作站点" prop="opSiteCode">
<el-input v-model="form.opSiteCode" placeholder="请输入操作站点" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="开票渠道状态" prop="openChStatus">
<el-input v-model="form.openChStatus" placeholder="请输入开票渠道状态" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="开票渠道描述" prop="openChStatusDesc">
<el-input v-model="form.openChStatusDesc" placeholder="请输入开票渠道描述" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="使用的开票企业代码" prop="openComCode">
<el-input v-model="form.openComCode" placeholder="请输入使用的开票企业代码" />
</el-form-item>
</el-col>
-->
</el-row>
</el-form>
<div style="text-align: center;margin-bottom: 10px;">
@ -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;
});

View File

@ -1,36 +1,43 @@
<template>
<div >
<div style="margin-bottom: 20px;">
<el-descriptions title="账单信息" size="mini" border :column="4" v-if="emisSettleInvoiceRecord">
<el-descriptions-item label="申请序号">{{ emisSettleInvoiceRecord.applySeqNo }}</el-descriptions-item>
<el-descriptions-item label="申请时间">{{ emisSettleInvoiceRecord.applyDate }}</el-descriptions-item>
<el-descriptions-item label="申请人">{{ emisSettleInvoiceRecord.applyManName }}</el-descriptions-item>
<el-descriptions-item label="账单编号">{{ emisSettleInvoiceRecord.settleBillNo }}</el-descriptions-item>
<el-descriptions title="开票申请信息" size="mini" border :column="4" v-if="emisSettleInvoiceRecord">
<!-- <el-descriptions-item label="申请序号">{{ emisSettleInvoiceRecord.applySeqNo }}</el-descriptions-item> -->
<el-descriptions-item label="账单名称">{{ emisSettleInvoiceRecord.settleBillName }}</el-descriptions-item>
<el-descriptions-item label="申请开票金额">{{ emisSettleInvoiceRecord.applyMoney }}</el-descriptions-item>
<el-descriptions-item label="开票类型">
<el-descriptions-item label="申请时间">{{ emisSettleInvoiceRecord.applyDate }}</el-descriptions-item>
<el-descriptions-item label="申请人" :span="2">{{ emisSettleInvoiceRecord.createByName }}</el-descriptions-item>
<!-- <el-descriptions-item label="账单编号">{{ emisSettleInvoiceRecord.settleBillNo }}</el-descriptions-item> -->
<el-descriptions-item label="开票抬头">{{ emisSettleInvoiceRecord.companyName }}</el-descriptions-item>
<el-descriptions-item label="开票税号">{{ emisSettleInvoiceRecord.companyTaxNo }}</el-descriptions-item>
<el-descriptions-item label="开票地址">{{ emisSettleInvoiceRecord.companyAddress }} {{ emisSettleInvoiceRecord.companyTel }}</el-descriptions-item>
<el-descriptions-item label="开户银行">{{ emisSettleInvoiceRecord.bankName }} {{ emisSettleInvoiceRecord.bankAccNo }}</el-descriptions-item>
<el-descriptions-item label="开票类型" :span="1">
<span v-if="emisSettleInvoiceRecord.invoiceType==1"> 增值税电子普通发票</span>
<span v-if="emisSettleInvoiceRecord.invoiceType==2"> 增值税普通发票</span>
<span v-if="emisSettleInvoiceRecord.invoiceType==3"> 增值税专用发票</span>
</el-descriptions-item>
<el-descriptions-item label="开票抬头">{{ emisSettleInvoiceRecord.companyName }}</el-descriptions-item>
<el-descriptions-item label="开票税号">{{ emisSettleInvoiceRecord.companyTaxNo }}</el-descriptions-item>
<el-descriptions-item label="开票电话">{{ emisSettleInvoiceRecord.companyTel }}</el-descriptions-item>
<el-descriptions-item label="开票地址">{{ emisSettleInvoiceRecord.companyAddress }}</el-descriptions-item>
<el-descriptions-item label="开户行">{{ emisSettleInvoiceRecord.bankName }}</el-descriptions-item>
<el-descriptions-item label="开户账号">{{ emisSettleInvoiceRecord.bankAccNo }}</el-descriptions-item>
<el-descriptions-item label="联系人">{{ emisSettleInvoiceRecord.contact }}</el-descriptions-item>
<el-descriptions-item label="联系电话">{{ emisSettleInvoiceRecord.phone }}</el-descriptions-item>
<el-descriptions-item label="税类型">{{ emisSettleInvoiceRecord.realTaxType }}</el-descriptions-item>
<el-descriptions-item label="开票金额" :span="1">¥{{ emisSettleInvoiceRecord.applyMoney }}</el-descriptions-item>
<el-descriptions-item label="开票备注" :span="3">{{ emisSettleInvoiceRecord.remark }}</el-descriptions-item>
<!-- <el-descriptions-item label="联系人">{{ emisSettleInvoiceRecord.contact }}</el-descriptions-item> -->
<!-- <el-descriptions-item label="联系电话">{{ emisSettleInvoiceRecord.phone }}</el-descriptions-item> -->
<!-- <el-descriptions-item label="税类型">
{{ emisSettleInvoiceRecord.realTaxType }}
</el-descriptions-item> -->
<!-- <el-descriptions-item label="开票上限">{{ emisSettleInvoiceRecord.openMoneyMax }}</el-descriptions-item> -->
<!-- <el-descriptions-item label="开票金额">{{ emisSettleInvoiceRecord.openMoney }}</el-descriptions-item> -->
<!-- <el-descriptions-item label="发票号">{{ emisSettleInvoiceRecord.invoiceNo }}</el-descriptions-item> -->
<el-descriptions-item label="开票状态">{{ emisSettleInvoiceRecord.invoiceStatus }}</el-descriptions-item>
<el-descriptions-item label="开票状态描述">{{ emisSettleInvoiceRecord.invoiceStatusDesc }}</el-descriptions-item>
<el-descriptions-item label="开票状态" :span="1">
<span v-if="emisSettleInvoiceRecord.invoiceStatus==0"> 未开票</span>
<span v-if="emisSettleInvoiceRecord.invoiceStatus==1"> 开票中</span>
<span v-if="emisSettleInvoiceRecord.invoiceStatus==2"> 已开票</span>
<span v-if="emisSettleInvoiceRecord.invoiceStatus==3"> 开票失败</span>
</el-descriptions-item>
<el-descriptions-item label="状态描述">{{ emisSettleInvoiceRecord.invoiceStatusDesc }}</el-descriptions-item>
<!-- <el-descriptions-item label="纸质发票邮寄地址">{{ emisSettleInvoiceRecord.recieveAddress }}</el-descriptions-item> -->
<!-- <el-descriptions-item label="发票投递邮箱">{{ emisSettleInvoiceRecord.email }}</el-descriptions-item> -->
<!-- <el-descriptions-item label="发票下载路径">{{ emisSettleInvoiceRecord.filePath }}</el-descriptions-item> -->
<el-descriptions-item label="备注">{{ emisSettleInvoiceRecord.remark }}</el-descriptions-item>
<!-- <el-descriptions-item label="审核状态">{{ emisSettleInvoiceRecord.blAudit }}</el-descriptions-item>
<el-descriptions-item label="审核日期">{{ emisSettleInvoiceRecord.auditDate }}</el-descriptions-item>
<el-descriptions-item label="审核人">{{ emisSettleInvoiceRecord.auditManCode }}</el-descriptions-item>

View File

@ -78,8 +78,9 @@
<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>
@ -462,7 +463,7 @@
</template>
<script>
import { listEmisSettleInvoiceRecord, getEmisSettleInvoiceRecord, delEmisSettleInvoiceRecord, addEmisSettleInvoiceRecord, updateEmisSettleInvoiceRecord } from "@/api/emis/emisSettleInvoiceRecord";
import { auditCenterNoPass,listEmisSettleInvoiceRecord, getEmisSettleInvoiceRecord, delEmisSettleInvoiceRecord, addEmisSettleInvoiceRecord, updateEmisSettleInvoiceRecord } from "@/api/emis/emisSettleInvoiceRecord";
import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
// import emisSettleInvoiceRecordView from '@/views/emis/emisSettleInvoiceRecord/emisSettleInvoiceRecordView';
import OpenBillForm from '@/views/emis/emisSettleInvoiceRecord/OpenBillForm';
@ -575,9 +576,22 @@ export default {
this.getList();
},
},
handleRefuse(row){
handleRefuse(row) {
const ids = row.id || this.ids;
this.$prompt('请输入驳回原因', "操作确认", {
confirmButtonText: "确定",
cancelButtonText: "取消",
closeOnClickModal: false,
inputPattern: /^.{5,30}$/,
inputErrorMessage: "驳回原因长度必须介于 5 和 30 之间"
}).then(({ value }) => {
auditCenterNoPass(ids,value).then(response => {
this.$modal.msgSuccess("操作成功" );
this.getList();
});
}).catch(() => {});
},
/** 查询开票记录表列表 */
getList() {
this.loading = true;

View File

@ -1,10 +1,7 @@
<template>
<div>
<!-- border-right: 1px solid #f3f3f3; -->
<el-row v-if="emisSettleInvoiceRecord"
:gutter="0" style="display: flex;flex-wrap: wrap; overflow: hidden;">
<el-col :span="6" style="padding-right: 5px;">
<el-descriptions title="" border :column="4">
<div>
<el-descriptions title="" border :column="4">
<el-descriptions-item label="申请序号">{{ emisSettleInvoiceRecord.applySeqNo }}</el-descriptions-item>
<el-descriptions-item label="申请时间">{{ emisSettleInvoiceRecord.applyDate }}</el-descriptions-item>
<!-- <el-descriptions-item label="审核人">{{ emisSettleInvoiceRecord.applyManCode }}</el-descriptions-item> -->
@ -12,7 +9,7 @@
<!-- <el-descriptions-item label="客户编码">{{ emisSettleInvoiceRecord.customerCode }}</el-descriptions-item> -->
<!-- <el-descriptions-item label="客户名称">{{ emisSettleInvoiceRecord.customerName }}</el-descriptions-item> -->
<el-descriptions-item label="账单编号">{{ emisSettleInvoiceRecord.settleBillNo }}</el-descriptions-item>
<!-- <el-descriptions-item label="账单名称">{{ emisSettleInvoiceRecord.settleBillName }}</el-descriptions-item> -->
<el-descriptions-item label="账单名称">{{ emisSettleInvoiceRecord.settleBillName }}</el-descriptions-item>
<el-descriptions-item label="申请开票金额">{{ emisSettleInvoiceRecord.applyMoney }}</el-descriptions-item>
<el-descriptions-item label="开票类型">{{ emisSettleInvoiceRecord.invoiceType }}</el-descriptions-item>
<el-descriptions-item label="开票抬头">{{ emisSettleInvoiceRecord.companyName }}</el-descriptions-item>
@ -25,14 +22,14 @@
<el-descriptions-item label="联系电话">{{ emisSettleInvoiceRecord.phone }}</el-descriptions-item>
<!-- <el-descriptions-item label="税类型">{{ emisSettleInvoiceRecord.realTaxType }}</el-descriptions-item> -->
<!-- <el-descriptions-item label="开票上限">{{ emisSettleInvoiceRecord.openMoneyMax }}</el-descriptions-item> -->
<el-descriptions-item label="开票金额">{{ emisSettleInvoiceRecord.openMoney }}</el-descriptions-item>
<el-descriptions-item label="发票号">{{ emisSettleInvoiceRecord.invoiceNo }}</el-descriptions-item>
<!-- <el-descriptions-item label="开票金额">{{ emisSettleInvoiceRecord.openMoney }}</el-descriptions-item> -->
<!-- <el-descriptions-item label="发票号">{{ emisSettleInvoiceRecord.invoiceNo }}</el-descriptions-item> -->
<el-descriptions-item label="开票状态">{{ emisSettleInvoiceRecord.invoiceStatus }}</el-descriptions-item>
<el-descriptions-item label="开票异常描述">{{ emisSettleInvoiceRecord.invoiceStatusDesc }}</el-descriptions-item>
<el-descriptions-item label="纸质发票邮寄地址">{{ emisSettleInvoiceRecord.recieveAddress }}</el-descriptions-item>
<el-descriptions-item label="邮箱">{{ emisSettleInvoiceRecord.email }}</el-descriptions-item>
<el-descriptions-item label="发票下载路径">{{ emisSettleInvoiceRecord.filePath }}</el-descriptions-item>
<el-descriptions-item label="备注">{{ emisSettleInvoiceRecord.remark }}</el-descriptions-item>
<!-- <el-descriptions-item label="纸质发票邮寄地址">{{ emisSettleInvoiceRecord.recieveAddress }}</el-descriptions-item> -->
<!-- <el-descriptions-item label="邮箱">{{ emisSettleInvoiceRecord.email }}</el-descriptions-item> -->
<!-- <el-descriptions-item label="发票下载路径">{{ emisSettleInvoiceRecord.filePath }}</el-descriptions-item> -->
<el-descriptions-item label="开票备注">{{ emisSettleInvoiceRecord.remark }}</el-descriptions-item>
<!-- <el-descriptions-item label="审核状态">{{ emisSettleInvoiceRecord.blAudit }}</el-descriptions-item> -->
<!-- <el-descriptions-item label="审核日期">{{ emisSettleInvoiceRecord.auditDate }}</el-descriptions-item> -->
<!-- <el-descriptions-item label="审核人">{{ emisSettleInvoiceRecord.auditManCode }}</el-descriptions-item> -->
@ -53,32 +50,21 @@
<!-- <el-descriptions-item label="更新站点">{{ emisSettleInvoiceRecord.updateSite }}</el-descriptions-item> -->
</el-descriptions>
</div>
<div>
<InvoiceChRecordListReadOnly > </InvoiceChRecordListReadOnly>
</div>
</el-col>
<el-col :span="18" style="padding: 10px;font-size: 14px;">
<!-- <div style="margin-bottom:20px">
<div style="font-weight:500;margin-bottom:20px">收款状态:<span>未收款</span></div>
<div>总应收:<span style="color:red;font-weight:500;">{{ dataItem.recMoney }}</span>,已收:<span style="color:blue;font-weight:500;">{{ dataItem.recdMoney }}</span></div>
<div>
<PayRecordList :settleBillNo="settleBillNo"> </PayRecordList>
</div>
</div>
<div style="margin-bottom:20px">
<div style="font-weight:500;margin-bottom:20px">开票状态:<span>未开票</span></div>
<div>最高可开票金额:<span style="color:red;font-weight:500;">{{ dataItem.recMoney }}</span>,已开票:<span style="color:blue;font-weight:500;">{{ dataItem.recdMoney }}</span></div>
<div>
<InvoiceRecordList :settleBillNo="settleBillNo"> </InvoiceRecordList>
</div>
</div> -->
</el-col>
</el-row>
</div>
</template>
<script>
import { getInfoBySettleBillNo } from "@/api/emis/emisSettleBill";
import PayRecordList from '@/views/emis/emisSettlePayRecord/panel/PayRecordList.vue';
import InvoiceRecordList from '@/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordList.vue';
import PayRecordListOnly from '@/views/emis/emisSettlePayRecord/panel/PayRecordListOnly.vue';
import InvoiceChRecordListReadOnly from '@/views/emis/emisSettleInvoiceChRecord/InvoiceChRecordListReadOnly.vue';
import { listEmisSettleInvoiceRecord, getEmisSettleInvoiceRecord, delEmisSettleInvoiceRecord, addEmisSettleInvoiceRecord, updateEmisSettleInvoiceRecord } from "@/api/emis/emisSettleInvoiceRecord";
export default {
name: "BillDetailPanel",
@ -88,8 +74,8 @@ export default {
}
},
components: {
PayRecordList,
InvoiceRecordList
PayRecordListOnly,
InvoiceChRecordListReadOnly
},
dicts: [
],
@ -100,7 +86,7 @@ export default {
};
},
watch: {
"settleBillNo": {
"id": {
handler (newValue, oldValue) {
this.initData();
},

View File

@ -368,6 +368,16 @@
v-hasPermi="['emis:emisSettleInvoiceRecord:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-download"
size="mini"
:disabled="single"
@click="handleDownPDF"
>下载发票PDF</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-button
type="warning"
@ -391,30 +401,30 @@
<el-tag v-if="scope.row.invoiceStatus=='3'" type="warning">开票异常</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="settleBillName" min-width="100" :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="companyName" min-width="100" :show-overflow-tooltip="true" />
<el-table-column :label="$t('开票税号')" align="center" prop="companyTaxNo" min-width="100" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('开票电话')" align="center" prop="companyTel" min-width="100" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('开票地址')" align="center" prop="companyAddress" min-width="100" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('联系人')" align="center" prop="contact" min-width="100" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('联系电话')" align="center" prop="phone" min-width="100" :show-overflow-tooltip="true"/>
<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"/> -->
<!-- <el-table-column :label="$t('开票地址')" align="center" prop="companyAddress" min-width="100" :show-overflow-tooltip="true"/> -->
<!-- <el-table-column :label="$t('联系人')" align="center" prop="contact" min-width="100" :show-overflow-tooltip="true"/> -->
<!-- <el-table-column :label="$t('联系电话')" align="center" prop="phone" min-width="100" :show-overflow-tooltip="true"/> -->
<!-- <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"/>
<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"/>
<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="invoiceStatusDesc" 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"/>
@ -436,12 +446,12 @@
<!-- <el-table-column :label="$t('开票渠道描述')" align="center" prop="openChStatusDesc" min-width="100" /> -->
<!-- <el-table-column :label="$t('使用的开票企业代码')" align="center" prop="openComCode" min-width="100" /> -->
<el-table-column label="创建人" align="center" prop="createByName" width="80" :show-overflow-tooltip="true"/>
<!-- <el-table-column label="创建人" align="center" prop="createByName" width="80" :show-overflow-tooltip="true"/>
<el-table-column label="创建网点" align="center" prop="createSiteName" width="80" :show-overflow-tooltip="true"/>
<el-table-column label="创建时间" align="center" prop="createTime" width="170"/>
<el-table-column label="修改人" align="center" prop="updateByName" width="80" :show-overflow-tooltip="true"/>
<el-table-column label="修改网点" align="center" prop="updateSiteName" width="80" :show-overflow-tooltip="true"/>
<el-table-column label="修改时间" align="center" prop="updateTime" width="170"/>
<el-table-column label="修改时间" align="center" prop="updateTime" width="170"/> -->
</XdTable>
@ -606,6 +616,12 @@ export default {
this.openForm = true;
this.titleForm = "修改";
},
handleDownPDF(row) {
const ids = row.id || this.ids;
this.currentId= row.id;
// this.openForm = true;
// this.titleForm = "修改";
},
handleView(row) {
this.id=row.id;
this.titleView="查看";

View File

@ -140,6 +140,7 @@ export default {
};
},
created() {
this.queryParams.settleBillNo=this.settleBillNo;
this.getList();
},
methods: {

View File

@ -361,96 +361,88 @@
</template>
</el-table-column>
<el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="130" />
<el-table-column :label="$t('预警提示')" align="center" prop="waybillDetail.blSpecialQuote" width="150" :show-overflow-tooltip="true">
<template slot-scope="scope">
<el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="130" :sort-orders="['descending','ascending']" sortable="custom" />
<el-table-column :label="$t('预警提示')" align="center" prop="waybillDetail.blSpecialQuote" width="150" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.blConfirmCenter=='0'" style="color:red;font-weight:500">财务未确认,</span>
<span v-if="scope.row.blConfirmSite=='0'" style="color:red;font-weight:500">业务未确认</span>
</template>
</el-table-column>
<!-- <el-table-column :label="$t('是否特殊报价')" align="center" prop="waybillDetail.sendDate" min-width="170" :show-overflow-tooltip="true"/> -->
<el-table-column :label="$t('特殊报价')" align="center" prop="waybillDetail.blSpecialQuote" width="150" :show-overflow-tooltip="true">
<el-table-column :label="$t('快件类型')" align="center" prop="kjlx" width="180" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.waybillDetail.sendSiteName }}--{{ scope.row.waybillDetail.dispatchUnderlingSiteName }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('特殊报价')" align="center" prop="waybillDetail.blSpecialQuote" width="150" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.waybillDetail.blSpecialQuote==1">是</span>
<span v-else>否</span>
</template>
</el-table-column>
<el-table-column :label="$t('计费方式')" align="center" prop="waybillDetail.calcFeeType" width="150" :show-overflow-tooltip="true">
<el-table-column :label="$t('计费方式')" align="center" prop="waybillDetail.calcFeeType" width="150" :show-overflow-tooltip="true">
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_calc_fee_type" :value="scope.row.waybillDetail.calcFeeType"/>
</template>
</el-table-column>
<el-table-column :label="$t('寄件日期')" align="center" prop="waybillDetail.sendDate" min-width="170" :show-overflow-tooltip="true"/>
<!-- <el-table-column :label="$t('发件人')" align="center" prop="fjr" width="200" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.waybillDetail.sendName }}--{{ scope.row.waybillDetail.receiveName }}</span>
</template>
</el-table-column> -->
<el-table-column :label="$t('寄件网点')" align="center" prop="waybillDetail.sendSiteName" min-width="150" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件公司')" align="center" prop="waybillDetail.sendCompany" min-width="150" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件日期')" align="center" prop="waybillDetail.sendDate" min-width="170" :sort-orders="['descending','ascending']" sortable="custom" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件网点')" align="center" prop="waybillDetail.sendSiteName" min-width="150" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件公司')" align="center" prop="waybillDetail.sendCompany" min-width="150" :sort-orders="['descending','ascending']" sortable="custom" :show-overflow-tooltip="true"/>
<el-table-column v-if="actionType!=1" :label="$t('月结编号')" align="center" prop="custNo" min-width="150" :show-overflow-tooltip="true">
<el-table-column :label="$t('月结编号')" align="center" prop="customerName" min-width="150" :sort-orders="['descending','ascending']" sortable="custom" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span type="normal">{{ scope.row.custNo }}</span>
<span v-if="['2','4','5'].includes(scope.row.waybillDetail.paymentType)" type="normal">{{ scope.row.custNo }}</span>
</template>
</el-table-column>
<el-table-column v-if="actionType!=1" :label="$t('月结客户')" align="center" prop="custName" min-width="150" :show-overflow-tooltip="true">
<el-table-column :label="$t('月结客户')" align="center" prop="customerName" min-width="150" :sort-orders="['descending','ascending']" sortable="custom" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="['2','4','5'].includes(scope.row.waybillDetail.paymentType)" type="normal">{{ scope.row.custName }}</span>
</template>
</el-table-column>
<!-- <el-table-column :label="$t('取件员/操作员')" align="center" prop="takePieceEmployeeName" min-width="170" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.pickupMethod==1">{{scope.row.waybillDetail.operateEmployeeName}}</span>
<span v-if="scope.row.pickupMethod==2">{{scope.row.waybillDetail.takePieceEmployeeName}}</span>
<span v-else></span>
</template>
</el-table-column> -->
<el-table-column :label="$t('线路')" align="center" prop="waybillDetail.transLineTypeName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('产品类型')" align="center" prop="waybillDetail.productTypeName" min-width="120" :show-overflow-tooltip="true">
<el-table-column :label="$t('线路')" align="center" prop="waybillDetail.transLineTypeName" min-width="80" :sort-orders="['descending','ascending']" sortable="custom" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('产品类型')" align="center" prop="waybillDetail.productTypeName" min-width="120" :sort-orders="['descending','ascending']" sortable="custom" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span >{{scope.row.waybillDetail.productTypeName}}({{scope.row.waybillDetail.timeType}})</span>
</template>
</el-table-column>
<el-table-column :label="$t('寄件人')" align="center" prop="waybillDetail.sendName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('件数')" align="center" prop="waybillDetail.parcelQty" min-width="80" />
<el-table-column :label="$t('实际重量')" align="center" prop="waybillDetail.billWeight" min-width="80" />
<el-table-column :label="$t('体积')" align="center" prop="waybillDetail.totalVolume" min-width="80" />
<el-table-column :label="$t('体积重量')" align="center" prop="waybillDetail.volumeWeight" min-width="80" />
<el-table-column :label="$t('结算重量')" align="center" prop="waybillDetail.settlementWeight" min-width="80" />
<el-table-column :label="$t('运费')" align="center" prop="waybillDetail.freight" min-width="80" >
<el-table-column :label="$t('寄件人')" align="center" prop="waybillDetail.sendName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('件数')" align="center" prop="waybillDetail.parcelQty" min-width="80" />
<el-table-column :label="$t('实际重量')" align="center" prop="waybillDetail.billWeight" min-width="80" />
<el-table-column :label="$t('体积')" align="center" prop="waybillDetail.totalVolume" min-width="80" />
<el-table-column :label="$t('体积重量')" align="center" prop="waybillDetail.volumeWeight" min-width="80" />
<el-table-column :label="$t('结算重量')" align="center" prop="waybillDetail.settlementWeight" min-width="80" :sort-orders="['descending','ascending']" sortable="custom" />
<el-table-column :label="$t('运费')" align="center" prop="waybillDetail.freight" min-width="80" >
<template slot-scope="scope">
<span style="color: red;font-weight: 500" v-if="scope.row.waybillDetail.realFee!=scope.row.waybillDetail.freight">{{scope.row.waybillDetail.freight}}</span>
<span v-else>{{scope.row.waybillDetail.freight}}</span>
</template>
</el-table-column>
<el-table-column :label="$t('标准报价')" align="center" prop="waybillDetail.realFee" min-width="80" />
<el-table-column :label="$t('费用备注')" align="center" prop="waybillDetail.feeRemark" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('支付类型')" align="center" prop="waybillDetail.paymentType" min-width="80" :show-overflow-tooltip="true" >
<el-table-column :label="$t('标准报价')" align="center" prop="waybillDetail.realFee" min-width="80" />
<el-table-column :label="$t('费用备注')" align="center" prop="waybillDetail.feeRemark" min-width="80" :show-overflow-tooltip="true" />
<el-table-column :label="$t('支付类型')" align="center" prop="waybillDetail.paymentType" min-width="80" :show-overflow-tooltip="true" >
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_payment_type" :value="scope.row.waybillDetail.paymentType"/>
<dict-tag :options="dict.type.emis_payment_type" :value="scope.row.waybillDetail.paymentType" />
</template>
</el-table-column>
<el-table-column :label="$t('录单备注')" align="center" prop="waybillDetail.remark" min-width="80" :show-overflow-tooltip="true" />
<el-table-column :label="$t('回款联系人')" align="center" prop="waybillDetail.payee" min-width="100" />
<el-table-column :label="$t('销售联系人')" align="center" prop="waybillDetail.salesmen" min-width="100" />
<el-table-column :label="$t('录单备注')" align="center" prop="waybillDetail.remark" min-width="80" :show-overflow-tooltip="true" />
<el-table-column :label="$t('回款联系人')" align="center" prop="waybillDetail.payee" min-width="100" />
<el-table-column :label="$t('销售联系人')" align="center" prop="waybillDetail.salesmen" min-width="100" />
<el-table-column :label="$t('问题件')" align="center" prop="waybillDetail.blIsQuestion" min-width="150" >
<el-table-column :label="$t('问题件')" align="center" prop="waybillDetail.blIsQuestion" min-width="150" >
<template slot-scope="scope">
<el-tag v-if="scope.row.waybillDetail.blIsQuestion==1" type="danger">是</el-tag>
<span v-else >/</span>
</template>
</el-table-column>
<el-table-column :label="$t('问题件类型')" align="center" prop="waybillDetail.problemTypeName" width="150" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('问题件原因')" align="center" prop="waybillDetail.problemCause" width="150" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('问题件类型')" align="center" prop="waybillDetail.problemTypeName" width="150" :show-overflow-tooltip="true" :sort-orders="['descending','ascending']" sortable="custom" />
<el-table-column :label="$t('问题件原因')" align="center" prop="waybillDetail.problemCause" width="150" :show-overflow-tooltip="true" />
<el-table-column :label="$t('财务确认状态')" align="center" prop="blConfirmCenter" min-width="120" >
<el-table-column :label="$t('财务确认状态')" align="center" prop="blConfirmCenter" min-width="120" >
<template slot-scope="scope">
<span v-if="scope.row.blConfirmCenter=='0'" >未确认</span>
<el-tag v-if="scope.row.blConfirmCenter=='1'" type="success">已确认</el-tag>
@ -458,11 +450,11 @@
<el-tag v-if="scope.row.blConfirmCenter=='3'" type="error">账单异常</el-tag>
</template>
</el-table-column>
<el-table-column :label="$t('财务确认人')" align="center" prop="confirmCenterManName" min-width="100" />
<el-table-column :label="$t('财务确认时间')" align="center" prop="confirmCenterDate" min-width="170" />
<el-table-column :label="$t('财务备注')" align="center" prop="confirmCenterNote" min-width="100" />
<el-table-column :label="$t('财务确认人')" align="center" prop="confirmCenterManName" min-width="100" />
<el-table-column :label="$t('财务确认时间')" align="center" prop="confirmCenterDate" min-width="170" />
<el-table-column :label="$t('财务备注')" align="center" prop="confirmCenterNote" min-width="100" />
<el-table-column :label="$t('业务确认状态')" align="center" prop="blConfirmSite" min-width="120" >
<el-table-column :label="$t('业务确认状态')" align="center" prop="blConfirmSite" min-width="120" >
<template slot-scope="scope">
<span v-if="scope.row.blConfirmSite=='0'" >未确认</span>
<el-tag v-if="scope.row.blConfirmSite=='1'" type="success">已确认</el-tag>
@ -470,9 +462,9 @@
<el-tag v-if="scope.row.blConfirmSite=='3'" type="error">账单异常</el-tag>
</template>
</el-table-column>
<el-table-column :label="$t('业务确认时间')" align="center" prop="confirmSiteDate" min-width="170" />
<el-table-column :label="$t('业务确认人')" align="center" prop="confirmSiteManName" min-width="100" />
<el-table-column :label="$t('业务备注')" align="center" prop="confirmSiteNote" min-width="100" />
<el-table-column :label="$t('业务确认时间')" align="center" prop="confirmSiteDate" min-width="170" />
<el-table-column :label="$t('业务确认人')" align="center" prop="confirmSiteManName" min-width="100" />
<el-table-column :label="$t('业务备注')" align="center" prop="confirmSiteNote" min-width="100" />
</XdTable>

View File

@ -364,97 +364,88 @@
</template>
</el-table-column>
<el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="130" />
<el-table-column :label="$t('预警提示')" align="center" prop="waybillDetail.blSpecialQuote" width="150" :show-overflow-tooltip="true">
<template slot-scope="scope">
<el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="130" :sort-orders="['descending','ascending']" sortable="custom" />
<el-table-column :label="$t('预警提示')" align="center" prop="waybillDetail.blSpecialQuote" width="150" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.blConfirmCenter=='0'" style="color:red;font-weight:500">财务未确认,</span>
<span v-if="scope.row.blConfirmSite=='0'" style="color:red;font-weight:500">业务未确认</span>
</template>
</el-table-column>
<!-- <el-table-column :label="$t('是否特殊报价')" align="center" prop="waybillDetail.sendDate" min-width="170" :show-overflow-tooltip="true"/> -->
<el-table-column :label="$t('特殊报价')" align="center" prop="waybillDetail.blSpecialQuote" width="150" :show-overflow-tooltip="true">
<el-table-column :label="$t('快件类型')" align="center" prop="kjlx" width="180" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.waybillDetail.sendSiteName }}--{{ scope.row.waybillDetail.dispatchUnderlingSiteName }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('特殊报价')" align="center" prop="waybillDetail.blSpecialQuote" width="150" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.waybillDetail.blSpecialQuote==1">是</span>
<span v-else>否</span>
</template>
</el-table-column>
<el-table-column :label="$t('计费方式')" align="center" prop="waybillDetail.calcFeeType" width="150" :show-overflow-tooltip="true">
<el-table-column :label="$t('计费方式')" align="center" prop="waybillDetail.calcFeeType" width="150" :show-overflow-tooltip="true">
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_calc_fee_type" :value="scope.row.waybillDetail.calcFeeType"/>
</template>
</el-table-column>
<el-table-column :label="$t('寄件日期')" align="center" prop="waybillDetail.sendDate" min-width="170" :show-overflow-tooltip="true"/>
<!-- <el-table-column :label="$t('发件人')" align="center" prop="fjr" width="200" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.waybillDetail.sendName }}--{{ scope.row.waybillDetail.receiveName }}</span>
</template>
</el-table-column> -->
<el-table-column :label="$t('寄件网点')" align="center" prop="waybillDetail.sendSiteName" min-width="150" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件公司')" align="center" prop="waybillDetail.sendCompany" min-width="150" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件日期')" align="center" prop="waybillDetail.sendDate" min-width="170" :sort-orders="['descending','ascending']" sortable="custom" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件网点')" align="center" prop="waybillDetail.sendSiteName" min-width="150" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件公司')" align="center" prop="waybillDetail.sendCompany" min-width="150" :sort-orders="['descending','ascending']" sortable="custom" :show-overflow-tooltip="true"/>
<el-table-column v-if="actionType!=1" :label="$t('月结编号')" align="center" prop="custNo" min-width="150" :show-overflow-tooltip="true">
<el-table-column :label="$t('月结编号')" align="center" prop="customerName" min-width="150" :sort-orders="['descending','ascending']" sortable="custom" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span type="normal">{{ scope.row.custNo }}</span>
<span v-if="['2','4','5'].includes(scope.row.waybillDetail.paymentType)" type="normal">{{ scope.row.custNo }}</span>
</template>
</el-table-column>
<el-table-column v-if="actionType!=1" :label="$t('月结客户')" align="center" prop="custName" min-width="150" :show-overflow-tooltip="true">
<el-table-column :label="$t('月结客户')" align="center" prop="customerName" min-width="150" :sort-orders="['descending','ascending']" sortable="custom" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="['2','4','5'].includes(scope.row.waybillDetail.paymentType)" type="normal">{{ scope.row.custName }}</span>
</template>
</el-table-column>
<!-- <el-table-column :label="$t('取件员/操作员')" align="center" prop="takePieceEmployeeName" min-width="170" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.pickupMethod==1">{{scope.row.waybillDetail.operateEmployeeName}}</span>
<span v-if="scope.row.pickupMethod==2">{{scope.row.waybillDetail.takePieceEmployeeName}}</span>
<span v-else></span>
</template>
</el-table-column> -->
<el-table-column :label="$t('线路')" align="center" prop="waybillDetail.transLineTypeName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('产品类型')" align="center" prop="waybillDetail.productTypeName" min-width="120" :show-overflow-tooltip="true">
<el-table-column :label="$t('线路')" align="center" prop="waybillDetail.transLineTypeName" min-width="80" :sort-orders="['descending','ascending']" sortable="custom" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('产品类型')" align="center" prop="waybillDetail.productTypeName" min-width="120" :sort-orders="['descending','ascending']" sortable="custom" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span >{{scope.row.waybillDetail.productTypeName}}({{scope.row.waybillDetail.timeType}})</span>
</template>
</el-table-column>
<el-table-column :label="$t('寄件人')" align="center" prop="waybillDetail.sendName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('件数')" align="center" prop="waybillDetail.parcelQty" min-width="80" />
<el-table-column :label="$t('实际重量')" align="center" prop="waybillDetail.billWeight" min-width="80" />
<el-table-column :label="$t('体积')" align="center" prop="waybillDetail.totalVolume" min-width="80" />
<el-table-column :label="$t('体积重量')" align="center" prop="waybillDetail.volumeWeight" min-width="80" />
<el-table-column :label="$t('结算重量')" align="center" prop="waybillDetail.settlementWeight" min-width="80" />
<el-table-column :label="$t('运费')" align="center" prop="waybillDetail.freight" min-width="80" >
<el-table-column :label="$t('寄件人')" align="center" prop="waybillDetail.sendName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('件数')" align="center" prop="waybillDetail.parcelQty" min-width="80" />
<el-table-column :label="$t('实际重量')" align="center" prop="waybillDetail.billWeight" min-width="80" />
<el-table-column :label="$t('体积')" align="center" prop="waybillDetail.totalVolume" min-width="80" />
<el-table-column :label="$t('体积重量')" align="center" prop="waybillDetail.volumeWeight" min-width="80" />
<el-table-column :label="$t('结算重量')" align="center" prop="waybillDetail.settlementWeight" min-width="80" :sort-orders="['descending','ascending']" sortable="custom" />
<el-table-column :label="$t('运费')" align="center" prop="waybillDetail.freight" min-width="80" >
<template slot-scope="scope">
<span style="color: red;font-weight: 500" v-if="scope.row.waybillDetail.realFee!=scope.row.waybillDetail.freight">{{scope.row.waybillDetail.freight}}</span>
<span v-else>{{scope.row.waybillDetail.freight}}</span>
</template>
</el-table-column>
<el-table-column :label="$t('标准报价')" align="center" prop="waybillDetail.realFee" min-width="80" />
<el-table-column :label="$t('费用备注')" align="center" prop="waybillDetail.feeRemark" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('支付类型')" align="center" prop="waybillDetail.paymentType" min-width="80" :show-overflow-tooltip="true" >
<el-table-column :label="$t('标准报价')" align="center" prop="waybillDetail.realFee" min-width="80" />
<el-table-column :label="$t('费用备注')" align="center" prop="waybillDetail.feeRemark" min-width="80" :show-overflow-tooltip="true" />
<el-table-column :label="$t('支付类型')" align="center" prop="waybillDetail.paymentType" min-width="80" :show-overflow-tooltip="true" >
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_payment_type" :value="scope.row.waybillDetail.paymentType"/>
<dict-tag :options="dict.type.emis_payment_type" :value="scope.row.waybillDetail.paymentType" />
</template>
</el-table-column>
<el-table-column :label="$t('录单备注')" align="center" prop="waybillDetail.remark" min-width="80" :show-overflow-tooltip="true" />
<el-table-column :label="$t('回款联系人')" align="center" prop="waybillDetail.payee" min-width="100" />
<el-table-column :label="$t('销售联系人')" align="center" prop="waybillDetail.salesmen" min-width="100" />
<el-table-column :label="$t('录单备注')" align="center" prop="waybillDetail.remark" min-width="80" :show-overflow-tooltip="true" />
<el-table-column :label="$t('回款联系人')" align="center" prop="waybillDetail.payee" min-width="100" />
<el-table-column :label="$t('销售联系人')" align="center" prop="waybillDetail.salesmen" min-width="100" />
<el-table-column :label="$t('问题件')" align="center" prop="waybillDetail.blIsQuestion" min-width="150" >
<el-table-column :label="$t('问题件')" align="center" prop="waybillDetail.blIsQuestion" min-width="150" >
<template slot-scope="scope">
<el-tag v-if="scope.row.waybillDetail.blIsQuestion==1" type="danger">是</el-tag>
<span v-else >/</span>
</template>
</el-table-column>
<el-table-column :label="$t('问题件类型')" align="center" prop="waybillDetail.problemTypeName" width="150" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('问题件原因')" align="center" prop="waybillDetail.problemCause" width="150" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('问题件类型')" align="center" prop="waybillDetail.problemTypeName" width="150" :show-overflow-tooltip="true" :sort-orders="['descending','ascending']" sortable="custom" />
<el-table-column :label="$t('问题件原因')" align="center" prop="waybillDetail.problemCause" width="150" :show-overflow-tooltip="true" />
<el-table-column :label="$t('财务确认状态')" align="center" prop="blConfirmCenter" min-width="120" >
<el-table-column :label="$t('财务确认状态')" align="center" prop="blConfirmCenter" min-width="120" >
<template slot-scope="scope">
<span v-if="scope.row.blConfirmCenter=='0'" >未确认</span>
<el-tag v-if="scope.row.blConfirmCenter=='1'" type="success">已确认</el-tag>
@ -462,11 +453,11 @@
<el-tag v-if="scope.row.blConfirmCenter=='3'" type="error">账单异常</el-tag>
</template>
</el-table-column>
<el-table-column :label="$t('财务确认人')" align="center" prop="confirmCenterManName" min-width="100" />
<el-table-column :label="$t('财务确认时间')" align="center" prop="confirmCenterDate" min-width="170" />
<el-table-column :label="$t('财务备注')" align="center" prop="confirmCenterNote" min-width="100" />
<el-table-column :label="$t('财务确认人')" align="center" prop="confirmCenterManName" min-width="100" />
<el-table-column :label="$t('财务确认时间')" align="center" prop="confirmCenterDate" min-width="170" />
<el-table-column :label="$t('财务备注')" align="center" prop="confirmCenterNote" min-width="100" />
<el-table-column :label="$t('业务确认状态')" align="center" prop="blConfirmSite" min-width="120" >
<el-table-column :label="$t('业务确认状态')" align="center" prop="blConfirmSite" min-width="120" >
<template slot-scope="scope">
<span v-if="scope.row.blConfirmSite=='0'" >未确认</span>
<el-tag v-if="scope.row.blConfirmSite=='1'" type="success">已确认</el-tag>
@ -474,9 +465,9 @@
<el-tag v-if="scope.row.blConfirmSite=='3'" type="error">账单异常</el-tag>
</template>
</el-table-column>
<el-table-column :label="$t('业务确认时间')" align="center" prop="confirmSiteDate" min-width="170" />
<el-table-column :label="$t('业务确认人')" align="center" prop="confirmSiteManName" min-width="100" />
<el-table-column :label="$t('业务备注')" align="center" prop="confirmSiteNote" min-width="100" />
<el-table-column :label="$t('业务确认时间')" align="center" prop="confirmSiteDate" min-width="170" />
<el-table-column :label="$t('业务确认人')" align="center" prop="confirmSiteManName" min-width="100" />
<el-table-column :label="$t('业务备注')" align="center" prop="confirmSiteNote" min-width="100" />
</XdTable>

View File

@ -134,7 +134,6 @@
@queryTable="getList"
@selection-change="handleSelectionChange"
@sort-change="handleSortChange"
:default-sort="{prop: 'sendDate', order: 'descending'}"
:row-style="tableRowClassName"
@ -143,6 +142,9 @@
show-summary :summary-method="getSummaries"
>
<!-- :default-sort="{prop: 'sendDate', order: 'descending'}" -->
<div slot="toolbar">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5" v-if="activeTab=='waitConfirm'">
@ -217,8 +219,8 @@
</template>
</el-table-column>
<el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="130" :sort-orders="['descending','ascending']" />
<el-table-column :label="$t('预警提示')" align="center" prop="waybillDetail.blSpecialQuote" width="150" :sort-orders="['descending','ascending']" :show-overflow-tooltip="true">
<el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="130" sortable="custom" />
<el-table-column :label="$t('预警提示')" align="center" prop="waybillDetail.blSpecialQuote" width="150" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.blConfirmCenter=='0'" style="color:red;font-weight:500">财务未确认,</span>
<span v-if="scope.row.blConfirmSite=='0'" style="color:red;font-weight:500">业务未确认</span>
@ -229,89 +231,76 @@
<span>{{ scope.row.waybillDetail.sendSiteName }}--{{ scope.row.waybillDetail.dispatchUnderlingSiteName }}</span>
</template>
</el-table-column>
<!-- <el-table-column :label="$t('是否特殊报价')" align="center" prop="waybillDetail.sendDate" min-width="170" :show-overflow-tooltip="true"/> -->
<el-table-column :label="$t('特殊报价')" align="center" prop="waybillDetail.blSpecialQuote" width="150" :sort-orders="['descending','ascending']" :show-overflow-tooltip="true">
<el-table-column :label="$t('特殊报价')" align="center" prop="waybillDetail.blSpecialQuote" width="150" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.waybillDetail.blSpecialQuote==1">是</span>
<span v-else>否</span>
</template>
</el-table-column>
<el-table-column :label="$t('计费方式')" align="center" prop="waybillDetail.calcFeeType" width="150" :sort-orders="['descending','ascending']" :show-overflow-tooltip="true">
<el-table-column :label="$t('计费方式')" align="center" prop="waybillDetail.calcFeeType" width="150" :show-overflow-tooltip="true">
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_calc_fee_type" :value="scope.row.waybillDetail.calcFeeType"/>
</template>
</el-table-column>
<el-table-column :label="$t('寄件日期')" align="center" prop="waybillDetail.sendDate" min-width="170" :sort-orders="['descending','ascending']" :show-overflow-tooltip="true"/>
<!-- <el-table-column :label="$t('发件人')" align="center" prop="fjr" width="200" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.waybillDetail.sendName }}--{{ scope.row.waybillDetail.receiveName }}</span>
</template>
</el-table-column> -->
<el-table-column :label="$t('寄件网点')" align="center" prop="waybillDetail.sendSiteName" min-width="150" :sort-orders="['descending','ascending']" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件公司')" align="center" prop="waybillDetail.sendCompany" min-width="150" :sort-orders="['descending','ascending']" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件日期')" align="center" prop="waybillDetail.sendDate" min-width="170" sortable="custom" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件网点')" align="center" prop="waybillDetail.sendSiteName" min-width="150" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件公司')" align="center" prop="waybillDetail.sendCompany" min-width="150" sortable="custom" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('月结编号')" align="center" prop="customerName" min-width="150" :sort-orders="['descending','ascending']" :show-overflow-tooltip="true">
<el-table-column :label="$t('月结编号')" align="center" prop="customerName" min-width="150" sortable="custom" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="['2','4','5'].includes(scope.row.waybillDetail.paymentType)" type="normal">{{ scope.row.custNo }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('月结客户')" align="center" prop="customerName" min-width="150" :sort-orders="['descending','ascending']" :show-overflow-tooltip="true">
<el-table-column :label="$t('月结客户')" align="center" prop="customerName" min-width="150" sortable="custom" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="['2','4','5'].includes(scope.row.waybillDetail.paymentType)" type="normal">{{ scope.row.custName }}</span>
</template>
</el-table-column>
<!-- <el-table-column :label="$t('取件员/操作员')" align="center" prop="takePieceEmployeeName" min-width="170" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.pickupMethod==1">{{scope.row.waybillDetail.operateEmployeeName}}</span>
<span v-if="scope.row.pickupMethod==2">{{scope.row.waybillDetail.takePieceEmployeeName}}</span>
<span v-else></span>
</template>
</el-table-column> -->
<el-table-column :label="$t('线路')" align="center" prop="waybillDetail.transLineTypeName" min-width="80" :sort-orders="['descending','ascending']" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('线路')" align="center" prop="waybillDetail.transLineTypeName" min-width="80" sortable="custom" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('产品类型')" align="center" prop="waybillDetail.productTypeName" min-width="120" :sort-orders="['descending','ascending']" :show-overflow-tooltip="true">
<el-table-column :label="$t('产品类型')" align="center" prop="waybillDetail.productTypeName" min-width="120" sortable="custom" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span >{{scope.row.waybillDetail.productTypeName}}({{scope.row.waybillDetail.timeType}})</span>
</template>
</el-table-column>
<el-table-column :label="$t('寄件人')" align="center" prop="waybillDetail.sendName" min-width="80" :sort-orders="['descending','ascending']" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('件数')" align="center" prop="waybillDetail.parcelQty" min-width="80" :sort-orders="['descending','ascending']" />
<el-table-column :label="$t('实际重量')" align="center" prop="waybillDetail.billWeight" min-width="80" :sort-orders="['descending','ascending']" />
<el-table-column :label="$t('体积')" align="center" prop="waybillDetail.totalVolume" min-width="80" :sort-orders="['descending','ascending']" />
<el-table-column :label="$t('体积重量')" align="center" prop="waybillDetail.volumeWeight" min-width="80" :sort-orders="['descending','ascending']" />
<el-table-column :label="$t('结算重量')" align="center" prop="waybillDetail.settlementWeight" min-width="80" :sort-orders="['descending','ascending']" />
<el-table-column :label="$t('运费')" align="center" prop="waybillDetail.freight" min-width="80" :sort-orders="['descending','ascending']" >
<el-table-column :label="$t('寄件人')" align="center" prop="waybillDetail.sendName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('件数')" align="center" prop="waybillDetail.parcelQty" min-width="80" />
<el-table-column :label="$t('实际重量')" align="center" prop="waybillDetail.billWeight" min-width="80" />
<el-table-column :label="$t('体积')" align="center" prop="waybillDetail.totalVolume" min-width="80" />
<el-table-column :label="$t('体积重量')" align="center" prop="waybillDetail.volumeWeight" min-width="80" />
<el-table-column :label="$t('结算重量')" align="center" prop="waybillDetail.settlementWeight" min-width="80" sortable="custom" />
<el-table-column :label="$t('运费')" align="center" prop="waybillDetail.freight" min-width="80" >
<template slot-scope="scope">
<span style="color: red;font-weight: 500" v-if="scope.row.waybillDetail.realFee!=scope.row.waybillDetail.freight">{{scope.row.waybillDetail.freight}}</span>
<span v-else>{{scope.row.waybillDetail.freight}}</span>
</template>
</el-table-column>
<el-table-column :label="$t('标准报价')" align="center" prop="waybillDetail.realFee" min-width="80" :sort-orders="['descending','ascending']" />
<el-table-column :label="$t('费用备注')" align="center" prop="waybillDetail.feeRemark" min-width="80" :show-overflow-tooltip="true" :sort-orders="['descending','ascending']" />
<el-table-column :label="$t('支付类型')" align="center" prop="waybillDetail.paymentType" min-width="80" :show-overflow-tooltip="true" :sort-orders="['descending','ascending']" >
<el-table-column :label="$t('标准报价')" align="center" prop="waybillDetail.realFee" min-width="80" />
<el-table-column :label="$t('费用备注')" align="center" prop="waybillDetail.feeRemark" min-width="80" :show-overflow-tooltip="true" />
<el-table-column :label="$t('支付类型')" align="center" prop="waybillDetail.paymentType" min-width="80" :show-overflow-tooltip="true" >
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_payment_type" :value="scope.row.waybillDetail.paymentType" />
</template>
</el-table-column>
<el-table-column :label="$t('录单备注')" align="center" prop="waybillDetail.remark" min-width="80" :show-overflow-tooltip="true" :sort-orders="['descending','ascending']" />
<el-table-column :label="$t('回款联系人')" align="center" prop="waybillDetail.payee" min-width="100" :sort-orders="['descending','ascending']" />
<el-table-column :label="$t('销售联系人')" align="center" prop="waybillDetail.salesmen" min-width="100" :sort-orders="['descending','ascending']" />
<el-table-column :label="$t('录单备注')" align="center" prop="waybillDetail.remark" min-width="80" :show-overflow-tooltip="true" />
<el-table-column :label="$t('回款联系人')" align="center" prop="waybillDetail.payee" min-width="100" />
<el-table-column :label="$t('销售联系人')" align="center" prop="waybillDetail.salesmen" min-width="100" />
<el-table-column :label="$t('问题件')" align="center" prop="waybillDetail.blIsQuestion" min-width="150" :sort-orders="['descending','ascending']" >
<el-table-column :label="$t('问题件')" align="center" prop="waybillDetail.blIsQuestion" min-width="150" >
<template slot-scope="scope">
<el-tag v-if="scope.row.waybillDetail.blIsQuestion==1" type="danger">是</el-tag>
<span v-else >/</span>
</template>
</el-table-column>
<el-table-column :label="$t('问题件类型')" align="center" prop="waybillDetail.problemTypeName" width="150" :show-overflow-tooltip="true" :sort-orders="['descending','ascending']" />
<el-table-column :label="$t('问题件原因')" align="center" prop="waybillDetail.problemCause" width="150" :show-overflow-tooltip="true" :sort-orders="['descending','ascending']" />
<el-table-column :label="$t('问题件类型')" align="center" prop="waybillDetail.problemTypeName" width="150" :show-overflow-tooltip="true" sortable="custom" />
<el-table-column :label="$t('问题件原因')" align="center" prop="waybillDetail.problemCause" width="150" :show-overflow-tooltip="true" />
<el-table-column :label="$t('财务确认状态')" align="center" prop="blConfirmCenter" min-width="120" :sort-orders="['descending','ascending']" >
<el-table-column :label="$t('财务确认状态')" align="center" prop="blConfirmCenter" min-width="120" >
<template slot-scope="scope">
<span v-if="scope.row.blConfirmCenter=='0'" >未确认</span>
<el-tag v-if="scope.row.blConfirmCenter=='1'" type="success">已确认</el-tag>
@ -319,11 +308,11 @@
<el-tag v-if="scope.row.blConfirmCenter=='3'" type="error">账单异常</el-tag>
</template>
</el-table-column>
<el-table-column :label="$t('财务确认人')" align="center" prop="confirmCenterManName" min-width="100" :sort-orders="['descending','ascending']" />
<el-table-column :label="$t('财务确认时间')" align="center" prop="confirmCenterDate" min-width="170" :sort-orders="['descending','ascending']" />
<el-table-column :label="$t('财务备注')" align="center" prop="confirmCenterNote" min-width="100" :sort-orders="['descending','ascending']" />
<el-table-column :label="$t('财务确认人')" align="center" prop="confirmCenterManName" min-width="100" />
<el-table-column :label="$t('财务确认时间')" align="center" prop="confirmCenterDate" min-width="170" />
<el-table-column :label="$t('财务备注')" align="center" prop="confirmCenterNote" min-width="100" />
<el-table-column :label="$t('业务确认状态')" align="center" prop="blConfirmSite" min-width="120" :sort-orders="['descending','ascending']" >
<el-table-column :label="$t('业务确认状态')" align="center" prop="blConfirmSite" min-width="120" >
<template slot-scope="scope">
<span v-if="scope.row.blConfirmSite=='0'" >未确认</span>
<el-tag v-if="scope.row.blConfirmSite=='1'" type="success">已确认</el-tag>
@ -331,9 +320,9 @@
<el-tag v-if="scope.row.blConfirmSite=='3'" type="error">账单异常</el-tag>
</template>
</el-table-column>
<el-table-column :label="$t('业务确认时间')" align="center" prop="confirmSiteDate" min-width="170" :sort-orders="['descending','ascending']" />
<el-table-column :label="$t('业务确认人')" align="center" prop="confirmSiteManName" min-width="100" :sort-orders="['descending','ascending']" />
<el-table-column :label="$t('业务备注')" align="center" prop="confirmSiteNote" min-width="100" :sort-orders="['descending','ascending']" />
<el-table-column :label="$t('业务确认时间')" align="center" prop="confirmSiteDate" min-width="170" />
<el-table-column :label="$t('业务确认人')" align="center" prop="confirmSiteManName" min-width="100" />
<el-table-column :label="$t('业务备注')" align="center" prop="confirmSiteNote" min-width="100" />
</XdTable>
@ -1009,10 +998,16 @@ export default {
// 排序 查询字段是表格中字段名字 动态取值排序顺序
handleSortChange(column) {
console.log("==column.prop==>",column.prop);
if(column.prop=='billCode'){
this.queryParams.params.orderByColumn = 'billCode';
}
else if(column.prop=='waybillDetail.sendDate'){
this.queryParams.params.orderByColumn = 'sendDate';
}
// this.queryParams.orderByColumn = column.prop;
// this.queryParams.isAsc = column.order;
// this.getList();
this.queryParams.isAsc = column.order;
this.getList();
},
/** 修改按钮操作 */

View File

@ -36,7 +36,7 @@
<el-form-item label="寄件客户" prop="custNo">
<EmisMonthpayAccountPicker v-model="queryParams.custNo" @onChange="handleQuery"></EmisMonthpayAccountPicker>
</el-form-item>
<el-form-item label="寄件网点" prop="productType">
<el-form-item label="寄件网点" prop="sendSiteCode">
<EmisSiteSimplePicker1 v-model="queryParams.sendSiteCode" ></EmisSiteSimplePicker1>
</el-form-item>

View File

@ -1358,6 +1358,10 @@ methods: {
this.$refs.popoverFeeRef.doClose();
if(item!=null){
let newItem=Object.assign({},item)
if(!this.form.feeItems){
this.form.feeItems=[];
}
this.form.feeItems.push(newItem);
this.handleCalcFeeItem();
}
@ -1441,20 +1445,19 @@ methods: {
this.form.attachmentList=[];
}
if(!this.form.feeItems){
this.form.feeItems=[];
}
if(!this.form.cargoList){
this.form.cargoList=[];
}
// 接单处理
if(this.addFrom=="userOrder"){
if(!this.form.feeItems){
this.form.feeItems=[];
}
if(!this.form.cargoList){
this.form.cargoList=[];
}
// 获取可用运单数
this.initGetTotalAvailablePag(this.form.sendSiteCode);
this.startTimer();
}

View File

@ -1358,6 +1358,10 @@ methods: {
this.$refs.popoverFeeRef.doClose();
if(item!=null){
let newItem=Object.assign({},item)
if(!this.form.feeItems){
this.form.feeItems=[];
}
this.form.feeItems.push(newItem);
this.handleCalcFeeItem();
}
@ -1441,20 +1445,19 @@ methods: {
this.form.attachmentList=[];
}
if(!this.form.feeItems){
this.form.feeItems=[];
}
if(!this.form.cargoList){
this.form.cargoList=[];
}
// 接单处理
if(this.addFrom=="userOrder"){
if(!this.form.feeItems){
this.form.feeItems=[];
}
if(!this.form.cargoList){
this.form.cargoList=[];
}
// 获取可用运单数
this.initGetTotalAvailablePag(this.form.sendSiteCode);
this.startTimer();
}