多账户优化
This commit is contained in:
季圣华
@@ -431,12 +431,12 @@
|
|||||||
</a-col>
|
</a-col>
|
||||||
<a-col :lg="24" :md="6" :sm="6">
|
<a-col :lg="24" :md="6" :sm="6">
|
||||||
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款金额">
|
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款金额">
|
||||||
{{model.getAmount}}
|
{{model.changeAmount}}
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col :lg="24" :md="6" :sm="6">
|
<a-col :lg="24" :md="6" :sm="6">
|
||||||
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="找零">
|
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="找零">
|
||||||
{{model.backAmount}}
|
0
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col :lg="24" :md="6" :sm="6">
|
<a-col :lg="24" :md="6" :sm="6">
|
||||||
@@ -501,12 +501,12 @@
|
|||||||
</a-col>
|
</a-col>
|
||||||
<a-col :lg="24" :md="6" :sm="6">
|
<a-col :lg="24" :md="6" :sm="6">
|
||||||
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款金额">
|
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款金额">
|
||||||
{{model.getAmount}}
|
{{model.changeAmount}}
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col :lg="24" :md="6" :sm="6">
|
<a-col :lg="24" :md="6" :sm="6">
|
||||||
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="找零">
|
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="找零">
|
||||||
{{model.backAmount}}
|
0
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col :lg="24" :md="6" :sm="6">
|
<a-col :lg="24" :md="6" :sm="6">
|
||||||
|
|||||||
@@ -71,7 +71,7 @@ export const BillModalMixin = {
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
this.form.setFieldsValue({'payType': '现金'})
|
this.form.setFieldsValue({'payType': '现付'})
|
||||||
})
|
})
|
||||||
this.accountIdList = []
|
this.accountIdList = []
|
||||||
this.accountMoneyList = []
|
this.accountMoneyList = []
|
||||||
|
|||||||
@@ -1,120 +1,129 @@
|
|||||||
<template>
|
<template>
|
||||||
<j-modal
|
<a-card :bordered="false" class="card-area">
|
||||||
:title="title"
|
<j-modal
|
||||||
:width="width"
|
:title="title"
|
||||||
:visible="visible"
|
:width="width"
|
||||||
:confirmLoading="confirmLoading"
|
:visible="visible"
|
||||||
:maskClosable="false"
|
:confirmLoading="confirmLoading"
|
||||||
:keyboard="false"
|
:maskClosable="false"
|
||||||
:forceRender="true"
|
:keyboard="false"
|
||||||
switchFullscreen
|
:forceRender="true"
|
||||||
@ok="handleOk"
|
switchFullscreen
|
||||||
@cancel="handleCancel"
|
@ok="handleOk"
|
||||||
wrapClassName="ant-modal-cust-warp"
|
@cancel="handleCancel"
|
||||||
style="top:5%;height: 100%;overflow-y: hidden">
|
wrapClassName="ant-modal-cust-warp"
|
||||||
<a-spin :spinning="confirmLoading">
|
style="top:5%;height: 100%;overflow-y: hidden">
|
||||||
<a-form :form="form">
|
<a-spin :spinning="confirmLoading">
|
||||||
<a-row class="form-row" :gutter="24">
|
<a-form :form="form">
|
||||||
<a-col :lg="6" :md="12" :sm="24">
|
<a-row class="form-row" :gutter="24">
|
||||||
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="供应商">
|
<a-col :lg="6" :md="12" :sm="24">
|
||||||
<a-select placeholder="选择供应商" v-decorator="[ 'organId', validatorRules.organId ]" :dropdownMatchSelectWidth="false">
|
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="供应商">
|
||||||
<a-select-option v-for="(item,index) in supList" :key="index" :value="item.id">
|
<a-select placeholder="选择供应商" v-decorator="[ 'organId', validatorRules.organId ]" :dropdownMatchSelectWidth="false">
|
||||||
{{ item.supplier }}
|
<a-select-option v-for="(item,index) in supList" :key="index" :value="item.id">
|
||||||
</a-select-option>
|
{{ item.supplier }}
|
||||||
</a-select>
|
</a-select-option>
|
||||||
</a-form-item>
|
</a-select>
|
||||||
</a-col>
|
</a-form-item>
|
||||||
<a-col :lg="6" :md="12" :sm="24">
|
</a-col>
|
||||||
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
|
<a-col :lg="6" :md="12" :sm="24">
|
||||||
<j-date v-decorator="['operTime']" :show-time="true"/>
|
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
|
||||||
</a-form-item>
|
<j-date v-decorator="['operTime']" :show-time="true"/>
|
||||||
</a-col>
|
</a-form-item>
|
||||||
<a-col :lg="6" :md="12" :sm="24">
|
</a-col>
|
||||||
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
|
<a-col :lg="6" :md="12" :sm="24">
|
||||||
<a-input placeholder="请输入单据编号" v-decorator.trim="[ 'number' ]" :readOnly="true"/>
|
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
|
||||||
</a-form-item>
|
<a-input placeholder="请输入单据编号" v-decorator.trim="[ 'number' ]" :readOnly="true"/>
|
||||||
</a-col>
|
</a-form-item>
|
||||||
<a-col :lg="6" :md="12" :sm="24"></a-col>
|
</a-col>
|
||||||
</a-row>
|
<a-col :lg="6" :md="12" :sm="24"></a-col>
|
||||||
<j-editable-table
|
</a-row>
|
||||||
:ref="refKeys[0]"
|
<j-editable-table
|
||||||
:loading="materialTable.loading"
|
:ref="refKeys[0]"
|
||||||
:columns="materialTable.columns"
|
:loading="materialTable.loading"
|
||||||
:dataSource="materialTable.dataSource"
|
:columns="materialTable.columns"
|
||||||
:maxHeight="300"
|
:dataSource="materialTable.dataSource"
|
||||||
:rowNumber="false"
|
:maxHeight="300"
|
||||||
:rowSelection="true"
|
:rowNumber="false"
|
||||||
:actionButton="true"
|
:rowSelection="true"
|
||||||
@valueChange="onValueChange"
|
:actionButton="true"
|
||||||
@deleted="onDeleted" />
|
@valueChange="onValueChange"
|
||||||
<a-row class="form-row" :gutter="24">
|
@deleted="onDeleted" />
|
||||||
<a-col :lg="24" :md="24" :sm="24">
|
<a-row class="form-row" :gutter="24">
|
||||||
<a-form-item :labelCol="labelCol" :wrapperCol="{xs: { span: 24 },sm: { span: 24 }}" label="">
|
<a-col :lg="24" :md="24" :sm="24">
|
||||||
<a-textarea :rows="2" placeholder="请输入备注" v-decorator="[ 'remark' ]" style="margin-top:8px;"/>
|
<a-form-item :labelCol="labelCol" :wrapperCol="{xs: { span: 24 },sm: { span: 24 }}" label="">
|
||||||
</a-form-item>
|
<a-textarea :rows="2" placeholder="请输入备注" v-decorator="[ 'remark' ]" style="margin-top:8px;"/>
|
||||||
</a-col>
|
</a-form-item>
|
||||||
</a-row>
|
</a-col>
|
||||||
<a-row class="form-row" :gutter="24">
|
</a-row>
|
||||||
<a-col :lg="6" :md="12" :sm="24">
|
<a-row class="form-row" :gutter="24">
|
||||||
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠率">
|
<a-col :lg="6" :md="12" :sm="24">
|
||||||
<a-input placeholder="请输入优惠率" v-decorator.trim="[ 'discount' ]" suffix="%" @keyup="onKeyUpDiscount"/>
|
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠率">
|
||||||
</a-form-item>
|
<a-input style="width:185px;" placeholder="请输入优惠率" v-decorator.trim="[ 'discount' ]" suffix="%" @keyup="onKeyUpDiscount"/>
|
||||||
</a-col>
|
</a-form-item>
|
||||||
<a-col :lg="6" :md="12" :sm="24">
|
</a-col>
|
||||||
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="退款优惠">
|
<a-col :lg="6" :md="12" :sm="24">
|
||||||
<a-input placeholder="请输入付款优惠" v-decorator.trim="[ 'discountMoney' ]" @keyup="onKeyUpDiscountMoney"/>
|
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="退款优惠">
|
||||||
</a-form-item>
|
<a-input placeholder="请输入付款优惠" v-decorator.trim="[ 'discountMoney' ]" @keyup="onKeyUpDiscountMoney"/>
|
||||||
</a-col>
|
</a-form-item>
|
||||||
<a-col :lg="6" :md="12" :sm="24">
|
</a-col>
|
||||||
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠后金额">
|
<a-col :lg="6" :md="12" :sm="24">
|
||||||
<a-input placeholder="请输入优惠后金额" v-decorator.trim="[ 'discountLastMoney' ]" :readOnly="true"/>
|
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠后金额">
|
||||||
</a-form-item>
|
<a-input placeholder="请输入优惠后金额" v-decorator.trim="[ 'discountLastMoney' ]" :readOnly="true"/>
|
||||||
</a-col>
|
</a-form-item>
|
||||||
<a-col :lg="6" :md="12" :sm="24">
|
</a-col>
|
||||||
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="其它费用">
|
<a-col :lg="6" :md="12" :sm="24">
|
||||||
<a-input placeholder="请选择其它费用" v-decorator.trim="[ 'otherMoney' ]" @keyup="onKeyUpOtherMoney"/>
|
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="其它费用">
|
||||||
</a-form-item>
|
<a-input placeholder="请选择其它费用" v-decorator.trim="[ 'otherMoney' ]" @keyup="onKeyUpOtherMoney"/>
|
||||||
</a-col>
|
</a-form-item>
|
||||||
</a-row>
|
</a-col>
|
||||||
<a-row class="form-row" :gutter="24">
|
</a-row>
|
||||||
<a-col :lg="6" :md="12" :sm="24">
|
<a-row class="form-row" :gutter="24">
|
||||||
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结算账户">
|
<a-col :lg="6" :md="12" :sm="24">
|
||||||
<a-select placeholder="选择结算账户" v-decorator="[ 'accountId' ]" :dropdownMatchSelectWidth="false">
|
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结算账户">
|
||||||
<a-select-option v-for="(item,index) in accountList" :key="index" :value="item.id">
|
<a-select style="width:185px;" placeholder="选择结算账户" v-decorator="[ 'accountId' ]"
|
||||||
{{ item.name }}
|
:dropdownMatchSelectWidth="false" allowClear @select="selectAccount">
|
||||||
</a-select-option>
|
<a-select-option v-for="(item,index) in accountList" :key="index" :value="item.id">
|
||||||
</a-select>
|
{{ item.name }}
|
||||||
</a-form-item>
|
</a-select-option>
|
||||||
</a-col>
|
</a-select>
|
||||||
<a-col :lg="6" :md="12" :sm="24">
|
<a-tooltip title="多账户明细">
|
||||||
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次退款">
|
<a-button type="default" icon="folder" style="margin-left: 8px;" size="small" v-show="manyAccountBtnStatus" @click="handleManyAccount"/>
|
||||||
<a-input placeholder="请输入本次付款" v-decorator.trim="[ 'changeAmount' ]" @keyup="onKeyUpChangeAmount"/>
|
</a-tooltip>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col :lg="6" :md="12" :sm="24">
|
<a-col :lg="6" :md="12" :sm="24">
|
||||||
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次欠款">
|
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次退款">
|
||||||
<a-input placeholder="请输入本次欠款" v-decorator.trim="[ 'debt' ]" :readOnly="true"/>
|
<a-input placeholder="请输入本次付款" v-decorator.trim="[ 'changeAmount' ]" @keyup="onKeyUpChangeAmount"/>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col :lg="6" :md="12" :sm="24">
|
<a-col :lg="6" :md="12" :sm="24">
|
||||||
</a-col>
|
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次欠款">
|
||||||
</a-row>
|
<a-input placeholder="请输入本次欠款" v-decorator.trim="[ 'debt' ]" :readOnly="true"/>
|
||||||
</a-form>
|
</a-form-item>
|
||||||
</a-spin>
|
</a-col>
|
||||||
</j-modal>
|
<a-col :lg="6" :md="12" :sm="24">
|
||||||
|
</a-col>
|
||||||
|
</a-row>
|
||||||
|
</a-form>
|
||||||
|
</a-spin>
|
||||||
|
</j-modal>
|
||||||
|
<many-account-modal ref="manyAccountModalForm" @ok="manyAccountModalFormOk"></many-account-modal>
|
||||||
|
</a-card>
|
||||||
</template>
|
</template>
|
||||||
<script>
|
<script>
|
||||||
import pick from 'lodash.pick'
|
import pick from 'lodash.pick'
|
||||||
|
import ManyAccountModal from '../dialog/ManyAccountModal'
|
||||||
import { FormTypes } from '@/utils/JEditableTableUtil'
|
import { FormTypes } from '@/utils/JEditableTableUtil'
|
||||||
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
|
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
|
||||||
import { BillModalMixin } from '../mixins/BillModalMixin'
|
import { BillModalMixin } from '../mixins/BillModalMixin'
|
||||||
import { getMpListShort } from "@/utils/util"
|
import { getMpListShort, changeListFmtMinus} from "@/utils/util"
|
||||||
import JDate from '@/components/jeecg/JDate'
|
import JDate from '@/components/jeecg/JDate'
|
||||||
import Vue from 'vue'
|
import Vue from 'vue'
|
||||||
export default {
|
export default {
|
||||||
name: "PurchaseBackModal",
|
name: "PurchaseBackModal",
|
||||||
mixins: [JEditableTableMixin, BillModalMixin],
|
mixins: [JEditableTableMixin, BillModalMixin],
|
||||||
components: {
|
components: {
|
||||||
|
ManyAccountModal,
|
||||||
JDate
|
JDate
|
||||||
},
|
},
|
||||||
data () {
|
data () {
|
||||||
@@ -230,6 +239,13 @@
|
|||||||
rows: JSON.stringify(detailArr),
|
rows: JSON.stringify(detailArr),
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
manyAccountModalFormOk(idList, moneyList, allPrice) {
|
||||||
|
this.accountIdList = idList
|
||||||
|
this.accountMoneyList = changeListFmtMinus(moneyList)
|
||||||
|
this.$nextTick(() => {
|
||||||
|
this.form.setFieldsValue({'changeAmount':allPrice})
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -165,7 +165,7 @@
|
|||||||
for(let item of detailArr){
|
for(let item of detailArr){
|
||||||
totalPrice += item.allPrice-0
|
totalPrice += item.allPrice-0
|
||||||
}
|
}
|
||||||
billMain.totalPrice = totalPrice
|
billMain.totalPrice = 0-totalPrice
|
||||||
if(this.model.id){
|
if(this.model.id){
|
||||||
billMain.id = this.model.id
|
billMain.id = this.model.id
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -172,10 +172,11 @@
|
|||||||
this.addInit("LSTH")
|
this.addInit("LSTH")
|
||||||
} else {
|
} else {
|
||||||
this.model.operTime = this.model.operTimeStr
|
this.model.operTime = this.model.operTimeStr
|
||||||
this.model.debt = this.model.discountLastMoney - this.model.changeAmount
|
this.model.getAmount = this.model.changeAmount
|
||||||
|
this.model.backAmount = 0
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
this.form.setFieldsValue(pick(this.model,'organId', 'operTime', 'number', 'remark',
|
this.form.setFieldsValue(pick(this.model,'organId', 'operTime', 'number', 'remark',
|
||||||
'discount','discountMoney','discountLastMoney','otherMoney','accountId','changeAmount','debt'))
|
'discount','discountMoney','discountLastMoney','otherMoney','accountId','changeAmount','getAmount','backAmount'))
|
||||||
});
|
});
|
||||||
// 加载子表数据
|
// 加载子表数据
|
||||||
let params = {
|
let params = {
|
||||||
@@ -197,7 +198,8 @@
|
|||||||
for(let item of detailArr){
|
for(let item of detailArr){
|
||||||
totalPrice += item.allPrice-0
|
totalPrice += item.allPrice-0
|
||||||
}
|
}
|
||||||
billMain.totalPrice = totalPrice
|
billMain.totalPrice = 0-totalPrice
|
||||||
|
billMain.changeAmount = 0-billMain.changeAmount
|
||||||
if(this.model.id){
|
if(this.model.id){
|
||||||
billMain.id = this.model.id
|
billMain.id = this.model.id
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,117 +1,125 @@
|
|||||||
<template>
|
<template>
|
||||||
<j-modal
|
<a-card :bordered="false" class="card-area">
|
||||||
:title="title"
|
<j-modal
|
||||||
:width="width"
|
:title="title"
|
||||||
:visible="visible"
|
:width="width"
|
||||||
:confirmLoading="confirmLoading"
|
:visible="visible"
|
||||||
:maskClosable="false"
|
:confirmLoading="confirmLoading"
|
||||||
:keyboard="false"
|
:maskClosable="false"
|
||||||
:forceRender="true"
|
:keyboard="false"
|
||||||
switchFullscreen
|
:forceRender="true"
|
||||||
@ok="handleOk"
|
switchFullscreen
|
||||||
@cancel="handleCancel"
|
@ok="handleOk"
|
||||||
wrapClassName="ant-modal-cust-warp"
|
@cancel="handleCancel"
|
||||||
style="top:5%;height: 100%;overflow-y: hidden">
|
wrapClassName="ant-modal-cust-warp"
|
||||||
<a-spin :spinning="confirmLoading">
|
style="top:5%;height: 100%;overflow-y: hidden">
|
||||||
<a-form :form="form">
|
<a-spin :spinning="confirmLoading">
|
||||||
<a-row class="form-row" :gutter="24">
|
<a-form :form="form">
|
||||||
<a-col :lg="6" :md="12" :sm="24">
|
<a-row class="form-row" :gutter="24">
|
||||||
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="客户">
|
<a-col :lg="6" :md="12" :sm="24">
|
||||||
<a-select placeholder="选择客户" v-decorator="[ 'organId', validatorRules.organId ]" :dropdownMatchSelectWidth="false">
|
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="客户">
|
||||||
<a-select-option v-for="(item,index) in cusList" :key="index" :value="item.id">
|
<a-select placeholder="选择客户" v-decorator="[ 'organId', validatorRules.organId ]" :dropdownMatchSelectWidth="false">
|
||||||
{{ item.supplier }}
|
<a-select-option v-for="(item,index) in cusList" :key="index" :value="item.id">
|
||||||
</a-select-option>
|
{{ item.supplier }}
|
||||||
</a-select>
|
</a-select-option>
|
||||||
</a-form-item>
|
</a-select>
|
||||||
</a-col>
|
</a-form-item>
|
||||||
<a-col :lg="6" :md="12" :sm="24">
|
</a-col>
|
||||||
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
|
<a-col :lg="6" :md="12" :sm="24">
|
||||||
<j-date v-decorator="['operTime']" :show-time="true"/>
|
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
|
||||||
</a-form-item>
|
<j-date v-decorator="['operTime']" :show-time="true"/>
|
||||||
</a-col>
|
</a-form-item>
|
||||||
<a-col :lg="6" :md="12" :sm="24">
|
</a-col>
|
||||||
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
|
<a-col :lg="6" :md="12" :sm="24">
|
||||||
<a-input placeholder="请输入单据编号" v-decorator.trim="[ 'number' ]" :readOnly="true"/>
|
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
|
||||||
</a-form-item>
|
<a-input placeholder="请输入单据编号" v-decorator.trim="[ 'number' ]" :readOnly="true"/>
|
||||||
</a-col>
|
</a-form-item>
|
||||||
<a-col :lg="6" :md="12" :sm="24"></a-col>
|
</a-col>
|
||||||
</a-row>
|
<a-col :lg="6" :md="12" :sm="24"></a-col>
|
||||||
<j-editable-table
|
</a-row>
|
||||||
:ref="refKeys[0]"
|
<j-editable-table
|
||||||
:loading="materialTable.loading"
|
:ref="refKeys[0]"
|
||||||
:columns="materialTable.columns"
|
:loading="materialTable.loading"
|
||||||
:dataSource="materialTable.dataSource"
|
:columns="materialTable.columns"
|
||||||
:maxHeight="300"
|
:dataSource="materialTable.dataSource"
|
||||||
:rowNumber="false"
|
:maxHeight="300"
|
||||||
:rowSelection="true"
|
:rowNumber="false"
|
||||||
:actionButton="true"
|
:rowSelection="true"
|
||||||
@valueChange="onValueChange"
|
:actionButton="true"
|
||||||
@deleted="onDeleted" />
|
@valueChange="onValueChange"
|
||||||
<a-row class="form-row" :gutter="24">
|
@deleted="onDeleted" />
|
||||||
<a-col :lg="24" :md="24" :sm="24">
|
<a-row class="form-row" :gutter="24">
|
||||||
<a-form-item :labelCol="labelCol" :wrapperCol="{xs: { span: 24 },sm: { span: 24 }}" label="">
|
<a-col :lg="24" :md="24" :sm="24">
|
||||||
<a-textarea :rows="2" placeholder="请输入备注" v-decorator="[ 'remark' ]" style="margin-top:8px;"/>
|
<a-form-item :labelCol="labelCol" :wrapperCol="{xs: { span: 24 },sm: { span: 24 }}" label="">
|
||||||
</a-form-item>
|
<a-textarea :rows="2" placeholder="请输入备注" v-decorator="[ 'remark' ]" style="margin-top:8px;"/>
|
||||||
</a-col>
|
</a-form-item>
|
||||||
</a-row>
|
</a-col>
|
||||||
<a-row class="form-row" :gutter="24">
|
</a-row>
|
||||||
<a-col :lg="6" :md="12" :sm="24">
|
<a-row class="form-row" :gutter="24">
|
||||||
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠率">
|
<a-col :lg="6" :md="12" :sm="24">
|
||||||
<a-input placeholder="请输入优惠率" v-decorator.trim="[ 'discount' ]" suffix="%" @keyup="onKeyUpDiscount"/>
|
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠率">
|
||||||
</a-form-item>
|
<a-input style="width:185px;" placeholder="请输入优惠率" v-decorator.trim="[ 'discount' ]" suffix="%" @keyup="onKeyUpDiscount"/>
|
||||||
</a-col>
|
</a-form-item>
|
||||||
<a-col :lg="6" :md="12" :sm="24">
|
</a-col>
|
||||||
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="退款优惠">
|
<a-col :lg="6" :md="12" :sm="24">
|
||||||
<a-input placeholder="请输入付款优惠" v-decorator.trim="[ 'discountMoney' ]" @keyup="onKeyUpDiscountMoney"/>
|
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="退款优惠">
|
||||||
</a-form-item>
|
<a-input placeholder="请输入付款优惠" v-decorator.trim="[ 'discountMoney' ]" @keyup="onKeyUpDiscountMoney"/>
|
||||||
</a-col>
|
</a-form-item>
|
||||||
<a-col :lg="6" :md="12" :sm="24">
|
</a-col>
|
||||||
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠后金额">
|
<a-col :lg="6" :md="12" :sm="24">
|
||||||
<a-input placeholder="请输入优惠后金额" v-decorator.trim="[ 'discountLastMoney' ]" :readOnly="true"/>
|
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠后金额">
|
||||||
</a-form-item>
|
<a-input placeholder="请输入优惠后金额" v-decorator.trim="[ 'discountLastMoney' ]" :readOnly="true"/>
|
||||||
</a-col>
|
</a-form-item>
|
||||||
<a-col :lg="6" :md="12" :sm="24">
|
</a-col>
|
||||||
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="其它费用">
|
<a-col :lg="6" :md="12" :sm="24">
|
||||||
<a-input placeholder="请选择其它费用" v-decorator.trim="[ 'otherMoney' ]" @keyup="onKeyUpOtherMoney"/>
|
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="其它费用">
|
||||||
</a-form-item>
|
<a-input placeholder="请选择其它费用" v-decorator.trim="[ 'otherMoney' ]" @keyup="onKeyUpOtherMoney"/>
|
||||||
</a-col>
|
</a-form-item>
|
||||||
</a-row>
|
</a-col>
|
||||||
<a-row class="form-row" :gutter="24">
|
</a-row>
|
||||||
<a-col :lg="6" :md="12" :sm="24">
|
<a-row class="form-row" :gutter="24">
|
||||||
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结算账户">
|
<a-col :lg="6" :md="12" :sm="24">
|
||||||
<a-select placeholder="选择结算账户" v-decorator="[ 'accountId' ]" :dropdownMatchSelectWidth="false">
|
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结算账户">
|
||||||
<a-select-option v-for="(item,index) in accountList" :key="index" :value="item.id">
|
<a-select style="width:185px;" placeholder="选择结算账户" v-decorator="[ 'accountId' ]"
|
||||||
{{ item.name }}
|
:dropdownMatchSelectWidth="false" allowClear @select="selectAccount">
|
||||||
</a-select-option>
|
<a-select-option v-for="(item,index) in accountList" :key="index" :value="item.id">
|
||||||
</a-select>
|
{{ item.name }}
|
||||||
</a-form-item>
|
</a-select-option>
|
||||||
</a-col>
|
</a-select>
|
||||||
<a-col :lg="6" :md="12" :sm="24">
|
<a-tooltip title="多账户明细">
|
||||||
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次退款">
|
<a-button type="default" icon="folder" style="margin-left: 8px;" size="small" v-show="manyAccountBtnStatus" @click="handleManyAccount"/>
|
||||||
<a-input placeholder="请输入本次付款" v-decorator.trim="[ 'changeAmount' ]" @keyup="onKeyUpChangeAmount"/>
|
</a-tooltip>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col :lg="6" :md="12" :sm="24">
|
<a-col :lg="6" :md="12" :sm="24">
|
||||||
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次欠款">
|
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次退款">
|
||||||
<a-input placeholder="请输入本次欠款" v-decorator.trim="[ 'debt' ]" :readOnly="true"/>
|
<a-input placeholder="请输入本次付款" v-decorator.trim="[ 'changeAmount' ]" @keyup="onKeyUpChangeAmount"/>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col :lg="6" :md="12" :sm="24">
|
<a-col :lg="6" :md="12" :sm="24">
|
||||||
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="销售人员">
|
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次欠款">
|
||||||
<j-select-multiple placeholder="请选择销售人员" v-model="personList.value" :options="personList.options"/>
|
<a-input placeholder="请输入本次欠款" v-decorator.trim="[ 'debt' ]" :readOnly="true"/>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
</a-row>
|
<a-col :lg="6" :md="12" :sm="24">
|
||||||
</a-form>
|
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="销售人员">
|
||||||
</a-spin>
|
<j-select-multiple placeholder="请选择销售人员" v-model="personList.value" :options="personList.options"/>
|
||||||
</j-modal>
|
</a-form-item>
|
||||||
|
</a-col>
|
||||||
|
</a-row>
|
||||||
|
</a-form>
|
||||||
|
</a-spin>
|
||||||
|
</j-modal>
|
||||||
|
<many-account-modal ref="manyAccountModalForm" @ok="manyAccountModalFormOk"></many-account-modal>
|
||||||
|
</a-card>
|
||||||
</template>
|
</template>
|
||||||
<script>
|
<script>
|
||||||
import pick from 'lodash.pick'
|
import pick from 'lodash.pick'
|
||||||
|
import ManyAccountModal from '../dialog/ManyAccountModal'
|
||||||
import { FormTypes } from '@/utils/JEditableTableUtil'
|
import { FormTypes } from '@/utils/JEditableTableUtil'
|
||||||
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
|
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
|
||||||
import { BillModalMixin } from '../mixins/BillModalMixin'
|
import { BillModalMixin } from '../mixins/BillModalMixin'
|
||||||
import { getMpListShort } from "@/utils/util"
|
import { getMpListShort, changeListFmtMinus } from "@/utils/util"
|
||||||
import JSelectMultiple from '@/components/jeecg/JSelectMultiple'
|
import JSelectMultiple from '@/components/jeecg/JSelectMultiple'
|
||||||
import JDate from '@/components/jeecg/JDate'
|
import JDate from '@/components/jeecg/JDate'
|
||||||
import Vue from 'vue'
|
import Vue from 'vue'
|
||||||
@@ -119,6 +127,7 @@
|
|||||||
name: "SaleBackModal",
|
name: "SaleBackModal",
|
||||||
mixins: [JEditableTableMixin, BillModalMixin],
|
mixins: [JEditableTableMixin, BillModalMixin],
|
||||||
components: {
|
components: {
|
||||||
|
ManyAccountModal,
|
||||||
JDate,
|
JDate,
|
||||||
JSelectMultiple
|
JSelectMultiple
|
||||||
},
|
},
|
||||||
@@ -228,7 +237,8 @@
|
|||||||
for(let item of detailArr){
|
for(let item of detailArr){
|
||||||
totalPrice += item.allPrice-0
|
totalPrice += item.allPrice-0
|
||||||
}
|
}
|
||||||
billMain.totalPrice = totalPrice
|
billMain.totalPrice = 0-totalPrice
|
||||||
|
billMain.changeAmount = 0-billMain.changeAmount
|
||||||
if(this.model.id){
|
if(this.model.id){
|
||||||
billMain.id = this.model.id
|
billMain.id = this.model.id
|
||||||
}
|
}
|
||||||
@@ -238,6 +248,13 @@
|
|||||||
rows: JSON.stringify(detailArr),
|
rows: JSON.stringify(detailArr),
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
manyAccountModalFormOk(idList, moneyList, allPrice) {
|
||||||
|
this.accountIdList = idList
|
||||||
|
this.accountMoneyList = changeListFmtMinus(moneyList)
|
||||||
|
this.$nextTick(() => {
|
||||||
|
this.form.setFieldsValue({'changeAmount':allPrice})
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
Reference in New Issue
Block a user