Commit 5b189f21 authored by 我在何方's avatar 我在何方

财务管理国际化

parent 79a160bc
This diff is collapsed.
This diff is collapsed.
...@@ -190,7 +190,7 @@ ...@@ -190,7 +190,7 @@
<el-input v-model="scope.row.exchangeRate"></el-input> <el-input v-model="scope.row.exchangeRate"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('税率%')" align="center" prop="taxRate" > <el-table-column :label="$t('税率')+'%'" align="center" prop="taxRate" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.taxRate" @keyup.native="scope.row.taxRate = oninput(scope.row.taxRate)"></el-input> <el-input v-model="scope.row.taxRate" @keyup.native="scope.row.taxRate = oninput(scope.row.taxRate)"></el-input>
</template> </template>
...@@ -218,7 +218,7 @@ ...@@ -218,7 +218,7 @@
style="margin-bottom: 0" style="margin-bottom: 0"
prop="accountNumber" prop="accountNumber"
:rules="[ :rules="[
{ required: true, message: '账单号不能为空', trigger: 'blur' }, { required: true, message:$t('账单号不能为空'), trigger: 'blur' },
]" ]"
> >
<el-input <el-input
...@@ -250,7 +250,7 @@ ...@@ -250,7 +250,7 @@
</el-card> </el-card>
<div slot="footer" style="margin: 20px 0"> <div slot="footer" style="margin: 20px 0">
<!-- <el-button type="primary" @click="submitDraft">保 存</el-button> --> <!-- <el-button type="primary" @click="submitDraft">保 存</el-button> -->
<el-button type="primary" @click="submitForm">{{id==0?'新 增':'编 辑'}}</el-button> <el-button type="primary" @click="submitForm">{{id==0?$t('新增'):$t('编辑')}}</el-button>
</div> </div>
<el-dialog <el-dialog
:visible.sync="open" :visible.sync="open"
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<el-descriptions-item :label="$t('纳税人识别号')">{{ invoiceData.taxpayer }}</el-descriptions-item> <el-descriptions-item :label="$t('纳税人识别号')">{{ invoiceData.taxpayer }}</el-descriptions-item>
<el-descriptions-item :label="$t('地址')">{{ invoiceData.addressPhone }}</el-descriptions-item> <el-descriptions-item :label="$t('地址')">{{ invoiceData.addressPhone }}</el-descriptions-item>
<el-descriptions-item :label="$t('开户行')">{{ invoiceData.accountBank }}</el-descriptions-item> <el-descriptions-item :label="$t('开户行')">{{ invoiceData.accountBank }}</el-descriptions-item>
<el-descriptions-item :label="$t('税率%')"> <el-descriptions-item :label="$t('税率')+'%'">
<el-form-item label=""> <el-form-item label="">
<el-input v-model="invoiceData.taxRate"></el-input> <el-input v-model="invoiceData.taxRate"></el-input>
</el-form-item> </el-form-item>
......
...@@ -348,7 +348,7 @@ export default { ...@@ -348,7 +348,7 @@ export default {
}, },
deleteClick(row) { deleteClick(row) {
const id = row.id; const id = row.id;
this.$modal.confirm(this.$t('是否确认删除该应付款?')).then(function() { this.$modal.confirm(this.$t('是否确认删除该应付款')+'?').then(function() {
return deletePayable(id); return deletePayable(id);
}).then(() => { }).then(() => {
this.getList(); this.getList();
......
...@@ -159,8 +159,8 @@ ...@@ -159,8 +159,8 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('汇率')" align="center" prop="exchangeRate" /> <el-table-column :label="$t('汇率')" align="center" prop="exchangeRate" />
<el-table-column :label="$t('税率%')" align="center" prop="taxRate" /> <el-table-column :label="$t('税率')+'%'" align="center" prop="taxRate" />
<el-table-column :label="$t('价税合计(RMB)')" align="center" prop="total" > <el-table-column :label="$t('价税合计')+'(RMB)'" align="center" prop="total" >
<template slot-scope="scope"> <template slot-scope="scope">
<!-- <span>{{ scope.row.total = ((scope.row.totalAmount * scope.row.exchangeRate) + (scope.row.totalAmount * scope.row.exchangeRate) * (scope.row.taxRate/100)).toFixed(6) }}</span> --> <!-- <span>{{ scope.row.total = ((scope.row.totalAmount * scope.row.exchangeRate) + (scope.row.totalAmount * scope.row.exchangeRate) * (scope.row.taxRate/100)).toFixed(6) }}</span> -->
<span>{{scope.row.total}}</span> <span>{{scope.row.total}}</span>
......
...@@ -58,12 +58,12 @@ ...@@ -58,12 +58,12 @@
<el-input v-model="scope.row.exchangeRate"></el-input> <el-input v-model="scope.row.exchangeRate"></el-input>
</template> --> </template> -->
</el-table-column> </el-table-column>
<el-table-column :label="$t('税率%')" align="center" prop="taxRate" > <el-table-column :label="$t('税率')+'%'" align="center" prop="taxRate" >
<!-- <template slot-scope="scope"> <!-- <template slot-scope="scope">
<el-input v-model="scope.row.taxRate"></el-input> <el-input v-model="scope.row.taxRate"></el-input>
</template> --> </template> -->
</el-table-column> </el-table-column>
<el-table-column :label="$t('价税合计(RMB)')" align="center" prop="total" /> <el-table-column :label="$t('价税合计')+'(RMB)'" align="center" prop="total" />
</el-table> </el-table>
<el-descriptions :column="1" class="card" border> <el-descriptions :column="1" class="card" border>
......
...@@ -302,7 +302,7 @@ export default { ...@@ -302,7 +302,7 @@ export default {
}, },
deleteClick(row) { deleteClick(row) {
const id = row.id; const id = row.id;
this.$modal.confirm(this.$t('是否确认删除该付款单?')).then(function() { this.$modal.confirm(this.$t('是否确认删除该付款单')+'?').then(function() {
return deletePayment(id); return deletePayment(id);
}).then(() => { }).then(() => {
this.getList(); this.getList();
...@@ -311,7 +311,7 @@ export default { ...@@ -311,7 +311,7 @@ export default {
}, },
verificationClick(row) { verificationClick(row) {
const id = row.id; const id = row.id;
this.$modal.confirm(this.$t('您确认要核销吗?')).then(function() { this.$modal.confirm(this.$t('您确认要核销吗')+'?').then(function() {
return paymentVerification(id); return paymentVerification(id);
}).then(() => { }).then(() => {
this.getList(); this.getList();
...@@ -320,7 +320,7 @@ export default { ...@@ -320,7 +320,7 @@ export default {
}, },
verificationCancelClick(row) { verificationCancelClick(row) {
const id = row.id; const id = row.id;
this.$modal.confirm(this.$t('您确认要反核销吗?')).then(function() { this.$modal.confirm(this.$t('您确认要反核销吗')+'?').then(function() {
return paymentVerificationCancel(id); return paymentVerificationCancel(id);
}).then(() => { }).then(() => {
this.getList(); this.getList();
...@@ -329,7 +329,7 @@ export default { ...@@ -329,7 +329,7 @@ export default {
}, },
verifyCancelClick(row) { verifyCancelClick(row) {
const id = row.id; const id = row.id;
this.$modal.confirm(this.$t('您确认要反审核吗?')).then(function() { this.$modal.confirm(this.$t('您确认要反审核吗')+'?').then(function() {
return paymentVerifyCancel(id); return paymentVerifyCancel(id);
}).then(() => { }).then(() => {
this.getList(); this.getList();
......
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
return { return {
loadings: false, loadings: false,
form:{}, form:{},
title:'收款单', title:this.$t('收款单'),
creatorData:[], creatorData:[],
list:[], list:[],
fileList:[], fileList:[],
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="app-container" > <div class="app-container" >
<div id="print" style="font-size: 18px;"> <div id="print" style="font-size: 18px;">
<div style="text-align: center;font-weight: bold;font-size: 26px;padding: 22px 0;border-top: 1px solid #666;border-left:1px solid #666;border-right: 1px solid #666;">捷道货运收款单</div> <div style="text-align: center;font-weight: bold;font-size: 26px;padding: 22px 0;border-top: 1px solid #666;border-left:1px solid #666;border-right: 1px solid #666;">{{$t('捷道货运收款单')}}</div>
<table border="1" style="width: 100%;text-align: center;border-collapse: collapse; "> <table border="1" style="width: 100%;text-align: center;border-collapse: collapse; ">
<tr> <tr>
<td style="font-weight: bold;width:12.5%">{{$t('部门')}}</td> <td style="font-weight: bold;width:12.5%">{{$t('部门')}}</td>
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
return { return {
loadings: false, loadings: false,
form:{}, form:{},
title:'收款单', title:this.$t('收款单'),
// creatorData:[], // creatorData:[],
list:[], list:[],
fileList:[], fileList:[],
......
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
{{ form.projectName }} {{ form.projectName }}
<!-- <el-input v-model="form.projectName"></el-input> --> <!-- <el-input v-model="form.projectName"></el-input> -->
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('税率%')"> <el-descriptions-item :label="$t('税率')+'%'">
{{ form.taxRate }} {{ form.taxRate }}
<!-- <el-input v-model="form.taxRate"></el-input> --> <!-- <el-input v-model="form.taxRate"></el-input> -->
</el-descriptions-item> </el-descriptions-item>
...@@ -839,7 +839,7 @@ export default { ...@@ -839,7 +839,7 @@ export default {
}, },
deleteClick(row) { deleteClick(row) {
const id = row.id; const id = row.id;
this.$modal.confirm(this.$t('是否确认删除该收款单?')).then(function() { this.$modal.confirm(this.$t('是否确认删除该收款单')+'?').then(function() {
return deleteReceiptItem(id); return deleteReceiptItem(id);
}).then(() => { }).then(() => {
this.getList(); this.getList();
...@@ -849,7 +849,7 @@ export default { ...@@ -849,7 +849,7 @@ export default {
verificationClick(row) { verificationClick(row) {
const id = row.id; const id = row.id;
this.$modal this.$modal
.confirm(this.$t('您确认要核销吗?')) .confirm(this.$t('您确认要核销吗')+'?')
.then(function () { .then(function () {
return receiptItemVerification(id); return receiptItemVerification(id);
}) })
...@@ -862,7 +862,7 @@ export default { ...@@ -862,7 +862,7 @@ export default {
verificationCancelClick(row) { verificationCancelClick(row) {
const id = row.id; const id = row.id;
this.$modal this.$modal
.confirm(this.$t('您确认要反核销吗?')) .confirm(this.$t('您确认要反核销吗')+'?')
.then(function () { .then(function () {
return receiptItemVerificationCancel(id); return receiptItemVerificationCancel(id);
}) })
...@@ -877,12 +877,12 @@ export default { ...@@ -877,12 +877,12 @@ export default {
}, },
batchVerification() { batchVerification() {
if (this.multipleSelection.length === 0) { if (this.multipleSelection.length === 0) {
this.$modal.msgError(this.$t('请选择需要核销的收款明细')); this.$modal.msgError(this.$t('请选择需要核销的收款明细'));
return return
} }
const params = { ids: this.multipleSelection.map(v => v.id).join(',') } const params = { ids: this.multipleSelection.map(v => v.id).join(',') }
this.$modal this.$modal
.confirm(this.$t('您确认要核销吗?')) .confirm(this.$t('您确认要核销吗'+'?'))
.then(function () { .then(function () {
return receiptItemBatchVerification(params); return receiptItemBatchVerification(params);
}) })
...@@ -897,11 +897,11 @@ export default { ...@@ -897,11 +897,11 @@ export default {
}, },
verificationAll() { verificationAll() {
if(!this.detailed||this.detailed.length==0){ if(!this.detailed||this.detailed.length==0){
this.$modal.msgError(this.$t('当前收款单未添加银行收款明细,无法全部核销,请添加银行收款单明细,并核销所有实收明细后再进行全部核销')); this.$modal.msgError(this.$t('当前收款单未添加银行收款明细,无法全部核销,请添加银行收款单明细,并核销所有实收明细后再进行全部核销'));
return return
} }
this.$modal this.$modal
.confirm(this.$t('您确认要全部核销吗?')) .confirm(this.$t('您确认要全部核销吗'+'?'))
.then(() => { .then(() => {
return receiptItemAllVerification(this.id); return receiptItemAllVerification(this.id);
}) })
...@@ -998,7 +998,7 @@ export default { ...@@ -998,7 +998,7 @@ export default {
this.loading.close(); this.loading.close();
}, },
beforeRemove(file, fileList) { beforeRemove(file, fileList) {
return this.$confirm(this.$t('确定移除?')).then(res => { return this.$confirm(this.$t('确定移除')+'?').then(res => {
setTimeout(() => { setTimeout(() => {
this.addForm.attr = fileList.map(v => ({ name: v.name, url: v.response ? v.response.data : v.url })) this.addForm.attr = fileList.map(v => ({ name: v.name, url: v.response ? v.response.data : v.url }))
}, 300) }, 300)
......
...@@ -361,7 +361,7 @@ export default { ...@@ -361,7 +361,7 @@ export default {
}, },
deleteClick(row) { deleteClick(row) {
const id = row.id; const id = row.id;
this.$modal.confirm(this.$t('是否确认删除该收款单?')).then(function() { this.$modal.confirm(this.$t('是否确认删除该收款单')+'?').then(function() {
return deleteReceipt(id); return deleteReceipt(id);
}).then(() => { }).then(() => {
this.getList(); this.getList();
......
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
@pagination="getList"/> @pagination="getList"/>
<!-- 对话框(添加 / 修改) --> <!-- 对话框(添加 / 修改) -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="标题中文" prop="titleZh"> <el-form-item label="标题中文" prop="titleZh">
<el-input v-model="form.titleZh" placeholder="请输入标题中文" /> <el-input v-model="form.titleZh" placeholder="请输入标题中文" />
......
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