Merge branch 'dev'
Showing
21 changed files
with
22 additions
and
22 deletions
| ... | @@ -145,7 +145,7 @@ | ... | @@ -145,7 +145,7 @@ |
| 145 | this.$popupCacel() | 145 | this.$popupCacel() |
| 146 | 146 | ||
| 147 | } else { | 147 | } else { |
| 148 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 148 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true) |
| 149 | } | 149 | } |
| 150 | }).catch(() => { | 150 | }).catch(() => { |
| 151 | this.loading = false | 151 | this.loading = false | ... | ... |
| ... | @@ -138,7 +138,7 @@ | ... | @@ -138,7 +138,7 @@ |
| 138 | } | 138 | } |
| 139 | this.$popupCacel() | 139 | this.$popupCacel() |
| 140 | } else { | 140 | } else { |
| 141 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 141 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true) |
| 142 | } | 142 | } |
| 143 | }).catch(() => { | 143 | }).catch(() => { |
| 144 | this.loading = false | 144 | this.loading = false | ... | ... |
| ... | @@ -258,7 +258,7 @@ | ... | @@ -258,7 +258,7 @@ |
| 258 | } | 258 | } |
| 259 | this.$popupCacel() | 259 | this.$popupCacel() |
| 260 | } else { | 260 | } else { |
| 261 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 261 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true) |
| 262 | } | 262 | } |
| 263 | }).catch(() => { | 263 | }).catch(() => { |
| 264 | this.loading = false | 264 | this.loading = false |
| ... | @@ -279,7 +279,7 @@ | ... | @@ -279,7 +279,7 @@ |
| 279 | store.dispatch('user/refreshPage', true); | 279 | store.dispatch('user/refreshPage', true); |
| 280 | this.$popupCacel() | 280 | this.$popupCacel() |
| 281 | } else { | 281 | } else { |
| 282 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 282 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true) |
| 283 | } | 283 | } |
| 284 | }).catch(() => { | 284 | }).catch(() => { |
| 285 | this.loading = false | 285 | this.loading = false | ... | ... |
| ... | @@ -120,7 +120,7 @@ | ... | @@ -120,7 +120,7 @@ |
| 120 | } | 120 | } |
| 121 | this.$popupCacel() | 121 | this.$popupCacel() |
| 122 | } else { | 122 | } else { |
| 123 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 123 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true) |
| 124 | } | 124 | } |
| 125 | }).catch(() => { | 125 | }).catch(() => { |
| 126 | this.loading = false | 126 | this.loading = false | ... | ... |
| ... | @@ -121,7 +121,7 @@ | ... | @@ -121,7 +121,7 @@ |
| 121 | } | 121 | } |
| 122 | this.$popupCacel() | 122 | this.$popupCacel() |
| 123 | } else { | 123 | } else { |
| 124 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 124 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true) |
| 125 | } | 125 | } |
| 126 | }).catch(() => { | 126 | }).catch(() => { |
| 127 | this.loading = false | 127 | this.loading = false | ... | ... |
| ... | @@ -145,7 +145,7 @@ | ... | @@ -145,7 +145,7 @@ |
| 145 | } | 145 | } |
| 146 | this.$popupCacel() | 146 | this.$popupCacel() |
| 147 | } else { | 147 | } else { |
| 148 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 148 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true) |
| 149 | } | 149 | } |
| 150 | }).catch(() => { | 150 | }).catch(() => { |
| 151 | this.loading = false | 151 | this.loading = false | ... | ... |
| ... | @@ -182,7 +182,7 @@ | ... | @@ -182,7 +182,7 @@ |
| 182 | } | 182 | } |
| 183 | this.$popupCacel() | 183 | this.$popupCacel() |
| 184 | } else { | 184 | } else { |
| 185 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 185 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true) |
| 186 | } | 186 | } |
| 187 | }).catch(() => { | 187 | }).catch(() => { |
| 188 | this.loading = false | 188 | this.loading = false | ... | ... |
| ... | @@ -126,7 +126,7 @@ | ... | @@ -126,7 +126,7 @@ |
| 126 | } | 126 | } |
| 127 | this.$popupCacel() | 127 | this.$popupCacel() |
| 128 | } else { | 128 | } else { |
| 129 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 129 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true) |
| 130 | } | 130 | } |
| 131 | }).catch(() => { | 131 | }).catch(() => { |
| 132 | this.loading = false | 132 | this.loading = false | ... | ... |
| ... | @@ -125,7 +125,7 @@ | ... | @@ -125,7 +125,7 @@ |
| 125 | } | 125 | } |
| 126 | this.$popupCacel() | 126 | this.$popupCacel() |
| 127 | } else { | 127 | } else { |
| 128 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 128 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true) |
| 129 | } | 129 | } |
| 130 | }).catch(() => { | 130 | }).catch(() => { |
| 131 | this.loading = false | 131 | this.loading = false | ... | ... |
| ... | @@ -134,7 +134,7 @@ | ... | @@ -134,7 +134,7 @@ |
| 134 | } | 134 | } |
| 135 | this.$popupCacel() | 135 | this.$popupCacel() |
| 136 | } else { | 136 | } else { |
| 137 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 137 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true) |
| 138 | } | 138 | } |
| 139 | }).catch(() => { | 139 | }).catch(() => { |
| 140 | this.loading = false | 140 | this.loading = false | ... | ... |
| ... | @@ -254,7 +254,7 @@ | ... | @@ -254,7 +254,7 @@ |
| 254 | } | 254 | } |
| 255 | this.$popupCacel() | 255 | this.$popupCacel() |
| 256 | } else { | 256 | } else { |
| 257 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 257 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true) |
| 258 | } | 258 | } |
| 259 | }).catch(() => { | 259 | }).catch(() => { |
| 260 | this.loading = false | 260 | this.loading = false | ... | ... |
| ... | @@ -127,7 +127,7 @@ | ... | @@ -127,7 +127,7 @@ |
| 127 | } | 127 | } |
| 128 | this.$popupCacel() | 128 | this.$popupCacel() |
| 129 | } else { | 129 | } else { |
| 130 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 130 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true) |
| 131 | } | 131 | } |
| 132 | }).catch(() => { | 132 | }).catch(() => { |
| 133 | this.loading = false | 133 | this.loading = false | ... | ... |
| ... | @@ -129,7 +129,7 @@ | ... | @@ -129,7 +129,7 @@ |
| 129 | } | 129 | } |
| 130 | this.$popupCacel() | 130 | this.$popupCacel() |
| 131 | } else { | 131 | } else { |
| 132 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 132 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true) |
| 133 | } | 133 | } |
| 134 | }).catch(() => { | 134 | }).catch(() => { |
| 135 | this.loading = false | 135 | this.loading = false | ... | ... |
| ... | @@ -127,7 +127,7 @@ | ... | @@ -127,7 +127,7 @@ |
| 127 | } | 127 | } |
| 128 | this.$popupCacel() | 128 | this.$popupCacel() |
| 129 | } else { | 129 | } else { |
| 130 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 130 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true) |
| 131 | } | 131 | } |
| 132 | }).catch(() => { | 132 | }).catch(() => { |
| 133 | this.loading = false | 133 | this.loading = false | ... | ... |
| ... | @@ -134,7 +134,7 @@ | ... | @@ -134,7 +134,7 @@ |
| 134 | } | 134 | } |
| 135 | this.$popupCacel() | 135 | this.$popupCacel() |
| 136 | } else { | 136 | } else { |
| 137 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 137 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true) |
| 138 | } | 138 | } |
| 139 | }).catch(() => { | 139 | }).catch(() => { |
| 140 | this.loading = false | 140 | this.loading = false | ... | ... |
| ... | @@ -125,7 +125,7 @@ | ... | @@ -125,7 +125,7 @@ |
| 125 | this.$popupCacel() | 125 | this.$popupCacel() |
| 126 | } | 126 | } |
| 127 | } else { | 127 | } else { |
| 128 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 128 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true) |
| 129 | } | 129 | } |
| 130 | }).catch(() => { | 130 | }).catch(() => { |
| 131 | this.loading = false | 131 | this.loading = false | ... | ... |
| ... | @@ -123,7 +123,7 @@ | ... | @@ -123,7 +123,7 @@ |
| 123 | } | 123 | } |
| 124 | this.$popupCacel() | 124 | this.$popupCacel() |
| 125 | } else { | 125 | } else { |
| 126 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 126 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true) |
| 127 | } | 127 | } |
| 128 | }).catch(() => { | 128 | }).catch(() => { |
| 129 | this.loading = false | 129 | this.loading = false | ... | ... |
| ... | @@ -125,7 +125,7 @@ | ... | @@ -125,7 +125,7 @@ |
| 125 | } | 125 | } |
| 126 | this.$popupCacel() | 126 | this.$popupCacel() |
| 127 | } else { | 127 | } else { |
| 128 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 128 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true) |
| 129 | } | 129 | } |
| 130 | }).catch(() => { | 130 | }).catch(() => { |
| 131 | this.loading = false | 131 | this.loading = false | ... | ... |
| ... | @@ -125,7 +125,7 @@ | ... | @@ -125,7 +125,7 @@ |
| 125 | this.$popupCacel() | 125 | this.$popupCacel() |
| 126 | } | 126 | } |
| 127 | } else { | 127 | } else { |
| 128 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 128 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true) |
| 129 | } | 129 | } |
| 130 | }).catch(() => { | 130 | }).catch(() => { |
| 131 | this.loading = false | 131 | this.loading = false | ... | ... |
| ... | @@ -126,7 +126,7 @@ | ... | @@ -126,7 +126,7 @@ |
| 126 | } | 126 | } |
| 127 | this.$popupCacel() | 127 | this.$popupCacel() |
| 128 | } else { | 128 | } else { |
| 129 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 129 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true) |
| 130 | } | 130 | } |
| 131 | }).catch(() => { | 131 | }).catch(() => { |
| 132 | this.loading = false | 132 | this.loading = false | ... | ... |
| ... | @@ -127,7 +127,7 @@ | ... | @@ -127,7 +127,7 @@ |
| 127 | } | 127 | } |
| 128 | this.$popupCacel() | 128 | this.$popupCacel() |
| 129 | } else { | 129 | } else { |
| 130 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 130 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true) |
| 131 | } | 131 | } |
| 132 | }).catch(() => { | 132 | }).catch(() => { |
| 133 | this.loading = false | 133 | this.loading = false | ... | ... |
-
Please register or sign in to post a comment