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

Merge pull request 'master-dev' (#83) from master-dev into develop

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/83
This commit is contained in:
wuteng 2025-09-05 11:43:27 +08:00
commit 37f3f87804
3 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceHasOpenPanel.vue
View File

@ -7,6 +7,7 @@
<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="3" label="3">发票号</el-radio>
</el-radio-group>
</div>
<XdTextareaInput
@ -210,13 +211,13 @@
<el-tag v-if="scope.row.blAudit=='2'" type="error">审核不通过</el-tag>
</template>
</el-table-column>
<el-table-column :label="$t('收款状态')" align="center" prop="paymentStatus" width="100" >
<!-- <el-table-column :label="$t('收款状态')" align="center" prop="paymentStatus" width="100" >
<template slot-scope="scope">
<el-tag v-if="scope.row.paymentStatus=='0'" type="error">未收款</el-tag>
<el-tag v-if="scope.row.paymentStatus=='1'" type="success">已收款</el-tag>
<el-tag v-if="scope.row.paymentStatus=='2'" type="warning">部分收款</el-tag>
</template>
</el-table-column>
</el-table-column> -->
<el-table-column :label="$t('驳回原因')" align="center" prop="auditNote" min-width="100" :show-overflow-tooltip="true"/>
<!-- <el-table-column :label="$t('状态描述')" align="center" prop="invoiceStatusDesc" min-width="100" :show-overflow-tooltip="true"/> -->
@ -239,7 +240,7 @@
<!-- <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="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="applySeqNo" min-width="170" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('申请人')" align="center" prop="createByName" min-width="100" :show-overflow-tooltip="true"/>
@ -374,9 +375,10 @@ export default {
openComCode: null,
delFlag: null,
paymentStatus:null,
invoiceNo:null,
params:{
billCode:null,
invoiceNo:null,
// invoiceNo:null,
}
},
};
@ -464,10 +466,17 @@ export default {
if(this.queryOrderType=="1"){
this.queryParams.params.billCode=this.queryParams.queryCode;
this.queryParams.settleBillNo=null;
this.queryParams.invoiceNo=null;
}
else if(this.queryOrderType=="2"){
this.queryParams.params.billCode=null;
this.queryParams.settleBillNo=this.queryParams.queryCode;
this.queryParams.invoiceNo=null;
}
else if(this.queryOrderType=="3"){ //发票查询
this.queryParams.params.billCode=null;
this.queryParams.settleBillNo=null;
this.queryParams.invoiceNo=this.queryParams.queryCode;
}
listEmisSettleInvoiceRecord(this.addDateRange(this.queryParams, this.dateTimeRange,'createTime')).then(response => {

4
src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceRecordDealListPanel.vue
View File

@ -201,12 +201,12 @@
<el-tag v-if="scope.row.blAudit=='2'" type="error">审核不通过</el-tag>
</template>
</el-table-column>
<el-table-column :label="$t('收款状态')" align="center" prop="paymentStatus" width="100" >
<!-- <el-table-column :label="$t('收款状态')" align="center" prop="paymentStatus" width="100" >
<template slot-scope="scope">
<el-tag v-if="scope.row.paymentStatus=='0'" type="error">未收款</el-tag>
<el-tag v-if="scope.row.paymentStatus=='1'" type="success">已收款</el-tag>
</template>
</el-table-column>
</el-table-column> -->
<!-- <el-tag v-if="scope.row.paymentStatus=='2'" type="warning">部分收款</el-tag> -->
<el-table-column :label="$t('驳回原因')" align="center" prop="auditNote" min-width="100" :show-overflow-tooltip="true"/>

18
src/views/emis/emisWaybill/waybillGot.vue
View File

@ -1718,15 +1718,19 @@ methods: {
}
// });
// 获取企业税号
if(['2', '4', '5'].includes(this.form.paymentType) || this.form.customerType == 2){ // 月结或者月结客户
if(['2', '4', '5'].includes(this.form.paymentType) || this.form.customerType == 2 || this.form.mainUserId){ // 月结单 或者 月结客户现金单 或者 月结客户子账户现金单
let params = {
pageNum: 1, pageSize: 1, customerType: 2
}
if (['2', '4', '5'].includes(this.form.paymentType)) {
params.monthlyPayCode = this.form.custNo; // 支付类型为月结
} else {
params.customerCode = this.form.customerCode; // 月结客户下单的现金单
pageNum: 1, pageSize: 1
}
if (this.form.mainUserId) {
params.id = this.form.mainUserId;
} else {
if (['2', '4', '5'].includes(this.form.paymentType)) {
params.monthlyPayCode = this.form.custNo; // 支付类型为月结
} else {
params.customerCode = this.form.customerCode; // 月结客户下单的现金单
}
}
const res = await listMonthUserAll(params);
if(res.rows.length > 0){