|
|
@@ -25,7 +25,7 @@
|
|
|
|
|
|
<!-- 默认值 -->
|
|
|
<template v-slot:defaultValue="{ row }">
|
|
|
- <el-input v-if="row.textType == 1 || row.textType == 4" v-model="row.defaultValue"
|
|
|
+ <el-input v-if="row.textType == 1 || row.textType == 4 || row.textType == 5" v-model="row.defaultValue"
|
|
|
placeholder="请输入"></el-input>
|
|
|
<el-select v-if="row.textType == 2" v-model="row.defaultValue" placeholder="请选择">
|
|
|
<el-option label="TRUE" :value="'TRUE'" />
|
|
|
@@ -247,14 +247,19 @@ export default {
|
|
|
|
|
|
|
|
|
openEdit() {
|
|
|
+
|
|
|
let tableList = []
|
|
|
tableList = this.$refs.table.getData()
|
|
|
this.$refs.processModalRef.open(tableList)
|
|
|
},
|
|
|
|
|
|
chooseProcess(data) {
|
|
|
+
|
|
|
+ let _arr = [...data, ...this.$refs.table.getData()]
|
|
|
this.$refs.table.setData([...data, ...this.$refs.table.getData()]);
|
|
|
- this.$emit('chooseProcess', [...this.$refs.table.getData()])
|
|
|
+
|
|
|
+
|
|
|
+ this.$emit('chooseProcess', _arr)
|
|
|
|
|
|
},
|
|
|
|
|
|
@@ -272,7 +277,6 @@ export default {
|
|
|
|
|
|
tableList.forEach(e => {
|
|
|
if (e.id == current.id) {
|
|
|
- console.log(e)
|
|
|
e.produceList = data
|
|
|
|
|
|
}
|
|
|
@@ -296,6 +300,7 @@ export default {
|
|
|
|
|
|
|
|
|
remove2(row) {
|
|
|
+
|
|
|
const data = this.$refs.table.getData() ?? [];
|
|
|
data.forEach((e) => {
|
|
|
if (row.parentId == e.id) {
|