BUG修改

src/views/eam/basic/deviceMoldItems/index.vue

@@ -133,8 +133,8 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'eam:deviceMoldItems:update'}), // 编辑
+   defaultButtons.mainListEditBtn(null), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'eam:deviceMoldItems:delete'}), // 删除
+    defaultButtons.mainListDeleteBtn(null), // 删除
 ]
 
 // 列表-操作按钮事件

src/views/eam/basic/factoryArea/index.vue

@@ -5,28 +5,15 @@
   </ContentWrap>
 
   <!-- 列表头部 -->
-    <TableHead
+  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
-      :HeadButttondata="HeadButttondata"
+    @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick" :allSchemas="FactoryArea.allSchemas" />
-      @button-base-click="buttonBaseClick"
-      :routeName="routeName"
-      @updataTableColumns="updataTableColumns"
-      @searchFormClick="searchFormClick"
-      :allSchemas="FactoryArea.allSchemas"
-    />
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table
+    <Table :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
-      :columns="tableColumns"
-      :data="tableObject.tableList"
-      :loading="tableObject.loading"
-      :pagination="{
         total: tableObject.total
-      }"
+      }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
-      v-model:pageSize="tableObject.pageSize"
+      v-model:sort="tableObject.sort">
-      v-model:currentPage="tableObject.currentPage"
-      v-model:sort="tableObject.sort"
-    >
       <template #code="{row}">
         <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
           <span>{{ row.code }}</span>
@@ -39,16 +26,9 @@
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <BasicForm
+  <BasicForm ref="basicFormRef" @success="formsSuccess" :rules="FactoryAreaRules"
-    ref="basicFormRef"
+    :formAllSchemas="FactoryArea.allSchemas" :apiUpdate="FactoryAreaApi.updateFactoryArea"
-    @success="formsSuccess"
+    :apiCreate="FactoryAreaApi.createFactoryArea" @searchTableSuccess="searchTableSuccess" :isBusiness="false" />
-    :rules="FactoryAreaRules"
-    :formAllSchemas="FactoryArea.allSchemas"
-    :apiUpdate="FactoryAreaApi.updateFactoryArea"
-    :apiCreate="FactoryAreaApi.createFactoryArea"
-    @searchTableSuccess="searchTableSuccess"
-    :isBusiness="false"
-  />
 
   <!-- 详情 -->
   <Detail ref="detailRef" :isBasic="true" :allSchemas="FactoryArea.allSchemas" />
@@ -137,6 +117,7 @@ const butttondata = [
   // 列表-操作按钮事件
   const buttonTableClick = async (val, row) => {
     if (val == 'edit') { // 编辑
+    console.log(row)
       openForm('update', row)
     } else if (val == 'delete') { // 删除
       handleDelete(row.id)
@@ -221,5 +202,4 @@ const searchFormClick = (searchData) => {
   onMounted(async () => {
     getList()
   })
-
 </script>

src/views/eam/basic/item/index.vue

@@ -119,8 +119,6 @@ const HeadButttondata = [
 const buttonBaseClick = (val, item) => {
   if (val == 'add') { // 新增
     openForm('create')
-  } else if (val == 'import') { // 导入
-    handleImport()
   } else if (val == 'export') { // 导出
     handleExport()
   } else if (val == 'refresh') { // 刷新
@@ -133,8 +131,8 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'eam:item:update'}), // 编辑
+    defaultButtons.mainListEditBtn(null), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'eam:item:delete'}), // 删除
+    defaultButtons.mainListDeleteBtn(null), // 删除
 ]
 
 // 列表-操作按钮事件

src/views/eam/basic/location/index.vue

@@ -119,8 +119,6 @@ const HeadButttondata = [
 const buttonBaseClick = (val, item) => {
   if (val == 'add') { // 新增
     openForm('create')
-  } else if (val == 'import') { // 导入
-    handleImport()
   }  else if (val == 'export') { // 导出
     handleExport()
   } else if (val == 'refresh') { // 刷新
@@ -133,8 +131,8 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'eam:location:update'}), // 编辑
+    defaultButtons.mainListEditBtn(null), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'eam:location:delete'}), // 删除
+    defaultButtons.mainListDeleteBtn(null), // 删除
 ]
 
 // 列表-操作按钮事件

