43804732 by xiaomiao

Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

2 parents 80183af9 00517d7a
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-12 16:37:53 4 * @LastEditTime: 2023-07-13 11:06:42
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%', true)
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%', true)
212 } 212 }
213 } else { 213 } else {
214 that.$message.error(res.message) 214 that.$message.error(res.message)
......