From 5381292617ad40f2fc7a9266ceb964a672d25a5a Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 13 十一月 2023 18:30:42 +0800
Subject: [PATCH] modified: src/views/basic/param/index.vue modified: src/views/basic/template/index.vue modified: src/views/common/param-mergeTemplate.vue modified: src/views/plan/customerorder/index.vue
---
src/views/basic/param/index.vue | 25 ++++++++++++++++++++-----
src/views/basic/template/index.vue | 8 ++++++--
src/views/plan/customerorder/index.vue | 2 +-
src/views/common/param-mergeTemplate.vue | 5 ++++-
4 files changed, 31 insertions(+), 9 deletions(-)
diff --git a/src/views/basic/param/index.vue b/src/views/basic/param/index.vue
index 03c511f..32c34ef 100644
--- a/src/views/basic/param/index.vue
+++ b/src/views/basic/param/index.vue
@@ -17,7 +17,7 @@
<el-form-item class="btn-group">
<el-button type="" @click="onSearch">鏌ヨ</el-button>
<el-button type="primary" @click="addOrUpdateHandle">鏂板</el-button>
- <el-button @click="showImportDialog">瀵煎叆</el-button>
+ <el-button type="primary" @click="showImportDialog">瀵煎叆</el-button>
</el-form-item>
</el-col>
</el-row>
@@ -173,16 +173,31 @@
...mapGetters(['permissions'])
},
created() {
+ this.loading = true
this.getData()
this.getParamType()
- },
- beforeUpdate() {
- console.log("updated");
this.rowSort()
this.rowCalc()
this.loading = false
},
- watch: {},
+ // beforeUpdate() {
+ // console.log("updated");
+ // this.rowSort()
+ // this.rowCalc()
+ // this.loading = false
+ // },
+ watch: {
+ tableData:{
+ handler(old,newval){
+ this.loading = true
+ // this.tableData=JSON.parse(JSON.stringify(this.tableTreeData))
+ this.rowSort()
+ this.rowCalc()
+ this.loading = false
+ },
+ deep: true
+ }
+ },
methods: {
//涓嬭浇妯℃澘
downloadTemplate() {
diff --git a/src/views/basic/template/index.vue b/src/views/basic/template/index.vue
index 0880d7a..4940e83 100644
--- a/src/views/basic/template/index.vue
+++ b/src/views/basic/template/index.vue
@@ -177,6 +177,7 @@
} from '@/api/basic/template'
import TableForm from './template-form'
import ttable from '@/views/common/ztt-table.vue'
+import { getStore } from '@/util/store.js'
import ParamDialog from '@/views/common/param.vue'
import { mapGetters } from 'vuex'
import {
@@ -301,8 +302,7 @@
},
addOrUpdateVisible: false,
paramTemplateOption: {
- maxHeight: 450,
- height: 450,
+ height: '65vh',
loadingText: "Loading...",
columnBtn: false,
index: true,
@@ -375,6 +375,10 @@
computed: {
...mapGetters(['permissions'])
},
+ created(){
+ },
+ watch:{
+ },
mounted() {
this.getParamType()
// this.rowDrop()
diff --git a/src/views/common/param-mergeTemplate.vue b/src/views/common/param-mergeTemplate.vue
index 104f3c3..03b521b 100644
--- a/src/views/common/param-mergeTemplate.vue
+++ b/src/views/common/param-mergeTemplate.vue
@@ -169,6 +169,9 @@
},
},
watch:{
+ table(val) {
+ this.doLayout()
+ },
tableTreeData:{
handler(old,newval){
this.loading = true
@@ -178,7 +181,7 @@
this.loading = false
},
deep: true
- }
+ },
},
created() {
this.loading = true
diff --git a/src/views/plan/customerorder/index.vue b/src/views/plan/customerorder/index.vue
index 63f8c5a..711cf02 100644
--- a/src/views/plan/customerorder/index.vue
+++ b/src/views/plan/customerorder/index.vue
@@ -390,7 +390,7 @@
isShowQuery: false,
uploadInfo: {
// 鏄惁灞曠ず涓婁紶EXCEL浠ュ強瀵瑰簲鐨剈rl
- isShow: false,
+ isShow: true,
url: ''
},
prelang: 'operation',
--
Gitblit v1.9.3