src/views/eam/basic/locationArea/index.vue

@@ -5,28 +5,15 @@
   </ContentWrap>
 
   <!-- 列表头部 -->
-    <TableHead
+  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
-      :HeadButttondata="HeadButttondata"
+    @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick" :allSchemas="LocationArea.allSchemas" />
-      @button-base-click="buttonBaseClick"
-      :routeName="routeName"
-      @updataTableColumns="updataTableColumns"
-      @searchFormClick="searchFormClick"
-      :allSchemas="LocationArea.allSchemas"
-    />
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table
+    <Table :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
-      :columns="tableColumns"
-      :data="tableObject.tableList"
-      :loading="tableObject.loading"
-      :pagination="{
         total: tableObject.total
-      }"
+      }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
-      v-model:pageSize="tableObject.pageSize"
+      v-model:sort="tableObject.sort">
-      v-model:currentPage="tableObject.currentPage"
-      v-model:sort="tableObject.sort"
-    >
       <template #code="{row}">
         <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
           <span>{{ row.code }}</span>
@@ -39,17 +26,10 @@
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <BasicForm
+  <BasicForm ref="basicFormRef" @success="formsSuccess" :rules="LocationAreaRules"
-    ref="basicFormRef"
+    :formAllSchemas="LocationArea.allSchemas" :searchTableParams="searchTableParams"
-    @success="formsSuccess"
+    :apiUpdate="LocationAreaApi.updateLocationArea" :apiCreate="LocationAreaApi.createLocationArea"
-    :rules="LocationAreaRules"
+    @searchTableSuccess="searchTableSuccess" :isBusiness="false" />
-    :formAllSchemas="LocationArea.allSchemas"
-    :searchTableParams="searchTableParams"
-    :apiUpdate="LocationAreaApi.updateLocationArea"
-    :apiCreate="LocationAreaApi.createLocationArea"
-    @searchTableSuccess="searchTableSuccess"
-    :isBusiness="false"
-  />
 
   <!-- 详情 -->
   <Detail ref="detailRef" :isBasic="true" :allSchemas="LocationArea.allSchemas" />
@@ -136,8 +116,10 @@ const butttondata = [
   ]
 
   // 列表-操作按钮事件
-const buttonTableClick = async (val, row) => {
+  const buttonTableClick = (val, row) => {
+      console.log('11111111111111',val, row )
     if (val == 'edit') { // 编辑
+     console.log('22222', row )
       openForm('update', row)
     } else if (val == 'delete') { // 删除
       handleDelete(row.id)
@@ -147,6 +129,7 @@ const buttonTableClick = async (val, row) => {
   /** 添加/修改操作 */
   const basicFormRef = ref()
   const openForm = (type : string, row ?: any) => {
+    console.log('33333', row )
     basicFormRef.value.open(type, row)
   }
 
@@ -231,5 +214,4 @@ const searchFormClick = (searchData) => {
   onMounted(async () => {
     getList()
   })
-
 </script>

src/views/eam/basic/supplier/index.vue

@@ -119,8 +119,6 @@ const HeadButttondata = [
 const buttonBaseClick = (val, item) => {
   if (val == 'add') { // 新增
     openForm('create')
-  } else if (val == 'import') { // 导入
-    handleImport()
   } else if (val == 'export') { // 导出
     handleExport()
   } else if (val == 'refresh') { // 刷新
@@ -133,8 +131,8 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'eam:supplier:update'}), // 编辑
+    defaultButtons.mainListEditBtn(null), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'eam:supplier:delete'}), // 删除
+    defaultButtons.mainListDeleteBtn(null), // 删除
 ]
 
 // 列表-操作按钮事件

src/views/eam/fixedAssets/index.vue

@@ -133,8 +133,8 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'eam:fixedAssets:update'}), // 编辑
+   defaultButtons.mainListEditBtn(null), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'eam:fixedAssets:delete'}), // 删除
+    defaultButtons.mainListDeleteBtn(null), // 删除
 ]
 
 // 列表-操作按钮事件