whm
/
BookingHeChuanFront
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

分单必填项， 箱信息必填项

Browse Source
dev
lilu 2 years ago
parent 5cbfb1e4dd
commit 5947f93f82
3 changed files with 236 additions and 19 deletions
Show Stats Download Patch File Download Diff File

69
src/views/main/BookingLedger/detail/components/sedOrder.vue
Unescape Escape View File

@ -44,7 +44,7 @@
<!-- 备注信息 --> <!-- 备注信息 -->
<remarksInfo ref="remarksInfo" :details="editDetails" :rules="remarksRules" @changeDetail="changeDetailFun"></remarksInfo> <remarksInfo ref="remarksInfo" :details="editDetails" :rules="remarksRules" @changeDetail="changeDetailFun"></remarksInfo>
<!-- 箱型 --> <!-- 箱型 -->
<goodsTable ref="goodsTable" :details="editDetails" @changeDetail="changeDetailFun"></goodsTable> <goodsTable ref="goodsTable" :details="editDetails" :rules="tableRules" @changeDetail="changeDetailFun"></goodsTable>
</div> </div>
</a-tab-pane> </a-tab-pane>
<a-tab-pane key="2" tab="EDI补充信息"> <a-tab-pane key="2" tab="EDI补充信息">
@ -239,7 +239,21 @@ export default {
'freightpayer': [ { required: false, message: '请输入付款方', trigger: 'change' } ], 'freightpayer': [ { required: false, message: '请输入付款方', trigger: 'change' } ],
'bookingEDIExt.weiTuoFang': [ { required: false, message: '请输入委托方', trigger: 'change' } ], 'bookingEDIExt.weiTuoFang': [ { required: false, message: '请输入委托方', trigger: 'change' } ],
}, },
hasEdiRules: false hasEdiRules: false,
tableRules: {
ctnall: { required: false, title: '箱型', message: '请选择箱型', trigger: 'change' },
ctnnum: { required: false, title: '箱量', message: '请选择箱量', trigger: 'change' },
cntrno: { required: false, title: '箱号', message: '请选择箱号', trigger: 'change' },
sealno: { required: false, title: '封号', message: '请选择封号', trigger: 'change' },
pkgs: { required: false, title: '件数', message: '请选择件数', trigger: 'change' },
kindpkgs: { required: false, title: '包装', message: '请选择包装', trigger: 'change' },
kgs: { required: false, title: '重量', message: '请选择重量', trigger: 'change' },
cbm: { required: false, title: '尺码', message: '请选择尺码', trigger: 'change' },
tareweight: { required: false, title: '箱皮重', message: '请选择箱皮重', trigger: 'change' },
weightype: { required: false, title: '称重方式', message: '请选择称重方式', trigger: 'change' },
weighkgs: { required: false, title: '称重重量', message: '请选择称重重量', trigger: 'change' }
},
hasTableRules: false
} }
}, },
watch: { watch: {
@ -276,11 +290,13 @@ export default {
immediate: true, immediate: true,
handler(nD, oD) { handler(nD, oD) {
this.id = this.$route.query.id this.id = this.$route.query.id
// this.$refs.basicInfo.$refs.basicFrom.clearValidate() if (this.$refs.basicInfo) {
// this.$refs.mailingInfo.$refs.mailingFrom.clearValidate() this.$refs.basicInfo.$refs.basicFrom.clearValidate()
// this.$refs.cargoInfo.$refs.cargoFrom.clearValidate() this.$refs.mailingInfo.$refs.mailingFrom.clearValidate()
// this.$refs.billInfo.$refs.billFrom.clearValidate() this.$refs.cargoInfo.$refs.cargoFrom.clearValidate()
// this.$refs.remarksInfo.$refs.remarkFrom.clearValidate() this.$refs.billInfo.$refs.billFrom.clearValidate()
this.$refs.remarksInfo.$refs.remarkFrom.clearValidate()
}
} }
}, },
checkFrom (nval, oval) { checkFrom (nval, oval) {
@ -341,7 +357,12 @@ export default {
Object.keys(this.ediRules).map((item, index) => { Object.keys(this.ediRules).map((item, index) => {
if (this.checkFrom.includes(item)) { if (this.checkFrom.includes(item)) {
this.ediRules[item][0].required = true this.ediRules[item][0].required = true
// this.hasEdiRules = true }
})
Object.keys(this.tableRules).map((item, index) => {
if (this.checkFrom.includes(item)) {
this.tableRules[item].required = true
this.hasTableRules = true
} }
}) })
this.$forceUpdate() this.$forceUpdate()
@ -476,6 +497,22 @@ export default {
return false return false
} }
} }
// 箱信息验证
if (this.hasTableRules) {
let tableErrTip = ''
this.editDetails.ctnInputs.map((item, index) => {
Object.keys(item).map((label, lindex) => {
if (this.tableRules[label] && this.tableRules[label].required && !item[label]) {
console.log('这里需要必填： ', label, this.tableRules[label].message)
tableErrTip = `${tableErrTip} 序号${index + 1}中${this.tableRules[label].title}未填写,`
}
})
})
if (tableErrTip !== '') {
this.$message.error(`箱信息错误： ${tableErrTip.substr(0, tableErrTip.length - 1)}`, 3)
return false
}
}
// 自定义必填项验证 - end // 自定义必填项验证 - end
let data = JSON.parse(JSON.stringify(this.editDetails)) let data = JSON.parse(JSON.stringify(this.editDetails))
delete data.isNoSave delete data.isNoSave
@ -551,6 +588,22 @@ export default {
return false return false
} }
} }
// 箱信息验证
if (this.hasTableRules) {
let tableErrTip = ''
this.editDetails.ctnInputs.map((item, index) => {
Object.keys(item).map((label, lindex) => {
if (this.tableRules[label] && this.tableRules[label].required && !item[label]) {
console.log('这里需要必填： ', label, this.tableRules[label].message)
tableErrTip = `${tableErrTip} 序号${index + 1}中${this.tableRules[label].title}未填写,`
}
})
})
if (tableErrTip !== '') {
this.$message.error(`箱信息错误： ${tableErrTip.substr(0, tableErrTip.length - 1)}`, 3)
return false
}
}
// 自定义必填项验证 - end // 自定义必填项验证 - end
let data = JSON.parse(JSON.stringify(this.editDetails)) let data = JSON.parse(JSON.stringify(this.editDetails))
delete data.isNoSave delete data.isNoSave

