diff --git a/src/views/main/BookingLedger/detail/index.vue b/src/views/main/BookingLedger/detail/index.vue
index d60ef86..0cf1726 100644
--- a/src/views/main/BookingLedger/detail/index.vue
+++ b/src/views/main/BookingLedger/detail/index.vue
@@ -1239,8 +1239,7 @@ export default {
return false
}
}
- if ((!basicFrom || !mailingFrom || !cargoFrom || !billFrom || !remarksFrom) &&
- (Object.keys(basicObject)[0] !== 'zhanCangFlag' && Object.keys(basicObject).length !== 1)) {
+ if (!basicFrom || !mailingFrom || !cargoFrom || !billFrom || !remarksFrom) {
this.$message.error('保存失败,请检查必填项')
return false
}
diff --git a/src/views/main/BookingLedger/detail/modulesTest/sedOrder.vue b/src/views/main/BookingLedger/detail/modulesTest/sedOrder.vue
index 010647e..ebc9e38 100644
--- a/src/views/main/BookingLedger/detail/modulesTest/sedOrder.vue
+++ b/src/views/main/BookingLedger/detail/modulesTest/sedOrder.vue
@@ -81,6 +81,7 @@
isParent="child"
@changeDetail="changeDetailFun"
@pkgsEnCapital="pkgsEnCapitalFun"
+ @spliceMore="spliceMorefun"
>
-
-
+ > -->
+ @changeTotal="changeTotalFun"
+ @changeCtnInfo="changeCtnInfoFun">
+
@@ -432,8 +433,8 @@ export default {
this.$refs.basicInfo.$refs.basicFrom.clearValidate()
this.$refs.mailingInfo.$refs.mailingFrom.clearValidate()
this.$refs.cargoInfo.$refs.cargoFrom.clearValidate()
- this.$refs.billInfo.$refs.billFrom.clearValidate()
- this.$refs.remarksInfo.$refs.remarkFrom.clearValidate()
+ // this.$refs.billInfo.$refs.billFrom.clearValidate()
+ // this.$refs.remarksInfo.$refs.remarkFrom.clearValidate()
}
}
},
@@ -476,6 +477,12 @@ export default {
}, 2000)
}
},
+ spliceMorefun(str) {
+ this.moreStr = str
+ },
+ pkgsEnCapitalFun(data) {
+ this.bookingDetails.totalno = data
+ },
checkFromInit() {
Object.keys(this.basicRules).map((item, index) => {
@@ -587,6 +594,21 @@ export default {
saveFun() {
this.bookingOrderSave()
},
+ changeTotalFun(data) {
+ const { type, val } = data
+ if (type === 'totalKgs') {
+ this.editDetails.kgs = val || this.editDetails.kgs
+ } else if (type === 'totalPkgs') {
+ this.editDetails.pkgs = val || this.editDetails.pkgs
+ } else if (type === 'totalCbm') {
+ this.editDetails.cbm = val || this.editDetails.cbm
+ }
+ },
+ changeCtnInfoFun({ type, val }) {
+ if (type === 'kindpkgs') {
+ this.editDetails.kindpkgs = val
+ }
+ },
bookingOrderSave() {
if (!this.editDetails.hblno) {
this.$message.error('请输入分提单号')
@@ -605,16 +627,16 @@ export default {
this.$refs.cargoInfo.$refs.cargoFrom.validate(valid => {
cargoFrom = valid
})
- let billFrom = true
- this.$refs.billInfo.$refs.billFrom.validate(valid => {
- billFrom = valid
- })
- let remarksFrom = true
- this.$refs.remarksInfo.$refs.remarkFrom.validate(valid => {
- remarksFrom = valid
- })
+ // let billFrom = true
+ // this.$refs.billInfo.$refs.billFrom.validate(valid => {
+ // billFrom = valid
+ // })
+ // let remarksFrom = true
+ // this.$refs.remarksInfo.$refs.remarkFrom.validate(valid => {
+ // remarksFrom = valid
+ // })
console.log(this.editDetails)
- if (!basicFrom || !mailingFrom || !cargoFrom || !billFrom || !remarksFrom) {
+ if (!basicFrom || !mailingFrom || !cargoFrom) {
this.$message.error('保存失败,请检查必填项')
return false
}