Merge branch 'develop' of http://117.78.60.236:8000/csbr-daop/fe-data-asset-management into develop

lxs
Showing 3 changed files with 233 additions and 230 deletions
src/layouts/components/Tabbar/index.vue
src/views/data_product/productListingDetail.vue
src/views/data_transaction/entryManagement.vue
--- a/src/layouts/components/Tabbar/index.vue
View file @810718a
+++ b/src/layouts/components/Tabbar/index.vue
View file @810718a
@@ -46,24 +46,24 @@ watch(
      }
    }
    // isExist.length == 0 && list.push(newRouter);
-    list.map(item => {
+    // list.map(item => {
-      if (combPath == 'app-scenes') {
+    //   if (combPath == 'app-scenes') {
-        item.visible = item.fullPath == '/'
+    //     item.visible = item.fullPath == '/'
-      } else {
+    //   } else {
-        if (item.fullPath.split('/')?.[1] != combPath) {
+    //     if (item.fullPath.split('/')?.[1] != combPath) {
-          item.visible = false
+    //       item.visible = false
-        } else {
+    //     } else {
-          item.visible = true
+    //       item.visible = true
-        }
+    //     }
-      }
+    //   }
-    })
+    // })
    tabbarList.value = list;
    tabbarActive.value = newRouter.fullPath;
    userStore.setTabbar(tabbarList.value);
    userStore.setActiveTabbar(combPath, newRouter.fullPath);
-    nextTick(() => {
+    // nextTick(() => {
-      setTabVisible()
+    //   setTabVisible()
-    })
+    // })
  },
  { immediate: true }
 );
