dev
张同海 2 years ago
parent ee5f16ad8f
commit dd42a4e65e

@ -31,10 +31,10 @@
<span class="table-page-search-submitButtons"> <span class="table-page-search-submitButtons">
<a-button type="primary" @click="FnGetData"></a-button> <a-button type="primary" @click="FnGetData"></a-button>
<a-button style="margin-left: 8px" @click="init"></a-button> <a-button style="margin-left: 8px" @click="init"></a-button>
<a @click="toggleAdvanced" style="margin-left: 8px"> <!-- <a @click="toggleAdvanced" style="margin-left: 8px">
{{ advanced ? '收起' : '展开' }} {{ advanced ? '收起' : '展开' }}
<a-icon :type="advanced ? 'up' : 'down'" /> <a-icon :type="advanced ? 'up' : 'down'" />
</a> </a> -->
</span> </span>
</a-col> </a-col>
</a-row> </a-row>

@ -39,11 +39,11 @@
<a-input placeholder="请输入备注" v-decorator="['remark']" /> <a-input placeholder="请输入备注" v-decorator="['remark']" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <!-- <a-col :span="12">
<a-form-item label="排序" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback> <a-form-item label="排序" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input-number placeholder="请输入排序" v-decorator="['sort']" /> <a-input-number placeholder="请输入排序" v-decorator="['sort']" />
</a-form-item> </a-form-item>
</a-col> </a-col> -->
<a-col :span="24"> <a-col :span="24">
<a-form-item label="描述" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback> <a-form-item label="描述" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
<a-textarea :autosize="{ minRows: 3 }" placeholder="请输入描述" v-decorator="['description']" /> <a-textarea :autosize="{ minRows: 3 }" placeholder="请输入描述" v-decorator="['description']" />

@ -40,11 +40,11 @@
<a-input placeholder="请输入备注" v-decorator="['remark']" /> <a-input placeholder="请输入备注" v-decorator="['remark']" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <!-- <a-col :span="12">
<a-form-item label="排序" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback> <a-form-item label="排序" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input-number placeholder="请输入排序" v-decorator="['sort']" /> <a-input-number placeholder="请输入排序" v-decorator="['sort']" />
</a-form-item> </a-form-item>
</a-col> </a-col> -->
<a-col :span="24"> <a-col :span="24">
<a-form-item label="描述" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback> <a-form-item label="描述" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
<a-textarea :autosize="{ minRows: 3 }" placeholder="请输入描述" v-decorator="['description']" /> <a-textarea :autosize="{ minRows: 3 }" placeholder="请输入描述" v-decorator="['description']" />

@ -63,7 +63,7 @@
</div> </div>
</template> </template>
<script> <script>
import { CommondbList } from '@/api/modular/main/CommondbServiceList' import { CommondbList } from '@/api/modular/main/CommondbCodeIssueType'
import addForm from './addForm.vue' import addForm from './addForm.vue'
import editForm from './editForm.vue' import editForm from './editForm.vue'
export default { export default {
@ -115,13 +115,13 @@ export default {
align: 'center', align: 'center',
width: '80', width: '80',
dataIndex: 'description' dataIndex: 'description'
},
{
title: '排序',
align: 'center',
width: '80',
dataIndex: 'sort'
} }
// {
// title: '',
// align: 'center',
// width: '80',
// dataIndex: 'sort'
// }
], ],
tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' }, tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
// Promise // Promise

@ -31,10 +31,10 @@
<span class="table-page-search-submitButtons"> <span class="table-page-search-submitButtons">
<a-button type="primary" @click="FnGetData"></a-button> <a-button type="primary" @click="FnGetData"></a-button>
<a-button style="margin-left: 8px" @click="init"></a-button> <a-button style="margin-left: 8px" @click="init"></a-button>
<a @click="toggleAdvanced" style="margin-left: 8px"> <!-- <a @click="toggleAdvanced" style="margin-left: 8px">
{{ advanced ? '收起' : '展开' }} {{ advanced ? '收起' : '展开' }}
<a-icon :type="advanced ? 'up' : 'down'" /> <a-icon :type="advanced ? 'up' : 'down'" />
</a> </a> -->
</span> </span>
</a-col> </a-col>
</a-row> </a-row>

