aike/emis-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-08-10 10:15:25 +08:00
parent 43e9df183d
commit ed3f65d3c4
8 changed files with 118 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/XdTable/index.vue
View File

@ -881,6 +881,7 @@ export default {
if(currentRow!=-1 && currentRow!=item.row){ if(currentRow!=-1 && currentRow!=item.row){
// 去除末尾的\t // 去除末尾的\t
selStr=this.trimTabChar(selStr,'\t',''); selStr=this.trimTabChar(selStr,'\t','');
selStr=selStr.trim();
selStr=selStr+"\n"; selStr=selStr+"\n";
} }
@ -896,6 +897,9 @@ export default {
selStr=this.trimTabChar(selStr,'\t',''); selStr=this.trimTabChar(selStr,'\t','');
// // console.log("=selStr==>",selStr); // // console.log("=selStr==>",selStr);
// 去除两端空格
selStr=selStr.trim();
this.currentSelectStr=selStr; this.currentSelectStr=selStr;
} }

10
src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue
View File

@ -122,6 +122,7 @@
@click="handleConfirmBySite" @click="handleConfirmBySite"
>确认账单</el-button> >确认账单</el-button>
</el-col> </el-col>
<!-- <el-col :span="1.5" v-if="confirmStatus==1"> <!-- <el-col :span="1.5" v-if="confirmStatus==1">
<el-button <el-button
type="danger" type="danger"
@ -152,6 +153,15 @@
@click="handleExportToBill" @click="handleExportToBill"
>导出EXCEL电子表</el-button> >导出EXCEL电子表</el-button>
</el-col> </el-col>
<el-col :span="1.5" v-if="confirmStatus==1">
<el-button
type="primary"
plain
size="mini"
:disabled="multiple"
@click="handleConfirmBySite"
>微信收款码</el-button>
</el-col>
</el-row> </el-row>
</div> </div>

2
src/views/emis/emisSettleInvoiceChRecord/InvoiceChRecordListReadOnly.vue
View File

