Merge branch 'master' of http://106.12.13.113:3000/lanju/lanju-front

9 months ago · 0e2b72b5f4
parent 9adeb55c98 f3f49d6a6d
commit 0e2b72b5f4
2 changed files with 9 additions and 0 deletions
--- a/src/views/wms/equipment/index.vue
+++ b/src/views/wms/equipment/index.vue
@ -221,6 +221,13 @@
          />
        </template>
      </el-table-column>
+      <el-table-column
+        label="备注"
+        align="center"
+        prop="remark"
+        width="100"
+      >
+      </el-table-column>
      <el-table-column
        label="设备类型编码"
        align="center"
--- a/src/views/wms/equipment/itemEquipment.vue
+++ b/src/views/wms/equipment/itemEquipment.vue
@ -16,6 +16,7 @@
      <el-table-column
        label="设备编码"
        align="center"
+        width="120"
        prop="equipmentCode"
        fixed
      />
@ -27,6 +28,7 @@
      <el-table-column
        label="设备状态"
        align="center"
+        width="150"
        prop="equipmentStatus"
      >
        <template slot-scope="scope">