Skip to content
GitLab
Commit 52985ab4 authored by 季圣华's avatar 季圣华
Browse files

给单据增加查看详细的页面

parent b641ea7a
Hide whitespace changes
Inline Side-by-side
jshERP-web/src/views/financial/ItemOutList.vue
View file @ 52985ab4
......@@ -57,6 +57,8 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
<a @click="myHandleDetail(record, 'itemOut')">查看</a>
<a-divider type="vertical" />
<a @click="myHandleEdit(record)">编辑</a>
<a-divider type="vertical" />
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
......@@ -68,10 +70,12 @@
<!-- table区域-end -->
<!-- 表单区域 -->
<item-out-modal ref="modalForm" @ok="modalFormOk"></item-out-modal>
<financial-detail ref="modalDetail"></financial-detail>
</a-card>
</template>
<script>
import ItemOutModal from './modules/ItemOutModal'
import FinancialDetail from './dialog/FinancialDetail'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { FinancialListMixin } from './mixins/FinancialListMixin'
import JDate from '@/components/jeecg/JDate'
......@@ -80,6 +84,7 @@
mixins:[JeecgListMixin, FinancialListMixin],
components: {
ItemOutModal,
FinancialDetail,
JDate
},
data () {
......
jshERP-web/src/views/financial/MoneyInList.vue
View file @ 52985ab4
......@@ -57,6 +57,8 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
<a @click="myHandleDetail(record, 'moneyIn')">查看</a>
<a-divider type="vertical" />
<a @click="myHandleEdit(record)">编辑</a>
<a-divider type="vertical" />
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
......@@ -68,10 +70,12 @@
<!-- table区域-end -->
<!-- 表单区域 -->
<money-in-modal ref="modalForm" @ok="modalFormOk"></money-in-modal>
<financial-detail ref="modalDetail"></financial-detail>
</a-card>
</template>
<script>
import MoneyInModal from './modules/MoneyInModal'
import FinancialDetail from './dialog/FinancialDetail'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { FinancialListMixin } from './mixins/FinancialListMixin'
import JDate from '@/components/jeecg/JDate'
......@@ -80,6 +84,7 @@
mixins:[JeecgListMixin, FinancialListMixin],
components: {
MoneyInModal,
FinancialDetail,
JDate
},
data () {
......
jshERP-web/src/views/financial/MoneyOutList.vue
View file @ 52985ab4
......@@ -57,6 +57,8 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
<a @click="myHandleDetail(record, 'moneyOut')">查看</a>
<a-divider type="vertical" />
<a @click="myHandleEdit(record)">编辑</a>
<a-divider type="vertical" />
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
......@@ -68,10 +70,12 @@
<!-- table区域-end -->
<!-- 表单区域 -->
<money-out-modal ref="modalForm" @ok="modalFormOk"></money-out-modal>
<financial-detail ref="modalDetail"></financial-detail>
</a-card>
</template>
<script>
import MoneyOutModal from './modules/MoneyOutModal'
import FinancialDetail from './dialog/FinancialDetail'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { FinancialListMixin } from './mixins/FinancialListMixin'
import JDate from '@/components/jeecg/JDate'
......@@ -80,6 +84,7 @@
mixins:[JeecgListMixin, FinancialListMixin],
components: {
MoneyOutModal,
FinancialDetail,
JDate
},
data () {
......
jshERP-web/src/views/financial/dialog/FinancialDetail.vue
View file @ 52985ab4
<template>
<a-card :bordered="false" class="card-area">
<j-modal
:title="title"
:width="width"
:visible="visible"
:maskClosable="false"
:keyboard="false"
:forceRender="true"
@cancel="handleCancel"
wrapClassName="ant-modal-cust-warp"
style="top:5%;height: 100%;overflow-y: hidden">
<a-form :form="form">
<!--收预付款-->
<template v-if="financialType === 'advanceIn'">
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款会员">
<a-input v-decorator="['id']" hidden/>
{{model.organName}}
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="经手人">
{{model.handsPersonName}}
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
{{model.billTimeStr}}
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
{{model.billNo}}
</a-form-item>
</a-col>
</a-row>
<a-table
ref="table"
size="middle"
bordered
rowKey="id"
:pagination="false"
:columns="advanceInColumns"
:dataSource="dataSource">
</a-table>
<a-row class="form-row" :gutter="24">
<a-col :lg="24" :md="24" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="{xs: { span: 24 },sm: { span: 24 }}" label="" style="padding:20px 10px;">
{{model.remark}}
</a-form-item>
</a-col>
</a-row>
</template>
<!--转账-->
<template v-if="financialType === 'giro'">
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="经手人">
<a-input v-decorator="['id']" hidden/>
{{model.handsPersonName}}
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
{{model.billTimeStr}}
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
{{model.billNo}}
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24"></a-col>
</a-row>
<a-table
ref="table"
size="middle"
bordered
rowKey="id"
:pagination="false"
:columns="giroColumns"
:dataSource="dataSource">
</a-table>
<a-row class="form-row" :gutter="24">
<a-col :lg="24" :md="24" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="{xs: { span: 24 },sm: { span: 24 }}" label="" style="padding:20px 10px;">
{{model.remark}}
</a-form-item>
</a-col>
</a-row>
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款账户">
{{model.accountName}}
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="实付金额">
{{model.changeAmount}}
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24"></a-col>
<a-col :lg="6" :md="12" :sm="24"></a-col>
</a-row>
</template>
<!--收入-->
<template v-if="financialType === 'itemIn'">
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="往来单位">
<a-input v-decorator="['id']" hidden/>
{{model.organName}}
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="经手人">
{{model.handsPersonName}}
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
{{model.billTimeStr}}
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
{{model.billNo}}
</a-form-item>
</a-col>
</a-row>
<a-table
ref="table"
size="middle"
bordered
rowKey="id"
:pagination="false"
:columns="itemInColumns"
:dataSource="dataSource">
</a-table>
<a-row class="form-row" :gutter="24">
<a-col :lg="24" :md="24" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="{xs: { span: 24 },sm: { span: 24 }}" label="" style="padding:20px 10px;">
{{model.remark}}
</a-form-item>
</a-col>
</a-row>
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收款账户">
{{model.accountName}}
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收款金额">
{{model.changeAmount}}
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24"></a-col>
<a-col :lg="6" :md="12" :sm="24"></a-col>
</a-row>
</template>
<!--支出-->
<template v-if="financialType === 'itemOut'">
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="往来单位">
<a-input v-decorator="['id']" hidden/>
{{model.organName}}
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="经手人">
{{model.handsPersonName}}
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
{{model.billTimeStr}}
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
{{model.billNo}}
</a-form-item>
</a-col>
</a-row>
<a-table
ref="table"
size="middle"
bordered
rowKey="id"
:pagination="false"
:columns="itemOutColumns"
:dataSource="dataSource">
</a-table>
<a-row class="form-row" :gutter="24">
<a-col :lg="24" :md="24" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="{xs: { span: 24 },sm: { span: 24 }}" label="" style="padding:20px 10px;">
{{model.remark}}
</a-form-item>
</a-col>
</a-row>
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款账户">
{{model.accountName}}
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款金额">
{{model.changeAmount}}
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24"></a-col>
<a-col :lg="6" :md="12" :sm="24"></a-col>
</a-row>
</template>
<!--收款-->
<template v-if="financialType === 'moneyIn'">
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款单位">
<a-input v-decorator="['id']" hidden/>
{{model.organName}}
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="经手人">
{{model.handsPersonName}}
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
{{model.billTimeStr}}
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
{{model.billNo}}
</a-form-item>
</a-col>
</a-row>
<a-table
ref="table"
size="middle"
bordered
rowKey="id"
:pagination="false"
:columns="moneyInColumns"
:dataSource="dataSource">
</a-table>
<a-row class="form-row" :gutter="24">
<a-col :lg="24" :md="24" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="{xs: { span: 24 },sm: { span: 24 }}" label="" style="padding:20px 10px;">
{{model.remark}}
</a-form-item>
</a-col>
</a-row>
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠金额">
{{model.changeAmount}}
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24"></a-col>
<a-col :lg="6" :md="12" :sm="24"></a-col>
<a-col :lg="6" :md="12" :sm="24"></a-col>
</a-row>
</template>
<!--付款-->
<template v-if="financialType === 'moneyOut'">
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收款单位">
<a-input v-decorator="['id']" hidden/>
{{model.organName}}
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="经手人">
{{model.handsPersonName}}
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
{{model.billTimeStr}}
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
{{model.billNo}}
</a-form-item>
</a-col>
</a-row>
<a-table
ref="table"
size="middle"
bordered
rowKey="id"
:pagination="false"
:columns="moneyOutColumns"
:dataSource="dataSource">
</a-table>
<a-row class="form-row" :gutter="24">
<a-col :lg="24" :md="24" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="{xs: { span: 24 },sm: { span: 24 }}" label="" style="padding:20px 10px;">
{{model.remark}}
</a-form-item>
</a-col>
</a-row>
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠金额">
{{model.changeAmount}}
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24"></a-col>
<a-col :lg="6" :md="12" :sm="24"></a-col>
<a-col :lg="6" :md="12" :sm="24"></a-col>
</a-row>
</template>
</a-form>
</j-modal>
</a-card>
</template>
<script>
import pick from 'lodash.pick'
import { getAction } from '@/api/manage'
export default {
name: 'FinancialDetail'
name: 'FinancialDetail',
data () {
return {
title: "详情",
width: '1200px',
visible: false,
model: {},
financialType: '',
labelCol: {
xs: { span: 24 },
sm: { span: 6 },
},
wrapperCol: {
xs: { span: 24 },
sm: { span: 16 },
},
form: this.$form.createForm(this),
loading: false,
dataSource: [],
url: {
detailList: '/accountItem/getDetailList'
},
advanceInColumns: [
{ title: '账户名称',dataIndex: 'accountName',width: '30%'},
{ title: '金额',dataIndex: 'eachAmount', width: '30%'},
{ title: '备注',dataIndex: 'remark', width: '30%'}
],
giroColumns: [
{ title: '账户名称',dataIndex: 'accountName',width: '30%'},
{ title: '金额',dataIndex: 'eachAmount', width: '30%'},
{ title: '备注',dataIndex: 'remark', width: '30%'}
],
itemInColumns: [
{ title: '收入项目',dataIndex: 'inOutItemName',width: '30%'},
{ title: '金额',dataIndex: 'eachAmount', width: '30%'},
{ title: '备注',dataIndex: 'remark', width: '30%'}
],
itemOutColumns: [
{ title: '支出项目',dataIndex: 'inOutItemName',width: '30%'},
{ title: '金额',dataIndex: 'eachAmount', width: '30%'},
{ title: '备注',dataIndex: 'remark', width: '30%'}
],
moneyInColumns: [
{ title: '账户名称',dataIndex: 'accountName',width: '20%'},
{ title: '金额',dataIndex: 'eachAmount', width: '10%'},
{ title: '备注',dataIndex: 'remark', width: '30%'}
],
moneyOutColumns: [
{ title: '账户名称',dataIndex: 'accountName',width: '20%'},
{ title: '金额',dataIndex: 'eachAmount', width: '10%'},
{ title: '备注',dataIndex: 'remark', width: '30%'}
],
}
},
created () {
},
methods: {
show(record, type) {
this.financialType = type
this.visible = true;
this.model = Object.assign({}, record);
this.$nextTick(() => {
this.form.setFieldsValue(pick(this.model,'id'))
});
let params = {
headerId: this.model.id,
}
let url = this.readOnly ? this.url.detailList : this.url.detailList;
this.requestSubTableData(url, params);
},
requestSubTableData(url, params, success) {
this.loading = true
getAction(url, params).then(res => {
if(res && res.code === 200){
this.dataSource = res.data.rows
typeof success === 'function' ? success(res) : ''
}
}).finally(() => {
this.loading = false
})
},
handleCancel() {
this.close()
},
close() {
this.$emit('close');
this.visible = false;
}
}
}
</script>
......
jshERP-web/src/views/financial/mixins/FinancialListMixin.js
View file @ 52985ab4
......@@ -23,9 +23,8 @@ export const FinancialListMixin = {
this.$refs.modalForm.action = "edit";
this.handleEdit(record);
},
myHandleDetail(record) {
this.$refs.modalForm.action = "detail";
this.handleDetail(record);
myHandleDetail(record, type) {
this.handleDetail(record, type);
},
handleApprove(record) {
this.$refs.modalForm.action = "approve";
......
jshERP-web/src/views/financial/modules/AdvanceInModal.vue
View file @ 52985ab4
......@@ -85,7 +85,7 @@
import { FinancialModalMixin } from '../mixins/FinancialModalMixin'
import JDate from '@/components/jeecg/JDate'
export default {
name: "MoneyInModal",
name: "AdvanceInModal",
mixins: [JEditableTableMixin, FinancialModalMixin],
components: {
JDate
......
jshERP-web/src/views/financial/modules/GiroModal.vue
View file @ 52985ab4
......@@ -85,7 +85,7 @@
import { FinancialModalMixin } from '../mixins/FinancialModalMixin'
import JDate from '@/components/jeecg/JDate'
export default {
name: "MoneyInModal",
name: "GiroModal",
mixins: [JEditableTableMixin, FinancialModalMixin],
components: {
JDate
......
Supports Markdown
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