xy 11 months ago
parent c82f976fc1
commit d2ce42d398

@ -140,10 +140,12 @@ export default function formBuilder(
? target[info.name] ? target[info.name]
.toString() .toString()
?.split(/,|\|/) ?.split(/,|\|/)
.map((i) => (isNaN(Number(i) || !i) ? i : Number(i))) .map((i) => {
return ((isNaN(Number(i)) || !i) ? i : Number(i))
})
: []; : [];
} else { } else {
return isNaN(Number(target[info.name])) || !target[info.name] return (isNaN(Number(target[info.name])) || !target[info.name])
? target[info.name] ? target[info.name]
: Number(target[info.name]); : Number(target[info.name]);
} }
@ -666,11 +668,11 @@ export default function formBuilder(
? target[info.name] ? target[info.name]
.toString() .toString()
?.split(/,|\|/) ?.split(/,|\|/)
.map((i) => (isNaN(Number(i)) || !i ? i : Number(i))) .map((i) => ((isNaN(Number(i)) || !i) ? i : Number(i)))
: []; : [];
} else { } else {
res = res =
isNaN(Number(target[info.name])) || !target[info.name] (isNaN(Number(target[info.name])) || !target[info.name])
? target[info.name] ? target[info.name]
: Number(target[info.name]); : Number(target[info.name]);
} }
@ -1121,20 +1123,6 @@ export default function formBuilder(
break; break;
case "choice": case "choice":
case "select": case "select":
// const getMoblieSelectValue = () => {
// if (!!info.multiple) {
// return target[info.name]
// ? target[info.name]
// .toString()
// ?.split(/,|\|/)
// .map((i) => (isNaN(Number(i) || !i) ? i : Number(i)))
// : [];
// } else {
// return isNaN(Number(target[info.name])) || !target[info.name]
// ? target[info.name]
// : Number(target[info.name]);
// }
// };
const getDetailMobileSelectValue = () => { const getDetailMobileSelectValue = () => {
let res = ""; let res = "";
if (!!info.multiple) { if (!!info.multiple) {
@ -1142,11 +1130,11 @@ export default function formBuilder(
? target[info.name] ? target[info.name]
.toString() .toString()
?.split(/,|\|/) ?.split(/,|\|/)
.map((i) => (isNaN(Number(i)) || !i ? i : Number(i))) .map((i) => ((isNaN(Number(i)) || !i) ? i : Number(i)))
: []; : [];
} else { } else {
res = res =
isNaN(Number(target[info.name])) || !target[info.name] (isNaN(Number(target[info.name])) || !target[info.name])
? target[info.name] ? target[info.name]
: Number(target[info.name]); : Number(target[info.name]);
} }

@ -254,7 +254,7 @@ 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"); this.$router.push("/flow/list/todo");
} }
} else { } else {
if (typeof this.form.user_id === 'number') { if (typeof this.form.user_id === 'number') {
@ -273,7 +273,7 @@ export default {
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.$router.push("/flow/list/todo");
} }
} }
this.$emit('update:visible', false) this.$emit('update:visible', false)

@ -301,7 +301,17 @@
>撤回</el-button >撤回</el-button
> >
<el-button <el-button
v-if="row.can_delete || ($store.state.user.adminId === 1)" v-if="row.can_delete"
plain
type="danger"
size="mini"
@click="destroy(row)"
>删除</el-button
>
</template>
<template v-else>
<el-button
v-if="$store.state.user.adminId === 1"
plain plain
type="danger" type="danger"
size="mini" size="mini"

Loading…
Cancel
Save