Commit 4fa9d11f authored by 我在何方's avatar 我在何方

收款单审核详情显示申请原因

parent 370db396
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
<div v-for="itemAmount in collectionAmount" :key="itemAmount.currencyNameZh">{{ itemAmount.amount}}{{$i18n.locale=='zh_CN'?itemAmount.currencyNameZh:itemAmount.currencyNameEn}}</div> <div v-for="itemAmount in collectionAmount" :key="itemAmount.currencyNameZh">{{ itemAmount.amount}}{{$i18n.locale=='zh_CN'?itemAmount.currencyNameZh:itemAmount.currencyNameEn}}</div>
</template> </template>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item v-if="reason" :label="$t('申请理由')">{{reason}}</el-descriptions-item>
</el-descriptions> </el-descriptions>
<div class="btn"> <div class="btn">
<el-button <el-button
...@@ -46,7 +47,8 @@ export default { ...@@ -46,7 +47,8 @@ export default {
collectionAmount: [], collectionAmount: [],
currencyList:[], currencyList:[],
list:[], list:[],
receiptId:0 receiptId:0,
reason:''
} }
}, },
watch:{ watch:{
...@@ -74,6 +76,7 @@ export default { ...@@ -74,6 +76,7 @@ export default {
getReceiptApprove(this.id).then(res => { getReceiptApprove(this.id).then(res => {
if(res.data.receiptId){ if(res.data.receiptId){
this.receiptId = res.data.receiptId this.receiptId = res.data.receiptId
this.reason = res.data.reason
this.getReceiptInfo() this.getReceiptInfo()
} }
}) })
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
<span>{{ parseTime(form.createTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(form.createTime, '{y}-{m}-{d}') }}</span>
</template></el-descriptions-item> </template></el-descriptions-item>
<el-descriptions-item :label="$t('业务员')">{{ form.salesmanName }}</el-descriptions-item> <el-descriptions-item :label="$t('业务员')">{{ form.salesmanName }}</el-descriptions-item>
<el-descriptions-item v-if="reason" :label="$t('申请理由')">{{reason}}</el-descriptions-item>
</el-descriptions> </el-descriptions>
<div class="btn"> <div class="btn">
<el-table ref="multipleTable" :data="detailed" border row-key="id"> <el-table ref="multipleTable" :data="detailed" border row-key="id">
...@@ -157,7 +158,8 @@ export default { ...@@ -157,7 +158,8 @@ export default {
collectionAmount: [], collectionAmount: [],
addForm:{}, addForm:{},
receiptId:0, receiptId:0,
receiptItemId:0 receiptItemId:0,
reason:''
} }
}, },
watch:{ watch:{
...@@ -183,6 +185,7 @@ export default { ...@@ -183,6 +185,7 @@ export default {
if(res.data.receiptId){ if(res.data.receiptId){
this.receiptId = res.data.receiptId this.receiptId = res.data.receiptId
this.receiptItemId = res.data.receiptItemId this.receiptItemId = res.data.receiptItemId
this.reason = res.data.reason
this.getReceiptInfo() this.getReceiptInfo()
} }
}) })
......
...@@ -14,7 +14,9 @@ ...@@ -14,7 +14,9 @@
<div v-for="itemAmount in collectionAmount" :key="itemAmount.currencyNameZh">{{$i18n.locale=='zh_CN'?itemAmount.currencyNameZh:itemAmount.currencyNameEn}}: {{ itemAmount.amount}}</div> <div v-for="itemAmount in collectionAmount" :key="itemAmount.currencyNameZh">{{$i18n.locale=='zh_CN'?itemAmount.currencyNameZh:itemAmount.currencyNameEn}}: {{ itemAmount.amount}}</div>
</template> </template>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item v-if="reason" :label="$t('申请理由')">{{reason}}</el-descriptions-item>
</el-descriptions> </el-descriptions>
</div> </div>
<el-descriptions :column="3" border> <el-descriptions :column="3" border>
<el-descriptions-item > <el-descriptions-item >
...@@ -85,7 +87,8 @@ export default { ...@@ -85,7 +87,8 @@ export default {
writeOffAmounts:0, writeOffAmounts:0,
detailed:[], detailed:[],
showCurrencyId:0, showCurrencyId:0,
receiptId:0 receiptId:0,
reason:''
} }
}, },
watch:{ watch:{
...@@ -149,6 +152,7 @@ export default { ...@@ -149,6 +152,7 @@ export default {
getReceiptApprove(this.id).then(res => { getReceiptApprove(this.id).then(res => {
if(res.data.receiptId){ if(res.data.receiptId){
this.receiptId = res.data.receiptId this.receiptId = res.data.receiptId
this.reason = res.data.reason
this.getReceiptInfo() this.getReceiptInfo()
} }
}) })
......
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