diff --git a/hb_client/src/icons/svg/attendance.svg b/hb_client/src/icons/svg/attendance.svg
new file mode 100644
index 0000000..63a946a
--- /dev/null
+++ b/hb_client/src/icons/svg/attendance.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/hb_client/src/icons/svg/calibrationRecord.svg b/hb_client/src/icons/svg/calibrationRecord.svg
new file mode 100644
index 0000000..c01021a
--- /dev/null
+++ b/hb_client/src/icons/svg/calibrationRecord.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/hb_client/src/icons/svg/check.svg b/hb_client/src/icons/svg/check.svg
new file mode 100644
index 0000000..b74de55
--- /dev/null
+++ b/hb_client/src/icons/svg/check.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/hb_client/src/icons/svg/contract.svg b/hb_client/src/icons/svg/contract.svg
new file mode 100644
index 0000000..befe23f
--- /dev/null
+++ b/hb_client/src/icons/svg/contract.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/hb_client/src/icons/svg/costStatistics.svg b/hb_client/src/icons/svg/costStatistics.svg
new file mode 100644
index 0000000..5882805
--- /dev/null
+++ b/hb_client/src/icons/svg/costStatistics.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/hb_client/src/icons/svg/customer.svg b/hb_client/src/icons/svg/customer.svg
new file mode 100644
index 0000000..c1bf19e
--- /dev/null
+++ b/hb_client/src/icons/svg/customer.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/hb_client/src/icons/svg/equipment.svg b/hb_client/src/icons/svg/equipment.svg
new file mode 100644
index 0000000..2bdce33
--- /dev/null
+++ b/hb_client/src/icons/svg/equipment.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/hb_client/src/icons/svg/execute.svg b/hb_client/src/icons/svg/execute.svg
new file mode 100644
index 0000000..27dbf42
--- /dev/null
+++ b/hb_client/src/icons/svg/execute.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/hb_client/src/icons/svg/fifo.svg b/hb_client/src/icons/svg/fifo.svg
new file mode 100644
index 0000000..34f0d69
--- /dev/null
+++ b/hb_client/src/icons/svg/fifo.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/hb_client/src/icons/svg/finishedCheck.svg b/hb_client/src/icons/svg/finishedCheck.svg
new file mode 100644
index 0000000..2d664e5
--- /dev/null
+++ b/hb_client/src/icons/svg/finishedCheck.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/hb_client/src/icons/svg/finishedProduct.svg b/hb_client/src/icons/svg/finishedProduct.svg
new file mode 100644
index 0000000..654767c
--- /dev/null
+++ b/hb_client/src/icons/svg/finishedProduct.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/hb_client/src/icons/svg/make.svg b/hb_client/src/icons/svg/make.svg
new file mode 100644
index 0000000..37c34e2
--- /dev/null
+++ b/hb_client/src/icons/svg/make.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/hb_client/src/icons/svg/material.svg b/hb_client/src/icons/svg/material.svg
new file mode 100644
index 0000000..e96700d
--- /dev/null
+++ b/hb_client/src/icons/svg/material.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/hb_client/src/icons/svg/materialStatistics.svg b/hb_client/src/icons/svg/materialStatistics.svg
new file mode 100644
index 0000000..e3d8477
--- /dev/null
+++ b/hb_client/src/icons/svg/materialStatistics.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/hb_client/src/icons/svg/materialbatch.svg b/hb_client/src/icons/svg/materialbatch.svg
new file mode 100644
index 0000000..2ff6380
--- /dev/null
+++ b/hb_client/src/icons/svg/materialbatch.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/hb_client/src/icons/svg/monitorEquipment.svg b/hb_client/src/icons/svg/monitorEquipment.svg
new file mode 100644
index 0000000..0197798
--- /dev/null
+++ b/hb_client/src/icons/svg/monitorEquipment.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/hb_client/src/icons/svg/order.svg b/hb_client/src/icons/svg/order.svg
new file mode 100644
index 0000000..69f2a1c
--- /dev/null
+++ b/hb_client/src/icons/svg/order.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/hb_client/src/icons/svg/personStatistics.svg b/hb_client/src/icons/svg/personStatistics.svg
new file mode 100644
index 0000000..a3bda3a
--- /dev/null
+++ b/hb_client/src/icons/svg/personStatistics.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/hb_client/src/icons/svg/procedure.svg b/hb_client/src/icons/svg/procedure.svg
new file mode 100644
index 0000000..46fa55d
--- /dev/null
+++ b/hb_client/src/icons/svg/procedure.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/hb_client/src/icons/svg/processTest.svg b/hb_client/src/icons/svg/processTest.svg
new file mode 100644
index 0000000..3ba6fd2
--- /dev/null
+++ b/hb_client/src/icons/svg/processTest.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/hb_client/src/icons/svg/produce.svg b/hb_client/src/icons/svg/produce.svg
new file mode 100644
index 0000000..be48c77
--- /dev/null
+++ b/hb_client/src/icons/svg/produce.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/hb_client/src/icons/svg/product.svg b/hb_client/src/icons/svg/product.svg
new file mode 100644
index 0000000..1b128a8
--- /dev/null
+++ b/hb_client/src/icons/svg/product.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/hb_client/src/icons/svg/productionEquipment.svg b/hb_client/src/icons/svg/productionEquipment.svg
new file mode 100644
index 0000000..5e68825
--- /dev/null
+++ b/hb_client/src/icons/svg/productionEquipment.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/hb_client/src/icons/svg/productionPlan.svg b/hb_client/src/icons/svg/productionPlan.svg
new file mode 100644
index 0000000..1216ede
--- /dev/null
+++ b/hb_client/src/icons/svg/productionPlan.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/hb_client/src/icons/svg/productionResources.svg b/hb_client/src/icons/svg/productionResources.svg
new file mode 100644
index 0000000..4a3460e
--- /dev/null
+++ b/hb_client/src/icons/svg/productionResources.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/hb_client/src/icons/svg/productionTask.svg b/hb_client/src/icons/svg/productionTask.svg
new file mode 100644
index 0000000..5bc04b7
--- /dev/null
+++ b/hb_client/src/icons/svg/productionTask.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/hb_client/src/icons/svg/progressStatistics.svg b/hb_client/src/icons/svg/progressStatistics.svg
new file mode 100644
index 0000000..a0f4f01
--- /dev/null
+++ b/hb_client/src/icons/svg/progressStatistics.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/hb_client/src/icons/svg/purchase.svg b/hb_client/src/icons/svg/purchase.svg
new file mode 100644
index 0000000..c9c6e0f
--- /dev/null
+++ b/hb_client/src/icons/svg/purchase.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/hb_client/src/icons/svg/purchaseOrder.svg b/hb_client/src/icons/svg/purchaseOrder.svg
new file mode 100644
index 0000000..35444e7
--- /dev/null
+++ b/hb_client/src/icons/svg/purchaseOrder.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/hb_client/src/icons/svg/sale.svg b/hb_client/src/icons/svg/sale.svg
new file mode 100644
index 0000000..468a2f6
--- /dev/null
+++ b/hb_client/src/icons/svg/sale.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/hb_client/src/icons/svg/saleInfo.svg b/hb_client/src/icons/svg/saleInfo.svg
new file mode 100644
index 0000000..a31e933
--- /dev/null
+++ b/hb_client/src/icons/svg/saleInfo.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/hb_client/src/icons/svg/statistics.svg b/hb_client/src/icons/svg/statistics.svg
new file mode 100644
index 0000000..36451d2
--- /dev/null
+++ b/hb_client/src/icons/svg/statistics.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/hb_client/src/icons/svg/stock.svg b/hb_client/src/icons/svg/stock.svg
new file mode 100644
index 0000000..cc9ce34
--- /dev/null
+++ b/hb_client/src/icons/svg/stock.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/hb_client/src/icons/svg/supplier.svg b/hb_client/src/icons/svg/supplier.svg
new file mode 100644
index 0000000..d948a57
--- /dev/null
+++ b/hb_client/src/icons/svg/supplier.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/hb_client/src/icons/svg/test.svg b/hb_client/src/icons/svg/test.svg
new file mode 100644
index 0000000..fd0e6d8
--- /dev/null
+++ b/hb_client/src/icons/svg/test.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/hb_client/src/icons/svg/testStatistics.svg b/hb_client/src/icons/svg/testStatistics.svg
new file mode 100644
index 0000000..1688ba3
--- /dev/null
+++ b/hb_client/src/icons/svg/testStatistics.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/hb_client/src/icons/svg/unqualified.svg b/hb_client/src/icons/svg/unqualified.svg
new file mode 100644
index 0000000..8601933
--- /dev/null
+++ b/hb_client/src/icons/svg/unqualified.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/hb_client/src/icons/svg/user.svg b/hb_client/src/icons/svg/user.svg
new file mode 100644
index 0000000..18b6145
--- /dev/null
+++ b/hb_client/src/icons/svg/user.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/hb_client/src/icons/svg/userList.svg b/hb_client/src/icons/svg/userList.svg
new file mode 100644
index 0000000..7380551
--- /dev/null
+++ b/hb_client/src/icons/svg/userList.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/hb_client/src/icons/svg/warehouse.svg b/hb_client/src/icons/svg/warehouse.svg
new file mode 100644
index 0000000..5e330d2
--- /dev/null
+++ b/hb_client/src/icons/svg/warehouse.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/hb_client/src/icons/svg/workshopOperation.svg b/hb_client/src/icons/svg/workshopOperation.svg
new file mode 100644
index 0000000..5c14318
--- /dev/null
+++ b/hb_client/src/icons/svg/workshopOperation.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/hb_client/src/icons/svg/workshopTask.svg b/hb_client/src/icons/svg/workshopTask.svg
new file mode 100644
index 0000000..1f03826
--- /dev/null
+++ b/hb_client/src/icons/svg/workshopTask.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/hb_client/src/icons/svg/wproduct.svg b/hb_client/src/icons/svg/wproduct.svg
new file mode 100644
index 0000000..6ebdb4c
--- /dev/null
+++ b/hb_client/src/icons/svg/wproduct.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/hb_client/src/router/index.js b/hb_client/src/router/index.js
index 551017d..6d08976 100644
--- a/hb_client/src/router/index.js
+++ b/hb_client/src/router/index.js
@@ -100,13 +100,13 @@ export const asyncRoutes = [
component: Layout,
redirect: '/mtm/material/',
name: 'mtm',
- meta: { title: '制造管理', icon: 'home', perms: ['mtm_manage'] },
+ meta: { title: '制造管理', icon: 'make', perms: ['mtm_manage'] },
children: [
{
path: 'material',
name: 'material',
component: () => import('@/views/mtm/material'),
- meta: { title: '物料清单', icon: 'home', perms: ['mtm_material'] }
+ meta: { title: '物料清单', icon: 'material', perms: ['mtm_material'] }
}
,
@@ -129,7 +129,7 @@ export const asyncRoutes = [
path: 'process',
name: 'process',
component: () => import('@/views/mtm/process'),
- meta: { title: '工序管理', icon: 'home', perms: ['mtm_process'] }
+ meta: { title: '工序管理', icon: 'procedure', perms: ['mtm_process'] }
},
{
path: 'step/:id',
@@ -150,7 +150,7 @@ export const asyncRoutes = [
path: '/mtm/productprocess/',
name: 'productprocess',
component: () => import('@/views/mtm/productprocess'),
- meta: { title: '产品管理', icon: 'home', perms: ['mtm_productprocess'] }
+ meta: { title: '产品管理', icon: 'product', perms: ['mtm_productprocess'] }
},
]
},
@@ -159,13 +159,13 @@ export const asyncRoutes = [
component: Layout,
redirect: '/pm/plan',
name: 'pm',
- meta: { title: '生产管理', icon: 'home', perms: ['pm_manage'] },
+ meta: { title: '生产管理', icon: 'produce', perms: ['pm_manage'] },
children: [
{
path: 'plan',
name: 'plan',
component: () => import('@/views/pm/plan'),
- meta: { title: '生产计划管理', icon: 'home', perms: ['index_manage'] }
+ meta: { title: '生产计划管理', icon: 'productionPlan', perms: ['index_manage'] }
}
,
{
@@ -179,14 +179,14 @@ export const asyncRoutes = [
path: 'resources',
name: 'resources',
component: () => import('@/views/pm/resources'),
- meta: { title: '生产资源配置', icon: 'home', perms: ['pm_resources'] }
+ meta: { title: '生产资源配置', icon: 'productionResources', perms: ['pm_resources'] }
}
,
{
path: 'management',
name: 'management',
component: () => import('@/views/pm/management'),
- meta: { title: '生产任务管理', icon: 'home', perms: ['pm_resources'] }
+ meta: { title: '生产任务管理', icon: 'productionTask', perms: ['pm_resources'] }
},
{
@@ -212,20 +212,20 @@ export const asyncRoutes = [
path: '/wpm',
component: Layout,
redirect: '/wpm/worktask',
- name: 'pm',
- meta: { title: '生产执行', icon: 'home', perms: ['equipment_set'] },
+ name: 'wpm',
+ meta: { title: '生产执行', icon: 'execute', perms: ['equipment_set'] },
children: [
{
path: 'worktask',
name: 'worktask',
component: () => import('@/views/wpm/worktask'),
- meta: { title: '车间任务', icon: 'home', perms: ['index_manage'] }
+ meta: { title: '车间任务', icon: 'workshopTask', perms: ['index_manage'] }
},
{
path: 'operation',
name: 'operation',
component: () => import('@/views/wpm/operation'),
- meta: { title: '车间操作', icon: 'home', perms: ['index_manage'] }
+ meta: { title: '车间操作', icon: 'workshopOperation', perms: ['index_manage'] }
}
,
{
@@ -239,14 +239,14 @@ export const asyncRoutes = [
path: 'need',
name: 'need',
component: () => import('@/views/wpm/need'),
- meta: { title: '过程检验', icon: 'home', perms: ['index_manage'] }
+ meta: { title: '过程检验', icon: 'processTest', perms: ['index_manage'] }
}
,
{
path: 'productjy',
name: 'productjy',
component: () => import('@/views/wpm/productjy'),
- meta: { title: '成品检验', icon: 'home', perms: ['index_manage'] }
+ meta: { title: '成品检验', icon: 'finishedCheck', perms: ['index_manage'] }
}
]
@@ -256,25 +256,25 @@ export const asyncRoutes = [
component: Layout,
redirect: '/em/equipment',
name: 'em',
- meta: { title: '设备管理', icon: 'home', perms: ['em_manage'] },
+ meta: { title: '设备管理', icon: 'equipment', perms: ['em_manage'] },
children: [
{
path: 'equipment',
name: 'equipment',
component: () => import('@/views/em/equipment'),
- meta: { title: '生产设备', icon: 'home', perms: ['em_equipment'] }
+ meta: { title: '生产设备', icon: 'productionEquipment', perms: ['em_equipment'] }
},
{
path: 'monitoring ',
name: 'monitoring ',
component: () => import('@/views/em/monitoring'),
- meta: { title: '监视和测量设备', icon: 'home', perms: ['em_monitoring'] }
+ meta: { title: '监视和测量设备', icon: 'monitorEquipment', perms: ['em_monitoring'] }
},
{
path: 'record',
name: 'record',
component: () => import('@/views/em/record'),
- meta: { title: '校准检定记录', icon: 'home', perms: ['em_record'] }
+ meta: { title: '校准检定记录', icon: 'calibrationRecord', perms: ['em_record'] }
}
]
},
@@ -283,19 +283,19 @@ export const asyncRoutes = [
component: Layout,
redirect: '/sam/customer',
name: 'sam',
- meta: { title: '销售管理', icon: 'home', perms: ['equipment_set'] },
+ meta: { title: '销售管理', icon: 'sale', perms: ['equipment_set'] },
children: [
{
path: 'customer',
name: 'customer',
component: () => import('@/views/sam/customer'),
- meta: { title: '客户管理', icon: 'home', perms: ['index_manage'] }
+ meta: { title: '客户管理', icon: 'customer', perms: ['index_manage'] }
},
{
path: 'contract',
name: 'contract',
component: () => import('@/views/sam/contract'),
- meta: { title: '合同管理', icon: 'home', perms: ['index_manage'] }
+ meta: { title: '合同管理', icon: 'contract', perms: ['index_manage'] }
}
,
{
@@ -311,7 +311,7 @@ export const asyncRoutes = [
path: 'order',
name: 'order',
component: () => import('@/views/sam/order'),
- meta: { title: '订单管理', icon: 'home', perms: ['index_manage'] }
+ meta: { title: '订单管理', icon: 'order', perms: ['index_manage'] }
}
,
@@ -326,7 +326,7 @@ export const asyncRoutes = [
path: 'sales',
name: 'sales',
component: () => import('@/views/sam/sales'),
- meta: { title: '销售信息', icon: 'home', perms: ['index_manage'] }
+ meta: { title: '销售信息', icon: 'saleInfo', perms: ['index_manage'] }
}
,
{
@@ -343,27 +343,27 @@ export const asyncRoutes = [
component: Layout,
redirect: '/qm/product',
name: 'qm',
- meta: { title: '检验管理', icon: 'home', perms: ['equipment_set'] },
+ meta: { title: '检验管理', icon: 'test', perms: ['equipment_set'] },
children: [
{
path: 'product',
name: 'product',
component: () => import('@/views/qm/product'),
- meta: { title: '军检', icon: 'home', perms: ['index_manage'] }
+ meta: { title: '军检', icon: 'check', perms: ['index_manage'] }
}
,
{
path: 'admissiontest',
name: 'admissiontest',
component: () => import('@/views/qm/admissiontest'),
- meta: { title: '入厂检验', icon: 'home', perms: ['index_manage'] }
+ meta: { title: '入厂检验', icon: 'check', perms: ['index_manage'] }
}
,
{
path: 'processtest',
name: 'processtest',
component: () => import('@/views/qm/processtest'),
- meta: { title: '过程检验', icon: 'home', perms: ['index_manage'] }
+ meta: { title: '过程检验', icon: 'processTest', perms: ['index_manage'] }
},
{
path: 'taskdetails/:id',
@@ -393,13 +393,13 @@ export const asyncRoutes = [
path: 'producttest',
name: 'producttest',
component: () => import('@/views/qm/producttest'),
- meta: { title: '成品检验', icon: 'home', perms: ['index_manage'] }
+ meta: { title: '成品检验', icon: 'finishedCheck', perms: ['index_manage'] }
},
{
path: 'unproduct',
name: 'unproduct',
component: () => import('@/views/qm/unproduct'),
- meta: { title: '不合格品', icon: 'home', perms: ['index_manage'] }
+ meta: { title: '不合格品', icon: 'unqualified', perms: ['index_manage'] }
}
]
@@ -409,19 +409,19 @@ export const asyncRoutes = [
component: Layout,
redirect: '/personnel/user',
name: 'personnel',
- meta: { title: '人员管理', icon: 'home', perms: ['personnel_set'] },
+ meta: { title: '人员管理', icon: 'user', perms: ['personnel_set'] },
children: [
{
path: 'user',
name: 'user',
component: () => import('@/views/personnel/user'),
- meta: { title: '人员列表', icon: 'home', perms: ['user_manage'] }
+ meta: { title: '人员列表', icon: 'userList', perms: ['user_manage'] }
},
{
path: 'attendance',
name: 'attendance',
component: () => import('@/views/personnel/attendance'),
- meta: { title: '考勤列表', icon: 'home', perms: ['attendance_manage'] }
+ meta: { title: '考勤列表', icon: 'attendance', perms: ['attendance_manage'] }
} ,{
path: 'userupdate/:id',
name: 'userupdate',
@@ -437,13 +437,13 @@ export const asyncRoutes = [
component: Layout,
redirect: '/inm/warehouse',
name: 'inm',
- meta: { title: '库存管理', icon: 'home', perms: ['equipment_set'] },
+ meta: { title: '库存管理', icon: 'stock', perms: ['equipment_set'] },
children: [
{
path: 'warehouse',
name: 'warehouse',
component: () => import('@/views/inm/warehouse'),
- meta: { title: '仓库', icon: 'home', perms: ['index_manage'] }
+ meta: { title: '仓库', icon: 'warehouse', perms: ['index_manage'] }
},
{
path: 'inventory/:id',
@@ -457,7 +457,7 @@ export const asyncRoutes = [
path: 'materialbatch',
name: 'materialbatch',
component: () => import('@/views/inm/materialbatch'),
- meta: { title: '物料批次', icon: 'home', perms: ['index_manage'] }
+ meta: { title: '物料批次', icon: 'materialbatch', perms: ['index_manage'] }
},
{
path: 'fifo',
@@ -476,13 +476,13 @@ export const asyncRoutes = [
path: 'wproduct',
name: 'wproduct',
component: () => import('@/views/inm/wproduct'),
- meta: { title: '半成品', icon: 'home', perms: ['index_manage'] }
+ meta: { title: '半成品库', icon: 'wproduct', perms: ['index_manage'] }
},
{
path: 'product',
name: 'product',
component: () => import('@/views/inm/product'),
- meta: { title: '成品', icon: 'home', perms: ['index_manage'] }
+ meta: { title: '成品库', icon: 'finishedProduct', perms: ['index_manage'] }
},
]
@@ -492,19 +492,19 @@ export const asyncRoutes = [
component: Layout,
redirect: '/procurement/vendor',
name: 'procurement',
- meta: { title: '采购管理', icon: 'home', perms: ['procurement_set'] },
+ meta: { title: '采购管理', icon: 'purchase', perms: ['procurement_set'] },
children: [
{
path: 'vendor',
name: 'vendor',
component: () => import('@/views/procurement/vendor'),
- meta: { title: '供应商', icon: 'home', perms: ['vendor_manage'] }
+ meta: { title: '供应商', icon: 'supplier', perms: ['vendor_manage'] }
},
{
path: 'puorder',
name: 'puorder',
component: () => import('@/views/procurement/puorder'),
- meta: { title: '采购订单', icon: 'home', perms: ['vendor_manage'] }
+ meta: { title: '采购订单', icon: 'purchaseOrder', perms: ['vendor_manage'] }
},
{
path: 'puorderitem/:id',
@@ -520,37 +520,37 @@ export const asyncRoutes = [
component: Layout,
redirect: '/statistics/progressStatistics',
name: 'statistics',
- meta: { title: '统计分析', icon: 'home', perms: ['workflow_manage'] },
+ meta: { title: '统计分析', icon: 'statistics', perms: ['workflow_manage'] },
children: [
{
path: 'progressStatistics',
name: 'progressStatistics',
component: () => import('@/views/statistics/progressStatistics'),
- meta: { title: '进度统计', icon: 'home', perms: ['workflow_index'] }
+ meta: { title: '进度统计', icon: 'progressStatistics', perms: ['workflow_index'] }
},
{
path: 'materialStatistics',
name: 'materialStatistics',
component: () => import('@/views/statistics/materialStatistics'),
- meta: { title: '物料统计', icon: 'home', perms: ['workflow_index'] }
+ meta: { title: '物料统计', icon: 'materialStatistics', perms: ['workflow_index'] }
},
{
path: 'personStatistics',
name: 'personStatistics',
component: () => import('@/views/statistics/personStatistics'),
- meta: { title: '人员统计', icon: 'home', perms: ['workflow_index'] }
+ meta: { title: '人员统计', icon: 'personStatistics', perms: ['workflow_index'] }
},
{
path: 'costStatistics',
name: 'costStatistics',
component: () => import('@/views/statistics/costStatistics'),
- meta: { title: '成本统计', icon: 'home', perms: ['workflow_index'] }
+ meta: { title: '成本统计', icon: 'costStatistics', perms: ['workflow_index'] }
},
{
path: 'testStatistics',
name: 'testStatistics',
component: () => import('@/views/statistics/testStatistics'),
- meta: { title: '检验统计', icon: 'home', perms: ['workflow_index'] }
+ meta: { title: '检验统计', icon: 'testStatistics', perms: ['workflow_index'] }
},
]
diff --git a/hb_client/src/views/qm/processtest.vue b/hb_client/src/views/qm/processtest.vue
index d87eccc..16376a5 100644
--- a/hb_client/src/views/qm/processtest.vue
+++ b/hb_client/src/views/qm/processtest.vue
@@ -16,9 +16,8 @@
{{ scope.row.number }}
- {{
- scope.row.product_.name
- }}
+
+ {{scope.row.product_.name }}
{{
@@ -236,10 +235,10 @@ export default {
//不合格玻璃审理单查看
handledetailbhg(scope)
{
-
- this.$router.push({name:"ticketDetail",params:{ticketId:scope.row.ticket}})
+
+ this.$router.push({name:"ticketDetail",params:{ticketId:scope.row.ticket,workflow:scope.row.workflow}})
}
-
+
},
};
diff --git a/hb_client/src/views/statistics/personStatistics.vue b/hb_client/src/views/statistics/personStatistics.vue
index ee6fefe..a608e05 100644
--- a/hb_client/src/views/statistics/personStatistics.vue
+++ b/hb_client/src/views/statistics/personStatistics.vue
@@ -1,13 +1,154 @@
-
+
+
+
+
+ 搜索
+
+ 重置
+
+
+
+
+
+ {{ scope.row.number }}
+
+
+ {{ scope.row.name }}
+
+
+
+
+
+
+
+
+ {{ scope.row.dept_.name }}
+
+
+
+
+
+
-
+
diff --git a/hb_client/src/views/workflow/ticketDetail.vue b/hb_client/src/views/workflow/ticketDetail.vue
index 3e55a11..0b5851d 100644
--- a/hb_client/src/views/workflow/ticketDetail.vue
+++ b/hb_client/src/views/workflow/ticketDetail.vue
@@ -180,20 +180,20 @@
that.ticketDetail.ticket_data_[i].field_choice = that.orgList;
}
}
- console.log(that.ticketDetail.state_.enable_retreat);
+ // console.log(that.ticketDetail.state_.enable_retreat);
let state = res.data.state;
let dat = that.flowSteps.filter((item) => {
return item.id == state;
})
- debugger;
+ // debugger;
let state_fields = dat[0].state_fields;
if (state_fields !== {}) {
for (let labe in state_fields) {
for (let j = 0; j < that.ticketDetail.ticket_data_.length; j++) {
if (that.ticketDetail.ticket_data_[j].field_key === labe) {
- debugger;
- console.log(labe)
- console.log(state_fields[labe])
+ // debugger;
+ // console.log(labe)
+ // console.log(state_fields[labe])
if (state_fields[labe] !== 4) {
that.ticketDetail.ticket_data_[j].is_hidden = false
} else {
@@ -423,7 +423,7 @@
obj.transition = id;
obj.ticket_data = this.ticketDetail.ticket_data;
obj.suggestion = this.ticketForm.suggestion;
- console.log(this.ticketForm);
+ // console.log(this.ticketForm);
ticketHandle(this.ticketId, obj).then(res => {
if (res.data) {
this.$store.dispatch("user/getCount", {})