Merge branch 'master' of http://114.132.189.42:9002/r/zs-mes-before

Fixiaobai

2023-11-14 21d976db1dcdf9ea4b6c300c159a654a7cd62b63

 src/views/common/param-mergeTemplate.vue

@@ -3,7 +3,7 @@
        <avue-crud 
        ref="crud" 
        class="l-mes" 
        rowKey="oneId" 
        rowKey="id" 
        :data="tableData" 
        :option="option" 
        :span-method="spanMethod"
@@ -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
@@ -187,7 +190,7 @@
        this.rowCalc()
        setTimeout(()=>{
            this.loading = false
        },3000)
        },1000)
    },
    data(){
        return {
@@ -275,6 +278,9 @@
</script>

<style>
.avue-crud_menu{
    display: none;
}
.avue-crud .el-table th {
    word-break: break-word;
    color: rgba(102,102,102,1);