add 打包添加打包负责人字段
This commit is contained in:
@@ -45,7 +45,7 @@
|
|||||||
bordered
|
bordered
|
||||||
rowKey="id"
|
rowKey="id"
|
||||||
:columns="columns"
|
:columns="columns"
|
||||||
:scroll="{x: 1500}"
|
:scroll="{x: 1600}"
|
||||||
:dataSource="dataSource"
|
:dataSource="dataSource"
|
||||||
:pagination="ipagination"
|
:pagination="ipagination"
|
||||||
:loading="loading"
|
:loading="loading"
|
||||||
@@ -86,7 +86,7 @@
|
|||||||
ref="footTable"
|
ref="footTable"
|
||||||
:rowKey="record=>record.id"
|
:rowKey="record=>record.id"
|
||||||
:columns="columnsFooter"
|
:columns="columnsFooter"
|
||||||
:scroll="{x: 1500}"
|
:scroll="{x: 1600}"
|
||||||
:dataSource="footerDataSource"
|
:dataSource="footerDataSource"
|
||||||
:showHeader="false"
|
:showHeader="false"
|
||||||
:pagination="false"
|
:pagination="false"
|
||||||
@@ -139,6 +139,13 @@ const defaultTableColumns = [
|
|||||||
dataIndex: 'packContactTemporaryName',
|
dataIndex: 'packContactTemporaryName',
|
||||||
scopedSlots: { customRender: 'nameText' }
|
scopedSlots: { customRender: 'nameText' }
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
title: '打包负责人',
|
||||||
|
align: 'center',
|
||||||
|
width: 140,
|
||||||
|
dataIndex: 'packPrincipalName',
|
||||||
|
scopedSlots: { customRender: 'nameText' }
|
||||||
|
},
|
||||||
{
|
{
|
||||||
title: '打包费用总计',
|
title: '打包费用总计',
|
||||||
align: 'center',
|
align: 'center',
|
||||||
|
|||||||
@@ -66,6 +66,14 @@
|
|||||||
</select-contacts>
|
</select-contacts>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
|
<a-col :xl="12" :sm="24">
|
||||||
|
<a-form-item label="打包负责人" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
||||||
|
<select-principal placeholder="请选择打包负责人"
|
||||||
|
v-decorator="['packPrincipalId',validatorRules.packPrincipalId]"
|
||||||
|
:maxLength='50'>
|
||||||
|
</select-principal>
|
||||||
|
</a-form-item>
|
||||||
|
</a-col>
|
||||||
</a-row>
|
</a-row>
|
||||||
<a-row>
|
<a-row>
|
||||||
<a-col>
|
<a-col>
|
||||||
@@ -104,10 +112,11 @@ import SelectContacts from '../../../components/company/SelectContacts'
|
|||||||
import JYearDate from '../../../components/jero/JYearDate'
|
import JYearDate from '../../../components/jero/JYearDate'
|
||||||
import { money } from '../../../utils/validate'
|
import { money } from '../../../utils/validate'
|
||||||
import { addZero } from '../../../utils/util'
|
import { addZero } from '../../../utils/util'
|
||||||
|
import SelectPrincipal from '@comp/company/SelectPrincipal.vue'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'PackCompanyModule',
|
name: 'PackCompanyModule',
|
||||||
components: { CompanySelect, SelectContacts, JYearDate },
|
components: { CompanySelect, SelectContacts, JYearDate, SelectPrincipal },
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
title: '操作',
|
title: '操作',
|
||||||
@@ -157,6 +166,10 @@ export default {
|
|||||||
packContactId: {
|
packContactId: {
|
||||||
rules: [{ required: true, message: '请选择打包联系人' }],
|
rules: [{ required: true, message: '请选择打包联系人' }],
|
||||||
validateTrigger: 'change'
|
validateTrigger: 'change'
|
||||||
|
},
|
||||||
|
packPrincipalId: {
|
||||||
|
rules: [{ required: true, message: '请选择打包负责人' }],
|
||||||
|
validateTrigger: 'change'
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
initContact: null, // 编辑回显的企业联系人信息
|
initContact: null, // 编辑回显的企业联系人信息
|
||||||
@@ -192,7 +205,7 @@ export default {
|
|||||||
this.model = Object.assign({}, record)
|
this.model = Object.assign({}, record)
|
||||||
this.visible = true
|
this.visible = true
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
this.form.setFieldsValue(pick(this.model, 'company', 'companyContactId', 'packYear', 'packChargeTotal', 'packContactId', 'packChargeRemark', 'remark'))
|
this.form.setFieldsValue(pick(this.model, 'company', 'companyContactId', 'packYear', 'packChargeTotal', 'packContactId', 'packChargeRemark', 'remark', 'packPrincipalId'))
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
close() {
|
close() {
|
||||||
|
|||||||
Reference in New Issue
Block a user