bug修改
This commit is contained in:
zhaoxiao
@@ -67,6 +67,7 @@
|
||||
import JDate from '../tools/JDate'
|
||||
import pick from 'lodash.pick'
|
||||
import { addZero } from '../../utils/util'
|
||||
import { money } from '../../utils/validate'
|
||||
|
||||
export default {
|
||||
name: 'InstallmentForm',
|
||||
@@ -89,11 +90,11 @@ export default {
|
||||
validateTrigger: 'blur'
|
||||
},
|
||||
accountsReceivableAmount: {
|
||||
rules: [{ required: true, message: '请输入金额' }],
|
||||
rules: [{ required: true, validator: this.checkMoney }],
|
||||
validateTrigger: 'blur'
|
||||
},
|
||||
paidAmount: {
|
||||
rules: [{ required: false, message: '请输入金额' }],
|
||||
rules: [{ required: false, validator: this.checkMoney }],
|
||||
validateTrigger: 'blur'
|
||||
}
|
||||
},
|
||||
@@ -147,6 +148,25 @@ export default {
|
||||
this.$emit('ok', values)
|
||||
}
|
||||
})
|
||||
},
|
||||
/**
|
||||
* 校验金额格式
|
||||
* @param rules
|
||||
* @param value
|
||||
* @param callback
|
||||
*/
|
||||
checkMoney(rules, value, callback) {
|
||||
if (value) {
|
||||
if (money(value)) {
|
||||
callback()
|
||||
return
|
||||
}
|
||||
callback('请输入正确格式的金额')
|
||||
}
|
||||
if (rules.field === 'accountsReceivableAmount') {
|
||||
callback('请输入金额')
|
||||
}
|
||||
callback()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -650,6 +650,9 @@ export default {
|
||||
case 'accountsReceivableAmount':
|
||||
callback('请输入应收金额')
|
||||
break
|
||||
case 'noTaxAmount':
|
||||
callback('请输入未税金额')
|
||||
break
|
||||
case 'amountReceived':
|
||||
callback('请输入已收金额')
|
||||
break
|
||||
|
||||
@@ -36,7 +36,7 @@
|
||||
@change="handleSignedCompanyChange"></company-select>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :xxl="6" :xl="8" :sm="12" style="margin-bottom: 0">
|
||||
<a-col :xxl="6" :xl="8" :sm="12" style="margin-bottom: -2px">
|
||||
<a-form-item label="签订联系人" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
||||
<select-contacts placeholder="请选择签订联系人"
|
||||
:selected-company="selectedCompany"
|
||||
@@ -331,7 +331,6 @@ export default {
|
||||
form: this.$form.createForm(this),
|
||||
confirmLoading: false,
|
||||
model: {},
|
||||
temporaryModel: {}, // 编辑数据临时保存
|
||||
title: '',
|
||||
labelCol: {
|
||||
xs: { span: 24 },
|
||||
@@ -439,6 +438,9 @@ export default {
|
||||
this.rateNum = 6 / 100
|
||||
},
|
||||
edit(id) {
|
||||
if (!id) {
|
||||
return
|
||||
}
|
||||
this.title = '编辑收入合同'
|
||||
this.confirmLoading = true
|
||||
const param = {
|
||||
@@ -476,7 +478,6 @@ export default {
|
||||
this.accountsReceivableNum = record.accountsReceivableAmount
|
||||
this.amountReceivedNum = record.amountReceived
|
||||
this.model = Object.assign({}, record)
|
||||
this.temporaryModel = Object.assign({}, record)
|
||||
this.$nextTick(() => {
|
||||
this.form.setFieldsValue(pick(this.model, 'contractNum', 'contractName', 'signedCompany', 'signedContactsId', 'opening', 'principalId', 'departmentName', 'contractAmount', 'rate', 'noTaxAmount', 'contractDate', 'terminationDate', 'contractTimePoints', 'accountsReceivableAmount', 'amountReceived', 'outstandingAmount', 'accountStatus', 'contractPaymentTimes', 'pack', 'packYear'))
|
||||
this.confirmLoading = false
|
||||
@@ -535,18 +536,12 @@ export default {
|
||||
})
|
||||
},
|
||||
handleCancle() {
|
||||
this.model = this.temporaryModel
|
||||
// 处理联系人信息回显
|
||||
this.isCancel = true
|
||||
this.model.signedContactsId = this.model.signedContactsTemporaryId
|
||||
this.selectedContact = {
|
||||
id: this.model.signedContactsTemporaryId,
|
||||
name: this.model.signedContactsTemporaryName
|
||||
if (this.model.id) {
|
||||
this.edit(this.model.id)
|
||||
} else {
|
||||
this.form.resetFields()
|
||||
this.$refs.installmentForm.form.resetFields()
|
||||
}
|
||||
this.$nextTick(() => {
|
||||
this.form.setFieldsValue(pick(this.model, 'contractNum', 'contractName', 'signedCompany', 'signedContactsId', 'opening', 'principalId', 'departmentName', 'contractAmount', 'rate', 'noTaxAmount', 'contractDate', 'terminationDate', 'contractTimePoints', 'accountsReceivableAmount', 'amountReceived', 'outstandingAmount', 'accountStatus', 'contractPaymentTimes', 'pack', 'packYear'))
|
||||
this.confirmLoading = false
|
||||
})
|
||||
},
|
||||
installmentFormOk(value) {
|
||||
this.installmentList = value.installmentList
|
||||
@@ -762,6 +757,9 @@ export default {
|
||||
case 'accountsReceivableAmount':
|
||||
callback('请输入应收金额')
|
||||
break
|
||||
case 'noTaxAmount':
|
||||
callback('请输入未税金额')
|
||||
break
|
||||
case 'amountReceived':
|
||||
callback('请输入已收金额')
|
||||
break
|
||||
|
||||
@@ -29,6 +29,8 @@
|
||||
<a-input
|
||||
v-decorator="['postNo', validatorRules.postNo]"
|
||||
placeholder="请输入快递单号"
|
||||
:maxLength='50'
|
||||
@change="e => {e.target.value = (e.target.value + '').trim()}"
|
||||
></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
|
||||
@@ -29,6 +29,8 @@
|
||||
<a-input
|
||||
v-decorator="['postNo', validatorRules.postNo]"
|
||||
placeholder="请输入快递单号"
|
||||
:maxLength='50'
|
||||
@change="e => {e.target.value = (e.target.value + '').trim()}"
|
||||
></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
|
||||
@@ -179,12 +179,16 @@ export default {
|
||||
title: '应收金额',
|
||||
align: 'center',
|
||||
width: 150,
|
||||
dataIndex: 'receivableAmount'
|
||||
dataIndex: 'receivableAmount',
|
||||
customRender: (text, record) => (
|
||||
<j-ellipsis value={ record.receivableAmount + '元' } length={ 15 }></j-ellipsis>)
|
||||
}, {
|
||||
title: '实收金额',
|
||||
align: 'center',
|
||||
width: 150,
|
||||
dataIndex: 'paidAmount'
|
||||
dataIndex: 'paidAmount',
|
||||
customRender: (text, record) => (
|
||||
<j-ellipsis value={ record.paidAmount + '元' } length={ 15 }></j-ellipsis>)
|
||||
}, {
|
||||
title: '负责人',
|
||||
align: 'center',
|
||||
|
||||
@@ -37,6 +37,7 @@
|
||||
<j-upload :multiple="false"
|
||||
:return-id="true"
|
||||
bizPath="payment"
|
||||
:number="1"
|
||||
v-decorator="['chargeNoticeId']"
|
||||
:trigger-change="true"></j-upload>
|
||||
</a-form-item>
|
||||
@@ -56,6 +57,7 @@
|
||||
<a-form-item label="收费通知B" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
||||
<j-upload :multiple="false"
|
||||
:return-id="true"
|
||||
:number="1"
|
||||
bizPath="payment"
|
||||
v-decorator="['chargeNoticeId']"
|
||||
:trigger-change="true"></j-upload>
|
||||
|
||||
@@ -114,7 +114,7 @@
|
||||
<a-row v-if="chargeWayType === 2">
|
||||
<a-col :xl="12" :sm="24">
|
||||
<a-form-item label="应收金额" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
||||
<a-row>
|
||||
<a-row :gutter="10">
|
||||
<a-col :span="20">
|
||||
<a-input placeholder="请输入应收金额"
|
||||
v-decorator="['receivableAmount',validatorRules.receivableAmount]"
|
||||
@@ -151,6 +151,7 @@
|
||||
<j-upload :multiple="false"
|
||||
:return-id="true"
|
||||
bizPath="payment"
|
||||
:number="1"
|
||||
v-decorator="['chargeNoticeId']"
|
||||
:trigger-change="true"></j-upload>
|
||||
</a-form-item>
|
||||
@@ -171,6 +172,7 @@
|
||||
<j-upload :multiple="false"
|
||||
:return-id="true"
|
||||
bizPath="payment"
|
||||
:number="1"
|
||||
v-decorator="['chargeNoticeId']"
|
||||
:trigger-change="true"></j-upload>
|
||||
</a-form-item>
|
||||
@@ -327,7 +329,7 @@ export default {
|
||||
},
|
||||
needInvoice: {
|
||||
rules: [{ required: true, message: '请选择发票类型' }],
|
||||
validateTrigger: 'blur'
|
||||
validateTrigger: 'change'
|
||||
}
|
||||
},
|
||||
chargeWayType: null,
|
||||
|
||||
Reference in New Issue
Block a user