Skip to content

S
SuperMan
Commit cbe79f5e authored by liudong1993's avatar liudong1993
Browse files
Options

1 报销单发票

parent a093b0a1
Hide whitespace changes
Inline Side-by-side
Showing with 554 additions and 7 deletions
src/components/FinancialModule/BasicDocuments.vue
View file @ cbe79f5e
...@@ -801,6 +801,107 @@ ...@@ -801,6 +801,107 @@
text-decoration: underline; text-decoration: underline;
} }
.bx_table {
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'PingFang SC', 'Microsoft YaHei', sans-serif;
}
.bx_table-section {
display: flex;
flex-direction: column;
align-items: center;
margin-top: 10px;
}
.bx_table-title {
font-weight: 600;
margin-bottom: 12px;
font-size: 16px;
}
.bx_table-receipt {
border-collapse: collapse;
width: 100%;
max-width: 520px;
margin: 0 auto;
border: 1px solid #c94052;
border-radius: 6px;
overflow: hidden;
box-shadow: 0 2px 8px rgba(201, 64, 82, 0.1);
background-color: #fff;
}
.bx_table-receipt thead {
background-color: #f8f9fa;
}
.bx_table-receipt th {
color: #fff;
font-weight: 600;
padding: 12px 8px;
text-align: center;
vertical-align: middle;
border-bottom: 2px solid #b33848;
font-size: 14px;
}
.bx_table-receipt td {
padding: 10px 8px;
text-align: center;
vertical-align: middle;
border-bottom: 1px solid #f0f0f0;
color: #333;
font-size: 14px;
}
.bx_table-receipt tbody tr:nth-child(even) {
background-color: #fafafa;
}
.bx_table-receipt tbody tr:hover {
background-color: #fff5f5;
transition: background-color 0.3s ease;
}
.bx_table-finance-id {
color: #1890ff;
cursor: pointer;
text-decoration: none;
transition: all 0.3s ease;
padding: 2px 6px;
border-radius: 3px;
}
.bx_table-finance-id:hover {
color: #40a9ff;
background-color: #f0f8ff;
text-decoration: underline;
}
.bx_table-receipt {
font-size: 12px;
width: 510px;
}
.bx_table-receipt th,
.bx_table-receipt td {
padding: 8px 4px;
}
.bx_table-title {
font-size: 14px;
}
/* 表格空状态样式 */
.bx_table-receipt:empty::before {
content: "暂无数据";
display: table-cell;
text-align: center;
padding: 20px;
color: #999;
}
</style> </style>
<template> <template>
...@@ -1064,7 +1165,7 @@ ...@@ -1064,7 +1165,7 @@
@click="goSigningCustomer(GetDetail.SigningCustomerId,GetDetail.SigningCustomerName)">{{$t('objFill.contractcustomer')}}：{{GetDetail.SigningCustomerName}}</span></a> @click="goSigningCustomer(GetDetail.SigningCustomerId,GetDetail.SigningCustomerName)">{{$t('objFill.contractcustomer')}}：{{GetDetail.SigningCustomerName}}</span></a>
</div> </div>
</div> </div>
<div class="_fujian_box" v-if="(GetDetail.VorcherInos&&GetDetail.VorcherInos.length>0)||(GetDetail.KingdeeInvoice&&(GetDetail.KingdeeInvoice==1||GetDetail.KingdeeInvoice==3) )"> <div class="_fujian_box" v-if="(GetDetail.VorcherInos&&GetDetail.VorcherInos.length>0)||(GetDetail.KingdeeInvoice&&(GetDetail.KingdeeInvoice==1||GetDetail.KingdeeInvoice==3) || GetDetail.BXType==3)">
<div > <div >
<div class="_fujian_zhankai cursorpointer" v-if="!fujianShow" @click="fujianShow = true"> <div class="_fujian_zhankai cursorpointer" v-if="!fujianShow" @click="fujianShow = true">
<span>{{$t('objFill.fj')}}</span> <span>{{$t('objFill.fj')}}</span>
...@@ -1158,6 +1259,74 @@ ...@@ -1158,6 +1259,74 @@
</template> </template>
</div> </div>
</div> </div>
<!-- 报销单发票明细 -->>
<div v-if="GetDetail.BXType==3" style="border-top: 1px solid #dedede;margin-top: 10px;
padding: 0 0 10px 0;">
<div class="bx_table" v-if="InvoiceBXList.length>0">
<table class="Receipt_table" border="1" bordercolor="#c94052" style="border-collapse:collapse;margin-top: 10px;width:510px">
<tr style="height:30px;font-size: 14px;">
<th>发票日期</th>
<th>发票金额</th>
<th>发票单位</th>
<th width="80px" v-if="(GetDetail.CreateBy==userInfo.EmployeeId
||GetDetail.InvoiceExamineBy==userInfo.EmployeeId
||ActionMenuCode.indexOf('F_Query_AllIncomPay')!= -1)">
<el-tooltip content="添加一行" placement="top">
<i class="el-icon-circle-plus" style="color:#5cb6ff;cursor: pointer;" @click="BXInvoiceAdd()"></i></el-tooltip>
<el-tooltip content="提交保存" placement="top">
<i class="el-icon-success" style="color:#5cb6ff;cursor: pointer;" @click="updateFinanceBXInvoice()"></i></el-tooltip>
</th>
<th width="80px" v-else>操作</th>
</tr>
<tr class="_color_b" v-for="(BXitem,BXIndex) in InvoiceBXList" :key="BXIndex">
<td height="26px">
<el-date-picker format="yyyy-MM-dd" value-format="yyyy-MM-dd" clearable class="w135 _border_b_1"
v-model="BXitem.CreateDate" type="datetime" placeholder="请选择发票日期" align="right">
</el-date-picker>
</td>
<td height="26px"><el-input class="w120 _border_b_1" type="Number" v-model="BXitem.ShareMoney" placeholder="请输入发票金额"></el-input></td>
<td height="26px"><el-input class="w190 _border_b_1" v-model="BXitem.KRemark" placeholder="请输入发票单位"></el-input></td>
<td height="26px" style="text-align: center;"><i v-if="(GetDetail.CreateBy==userInfo.EmployeeId
||GetDetail.InvoiceExamineBy==userInfo.EmployeeId
||ActionMenuCode.indexOf('F_Query_AllIncomPay')!= -1)" class="el-icon-delete" style="color:red;cursor: pointer;" @click="BXInvoiceDel(BXIndex)"></i></td>
</tr>
</table>
</div>
<div v-else>
待后补发票信息
</div>
<div class="bx_table" v-if="InvoiceBXRepeatList.length>0">
<div class="bx_table-section">
<p class="bx_table-title">可能重复单号：</p>
<table class="bx_table-receipt">
<thead>
<tr>
<th>财务单号</th>
<th>发票日期</th>
<th>发票金额</th>
<th>发票单位</th>
</tr>
</thead>
<tbody>
<tr v-for="(ritem,rIndex) in InvoiceBXRepeatList" :key="rIndex">
<td>
<span class="bx_table-finance-id" @click="goBxFinanceDetail(ritem.BaseFinanceId)">
{{ritem.BaseFinanceId}}
</span>
</td>
<td>{{ritem.CreateDate}}</td>
<td>{{ritem.ShareMoney}}</td>
<td>{{ritem.KRemark}}</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div> </div>
</div> </div>
<div class="w890px"> <div class="w890px">
...@@ -2291,6 +2460,13 @@ class="w135 _border_b_1"> ...@@ -2291,6 +2460,13 @@ class="w135 _border_b_1">
export default { export default {
data() { data() {
return { return {
InvoiceBXList: [],
InvoiceBXModel:{
CreateDate:'',
ShareMoney:null,
KRemark:''
},
InvoiceBXRepeatList: [],//报销发票重复
InvoiceVoucherListImg: [], InvoiceVoucherListImg: [],
isCostTypeId: false,//地接费（领取）用款计划 isCostTypeId: false,//地接费（领取）用款计划
PaymentMethodList:[ PaymentMethodList:[
...@@ -4228,6 +4404,14 @@ else if (Type==2) { ...@@ -4228,6 +4404,14 @@ else if (Type==2) {
if(DetailList&&DetailList.length>0){ if(DetailList&&DetailList.length>0){
this.isCostTypeId = true this.isCostTypeId = true
} }
//处理报销单 发票信息
if(this.GetDetail.BXType==3 && this.GetDetail.InvoiceBXInfo){
this.InvoiceBXList = JSON.parse(this.GetDetail.InvoiceBXInfo);
if(this.InvoiceBXList.length>0){
this.getBXInvoiceRepeatList(this.GetDetail.FrID);
}
}
} }
}, err => {}) }, err => {})
}, },
...@@ -4414,6 +4598,55 @@ else if (Type==2) { ...@@ -4414,6 +4598,55 @@ else if (Type==2) {
} }
}, err => {}) }, err => {})
}, },
// 获取报销单 发票重复
getBXInvoiceRepeatList(frid) {
this.apipost("Financial_post_GetBXInvoiceRepeatList", {
FrId: frid
}, res => {
if (res.data.resultCode == 1) {
this.InvoiceBXRepeatList = res.data.data;
}
}, err => {})
},
updateFinanceBXInvoice(){
this.$confirm('确认提交发票明细保存吗？', this.$t("tips.tips"), {
confirmButtonText: this.$t("pub.sureBtn"),
cancelButtonText: this.$t("pub.cancelBtn"),
type: "warning"
})
.then(() => {
this.apipost("Financial_post_UpdateFinanceBXInvoice", {
FrId: this.GetDetail.FrID,InvoiceBXInfo: this.InvoiceBXList
}, res => {
if (res.data.resultCode == 1) {
this.$message.success('保存成功');
this.Financial_post_GetDetail(this.GetDetail.FrID);
}
}, err => {})
})
.catch(() => {
});
},
goBxFinanceDetail(frid){
this.$router.push({
name: 'FinancialDocumentsDetail',
query: {
id: frid,
blank: "y",
tab: '单据详情'
}
});
},
BXInvoiceAdd(){
this.InvoiceBXList.push(JSON.parse(JSON.stringify(this.InvoiceBXModel)));
},
BXInvoiceDel(index){
if(this.InvoiceBXList.length<=1){
return;
}
this.InvoiceBXList.splice(index, 1);
}
}, },
created() { created() {
if (this.$route.query.pageIndex) { if (this.$route.query.pageIndex) {
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ cbe79f5e
...@@ -795,6 +795,106 @@ ...@@ -795,6 +795,106 @@
text-decoration: underline; text-decoration: underline;
} }
.bx_table {
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'PingFang SC', 'Microsoft YaHei', sans-serif;
}
.bx_table-section {
display: flex;
flex-direction: column;
align-items: center;
margin-top: 10px;
}
.bx_table-title {
font-weight: 600;
margin-bottom: 12px;
font-size: 16px;
}
.bx_table-receipt {
border-collapse: collapse;
width: 100%;
max-width: 520px;
margin: 0 auto;
border: 1px solid #c94052;
border-radius: 6px;
overflow: hidden;
box-shadow: 0 2px 8px rgba(201, 64, 82, 0.1);
background-color: #fff;
}
.bx_table-receipt thead {
background-color: #f8f9fa;
}
.bx_table-receipt th {
color: #fff;
font-weight: 600;
padding: 12px 8px;
text-align: center;
vertical-align: middle;
border-bottom: 2px solid #b33848;
font-size: 14px;
}
.bx_table-receipt td {
padding: 10px 8px;
text-align: center;
vertical-align: middle;
border-bottom: 1px solid #f0f0f0;
color: #333;
font-size: 14px;
}
.bx_table-receipt tbody tr:nth-child(even) {
background-color: #fafafa;
}
.bx_table-receipt tbody tr:hover {
background-color: #fff5f5;
transition: background-color 0.3s ease;
}
.bx_table-finance-id {
color: #1890ff;
cursor: pointer;
text-decoration: none;
transition: all 0.3s ease;
padding: 2px 6px;
border-radius: 3px;
}
.bx_table-finance-id:hover {
color: #40a9ff;
background-color: #f0f8ff;
text-decoration: underline;
}
.bx_table-receipt {
font-size: 12px;
width: 510px;
}
.bx_table-receipt th,
.bx_table-receipt td {
padding: 8px 4px;
}
.bx_table-title {
font-size: 14px;
}
/* 表格空状态样式 */
.bx_table-receipt:empty::before {
content: "暂无数据";
display: table-cell;
text-align: center;
padding: 20px;
color: #999;
}
</style> </style>
<template> <template>
...@@ -1095,7 +1195,7 @@ ...@@ -1095,7 +1195,7 @@
<!-- <myDJieBill v-if="GetDetail.DijieBathFinanceList && GetDetail.DijieBathFinanceList.length" :ID="GetDetail.FrID" :isPrintPage="false" :width="widthSon" :color="colorSon"/> --> <!-- <myDJieBill v-if="GetDetail.DijieBathFinanceList && GetDetail.DijieBathFinanceList.length" :ID="GetDetail.FrID" :isPrintPage="false" :width="widthSon" :color="colorSon"/> -->
<!--<my-C-Bill v-if="GetDetail.CashierDetail&&GetDetail.CashierDetail.length&&GetDetail.Type!=1" :ID="GetDetail.FrID" :width="widthSon" :color="colorSon"></my-C-Bill>--> <!--<my-C-Bill v-if="GetDetail.CashierDetail&&GetDetail.CashierDetail.length&&GetDetail.Type!=1" :ID="GetDetail.FrID" :width="widthSon" :color="colorSon"></my-C-Bill>-->
<div class="_fujian_box" <div class="_fujian_box"
v-if="(GetDetail.VorcherInos&&GetDetail.VorcherInos.length>0) ||(GetDetail.InvoiceVoucherInfo&&GetDetail.InvoiceVoucherInfo.length>0) || saveMsg.length>0"> v-if="(GetDetail.VorcherInos&&GetDetail.VorcherInos.length>0) ||(GetDetail.InvoiceVoucherInfo&&GetDetail.InvoiceVoucherInfo.length>0) || saveMsg.length>0 || GetDetail.BXType==3">
<div> <div>
<div class="_fujian_zhankai cursorpointer" v-if="!fujianShow" @click="fujianShow = true"> <div class="_fujian_zhankai cursorpointer" v-if="!fujianShow" @click="fujianShow = true">
<span>{{$t('objFill.fj')}}</span> <span>{{$t('objFill.fj')}}</span>
...@@ -1232,6 +1332,72 @@ ...@@ -1232,6 +1332,72 @@
</div> </div>
</template> </template>
</div> </div>
<div v-if="GetDetail.BXType==3" style="border-top: 1px solid #dedede;margin-top: 10px;
padding: 0 0 10px 0;">
<div class="bx_table" v-if="InvoiceBXList.length>0">
<table class="Receipt_table" border="1" bordercolor="#c94052" style="border-collapse:collapse;margin-top: 10px;width:510px">
<tr style="height:30px;font-size: 14px;">
<th>发票日期</th>
<th>发票金额</th>
<th>发票单位</th>
<th width="80px" v-if="(GetDetail.CreateBy==userInfo.EmployeeId
||GetDetail.InvoiceExamineBy==userInfo.EmployeeId
||ActionMenuCode.indexOf('F_Query_AllIncomPay')!= -1)">
<el-tooltip content="添加一行" placement="top">
<i class="el-icon-circle-plus" style="color:#5cb6ff;cursor: pointer;" @click="BXInvoiceAdd()"></i></el-tooltip>
<el-tooltip content="提交保存" placement="top">
<i class="el-icon-success" style="color:#5cb6ff;cursor: pointer;" @click="updateFinanceBXInvoice()"></i></el-tooltip>
</th>
<th width="80px" v-else>操作</th>
</tr>
<tr class="_color_b" v-for="(BXitem,BXIndex) in InvoiceBXList" :key="BXIndex">
<td height="26px">
<el-date-picker format="yyyy-MM-dd" value-format="yyyy-MM-dd" clearable class="w135 _border_b_1"
v-model="BXitem.CreateDate" type="datetime" placeholder="请选择发票日期" align="right">
</el-date-picker>
</td>
<td height="26px"><el-input class="w120 _border_b_1" type="Number" v-model="BXitem.ShareMoney" placeholder="请输入发票金额"></el-input></td>
<td height="26px"><el-input class="w190 _border_b_1" v-model="BXitem.KRemark" placeholder="请输入发票单位"></el-input></td>
<td height="26px" style="text-align: center;"><i v-if="(GetDetail.CreateBy==userInfo.EmployeeId
||GetDetail.InvoiceExamineBy==userInfo.EmployeeId
||ActionMenuCode.indexOf('F_Query_AllIncomPay')!= -1)" class="el-icon-delete" style="color:red;cursor: pointer;" @click="BXInvoiceDel(BXIndex)"></i></td>
</tr>
</table>
</div>
<div v-else>
待后补发票信息
</div>
<div class="bx_table" v-if="InvoiceBXRepeatList.length>0">
<div class="bx_table-section">
<p class="bx_table-title">可能重复单号：</p>
<table class="bx_table-receipt">
<thead>
<tr>
<th>财务单号</th>
<th>发票日期</th>
<th>发票金额</th>
<th>发票单位</th>
</tr>
</thead>
<tbody>
<tr v-for="(ritem,rIndex) in InvoiceBXRepeatList" :key="rIndex">
<td>
<span class="bx_table-finance-id" @click="goBxFinanceDetail(ritem.BaseFinanceId)">
{{ritem.BaseFinanceId}}
</span>
</td>
<td>{{ritem.CreateDate}}</td>
<td>{{ritem.ShareMoney}}</td>
<td>{{ritem.KRemark}}</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div> </div>
...@@ -1646,6 +1812,13 @@ ...@@ -1646,6 +1812,13 @@
export default { export default {
data() { data() {
return { return {
InvoiceBXList: [],
InvoiceBXModel:{
CreateDate:'',
ShareMoney:null,
KRemark:''
},
InvoiceBXRepeatList: [],//报销发票重复
InvoiceVoucherListImg: [], InvoiceVoucherListImg: [],
InvoiceVoucherList: [], //发票附件 InvoiceVoucherList: [], //发票附件
isCostTypeId: false, //地接费（领取）用款计划 isCostTypeId: false, //地接费（领取）用款计划
...@@ -2955,6 +3128,13 @@ ...@@ -2955,6 +3128,13 @@
if (DetailList && DetailList.length > 0) { if (DetailList && DetailList.length > 0) {
this.isCostTypeId = true this.isCostTypeId = true
} }
//处理报销单 发票信息
if(this.GetDetail.BXType==3 && this.GetDetail.InvoiceBXInfo){
this.InvoiceBXList = JSON.parse(this.GetDetail.InvoiceBXInfo);
if(this.InvoiceBXList.length>0){
this.getBXInvoiceRepeatList(this.GetDetail.FrID);
}
}
} }
}, err => {}) }, err => {})
}, },
...@@ -2989,6 +3169,55 @@ ...@@ -2989,6 +3169,55 @@
blank: 'y' blank: 'y'
}, },
}) })
},
// 获取报销单 发票重复
getBXInvoiceRepeatList(frid) {
this.apipost("Financial_post_GetBXInvoiceRepeatList", {
FrId: frid
}, res => {
if (res.data.resultCode == 1) {
this.InvoiceBXRepeatList = res.data.data;
}
}, err => {})
},
updateFinanceBXInvoice(){
this.$confirm('确认提交发票明细保存吗？', this.$t("tips.tips"), {
confirmButtonText: this.$t("pub.sureBtn"),
cancelButtonText: this.$t("pub.cancelBtn"),
type: "warning"
})
.then(() => {
this.apipost("Financial_post_UpdateFinanceBXInvoice", {
FrId: this.GetDetail.FrID,InvoiceBXInfo: this.InvoiceBXList
}, res => {
if (res.data.resultCode == 1) {
this.$message.success('保存成功');
this.Financial_post_GetDetail(this.GetDetail.FrID);
}
}, err => {})
})
.catch(() => {
});
},
goBxFinanceDetail(frid){
this.$router.push({
name: 'FinancialDocumentsDetail',
query: {
id: frid,
blank: "y",
tab: '单据详情'
}
});
},
BXInvoiceAdd(){
this.InvoiceBXList.push(JSON.parse(JSON.stringify(this.InvoiceBXModel)));
},
BXInvoiceDel(index){
if(this.InvoiceBXList.length<=1){
return;
}
this.InvoiceBXList.splice(index, 1);
} }
}, },
mounted() { mounted() {
......
src/components/FinancialModule/addFinancialDocuments.vue
View file @ cbe79f5e
...@@ -1050,6 +1050,40 @@ ...@@ -1050,6 +1050,40 @@
</el-tooltip> </el-tooltip>
</span> </span>
</div> </div>
<!-- 发票信息 -->
<p v-if="InvoiceBXShow" style="margin-top:15px">
<span style="color:red;">
报销发票信息：
<el-tooltip class="item" effect="dark" content="现要求报销单需上传发票信息，用于核实发票重复上传" placement="top-start">
<i class="el-tooltip el-icon-info"></i>
</el-tooltip>
</span>
<span style="margin-left:15px">
发票后补：
<el-tooltip content="发票后补开启，提单时则无需填入发票信息，后补后财务审核" placement="top">
<el-switch v-model="InvoiceBXHB"></el-switch>
</el-tooltip>
</span>
</p>
<table v-if="InvoiceBXShow" class="Receipt_table" border="1" bordercolor="#c94052"
style="border-collapse:collapse;margin-top: 10px;">
<tr style="height:30px">
<th>开票日期</th>
<th>开票金额</th>
<th>开票单位</th>
<th><i class="el-icon-circle-plus" style="color:#5cb6ff;cursor: pointer;" @click="BXInvoiceAdd()"></i></th>
</tr>
<tr class="_color_b" v-for="(BXitem,BXIndex) in InvoiceBXList" :key="BXIndex">
<td height="26px">
<el-date-picker format="yyyy-MM-dd" value-format="yyyy-MM-dd" clearable class="w160 _border_b_1"
v-model="BXitem.CreateDate" type="datetime" placeholder="请选择发票日期" align="right">
</el-date-picker>
</td>
<td height="26px"><el-input class="w120 _border_b_1" type="Number" v-model="BXitem.ShareMoney" placeholder="请输入发票金额"></el-input></td>
<td height="26px"><el-input class="w190 _border_b_1" v-model="BXitem.KRemark" placeholder="请输入发票单位"></el-input></td>
<td height="26px"><i class="el-icon-delete" style="color:red;cursor: pointer;" @click="BXInvoiceDel(BXIndex)"></i></td>
</tr>
</table>
</div> </div>
...@@ -1197,6 +1231,14 @@ import SpecialList from '../SalesModule/SpecialList.vue'; ...@@ -1197,6 +1231,14 @@ import SpecialList from '../SalesModule/SpecialList.vue';
isDepositCustomer: false, isDepositCustomer: false,
ContractCustomer: null, ContractCustomer: null,
DepositCustomer: null, DepositCustomer: null,
InvoiceBXShow: false,
InvoiceBXHB:false,
InvoiceBXList: [],
InvoiceBXModel:{
CreateDate:'',
ShareMoney:null,
KRemark:''
},
CustomerIdList: [], CustomerIdList: [],
StoredCustomerList: [], StoredCustomerList: [],
yballPriceTo: 0, //原币合计 yballPriceTo: 0, //原币合计
...@@ -2123,6 +2165,15 @@ import SpecialList from '../SalesModule/SpecialList.vue'; ...@@ -2123,6 +2165,15 @@ import SpecialList from '../SalesModule/SpecialList.vue';
} }
} }
//
if(this.InvoiceBXShow){
if(this.InvoiceBXHB==false && this.InvoiceBXList.filter(x=>{return x.KRemark !=''}).length==0){
this.Error("请输入报销发票信息,或选择发票后补");
return;
}
this.msg.InvoiceBXInfo = JSON.stringify(this.InvoiceBXList);
}
// 是否是日本客户 // 是否是日本客户
let that = this let that = this
let ClientAccountObj = this.ClientAccountList.find(x => { let ClientAccountObj = this.ClientAccountList.find(x => {
...@@ -2307,6 +2358,13 @@ import SpecialList from '../SalesModule/SpecialList.vue'; ...@@ -2307,6 +2358,13 @@ import SpecialList from '../SalesModule/SpecialList.vue';
if (x.yTotalPrice) { if (x.yTotalPrice) {
ybsumprice += Number(x.yTotalPrice); ybsumprice += Number(x.yTotalPrice);
} }
if(((this.GetDetail.BXType==2 && this.msg.OrderSource!=8 &&this.msg.OrderSource!=10 && this.msg.OrderID<=0 && this.msg.OtherType !=55&& this.msg.OtherType !=61&& this.msg.OtherType !=66
&& this.msg.OtherType !=67&& this.msg.OtherType !=80&& this.msg.OtherType !=83)||this.GetDetail.BXType==3) && x.IsM == 11){
this.InvoiceBXShow=true;
if(this.InvoiceBXList.length==0){
this.InvoiceBXList.push(JSON.parse(JSON.stringify(this.InvoiceBXModel)));
}
}
}) })
this.$forceUpdate() this.$forceUpdate()
this.allPrice = allPrice; this.allPrice = allPrice;
...@@ -2399,7 +2457,7 @@ import SpecialList from '../SalesModule/SpecialList.vue'; ...@@ -2399,7 +2457,7 @@ import SpecialList from '../SalesModule/SpecialList.vue';
if (t >= 0) { if (t >= 0) {
this.msg.detailList[t].CostTypeName = x.Name; this.msg.detailList[t].CostTypeName = x.Name;
this.msg.detailList[t].IsAdvance = x.IsA; this.msg.detailList[t].IsAdvance = x.IsA;
console.log('ld1:'+x.IsA); this.msg.detailList[t].IsM = x.IsM;
if (x.ID === 56) { if (x.ID === 56) {
this.msg.detailList[t].Remark = this.orderObj.TCNUMS ? this.msg.detailList[t].Remark = this.orderObj.TCNUMS ?
`${this.$t('objFill.dijiefeilqzdsc')}：${this.orderObj.TCNUMS}` : ''; `${this.$t('objFill.dijiefeilqzdsc')}：${this.orderObj.TCNUMS}` : '';
...@@ -2407,6 +2465,7 @@ import SpecialList from '../SalesModule/SpecialList.vue'; ...@@ -2407,6 +2465,7 @@ import SpecialList from '../SalesModule/SpecialList.vue';
} else { } else {
this.detailList.CostTypeName = x.Name; this.detailList.CostTypeName = x.Name;
this.detailList.IsAdvance = x.IsA; this.detailList.IsAdvance = x.IsA;
this.detailList.IsM = x.IsM;
if (x.ID === 56) { if (x.ID === 56) {
this.detailList.Remark = this.orderObj.TCNUMS ? this.detailList.Remark = this.orderObj.TCNUMS ?
`${this.$t('objFill.dijiefeilqzdsc')}：${this.orderObj.TCNUMS}` : ''; `${this.$t('objFill.dijiefeilqzdsc')}：${this.orderObj.TCNUMS}` : '';
...@@ -2930,7 +2989,16 @@ import SpecialList from '../SalesModule/SpecialList.vue'; ...@@ -2930,7 +2989,16 @@ import SpecialList from '../SalesModule/SpecialList.vue';
this.loading = false; this.loading = false;
this.$message.error(res.data.message); this.$message.error(res.data.message);
} }
//处理报销 发票信息 InvoiceBXList
if(this.GetDetail.InvoiceBXInfo){
this.InvoiceBXList = JSON.parse(this.GetDetail.InvoiceBXInfo);
}
if(this.GetDetail.BXType==3){
this.InvoiceBXShow=true;
if(this.InvoiceBXList.length==0){
this.InvoiceBXList.push(JSON.parse(JSON.stringify(this.InvoiceBXModel)));
}
}
}, err => {}) }, err => {})
}, },
admin_get_DepartmentGetList(Bid, T) { admin_get_DepartmentGetList(Bid, T) {
...@@ -3284,6 +3352,12 @@ if(this.FinanceRefundEnumList.RefundProcessIdList!=null&&this.FinanceRefundEnumL ...@@ -3284,6 +3352,12 @@ if(this.FinanceRefundEnumList.RefundProcessIdList!=null&&this.FinanceRefundEnumL
} }
}, },
BXInvoiceAdd(){
this.InvoiceBXList.push(JSON.parse(JSON.stringify(this.InvoiceBXModel)));
},
BXInvoiceDel(index){
this.InvoiceBXList.splice(index, 1);
}
}, },
created() { created() {
var that = this; var that = this;
......
src/components/systemManagement/CostType.vue
View file @ cbe79f5e
...@@ -446,6 +446,13 @@ ...@@ -446,6 +446,13 @@
<el-input v-model="addMsg.PrioritySort"></el-input><span>*{{$t('objFill.shuzidakq')}}</span> <el-input v-model="addMsg.PrioritySort"></el-input><span>*{{$t('objFill.shuzidakq')}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4">
<el-form-item :label="'科目标记：'">
<el-select filterable v-model='addMsg.MarkType'>
<el-option label="报销费用" :value='11'></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
</div> </div>
...@@ -512,7 +519,8 @@ ...@@ -512,7 +519,8 @@
list:[], list:[],
Is_Report:0, Is_Report:0,
IsSecret:0, IsSecret:0,
PrioritySort:0 PrioritySort:0,
MarkType: null
}, },
EmployeeIDList:[], EmployeeIDList:[],
text:'', text:'',
...@@ -896,7 +904,8 @@ ...@@ -896,7 +904,8 @@
list:[], list:[],
Is_Report:0, Is_Report:0,
IsSecret:0, IsSecret:0,
PrioritySort:0 PrioritySort:0,
MarkType:null
} }
if(!t){ if(!t){
this.addShow=false this.addShow=false
...@@ -956,6 +965,7 @@ ...@@ -956,6 +965,7 @@
this.addMsg.Is_Report = dataList.Is_Report; this.addMsg.Is_Report = dataList.Is_Report;
this.addMsg.IsSecret = dataList.IsSecret; this.addMsg.IsSecret = dataList.IsSecret;
this.addMsg.PrioritySort = dataList.PrioritySort; this.addMsg.PrioritySort = dataList.PrioritySort;
this.addMsg.MarkType = dataList.MarkType;
// this.addMsg = dataList; // this.addMsg = dataList;
if(dataList.DepartList.length>0){ if(dataList.DepartList.length>0){
...@@ -1005,7 +1015,8 @@ ...@@ -1005,7 +1015,8 @@
list:[], list:[],
Is_Report:0, Is_Report:0,
IsSecret:0, IsSecret:0,
PrioritySort:0 PrioritySort:0,
MarkType:null
} }
this.addMsg = msg; this.addMsg = msg;
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment