purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化根据单据编号查看单据明细的功能

Browse Source
This commit is contained in:
季圣华
2021-04-20 22:07:23 +08:00
parent 52985ab42f
commit 53d41acfab
28 changed files with 124 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jshERP-web/src/api/api.js
View File

@@ -157,8 +157,10 @@ const findBySelectRetail = (params)=>postAction("/supplier/findBySelect_retail",
const findSupplierById = (params)=>getAction("/supplier/findById",params);
//单据相关
const findDepotHeadTotalPay = (params)=>getAction("/depotHead/findTotalPay",params);
const findBillDetailByNumber = (params)=>getAction("/depotHead/getDetailByNumber",params);
const findStockByDepotAndBarCode = (params)=>getAction("/depotItem/findStockByDepotAndBarCode",params);
const findAccountHeadTotalPay = (params)=>getAction("/accountHead/findTotalPay",params);
const findFinancialDetailByNumber = (params)=>getAction("/accountHead/getDetailByNumber",params);
export {
getBuyAndSaleStatistics,
@@ -265,8 +267,10 @@ export {
findBySelectRetail,
findSupplierById,
findDepotHeadTotalPay,
findBillDetailByNumber,
findStockByDepotAndBarCode,
findAccountHeadTotalPay
findAccountHeadTotalPay,
findFinancialDetailByNumber
}

2
jshERP-web/src/views/bill/AllocationOutList.vue
View File

@@ -62,7 +62,7 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
<a @click="myHandleDetail(record, 'allocationOut')">查看</a>
<a @click="myHandleDetail(record, '调拨出库')">查看</a>
<a-divider type="vertical" />
<a @click="myHandleEdit(record)">编辑</a>
<a-divider type="vertical" />

2
jshERP-web/src/views/bill/AssembleList.vue
View File

@@ -62,7 +62,7 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
<a @click="myHandleDetail(record, 'assemble')">查看</a>
<a @click="myHandleDetail(record, '组装单')">查看</a>
<a-divider type="vertical" />
<a @click="myHandleEdit(record)">编辑</a>
<a-divider type="vertical" />

2
jshERP-web/src/views/bill/DisassembleList.vue
View File

@@ -62,7 +62,7 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
<a @click="myHandleDetail(record, 'disassemble')">查看</a>
<a @click="myHandleDetail(record, '拆卸单')">查看</a>
<a-divider type="vertical" />
<a @click="myHandleEdit(record)">编辑</a>
<a-divider type="vertical" />

2
jshERP-web/src/views/bill/OtherInList.vue
View File

@@ -62,7 +62,7 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
<a @click="myHandleDetail(record, 'otherIn')">查看</a>
<a @click="myHandleDetail(record, '其它入库')">查看</a>
<a-divider type="vertical" />
<a @click="myHandleEdit(record)">编辑</a>
<a-divider type="vertical" />

2
jshERP-web/src/views/bill/OtherOutList.vue
View File

@@ -62,7 +62,7 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
<a @click="myHandleDetail(record, 'otherOut')">查看</a>
<a @click="myHandleDetail(record, '其它出库')">查看</a>
<a-divider type="vertical" />
<a @click="myHandleEdit(record)">编辑</a>
<a-divider type="vertical" />

2
jshERP-web/src/views/bill/PurchaseBackList.vue
View File

@@ -62,7 +62,7 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
<a @click="myHandleDetail(record, 'purchaseBack')">查看</a>
<a @click="myHandleDetail(record, '采购退货出库')">查看</a>
<a-divider type="vertical" />
<a @click="myHandleEdit(record)">编辑</a>
<a-divider type="vertical" />

2
jshERP-web/src/views/bill/PurchaseInList.vue
View File

@@ -62,7 +62,7 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
<a @click="myHandleDetail(record, 'purchaseIn')">查看</a>
<a @click="myHandleDetail(record, '采购入库')">查看</a>
<a-divider type="vertical" />
<a @click="myHandleEdit(record)">编辑</a>
<a-divider type="vertical" />

2
jshERP-web/src/views/bill/PurchaseOrderList.vue
View File

@@ -64,7 +64,7 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
<a @click="myHandleDetail(record, 'purchaseOrder')">查看</a>
<a @click="myHandleDetail(record, '采购订单')">查看</a>
<a-divider type="vertical" />
<a @click="myHandleEdit(record)">编辑</a>
<a-divider type="vertical" />

2
jshERP-web/src/views/bill/RetailBackList.vue
View File

@@ -62,7 +62,7 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
<a @click="myHandleDetail(record, 'retailBack')">查看</a>
<a @click="myHandleDetail(record, '零售退货入库')">查看</a>
<a-divider type="vertical" />
<a @click="myHandleEdit(record)">编辑</a>
<a-divider type="vertical" />

2
jshERP-web/src/views/bill/RetailOutList.vue
View File

@@ -62,7 +62,7 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
<a @click="myHandleDetail(record, 'retailOut')">查看</a>
<a @click="myHandleDetail(record, '零售出库')">查看</a>
<a-divider type="vertical" />
<a @click="myHandleEdit(record)">编辑</a>
<a-divider type="vertical" />

2
jshERP-web/src/views/bill/SaleBackList.vue
View File

@@ -62,7 +62,7 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
<a @click="myHandleDetail(record, 'saleBack')">查看</a>
<a @click="myHandleDetail(record, '销售退货入库')">查看</a>
<a-divider type="vertical" />
<a @click="myHandleEdit(record)">编辑</a>
<a-divider type="vertical" />

2
jshERP-web/src/views/bill/SaleOrderList.vue
View File

@@ -64,7 +64,7 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
<a @click="myHandleDetail(record, 'saleOrder')">查看</a>
<a @click="myHandleDetail(record, '销售订单')">查看</a>
<a-divider type="vertical" />
<a @click="myHandleEdit(record)">编辑</a>
<a-divider type="vertical" />

2
jshERP-web/src/views/bill/SaleOutList.vue
View File

@@ -62,7 +62,7 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
<a @click="myHandleDetail(record, 'saleOut')">查看</a>
<a @click="myHandleDetail(record, '销售出库')">查看</a>
<a-divider type="vertical" />
<a @click="myHandleEdit(record)">编辑</a>
<a-divider type="vertical" />

26
jshERP-web/src/views/bill/dialog/BillDetail.vue
View File

@@ -12,7 +12,7 @@
style="top:5%;height: 100%;overflow-y: hidden">
<a-form :form="form">
<!--调拨出库-->
<template v-if="billType === 'allocationOut'">
<template v-if="billType === '调拨出库'">
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
@@ -48,7 +48,7 @@
</a-row>
</template>
<!--组装单-->
<template v-else-if="billType === 'assemble'">
<template v-else-if="billType === '组装单'">
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
@@ -81,7 +81,7 @@
</a-row>
</template>
<!--拆卸单-->
<template v-else-if="billType === 'disassemble'">
<template v-else-if="billType === '拆卸单'">
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
@@ -114,7 +114,7 @@
</a-row>
</template>
<!--其它入库-->
<template v-else-if="billType === 'otherIn'">
<template v-else-if="billType === '其它入库'">
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="供应商">
@@ -152,7 +152,7 @@
</a-row>
</template>
<!--其它出库-->
<template v-else-if="billType === 'otherOut'">
<template v-else-if="billType === '其它出库'">
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="客户">
@@ -190,7 +190,7 @@
</a-row>
</template>
<!--采购退货-->
<template v-else-if="billType === 'purchaseBack'">
<template v-else-if="billType === '采购退货出库'">
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="供应商">
@@ -269,7 +269,7 @@
</a-row>
</template>
<!--采购入库-->
<template v-else-if="billType === 'purchaseIn'">
<template v-else-if="billType === '采购入库'">
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="供应商">
@@ -348,7 +348,7 @@
</a-row>
</template>
<!--采购订单-->
<template v-else-if="billType === 'purchaseOrder'">
<template v-else-if="billType === '采购订单'">
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="供应商">
@@ -386,7 +386,7 @@
</a-row>
</template>
<!--零售退货-->
<template v-else-if="billType === 'retailBack'">
<template v-else-if="billType === '零售退货入库'">
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="会员卡号">
@@ -453,7 +453,7 @@
</a-row>
</template>
<!--零售出库-->
<template v-else-if="billType === 'retailOut'">
<template v-else-if="billType === '零售出库'">
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="会员卡号">
@@ -524,7 +524,7 @@
</a-row>
</template>
<!--销售退货-->
<template v-else-if="billType === 'saleBack'">
<template v-else-if="billType === '销售退货入库'">
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="客户">
@@ -610,7 +610,7 @@
</a-row>
</template>
<!--销售订单-->
<template v-else-if="billType === 'saleOrder'">
<template v-else-if="billType === '销售订单'">
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="客户">
@@ -652,7 +652,7 @@
</a-row>
</template>
<!--销售出库-->
<template v-else-if="billType === 'saleOut'">
<template v-else-if="billType === '销售出库'">
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="客户">

2
jshERP-web/src/views/financial/AdvanceInList.vue
View File

@@ -57,7 +57,7 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
<a @click="myHandleDetail(record, 'advanceIn')">查看</a>
<a @click="myHandleDetail(record, '收预付款')">查看</a>
<a-divider type="vertical" />
<a @click="myHandleEdit(record)">编辑</a>
<a-divider type="vertical" />

2
jshERP-web/src/views/financial/GiroList.vue
View File

@@ -57,7 +57,7 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
<a @click="myHandleDetail(record, 'giro')">查看</a>
<a @click="myHandleDetail(record, '转账')">查看</a>
<a-divider type="vertical" />
<a @click="myHandleEdit(record)">编辑</a>
<a-divider type="vertical" />

2
jshERP-web/src/views/financial/ItemInList.vue
View File

@@ -57,7 +57,7 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
<a @click="myHandleDetail(record, 'itemIn')">查看</a>
<a @click="myHandleDetail(record, '收入')">查看</a>
<a-divider type="vertical" />
<a @click="myHandleEdit(record)">编辑</a>
<a-divider type="vertical" />

2
jshERP-web/src/views/financial/ItemOutList.vue
View File

@@ -57,7 +57,7 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
<a @click="myHandleDetail(record, 'itemOut')">查看</a>
<a @click="myHandleDetail(record, '支出')">查看</a>
<a-divider type="vertical" />
<a @click="myHandleEdit(record)">编辑</a>
<a-divider type="vertical" />

2
jshERP-web/src/views/financial/MoneyInList.vue
View File

@@ -57,7 +57,7 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
<a @click="myHandleDetail(record, 'moneyIn')">查看</a>
<a @click="myHandleDetail(record, '收款')">查看</a>
<a-divider type="vertical" />
<a @click="myHandleEdit(record)">编辑</a>
<a-divider type="vertical" />

2
jshERP-web/src/views/financial/MoneyOutList.vue
View File

@@ -57,7 +57,7 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
<a @click="myHandleDetail(record, 'moneyOut')">查看</a>
<a @click="myHandleDetail(record, '付款')">查看</a>
<a-divider type="vertical" />
<a @click="myHandleEdit(record)">编辑</a>
<a-divider type="vertical" />

12
jshERP-web/src/views/financial/dialog/FinancialDetail.vue
View File

@@ -12,7 +12,7 @@
style="top:5%;height: 100%;overflow-y: hidden">
<a-form :form="form">
<!--收预付款-->
<template v-if="financialType === 'advanceIn'">
<template v-if="financialType === '收预付款'">
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款会员">
@@ -54,7 +54,7 @@
</a-row>
</template>
<!--转账-->
<template v-if="financialType === 'giro'">
<template v-if="financialType === '转账'">
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="经手人">
@@ -106,7 +106,7 @@
</a-row>
</template>
<!--收入-->
<template v-if="financialType === 'itemIn'">
<template v-if="financialType === '收入'">
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="往来单位">
@@ -162,7 +162,7 @@
</a-row>
</template>
<!--支出-->
<template v-if="financialType === 'itemOut'">
<template v-if="financialType === '支出'">
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="往来单位">
@@ -218,7 +218,7 @@
</a-row>
</template>
<!--收款-->
<template v-if="financialType === 'moneyIn'">
<template v-if="financialType === '收款'">
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款单位">
@@ -270,7 +270,7 @@
</a-row>
</template>
<!--付款-->
<template v-if="financialType === 'moneyOut'">
<template v-if="financialType === '付款'">
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收款单位">

21
jshERP-web/src/views/report/InDetail.vue
View File

@@ -61,21 +61,28 @@
:pagination="ipagination"
:loading="loading"
@change="handleTableChange">
<span slot="numberCustomRender" slot-scope="text, record">
<a @click="myHandleDetail(record)">{{record.number}}</a>
</span>
</a-table>
<!-- table区域-end -->
<!-- 表单区域 -->
<bill-detail ref="modalDetail"></bill-detail>
</a-card>
</template>
<script>
import BillDetail from '../bill/dialog/BillDetail'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { getNowFormatMonth } from '@/utils/util';
import {getAction} from '@/api/manage'
import {findBySelectSup} from '@/api/api'
import {findBySelectSup, findBillDetailByNumber} from '@/api/api'
import JEllipsis from '@/components/jeecg/JEllipsis'
import moment from 'moment'
export default {
name: "BuyInReport",
mixins:[JeecgListMixin],
components: {
BillDetail,
JEllipsis
},
data () {
@@ -107,7 +114,10 @@
return parseInt(index)+1;
}
},
{title: '单据编号', dataIndex: 'number', width: 140},
{
title: '单据编号', dataIndex: 'number', width: 140,
scopedSlots: { customRender: 'numberCustomRender' },
},
{title: '名称', dataIndex: 'mname', width: 120},
{title: '规格', dataIndex: 'standard', width: 100},
{title: '型号', dataIndex: 'model', width: 100},
@@ -172,6 +182,13 @@
this.$message.info(res.data);
}
})
},
myHandleDetail(record) {
findBillDetailByNumber({ number: record.number }).then((res) => {
if (res && res.code === 200) {
this.handleDetail(res.data, record.newType);
}
})
}
}
}

21
jshERP-web/src/views/report/OutDetail.vue
View File

@@ -61,21 +61,28 @@
:pagination="ipagination"
:loading="loading"
@change="handleTableChange">
<span slot="numberCustomRender" slot-scope="text, record">
<a @click="myHandleDetail(record)">{{record.number}}</a>
</span>
</a-table>
<!-- table区域-end -->
<!-- 表单区域 -->
<bill-detail ref="modalDetail"></bill-detail>
</a-card>
</template>
<script>
import BillDetail from '../bill/dialog/BillDetail'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { getNowFormatMonth } from '@/utils/util';
import {getAction} from '@/api/manage'
import {findBySelectCus} from '@/api/api'
import {findBySelectCus, findBillDetailByNumber} from '@/api/api'
import JEllipsis from '@/components/jeecg/JEllipsis'
import moment from 'moment'
export default {
name: "BuyInReport",
mixins:[JeecgListMixin],
components: {
BillDetail,
JEllipsis
},
data () {
@@ -107,7 +114,10 @@
return parseInt(index)+1;
}
},
{title: '单据编号', dataIndex: 'number', width: 140},
{
title: '单据编号', dataIndex: 'number', width: 140,
scopedSlots: { customRender: 'numberCustomRender' },
},
{title: '名称', dataIndex: 'mname', width: 120},
{title: '规格', dataIndex: 'standard', width: 100},
{title: '型号', dataIndex: 'model', width: 100},
@@ -172,6 +182,13 @@
this.$message.info(res.data);
}
})
},
myHandleDetail(record) {
findBillDetailByNumber({ number: record.number }).then((res) => {
if (res && res.code === 200) {
this.handleDetail(res.data, record.newType);
}
})
}
}
}