@@ -78,7 +78,9 @@ const changeTab = (pane: any, ev: any) => {
  userStore.setActiveTabbar(combPath, paneData.fullPath);
 };
 const removeTab = (targetName) => {
-  const tabs = tabbarList.value.filter(item => item.visible ?? true);
+  // const tabs = tabbarList.value.filter(item => item.visible ?? true);
+  const tabs = tabbarList.value;
+  let activeName = tabbarActive.value, nextTab: any = {};
  const setTabs = (activeTab) => {
    tabbarActive.value = activeName;
    tabbarList.value = tabbarList.value.filter((tab) => tab.fullPath !== targetName);
@@ -94,12 +96,12 @@ const removeTab = (targetName) => {
    }
    nextTick(() => {
      nextTab.name && router.push({ name: nextTab.name, query: nextTab.query });
-      setTabVisible()
+      // setTabVisible()
    });
  }
-  let activeName = tabbarActive.value;
+  // let activeName = tabbarActive.value;
-  let nextTab: any = {};
+  // let nextTab: any = {};
  if (tabbarActive.value === targetName) {
    tabs.forEach((tab, index) => {
      if (tab.fullPath === targetName) {
@@ -112,7 +114,7 @@ const removeTab = (targetName) => {
  }
  let activeTab: any = tabs.find(t => t.fullPath === targetName);
-  if (activeTab.meta.editPage) {
+  if (activeTab && activeTab.meta.editPage) {
    ElMessageBox.confirm(
      "当前页面尚未保存，确定关闭吗？",
      "提示",
@@ -140,13 +142,14 @@ const setTabVisible = () => {
  const tabpanes: any = document.querySelectorAll('.tabbar-container .el-tabs__item')
  let list: any = []
  tabpanes.forEach((tab, i) => {
-    const visible = tabbarList.value[i].visible ?? true
+    // const visible = tabbarList.value[i].visible ?? true
-    if (!visible) {
+    // if (!visible) {
-      tab.style.display = 'none'
+    //   tab.style.display = 'none'
-    } else {
+    // } else {
-      tab.style.display = 'inherit'
+    //   tab.style.display = 'inherit'
+    //   list.push(tabbarList.value[i].fullPath)
+    // }
    list.push(tabbarList.value[i].fullPath)
-    }
  })
  visibleTabs.value = list
 }
@@ -159,7 +162,7 @@ onMounted(() => {
  <div class="tabbar-container">
    <el-tabs v-model="tabbarActive" type="card" @tab-click="changeTab" @tab-remove="removeTab">
      <el-tab-pane v-for="(item, index) in tabbarList" :key="item.fullPath + '_' + index" :name="item.fullPath"
-        :closable="visibleTabs.length > 1">
+        :closable="tabbarList.length > 1">
        <template #label v-if="item.isHomePage">
          <span class="custom-tabs-label">
            <el-icon>
--- a/src/views/data_product/productListingDetail.vue
View file @810718a
+++ b/src/views/data_product/productListingDetail.vue
View file @810718a
@@ -181,7 +181,7 @@ const formInfo = ref<any>({
      field: 'damCode',
      default: '',
      disabled: true,
-      required: true,
+      required: false,
      visible: true
    },
    {
@@ -532,9 +532,9 @@ const formInfo = ref<any>({
    damType: [
      { required: true, message: "请选择资产类型", trigger: "change", },
    ],
-    damCode: [
+    // damCode: [
-      { required: true, message: "请填写证书编号", trigger: "blur", },
+    //   { required: true, message: "请填写证书编号", trigger: "blur", },
-    ],
+    // ],
    dateRange: [
      { required: true, message: "请选择数据时间范围", trigger: "change", },
    ],
--- a/src/views/data_transaction/entryManagement.vue
View file @810718a
+++ b/src/views/data_transaction/entryManagement.vue
View file @810718a
+<script lang="ts" setup name="entryManagement">
+import { ref, onBeforeMount } from 'vue';
-<script lang="ts" setup name="entryManagement" >
-import { ref,onBeforeMount } from 'vue';
 import { useRoute } from "vue-router"
 import { ElMessage, ElMessageBox } from "element-plus"
 import dayjs from 'dayjs';
@@ -15,6 +13,7 @@ import {
  intableUpdate,
  getDocumentList
 } from "@/api/modules/dataTransaction";
+import { getDamCatalogTable } from '@/api/modules/dataAsset';
 const route = useRoute()
 const userStore = useUserStore();
 const searchItemList = ref([
@@ -29,7 +28,7 @@ const searchItemList = ref([
 ]);
 const page = ref({
  limit: 50,
-  rows:0,
+  rows: 0,
  curr: 1,
  sizes: [
    { label: "10", value: 10 },
@@ -45,123 +44,130 @@ const { proxy } = getCurrentInstance() as any;
 const tableRef = ref()
 const tableInfo = ref({
  id: 'entry-asset-table',
-  loading:false,
+  loading: false,
-  isEdit:false,
+  isEdit: false,
-  currentId:"0",
+  currentId: "0",
-  flag:"create",
+  flag: "create",
-  data:[] as any,
+  data: [] as any,
 })
 const tableSelectInfo = ref({
-  selectValue:"",
+  selectValue: "",
-  daName:"",
+  daName: "",
-  companyGuid:""
+  companyGuid: ""
 })
 const columnInfo = ref({
-  guid:"",
+  guid: "",
-  companyName:"",
+  companyName: "",
-  daName:"",
+  daName: "",
-  registerTime:"",
+  registerTime: "",
-  daCode:"",
+  daCode: "",
-  effectiveDate:"",
+  effectiveDate: "",
-  intableTime:"",
+  intableTime: "",
-  intableMoney:0,
+  intableMoney: 0,
-  issuingEntityName:"",
+  issuingEntityName: "",
-  issuingEntityGuid:"",
+  issuingEntityGuid: "",
-  companyGuid:"",
+  companyGuid: "",
-  registerGuid:""
+  registerGuid: ""
 })
-const companyOption = ref<any>([])
+const companyOption = ref<any>([
+  {
+    tenantGuid: JSON.parse(userStore.userData).tenantGuid,
+    tenantName: JSON.parse(userStore.userData).tenantName
+  }
+])
 const assetsOption = ref<any>([])
 const colums = [
  {
-    type:"index",
+    type: "index",
-    label:"序号",
+    label: "序号",
-    align:"center",
+    align: "center",
-    width:"56"
+    width: "56"
  },
  {
-    prop:"companyName",
+    prop: "companyName",
-    label:"公司名称",
+    label: "公司名称",
-    width:"220",
+    width: "220",
-    componentType:"select",
+    componentType: "select",
    // editDisabled:()=> tableInfo.value.flag==="edit" ? true :false,
-    selectKey:"tenantName",
+    selectKey: "tenantName",
-    selectOption:() => companyOption.value
+    selectOption: () => companyOption.value
  },
  {
-    prop:"daName",
+    prop: "intableTime",
-    label:"资产名称",
+    label: "入表时间",
-    width:"180",
+    width: "130",
-    componentType:"select",
+    componentType: "dateTime",
-    componentDisabled:false,
+    componentDisabled: false
-    //editDisabled:()=> tableInfo.value.flag==="edit" ? true :false,
-    selectOption:() => assetsOption.value ,
-    selectKey:"daName",
  },
  {
-    prop:"daCode",
+    prop: "intableMoney",
-    label:"资产编号",
+    label: "入表金额(万元)",
-    width:"180"
+    width: "200",
+    componentType: "number",
+    toFixed: true,
+    placeholder: "0.00",
+    align: "right",
+    config: {
+      controls: false,
+      precision: 0
    },
-  {
+    componentDisabled: false,
-    prop:"registerTime",
+    input: (value, key, info) => {
-    label:"登记时间",
+      tableRef.value.columnInfo[key] = tableRef.value.columnInfo[key].toString().replace(/[^\d.]/g, "")
-    width:"130",
+      tableRef.value.columnInfo[key] = tableRef.value.columnInfo[key].toString().replace(/\.{2,}/g, ".")
-    componentType:"dateTime",
+      tableRef.value.columnInfo[key] = tableRef.value.columnInfo[key].toString().replace(".", "$#$").replace(/\./g, "").replace("$#$", ".")
+      tableRef.value.columnInfo[key] = tableRef.value.columnInfo[key].toString().replace(/^(\-)*(\d+)\.(\d\d\d\d\d\d).*$/, "$1$2.$3")
+      tableRef.value.columnInfo[key] = tableRef.value.columnInfo[key].toString().replace(/^\D*(\d{0,12}(?:\.\d{0,6})?).*$/g, "$1")
+    },
+    change: (value, key, info) => {
+      let strArr = value.split(".")
+      if (strArr.length > 1) {
+        let right = strArr[1]
+        if (right === '' || right.length < 2) {
+          tableRef.value.columnInfo[key] = parseFloat(tableRef.value.columnInfo[key] || 0).toFixed(2)
+        }
+      } else {
+        tableRef.value.columnInfo[key] = parseFloat(tableRef.value.columnInfo[key] || 0).toFixed(2)
+      }
+    }
  },
  {
-    prop:"effectiveDate",
+    prop: "daName",
-    label:"有效期",
+    label: "资产名称",
-    width:"130",
+    width: "180",
-    componentType:"dateTime",
+    componentType: "select",
+    componentDisabled: false,
+    //editDisabled:()=> tableInfo.value.flag==="edit" ? true :false,
+    selectOption: () => assetsOption.value,
+    selectKey: "damName",
  },
  {
-    prop:"issuingEntityName",
+    prop: "daCode",
-    label:"发证主体",
+    label: "资产编号",
-    width:"250"
+    width: "180"
  },
  {
-    prop:"intableTime",
+    prop: "registerTime",
-    label:"入表时间",
+    label: "登记时间",
-    width:"130",
+    width: "130",
-    componentType:"dateTime",
+    componentType: "dateTime",
-    componentDisabled:false
  },
  {
-    prop:"intableMoney",
+    prop: "effectiveDate",
-    label:"入表金额(万元)",
+    label: "有效期",
-    width:"200",
+    width: "130",
-    componentType:"number",
+    componentType: "dateTime",
-    toFixed:true,
-    placeholder:"0.00",
-    align:"right",
-    config:{
-      controls:false,
-      precision:0
  },
-    componentDisabled:false,
+  {
-    input:(value,key,info)=>{
+    prop: "issuingEntityName",
-     tableRef.value.columnInfo[key] = tableRef.value.columnInfo[key].toString().replace(/[^\d.]/g,"")
+    label: "发证主体",
-     tableRef.value.columnInfo[key] = tableRef.value.columnInfo[key].toString().replace(/\.{2,}/g,".")
+    width: "250"
-     tableRef.value.columnInfo[key] = tableRef.value.columnInfo[key].toString().replace(".","$#$").replace(/\./g,"").replace("$#$",".")
-     tableRef.value.columnInfo[key] = tableRef.value.columnInfo[key].toString().replace(/^(\-)*(\d+)\.(\d\d\d\d\d\d).*$/,"$1$2.$3")
-     tableRef.value.columnInfo[key] = tableRef.value.columnInfo[key].toString().replace(/^\D*(\d{0,12}(?:\.\d{0,6})?).*$/g,"$1")
  },
-    change:(value,key,info) => {
-      let strArr = value.split(".")
-      if(strArr.length>1) {
-        let right = strArr[1]
-        if(right==='' || right.length<2) {
-          tableRef.value.columnInfo[key] = parseFloat(tableRef.value.columnInfo[key]||0).toFixed(2)
-        }
-      } else {
-        tableRef.value.columnInfo[key] = parseFloat(tableRef.value.columnInfo[key]||0).toFixed(2)
-      }
-    }
-  },
 ]
 const toSearch = (val: any, clear: boolean = false) => {
  page.value.curr = 1;
@@ -176,23 +182,25 @@ const toSearch = (val: any, clear: boolean = false) => {
 // 查公司
 const documentList = async () => {
  const res = await getDocumentList({
-    daName:tableSelectInfo.value.selectValue,
+    daName: tableSelectInfo.value.selectValue,
    isCompany: true,
-    type:1})
+    type: 1
-    companyOption.value =res.data || []
+  })
+  companyOption.value = res.data || []
  return Promise.resolve()
 }
 // 查资产
 const getAssetsList = async () => {
-  const res = await  getDocumentList({
+  const res = await getDamCatalogTable({
-    daName:tableSelectInfo.value.selectValue,
+    pageSize: -1,
-    companyGuid:tableSelectInfo.value.companyGuid,
+    pageIndex: 1,
-    type:1})
+  })
-    assetsOption.value =res.data || []
+  assetsOption.value = res.data.records || []
+  console.log(assetsOption.value, '---')
  return Promise.resolve()
 }
-// 
+// getDamCatalogTable
 const getTableData = () => {
  tableInfo.value.loading = true;
  getEntryList({
@@ -211,36 +219,37 @@ const getTableData = () => {
 }
 const createOneData = () => {
-  if(companyOption.value.length>0) {
+  if (companyOption.value.length > 0) {
    findTab(true)
    assetsOption.value = []
    const currentDate = dayjs().format('YYYY-MM-DD');
    tableInfo.value.flag = "create"
    //const arr:any = []
    tableInfo.value.data.unshift({
-        guid:BASE_ID,
+      guid: BASE_ID,
-        companyName:"",
+      companyName: "",
-        daName:"",
+      daName: "",
-        registerTime:"",
+      registerTime: "",
-        daCode:"",
+      daCode: "",
-        effectiveDate:"",
+      effectiveDate: "",
-        intableTime:currentDate,
+      intableTime: currentDate,
-        intableMoney:0,
+      intableMoney: 0,
-        issuingEntityName:"",
+      issuingEntityName: "",
-        companyGuid:"",
+      companyGuid: "",
-        registerGuid:""
+      registerGuid: ""
    })
    //tableInfo.value.data = arr
    tableInfo.value.currentId = BASE_ID
    tableInfo.value.isEdit = true
    tableRef.value.columnInfo.intableTime = currentDate
+    // tableRef.value.columnInfo.companyName = JSON.parse(userStore.userData).tenantName
  } else {
    ElMessage.warning("没有可添加的数据！")
  }
 }
-const columnDel =(row) => {
+const columnDel = (row) => {
  ElMessageBox.confirm(
    '是否确定删除所选数据?',
@@ -252,8 +261,8 @@ const columnDel =(row) => {
    }
  )
    .then(() => {
-      deleteEntryAll(row.guid).then((res:any)=>{
+      deleteEntryAll(row.guid).then((res: any) => {
-        if(res?.code===proxy.$passCode){
+        if (res?.code === proxy.$passCode) {
          ElMessage.success("删除成功")
          getTableData()
          documentList()
@@ -265,38 +274,38 @@ const columnDel =(row) => {
        }
      })
-    }).catch(()=>{
+    }).catch(() => {
      tableRef.value.columnInfo = {}
    })
 }
 const columnSave = async (row) => {
-  if(!row.companyName) {
+  if (!row.companyName) {
    ElMessage.warning("公司名称不能为空")
    return
-  } else if(!row.daName) {
+  } else if (!row.daName) {
    ElMessage.warning("资产名称不能为空")
    return
-  } else if(!row.intableTime) {
+  } else if (!row.intableTime) {
    ElMessage.warning("入表时间不能为空")
    return
-  } else if(!row.intableMoney || row.intableMoney<=0) {
+  } else if (!row.intableMoney || row.intableMoney <= 0) {
    ElMessage.warning("入表金额必须大于0")
    return
  }
-  let res:any
+  let res: any
-  switch(tableInfo.value.flag) {
+  switch (tableInfo.value.flag) {
-    case "create":res = await createEntry(row);break
+    case "create": res = await createEntry(row); break
-    case "edit":res = await intableUpdate(row);break
+    case "edit": res = await intableUpdate(row); break
  }
-   if(res?.code===proxy.$passCode) {
+  if (res?.code === proxy.$passCode) {
-    ElMessage.success(`${tableInfo.value.flag==='create' ? '新增' : '修改'}成功`);
+    ElMessage.success(`${tableInfo.value.flag === 'create' ? '新增' : '修改'}成功`);
    getTableData()
    columnInfoReset()
    documentList()
    findTab(false)
    tableRef.value.columnInfo = {}
-   }else {
+  } else {
    ElMessage.error(res.msg);
    //columnCancel()
  }
@@ -306,18 +315,18 @@ const columnInfoReset = () => {
  tableInfo.value.currentId = "0"
  tableInfo.value.isEdit = false
  columnInfo.value = {
-      guid:"",
+    guid: "",
-      companyName:"",
+    companyName: "",
-      daName:"",
+    daName: "",
-      registerTime:"",
+    registerTime: "",
-      daCode:"",
+    daCode: "",
-      effectiveDate:"",
+    effectiveDate: "",
-      intableTime:"",
+    intableTime: "",
-      intableMoney:0,
+    intableMoney: 0,
-      issuingEntityName:"",
+    issuingEntityName: "",
-      issuingEntityGuid:"",
+    issuingEntityGuid: "",
-      companyGuid:"",
+    companyGuid: "",
-      registerGuid:""
+    registerGuid: ""
  }
 }
 const columnEdit = (row) => {
@@ -325,18 +334,18 @@ const columnEdit =  (row) => {
  findTab(true)
  tableSelectInfo.value.companyGuid = row.companyGuid
  assetsOption.value = []
-  addAssetsOption(null,row,true)
+  addAssetsOption(null, row, true)
  addCompanyOption(row)
  //getAssetsList()
-  const info = {...row}
+  const info = { ...row }
  tableInfo.value.currentId = info.guid
  tableInfo.value.isEdit = true
  tableRef.value.columnInfo.intableMoney = tableRef.value.columnInfo.intableMoney.toFixed(2)
-  columnInfo.value = {...info}
+  columnInfo.value = { ...info }
 }
 const columnCancel = () => {
  tableInfo.value.isEdit = false
-  if(tableInfo.value.flag==="edit") {
+  if (tableInfo.value.flag === "edit") {
    tableInfo.value.currentId = "0"
  } else {
    tableInfo.value.data.shift()
@@ -351,10 +360,10 @@ const pageChange = (info) => {
  getTableData()
 }
 // 选择后赋值
-const handelSelect = (row,key,row1) => {
+const handelSelect = (row, key, row1) => {
-  if(key==="companyName") {
+  if (key === "companyName") {
    tableSelectInfo.value.companyGuid = row.tenantGuid
-  addAssetsOption(row,row1)
+    addAssetsOption(row, row1)
    columnInfo.value.companyName = row.tenantName
    tableRef.value.columnInfo.companyName = row.tenantName
    tableRef.value.columnInfo.companyGuid = row.tenantGuid
@@ -366,23 +375,24 @@ const handelSelect = (row,key,row1) => {
    tableRef.value.columnInfo.registerTime = ""
    tableRef.value.columnInfo.effectiveDate = ""
  } else {
-    if(tableInfo.value.flag==="create") {
+    if (tableInfo.value.flag === "create") {
+      console.log(row, '-----')
      const currentDate = dayjs().format('YYYY-MM-DD');
      columnInfo.value = {
-      guid:row.guid,
+        guid: row.guid,
-      companyName:row.tenantName,
+        companyName: row.rightMainName,
-      daName:row.daName,
+        daName: row.damName,
-      registerTime:row.registerTime,
+        registerTime: row.registerTime,
-      daCode:row.daCode,
+        daCode: row.daCode,
-      effectiveDate:row.effectiveDate,
+        effectiveDate: row.effectiveDate,
-      intableTime:currentDate,
+        intableTime: currentDate,
-      intableMoney:0,
+        intableMoney: 0,
-      issuingEntityName:row.issuingEntityName,
+        issuingEntityName: row.issuingEntityName,
-      issuingEntityGuid:row.issuingEntityGuid,
+        issuingEntityGuid: row.issuingEntityGuid,
-      companyGuid:row.tenantGuid,
+        companyGuid: row.tenantGuid,
-      registerGuid:row.registerGuid
+        registerGuid: row.registerGuid
      }
-      const {guid,...obj} = columnInfo.value
+      const { guid, ...obj } = columnInfo.value
      tableRef.value.columnInfo = obj
    } else {
      columnInfo.value.daName = row.daName
@@ -391,43 +401,43 @@ const handelSelect = (row,key,row1) => {
      columnInfo.value.effectiveDate = row.effectiveDate
      columnInfo.value.issuingEntityName = row.issuingEntityName
      columnInfo.value.registerGuid = row.registerGuid;
-      tableRef.value.columnInfo = {...columnInfo.value}
+      tableRef.value.columnInfo = { ...columnInfo.value }
    }
-// 新增不用传guid 所以删掉，但是往输入框添加数据 通过guid判断
+    // 新增不用传guid 所以删掉，但是往输入框添加数据 通过guid判断
-//console.log(columnInfo.value)
+    //console.log(columnInfo.value)
  }
 }
 const findTab = (flag) => {
- const tab:any = userStore.tabbar.find((tab:any)=>tab.fullPath===route.path)
+  const tab: any = userStore.tabbar.find((tab: any) => tab.fullPath === route.path)
  tab.meta.editPage = flag
 }
-const addAssetsOption = (values,row,flag=false) => {
+const addAssetsOption = (values, row, flag = false) => {
-  getAssetsList().then(()=>{
+  getAssetsList().then(() => {
    const obj = {
-    costAccessmentGuid:null,
+      costAccessmentGuid: null,
-    daCode:row.daCode,
+      daCode: row.daCode,
      daName: row.daName,
      documentFile: null,
      documentType: 1,
      effectiveDate: row.effectiveDate,
-    guid:row.guid,
+      guid: row.guid,
-    issuingEntityGuid:row.issuingEntityGuid ,
+      issuingEntityGuid: row.issuingEntityGuid,
-    issuingEntityName:row.issuingEntityName,
+      issuingEntityName: row.issuingEntityName,
      qualityEvaluationGuid: null,
-    registerGuid:row.registerGuid,
+      registerGuid: row.registerGuid,
-    registerTime:row.registerTime,
+      registerTime: row.registerTime,
      state: row.state,
      tenantGuid: row.companyGuid,
-    tenantName:row.companyName,
+      tenantName: row.companyName,
    }
    const arr = assetsOption.value
-  if(values&&values.tenantGuid===row.companyGuid) {
+    if (values && values.tenantGuid === row.companyGuid) {
      arr.unshift(obj)
      assetsOption.value = arr
-  }else if(flag) {
+    } else if (flag) {
      arr.unshift(obj)
      assetsOption.value = arr
    }
@@ -436,26 +446,27 @@ const addAssetsOption = (values,row,flag=false) => {
 }
 const addCompanyOption = (row) => {
  let flag = true
-  documentList().then(()=>{
+  documentList().then(() => {
    const obj = {
-      tenantName:row.companyName,
+      tenantName: row.companyName,
-      tenantGuid:row.companyGuid
+      tenantGuid: row.companyGuid
    }
    const arr = companyOption.value
-  arr.forEach((item)=>{
+    arr.forEach((item) => {
-       if(item.tenantGuid===row.companyGuid){
+      if (item.tenantGuid === row.companyGuid) {
        flag = false
      }
    })
-  if(flag) {
+    if (flag) {
      arr.unshift(obj)
      companyOption.value = arr
    }
  })
 }
-onBeforeMount(()=> {
+onBeforeMount(() => {
  //getTableData()
-  documentList()
+  // getAssetsList()
+  // documentList()
 })
 </script>
@@ -468,19 +479,9 @@ onBeforeMount(()=> {
      </div>
    </div>
    <div class="table_panel_wrap">
-      <Table 
+      <Table ref="tableRef" :tableInfo="tableInfo" :page="page" :colums="colums" v-model="columnInfo"
-        ref="tableRef"
+        @pageChange="pageChange" @columnSave="columnSave" @columnDel="columnDel" @columnEdit="columnEdit"
-        :tableInfo="tableInfo"
+        @columnCancel="columnCancel" @handelSelect="handelSelect"></Table>
-        :page="page"
-        :colums="colums"
-        v-model="columnInfo"
-        @pageChange="pageChange"
-        @columnSave="columnSave"
-        @columnDel="columnDel"
-        @columnEdit="columnEdit"
-        @columnCancel="columnCancel"
-        @handelSelect="handelSelect"
-      ></Table>
    </div>
  </div>
 </template>
@@ -490,5 +491,4 @@ onBeforeMount(()=> {
 .container_wrap {
  padding: 0 16px;
 }
 </style>