Commit 789b86ea authored by youjie's avatar youjie

no message

parent 3aa5e1b3
...@@ -531,7 +531,7 @@ ...@@ -531,7 +531,7 @@
</el-table> </el-table>
<div style="padding-bottom:15px"> <div style="padding-bottom:15px">
<el-pagination background @current-change="handleCurrentChanges" <el-pagination background @current-change="handleCurrentChanges"
layout="total,prev, pager, next, jumper" :page-size="pageSize" :total='total'> layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total='total'>
</el-pagination> </el-pagination>
</div> </div>
</div> </div>
...@@ -1155,12 +1155,28 @@ export default { ...@@ -1155,12 +1155,28 @@ export default {
return; return;
} }
let ids let ids
let Money = 0
ids = this.multipleSelection.map(x=>{ return x.FrID}) ids = this.multipleSelection.map(x=>{ return x.FrID})
this.multipleSelection.forEach(x=>{
Money += Number(x.Money*100)
})
if(Money<=0){
this.Error('单据总金额需大于0');
return;
}
let orderObj = { let orderObj = {
OtherType: 75, OtherType: 75,
Money: Money/100,
isVerifyMoney: true,
ReFinanceIds: ids.join(','),//单号 ReFinanceIds: ids.join(','),//单号
ReFinanceId2: 3,//成本 ReFinanceId2: 3,//成本
} }
this.$confirm(`总金额:${orderObj.Money},是否继续生成财务单据`, "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
this.$router.push({ this.$router.push({
name: 'ChoiceAddFinancialDocuments', name: 'ChoiceAddFinancialDocuments',
query: { query: {
...@@ -1169,6 +1185,7 @@ export default { ...@@ -1169,6 +1185,7 @@ export default {
'orderObj': JSON.stringify(orderObj), 'orderObj': JSON.stringify(orderObj),
} }
}); });
})
} }
} }
} }
......
...@@ -1432,8 +1432,8 @@ ...@@ -1432,8 +1432,8 @@
this.Error(`成本月结数据不能为空!`) this.Error(`成本月结数据不能为空!`)
return return
} }
// 台湾提成汇率 // 台湾提成汇率 验证总金额是否一致
if (this.orderObj && this.orderObj.Rate && this.orderObj.Money) { if (this.orderObj && this.orderObj.Money && (this.orderObj.Rate || this.orderObj.isVerifyMoney)) {
let yballPrice = 0 let yballPrice = 0
this.msg && this.msg.detailList && this.msg.detailList.forEach((item, i) => { this.msg && this.msg.detailList && this.msg.detailList.forEach((item, i) => {
yballPrice += Number(yballPrice) + Number(item.UnitPrice) yballPrice += Number(yballPrice) + Number(item.UnitPrice)
......
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