xy 11 months ago
parent 138882aff4
commit 94fcd7e74c

@ -2,8 +2,8 @@
ENV = 'development' ENV = 'development'
# base api # base api
#VUE_APP_BASE_API='http://192.167.20.118:8080/' VUE_APP_BASE_API='http://192.167.20.118:8080/'
VUE_APP_BASE_API='https://cz-hjjc-test.115.langye.net' #VUE_APP_BASE_API='https://cz-hjjc-test.115.langye.net'
VUE_APP_UPLOAD_API='https://cz-hjjc-test.115.langye.net/api/upload-file' VUE_APP_UPLOAD_API='https://cz-hjjc-test.115.langye.net/api/upload-file'
VUE_APP_PREVIEW=//view.langye.net/preview/onlinePreview VUE_APP_PREVIEW=//view.langye.net/preview/onlinePreview
VUE_APP_MODULE_NAME=oa VUE_APP_MODULE_NAME=oa

@ -21,6 +21,7 @@
"element-ui": "^2.15.14", "element-ui": "^2.15.14",
"exceljs": "^4.4.0", "exceljs": "^4.4.0",
"js-cookie": "2.2.0", "js-cookie": "2.2.0",
"json-bigint": "^1.0.0",
"moment": "^2.29.4", "moment": "^2.29.4",
"normalize.css": "7.0.0", "normalize.css": "7.0.0",
"nprogress": "0.2.0", "nprogress": "0.2.0",

@ -241,12 +241,14 @@ export default {
await Promise.all(this.multipleIds.map(i => assign(i))) await Promise.all(this.multipleIds.map(i => assign(i)))
} else { } else {
await assign(this.result.id) await assign(this.result.id)
this.$router.push("/flow/list/handled");
} }
} else { } else {
if (this.multiple) { if (this.multiple) {
await Promise.all(this.multipleIds.map(i => assign(i, this.form))) await Promise.all(this.multipleIds.map(i => assign(i, this.form)))
} else { } else {
await assign(this.result.id, this.form) await assign(this.result.id, this.form)
this.$router.push("/flow/list/handled");
} }
} }
this.$emit('update:visible', false) this.$emit('update:visible', false)

@ -19,7 +19,7 @@
<template v-if="!isFirstNode"> <template v-if="!isFirstNode">
<el-step <el-step
v-for="step in config.logs" v-for="step in config.logs"
v-if="step.flow_node_id !== node.id" v-if="(step.flow_node_id !== node.id && step.status !== -1)"
:title="step.node.name" :title="step.node.name"
:status="step.status !== -1 ? 'success' : 'error'" :status="step.status !== -1 ? 'success' : 'error'"
icon="el-icon-circle-check" icon="el-icon-circle-check"
@ -276,6 +276,7 @@ import {
import { deepCopy } from "@/utils"; import { deepCopy } from "@/utils";
import { validation, validationName } from "@/utils/validate"; import { validation, validationName } from "@/utils/validate";
import { print } from "@/utils/print"; import { print } from "@/utils/print";
import JSONBigint from 'json-bigint'
export default { export default {
components: { components: {
DesktopForm, DesktopForm,
@ -575,7 +576,7 @@ export default {
if (typeof item[key] === 'string') { if (typeof item[key] === 'string') {
try { try {
// JSON // JSON
const parsedValue = JSON.parse(item[key]); const parsedValue = JSONBigint.parse(item[key]);
// //
item[key] = parsedValue; item[key] = parsedValue;
} catch (e) { } catch (e) {
@ -675,7 +676,7 @@ export default {
if (typeof item[key] === 'string') { if (typeof item[key] === 'string') {
try { try {
// JSON // JSON
const parsedValue = JSON.parse(item[key]); const parsedValue = JSONBigint.parse(item[key]);
// //
item[key] = parsedValue; item[key] = parsedValue;
} catch (e) { } catch (e) {

Loading…
Cancel
Save