修复一些小问题

master
toesbieya 6 years ago
parent 58abb624cc
commit ba81755fd5
  1. 6
      vue/src/components/Guide/main.vue
  2. 4
      vue/src/layout/components/TagsView/index.vue
  3. 2
      vue/src/mixins/bizDocDetailMixin.js
  4. 2
      vue/src/router/authority/modules/sell.js
  5. 2
      vue/src/views/message/user/MessageStream.vue

@ -122,7 +122,7 @@
if (this.beforeExit) { if (this.beforeExit) {
const result = this.beforeExit(this.hasDone) const result = this.beforeExit(this.hasDone)
if (result && result.then) { if (result && result.then) {
result.then(this.$_clear) result.then(() => this.$_clear())
} }
else result !== false && this.$_clear() else result !== false && this.$_clear()
return return
@ -138,7 +138,7 @@
if (this.step.onPrevious) { if (this.step.onPrevious) {
const result = this.step.onPrevious() const result = this.step.onPrevious()
if (result && result.then) { if (result && result.then) {
result.then(this.$_movePrevious) result.then(() => this.$_movePrevious())
} }
else result !== false && this.$_movePrevious() else result !== false && this.$_movePrevious()
} }
@ -152,7 +152,7 @@
if (this.step.onNext) { if (this.step.onNext) {
const result = this.step.onNext() const result = this.step.onNext()
if (result && result.then) { if (result && result.then) {
result.then(this.$_moveNext) result.then(() => this.$_moveNext())
} }
else result !== false && this.$_moveNext() else result !== false && this.$_moveNext()
} }

@ -66,7 +66,7 @@
watch: { watch: {
$route(to, from) { $route(to, from) {
this.decideRouteTransition && this.decideRouteTransition(to, from) this.decideRouteTransition && this.decideRouteTransition(to, from)
this.addTags(to).then(this.moveToCurrentTag) this.addTags(to).then(() => this.moveToCurrentTag())
}, },
'contextmenu.show'(v) { 'contextmenu.show'(v) {
@ -148,7 +148,7 @@
closeAllTags() { closeAllTags() {
this.$store this.$store
.dispatch('tagsView/delAllViews') .dispatch('tagsView/delAllViews')
.then(this.gotoLastView) .then(() => this.gotoLastView())
}, },
gotoLastView() { gotoLastView() {

@ -205,7 +205,7 @@ export default {
if (!data || id !== data.id) return Promise.reject() if (!data || id !== data.id) return Promise.reject()
return Promise.resolve(mergeObj(this.form, data)) return Promise.resolve(mergeObj(this.form, data))
}) })
.then(this.afterInit || Promise.resolve) .then(() => this.afterInit ? this.afterInit() : Promise.resolve())
.catch(e => { .catch(e => {
console.log(e) console.log(e)
return elAlert(`获取${this.docName}数据失败,请重试`, this.close) return elAlert(`获取${this.docName}数据失败,请重试`, this.close)

@ -16,7 +16,7 @@ const router = {
}, },
{ {
path: 'order/detail/:type(see|add|edit)/:id?', path: 'order/detail/:type(see|add|edit)/:id?',
name: 'purchaseOrderDetail', name: 'sellOrderDetail',
hidden: true, hidden: true,
props: true, props: true,
component: lazyLoadView(import('@/views/sell/order/detail')), component: lazyLoadView(import('@/views/sell/order/detail')),

@ -132,7 +132,7 @@
}, },
readAll() { readAll() {
readAll().then(this.search) readAll().then(() => this.search())
}, },
transformType(type) { transformType(type) {

Loading…
Cancel
Save