Commit 1753a477 authored by 吴滔's avatar 吴滔

国际化

parent d1d9e8d6
This diff is collapsed.
This diff is collapsed.
<template> <template>
<div class="app-container"> <div class="app-container">
<div slot="header" class="card-title">开票</div> <div slot="header" class="card-title">{{ $t('开票') }}</div>
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<el-form <el-form
:model="invoiceData" :model="invoiceData"
...@@ -11,10 +11,10 @@ ...@@ -11,10 +11,10 @@
class="card" class="card"
> >
<el-card class="card"> <el-card class="card">
<el-form-item label="发票号码:" prop="invoiceNumber" :rules="{ required: true, trigger: ['blur'], message: '发票号码不能为空' }"> <el-form-item :label="$t('发票号码')" prop="invoiceNumber" :rules="{ required: true, trigger: ['blur'], message: $t('发票号码不能为空') }">
<el-input v-model="invoiceData.invoiceNumber"></el-input> <el-input v-model="invoiceData.invoiceNumber"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="开票类型:" prop="invoicingTypeId" :rules="{ required: true, trigger: ['blur', 'change'], message: '开票类型不能为空' }"> <el-form-item :label="$t('开票类型')" prop="invoicingTypeId" :rules="{ required: true, trigger: ['blur', 'change'], message: $t('开票类型不能为空') }">
<dict-selector <dict-selector
:type="DICT_TYPE.ECW_INVOICING_TYPE" :type="DICT_TYPE.ECW_INVOICING_TYPE"
v-model="invoiceData.invoicingTypeId" v-model="invoiceData.invoicingTypeId"
...@@ -22,18 +22,18 @@ ...@@ -22,18 +22,18 @@
</el-form-item> </el-form-item>
</el-card> </el-card>
<el-card class="card"> <el-card class="card">
<div slot="header" class="card-title">开票资料</div> <div slot="header" class="card-title">{{ $t('开票资料') }}</div>
<el-descriptions title="" direction="vertical" :column="6" border> <el-descriptions title="" direction="vertical" :column="6" border>
<el-descriptions-item label="发票抬头">{{ invoiceData.invoice }}</el-descriptions-item> <el-descriptions-item :label="$t('发票抬头')">{{ invoiceData.invoice }}</el-descriptions-item>
<el-descriptions-item label="纳税人识别号">{{ invoiceData.taxpayer }}</el-descriptions-item> <el-descriptions-item :label="$t('纳税人识别号')">{{ invoiceData.taxpayer }}</el-descriptions-item>
<el-descriptions-item label="地址">{{ invoiceData.addressPhone }}</el-descriptions-item> <el-descriptions-item :label="$t('地址')">{{ invoiceData.addressPhone }}</el-descriptions-item>
<el-descriptions-item label="开户行">{{ invoiceData.accountBank }}</el-descriptions-item> <el-descriptions-item :label="$t('开户行')">{{ invoiceData.accountBank }}</el-descriptions-item>
<el-descriptions-item label="税率%"> <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>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="项目"> <el-descriptions-item :label="$t('项目')">
<el-form-item label=""> <el-form-item label="">
<el-input v-model="invoiceData.projectName"></el-input> <el-input v-model="invoiceData.projectName"></el-input>
</el-form-item> </el-form-item>
...@@ -49,15 +49,15 @@ ...@@ -49,15 +49,15 @@
show-summary show-summary
:summary-method="getSummaries" :summary-method="getSummaries"
> >
<el-table-column label="订单号" align="center" prop="orderNo" /> <el-table-column :label="$t('订单号')" align="center" prop="orderNo" />
<el-table-column label="品名" align="center" prop="titleZh"> <el-table-column :label="$t('品名')" align="center" prop="titleZh">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.titleZh || scope.row.titleEn ? scope.row.titleZh + "(" + scope.row.titleEn + ")" : '' }} {{ scope.row.titleZh || scope.row.titleEn ? scope.row.titleZh + "(" + scope.row.titleEn + ")" : '' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="箱数" align="center" prop="num" /> <el-table-column :label="$t('箱数')" align="center" prop="num" />
<el-table-column label="体积/重量" align="center" prop="weight"></el-table-column> <el-table-column :label="$t('体积/重量')" align="center" prop="weight"></el-table-column>
<el-table-column label="收入类型" align="center" prop="feeType"> <el-table-column :label="$t('收入类型')" align="center" prop="feeType">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag <dict-tag
:type="DICT_TYPE.FEE_TYPE" :type="DICT_TYPE.FEE_TYPE"
...@@ -65,25 +65,25 @@ ...@@ -65,25 +65,25 @@
></dict-tag> ></dict-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="单价金额" align="center" prop="unitPrice"> <el-table-column :label="$t('单价金额')" align="center" prop="unitPrice">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.unitPrice }}</span> <span>{{ scope.row.unitPrice }}</span>
<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" /> <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="总金额" align="center" prop="totalAmount"> <el-table-column :label="$t('总金额')" align="center" prop="totalAmount">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.totalAmount }}</span> <span>{{ scope.row.totalAmount }}</span>
<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" /> <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="税额" align="center" prop="tax"> <el-table-column :label="$t('税额')" align="center" prop="tax">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.tax }}</span> <span>{{ scope.row.tax }}</span>
<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" /> <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="价税合计" align="center" prop="taxAndTotalAmount"> <el-table-column :label="$t('价税合计')" align="center" prop="taxAndTotalAmount">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.taxAndTotalAmount }}</span> <span>{{ scope.row.taxAndTotalAmount }}</span>
<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" /> <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" />
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
</el-table> </el-table>
</el-card> </el-card>
<el-descriptions class="card" style="width: 50%"> <el-descriptions class="card" style="width: 50%">
<el-descriptions-item label="备注"> <el-descriptions-item :label="$t('备注')">
<el-input <el-input
v-model="invoiceData.invoicingRemark" v-model="invoiceData.invoicingRemark"
type="text" type="text"
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
</el-descriptions> </el-descriptions>
</el-form> </el-form>
<div slot="footer" class="card"> <div slot="footer" class="card">
<el-button type="primary" @click="submitForm">确定</el-button> <el-button type="primary" @click="submitForm">{{ $t('确定') }}</el-button>
</div> </div>
</div> </div>
</template> </template>
...@@ -147,7 +147,7 @@ export default { ...@@ -147,7 +147,7 @@ export default {
v.taxAndTotalAmount = NP.plus(v.totalAmount, NP.times(v.totalAmount, this.invoiceData.taxRate/100)) v.taxAndTotalAmount = NP.plus(v.totalAmount, NP.times(v.totalAmount, this.invoiceData.taxRate/100))
}) })
const t = { const t = {
orderNo: '合计', orderNo: this.$t('合计'),
totalAmount: res.data.reduce((total, curr) => NP.plus(total, curr.totalAmount), 0), totalAmount: res.data.reduce((total, curr) => NP.plus(total, curr.totalAmount), 0),
tax: res.data.reduce((total, curr) => NP.plus(total, curr.tax), 0), tax: res.data.reduce((total, curr) => NP.plus(total, curr.tax), 0),
taxAndTotalAmount: res.data.reduce((total, curr) => NP.plus(total, curr.taxAndTotalAmount), 0) taxAndTotalAmount: res.data.reduce((total, curr) => NP.plus(total, curr.taxAndTotalAmount), 0)
...@@ -160,7 +160,7 @@ export default { ...@@ -160,7 +160,7 @@ export default {
if (valid) { if (valid) {
updateReceiptInvoicing(this.invoiceData).then(res => { updateReceiptInvoicing(this.invoiceData).then(res => {
this.open = false; this.open = false;
this.$modal.msgSuccess("操作成功"); this.$modal.msgSuccess(this.$t('操作成功'));
this.$router.back(); this.$router.back();
}) })
} }
...@@ -168,7 +168,7 @@ export default { ...@@ -168,7 +168,7 @@ export default {
}, },
getSummaries(param) { getSummaries(param) {
const t = this.list[this.list.length - 1].taxAndTotalAmount const t = this.list[this.list.length - 1].taxAndTotalAmount
return ['收款人', this.invoiceData.payeeName, '核销人', this.invoiceData.writeOffName, '开票人', this.invoiceData.issuerName, '', '价税合计大写', this.convertCurrency(t)]; return [this.$t('收款人'), this.invoiceData.payeeName, this.$t('核销人'), this.invoiceData.writeOffName, this.$t('开票人'), this.invoiceData.issuerName, '', this.$t('价税合计大写'), this.convertCurrency(t)];
}, },
convertCurrency(money) { convertCurrency(money) {
//汉字的数字 //汉字的数字
......
This diff is collapsed.
<template> <template>
<div class="app-container"> <div class="app-container">
<el-card> <el-card>
<div slot="header" class="card-title">付款单详情</div> <div slot="header" class="card-title">{{ $t('付款单详情') }}</div>
<el-form <el-form
ref="form" ref="form"
:model="form" :model="form"
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
label-position="left" label-position="left"
> >
<el-descriptions :column="3" class="card" border> <el-descriptions :column="3" class="card" border>
<el-descriptions-item label="供应商"> <el-descriptions-item :label="$t('供应商')">
<el-form-item <el-form-item
label="" label=""
label-width="0" label-width="0"
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<!-- <customer-selector v-model="form.supplierId" @change="consignor = $event" /> --> <!-- <customer-selector v-model="form.supplierId" @change="consignor = $event" /> -->
<el-select <el-select
v-model="form.supplierId" v-model="form.supplierId"
placeholder="请选择供应商" :placeholder="$t('请选择供应商')"
disabled disabled
> >
<el-option <el-option
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="部门"> <el-descriptions-item :label="$t('部门')">
<el-form-item <el-form-item
label="" label=""
label-width="0" label-width="0"
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="业务员"> <el-descriptions-item :label="$t('业务员')">
<el-form-item <el-form-item
label="" label=""
label-width="0" label-width="0"
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="申请日期"> <el-descriptions-item :label="$t('申请日期')">
<el-form-item <el-form-item
label="" label=""
label-width="0" label-width="0"
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
/> />
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="供应商银行账号" style="width: 50%"> <el-descriptions-item :label="$t('供应商银行账号')" style="width: 50%">
<el-form-item <el-form-item
label="" label=""
label-width="0" label-width="0"
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
<el-descriptions :column="3" class="card" border> <el-descriptions :column="3" class="card" border>
<el-descriptions-item label="最后付款日期"> <el-descriptions-item :label="$t('最后付款日期')">
<el-form-item <el-form-item
label="" label=""
label-width="0" label-width="0"
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
/> />
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="结算方式"> <el-descriptions-item :label="$t('结算方式')">
<el-form-item <el-form-item
label="" label=""
label-width="0" label-width="0"
...@@ -139,10 +139,10 @@ ...@@ -139,10 +139,10 @@
</el-form> </el-form>
</el-card> </el-card>
<el-card class="card"> <el-card class="card">
<div slot="header" class="card-title">费用信息</div> <div slot="header" class="card-title">{{ $t('费用信息') }}</div>
<el-table v-loading="loadings" :data="list" border :show-summary="!!list.length" :summary-method="getSummaries"> <el-table v-loading="loadings" :data="list" border :show-summary="!!list.length" :summary-method="getSummaries">
<el-table-column label="自编号" align="center" prop="payableNo" /> <el-table-column :label="$t('自编号')" align="center" prop="payableNo" />
<el-table-column label="费用类型" align="center" prop="feeType"> <el-table-column :label="$t('费用类型')" align="center" prop="feeType">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag <dict-tag
:type="DICT_TYPE.FEE_TYPE" :type="DICT_TYPE.FEE_TYPE"
...@@ -150,16 +150,16 @@ ...@@ -150,16 +150,16 @@
></dict-tag> ></dict-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="发票号码" align="center" prop="invoiceNumber" /> <el-table-column :label="$t('发票号码')" align="center" prop="invoiceNumber" />
<el-table-column label="应付金额" align="center" prop="totalAmount" /> <el-table-column :label="$t('应付金额')" align="center" prop="totalAmount" />
<el-table-column label="币种" align="center" prop="currencyId"> <el-table-column :label="$t('币种')" align="center" prop="currencyId">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" /> <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="汇率" align="center" prop="exchangeRate" /> <el-table-column :label="$t('汇率')" align="center" prop="exchangeRate" />
<el-table-column label="税率%" align="center" prop="taxRate" /> <el-table-column :label="$t('税率%')" align="center" prop="taxRate" />
<el-table-column label="价税合计(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>
</template> </template>
...@@ -174,13 +174,13 @@ ...@@ -174,13 +174,13 @@
style="width: 50%" style="width: 50%"
> >
<el-descriptions :column="1" class="card" border> <el-descriptions :column="1" class="card" border>
<el-descriptions-item label="账单号"> <el-descriptions-item :label="$t('账单号')">
<el-form-item <el-form-item
label="" label=""
label-width="0" label-width="0"
style="margin-bottom: 0" style="margin-bottom: 0"
required required
error="账单号不能为空" :error="$t('账单号不能为空')"
prop="accountNumber" prop="accountNumber"
> >
<el-input <el-input
...@@ -188,7 +188,7 @@ ...@@ -188,7 +188,7 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="发票"> <el-descriptions-item :label="$t('发票')">
<el-form-item <el-form-item
label="" label=""
label-width="0" label-width="0"
...@@ -199,8 +199,8 @@ ...@@ -199,8 +199,8 @@
v-model="form.invoiceStatus" v-model="form.invoiceStatus"
disabled disabled
> >
<el-option label="未开票" value="0" /> <el-option :label="$t('未开票')" value="0" />
<el-option label="已开票" value="1" /> <el-option :label="$t('已开票')" value="1" />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
...@@ -209,7 +209,7 @@ ...@@ -209,7 +209,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="$store.dispatch('tagsView/delCurrentView')">返回</el-button> <el-button type="primary" @click="$store.dispatch('tagsView/delCurrentView')">{{ $t('返回') }}</el-button>
</div> </div>
</div> </div>
</template> </template>
...@@ -348,7 +348,7 @@ export default { ...@@ -348,7 +348,7 @@ export default {
const { columns, data } = param; const { columns, data } = param;
const sums = new Array(columns.length).map(v => ''); const sums = new Array(columns.length).map(v => '');
const index = sums.length - 1 const index = sums.length - 1
sums[index - 1] = '价税合计大写' sums[index - 1] = this.$t('价税合计大写')
const t = data.map(v => v.total).reduce((prev, curr) => { const t = data.map(v => v.total).reduce((prev, curr) => {
return parseFloat(prev) + parseFloat(curr); return parseFloat(prev) + parseFloat(curr);
}, 0) }, 0)
...@@ -368,21 +368,21 @@ export default { ...@@ -368,21 +368,21 @@ export default {
if (this.list && this.list.length > 0) { if (this.list && this.list.length > 0) {
params.payableReqVOList = [...this.list] params.payableReqVOList = [...this.list]
}else{ }else{
this.$modal.msgError("请选择供应商未付款项"); this.$modal.msgError(this.$t('请选择供应商未付款项'));
return return
} }
if(!params.supplierBankAccount){ if(!params.supplierBankAccount){
this.$modal.msgError("请选择供应商银行账号"); this.$modal.msgError(this.$t('请选择供应商银行账号'));
return return
} }
if (this.id && this.id !== '0') { if (this.id && this.id !== '0') {
updatePayment(params).then(res => { updatePayment(params).then(res => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess(this.$t('修改成功'));
this.$router.back(); this.$router.back();
}) })
} else { } else {
createPayment(params).then(res => { createPayment(params).then(res => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess(this.$t('新增成功'));
this.$router.back(); this.$router.back();
}) })
} }
...@@ -398,21 +398,21 @@ export default { ...@@ -398,21 +398,21 @@ export default {
if (this.list && this.list.length > 0) { if (this.list && this.list.length > 0) {
params.payableReqVOList = [...this.list] params.payableReqVOList = [...this.list]
}else{ }else{
this.$modal.msgError("请选择供应商未付款项"); this.$modal.msgError(this.$t('请选择供应商未付款项'));
return return
} }
if(!params.supplierBankAccount){ if(!params.supplierBankAccount){
this.$modal.msgError("请选择供应商银行账号"); this.$modal.msgError(this.$t('请选择供应商银行账号'));
return return
} }
if (this.id && this.id !== '0') { if (this.id && this.id !== '0') {
updatePayment(params).then(res => { updatePayment(params).then(res => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess(this.$t('修改成功'));
this.$router.back(); this.$router.back();
}) })
} else { } else {
createPayment(params).then(res => { createPayment(params).then(res => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess(this.$t('新增成功'));
this.$router.back(); this.$router.back();
}) })
} }
......
<template> <template>
<div class="app-container examine-wrap"> <div class="app-container examine-wrap">
<el-card> <el-card>
<div slot="header" class="card-title">审核请款单</div> <div slot="header" class="card-title">{{ $t('审核请款单') }}</div>
<el-descriptions :column="3" class="card" border> <el-descriptions :column="3" class="card" border>
<el-descriptions-item label="供应商"> <el-descriptions-item :label="$t('供应商')">
{{ detail.supplierName }} {{ detail.supplierName }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="部门"> <el-descriptions-item :label="$t('部门')">
{{ findDepartmentName(detail.departmentId) }} {{ findDepartmentName(detail.departmentId) }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="业务员"> <el-descriptions-item :label="$t('业务员')">
{{ detail.salesmanName }} {{ detail.salesmanName }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="申请日期"> <el-descriptions-item :label="$t('申请日期')">
{{ detail.applicationAt }} {{ detail.applicationAt }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="供应商银行账号" style="width: 50%"> <el-descriptions-item :label="$t('供应商银行账号')" style="width: 50%">
{{ findBank(detail.supplierBankAccount) }} {{ findBank(detail.supplierBankAccount) }}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
<el-descriptions :column="3" class="card" border> <el-descriptions :column="3" class="card" border>
<el-descriptions-item label="最后付款日期"> <el-descriptions-item :label="$t('最后付款日期')">
{{ detail.latestPayAt }} {{ detail.latestPayAt }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="结算方式"> <el-descriptions-item :label="$t('结算方式')">
<!-- {{ detail.settlementType }} --> <!-- {{ detail.settlementType }} -->
<dict-tag :type="DICT_TYPE.CUSTOMER_BALANCE" :value="detail.settlementType"></dict-tag> <dict-tag :type="DICT_TYPE.CUSTOMER_BALANCE" :value="detail.settlementType"></dict-tag>
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
</el-card> </el-card>
<el-card class="card"> <el-card class="card">
<div slot="header" class="card-title">费用信息</div> <div slot="header" class="card-title">{{ $t('费用信息') }}</div>
<el-table v-loading="loadings" :data="list" border :show-summary="!!list.length" :summary-method="getSummaries"> <el-table v-loading="loadings" :data="list" border :show-summary="!!list.length" :summary-method="getSummaries">
<el-table-column label="自编号" align="center" prop="payableNo" /> <el-table-column :label="$t('自编号')" align="center" prop="payableNo" />
<el-table-column label="费用类型" align="center" prop="feeType"> <el-table-column :label="$t('费用类型')" align="center" prop="feeType">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag <dict-tag
:type="DICT_TYPE.FEE_TYPE" :type="DICT_TYPE.FEE_TYPE"
...@@ -41,46 +41,46 @@ ...@@ -41,46 +41,46 @@
></dict-tag> ></dict-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="发票号码" align="center" prop="invoiceNumber"> <el-table-column :label="$t('发票号码')" align="center" prop="invoiceNumber">
<!-- <template slot-scope="scope"> <!-- <template slot-scope="scope">
<el-input v-model="scope.row.invoiceNumber"></el-input> <el-input v-model="scope.row.invoiceNumber"></el-input>
</template> --> </template> -->
</el-table-column> </el-table-column>
<el-table-column label="应付金额" align="center" prop="totalAmount" /> <el-table-column :label="$t('应付金额')" align="center" prop="totalAmount" />
<el-table-column label="币种" align="center" prop="currencyId"> <el-table-column :label="$t('币种')" align="center" prop="currencyId">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" /> <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="汇率" align="center" prop="exchangeRate"> <el-table-column :label="$t('汇率')" align="center" prop="exchangeRate">
<!-- <template slot-scope="scope"> <!-- <template slot-scope="scope">
<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="税率" 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="价税合计(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>
<el-descriptions-item label="账单号"> <el-descriptions-item :label="$t('账单号')">
{{ detail.accountNumber }} {{ detail.accountNumber }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="发票"> <el-descriptions-item :label="$t('发票')">
{{ detail.invoiceStatus == 0 ? '未开票' : '已开票' }} {{ detail.invoiceStatus == 0 ? $t('未开票') : $t('已开票') }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="审核备注"> <el-descriptions-item :label="$t('审核备注')">
<el-input type="textarea" :rows="2" v-model="notes"> <el-input type="textarea" :rows="2" v-model="notes">
</el-input> </el-input>
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
</el-card> </el-card>
<div slot="footer" style="margin: 20px 0"> <div slot="footer" style="margin: 20px 0">
<el-button type="primary" @click="examine('y')">审核通过</el-button> <el-button type="primary" @click="examine('y')">{{ $t('审核通过') }}</el-button>
<el-button type="danger" @click="examine('n')">审核驳回</el-button> <el-button type="danger" @click="examine('n')">{{ $t('审核驳回') }}</el-button>
</div> </div>
</div> </div>
</template> </template>
...@@ -150,7 +150,7 @@ export default { ...@@ -150,7 +150,7 @@ export default {
const { columns, data } = param; const { columns, data } = param;
const sums = new Array(columns.length).map(v => ''); const sums = new Array(columns.length).map(v => '');
const index = sums.length - 1 const index = sums.length - 1
sums[index - 1] = '价税合计大写' sums[index - 1] = this.$t('价税合计大写')
const t = data.map(v => v.total).reduce((prev, curr) => { const t = data.map(v => v.total).reduce((prev, curr) => {
return prev + curr; return prev + curr;
}, 0) }, 0)
...@@ -164,7 +164,7 @@ export default { ...@@ -164,7 +164,7 @@ export default {
verifyStatus: status verifyStatus: status
} }
paymentVerify(params).then(res => { paymentVerify(params).then(res => {
this.$modal.msgSuccess("操作成功"); this.$modal.msgSuccess(this.$t('操作成功'));
this.$router.back(); this.$router.back();
}) })
}, },
......
This diff is collapsed.
<template> <template>
<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: 20px;">付款单</div> <div style="text-align: center;font-weight: bold;font-size: 20px;">{{ $t('付款单') }}</div>
<div style="margin-top: 20px;"> <div style="margin-top: 20px;">
<div style="display: flex;width: 80%;align-items: center;margin-bottom: 10px;"> <div style="display: flex;width: 80%;align-items: center;margin-bottom: 10px;">
<div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">付款单号:</div><span>{{ form.paymentNo || '' }}</span></div> <div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">{{ $t('付款单号') }}</div><span>{{ form.paymentNo || '-' }}</span></div>
<div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">最后付款日:</div> <span>{{ form.latestPayAt || '' }}</span></div> <div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">{{ $t('最后付款日') }}</div> <span>{{ form.latestPayAt || '-' }}</span></div>
</div> </div>
<div style="display: flex;width: 80%;align-items: center;margin-bottom: 10px;"> <div style="display: flex;width: 80%;align-items: center;margin-bottom: 10px;">
<div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">申请日期:</div> <span>{{ form.applicationAt || '' }}</span></div> <div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">{{ $t('申请日期') }}</div> <span>{{ form.applicationAt || '-' }}</span></div>
<div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">结算方式:</div><span>{{ form.settlementType || '' }}</span></div> <div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">{{ $t('结算方式') }}</div><span>{{ form.settlementType || '-' }}</span></div>
</div> </div>
<div style="display: flex;width: 80%;align-items: center;margin-bottom: 10px;"> <div style="display: flex;width: 80%;align-items: center;margin-bottom: 10px;">
<div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">付款公司:</div><span>{{ form.supplierName || '' }}</span></div> <div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">{{ $t('付款公司') }}</div><span>{{ form.supplierName || '-' }}</span></div>
<div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">银行户名:</div><span>{{ findBank(form.supplierBankAccount).baAccountName || '' }}</span></div> <div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">{{ $t('银行户名') }}</div><span>{{ findBank(form.supplierBankAccount).baAccountName || '-' }}</span></div>
</div> </div>
<div style="display: flex;width: 80%;align-items: center;margin-bottom: 10px;"> <div style="display: flex;width: 80%;align-items: center;margin-bottom: 10px;">
<div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">银行名称:</div><span>{{ findBank(form.supplierBankAccount).baBankName || '' }}</span></div> <div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">{{ $t('银行名称') }}</div><span>{{ findBank(form.supplierBankAccount).baBankName || '-' }}</span></div>
<div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">银行账号:</div><span>{{ findBank(form.supplierBankAccount).baAccountNum || '' }}</span></div> <div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">{{ $t('银行账号') }}</div><span>{{ findBank(form.supplierBankAccount).baAccountNum || '-' }}</span></div>
</div> </div>
<!-- <div style="display: flex;width: 80%;align-items: center;margin-bottom: 10px;"> <!-- <div style="display: flex;width: 80%;align-items: center;margin-bottom: 10px;">
<div style="flex:1"><div style="width: 120px;text-align: right;">水单号:</div><span>{{form?form.accountBank:''}}</span></div> <div style="flex:1"><div style="width: 120px;text-align: right;">水单号:</div><span>{{form?form.accountBank:''}}</span></div>
<div style="flex:1"><div style="width: 120px;text-align: right;">手续费:</div><span>{{form?form.accountBank:''}}</span></div> <div style="flex:1"><div style="width: 120px;text-align: right;">手续费:</div><span>{{form?form.accountBank:''}}</span></div>
</div> --> </div> -->
<div style="display: flex;width: 80%;align-items: center;"> <div style="display: flex;width: 80%;align-items: center;">
<div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">备注:</div><span>{{ form.notes || '' }}</span></div> <div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">{{ $t('备注') }}</div><span>{{ form.notes || '-' }}</span></div>
</div> </div>
</div> </div>
<table border="1" style="margin-top: 20px;width: 100%;text-align: center;border-collapse: collapse;line-height: 2 "> <table border="1" style="margin-top: 20px;width: 100%;text-align: center;border-collapse: collapse;line-height: 2 ">
<tr> <tr>
<th style="width: 6%;">序号</th> <th style="width: 6%;">{{ $t('序号') }}</th>
<th style="width: 15%;">自编号</th> <th style="width: 15%;">{{ $t('自编号') }}</th>
<th style="width: 15%;">费用类型</th> <th style="width: 15%;">{{ $t('费用类型') }}</th>
<th style="width: 15%;">币别</th> <th style="width: 15%;">{{ $t('币种') }}</th>
<th style="width: 10%;">汇率</th> <th style="width: 10%;">{{ $t('汇率') }}</th>
<th style="width: 15%;">发票号</th> <th style="width: 15%;">{{ $t('发票号') }}</th>
<th style="width: 12%;">应付金额</th> <th style="width: 12%;">{{ $t('应付金额') }}</th>
<th style="width: 12%;">申请金额</th> <th style="width: 12%;">{{ $t('申请金额') }}</th>
</tr> </tr>
<tr v-for="(item, index) in list" :key="index"> <tr v-for="(item, index) in list" :key="index">
<td>{{ index + 1 }}</td> <td>{{ index + 1 }}</td>
...@@ -56,23 +56,23 @@ ...@@ -56,23 +56,23 @@
<td>{{ item.total }}</td> <td>{{ item.total }}</td>
</tr> </tr>
<tr> <tr>
<td colspan="2">合计(大写)</td> <td colspan="2">{{ $t('合计(大写)') }}</td>
<td colspan="2">{{ convertCurrency(totalMoney()) }}</td> <td colspan="2">{{ convertCurrency(totalMoney()) }}</td>
<td colspan="2">合计付款</td> <td colspan="2">{{ $t('合计付款') }}</td>
<td>{{ totalMoney() }}</td> <td>{{ totalMoney() }}</td>
</tr> </tr>
</table> </table>
<div style="margin-top: 20px;"> <div style="margin-top: 20px;">
<div style="display: flex;width: 100%;align-items: center;"> <div style="display: flex;width: 100%;align-items: center;">
<div style="flex:1"><span style="width: 120px;">主管</span></div> <div style="flex:1"><span style="width: 120px;">{{ $t('主管') }}</span></div>
<div style="flex:1"><span style="width: 120px;">会计</span></div> <div style="flex:1"><span style="width: 120px;">{{ $t('会计') }}</span></div>
<div style="flex:1"><span style="width: 120px;">出纳</span></div> <div style="flex:1"><span style="width: 120px;">{{ $t('出纳') }}</span></div>
<div style="flex:1"><span style="width: 120px;">经手人</span></div> <div style="flex:1"><span style="width: 120px;">{{ $t('经手人') }}</span></div>
</div> </div>
</div> </div>
</div> </div>
<div slot="footer" class="card"> <div slot="footer" class="card">
<el-button type="primary" @click="print">确订打印</el-button> <el-button type="primary" @click="print">{{ $t('确订打印') }}</el-button>
</div> </div>
</div> </div>
</template> </template>
...@@ -169,7 +169,7 @@ ...@@ -169,7 +169,7 @@
console.log('打印哦') console.log('打印哦')
}).catch(err => { }).catch(err => {
console.error('lodop异常', err) console.error('lodop异常', err)
alert('请检查LODOP打印控件是否安装并启动'); alert(this.$t('请检查LODOP打印控件是否安装并启动'));
}) })
}, },
findBank(val) { findBank(val) {
......
<template> <template>
<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: 20px;">收款单</div> <div style="text-align: center;font-weight: bold;font-size: 20px;">{{ $t('收款单') }}</div>
<div style="margin-top: 20px;"> <div style="margin-top: 20px;">
<div style="display: flex;width: 80%;align-items: center;margin-bottom: 10px;"> <div style="display: flex;width: 80%;align-items: center;margin-bottom: 10px;">
<div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">部门:</div><span>{{form?form.departmentName:''}}</span></div> <div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">{{ $t('部门') }}</div><span>{{form?form.departmentName:'-'}}</span></div>
</div> </div>
<div style="display: flex;width: 80%;align-items: center;margin-bottom: 10px;"> <div style="display: flex;width: 80%;align-items: center;margin-bottom: 10px;">
<div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">收款单号:</div> <span>{{form?form.receiptNo:''}}</span></div> <div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">{{ $t('收款单号') }}</div> <span>{{form?form.receiptNo:'-'}}</span></div>
<div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">收款日期:</div><span>{{form?form.payedAt:''}}</span></div> <div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">{{ $t('收款日期') }}</div><span>{{form?form.payedAt:'-'}}</span></div>
</div> </div>
<div style="display: flex;width: 80%;align-items: center;margin-bottom: 10px;"> <div style="display: flex;width: 80%;align-items: center;margin-bottom: 10px;">
<div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">客户名称:</div><span>{{form?form.customerName:''}}</span></div> <div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">{{ $t('客户名称') }}</div><span>{{form?form.customerName:'-'}}</span></div>
<div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">收款户名:</div><span>{{form?form.payeeName:''}}</span></div> <div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">{{ $t('收款户名') }}</div><span>{{form?form.payeeName:'-'}}</span></div>
</div> </div>
<div style="display: flex;width: 80%;align-items: center;margin-bottom: 10px;"> <div style="display: flex;width: 80%;align-items: center;margin-bottom: 10px;">
<div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">银行名称:</div><span>{{form?form.accountBank:''}}</span></div> <div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">{{ $t('银行名称') }}</div><span>{{form?form.accountBank:'-'}}</span></div>
<div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">银行账号:</div><span>{{form?form.platformAccount:''}}</span></div> <div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">{{ $t('银行账号') }}</div><span>{{form?form.platformAccount:'-'}}</span></div>
</div> </div>
<div style="display: flex;width: 80%;align-items: center;margin-bottom: 10px;"> <div style="display: flex;width: 80%;align-items: center;margin-bottom: 10px;">
<div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">水单号:</div><span>{{form?form.waterBillNo:''}}</span></div> <div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">{{ $t('水单号') }}</div><span>{{form?form.waterBillNo:'-'}}</span></div>
<div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">手续费:</div><span>{{form?form.feeRate:''}}</span></div> <div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">{{ $t('手续费') }}</div><span>{{form?form.feeRate:'-'}}</span></div>
</div> </div>
<div style="display: flex;width: 80%;align-items: center;"> <div style="display: flex;width: 80%;align-items: center;">
<div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">备注:</div><span>{{form?form.remark:''}}</span></div> <div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">{{ $t('备注') }}</div><span>{{form?form.remark:'-'}}</span></div>
</div> </div>
</div> </div>
<table border="1" style="margin-top: 20px;width: 100%;text-align: center;border-collapse: collapse; "> <table border="1" style="margin-top: 20px;width: 100%;text-align: center;border-collapse: collapse; ">
<tr> <tr>
<th style="width: 8%;">序号</th> <th style="width: 8%;">{{ $t('序号') }}</th>
<th style="width: 12%;">订单号</th> <th style="width: 12%;">{{ $t('订单号') }}</th>
<th style="width: 18%;">收入类型</th> <th style="width: 18%;">{{ $t('收入类型') }}</th>
<th style="width: 22%;">品名</th> <th style="width: 22%;">{{ $t('品名') }}</th>
<th style="width: 8%;">汇率</th> <th style="width: 8%;">{{ $t('汇率') }}</th>
<th style="width: 12%;">总金额</th> <th style="width: 12%;">{{ $t('总金额') }}</th>
<th style="width: 20%;">实收金额</th> <th style="width: 20%;">{{ $t('实收金额') }}</th>
</tr> </tr>
<tr v-for="(item, index) in list" :key="index"> <tr v-for="(item, index) in list" :key="index">
<td>{{ index + 1 }}</td> <td>{{ index + 1 }}</td>
...@@ -46,23 +46,23 @@ ...@@ -46,23 +46,23 @@
<td>{{ item.actualAmount }}</td> <td>{{ item.actualAmount }}</td>
</tr> </tr>
<tr> <tr>
<td colspan="2">合计(大写)</td> <td colspan="2">{{ $t('合计(大写)') }}</td>
<td colspan="2">{{ convertCurrency(totalMoney()) }}</td> <td colspan="2">{{ convertCurrency(totalMoney()) }}</td>
<td colspan="2">合计实收</td> <td colspan="2">{{ $t('合计实收') }}</td>
<td>{{ totalMoney() }}</td> <td>{{ totalMoney() }}</td>
</tr> </tr>
</table> </table>
<div style="margin-top: 20px;"> <div style="margin-top: 20px;">
<div style="display: flex;width: 100%;align-items: center;"> <div style="display: flex;width: 100%;align-items: center;">
<div style="flex:1"><span style="width: 120px;">主管</span></div> <div style="flex:1"><span style="width: 120px;">{{ $t('主管') }}</span></div>
<div style="flex:1"><span style="width: 120px;">会计</span></div> <div style="flex:1"><span style="width: 120px;">{{ $t('会计') }}</span></div>
<div style="flex:1"><span style="width: 120px;">出纳</span></div> <div style="flex:1"><span style="width: 120px;">{{ $t('出纳') }}</span></div>
<div style="flex:1"><span style="width: 120px;">经手人</span></div> <div style="flex:1"><span style="width: 120px;">{{ $t('经手人') }}</span></div>
</div> </div>
</div> </div>
</div> </div>
<div slot="footer" class="card"> <div slot="footer" class="card">
<el-button type="primary" @click="print">确订打印</el-button> <el-button type="primary" @click="print">{{ $t('确订打印') }}</el-button>
</div> </div>
</div> </div>
</template> </template>
...@@ -156,7 +156,7 @@ ...@@ -156,7 +156,7 @@
console.log('打印哦') console.log('打印哦')
}).catch(err => { }).catch(err => {
console.error('lodop异常', err) console.error('lodop异常', err)
alert('请检查LODOP打印控件是否安装并启动'); alert(this.$t('请检查LODOP打印控件是否安装并启动'));
}) })
}, },
totalMoney() { totalMoney() {
......
This diff is collapsed.
<template> <template>
<div class="app-container"> <div class="app-container">
<div slot="header" class="card-title">待收款</div> <div slot="header" class="card-title">{{ $t('待收款') }}</div>
<!-- 操作工具栏 --> <!-- 操作工具栏 -->
<el-row :gutter="10" class="mb8" style="margin-right: 60px"> <el-row :gutter="10" class="mb8" style="margin-right: 60px">
<el-button <el-button
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
type="primary" type="primary"
size="mini" size="mini"
@click="handleAdd(0)" @click="handleAdd(0)"
>新增收款单</el-button >{{ $t('新增收款单') }}</el-button
> >
<el-button <el-button
v-if="showSearch" v-if="showSearch"
...@@ -38,10 +38,10 @@ ...@@ -38,10 +38,10 @@
class="card" class="card"
> >
<el-row> <el-row>
<el-form-item label="始发城市:"> <el-form-item :label="$t('始发城市')">
<el-select <el-select
v-model="queryParams.departureId" v-model="queryParams.departureId"
placeholder="请选择始发城市" :placeholder="$t('请选择始发城市')"
clearable clearable
> >
<el-option <el-option
...@@ -52,10 +52,10 @@ ...@@ -52,10 +52,10 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="目的城市:"> <el-form-item :label="$t('目的城市')">
<el-select <el-select
v-model="queryParams.objectiveId" v-model="queryParams.objectiveId"
placeholder="请选择目的城市" :placeholder="$t('请选择目的城市')"
clearable clearable
> >
<el-option <el-option
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="运输方式:"> <el-form-item :label="$t('运输方式')">
<dict-selector <dict-selector
:type="DICT_TYPE.ECW_TRANSPORT_TYPE" :type="DICT_TYPE.ECW_TRANSPORT_TYPE"
v-model="queryParams.transportId" v-model="queryParams.transportId"
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
clearable clearable
/> />
</el-form-item> </el-form-item>
<el-form-item label="控货:"> <el-form-item :label="$t('控货')">
<dict-selector <dict-selector
:type="DICT_TYPE.INFRA_BOOLEAN_STRING" :type="DICT_TYPE.INFRA_BOOLEAN_STRING"
v-model="queryParams.isCargoControl" v-model="queryParams.isCargoControl"
...@@ -83,66 +83,66 @@ ...@@ -83,66 +83,66 @@
</el-form-item> </el-form-item>
</el-row> </el-row>
<el-row> <el-row>
<el-form-item label="订单状态:"> <el-form-item :label="$t('订单状态')">
<dict-selector <dict-selector
:type="DICT_TYPE.ORDER_STATUS" :type="DICT_TYPE.ORDER_STATUS"
v-model="queryParams.status" v-model="queryParams.status"
clearable clearable
/> />
</el-form-item> </el-form-item>
<el-form-item label="报关方式:"> <el-form-item :label="$t('报关方式')">
<dict-selector <dict-selector
:type="DICT_TYPE.ECW_CUSTOMS_TYPE" :type="DICT_TYPE.ECW_CUSTOMS_TYPE"
v-model="queryParams.customsType" v-model="queryParams.customsType"
clearable clearable
/> />
</el-form-item> </el-form-item>
<el-form-item label="订单号:"> <el-form-item :label="$t('订单号')">
<el-input <el-input
style="max-width: 188px" style="max-width: 188px"
v-model="queryParams.orderNo" v-model="queryParams.orderNo"
placeholder="请输入订单编号" :placeholder="$t('请输入订单编号')"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="品名:"> <el-form-item :label="$t('品名')">
<el-input <el-input
style="max-width: 188px" style="max-width: 188px"
v-model="queryParams.title" v-model="queryParams.title"
placeholder="请输入品名" :placeholder="$t('请输入品名')"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
</el-row> </el-row>
<el-row> <el-row>
<el-form-item label="提单号:"> <el-form-item :label="$t('提单号')">
<el-input <el-input
style="max-width: 188px" style="max-width: 188px"
v-model="queryParams.tidanNo" v-model="queryParams.tidanNo"
placeholder="请输入提单号" :placeholder="$t('请输入提单号')"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="唛头:"> <el-form-item :label="$t('唛头')">
<el-input <el-input
style="max-width: 188px" style="max-width: 188px"
v-model="queryParams.marks" v-model="queryParams.marks"
placeholder="请输入唛头" :placeholder="$t('请输入唛头')"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="费用类型:"> <el-form-item :label="$t('费用类型')">
<dict-selector <dict-selector
:type="DICT_TYPE.FEE_TYPE" :type="DICT_TYPE.FEE_TYPE"
v-model="queryParams.feeType" v-model="queryParams.feeType"
clearable clearable
></dict-selector> ></dict-selector>
</el-form-item> </el-form-item>
<el-form-item label="发货人:"> <el-form-item :label="$t('发货人')">
<customer-selector <customer-selector
v-model="queryParams.consignorNameOrPhone" v-model="queryParams.consignorNameOrPhone"
@change="consignor = $event" @change="consignor = $event"
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
</el-form-item> --> </el-form-item> -->
</el-row> </el-row>
<el-row> <el-row>
<el-form-item label="收货人:"> <el-form-item :label="$t('收货人')">
<!-- <el-input style="max-width: 188px;" v-model="queryParams.consigneeNameOrPhone" placeholder="请输入收货人" clearable @keyup.enter.native="handleQuery"/> --> <!-- <el-input style="max-width: 188px;" v-model="queryParams.consigneeNameOrPhone" placeholder="请输入收货人" clearable @keyup.enter.native="handleQuery"/> -->
<customer-selector <customer-selector
v-model="queryParams.consigneeNameOrPhone" v-model="queryParams.consigneeNameOrPhone"
...@@ -162,24 +162,24 @@ ...@@ -162,24 +162,24 @@
clearable clearable
/> />
</el-form-item> </el-form-item>
<el-form-item label="自编号:"> <el-form-item :label="$t('自编号')">
<el-input <el-input
style="max-width: 188px" style="max-width: 188px"
v-model="queryParams.selfNo" v-model="queryParams.selfNo"
placeholder="请输入自编号" :placeholder="$t('请输入自编号')"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="创建时间:"> <el-form-item :label="$t('创建时间')">
<!-- <dict-selector :type="DICT_TYPE.BEGINTIME_TYPE_ENDTIME" v-model="queryParams.date"></dict-selector> --> <!-- <dict-selector :type="DICT_TYPE.BEGINTIME_TYPE_ENDTIME" v-model="queryParams.date"></dict-selector> -->
<el-date-picker <el-date-picker
v-model="dateType" v-model="dateType"
type="datetimerange" type="datetimerange"
range-separator="-" range-separator="-"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
start-placeholder="请选择日期" :start-placeholder="$t('请选择日期')"
end-placeholder="请选择日期" :end-placeholder="$t('请选择日期')"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
...@@ -194,23 +194,23 @@ ...@@ -194,23 +194,23 @@
</el-form> </el-form>
</el-card> </el-card>
<el-table v-loading="loadings" :data="list" border class="card"> <el-table v-loading="loadings" :data="list" border class="card">
<el-table-column label="订单号" align="center" prop="orderNo" /> <el-table-column :label="$t('订单号')" align="center" prop="orderNo" />
<el-table-column label="唛头" align="center" prop="marks" /> <el-table-column :label="$t('唛头')" align="center" prop="marks" />
<el-table-column label="品名" align="center" prop="title"> <el-table-column :label="$t('品名')" align="center" prop="title">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.titleZh? (scope.row.titleZh + "(" + scope.row.titleEn + ")"):'' }} {{ scope.row.titleZh? (scope.row.titleZh + "(" + scope.row.titleEn + ")"):'' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="箱数" align="center" prop="num" /> <el-table-column :label="$t('箱数')" align="center" prop="num" />
<el-table-column label="体积/重量" align="center" prop="weight" /> <el-table-column :label="$t('体积/重量')" align="center" prop="weight" />
<el-table-column label="发货人" align="center" prop="consignorName" /> <el-table-column :label="$t('发货人')" align="center" prop="consignorName" />
<el-table-column label="收货人" align="center" prop="consigneeName" /> <el-table-column :label="$t('收货人')" align="center" prop="consigneeName" />
<el-table-column label="订单状态" align="center" prop="status"> <el-table-column :label="$t('订单状态')" align="center" prop="status">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="scope.row.status" /> <dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="scope.row.status" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="收入类型" align="center" prop="feeType"> <el-table-column :label="$t('收入类型')" align="center" prop="feeType">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag <dict-tag
:type="DICT_TYPE.FEE_TYPE" :type="DICT_TYPE.FEE_TYPE"
...@@ -218,26 +218,26 @@ ...@@ -218,26 +218,26 @@
></dict-tag> ></dict-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="单价" align="center" prop="unitPrice"> <el-table-column :label="$t('单价')" align="center" prop="unitPrice">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.unitPrice }}</span> <span>{{ scope.row.unitPrice }}</span>
<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" /> <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="总金额" align="center" prop="totalAmount"> <el-table-column :label="$t('总金额')" align="center" prop="totalAmount">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.totalAmount }}</span> <span>{{ scope.row.totalAmount }}</span>
<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" /> <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="操作" :label="$t('操作')"
align="center" align="center"
class-name="small-padding fixed-width" class-name="small-padding fixed-width"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" @click="handleAdd(scope.row.id)" <el-button size="mini" type="text" @click="handleAdd(scope.row.id)"
>收款</el-button >{{ $t('收款') }}</el-button
> >
</template> </template>
</el-table-column> </el-table-column>
......
This diff is collapsed.
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