Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend into dev

src/views/material/materialBOM/components/view-dialog.vue

@@ -33,6 +33,11 @@
             {{ formData.categoryName }}
           </el-form-item>
         </el-col>
+        <el-col :span="8">
+          <el-form-item label="版本号" prop="categoryName">
+            {{ formData.version }}
+          </el-form-item>
+        </el-col>
         <el-col :span="8">
           <el-form-item label="分类层级" prop="categoryType">
             {{ formData.categoryType }}
@@ -106,7 +111,7 @@
           },
           {
             label: '物料编码',
-            prop: 'categoryId'
+            prop: 'categoryCode'
           },
           {
             label: '牌号',

src/views/material/materialBOM/index.vue

@@ -70,6 +70,10 @@
             label: '产品名称',
             showOverflowTooltip: true
           },
+          {
+            prop: 'version',
+            label: '版本'
+          },
           {
             prop: 'status ',
             label: '状态',