修改收发通

dev
lilu 2 years ago
parent 5e74f9f7aa
commit d9bd867597

@ -478,7 +478,7 @@ export default {
this.inPageLoading = true this.inPageLoading = true
this.inChildLoading = true this.inChildLoading = true
this.$message.loading({ content: '加载中...' }); this.$message.loading({ content: '加载中...' });
// console.log('4.1 == ==', this.id) console.log('4.1 == 获取详情 ==', this.id)
BookingOrderGet({ BookingOrderGet({
id: this.id id: this.id
}) })
@ -512,7 +512,7 @@ export default {
} }
this.$set(this, 'bookingDetails', res.data) this.$set(this, 'bookingDetails', res.data)
setTimeout(() => { setTimeout(() => {
// console.log(' 1. === ===') console.log(' 1. === 主单获取信息更新 ===')
this.inChildLoading = false this.inChildLoading = false
this.checkSaveFun({ type: 'details', hasChange: false }) this.checkSaveFun({ type: 'details', hasChange: false })
}, 1500) }, 1500)
@ -527,7 +527,7 @@ export default {
const { detail, type } = data const { detail, type } = data
// console.log('', this.ifCompare(this.bookingDetails, detail), !this.inChildLoading, this.ifCompare(this.bookingDetails, detail) && !this.inChildLoading) // console.log('', this.ifCompare(this.bookingDetails, detail), !this.inChildLoading, this.ifCompare(this.bookingDetails, detail) && !this.inChildLoading)
if (this.ifCompare(this.bookingDetails, detail) && !this.inChildLoading) { if (this.ifCompare(this.bookingDetails, detail) && !this.inChildLoading) {
// console.log('2. == == ', type) console.log('2. == 这里子组件进行了更新 == ', type)
this.checkSaveFun({ type: 'details', hasChange: true }) this.checkSaveFun({ type: 'details', hasChange: true })
} }
this.bookingDetails = detail this.bookingDetails = detail
@ -664,7 +664,7 @@ export default {
const arr = Object.keys(this.bookingList) const arr = Object.keys(this.bookingList)
const index = arr.indexOf(nowId.toString()) const index = arr.indexOf(nowId.toString())
if (type === 'prev') { if (type === 'prev') {
if (index === 0) { if (index < 1) {
this.$message.error('当前已经是第一票') this.$message.error('当前已经是第一票')
return false return false
} }
@ -724,7 +724,7 @@ export default {
const arr = data.map((item, index) => { const arr = data.map((item, index) => {
return item.isNoSave return item.isNoSave
}) })
// console.log('3. === ===') console.log('3. === 分单更新 ===')
if (arr.includes(true)) { if (arr.includes(true)) {
this.checkSaveFun({ type: 'hbList', hasChange: true }) this.checkSaveFun({ type: 'hbList', hasChange: true })
} else { } else {
@ -746,7 +746,7 @@ export default {
const key = this.$route.fullPath const key = this.$route.fullPath
this.$set(lastPages, key, $data) this.$set(lastPages, key, $data)
this.setNeedSavePages(lastPages) this.setNeedSavePages(lastPages)
// console.log('== vuex ==', this.needSavePages) console.log('== vuex 配置更新信息 ==', this.needSavePages)
}, },
calc(num1, num2, calcStr) { calc(num1, num2, calcStr) {
var str1; // var str1; //

@ -718,6 +718,11 @@ export default {
detail: nval, detail: nval,
type: 'mailingInfo' type: 'mailingInfo'
}) })
if (nval) {
this.showShipper = this.details.shipper || ''
this.showConsignee = this.details.consignee || ''
this.showNotifier = this.details.notifier || ''
}
}, },
deep: true deep: true
}, },
@ -725,6 +730,9 @@ 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.showShipper = ''
this.showConsignee = ''
this.showNotifier = ''
} }
} }
}, },
@ -936,6 +944,11 @@ export default {
notifypartyScroll.addEventListener('scroll', () => { notifypartyScroll.addEventListener('scroll', () => {
document.getElementById('notifyparty-scroll-right').scrollTop = notifypartyScroll.scrollTop document.getElementById('notifyparty-scroll-right').scrollTop = notifypartyScroll.scrollTop
}) })
if (this.details) {
this.showShipper = this.details.shipper || ''
this.showConsignee = this.details.consignee || ''
this.showNotifier = this.details.notifier || ''
}
}, },
methods: { methods: {
// ========== ========== // ========== ==========

@ -1215,6 +1215,10 @@ export default {
}, },
changePage(type) { changePage(type) {
if (!this.$route.query.id) {
this.$message.error('请先保存订单')
return false
}
this.$emit('changePage', type) this.$emit('changePage', type)
}, },
copyBooking() { copyBooking() {

Loading…
Cancel
Save