bom2

src/api/material/BOM.js

@@ -113,7 +113,7 @@ export async function getByTaskId(categoryId, taskId) {
 
 // 查询BOM树
 export async function getBomTreeList(params) {
-  const res = await request.get(`/main/bomCategory/getList`, { params });
+  const res = await request.get(`/eam/deviceBom/getList`, { params });
   if (res.data.code == 0) {
     return res.data;
   }
@@ -122,7 +122,7 @@ export async function getBomTreeList(params) {
 
 // 查询BOM树 详情
 export async function getBomGetById(id) {
-  const res = await request.get(`/main/bomCategory/getById/${id}`);
+  const res = await request.get(`/eam/deviceBom/getById/${id}`);
   if (res.data.code == 0) {
     return res.data;
   }
@@ -131,7 +131,7 @@ export async function getBomGetById(id) {
 
 // 查询BOM 版本
 export async function versionList(params) {
-  const res = await request.get(`/main/bomCategory/versionList`, { params });
+  const res = await request.get(`/eam/deviceBom/versionList`, { params });
   if (res.data.code == 0) {
     return res.data.data;
   }
@@ -176,7 +176,7 @@ export async function getBomPageList(params) {
 
 // 获取产品BOM列表
 export async function getBomPageCategoryId(params) {
-  const res = await request.get(`/main/bomCategory/pageByCategoryId`, {
+  const res = await request.get(`/eam/deviceBom/pageByCategoryId`, {
     params
   });
   if (res.data.code == 0) {

src/views/ledgerAssets/equipment/components/attribute.vue

@@ -19,11 +19,7 @@
 
         <el-col :span="8" label-width="100px">
           <el-form-item label="编码:" prop="code">
-            <el-input
-              placeholder=""
-              v-model="category.code"
-              disabled
-            ></el-input>
+            <el-input placeholder="" v-model="codes" disabled></el-input>
           </el-form-item>
         </el-col>
 
@@ -199,7 +195,7 @@
 
       <el-row>
         <el-col :span="8" label-width="100px">
-          <el-form-item label="物料库路径" prop="name">
+          <el-form-item label="物料库路径" prop="materielPath">
             <el-input
               placeholder=""
               v-model="attributeData.materielPath"
@@ -210,7 +206,7 @@
 
       <el-row>
         <el-col :span="20" label-width="100px">
-          <el-form-item label="备注" prop="name">
+          <el-form-item label="备注" prop="remake">
             <el-input
               placeholder=""
               v-model="attributeData.remake"
@@ -223,7 +219,7 @@
 
       <el-row>
         <el-col :span="8" label-width="100px">
-          <el-form-item label="创建人" prop="name">
+          <el-form-item label="创建人" prop="createName">
             <el-input
               placeholder=""
               disabled
@@ -233,7 +229,7 @@
         </el-col>
 
         <el-col :span="8" label-width="100px">
-          <el-form-item label="创建时间" prop="name">
+          <el-form-item label="创建时间" prop="createTime">
             <el-input
               placeholder=""
               disabled
@@ -331,6 +327,10 @@
       attributeData: {
         type: Object,
         default: {}
+      },
+      codes: {
+        type: String,
+        default: ''
       }
     },
 

src/views/ledgerAssets/equipment/components/detailedList.vue

@@ -123,8 +123,16 @@
             prop: 'code',
             label: '编码',
             showOverflowTooltip: true,
-            width: 120
+            width: 240,
+            formatter: (row) => {
+              return row.code + '/' + this.codes;
+            }
           },
+          /*  {
+            prop: 'deviceCode',
+            label: '部件编码',
+            width: 120
+          }, */
           {
             prop: 'name',
             label: '名称',
@@ -254,6 +262,10 @@
       isTemp: {
         type: Number,
         default: 0
+      },
+      codes: {
+        type: String,
+        default: ''
       }
     },
 

src/views/ledgerAssets/equipment/detailsPop.vue

@@ -121,7 +121,10 @@
               @tab-click="handleClick"
             >
               <el-tab-pane label="属性" name="属性">
-                <attribute :attributeData="currentNodeData"></attribute>
+                <attribute
+                  :attributeData="currentNodeData"
+                  :codes="searchObj.code"
+                ></attribute>
               </el-tab-pane>
 
               <el-tab-pane
@@ -139,6 +142,7 @@
                   :isTemp="searchObj.isTemp"
                   :attributeData="currentNodeData"
                   :treeId="treeId"
+                  :codes="searchObj.code"
                 ></detailedList>
               </el-tab-pane>
             </el-tabs>