f0c30785 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents b45632cc 64ce8ccc
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2024-01-18 14:22:06 4 * @LastEditTime: 2024-01-18 15:03:56
5 --> 5 -->
6 <template> 6 <template>
7 <div> 7 <div>
...@@ -181,6 +181,7 @@ ...@@ -181,6 +181,7 @@
181 that.tableDataList = _.cloneDeep([]) 181 that.tableDataList = _.cloneDeep([])
182 } else { 182 } else {
183 that.tableDataList = _.cloneDeep(val) 183 that.tableDataList = _.cloneDeep(val)
184 that.key++
184 } 185 }
185 }) 186 })
186 }, 187 },
...@@ -193,6 +194,7 @@ ...@@ -193,6 +194,7 @@
193 if (newVal == 0) { 194 if (newVal == 0) {
194 this.column = _.cloneDeep(dataList); 195 this.column = _.cloneDeep(dataList);
195 this.tableDataList = _.cloneDeep(this.tableData); 196 this.tableDataList = _.cloneDeep(this.tableData);
197 this.key++
196 } else if (newVal == "1" || newVal == "3") { 198 } else if (newVal == "1" || newVal == "3") {
197 this.column = dataList; 199 this.column = dataList;
198 } else { 200 } else {
......
...@@ -181,6 +181,7 @@ ...@@ -181,6 +181,7 @@
181 that.tableDataList = _.cloneDeep([]) 181 that.tableDataList = _.cloneDeep([])
182 } else { 182 } else {
183 that.tableDataList = _.cloneDeep(val) 183 that.tableDataList = _.cloneDeep(val)
184 that.key++
184 } 185 }
185 }) 186 })
186 }, 187 },
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2024-01-18 14:51:42 4 * @LastEditTime: 2024-01-18 15:03:10
5 --> 5 -->
6 <template> 6 <template>
7 <div> 7 <div>
...@@ -126,6 +126,7 @@ ...@@ -126,6 +126,7 @@
126 if (val.length == 0 || !val) { 126 if (val.length == 0 || !val) {
127 } else { 127 } else {
128 that.tableDataList = _.cloneDeep(val) 128 that.tableDataList = _.cloneDeep(val)
129 this.key++
129 } 130 }
130 }) 131 })
131 }, 132 },
...@@ -138,6 +139,7 @@ ...@@ -138,6 +139,7 @@
138 if (newVal == 0) { 139 if (newVal == 0) {
139 this.column = _.cloneDeep(dataList) 140 this.column = _.cloneDeep(dataList)
140 this.tableDataList = _.cloneDeep(this.tableData) 141 this.tableDataList = _.cloneDeep(this.tableData)
142 this.key++
141 } else if ((newVal == '1' || newVal == '3')) { 143 } else if ((newVal == '1' || newVal == '3')) {
142 this.column = dataList 144 this.column = dataList
143 } else { 145 } else {
......