@ -39,7 +39,6 @@
<a-select <a-select
placeholder="请输入大小箱分类" placeholder="请输入大小箱分类"
v-decorator="['ctnCategory', { rules: [{ required: true, message: '请输入大小箱分类!' }] }]" v-decorator="['ctnCategory', { rules: [{ required: true, message: '请输入大小箱分类!' }] }]"
@change="FnChangeCtnCategory"
> >
<a-select-option value="small"> <a-select-option value="small">
小箱 小箱
@ -111,9 +110,7 @@ export default {
/** /**
* 提交表单 * 提交表单
*/ */
FnChangeCtnCategory(e) {
console.log(e)
},
handleSubmit() { handleSubmit() {
const { const {
form: { validateFields } form: { validateFields }

@ -40,7 +40,6 @@
<a-select <a-select
placeholder="请输入大小箱分类" placeholder="请输入大小箱分类"
v-decorator="['ctnCategory', { rules: [{ required: true, message: '请输入大小箱分类!' }] }]" v-decorator="['ctnCategory', { rules: [{ required: true, message: '请输入大小箱分类!' }] }]"
@change="FnChangeCtnCategory"
> >
<a-select-option value="small"> <a-select-option value="small">
小箱 小箱
@ -112,10 +111,12 @@ export default {
this.visible = true this.visible = true
setTimeout(() => { setTimeout(() => {
this.form.setFieldsValue({ this.form.setFieldsValue({
code: record.code,
name: record.name, name: record.name,
ediCode: record.ediCode, size: record.size,
description: record.description, ctnCategory: record.ctnCategory,
remark: record.remark remark: record.remark,
description: record.description
}) })
console.log(this.form.getFieldsValue()) console.log(this.form.getFieldsValue())
}, 100) }, 100)

@ -51,11 +51,11 @@
:show-overflow="true" :show-overflow="true"
> >
</vxe-column> </vxe-column>
<!-- <vxe-column title="操作" fixed="right" width="200" align="center"> <vxe-column title="操作" fixed="right" width="200" align="center">
<template #default="{ row }"> <template #default="{ row }">
<vxe-button type="text" @click="$refs.editForm.edit(row)"></vxe-button> <vxe-button type="text" @click="$refs.editForm.edit(row)"></vxe-button>
</template> </template>
</vxe-column> --> </vxe-column>
</vxe-table> </vxe-table>
<add-form ref="addForm" @ok="handleOk" /> <add-form ref="addForm" @ok="handleOk" />
<edit-form ref="editForm" @ok="handleOk" /> <edit-form ref="editForm" @ok="handleOk" />
@ -63,7 +63,7 @@
</div> </div>
</template> </template>
<script> <script>
import { CommondbList } from '@/api/modular/main/CommondbServiceList' import { CommondbList } from '@/api/modular/main/CommondbCtn'
import addForm from './addForm.vue' import addForm from './addForm.vue'
import editForm from './editForm.vue' import editForm from './editForm.vue'
export default { export default {
@ -117,12 +117,12 @@ export default {
width: '80', width: '80',
dataIndex: 'remark' dataIndex: 'remark'
}, },
{ // {
// title: 'EDI', // // title: 'EDI',
align: 'center', // align: 'center',
width: '80', // width: '80',
dataIndex: 'ediCode' // dataIndex: 'ediCode'
}, // },
{ {
title: '描述', title: '描述',
align: 'center', align: 'center',

@ -88,8 +88,8 @@ export default {
this.visible = true this.visible = true
setTimeout(() => { setTimeout(() => {
this.form.setFieldsValue({ this.form.setFieldsValue({
code: record.code,
name: record.name, name: record.name,
ediCode: record.ediCode,
description: record.description, description: record.description,
remark: record.remark remark: record.remark
}) })

@ -51,11 +51,11 @@
:show-overflow="true" :show-overflow="true"
> >
</vxe-column> </vxe-column>
<!-- <vxe-column title="操作" fixed="right" width="200" align="center"> <vxe-column title="操作" fixed="right" width="200" align="center">
<template #default="{ row }"> <template #default="{ row }">
<vxe-button type="text" @click="$refs.editForm.edit(row)"></vxe-button> <vxe-button type="text" @click="$refs.editForm.edit(row)"></vxe-button>
</template> </template>
</vxe-column> --> </vxe-column>
</vxe-table> </vxe-table>
<add-form ref="addForm" @ok="handleOk" /> <add-form ref="addForm" @ok="handleOk" />
<edit-form ref="editForm" @ok="handleOk" /> <edit-form ref="editForm" @ok="handleOk" />
@ -104,12 +104,12 @@ export default {
width: '80', width: '80',
dataIndex: 'remark' dataIndex: 'remark'
}, },
{ // {
// title: 'EDI', // // title: 'EDI',
align: 'center', // align: 'center',
width: '80', // width: '80',
dataIndex: 'ediCode' // dataIndex: 'ediCode'
}, // },
{ {
title: '描述', title: '描述',
align: 'center', align: 'center',

@ -13,20 +13,68 @@
<a-col :span="12"> <a-col :span="12">
<a-form-item label="代码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback> <a-form-item label="代码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input <a-input
placeholder="请输入代码"
:disabled="true" :disabled="true"
placeholder="请输入代码"
v-decorator="['code', { rules: [{ required: true, message: '请输入代码!' }] }]" v-decorator="['code', { rules: [{ required: true, message: '请输入代码!' }] }]"
/> />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback> <a-form-item label="英文名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input
placeholder="请输入英文名称"
v-decorator="['enName', { rules: [{ required: true, message: '请输入英文名称!' }] }]"
/>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="中文名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input
placeholder="请输入中文名称"
v-decorator="['cnName', { rules: [{ required: true, message: '请输入中文名称!' }] }]"
/>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="航线" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input
placeholder="请输入航线"
v-decorator="['shippingRoute', { rules: [{ required: true, message: '请输入航线!' }] }]"
/>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="国家" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input
placeholder="请输入国家"
v-decorator="['country', { rules: [{ required: true, message: '请输入国家!' }] }]"
/>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="国家代码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input <a-input
placeholder="请输入名称" placeholder="请输入国家代码"
v-decorator="['name', { rules: [{ required: true, message: '请输入名称!' }] }]" v-decorator="['countryCode', { rules: [{ required: true, message: '请输入国家代码' }] }]"
/> />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12">
<a-form-item label="全名" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input
placeholder="请输入全名"
v-decorator="['fullName', { rules: [{ required: true, message: '请输入全名!' }] }]"
/>
</a-form-item>
</a-col>
<!-- <a-col :span="12">
<a-form-item label="EDI代码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input
placeholder="请输入EDI代码"
v-decorator="['ediCode', { rules: [{ required: true, message: '请输入EDI代码' }] }]"
/>
</a-form-item>
</a-col> -->
<a-col :span="12"> <a-col :span="12">
<a-form-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback> <a-form-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="请输入备注" v-decorator="['remark']" /> <a-input placeholder="请输入备注" v-decorator="['remark']" />
@ -80,8 +128,13 @@ export default {
this.visible = true this.visible = true
setTimeout(() => { setTimeout(() => {
this.form.setFieldsValue({ this.form.setFieldsValue({
name: record.name, code: record.code,
ediCode: record.ediCode, enName: record.enName,
cnName: record.cnName,
shippingRoute: record.shippingRoute,
country: record.country,
countryCode: record.countryCode,
fullName: record.fullName,
description: record.description, description: record.description,
remark: record.remark remark: record.remark
}) })

@ -51,11 +51,11 @@
:show-overflow="true" :show-overflow="true"
> >
</vxe-column> </vxe-column>
<!-- <vxe-column title="操作" fixed="right" width="200" align="center"> <vxe-column title="操作" fixed="right" width="200" align="center">
<template #default="{ row }"> <template #default="{ row }">
<vxe-button type="text" @click="$refs.editForm.edit(row)"></vxe-button> <vxe-button type="text" @click="$refs.editForm.edit(row)"></vxe-button>
</template> </template>
</vxe-column> --> </vxe-column>
</vxe-table> </vxe-table>
<add-form ref="addForm" @ok="handleOk" /> <add-form ref="addForm" @ok="handleOk" />
<edit-form ref="editForm" @ok="handleOk" /> <edit-form ref="editForm" @ok="handleOk" />
@ -134,12 +134,12 @@ export default {
width: '80', width: '80',
dataIndex: 'remark' dataIndex: 'remark'
}, },
{ // {
// title: 'EDI', // // title: 'EDI',
align: 'center', // align: 'center',
width: '80', // width: '80',
dataIndex: 'ediCode' // dataIndex: 'ediCode'
}, // },
{ {
title: '描述', title: '描述',
align: 'center', align: 'center',

@ -88,8 +88,8 @@ export default {
this.visible = true this.visible = true
setTimeout(() => { setTimeout(() => {
this.form.setFieldsValue({ this.form.setFieldsValue({
code: record.code,
name: record.name, name: record.name,
ediCode: record.ediCode,
description: record.description, description: record.description,
remark: record.remark remark: record.remark
}) })

@ -51,11 +51,11 @@
:show-overflow="true" :show-overflow="true"
> >
</vxe-column> </vxe-column>
<!-- <vxe-column title="操作" fixed="right" width="200" align="center"> <vxe-column title="操作" fixed="right" width="200" align="center">
<template #default="{ row }"> <template #default="{ row }">
<vxe-button type="text" @click="$refs.editForm.edit(row)"></vxe-button> <vxe-button type="text" @click="$refs.editForm.edit(row)"></vxe-button>
</template> </template>
</vxe-column> --> </vxe-column>
</vxe-table> </vxe-table>
<add-form ref="addForm" @ok="handleOk" /> <add-form ref="addForm" @ok="handleOk" />
<edit-form ref="editForm" @ok="handleOk" /> <edit-form ref="editForm" @ok="handleOk" />
@ -104,12 +104,12 @@ export default {
width: '80', width: '80',
dataIndex: 'remark' dataIndex: 'remark'
}, },
{ // {
// title: 'EDI', // // title: 'EDI',
align: 'center', // align: 'center',
width: '80', // width: '80',
dataIndex: 'ediCode' // dataIndex: 'ediCode'
}, // },
{ {
title: '描述', title: '描述',
align: 'center', align: 'center',

@ -92,12 +92,12 @@ export default {
width: '100', width: '100',
dataIndex: 'name' dataIndex: 'name'
}, },
{ // {
// title: 'EDI', // // title: 'EDI',
align: 'center', // align: 'center',
width: '80', // width: '80',
dataIndex: 'ediCode' // dataIndex: 'ediCode'
}, // },
{ {
title: '描述', title: '描述',
align: 'center', align: 'center',

Loading…
Cancel
Save