@ -194,7 +194,9 @@ export default {
"applySeqNo": { "applySeqNo": {
handler (newValue, oldValue) { handler (newValue, oldValue) {
this.queryParams.applySeqNo = this.applySeqNo; this.queryParams.applySeqNo = this.applySeqNo;
if(this.applySeqNo){
this.getList(); this.getList();
}
}, },
deep: true deep: true
}, },

6
src/views/emis/emisSettleInvoiceRecord/panel/InvoiceDetailPanel.vue
View File

@ -52,9 +52,8 @@
</el-descriptions> </el-descriptions>
</div> </div>
<div> <div v-if="emisSettleInvoiceRecord">
<InvoiceChRecordListReadOnly > </InvoiceChRecordListReadOnly> <InvoiceChRecordListReadOnly :applySeqNo="emisSettleInvoiceRecord.applySeqNo" > </InvoiceChRecordListReadOnly>
</div> </div>
</div> </div>
@ -101,6 +100,7 @@ export default {
this.loading = true; this.loading = true;
if(this.id !=null) { if(this.id !=null) {
this.loading = true; this.loading = true;
getEmisSettleInvoiceRecord(this.id).then(response => { getEmisSettleInvoiceRecord(this.id).then(response => {
this.emisSettleInvoiceRecord = response.data; this.emisSettleInvoiceRecord = response.data;
this.loading = false; this.loading = false;

32
src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordApplyListPanel.vue
View File

@ -315,7 +315,7 @@
>修改</el-button> >修改</el-button>
</el-col> --> </el-col> -->
<el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button <el-button
type="primary" type="primary"
plain plain
@ -324,7 +324,7 @@
:disabled="single" :disabled="single"
@click="handleDownPDF" @click="handleDownPDF"
>下载发票PDF</el-button> >下载发票PDF</el-button>
</el-col> </el-col> -->
<!-- <el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button <el-button
type="danger" type="danger"
@ -336,22 +336,33 @@
v-hasPermi="['emis:emisSettleInvoiceRecord:remove']" v-hasPermi="['emis:emisSettleInvoiceRecord:remove']"
>删除</el-button> >删除</el-button>
</el-col> --> </el-col> -->
<!-- <el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="warning" type="warning"
plain plain
icon="el-icon-download" icon="el-icon-download"
size="mini" size="mini"
@click="handleExport" @click="handleExport"
v-hasPermi="['emis:emisSettleInvoiceRecord:export']"
>导出</el-button> >导出</el-button>
</el-col> --> </el-col>
</el-row> </el-row>
</div> </div>
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('申请时间')" align="center" prop="applyDate" min-width="170" /> <el-table-column :label="$t('申请时间')" align="center" prop="applyDate" 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="settleBillName" min-width="100" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('发票文件')" align="center" prop="filePath" min-width="170" :show-overflow-tooltip="true">
<template slot-scope="scope">
<el-button
v-if="scope.row.invoiceStatus=='2'"
type="primary"
plain
icon="el-icon-download"
size="mini"
@click="handleDownPDF(scope.row)"
>下载发票</el-button>
</template>
</el-table-column>
<el-table-column :label="$t('开票状态')" align="center" prop="invoiceStatus" width="100" > <el-table-column :label="$t('开票状态')" align="center" prop="invoiceStatus" width="100" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.invoiceStatus=='0'" type="info">未开票</el-tag> <el-tag v-if="scope.row.invoiceStatus=='0'" type="info">未开票</el-tag>
@ -379,7 +390,6 @@
<el-tag v-if="scope.row.invoiceType=='3'" type="info">增值税专用发票</el-tag> <el-tag v-if="scope.row.invoiceType=='3'" type="info">增值税专用发票</el-tag>
</template> </template>
</el-table-column> </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="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="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="companyTel" min-width="100" :show-overflow-tooltip="true"/> -->
@ -390,7 +400,7 @@
<!-- <el-table-column :label="$t('开票上限')" align="center" prop="openMoneyMax" 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="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="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="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="createSiteName" min-width="100" :show-overflow-tooltip="true"/>
@ -400,19 +410,19 @@
<el-table-column :label="$t('审核日期')" align="center" prop="auditDate" min-width="170" :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="auditManName" min-width="100" />
<el-table-column :label="$t('操作人')" align="center" prop="opManName" 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="opDate" min-width="100" />
<!-- <el-table-column :label="$t('操作站点')" align="center" prop="opSiteCode" min-width="100" /> --> <el-table-column :label="$t('操作站点')" align="center" prop="opSiteName" min-width="100" />
<!-- <el-table-column :label="$t('开票渠道编号')" align="center" prop="openChId" min-width="100" /> --> <!-- <el-table-column :label="$t('开票渠道编号')" align="center" prop="openChId" min-width="100" /> -->
<!-- <el-table-column :label="$t('开票渠道状态')" align="center" prop="openChStatus" min-width="100" /> --> <!-- <el-table-column :label="$t('开票渠道状态')" align="center" prop="openChStatus" min-width="100" /> -->
<!-- <el-table-column :label="$t('开票渠道描述')" align="center" prop="openChStatusDesc" min-width="100" /> --> <!-- <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="$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="createSiteName" width="80" :show-overflow-tooltip="true"/>
<el-table-column label="创建时间" align="center" prop="createTime" width="170"/> <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="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="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> </XdTable>

10
src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue
View File

@ -7,6 +7,8 @@
<el-tab-pane label="未确认" name="waitConfirm" /> <el-tab-pane label="未确认" name="waitConfirm" />
<el-tab-pane label="已确认" name="hasConfirm" /> <el-tab-pane label="已确认" name="hasConfirm" />
<el-tab-pane label="确认不出账" name="confirmNotBill" /> <el-tab-pane label="确认不出账" name="confirmNotBill" />
<el-tab-pane label="财务置账单异常" name="billError" />
</el-tabs> </el-tabs>
<SearchForm slot="pageTabs" :model="queryParams" ref="queryForm" <SearchForm slot="pageTabs" :model="queryParams" ref="queryForm"
@ -156,7 +158,7 @@
v-hasPermi="['emis:emisSettleSubBill:confirmNoBillByCenter']" v-hasPermi="['emis:emisSettleSubBill:confirmNoBillByCenter']"
>确认不出账</el-button> >确认不出账</el-button>
</el-col> </el-col>
<!-- <el-col :span="1.5" v-if="activeTab=='waitConfirm'"> <el-col :span="1.5" v-if="activeTab=='waitConfirm'">
<el-button <el-button
type="primary" type="primary"
plain plain
@ -164,8 +166,8 @@
:disabled="multiple" :disabled="multiple"
@click="handleSetBillErrorByCenter" @click="handleSetBillErrorByCenter"
v-hasPermi="['emis:emisSettleSubBill:setBillErrorByCenter']" v-hasPermi="['emis:emisSettleSubBill:setBillErrorByCenter']"
>置账单异常</el-button> >置出账异常</el-button>
</el-col> --> </el-col>
<el-col :span="1.5" v-if="activeTab!='waitConfirm'"> <el-col :span="1.5" v-if="activeTab!='waitConfirm'">
<el-button <el-button
type="danger" type="danger"
@ -204,7 +206,7 @@
<div slot="statInfo" style="font-size: 13px;"> <div slot="statInfo" style="font-size: 13px;">
总票数:<span class="statInfoValue">{{queryStatInfoMap?queryStatInfoMap.totalNum:0}}</span>, 总票数:<span class="statInfoValue">{{queryStatInfoMap?queryStatInfoMap.totalNum:0}}</span>,
总运费:<span class="statInfoValue">{{queryStatInfoMap?queryStatInfoMap.totalBillFee:0}}</span> 总运费:<span class="statInfoValue">{{total}}</span>
</div> </div>
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />

8
src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue
View File

@ -6,7 +6,7 @@
<el-tab-pane label="未确认" name="waitConfirm" /> <el-tab-pane label="未确认" name="waitConfirm" />
<el-tab-pane label="已确认" name="hasConfirm" /> <el-tab-pane label="已确认" name="hasConfirm" />
<el-tab-pane label="确认不出账" name="confirmNotBill" /> <el-tab-pane label="确认不出账" name="confirmNotBill" />
<!-- <el-tab-pane label="财务置账单异常" name="billError" /> --> <el-tab-pane label="财务置账单异常" name="billError" />
<!-- <el-tab-pane label="业务置账单异常" name="siteBillError" /> --> <!-- <el-tab-pane label="业务置账单异常" name="siteBillError" /> -->
</el-tabs> </el-tabs>
@ -181,7 +181,7 @@
v-hasPermi="['emis:emisSettleSubBill:confirmNoBillByCenter']" v-hasPermi="['emis:emisSettleSubBill:confirmNoBillByCenter']"
>确认不出账</el-button> >确认不出账</el-button>
</el-col> </el-col>
<!-- <el-col :span="1.5" v-if="activeTab=='waitConfirm'"> <el-col :span="1.5" v-if="activeTab=='waitConfirm'">
<el-button <el-button
type="primary" type="primary"
plain plain
@ -190,7 +190,7 @@
@click="handleSetBillErrorByCenter" @click="handleSetBillErrorByCenter"
v-hasPermi="['emis:emisSettleSubBill:setBillErrorByCenter']" v-hasPermi="['emis:emisSettleSubBill:setBillErrorByCenter']"
>置账单异常</el-button> >置账单异常</el-button>
</el-col> --> </el-col>
<el-col :span="1.5" v-if="activeTab!='waitConfirm'"> <el-col :span="1.5" v-if="activeTab!='waitConfirm'">
<el-button <el-button
type="danger" type="danger"
@ -230,7 +230,7 @@
<div slot="statInfo" style="font-size: 13px;"> <div slot="statInfo" style="font-size: 13px;">
总票数:<span class="statInfoValue">{{queryStatInfoMap?queryStatInfoMap.totalNum:0}}</span>, 总票数:<span class="statInfoValue">{{queryStatInfoMap?queryStatInfoMap.totalNum:0}}</span>,
总运费:<span class="statInfoValue">{{queryStatInfoMap?queryStatInfoMap.totalBillFee:0}}</span> 总运费:<span class="statInfoValue">{{total}}</span>
</div> </div>
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />

78
src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue
View File

@ -6,7 +6,7 @@
<el-tab-pane label="未确认" name="waitConfirm" /> <el-tab-pane label="未确认" name="waitConfirm" />
<el-tab-pane label="已确认" name="hasConfirm" /> <el-tab-pane label="已确认" name="hasConfirm" />
<el-tab-pane label="确认不出账" name="confirmNotBill" /> <el-tab-pane label="确认不出账" name="confirmNotBill" />
<!-- <el-tab-pane label="财务置账单异常" name="billError" /> --> <el-tab-pane label="财务置账单异常" name="billError" />
<!-- <el-tab-pane label="业务置账单异常" name="siteBillError" /> --> <!-- <el-tab-pane label="业务置账单异常" name="siteBillError" /> -->
</el-tabs> </el-tabs>
@ -110,8 +110,19 @@
/> />
</el-form-item> </el-form-item>
<el-form-item label="问题件类型" prop="problemType"> <!-- <el-form-item label="问题件类型" prop="problemType">
<ProblemTypePicker v-model="queryParams.params.problemType" ></ProblemTypePicker> <ProblemTypePicker v-model="queryParams.params.problemType" ></ProblemTypePicker>
</el-form-item> -->
<el-form-item label="问题件方式" prop="params.problemQueryType">
<el-select clearable="" v-model="queryParams.params.problemQueryType" placeholder="请选择">
<el-option label="只查问题件类型" :value="1"></el-option>
<el-option label="剔除问题件类型" :value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item label="问题件类型" prop="params.problemQueryIds">
<ProblemTypeMultiplePicker v-model="queryParams.params.problemQueryIds" ></ProblemTypeMultiplePicker>
</el-form-item> </el-form-item>
</SearchForm> </SearchForm>
@ -389,7 +400,7 @@ import EmisUserSimplePicker2 from '@/views/emis/EmisBaseTools/EmisUserSimplePick
import EmisSiteSimplePicker1 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue'; import EmisSiteSimplePicker1 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
import EmisSiteSimplePicker2 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue'; import EmisSiteSimplePicker2 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
import ProblemTypePicker from '@/views/emis/EmisBaseTools/ProblemTypePicker.vue'; import ProblemTypeMultiplePicker from '@/views/emis/EmisBaseTools/ProblemTypeMultiplePicker.vue';
import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue'; import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue';
import TraceWaybillDetailView from '@/views/emis/customerService/traceWaybillDetailView.vue'; import TraceWaybillDetailView from '@/views/emis/customerService/traceWaybillDetailView.vue';
@ -416,7 +427,7 @@ export default {
EmisSiteSimplePicker1, EmisSiteSimplePicker1,
EmisSiteSimplePicker2, EmisSiteSimplePicker2,
ProblemTypePicker, ProblemTypeMultiplePicker,
TraceWaybillDetailView, TraceWaybillDetailView,
MergeBillForm MergeBillForm
@ -657,7 +668,11 @@ export default {
remark: null, remark: null,
blSign:null, blSign:null,
mergeStatus:null mergeStatus:null,
problemQueryType:null,
problemQueryIds:null,
} }
}, },
}; };
@ -999,19 +1014,56 @@ export default {
this.billName=null; this.billName=null;
} }
}, },
sortFun: function (attr, rev) {
//第一个参数传入info里的prop表示排的是哪一列，第二个参数是升还是降排序
if (rev == undefined) {
rev = 1;
} else {
rev = (rev) ? 1 : -1;
}
return function (a, b) {
a = a[attr];
b = b[attr];
if (a < b) {
return rev * -1;
}
if (a > b) {
return rev * 1;
}
return 0;
}
},
// 排序 查询字段是表格中字段名字 动态取值排序顺序 // 排序 查询字段是表格中字段名字 动态取值排序顺序
handleSortChange(column) { handleSortChange(column) {
console.log("==column.prop==>",column.prop); console.log(column)
if(column.prop=='billCode'){ this.currentPage = 1 // return to the first page after sorting
this.queryParams.params.orderByColumn = 'billCode'; if (column.prop === 'billCode') {
} this.emisSettleSubBillList = this.emisSettleSubBillList.sort(this.sortFun(column.prop, column.order === 'ascending'));
else if(column.prop=='waybillDetail.sendDate'){ console.log(this.emisSettleSubBillList);
this.queryParams.params.orderByColumn = 'sendDate'; } else if (column.prop === 'waybillDetail.sendDate') {
this.emisSettleSubBillList = this.emisSettleSubBillList.sort(this.sortFun(column.prop, column.order === 'ascending'));
console.log(this.emisSettleSubBillList);
}else if (column.prop === 'priority') {
this.emisSettleSubBillList = this.emisSettleSubBillList.sort(this.sortFun(column.prop, column.order === 'ascending'));
console.log(this.emisSettleSubBillList);
} }
// this.showed_data = this.emisSettleSubBillList.slice(0, this.pageSize) // 排序完显示到第一页
console.log('Finished')
// console.log(this.showed_data)
this.queryParams.isAsc = column.order; // console.log("==column.prop==>",column.prop);
this.getList(); // if(column.prop=='billCode'){
// this.queryParams.params.orderByColumn = 'billCode';
// }
// else if(column.prop=='waybillDetail.sendDate'){
// this.queryParams.params.orderByColumn = 'sendDate';
// }
// this.queryParams.isAsc = column.order;
// this.getList();
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */