优化

src/views/sb/info/SbInfoC.vue

@@ -433,39 +433,29 @@ export default {
         }, */
 
         {
-          title: '设备名称',
+          title: '车间',
           checked: true,
-          width: 200,
-          dataIndex: 'name'
-        },
-        {
-          title: '设备位号',
-          dataIndex: 'positionNo',
-          width: 150,
-          scopedSlots: { customRender: 'positionNo' },
-          checked: true
-        },
-        {
-          title: '设备位置',
-          checked: true,
-          width: 200,
+          width: 100,
           dataIndex: 'positionName'
         },
+        // {
+        //   title: '位置',
+        //   dataIndex: 'cph',
+        //   width: 150,
+        //   checked: true
+        // },
         {
-          title: '父位号',
-          dataIndex: 'ppNo',
-          width: 120,
+          title: '设备编号',
+          dataIndex: 'no',
+          width: 100,
           checked: true
         },
 
         {
-          title: '设备类型',
+          title: '设备名称',
           checked: true,
-          dataIndex: 'type',
-          width: 150,
-          customRender: (text, record, index) => {
-            return record.typeName
-          }
+          dataIndex: 'name',
+          width: 100
         },
         /* {
           title: '设备等级',
@@ -477,15 +467,15 @@ export default {
           }
         }, */
         {
-          title: '规格型号',
+          title: '规格、型号',
           dataIndex: 'model',
           width: 150,
           checked: true
         },
         {
-          title: '设备编号',
-          dataIndex: 'no',
-          width: 150,
+          title: '厂牌',
+          dataIndex: 'producerId',
+          width: 100,
           checked: true
         },
         /* {
@@ -520,17 +510,14 @@ export default {
         {
           title: '出厂编号',
           dataIndex: 'zzh',
-          width: 120,
+          width: 100,
           checked: true
         },
         {
-          title: '是否强检',
-          dataIndex: 'checkType',
+          title: '管理编号',
+          dataIndex: 'positionNo',
           width: 120,
           checked: true,
-          customRender: (text, record, index) => {
-            return this.BaseTool.Object.getField(this.checkTypeMap, text)
-          }
         },
         /* {
           title: '是否显示',
@@ -598,9 +585,9 @@ export default {
           }
         }, */
         {
-          title: '检定有效期',
+          title: '有效期限',
           dataIndex: 'nextCheckDate',
-          width: 150,
+          width: 120,
           checked: true
         },
         /*  {
@@ -617,20 +604,26 @@ export default {
           }
         }, */
         {
-          title: '状态',
+          title: '检定单位',
           checked: true,
-          dataIndex: 'status',
+          dataIndex: 'dph',
+          width: 100
+        },
+        {
+          title: '是否强检',
+          dataIndex: 'checkType',
           width: 100,
-          scopedSlots: { customRender: 'status' }
+          checked: true,
+          customRender: (text, record, index) => {
+            return this.BaseTool.Object.getField(this.checkTypeMap, text)
+          }
+        },
+        {
+          title: '备注',
+          checked: true,
+          dataIndex: 'remark',
+          width: 100
         },
-        // {
-        //   title: '检定状态',
-        //   checked: true,
-        //   dataIndex: 'measureStatus',
-        //   fixed: 'right',
-        //   width: 100,
-        //   scopedSlots: { customRender: 'measureStatus' }
-        // },
         {
           title: '操作',
           key: 'action',