60
src/views/main/BookingLedger/detail/index.vue
Unescape Escape View File

@ -45,6 +45,7 @@
<goodsTable <goodsTable
ref="goodsTable" ref="goodsTable"
:details="bookingDetails" :details="bookingDetails"
:rules="tableRules"
@changeDetail="changeDetailFun" @changeDetail="changeDetailFun"
@changeTotal="changeTotalFun" @changeTotal="changeTotalFun"
v-if="!inPageLoading" v-if="!inPageLoading"
@ -369,7 +370,21 @@ export default {
'freightpayer': [ { required: false, message: '请输入付款方', trigger: 'change' } ], 'freightpayer': [ { required: false, message: '请输入付款方', trigger: 'change' } ],
'bookingEDIExt.weiTuoFang': [ { required: false, message: '请输入委托方', trigger: 'change' } ], 'bookingEDIExt.weiTuoFang': [ { required: false, message: '请输入委托方', trigger: 'change' } ],
}, },
hasEdiRules: false hasEdiRules: false,
tableRules: {
ctnall: { required: false, title: '箱型', message: '请选择箱型', trigger: 'change' },
ctnnum: { required: false, title: '箱量', message: '请选择箱量', trigger: 'change' },
cntrno: { required: false, title: '箱号', message: '请选择箱号', trigger: 'change' },
sealno: { required: false, title: '封号', message: '请选择封号', trigger: 'change' },
pkgs: { required: false, title: '件数', message: '请选择件数', trigger: 'change' },
kindpkgs: { required: false, title: '包装', message: '请选择包装', trigger: 'change' },
kgs: { required: false, title: '重量', message: '请选择重量', trigger: 'change' },
cbm: { required: false, title: '尺码', message: '请选择尺码', trigger: 'change' },
tareweight: { required: false, title: '箱皮重', message: '请选择箱皮重', trigger: 'change' },
weightype: { required: false, title: '称重方式', message: '请选择称重方式', trigger: 'change' },
weighkgs: { required: false, title: '称重重量', message: '请选择称重重量', trigger: 'change' }
},
hasTableRules: false
} }
}, },
computed: { computed: {
@ -653,12 +668,13 @@ export default {
type: 'booking_form_col' type: 'booking_form_col'
}) })
.then(res => { .then(res => {
// this.checkFrom = ['customername', 'mblno', 'carrierid', 'forwarder', 'shipper', 'consignee', 'notifyparty', 'yard', 'customser', 'marks', 'cargoid', 'hscode', 'issuetype', 'issuedate', 'soremark', 'siremark', 'bookingEDIExt.sendCode', 'bookingEDIExt.receiveCode']
if (res.data && JSON.parse(res.data.configJson).length) { if (res.data && JSON.parse(res.data.configJson).length) {
this.checkFrom = JSON.parse(res.data.configJson) || [] this.checkFrom = JSON.parse(res.data.configJson) || []
} else { } else {
this.checkFrom = [] this.checkFrom = []
} }
// 测试数据
// this.checkFrom = ['customername', 'mblno', 'carrierid', 'forwarder', 'shipper', 'consignee', 'notifyparty', 'yard', 'customser', 'marks', 'cargoid', 'hscode', 'issuetype', 'issuedate', 'soremark', 'siremark', 'bookingEDIExt.sendCode', 'bookingEDIExt.receiveCode', 'ctnall', 'ctnnum']
Object.keys(this.basicRules).map((item, index) => { Object.keys(this.basicRules).map((item, index) => {
if (this.checkFrom.includes(item)) { if (this.checkFrom.includes(item)) {
this.basicRules[item][0].required = true this.basicRules[item][0].required = true
@ -687,7 +703,12 @@ export default {
Object.keys(this.ediRules).map((item, index) => { Object.keys(this.ediRules).map((item, index) => {
if (this.checkFrom.includes(item)) { if (this.checkFrom.includes(item)) {
this.ediRules[item][0].required = true this.ediRules[item][0].required = true
// this.hasEdiRules = true }
})
Object.keys(this.tableRules).map((item, index) => {
if (this.checkFrom.includes(item)) {
this.tableRules[item].required = true
this.hasTableRules = true
} }
}) })
this.$forceUpdate() this.$forceUpdate()
@ -861,6 +882,23 @@ export default {
return false return false
} }
} }
// 箱信息验证
if (this.hasTableRules) {
let tableErrTip = ''
this.bookingDetails.ctnInputs.map((item, index) => {
Object.keys(item).map((label, lindex) => {
if (this.tableRules[label] && this.tableRules[label].required && !item[label]) {
console.log('这里需要必填： ', label, this.tableRules[label].message)
tableErrTip = `${tableErrTip} 序号${index + 1}中${this.tableRules[label].title}未填写,`
}
})
})
if (tableErrTip !== '') {
this.$message.error(`箱信息错误： ${tableErrTip.substr(0, tableErrTip.length - 1)}`, 3)
return false
}
}
// 自定义必填项验证 - end // 自定义必填项验证 - end
const _data = JSON.parse(JSON.stringify(this.bookingDetails)) const _data = JSON.parse(JSON.stringify(this.bookingDetails))
delete _data.hbList delete _data.hbList
@ -954,6 +992,22 @@ export default {
return false return false
} }
} }
// 箱信息验证
if (this.hasTableRules) {
let tableErrTip = ''
this.bookingDetails.ctnInputs.map((item, index) => {
Object.keys(item).map((label, lindex) => {
if (this.tableRules[label] && this.tableRules[label].required && !item[label]) {
console.log('这里需要必填： ', label, this.tableRules[label].message)
tableErrTip = `${tableErrTip} 序号${index + 1}中${this.tableRules[label].title}未填写,`
}
})
})
if (tableErrTip !== '') {
this.$message.error(`箱信息错误： ${tableErrTip.substr(0, tableErrTip.length - 1)}`, 3)
return false
}
}
// 自定义必填项验证 - end // 自定义必填项验证 - end
const _data = JSON.parse(JSON.stringify(this.bookingDetails)) const _data = JSON.parse(JSON.stringify(this.bookingDetails))
delete _data.hbList delete _data.hbList

126
src/views/main/BookingLedger/detail/modules/goodsTable.vue
Unescape Escape View File

@ -86,6 +86,12 @@ export default {
default: () => { default: () => {
return {} return {}
} }
},
rules: {
type: Object,
default: () => {
return {}
}
} }
}, },
data() { data() {
@ -175,6 +181,15 @@ export default {
// /> // />
// </div> // </div>
) )
},
renderHeaderCell: ({ column }, h) => {
return (
<span class="text-bold" style="text-align: center;">
{
this.rules.ctnall.required ? <i style="color: #f00">*</i> : ''
} {column.title}
</span>
);
} }
}, },
{ {
@ -183,7 +198,16 @@ export default {
title: '箱量', title: '箱量',
align: 'left', align: 'left',
width: 60, width: 60,
edit: true edit: true,
renderHeaderCell: ({ column }, h) => {
return (
<span class="text-bold" style="text-align: center;">
{
this.rules.ctnnum.required ? <i style="color: #f00">*</i> : ''
} {column.title}
</span>
);
}
}, },
{ {
field: 'cntrno', field: 'cntrno',
@ -191,21 +215,48 @@ export default {
title: '箱号', title: '箱号',
align: 'left', align: 'left',
width: 130, width: 130,
edit: true edit: true,
renderHeaderCell: ({ column }, h) => {
return (
<span class="text-bold" style="text-align: center;">
{
this.rules.cntrno.required ? <i style="color: #f00">*</i> : ''
} {column.title}
</span>
);
}
}, },
{ {
field: 'sealno', field: 'sealno',
key: 'sealno', key: 'sealno',
title: '封号', title: '封号',
align: 'left', align: 'left',
edit: true edit: true,
renderHeaderCell: ({ column }, h) => {
return (
<span class="text-bold" style="text-align: center;">
{
this.rules.sealno.required ? <i style="color: #f00">*</i> : ''
} {column.title}
</span>
);
}
}, },
{ {
field: 'pkgs', field: 'pkgs',
key: 'pkgs', key: 'pkgs',
title: '件数', title: '件数',
align: 'left', align: 'left',
edit: true edit: true,
renderHeaderCell: ({ column }, h) => {
return (
<span class="text-bold" style="text-align: center;">
{
this.rules.pkgs.required ? <i style="color: #f00">*</i> : ''
} {column.title}
</span>
);
}
}, },
{ {
field: 'kindpkgs', field: 'kindpkgs',
@ -265,6 +316,15 @@ export default {
})} })}
</a-select> </a-select>
) )
},
renderHeaderCell: ({ column }, h) => {
return (
<span class="text-bold" style="text-align: center;">
{
this.rules.kindpkgs.required ? <i style="color: #f00">*</i> : ''
} {column.title}
</span>
);
} }
}, },
{ {
@ -272,21 +332,48 @@ export default {
key: 'kgs', key: 'kgs',
title: '重量', title: '重量',
align: 'left', align: 'left',
edit: true edit: true,
renderHeaderCell: ({ column }, h) => {
return (
<span class="text-bold" style="text-align: center;">
{
this.rules.kgs.required ? <i style="color: #f00">*</i> : ''
} {column.title}
</span>
);
}
}, },
{ {
field: 'cbm', field: 'cbm',
key: 'cbm', key: 'cbm',
title: '尺码', title: '尺码',
align: 'left', align: 'left',
edit: true edit: true,
renderHeaderCell: ({ column }, h) => {
return (
<span class="text-bold" style="text-align: center;">
{
this.rules.cbm.required ? <i style="color: #f00">*</i> : ''
} {column.title}
</span>
);
}
}, },
{ {
field: 'tareweight', field: 'tareweight',
key: 'tareweight', key: 'tareweight',
title: '箱皮重', title: '箱皮重',
align: 'left', align: 'left',
edit: true edit: true,
renderHeaderCell: ({ column }, h) => {
return (
<span class="text-bold" style="text-align: center;">
{
this.rules.tareweight.required ? <i style="color: #f00">*</i> : ''
} {column.title}
</span>
);
}
}, },
{ {
field: 'weightype', field: 'weightype',
@ -316,6 +403,15 @@ export default {
<a-select-option value="总重">总重</a-select-option> <a-select-option value="总重">总重</a-select-option>
</a-select> </a-select>
) )
},
renderHeaderCell: ({ column }, h) => {
return (
<span class="text-bold" style="text-align: center;">
{
this.rules.weightype.required ? <i style="color: #f00">*</i> : ''
} {column.title}
</span>
);
} }
}, },
{ {
@ -323,7 +419,16 @@ export default {
key: 'weighkgs', key: 'weighkgs',
title: '称重重量', title: '称重重量',
align: 'left', align: 'left',
edit: true edit: true,
renderHeaderCell: ({ column }, h) => {
return (
<span class="text-bold" style="text-align: center;">
{
this.rules.weighkgs.required ? <i style="color: #f00">*</i> : ''
} {column.title}
</span>
);
}
} }
], ],
modelColumns: [ modelColumns: [
@ -1373,4 +1478,9 @@ export default {
text-align: center; text-align: center;
line-height: 60px; line-height: 60px;
} }
.text-bold{
text-align: center;
width: 100%;
display: block;
}
</style> </style>

Write Preview
Loading…
Cancel
Save