zouyu
2023-11-13 5381292617ad40f2fc7a9266ceb964a672d25a5a
	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
已修改4个文件
40 ■■■■ 文件已修改
src/views/basic/param/index.vue 25 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basic/template/index.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/common/param-mergeTemplate.vue 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/plan/customerorder/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
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() {
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()
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
src/views/plan/customerorder/index.vue
@@ -390,7 +390,7 @@
      isShowQuery: false,
      uploadInfo: {
        // 是否展示上传EXCEL以及对应的url
        isShow: false,
        isShow: true,
        url: ''
      },
      prelang: 'operation',