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

quanxian

This commit is contained in:
shijing 2022-06-14 16:45:50 +08:00
parent 6482ff4c25
commit 19bdcf5f89
3 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hb_client/src/views/pm/plan.vue
View File

@ -88,7 +88,7 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-link <el-link
v-if="checkPermission(['plan_toggle'])&&scope.row.state !== 70" v-if="checkPermission(['plan_toggle'])&&scope.row.state!==70&&scope.row.state!==80"
type="warning" type="warning"
@click="handlestatesuspended(scope)" @click="handlestatesuspended(scope)"
> >
@ -101,6 +101,7 @@
> >
启用 启用
</el-link> </el-link>
<!--暂停时才能终止-->
<el-link <el-link
v-if="checkPermission(['plan_stop'])&&scope.row.state === 70" v-if="checkPermission(['plan_stop'])&&scope.row.state === 70"
type="danger" type="danger"
@ -116,7 +117,7 @@
查看子计划 查看子计划
</el-link> </el-link>
<el-link <el-link
v-if="checkPermission(['plan_subcreate'])&&!scope.row.is_planed" v-if="checkPermission(['plan_subcreate'])&&!scope.row.is_planed&&scope.row.state!==70&&scope.row.state!==80"
type="primary" type="primary"
@click="handleWork(scope)" @click="handleWork(scope)"
> >

9
hb_client/src/views/pm/work.vue
View File

@ -69,14 +69,14 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-link <el-link
v-if="scope.row.state===10&&checkPermission['subplan_issue']" v-if="scope.row.state===10&&checkPermission(['subplan_issue'])&&scope.row.production_plan_.state!==70&&scope.row.production_plan_.state!==80"
type="primary" type="primary"
@click="handleclick(scope)" @click="handleclick(scope)"
> >
修改日期 修改日期
</el-link> </el-link>
<el-link <el-link
v-if="scope.row.state===10&&checkPermission['subplan_issue']" v-if="scope.row.state===10&&checkPermission(['subplan_issue'])&&scope.row.production_plan_.state!==70&&scope.row.production_plan_.state!==80"
type="primary" type="primary"
@click="handleissuedclick(scope)" @click="handleissuedclick(scope)"
> >
@ -244,7 +244,10 @@
20: '已下达', 20: '已下达',
30: '已接受', 30: '已接受',
40: '生产中', 40: '生产中',
50: '已完成' 50: '已完成',
60: "军检完成",
70: "暂停",
80: "终止",
} }
}; };
}, },

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

@ -67,6 +67,11 @@
{{ state_[scope.row.state] }} {{ state_[scope.row.state] }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="任务状态">
<template slot-scope="scope">
<span v-if="scope.row.production_plan_"> {{ state_[scope.row.production_plan_.state] }}</span>
</template>
</el-table-column>
<el-table-column label="领料状态" width="80"> <el-table-column label="领料状态" width="80">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.is_picked == false">未领料</el-tag> <el-tag v-if="scope.row.is_picked == false">未领料</el-tag>
@ -86,21 +91,21 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-link <el-link
v-if="checkPermission(['wmaterial_pick'])&&!scope.row.is_picked" v-if="checkPermission(['wmaterial_pick'])&&!scope.row.is_picked&&scope.row.production_plan_.state!==70&&scope.row.production_plan_.state!==80"
type="success" type="success"
@click="handleNeed(scope)" @click="handleNeed(scope)"
> >
领料 领料
</el-link> </el-link>
<el-link <el-link
v-if="checkPermission(['wmaterial_pick'])&&scope.row.is_picked" v-if="checkPermission(['wmaterial_pick'])&&scope.row.is_picked&&scope.row.production_plan_.state!==70&&scope.row.production_plan_.state!==80"
type="success" type="success"
@click="handleNeed(scope)" @click="handleNeed(scope)"
> >
继续领料 继续领料
</el-link> </el-link>
<el-link <el-link
v-if="checkPermission(['wmaterial_pick'])" v-if="checkPermission(['wmaterial_pick'])&&scope.row.production_plan_.state!==70&&scope.row.production_plan_.state!==80"
type="primary" type="primary"
@click="handlepick(scope)" @click="handlepick(scope)"
> >
@ -778,11 +783,14 @@
}, },
state_: { state_: {
0: "制定中", 10: "制定中",
1: "已下达", 20: "已下达",
2: "已接受", 30: "已接受",
3: "生产中", 40: "生产中",
4: "已完成", 50: "已完成",
60: "军检完成",
70: "暂停",
80: "终止",
}, },
listLoading: true, listLoading: true,
id: "", id: "",