szh_zidingyibiaoti
lilu 2 years ago
parent 2456b57fea
commit f6f2dff2af

@ -88,8 +88,8 @@
@changeDetail="changeDetailFun"
@changeTotal="changeTotalFun"
@changeCtnInfo="changeCtnInfoFun"
v-if="!inPageLoading"
></goodsTable>
<!-- v-if="!inPageLoading" -->
</div>
</div>
<div id="tab-content2" class="tab-content" v-show="mainOrderActiveKey === '2-2'">
@ -588,6 +588,7 @@ export default {
const hbListChange = !!this.needSavePages[key].hbList
this.checkSaveFun({ type: 'hbList', hasChange: hbListChange })
console.log('== details 发生变化 - 路由变化1 ==')
this.inChildLoading = false
}, 500)
this.$forceUpdate()
@ -631,6 +632,7 @@ export default {
const hbListChange = !!this.needSavePages[key].hbList
this.checkSaveFun({ type: 'hbList', hasChange: hbListChange })
console.log('== details 发生变化 - 路由变化2 ==')
this.inChildLoading = false
}, 500)
this.$forceUpdate()
@ -691,7 +693,8 @@ export default {
const hbListChange = !!this.needSavePages[key].hbList
this.checkSaveFun({ type: 'hbList', hasChange: hbListChange })
console.log(`详情历史改变数据:${detailsChange} 分单历史改变数据: ${hbListChange}`)
console.log('== details 发生变化 - 路由变化3 ==')
// console.log(`${detailsChange} : ${hbListChange}`)
this.inChildLoading = false
}, 500)
this.$forceUpdate()
@ -712,6 +715,7 @@ export default {
const hbListChange = !!this.needSavePages[key].hbList
this.checkSaveFun({ type: 'hbList', hasChange: hbListChange })
this.inChildLoading = false
console.log('== details 发生变化 - 路由变化4 ==')
}, 500)
}
this.$refs.basicInfo.$refs.basicFrom.clearValidate()
@ -985,10 +989,14 @@ export default {
}
const $BookingEDIExt = { ...JSON.parse(JSON.stringify(bookingEDIExt)), ...res.data.bookingEDIExt }
this.$set(this, 'bookingDetails', { ...this.bookingDetails, ...newData, ...{ bookingEDIExt: $BookingEDIExt } })
this.inPageLoading = false
this.getDefaultVal()
this.inPageLoading = false
setTimeout(() => {
this.checkSaveFun({ type: 'details', hasChange: false })
//
setTimeout(() => {
this.checkSaveFun({ type: 'details', hasChange: false })
console.log('== details 发生变化 - 加载完成 ==')
}, 1200)
this.detailsLoadOver = true
this.inChildLoading = false
this.$message.success({ content: '加载完成' })
@ -1032,6 +1040,7 @@ export default {
const { detail, type } = data
if (this.ifCompare(this.bookingDetails, detail) && !this.inChildLoading) {
this.checkSaveFun({ type: 'details', hasChange: true })
console.log('== details 发生变化 - changeDetailFun ==', data)
}
this.bookingDetails = detail
},
@ -1402,6 +1411,7 @@ export default {
}, 200)
},
changeHBFun(data) {
console.log('== details 发生变化 - changeHBFun ==')
const arr = []
data.map((item, index) => {
arr.push(item.isNoSave)
@ -1414,6 +1424,7 @@ export default {
}
},
checkSaveFun(data) {
console.log('== details 发生变化 - 保存 ==', data, this.inGoodsSave, this.detailsLoadOver)
if (this.inGoodsSave) { return false }
const key = this.$route.fullPath
const lastPages = this.needSavePages
@ -1428,6 +1439,7 @@ export default {
}
this.$set(lastPages, key, $data)
this.setNeedSavePages(lastPages)
console.log('保存信息设置完成', this.needSavePages)
},
inGoodsSaveFun (data) {
this.inGoodsSave = data

@ -291,7 +291,7 @@ export default {
})
},
completeChange (value) {
const val = value.split('-')[1]
const val = value ? value.split('-')[1] : ''
let res = val || value || ''
console.log('== 模糊搜索中 ==', value, val, res)
this.$emit('change', {
@ -300,23 +300,38 @@ export default {
})
this.$emit('getCompleteList', {
form: this.labelData,
value: value || ''
value: value.includes('-') ? val || '' : value || ''
})
},
completeChangeFirst (value) {
console.log('点击:', value)
if (this.value) { return false }
//
// console.log(this.type, this.bookingInitData)
// const label = this.labelData.label.toLowerCase()
// const arr = this.bookingInitData[`${label}InitList`]
// if (arr.length > 0) {
// this.dataSourceList = arr
// } else {
console.log(this.type, this.bookingInitData)
let label, arr;
if (['CUSTOMERNAME', 'FORWARDER', 'SALE', 'CUSTSERVICE', 'OP', 'DOC', 'ROUTE', 'PAYABLEAT', 'ISSUEPLACE', 'PREPARDAT', 'SERVICE', 'TRUCKER', 'SHIPAGENCY', 'CUSTOMSER'].includes(this.labelData.label)) {
label = this.labelData.label.toLowerCase()
arr = this.bookingInitData[`${label}InitList`]
} else if (['PORTDISCHARGE', 'PORTLOAD', 'PLACERECEIPT', 'DESTINATION', 'PLACEDELIVERY'].includes(this.labelData.label)) {
label = this.labelData.label.toLowerCase() + 'id'
arr = this.bookingInitData[`${label}InitList`]
} else if (['PLACERECEIPT', 'DESTINATION', 'PLACEDELIVERY'].includes(this.labelData.label)) {
label = this.labelData.label.toLowerCase() + 'name'
arr = this.bookingInitData[`${label}InitList`]
} else if (this.labelData.label === 'AGENTID') {
label = 'agentname'
arr = this.bookingInitData[`${label}InitList`]
} else {
label = ''
arr = []
}
if (arr.length > 0) {
this.dataSourceList = arr
} else {
this.$emit('getCompleteList', {
form: this.labelData,
value: value || ''
})
// }
}
},
inputChange (data) {
this.changeInput(data)

Loading…
Cancel
Save