diff --git a/hb_client/src/api/pm.js b/hb_client/src/api/pm.js index 6fb9dc8..e25b788 100644 --- a/hb_client/src/api/pm.js +++ b/hb_client/src/api/pm.js @@ -55,3 +55,20 @@ export function updatesubproductionplan(id, data) { data }) } +//子计划详情 + +export function getProgress(id) { + return request({ + url: `/pm/subproduction_plan/${id}/progress/`, + method: 'get' + }) +} + +//子计划下达 +export function issuesubplan(id) { + return request({ + url: `/pm/subproduction_plan/${id}/issue/`, + method: 'post', + + }) +} \ No newline at end of file diff --git a/hb_client/src/router/index.js b/hb_client/src/router/index.js index 001d272..e7da4f0 100644 --- a/hb_client/src/router/index.js +++ b/hb_client/src/router/index.js @@ -166,6 +166,28 @@ export const asyncRoutes = [ meta: { title: '生产作业管理', icon: 'example', perms: ['pm_testitem'] } } ] + } + , + { + path: '/wpm', + component: Layout, + redirect: '/wpm/worktask', + name: 'pm', + meta: { title: '车间生产', icon: 'example', perms: ['equipment_set'] }, + children: [ + { + path: 'worktask', + name: 'worktask', + component: () => import('@/views/wpm/worktask'), + meta: { title: '车间任务', icon: 'example', perms: ['index_manage'] } + }, + { + path: 'testitem', + name: 'testitem', + component: () => import('@/views/wpm/testitem'), + meta: { title: '检测项目', icon: 'example', perms: ['index_manage'] } + } + ] }, { path: '/em', diff --git a/hb_client/src/views/mtm/material.vue b/hb_client/src/views/mtm/material.vue index 7ad836a..0fb5b3e 100644 --- a/hb_client/src/views/mtm/material.vue +++ b/hb_client/src/views/mtm/material.vue @@ -44,10 +44,31 @@ > - + - diff --git a/hb_client/src/views/mtm/materialdo.vue b/hb_client/src/views/mtm/materialdo.vue index 85efa25..880f687 100644 --- a/hb_client/src/views/mtm/materialdo.vue +++ b/hb_client/src/views/mtm/materialdo.vue @@ -158,23 +158,39 @@ v-el-height-adaptive-table="{bottomOffset: 50}" > - - + + + + + - - - + - - - + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + @@ -266,7 +312,7 @@ }; const defaultfield = { - + }; export default { components: { Pagination,vueJsonEditor }, @@ -278,6 +324,7 @@ upUrl: upUrl(), fileList:[], listLoading: true, + need_judge:false, dialogVisibles: false, dialogVisibleForm: false, dialogTypes: "new", @@ -317,6 +364,20 @@ page: 1, page_size: 20, }, + highoptions:[{ value: 1, + label: '<'},{ value: 2, + label: '<='}], + lowoptions:[{ value: 1, + label: '>'},{ value: 2, + label: '>='}], + highoptionss_:{ + 1: '<', + 2: '<=' + }, + lowoptionss_:{ + 1: '>', + 2: '>=' + }, options_: { 'string':'文本', 'int':'整数', diff --git a/hb_client/src/views/mtm/productprocess.vue b/hb_client/src/views/mtm/productprocess.vue index 71f5e65..686b7d6 100644 --- a/hb_client/src/views/mtm/productprocess.vue +++ b/hb_client/src/views/mtm/productprocess.vue @@ -283,6 +283,12 @@ + + + @@ -315,7 +321,7 @@ @@ -334,6 +340,10 @@ + + + + @@ -51,6 +51,7 @@ + diff --git a/hb_client/src/views/wpm/worktask.vue b/hb_client/src/views/wpm/worktask.vue new file mode 100644 index 0000000..08a5463 --- /dev/null +++ b/hb_client/src/views/wpm/worktask.vue @@ -0,0 +1,107 @@ + + \ No newline at end of file