Merge branch 'dev'
Showing
17 changed files
with
20 additions
and
20 deletions
| 1 | /* | 1 | /* |
| 2 | * @Description: | 2 | * @Description: |
| 3 | * @Autor: renchao | 3 | * @Autor: renchao |
| 4 | * @LastEditTime: 2023-07-12 16:33:59 | 4 | * @LastEditTime: 2023-07-12 16:37:53 |
| 5 | */ | 5 | */ |
| 6 | import { getWorkFlowImage } from "@/api/workflow/jsydsyqFlow.js"; | 6 | import { getWorkFlowImage } from "@/api/workflow/jsydsyqFlow.js"; |
| 7 | import { getPrintTemplateByCode } from "@/api/system"; | 7 | import { getPrintTemplateByCode } from "@/api/system"; |
| ... | @@ -205,10 +205,10 @@ export default { | ... | @@ -205,10 +205,10 @@ export default { |
| 205 | res.result[0].state ? that.$message({ | 205 | res.result[0].state ? that.$message({ |
| 206 | message: '登簿成功', | 206 | message: '登簿成功', |
| 207 | type: 'success' | 207 | type: 'success' |
| 208 | }) : ywPopupDialog("登簿明细", "workflow/components/dialog/dblist", { result: res.result }, '30%') | 208 | }) : ywPopupDialog("登簿错误明细", "workflow/components/dialog/dblist", { result: res.result }, '30%') |
| 209 | } | 209 | } |
| 210 | else { | 210 | else { |
| 211 | ywPopupDialog("登簿明细", "workflow/components/dialog/dblist", { result: res.result }, '30%') | 211 | ywPopupDialog("登簿错误明细", "workflow/components/dialog/dblist", { result: res.result }, '30%') |
| 212 | } | 212 | } |
| 213 | } else { | 213 | } else { |
| 214 | that.$message.error(res.message) | 214 | that.$message.error(res.message) | ... | ... |
| ... | @@ -139,7 +139,7 @@ | ... | @@ -139,7 +139,7 @@ |
| 139 | this.$popupCacel() | 139 | this.$popupCacel() |
| 140 | 140 | ||
| 141 | } else { | 141 | } else { |
| 142 | ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 142 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') |
| 143 | } | 143 | } |
| 144 | }) | 144 | }) |
| 145 | } else { | 145 | } else { | ... | ... |
| ... | @@ -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%') |
| 124 | } | 124 | } |
| 125 | }) | 125 | }) |
| 126 | }, | 126 | }, | ... | ... |
| ... | @@ -242,7 +242,7 @@ | ... | @@ -242,7 +242,7 @@ |
| 242 | } | 242 | } |
| 243 | this.$popupCacel() | 243 | this.$popupCacel() |
| 244 | } else { | 244 | } else { |
| 245 | ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 245 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') |
| 246 | } | 246 | } |
| 247 | }) | 247 | }) |
| 248 | } else { | 248 | } else { |
| ... | @@ -259,7 +259,7 @@ | ... | @@ -259,7 +259,7 @@ |
| 259 | store.dispatch('user/refreshPage', true); | 259 | store.dispatch('user/refreshPage', true); |
| 260 | this.$popupCacel() | 260 | this.$popupCacel() |
| 261 | } else { | 261 | } else { |
| 262 | ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 262 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') |
| 263 | } | 263 | } |
| 264 | }) | 264 | }) |
| 265 | } | 265 | } | ... | ... |
| ... | @@ -109,7 +109,7 @@ | ... | @@ -109,7 +109,7 @@ |
| 109 | } | 109 | } |
| 110 | this.$popupCacel() | 110 | this.$popupCacel() |
| 111 | } else { | 111 | } else { |
| 112 | ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 112 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') |
| 113 | } | 113 | } |
| 114 | }) | 114 | }) |
| 115 | }, | 115 | }, | ... | ... |
| ... | @@ -106,7 +106,7 @@ | ... | @@ -106,7 +106,7 @@ |
| 106 | } | 106 | } |
| 107 | this.$popupCacel() | 107 | this.$popupCacel() |
| 108 | } else { | 108 | } else { |
| 109 | ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 109 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') |
| 110 | } | 110 | } |
| 111 | }) | 111 | }) |
| 112 | }, | 112 | }, | ... | ... |
| ... | @@ -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%') |
| 138 | } | 138 | } |
| 139 | }) | 139 | }) |
| 140 | }, | 140 | }, | ... | ... |
| ... | @@ -162,7 +162,7 @@ | ... | @@ -162,7 +162,7 @@ |
| 162 | } | 162 | } |
| 163 | this.$popupCacel() | 163 | this.$popupCacel() |
| 164 | } else { | 164 | } else { |
| 165 | ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 165 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') |
| 166 | } | 166 | } |
| 167 | }) | 167 | }) |
| 168 | }, | 168 | }, | ... | ... |
| ... | @@ -111,7 +111,7 @@ | ... | @@ -111,7 +111,7 @@ |
| 111 | } | 111 | } |
| 112 | this.$popupCacel() | 112 | this.$popupCacel() |
| 113 | } else { | 113 | } else { |
| 114 | ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 114 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') |
| 115 | } | 115 | } |
| 116 | }) | 116 | }) |
| 117 | }, | 117 | }, | ... | ... |
| ... | @@ -111,7 +111,7 @@ | ... | @@ -111,7 +111,7 @@ |
| 111 | } | 111 | } |
| 112 | this.$popupCacel() | 112 | this.$popupCacel() |
| 113 | } else { | 113 | } else { |
| 114 | ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 114 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') |
| 115 | } | 115 | } |
| 116 | }) | 116 | }) |
| 117 | }, | 117 | }, | ... | ... |
| ... | @@ -119,7 +119,7 @@ | ... | @@ -119,7 +119,7 @@ |
| 119 | } | 119 | } |
| 120 | this.$popupCacel() | 120 | this.$popupCacel() |
| 121 | } else { | 121 | } else { |
| 122 | ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 122 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') |
| 123 | } | 123 | } |
| 124 | }) | 124 | }) |
| 125 | }, | 125 | }, | ... | ... |
| ... | @@ -247,7 +247,7 @@ | ... | @@ -247,7 +247,7 @@ |
| 247 | } | 247 | } |
| 248 | this.$popupCacel() | 248 | this.$popupCacel() |
| 249 | } else { | 249 | } else { |
| 250 | ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 250 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') |
| 251 | } | 251 | } |
| 252 | }) | 252 | }) |
| 253 | }, | 253 | }, | ... | ... |
| ... | @@ -116,7 +116,7 @@ | ... | @@ -116,7 +116,7 @@ |
| 116 | } | 116 | } |
| 117 | this.$popupCacel() | 117 | this.$popupCacel() |
| 118 | } else { | 118 | } else { |
| 119 | ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 119 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') |
| 120 | } | 120 | } |
| 121 | }) | 121 | }) |
| 122 | }, | 122 | }, | ... | ... |
| ... | @@ -119,7 +119,7 @@ | ... | @@ -119,7 +119,7 @@ |
| 119 | } | 119 | } |
| 120 | this.$popupCacel() | 120 | this.$popupCacel() |
| 121 | } else { | 121 | } else { |
| 122 | ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 122 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') |
| 123 | } | 123 | } |
| 124 | }) | 124 | }) |
| 125 | }, | 125 | }, | ... | ... |
| ... | @@ -111,7 +111,7 @@ | ... | @@ -111,7 +111,7 @@ |
| 111 | this.$popupCacel() | 111 | this.$popupCacel() |
| 112 | } | 112 | } |
| 113 | } else { | 113 | } else { |
| 114 | ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 114 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') |
| 115 | } | 115 | } |
| 116 | }) | 116 | }) |
| 117 | }, | 117 | }, | ... | ... |
| ... | @@ -111,7 +111,7 @@ | ... | @@ -111,7 +111,7 @@ |
| 111 | } | 111 | } |
| 112 | this.$popupCacel() | 112 | this.$popupCacel() |
| 113 | } else { | 113 | } else { |
| 114 | ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 114 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') |
| 115 | } | 115 | } |
| 116 | }) | 116 | }) |
| 117 | }, | 117 | }, | ... | ... |
| ... | @@ -112,7 +112,7 @@ | ... | @@ -112,7 +112,7 @@ |
| 112 | } | 112 | } |
| 113 | this.$popupCacel() | 113 | this.$popupCacel() |
| 114 | } else { | 114 | } else { |
| 115 | ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 115 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') |
| 116 | } | 116 | } |
| 117 | }) | 117 | }) |
| 118 | }, | 118 | }, | ... | ... |
-
Please register or sign in to post a comment