41
jshERP-web/src/views/report/modules/AccountInOutList.vue
View File

@@ -18,25 +18,38 @@
:pagination="ipagination"
:loading="loading"
@change="handleTableChange">
<span slot="numberCustomRender" slot-scope="text, record">
<a @click="myHandleDetail(record)">{{record.number}}</a>
</span>
</a-table>
<!-- table区域-end -->
<!-- 表单区域 -->
<bill-detail ref="billDetail"></bill-detail>
<financial-detail ref="financialDetail"></financial-detail>
</a-modal>
</template>
<script>
import BillDetail from '../../bill/dialog/BillDetail'
import FinancialDetail from '../../financial/dialog/FinancialDetail'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import JEllipsis from '@/components/jeecg/JEllipsis'
import {getAction} from '@/api/manage'
import {findBillDetailByNumber, findFinancialDetailByNumber} from '@/api/api'
export default {
name: "AccountInOutList",
mixins:[JeecgListMixin],
components: {
JEllipsis
BillDetail,
FinancialDetail,
JEllipsis,
findBillDetailByNumber,
findFinancialDetailByNumber
},
data () {
return {
title:"操作",
visible: false,
disableMixinCreated: false,
toFromType: '',
// 查询条件
queryParam: {
accountId:'',
@@ -55,7 +68,10 @@
return parseInt(index)+1;
}
},
{ title: '单据编号', dataIndex: 'number', width: 150},
{
title: '单据编号', dataIndex: 'number', width: 150,
scopedSlots: { customRender: 'numberCustomRender' },
},
{ title: '类型', dataIndex: 'type', width: 100},
{ title: '单位信息', dataIndex: 'supplierName', width: 150},
{ title: '金额', dataIndex: 'changeAmount', width: 80},
@@ -115,6 +131,25 @@
},
handleCancel () {
this.close()
},
myHandleDetail(record) {
let that = this
this.toFromType = record.fromType
if(record.fromType === 'bill') {
findBillDetailByNumber({ number: record.number }).then((res) => {
if (res && res.code === 200) {
that.$refs.billDetail.show(res.data, record.type);
that.$refs.billDetail.title="详情";
}
})
} else if(record.fromType === 'financial') {
findFinancialDetailByNumber({ billNo: record.number }).then((res) => {
if (res && res.code === 200) {
that.$refs.financialDetail.show(res.data, record.type);
that.$refs.financialDetail.title="详情";
}
})
}
}
}
}