优化

README.md

@@ -1,2 +1,8 @@
 node版本----v16.20.0
 
+
+
+https://pic.imgdb.cn/item/65b9aecb871b83018a21b6ff.png
+
+
+https://s3.bmp.ovh/imgs/2024/09/18/28da0ea11949f3e0.png

src/layout/index.vue

@@ -52,10 +52,9 @@
     <!-- 路由出口 -->
     <router-layout />
     <!-- logo 图标 -->
-    <!--    <template v-slot:logo>-->
-    <!--      <img src="@/assets/logo.png" alt="logo" />-->
-    <!--    </template>-->
-    <!-- 顶栏右侧区域 -->
+    <template v-slot:logo>
+      <img src="@/assets/logo.png" alt="logo" />
+    </template>
     <template v-slot:right>
       <header-tools :fullscreen="fullscreen" @fullscreen="onFullscreen" />
     </template>
@@ -245,14 +244,12 @@
   .ele-admin-layout {
     .ele-admin-logo {
       font-size: 18px !important;
-
       img {
         width: 50px !important;
         height: auto !important;
       }
     }
   }
-
   // 侧栏菜单徽章样式，定位在右侧垂直居中并调小尺寸
   .ele-menu-badge {
     position: absolute;
@@ -343,10 +340,10 @@
     }
   }
 
-  .ele-admin-layout .ele-admin-logo {
-    background-image: url('@/assets/logo.png') !important;
-    background-size: cover !important;
-    background-repeat: no-repeat !important;
-    background-position: center center !important;
-  }
+  // .ele-admin-layout .ele-admin-logo {
+  //   background-image: url('@/assets/logo.png') !important;
+  //   background-size: cover !important;
+  //   background-repeat: no-repeat !important;
+  //   background-position: center center !important;
+  // }
 </style>

src/views/factoryModel/factoryManagement/components/edit.vue

@@ -64,11 +64,12 @@
             </div>
           </el-form-item>
         </el-col>
+        <!-- options_groupId -->
         <el-col :span="8">
           <el-form-item label="负责人部门:" prop="extInfo.principalDep">
             <ele-tree-select
               clearable
-              :data="options_groupId"
+              :data="options.groupId"
               v-model="form.extInfo.principalDep"
               valueKey="id"
               labelKey="name"

src/views/factoryModel/station/components/edit.vue

@@ -88,9 +88,10 @@
             </el-form-item>
           </el-col>
 
+    
           <el-col :span="8">
             <el-form-item label="负责人部门:" prop="extInfo.principalDep">
-              <ele-tree-select clearable :data="options_groupId" filterable v-model="form.extInfo.principalDep"
+              <ele-tree-select clearable :data="groupList" filterable v-model="form.extInfo.principalDep"
                 valueKey="id" labelKey="name" placeholder="请选择" @change="change_principalDep" default-expand-all />
             </el-form-item>
           </el-col>
@@ -188,6 +189,7 @@ import ProduceDialog from './ProduceDialog'
 import CodeDialog from './codeDialog.vue'
 import AreaSelect from "@/views/enterpriseModel/regionalManage/components/area-cascader.vue";
 import {basicAreaPageAPI} from "@/api/regionalManage";
+import { listOrganizations } from '@/api/system/organization';
 export default {
   components: {
     AreaSelect,
@@ -333,7 +335,9 @@ export default {
         ],
         productionLineId: [],
         areaList: [],
-      }
+      },
+
+      groupList: []
     };
   },
   computed: {
@@ -349,6 +353,7 @@ export default {
     }
   },
   created() {
+    this.getGs();
     this.getBasicAreaList()
   },
   methods: {
@@ -552,6 +557,18 @@ export default {
       this.options.leaderId = [];
       this.getlistFactoryLineByParentId();
     },
+
+        // 获取公司数据
+        getGs() {
+      listOrganizations().then((list) => {
+        this.groupList = this.$util.toTreeData({
+          data: list,
+          idField: 'id',
+          parentIdField: 'parentId'
+        });
+      });
+    },
+
     // 选择产线
     change_productionLineId() { },
     // 请求详情

src/views/material/product/components/index-data.vue

@@ -112,7 +112,16 @@
           :underline="false"
           @click="toBomManager(row)"
         >
-          BOM管理
+          结构BOM
+        </el-link>
+
+
+        <el-link
+          type="primary"
+          v-if="row.isProduct == 1"
+          :underline="false"
+        >
+        BOM管理
         </el-link>
 
         <el-link
@@ -331,7 +340,7 @@
           {
             columnKey: 'action',
             label: '操作',
-            width: 200,
+            width: 220,
             align: 'center',
             resizable: false,
             slot: 'action',

src/views/technology/productParam/components/user-edit.vue

@@ -243,7 +243,7 @@
         </div>
       </el-row>
 
-      <header-title title="添加工序"></header-title>
+      <!-- <header-title title="添加工序"></header-title> -->
     </el-form>
 
     <template v-slot:footer>
@@ -260,7 +260,7 @@
     <ParamModal ref="paramRefs" @chooseModal="chooseModal"></ParamModal>
 
     <!-- 选择工序 -->
-    <Process @chooseProcess="chooseProcess" :taskParam="taskParam"></Process>
+    <!-- <Process @chooseProcess="chooseProcess" :taskParam="taskParam"></Process> -->
   </ele-modal>
 </template>