diff --git a/hb_client/src/router/index.js b/hb_client/src/router/index.js
index 6437898..1003fbd 100644
--- a/hb_client/src/router/index.js
+++ b/hb_client/src/router/index.js
@@ -168,12 +168,6 @@ export const asyncRoutes = [
name: 'resources',
component: () => import('@/views/pm/resources'),
meta: { title: '生产资源配置', icon: 'example', perms: ['pm_resources'] }
- },
- {
- path: 'testitem',
- name: 'testitem',
- component: () => import('@/views/pm/plan'),
- meta: { title: '生产作业管理', icon: 'example', perms: ['pm_testitem'] }
}
]
}
@@ -183,7 +177,7 @@ export const asyncRoutes = [
component: Layout,
redirect: '/wpm/worktask',
name: 'pm',
- meta: { title: '车间生产', icon: 'example', perms: ['equipment_set'] },
+ meta: { title: '生产执行', icon: 'example', perms: ['equipment_set'] },
children: [
{
path: 'worktask',
@@ -251,13 +245,7 @@ export const asyncRoutes = [
component: () => import('@/views/sam/contract'),
meta: { title: '合同信息', icon: 'example', perms: ['index_manage'] }
}
- ,
- {
- path: 'review',
- name: 'review',
- component: () => import('@/views/sam/review'),
- meta: { title: '合同评审', icon: 'example', perms: ['index_manage'] }
- }
+
,
{
path: 'order',
diff --git a/hb_client/src/views/inm/fifo.vue b/hb_client/src/views/inm/fifo.vue
index 711a5f9..cf7168c 100644
--- a/hb_client/src/views/inm/fifo.vue
+++ b/hb_client/src/views/inm/fifo.vue
@@ -28,7 +28,7 @@
新增物料新增出入库记录
-
+
{{
scope.row.operator_.username
}}
-
+
{{ scope.row.inout_date }}
-
+
{{ types_[scope.row.type] }}
@@ -96,7 +96,7 @@
生产分解
+">流程分解
新增
@@ -84,7 +84,7 @@
@current-change="handlespChange"
>
-
+
{{scope.row.name}}
@@ -120,7 +120,7 @@
{{ scope.row.order_.customer_.name }}
-
+
{{ scope.row.product_.number }}-{{ scope.row.product_.name }}
@@ -39,7 +39,7 @@
{{ scope.row.product_.unit }}
-
+
{{ scope.row.count }}
@@ -52,7 +52,7 @@
{{ scope.row.order_.delivery_date }}
-
+
否
是
diff --git a/hb_client/src/views/pm/work.vue b/hb_client/src/views/pm/work.vue
index 492a5d9..89daab4 100644
--- a/hb_client/src/views/pm/work.vue
+++ b/hb_client/src/views/pm/work.vue
@@ -17,7 +17,7 @@
-
+
{{ scope.row.subproduction_.name }}
@@ -30,7 +30,7 @@
{{ scope.row.process_.number }}
-
+
{{ state_[scope.row.state] }}
+
+
{{ scope.row.create_time }}
diff --git a/hb_client/src/views/sam/contract.vue b/hb_client/src/views/sam/contract.vue
index 6735fc4..e903deb 100644
--- a/hb_client/src/views/sam/contract.vue
+++ b/hb_client/src/views/sam/contract.vue
@@ -26,7 +26,7 @@
新增客户新增合同
diff --git a/hb_client/src/views/wpm/worktask.vue b/hb_client/src/views/wpm/worktask.vue
index e1880d4..be1df27 100644
--- a/hb_client/src/views/wpm/worktask.vue
+++ b/hb_client/src/views/wpm/worktask.vue
@@ -20,7 +20,7 @@
>
-
+
{{
scope.row.subproduction_.name
}}
@@ -43,7 +43,7 @@
}}
-
+
已领料
-
+
+ {{ scope.row.main_count_real }}/{{scope.row.main_count}}
+
{{ scope.row.create_time }}