From 7b10179a35a079a098126a1cb3aea2e8d010704d Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 17 十一月 2023 16:37:37 +0800
Subject: [PATCH] 	modified:   src/const/crud/customerOrder/customerOrderForm.js 	modified:   src/views/common/document.vue 	modified:   src/views/common/ztt-table.vue 	modified:   src/views/plan/customerorder/sample-customerorder-form.vue 	modified:   src/views/plan/manfacturingorderstatement/index.vue 	modified:   src/views/plan/manufacturingorder/index.vue 	modified:   src/views/plan/masterproductionschedule/auto-manufacturingorder.vue 	modified:   src/views/plan/masterproductionschedule/index.vue 	modified:   src/views/plan/operationtask/index.vue 	modified:   src/views/plan/outsourcingorder/index.vue 	modified:   src/views/plan/outsourcingorder/outsourcingorder-form.vue 	modified:   src/views/warehouse/stock/index.vue

---
 src/views/common/param-mergeTemplate.vue |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/views/common/param-mergeTemplate.vue b/src/views/common/param-mergeTemplate.vue
index 796737f..d8a0cb7 100644
--- a/src/views/common/param-mergeTemplate.vue
+++ b/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,7 +278,7 @@
 </script>
 
 <style>
-.avue-crud__menu {
+.avue-crud_menu{
     display: none;
 }
 .avue-crud .el-table th {

--
Gitblit v1.9.3