Skip to content

S
SuperMan
Commit 3b9e0c4c authored by youjie's avatar youjie
Browse files
Options

no message

parent 8b63e0db
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 21 deletions
src/components/CarDealerOrder/components/OrderList.vue
View file @ 3b9e0c4c
......@@ -655,7 +655,6 @@
<span class="fz15 fbold">{{ scope.row.OutOilFee }}</span>
</template>
</el-table-column>
<el-table-column width="115" :label="$t('objFill.v101.CarDealerOrder.tingcheglfsr')" min-width="70" style="background:#EAEAEA">
<template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.InPassByFee }}</span>
......@@ -667,32 +666,32 @@
<span class="fz15 fbold">{{ scope.row.OutPassByFee }}</span>
</template>
</el-table-column>
<el-table-column width="115" label="其他收入" min-width="70" style="background:#EAEAEA">
<el-table-column width="115" :label="$t('objFill.qitashouru')" min-width="70" style="background:#EAEAEA">
<template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.OtherIncome }}</span>
</template>
</el-table-column>
<el-table-column width="115" label="司机住宿费" min-width="70" style="background:#EAEAEA">
<el-table-column width="115" :label="$t('objFill.v101.busManagement.sijizhusf')" min-width="70" style="background:#EAEAEA">
<template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.DriverRoomFee }}</span>
</template>
</el-table-column>
<el-table-column width="115" label="停车费收入" min-width="70" style="background:#EAEAEA">
<el-table-column width="115" :label="$t('objFill.v101.Contract.tincrzf')" min-width="70" style="background:#EAEAEA">
<template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.InParkingFee }}</span>
</template>
</el-table-column>
<el-table-column width="115" label="停车费支出" min-width="70" style="background:#EAEAEA">
<el-table-column width="115" :label="$t('objFill.v101.Contract.tinczcf')" min-width="70" style="background:#EAEAEA">
<template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.OutParkingFee }}</span>
</template>
</el-table-column>
<el-table-column width="115" label="司机茶代收入" min-width="70" style="background:#EAEAEA">
<el-table-column width="115" :label="$t('objFill.v101.Contract.sijicdsr')" min-width="70" style="background:#EAEAEA">
<template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.InTeaFee }}</span>
</template>
</el-table-column>
<el-table-column width="115" label="司机茶代支出" min-width="70" style="background:#EAEAEA">
<el-table-column width="115" :label="$t('objFill.v101.Contract.sijicdzc')" min-width="70" style="background:#EAEAEA">
<template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.OutTeaFee }}</span>
</template>
......@@ -702,7 +701,7 @@
<span class="fz15 fbold">{{ scope.row.CostMoney }}</span>
</template>
</el-table-column>
<el-table-column width="115" label="待收金额" min-width="70" style="background:#EAEAEA">
<el-table-column width="115" :label="$t('objFill.caravanshopcol.t4')" min-width="70" style="background:#EAEAEA">
<template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.DueInMoney }}</span>
</template>
......@@ -860,42 +859,40 @@
</template>
</el-table-column>
<el-table-column width="115" :label="$t('objFill.v101.CarDealerOrder.tingcheglfzc')" min-width="70" style="background:#EAEAEA">
<template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.OutPassByFee }}</span>
</template>
</el-table-column>
<el-table-column width="115" label="其他收入" min-width="70" style="background:#EAEAEA">
<el-table-column width="115" :label="$t('objFill.qitashouru')" min-width="70" style="background:#EAEAEA">
<template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.OtherIncome }}</span>
</template>
</el-table-column>
<el-table-column width="115" label="司机住宿费" min-width="70" style="background:#EAEAEA">
<el-table-column width="115" :label="$t('objFill.v101.busManagement.sijizhusf')" min-width="70" style="background:#EAEAEA">
<template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.DriverRoomFee }}</span>
</template>
</el-table-column>
<el-table-column width="115" label="停车费收入" min-width="70" style="background:#EAEAEA">
<el-table-column width="115" :label="$t('objFill.v101.Contract.tincrzf')" min-width="70" style="background:#EAEAEA">
<template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.InParkingFee }}</span>
</template>
</el-table-column>
<el-table-column width="115" label="停车费支出" min-width="70" style="background:#EAEAEA">
<el-table-column width="115" :label="$t('objFill.v101.Contract.tinczcf')" min-width="70" style="background:#EAEAEA">
<template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.OutParkingFee }}</span>
</template>
</el-table-column>
<el-table-column width="115" label="司机茶代收入" min-width="70" style="background:#EAEAEA">
<el-table-column width="115" :label="$t('objFill.v101.Contract.sijicdsr')" min-width="70" style="background:#EAEAEA">
<template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.InTeaFee }}</span>
</template>
</el-table-column>
<el-table-column width="115" label="司机茶代支出" min-width="70" style="background:#EAEAEA">
<el-table-column width="115" :label="$t('objFill.v101.Contract.sijicdzc')" min-width="70" style="background:#EAEAEA">
<template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.OutTeaFee }}</span>
</template>
</el-table-column>
<el-table-column width="115" :label="$t('active.cl_qita')+$t('objFill.caravanshopcol.t9')" min-width="70" style="background:#EAEAEA">
<template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.CostMoney }}</span>
......@@ -1094,13 +1091,13 @@
<li v-if="msgParameter.MailingState == 2">
<el-form-item :label="$t('admin.admin_address')" prop="MailingAddress">
<el-input style="border-radius: 3px;" v-model="msgParameter.MailingAddress"
:placeholder="$t('objFill.qinshuruyoujidz')" />
:placeholder="$t('objFill.qinshuruyoujidz')" />
</el-form-item>
</li>
<li v-if="msgParameter.MailingState == 2">
<el-form-item :label="$t('objFill.youjifei')" prop="MailingMoney">
<el-input type="Number" style="border-radius: 3px;" v-model="msgParameter.MailingMoney"
:placeholder="$t('objFill.qinshuruyoujif')" />
:placeholder="$t('objFill.qinshuruyoujif')" />
</el-form-item>
</li>
<li class="bottom">
......@@ -1131,7 +1128,7 @@
width="400px">
<el-row class="flex" style="margin-top: 10px;">
<el-col>
<span style="display: block;margin-bottom: 10px;">{{$t('pub.pubRemark')}}:</span>
<span style="display: block;margin-bottom: 10px;">{{$t('pub.pubRemark')}}：</span>
<span>
<el-input type="textarea" :rows="4" v-model="postMsg.Remark">
</el-input>
......
src/components/FinancialModule/ReportForm/fxOrderProfitLossList.vue
View file @ 3b9e0c4c
......@@ -234,7 +234,7 @@
</template>
</el-table-column> -->
<el-table-column
label="其他收入"
:label="$t('objFill.qitashouru')"
prop="YSMoney"
width="80"
></el-table-column>
......@@ -313,7 +313,7 @@
<el-table-column prop="Paid" label="已付"></el-table-column>
</el-table-column>
<!-- <el-table-column label="其他" align="center">
<el-table-column label="其他收入" prop="YSMoney" width="70"></el-table-column>
<el-table-column :label="$t('objFill.qitashouru')" prop="YSMoney" width="70"></el-table-column>
<el-table-column :label="$t('fnc.shishou')" prop="RealMoney" width="70"></el-table-column>
<el-table-column label="其他支出" prop="YFMoney" width="70"></el-table-column>
<el-table-column label="实付" prop="PayMoney" width="70"></el-table-column>
......
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