diff --git a/hb_client/src/router/index.js b/hb_client/src/router/index.js index e1724b0..5a7774c 100644 --- a/hb_client/src/router/index.js +++ b/hb_client/src/router/index.js @@ -97,7 +97,7 @@ export const asyncRoutes = [ path: 'index', name: 'index', component: () => import('@/views/equipment/index'), - meta: { title: '设备台账', icon: 'example', perms: ['index_manage'] } + meta: { title: '运维记录', icon: 'example', perms: ['index_manage'] } } ] }, diff --git a/hb_client/src/views/equipment/index.vue b/hb_client/src/views/equipment/index.vue index 0943614..1826b5e 100644 --- a/hb_client/src/views/equipment/index.vue +++ b/hb_client/src/views/equipment/index.vue @@ -50,6 +50,9 @@ + + + @@ -66,6 +69,9 @@ + + + + + + + + + + @@ -127,6 +144,8 @@ + + @@ -220,6 +239,18 @@ export default { equipmentList: { count: 0, }, + type_: { + '1':'生产设备', + '2':'检验工具', + + }, + typeoptions: [{ + value: 1, + label: '生产设备' + }, { + value: 2, + label: '检验工具' + }], options: [{ value: 0, label: '运转正常' @@ -242,6 +273,7 @@ export default { rule1: { name: [{ required: true, message: "请输入", trigger: "blur" }], number: [{ required: true, message: "请输入", trigger: "blur" }], + type: [{ required: true, message: "请输入", trigger: "blur" }], model: [{ required: true, message: "请输入", trigger: "blur" }], state: [{ required: true, message: "请选择", trigger: "blur" }], belong_dept:[{ required: true, message: "请选择", trigger: "blur" }] @@ -270,7 +302,7 @@ export default { //组员列表 getUserList() { getUserList({pageoff:true}).then((res) => { - this.keeperOptions = genTree(res.data.results); + this.keeperOptions = genTree(res.data); }); }, //部门列表 diff --git a/hb_client/src/views/inm/warehouse.vue b/hb_client/src/views/inm/warehouse.vue index 9e9a3c3..eb6e1e9 100644 --- a/hb_client/src/views/inm/warehouse.vue +++ b/hb_client/src/views/inm/warehouse.vue @@ -52,7 +52,9 @@ - + + + - + + + - + - + { diff --git a/hb_client/src/views/mtm/process.vue b/hb_client/src/views/mtm/process.vue index 758d359..767628f 100644 --- a/hb_client/src/views/mtm/process.vue +++ b/hb_client/src/views/mtm/process.vue @@ -34,6 +34,9 @@ + + + {{ scope.row.field_choice }} - + + + - + + +