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

PPT修改

This commit is contained in:
shijing 2022-03-30 14:44:41 +08:00
parent bca780a781
commit 8c75eeff09
5 changed files with 45 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hb_client/.env.production
View File

@ -2,6 +2,7 @@
ENV = 'production'
# base api
VUE_APP_BASE_API = 'http://192.168.1.250/api'
#VUE_APP_BASE_API = 'http://192.168.1.250/api'
VUE_APP_BASE_API = 'http://49.232.14.174:2222/api'
#VUE_APP_BASE_API = 'http://127.0.0.1:8000/api'

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

@ -261,9 +261,8 @@ export const asyncRoutes = [
path: 'firstCheck',
name: 'firstCheck',
component: () => import('@/views/wpm/firstCheck'),
meta: { title: '首件确认', icon: 'finishedCheck', perms: ['wpm_firstCheck'] ,noCache: true}
meta: { title: '首件确认', icon: 'finishedCheck', perms: ['wpm_firstCheck']}
}
]
},
{

8
hb_client/src/views/wpm/need.vue
View File

@ -266,10 +266,10 @@
<template slot-scope="scope">{{ scope.row.step_.name }}</template>
</el-table-column>
<el-table-column label="检验员">
<!--<template slot-scope="scope">
<template slot-scope="scope">
<span v-if="scope.row.update_by_!==null">{{scope.row.update_by_.username}}</span>
<span v-else>{{scope.row.create_by_.username}}</span>
</template>-->
</template>
</el-table-column>
<el-table-column align="center" label="操作" width="220px">
<template slot-scope="scope">
@ -362,10 +362,10 @@
<template slot-scope="scope">{{ scope.row.subproduction_plan_.number }}</template>
</el-table-column>
<el-table-column label="检验员">
<!--<template slot-scope="scope">
<template slot-scope="scope">
<span v-if="scope.row.update_by_!==null">{{scope.row.update_by_.username}}</span>
<span v-else>{{scope.row.create_by_.username}}</span>
</template>-->
</template>
</el-table-column>
<el-table-column align="center" label="操作" width="220px">
<template slot-scope="scope">

6
hb_client/src/views/wpm/productjy.vue
View File

@ -91,6 +91,12 @@
{{ actstate_[scope.row.act_state] }}
</template>
</el-table-column>
<el-table-column label="检验员">
<template slot-scope="scope">
<span v-if="scope.row.update_by_!==null">{{scope.row.update_by_.username}}</span>
<span v-else>{{scope.row.create_by_.username}}</span>
</template>
</el-table-column>
<el-table-column label="指派订单">
<template slot-scope="scope" v-if="scope.row.order_">
{{scope.row.order_.number }}

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

@ -134,10 +134,10 @@
{{ item.name }}
</el-button>
<el-button
v-if="checkPermission(['wmaterial_scrap'])"
v-show="checkPermission(['wp_scrap'])&&activeName==1"
id="scrap"
type="primary"
style="float: right; display: none"
style="float: right;"
@click="handleScrapbcp()"
>
报废
@ -841,29 +841,25 @@
//选项卡切换
handleClick(tab) {
this.process = tab.name;
this.listQuery.process = tab.name;
if (tab.name == 1) {
document.getElementById("scrap").style.display = "block";
}
this.steps = [];
getsubplanList(this.listQuery).then((response) => {
let that = this;
that.process = tab.name;
that.listQuery.process = tab.name;
that.steps = [];
getsubplanList(that.listQuery).then((response) => {
if (response.data) {
this.subproductionplanList = response.data;
that.subproductionplanList = response.data;
}
});
//子工序列表
getStepLists(tab.name).then((response) => {
if (response.data) {
this.steps = response.data;
that.steps = response.data;
}
});
//车间物料表
this.getwmaterialLists();
that.getwmaterialLists();
// 半成品表
this.getwproductLists();
that.getwproductLists();
},
//车间物料
@ -900,7 +896,6 @@
//工序对应的子计划，弹出对应的车间物料
handleCurrentChange(row) {
// this.steps = row.steps; //调出子工序
this.subproduction_plan = row.id; //子计划Id
this.getwproductLists();
getwmaterialList({
@ -915,9 +910,29 @@
},
//大工序工序渲染
getProcessList() {
let that = this;
getProcessList({page: 0}).then((response) => {
if (response.data) {
this.processOption = response.data;
that.processOption = response.data;
that.activeName = response.data[0].id;
that.process = response.data[0].id;
that.listQuery.process = response.data[0].id;
that.steps = [];
getsubplanList(that.listQuery).then((response) => {
if (response.data) {
that.subproductionplanList = response.data;
}
});
//子工序列表
getStepLists(response.data[0].id).then((response) => {
if (response.data) {
that.steps = response.data;
}
});
//车间物料表
that.getwmaterialLists();
// 半成品表
that.getwproductLists();
}
});
},
@ -1013,9 +1028,7 @@
createPick(this.pickData).then((res) => {
if (res.code >= 200) {
this.dialogVisiblenw = false;
this.$message.success("领料成功！");
this.listQuery.process = this.process;
getsubplanList(this.listQuery).then((response) => {