zcdsj
/
hberp
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop

This commit is contained in:
shijing 2021-12-23 16:59:18 +08:00
parent 8825054574 baef10ec19
commit 2e73713bae
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hb_client/src/router/index.js
View File

@ -345,13 +345,29 @@ export const asyncRoutes = [
name: 'product', name: 'product',
component: () => import('@/views/qm/product'), component: () => import('@/views/qm/product'),
meta: { title: '军检', icon: 'example', perms: ['index_manage'] } meta: { title: '军检', icon: 'example', perms: ['index_manage'] }
}, }
,
{ {
path: 'testitem', path: 'testitem',
name: 'testitem', name: 'testitem',
component: () => import('@/views/qm/testitem'), component: () => import('@/views/qm/testitem'),
meta: { title: '检测项目', icon: 'example', perms: ['index_manage'] } meta: { title: '入场检验', icon: 'example', perms: ['index_manage'] }
} }
,
{
path: 'testitem',
name: 'testitem',
component: () => import('@/views/qm/testitem'),
meta: { title: '过程检验', icon: 'example', perms: ['index_manage'] }
}
,
{
path: 'testitem',
name: 'testitem',
component: () => import('@/views/qm/testitem'),
meta: { title: '成品检验', icon: 'example', perms: ['index_manage'] }
}
] ]
}, },
{ {

10
hb_client/src/views/wpm/worktask.vue
View File

@ -244,7 +244,7 @@
<el-select <el-select
style="width: 80%" style="width: 80%"
v-model="formbcp.scrap_reason" v-model="formbcp.scrap_reason"
placeholder="请选择仓库" placeholder="请甩片原因"
> >
<el-option <el-option
v-for="item in scrapreason" v-for="item in scrapreason"
@ -276,9 +276,9 @@
<el-table-column prop="material_.unit" label="物料单位"> <el-table-column prop="material_.unit" label="物料单位">
</el-table-column> </el-table-column>
<el-table-column prop="count" label="所需物料数量"> </el-table-column> <el-table-column prop="count" label="所需物料数量"> </el-table-column>
<el-table-column prop="count_real" label="已领物料数量"> <el-table-column prop="count_pick" label="已领物料数量">
</el-table-column> </el-table-column>
<el-table-column prop="count_pick" label="实际产出/消耗"> <el-table-column prop="count_real" label="实际产出/消耗">
</el-table-column> </el-table-column>
<el-table-column align="center" label="操作"> <el-table-column align="center" label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
@ -363,7 +363,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="count" label="所需物料数量"> <el-table-column prop="count" label="所需物料数量">
</el-table-column> </el-table-column>
<el-table-column prop="count_real" label="已领物料数量"> <el-table-column prop="count_pick" label="已领物料数量">
</el-table-column> </el-table-column>
</el-table> </el-table>
</template> </template>
@ -410,7 +410,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="count_real" label="已领物料数量"> <el-table-column prop="count_pick" label="已领物料数量">
</el-table-column> </el-table-column>
<el-table-column prop="material_.specification" label="物料规格"> <el-table-column prop="material_.specification" label="物料规格">
</el-table-column> </el-table-column>