修改物品管理

src/views/material/BOMmanage/components/detailedList.vue

@@ -165,7 +165,13 @@ export default {
         },
         {
           prop: 'code',
-          label: '编码',
+          label: 'BOM编码',
+          showOverflowTooltip: true,
+          width: 120
+        },
+        {
+          prop: 'categoryCode',
+          label: '物品编码',
           showOverflowTooltip: true,
           width: 120
         },

src/views/material/BOMmanage/detailsPop.vue

@@ -230,7 +230,7 @@
               @node-click="handleNodeClick"
             >
               <span class="custom-tree-node" slot-scope="{ node, data }">
-                {{ data.code }} / {{ node.label }}
+                {{ data.categoryCode }} / {{ node.label }}
               </span>
             </el-tree>
           </div>

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

@@ -1,23 +1,10 @@
 <template>
   <div>
     <!-- 数据表格 -->
-    <ele-pro-table
-      ref="table"
-      :columns="newColumns"
-      :datasource="datasource"
-      :need-page="true"
-      :selection.sync="selection"
-      :current.sync="rowCurrent"
-      @sort-change="onSortChange"
-      highlight-current-row
-      height="calc(100vh - 412px)"
-      full-height="calc(100vh - 116px)"
-      tool-class="ele-toolbar-form"
-      :page-size="pageSize"
-      @columns-change="handleColumnChange"
-      :cache-key="cacheKeyUrl"
-      v-if="pageShow"
-    >
+    <ele-pro-table ref="table" :columns="newColumns" :datasource="datasource" :need-page="true"
+      :selection.sync="selection" :current.sync="rowCurrent" @sort-change="onSortChange" highlight-current-row
+      height="calc(100vh - 412px)" full-height="calc(100vh - 116px)" tool-class="ele-toolbar-form" :page-size="pageSize"
+      @columns-change="handleColumnChange" :cache-key="cacheKeyUrl" v-if="pageShow">
       <!-- 表头工具栏 -->
       <template v-slot:toolbar>
         <el-button size="small" type="primary" icon="el-icon-plus" class="ele-btn-icon" @click="openEdit({}, 2)">
@@ -245,6 +232,17 @@ const measureTypeList = [
     value: 5
   }
 ];
+const produceTypeList= [
+  {
+    label: '加工',
+    value: 1
+  },
+
+  {
+    label: '装配',
+    value: 3
+  },
+];
 export default {
   mixins: [dictMixins, tabMixins],
 
@@ -279,8 +277,8 @@ export default {
 
       errorData: [],
       exportErrorDioalogVisible: false,
-      pagination:{
-        total: 0 
+      pagination: {
+        total: 0
       },
       bomShow: false,
 
@@ -408,6 +406,17 @@ export default {
             )?.label;
           }
         },
+        {
+          prop: 'produceType',
+          align: 'center',
+          label: '生产类型',
+          showOverflowTooltip: true,
+          formatter: (row, column) => {
+            return produceTypeList.find(
+              (item) => item.value == row.produceType
+            )?.label;
+          }
+        },
         {
           prop: 'measureType',
           align: 'center',
@@ -446,6 +455,7 @@ export default {
           value: 4
         }
       ],
+
       newColumns: [],
       // 表格选中数据
       selection: [],
@@ -472,7 +482,7 @@ export default {
   methods: {
 
     onSortChange(e) {
-      console.log(e,'99999999');
+      console.log(e, '99999999');
 
       let sort = {
         orderBy: e.order,
@@ -483,14 +493,14 @@ export default {
     },
     getDictValueFn(e) {
       // console.log(e,'3333333333333');
-      if(e.length){
+      if (e.length) {
         let arr = [];
-        e.map(v=>{
+        e.map(v => {
           arr.push(this.findFn(v)?.label);
         })
 
         return arr.join(',');
-      }else{
+      } else {
         return '';
       }
       // let a =
@@ -498,8 +508,8 @@ export default {
       // return a?.label||''
     },
 
-    findFn(e){
-      return  this.sxtList.find((item) => item.value == Number(e))
+    findFn(e) {
+      return this.sxtList.find((item) => item.value == Number(e))
     },
 
     toBomManager(row) {
@@ -549,14 +559,14 @@ export default {
     },
     /* 表格数据源 */
     async datasource({ page, limit, where, order }) {
-      let labs= getMaterialList({
+      let labs = getMaterialList({
         pageNum: page,
         size: limit,
         ...this.sort,
         ...where,
         categoryLevelId: this.currentId
       });
-      let a= await labs;
+      let a = await labs;
 
       return labs;
     },
@@ -658,8 +668,8 @@ export default {
           this.rootTreeId == 9
             ? '请选择产品！'
             : this.rootTreeId == 4
-            ? '请选择设备！'
-            : ''
+              ? '请选择设备！'
+              : ''
         );
       }
 

src/views/technology/route/index.vue

@@ -72,7 +72,7 @@
     <!-- 历史版本弹框 -->
     <historyModal ref="historyRefs"></historyModal>
 
-    <UserDetail :visible.sync="detailEdit" :data="current" @close="detailEdit = false" ref="userEdit"></UserDetail>
+    <UserDetail :visible.sync="detailEdit" :data="current" @close="detailEdit = false" ref="UserDetailRef"></UserDetail>
 
   </div>
 </template>