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:
caoqianming 2021-12-22 10:37:30 +08:00
parent 72e5d89cac 3772a9b715
commit f1f92c0d9c
4 changed files with 392 additions and 271 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hb_client/src/api/wpm.js
View File

@ -298,11 +298,11 @@ export function testInit(data) {
} }
//不合格半成品报废 //不合格半成品报废
export function scrap(id) { export function scrap(id,data) {
return request({ return request({
url: `/wpm/wproduct/${id}/scrap/`, url: `/wpm/wproduct/${id}/scrap/`,
method: 'post', method: 'post',
data
}) })
} }

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

@ -43,6 +43,11 @@
@click="checkRecord(scope,'1')" @click="checkRecord(scope,'1')"
>检验记录 >检验记录
</el-link> </el-link>
<el-link
v-if="checkPermission(['warehouse_update'])"
@click="handleScrapbcp(scope)"
>报废
</el-link>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -53,6 +58,32 @@
:limit.sync="listQuery.page_size" :limit.sync="listQuery.page_size"
@pagination="getList" @pagination="getList"
/> />
<el-dialog title="半成品报废" :close-on-click-modal="false" :visible.sync="dialogFormVisiblebcp">
<el-form :model="formbcp">
<el-form-item label="甩片原因" :label-width="formLabelWidth">
<el-select
style="width: 80%"
v-model="formbcp.scrap_reason"
placeholder="请甩片原因"
>
<el-option
v-for="item in scrapreason"
:key="item.lable"
:label="item.lable"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisiblebcp = false">取 消</el-button>
<el-button type="primary" @click="scrapesubmit">确 定</el-button>
</div>
</el-dialog>
</el-card> </el-card>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="复检半成品"> <el-tab-pane label="复检半成品">
@ -491,6 +522,7 @@
data() { data() {
return { return {
testitem: defaultetestitem, testitem: defaultetestitem,
formbcp:{},
form: {remark: "", warehouse: ""}, form: {remark: "", warehouse: ""},
wproductList: { wproductList: {
count: 0, count: 0,
@ -556,6 +588,12 @@
label: "不合格", label: "不合格",
}, },
], ],
scrapreason: [
{ lable: "气泡", value: 10 },
{ lable: "破点", value: 20 },
{ lable: "划伤", value: 30 },
{ lable: "其他", value: 40 },
],
recordList: [], recordList: [],
options: [], options: [],
listLoading: true, listLoading: true,
@ -571,6 +609,7 @@
page: 0, page: 0,
}, },
recordVisible:false, recordVisible:false,
dialogFormVisiblebcp:false,
innerIndex:null, innerIndex:null,
origintest:null, origintest:null,
mutipID: [], mutipID: [],
@ -612,6 +651,25 @@
this.listLoading = false; this.listLoading = false;
}); });
}, },
//待检半成品报废
handleScrapbcp(scope){
this.dialogFormVisiblebcp=true;
this.bcpbf=scope.row.id;
},
//确定报废半成品
scrapesubmit(){
console.log(this.formbcp);
scrap(this.bcpbf,this.formbcp).then((response) => {
if (response.data) {
this.$message.success("该半成品已报废！");
this.dialogFormVisiblebcp=false;
this.getList();
}
});
},
//复检半成品列表 //复检半成品列表
getList2() { getList2() {
this.listQuery2.act_state = 6; this.listQuery2.act_state = 6;

20
hb_client/src/views/wpm/operation.vue
View File

@ -128,7 +128,7 @@ export default {
watch: {}, watch: {},
created() { created() {
this.id = this.$route.params.id; this.id = this.$route.params.id;
this. getProcessList() this.getProcessList()
}, },
methods: { methods: {
@ -147,19 +147,23 @@ handleoperation(scope)
}); });
}, },
getList(){
getoperationList(this.listQuery).then((response) => {
if (response.data) {
this.operationList = response.data;
}
});
},
//选项卡切换 //选项卡切换
handleClick(tab) { handleClick(tab) {
this.process = tab.name; this.process = tab.name;
this.listQuery.step__process = tab.name; this.listQuery.step__process = tab.name;
this.steps = []; this.getList();
getoperationList(this.listQuery).then((response) => {
if (response.data) {
this.operationList = response.data;
}
this.listLoading = false;
});
}, },
//操作记录删除 //操作记录删除
handleDelete(scope) { handleDelete(scope) {
this.$confirm("确认该操作删除?", "警告", { this.$confirm("确认该操作删除?", "警告", {

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

@ -18,20 +18,22 @@
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
> >
<el-table-column type="index" width="50" /> <el-table-column type="index" width="50" />
<el-table-column label="任务编号"> <el-table-column label="任务编号">
<template slot-scope="scope">{{ scope.row.number }}</template>
</el-table-column>
<el-table-column label="产品名称">
<template slot-scope="scope">{{ <template slot-scope="scope">{{
scope.row.number scope.row.product_.name
}}</template> }}</template>
</el-table-column> </el-table-column>
<el-table-column label="产品名称"> <el-table-column label="产品型号">
<template slot-scope="scope">{{ scope.row.product_.name }}</template> <template slot-scope="scope">{{
</el-table-column> scope.row.product_.specification
<el-table-column label="产品型号"> }}</template>
<template slot-scope="scope">{{ scope.row.product_.specification }}</template> </el-table-column>
</el-table-column> <el-table-column label="生产主产品" width="140">
<el-table-column label="生产主产品" width="140"> <template slot-scope="scope">{{
<template slot-scope="scope" >{{
scope.row.main_product_.name scope.row.main_product_.name
}}</template> }}</template>
</el-table-column> </el-table-column>
@ -66,10 +68,8 @@
</el-table-column> </el-table-column>
<el-table-column label="状态"> <el-table-column label="状态">
<template slot-scope="scope"> <template slot-scope="scope">
{{ state_[scope.row.state] }}</template
{{ >
state_[scope.row.state]
}}</template>
</el-table-column> </el-table-column>
<el-table-column label="领料状态" width="100"> <el-table-column label="领料状态" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
@ -77,12 +77,10 @@
<el-tag v-else>已领料</el-tag> <el-tag v-else>已领料</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="计划/生产/合格"> <el-table-column label="计划/生产/合格">
<template slot-scope="scope" <template slot-scope="scope"
>{{ >{{ scope.row.main_count }}/{{ scope.row.main_count_real }}/{{
scope.row.main_count
}}/{{ scope.row.main_count_real }}/{{
scope.row.main_count_ok scope.row.main_count_ok
}}</template }}</template
> >
@ -90,13 +88,19 @@
<el-table-column align="center" label="操作" width="130px"> <el-table-column align="center" label="操作" width="130px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-link type="success" v-if="scope.row.is_picked==false" @click="handleNeed(scope)" <el-link
type="success"
v-if="scope.row.is_picked == false"
@click="handleNeed(scope)"
>领料</el-link >领料</el-link
> >
<el-link type="success" v-if="scope.row.is_picked" @click="handleNeed(scope)" <el-link
type="success"
v-if="scope.row.is_picked"
@click="handleNeed(scope)"
>继续领料</el-link >继续领料</el-link
> >
<el-link type="primary" @click="handlepick(scope)" <el-link type="primary" @click="handlepick(scope)"
>领半成品</el-link >领半成品</el-link
> >
</template> </template>
@ -111,12 +115,11 @@
/> />
<el-row :gutter="2"> <el-row :gutter="2">
<el-col :span="12"> <el-col :span="12">
<el-card class="box-card"> <el-card class="box-card">
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<span>半成品</span> <span>半成品</span>
</div> </div>
<el-button <el-button
type="primary" type="primary"
style="margin-left: 2px" style="margin-left: 2px"
v-for="item in steps" v-for="item in steps"
@ -132,6 +135,14 @@
style="float: right" style="float: right"
>显示全部</el-button >显示全部</el-button
> >
<el-button
type="primary"
@click="handleScrapbcp()"
id="scrap"
style="float: right; display: none"
>报废</el-button
>
<el-table <el-table
:data="wproductData" :data="wproductData"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
@ -143,8 +154,10 @@
> >
<el-table-column type="selection" width="55"> </el-table-column> <el-table-column type="selection" width="55"> </el-table-column>
<el-table-column type="index" width="50" /> <el-table-column type="index" width="50" />
<el-table-column label="任务编号"> <el-table-column label="任务编号">
<template slot-scope="scope">{{ scope.row.subproduction_plan_.number}}</template> <template slot-scope="scope">{{
scope.row.subproduction_plan_.number
}}</template>
</el-table-column> </el-table-column>
<el-table-column label="玻璃编号"> <el-table-column label="玻璃编号">
@ -162,12 +175,11 @@
scope.row.step_.name scope.row.step_.name
}}</template> }}</template>
</el-table-column> </el-table-column>
<el-table-column label="进行状态"> <el-table-column label="进行状态">
<template slot-scope="scope">{{ <template slot-scope="scope">{{
actstate_[scope.row.act_state] actstate_[scope.row.act_state]
}}</template> }}</template>
</el-table-column> </el-table-column>
<el-table-column label="更新时间"> <el-table-column label="更新时间">
<template slot-scope="scope">{{ <template slot-scope="scope">{{
@ -175,7 +187,11 @@
}}</template> }}</template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-card> </el-card>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-card class="box-card"> <el-card class="box-card">
@ -191,7 +207,7 @@
max-height="300" max-height="300"
> >
<el-table-column type="index" width="50" /> <el-table-column type="index" width="50" />
<el-table-column label="任务编号"> <el-table-column label="任务编号">
<template slot-scope="scope">{{ <template slot-scope="scope">{{
scope.row.subproduction_plan_.number scope.row.subproduction_plan_.number
}}</template> }}</template>
@ -218,48 +234,74 @@
</el-row> </el-row>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<el-dialog title="领半成品" :close-on-click-modal="false" :visible.sync="dialogTableVisiblepick"> <el-dialog
<el-table :data="bcplist" style="width: 100%"> title="半成品报废"
:close-on-click-modal="false"
<el-table-column prop="material_.name" label="物料名称"> :visible.sync="dialogFormVisiblebcp"
</el-table-column> >
<el-table-column prop="material_.number" label="物料编号"> <el-form :model="formbcp">
</el-table-column> <el-form-item label="甩片原因" :label-width="formLabelWidth">
<el-table-column prop="material_.specification" label="物料规格"> <el-select
</el-table-column> style="width: 80%"
<el-table-column prop="material_.unit" label="物料单位"> v-model="formbcp.scrap_reason"
</el-table-column> placeholder="请选择仓库"
<el-table-column prop="count" label="所需物料数量"> >
</el-table-column> <el-option
<el-table-column prop="count_real" label="已领物料数量"> v-for="item in scrapreason"
</el-table-column> :key="item.lable"
<el-table-column prop="count_pick" label="实际产出/消耗"> :label="item.lable"
</el-table-column> :value="item.value"
<el-table-column >
align="center" </el-option>
label="操作" </el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisiblebcp = false">取 消</el-button>
<el-button type="primary" @click="scrapesubmit">确 定</el-button>
</div>
</el-dialog>
<el-dialog
title="领半成品"
:close-on-click-modal="false"
:visible.sync="dialogTableVisiblepick"
>
<el-table :data="bcplist" style="width: 100%">
<el-table-column prop="material_.name" label="物料名称">
</el-table-column>
<el-table-column prop="material_.number" label="物料编号">
</el-table-column>
<el-table-column prop="material_.specification" label="物料规格">
</el-table-column>
<el-table-column prop="material_.unit" label="物料单位">
</el-table-column>
<el-table-column prop="count" label="所需物料数量"> </el-table-column>
<el-table-column prop="count_real" label="已领物料数量">
</el-table-column>
<el-table-column prop="count_pick" label="实际产出/消耗">
</el-table-column>
<el-table-column align="center" label="操作">
<template slot-scope="scope">
<el-link
v-if="checkPermission(['material_update'])"
@click="handleReceive(scope)"
>领半成品</el-link
>
</template>
</el-table-column>
</el-table>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogTableVisiblepick = false">取 消</el-button>
<el-button type="primary" @click="bcpllSubmit">确 定</el-button>
</div>
</el-dialog>
> <el-dialog
<template slot-scope="scope"> title="半成品列表"
:close-on-click-modal="false"
<el-link :visible.sync="dialogTableVisiblepicks"
v-if="checkPermission(['material_update'])" >
@click="handleReceive(scope)" <el-table
>领半成品</el-link >
</template>
</el-table-column>
</el-table>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogTableVisiblepick = false">取 消</el-button>
<el-button type="primary" @click="bcpllSubmit">确 定</el-button>
</div>
</el-dialog>
<el-dialog title="半成品列表" :close-on-click-modal="false" :visible.sync="dialogTableVisiblepicks">
<el-table
:data="wproductslist" :data="wproductslist"
border border
fit fit
@ -268,42 +310,49 @@
max-height="300" max-height="300"
@selection-change="handleSelectionChangess" @selection-change="handleSelectionChangess"
> >
<el-table-column type="selection" width="55"> </el-table-column> <el-table-column type="selection" width="55"> </el-table-column>
<el-table-column type="index" width="50" /> <el-table-column type="index" width="50" />
<el-table-column label="玻璃编号"> <el-table-column label="玻璃编号">
<template slot-scope="scope">{{ scope.row.number }}</template> <template slot-scope="scope">{{ scope.row.number }}</template>
</el-table-column> </el-table-column>
<el-table-column label="玻璃状态">
<el-table-column label="玻璃状态">
<template slot-scope="scope">{{ scope.row.material_.name }}</template> <template slot-scope="scope">{{ scope.row.material_.name }}</template>
</el-table-column> </el-table-column>
<el-table-column label="所属子计划"> <el-table-column label="所属子计划">
<template slot-scope="scope">{{ scope.row.subproduction_plan }}</template> <template slot-scope="scope">{{
scope.row.subproduction_plan
}}</template>
</el-table-column> </el-table-column>
<el-table-column label="备注"> <el-table-column label="备注">
<template slot-scope="scope">{{ scope.row.remark }}</template> <template slot-scope="scope">{{ scope.row.remark }}</template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogTableVisiblepicks = false">取 消</el-button> <el-button @click="dialogTableVisiblepicks = false">取 消</el-button>
<el-button type="primary" @click="wproductSubmit">确 定</el-button> <el-button type="primary" @click="wproductSubmit">确 定</el-button>
</div> </div>
</el-dialog> </el-dialog>
<el-dialog
<el-dialog :visible.sync="dialogVisiblenw" :close-on-click-modal="false" width="80%" title="领料"> :visible.sync="dialogVisiblenw"
:close-on-click-modal="false"
width="80%"
title="领料"
>
<el-card class="box-card"> <el-card class="box-card">
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<span>生产所需领料表</span> <span>生产所需领料表</span>
</div> </div>
<template> <template>
<el-table :data="needwl" highlight-current-row height="300" style="width: 100%"> <el-table
:data="needwl"
highlight-current-row
height="300"
style="width: 100%"
>
<el-table-column prop="material_.name" label="物料名称"> <el-table-column prop="material_.name" label="物料名称">
</el-table-column> </el-table-column>
<el-table-column prop="material_.number" label="物料编号"> <el-table-column prop="material_.number" label="物料编号">
@ -330,17 +379,25 @@
> >
</div> </div>
<template> <template>
<el-table :data="havewl" highlight-current-row height="300" style="width: 100%" > <el-table
:data="havewl"
highlight-current-row
height="300"
style="width: 100%"
>
<el-table-column prop="batch" label="物料批次"> </el-table-column> <el-table-column prop="batch" label="物料批次"> </el-table-column>
<el-table-column prop="material_.name" label="物料名称"> <el-table-column prop="material_.name" label="物料名称">
</el-table-column> </el-table-column>
<el-table-column prop="warehouse_.name" label="物料所在仓库"> <el-table-column prop="warehouse_.name" 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 label="输入领料数量" width="140px" > <el-table-column label="输入领料数量" width="140px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-form :model="scope.row" v-if="scope.row.material_.type!=2" widht="100px"> <el-form
:model="scope.row"
v-if="scope.row.material_.type != 2"
widht="100px"
>
<el-form-item size="mini"> <el-form-item size="mini">
<el-input-number <el-input-number
v-model="scope.row.pick_count" v-model="scope.row.pick_count"
@ -359,23 +416,25 @@
</el-table-column> </el-table-column>
<el-table-column prop="material_.unit" label="物料单位"> <el-table-column prop="material_.unit" label="物料单位">
</el-table-column> </el-table-column>
<el-table-column align="center" label="操作" width="220px"> <el-table-column align="center" label="操作" width="220px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-link <el-link
v-if="scope.row.material_.type==2" v-if="scope.row.material_.type == 2"
@click="handlewproduct(scope)"
@click="handlewproduct(scope)" >选择半成品</el-link
>选择半成品</el-link >
> </template>
</template> </el-table-column>
</el-table-column>
</el-table> </el-table>
</template> </template>
</el-card> </el-card>
</el-dialog> </el-dialog>
<el-dialog title="半成品列表" :close-on-click-modal="false" :visible.sync="dialogTableVisible"> <el-dialog
<el-table title="半成品列表"
:close-on-click-modal="false"
:visible.sync="dialogTableVisible"
>
<el-table
:data="iproductData" :data="iproductData"
border border
fit fit
@ -384,7 +443,7 @@
max-height="600" max-height="600"
@selection-change="handleSelectionChanges" @selection-change="handleSelectionChanges"
> >
<el-table-column type="selection" width="55"> </el-table-column> <el-table-column type="selection" width="55"> </el-table-column>
<el-table-column type="index" width="50" /> <el-table-column type="index" width="50" />
<el-table-column label="玻璃编号"> <el-table-column label="玻璃编号">
<template slot-scope="scope">{{ scope.row.number }}</template> <template slot-scope="scope">{{ scope.row.number }}</template>
@ -393,21 +452,21 @@
<el-table-column label="半成品批次"> <el-table-column label="半成品批次">
<template slot-scope="scope">{{ scope.row.batch }}</template> <template slot-scope="scope">{{ scope.row.batch }}</template>
</el-table-column> </el-table-column>
<el-table-column label="玻璃状态"> <el-table-column label="玻璃状态">
<template slot-scope="scope">{{ scope.row.material_.name }}</template> <template slot-scope="scope">{{ scope.row.material_.name }}</template>
</el-table-column> </el-table-column>
<el-table-column label="所在仓库">
<template slot-scope="scope">{{ scope.row.warehouse_.name }}</template>
</el-table-column>
<el-table-column label="所在仓库">
<template slot-scope="scope">{{
scope.row.warehouse_.name
}}</template>
</el-table-column>
</el-table> </el-table>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogTableVisible = false">取 消</el-button> <el-button @click="dialogTableVisible = false">取 消</el-button>
<el-button type="primary" @click="iproductsSubmit">确 定</el-button> <el-button type="primary" @click="iproductsSubmit">确 定</el-button>
</div> </div>
</el-dialog> </el-dialog>
<el-dialog <el-dialog
:visible.sync="dialogVisiblework" :visible.sync="dialogVisiblework"
:close-on-click-modal="false" :close-on-click-modal="false"
@ -436,8 +495,7 @@
<span>消耗物料表</span> <span>消耗物料表</span>
<el-table :data="input" border style="width: 100%"> <el-table :data="input" border style="width: 100%">
<el-table-column
<el-table-column
prop="subproduction_plan" prop="subproduction_plan"
label="子计划编号" label="子计划编号"
width="180" width="180"
@ -480,7 +538,7 @@
<span>产出物料表</span> <span>产出物料表</span>
<el-table :data="output" border style="width: 100%"> <el-table :data="output" border style="width: 100%">
<el-table-column <el-table-column
prop="subproduction_plan" prop="subproduction_plan"
label="子计划编号" label="子计划编号"
width="180" width="180"
@ -651,6 +709,7 @@
<el-button type="primary" @click="submint()">确认</el-button> <el-button type="primary" @click="submint()">确认</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
@ -665,10 +724,10 @@ import {
getsubplanList, getsubplanList,
getpickhalfList, getpickhalfList,
createpickhalf, createpickhalf,
createOperation createOperation,
} from "@/api/wpm"; } from "@/api/wpm";
import { getiproductList } from "@/api/inm"; import { getiproductList } from "@/api/inm";
import { createWork } from "@/api/wpm"; import { scrap } from "@/api/wpm";
import Pagination from "@/components/Pagination"; // secondary package based on el-pagination import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
const defaulteneed = {}; const defaulteneed = {};
export default { export default {
@ -685,7 +744,7 @@ export default {
page: 1, page: 1,
page_size: 20, page_size: 20,
}, },
iproductData:"", iproductData: "",
remark: "", remark: "",
values: 0, values: 0,
active: 0, active: 0,
@ -694,7 +753,7 @@ export default {
needwl: "", needwl: "",
showPrise: false, showPrise: false,
showPrise1: false, showPrise1: false,
actstate_: { actstate_: {
6: "待复检", 6: "待复检",
10: "操作进行中", 10: "操作进行中",
20: "待检验", 20: "待检验",
@ -702,8 +761,8 @@ export default {
40: "库存中", 40: "库存中",
50: "不合格", 50: "不合格",
60: "待成品检验", 60: "待成品检验",
8:"操作准备中", 8: "操作准备中",
26:"待夹层检验", 26: "待夹层检验",
}, },
state_: { state_: {
0: "制定中", 0: "制定中",
@ -715,10 +774,10 @@ export default {
listLoading: true, listLoading: true,
listLoading: true, listLoading: true,
id: "", id: "",
dialogTableVisible:false, dialogTableVisible: false,
dialogVisible: false, dialogVisible: false,
dialogTableVisiblepick:false, dialogTableVisiblepick: false,
dialogTableVisiblepicks:false, dialogTableVisiblepicks: false,
dialogType: "new", dialogType: "new",
dialogVisiblework: false, dialogVisiblework: false,
dialogVisiblenw: false, dialogVisiblenw: false,
@ -748,9 +807,17 @@ export default {
from: [], from: [],
Operation: {}, Operation: {},
wproductdata: {}, wproductdata: {},
workData:{}, workData: {},
bcplist:"", bcplist: "",
wproductslist:"", wproductslist: "",
formbcp: {},
dialogFormVisiblebcp: false,
scrapreason: [
{ lable: "气泡", value: 10 },
{ lable: "破点", value: 20 },
{ lable: "划伤", value: 30 },
{ lable: "其他", value: 40 },
],
}; };
}, },
process: "", process: "",
@ -766,21 +833,22 @@ export default {
handleClick(tab) { handleClick(tab) {
this.process = tab.name; this.process = tab.name;
this.listQuery.process = tab.name; this.listQuery.process = tab.name;
if (tab.name == 1) {
document.getElementById("scrap").style.display = "block";
}
this.steps = []; this.steps = [];
getsubplanList(this.listQuery).then((response) => { getsubplanList(this.listQuery).then((response) => {
if (response.data) { if (response.data) {
this.subproductionplanList = response.data; this.subproductionplanList = response.data;
} }
}); });
//子工序列表 //子工序列表
getStepLists(tab.name).then((response) => { getStepLists(tab.name).then((response) => {
if (response.data) { if (response.data) {
this.steps = response.data; this.steps = response.data;
} }
}); });
//车间物料表 //车间物料表
this.getwmaterialLists(); this.getwmaterialLists();
@ -788,26 +856,43 @@ export default {
this.getwproductLists(); this.getwproductLists();
}, },
//车间物料 //车间物料
getwmaterialLists() getwmaterialLists() {
{ getwmaterialList({
getwmaterialList({
subproduction_plan__process: this.process, subproduction_plan__process: this.process,
page: 0, page: 0,
}).then((response) => { }).then((response) => {
if (response.data) { if (response.data) {
this.wmaterialList = response.data; this.wmaterialList = response.data;
} }
}); });
}, },
//待检半成品报废
handleScrapbcp() {
this.dialogFormVisiblebcp = true;
},
//确定报废半成品
scrapesubmit() {
console.log(this.formbcp);
scrap(this.wpID, this.formbcp).then((response) => {
if (response.code==200) {
this.$message.success("该半成品已报废！");
this.dialogFormVisiblebcp = false;
// 半成品表
this.getwproductLists();
}
});
},
//工序对应的子计划，弹出对应的车间物料 //工序对应的子计划，弹出对应的车间物料
handleCurrentChange(row) { handleCurrentChange(row) {
// this.steps = row.steps; //调出子工序 // this.steps = row.steps; //调出子工序
this.subproduction_plan = row.id; //子计划Id this.subproduction_plan = row.id; //子计划Id
this.getwproductLists(); this.getwproductLists();
getwmaterialList({ getwmaterialList({
subproduction_plan__process: this.process, subproduction_plan__process: this.process,
subproduction_plan: row.id, subproduction_plan: row.id,
@ -816,9 +901,7 @@ export default {
if (response.data) { if (response.data) {
this.wmaterialList = response.data; this.wmaterialList = response.data;
} }
}); });
}, },
//大工序工序渲染 //大工序工序渲染
getProcessList() { getProcessList() {
@ -826,7 +909,6 @@ export default {
if (response.data) { if (response.data) {
this.processOption = response.data; this.processOption = response.data;
} }
}); });
}, },
@ -839,16 +921,14 @@ export default {
if (response.data) { if (response.data) {
this.subproductionplanList = response.data; this.subproductionplanList = response.data;
} }
}); });
//车间物料表 //车间物料表
this.getwmaterialLists(); this.getwmaterialLists();
// 半成品表 // 半成品表
this.getwproductLists(); this.getwproductLists();
}, },
//大工序下子工序产出的半成品
//大工序下子工序产出的半成品
getwproductLists() { getwproductLists() {
this.wproductdata.page = 0; this.wproductdata.page = 0;
this.wproductdata.step__process = this.process; this.wproductdata.step__process = this.process;
@ -863,41 +943,37 @@ export default {
}); });
}, },
//调出该批次，该仓库的所有半成品 //调出该批次，该仓库的所有半成品
handlewproduct(scope){ handlewproduct(scope) {
this.dialogTableVisible = true;
this.dialogTableVisible = true; this.pcId = scope.row.id;
this.pcId=scope.row.id; getiproductList({
getiproductList({page:0,material:scope.row.material,warehouse:scope.row.warehouse,batch:scope.row.batch}).then((response) => { page: 0,
material: scope.row.material,
warehouse: scope.row.warehouse,
batch: scope.row.batch,
}).then((response) => {
if (response.data) { if (response.data) {
this.iproductData= response.data; this.iproductData = response.data;
} }
}); });
}, },
//勾选半成品 //勾选半成品
handleSelectionChanges(val){ handleSelectionChanges(val) {
this.iproducts= []; this.iproducts = [];
val.forEach((item) => { val.forEach((item) => {
this.iproducts.push(item.id); this.iproducts.push(item.id);
}); });
}, },
//提交半成品 //提交半成品
iproductsSubmit(){ iproductsSubmit() {
this.dialogTableVisible = false;
this.dialogTableVisible = false; this.havewl.forEach((item) => {
this.havewl.forEach((item) => { if (item.id == this.pcId) {
if(item.id== this.pcId) item.iproducts = this.iproducts;
{ }
item.iproducts=this.iproducts;
}
}); });
}, },
//领料 //领料
handleNeed(scope) { handleNeed(scope) {
this.need = Object.assign({}, defaulteneed); this.need = Object.assign({}, defaulteneed);
@ -914,106 +990,93 @@ export default {
//确认领料 //确认领料
handlePick() { handlePick() {
this.pickData.subproduction_plan = this.id; this.pickData.subproduction_plan = this.id;
this.pickData.picks = this.havewl;
this.pickData.picks = this.havewl;
createPick(this.pickData).then((res) => { createPick(this.pickData).then((res) => {
if (res.code >= 200) { if (res.code >= 200) {
this.dialogVisiblenw = false; this.dialogVisiblenw = false;
this.$message.success("领料成功！"); this.$message.success("领料成功！");
//车间物料表 //车间物料表
this.getwmaterialLists(); this.getwmaterialLists();
// 半成品表 // 半成品表
this.getwproductLists(); this.getwproductLists();
}
});
//半成品
getwproductList({page:0,step__process:this.process}).then((response) => {
if (response.data) {
this.wproductData = response.data;
console.log( this.wproductData)
} }
}); });
//半成品
getwproductList({ page: 0, step__process: this.process }).then(
(response) => {
if (response.data) {
this.wproductData = response.data;
console.log(this.wproductData);
}
}
);
}, },
//领半成品 //领半成品
handlepick(scope){ handlepick(scope) {
this.dialogTableVisiblepick = true;
this.dialogTableVisiblepick=true; this.spid = scope.row.id;
this.spid = scope.row.id; getpickhalfList(this.spid).then((res) => {
getpickhalfList(this.spid).then((res) => {
if (res.code >= 200) { if (res.code >= 200) {
this.bcplist = res.data; this.bcplist = res.data;
} }
}); });
}, },
//根据半成品ID+检测状态调取未入库半成品 //根据半成品ID+检测状态调取未入库半成品
handleReceive(scope){ handleReceive(scope) {
this.dialogTableVisiblepicks=true; this.dialogTableVisiblepicks = true;
this.bcpxlID=scope.row.id; this.bcpxlID = scope.row.id;
getwproductList({material:scope.row.material,act_state:30,page:0}).then((res) => { getwproductList({
material: scope.row.material,
act_state: 30,
page: 0,
}).then((res) => {
if (res.code >= 200) { if (res.code >= 200) {
this.wproductslist = res.data; this.wproductslist = res.data;
} }
}); });
}, },
handleSelectionChangess(val){ handleSelectionChangess(val) {
this.bcpproducts= []; this.bcpproducts = [];
val.forEach((item) => { val.forEach((item) => {
this.bcpproducts.push(item.id); this.bcpproducts.push(item.id);
}); });
}, },
wproductSubmit() wproductSubmit() {
{ this.dialogTableVisiblepicks = false;
this.dialogTableVisiblepicks = false;
this.bcplist.forEach((item) => {
if(item.id == this.bcpxlID)
{
item.iproducts=this.bcpproducts;
}
});
this.bcplist.forEach((item) => {
}, if (item.id == this.bcpxlID) {
item.iproducts = this.bcpproducts;
//提交领的半成品
bcpllSubmit()
{
this.bcplists=[];//新的半成品表
this.bcplist.forEach((item) => {
this.bcplists.push({
"id":item.id,
"wproducts": item.iproducts
});
});
console.log(this.bcplists);
createpickhalf(this.spid,this.bcplists).then((res) => {
if (res.code >= 200) {
this.$message.success("半成品领料成功！");
this.dialogTableVisiblepick=false;
//车间物料表
this.getwproductLists();
// 半成品表
this.getwproductLists();
} }
}); });
}, },
//提交领的半成品
bcpllSubmit() {
this.bcplists = []; //新的半成品表
this.bcplist.forEach((item) => {
this.bcplists.push({
id: item.id,
wproducts: item.iproducts,
});
});
console.log(this.bcplists);
createpickhalf(this.spid, this.bcplists).then((res) => {
if (res.code >= 200) {
this.$message.success("半成品领料成功！");
this.dialogTableVisiblepick = false;
//车间物料表
this.getwproductLists();
// 半成品表
this.getwproductLists();
}
});
},
prev() { prev() {
--this.values; --this.values;
if (this.values < 0) this.values = 0; if (this.values < 0) this.values = 0;
@ -1036,11 +1099,10 @@ wproductSubmit()
this.Operation.step = item.id; this.Operation.step = item.id;
this.Operation.wproducts = this.wpID; this.Operation.wproducts = this.wpID;
createOperation(this.Operation).then((res) => { createOperation(this.Operation).then((res) => {
if (res.code >= 200) { if (res.code >= 200) {
this.$message.success("操作记录创建成功！"); this.$message.success("操作记录创建成功！");
this.$router.push({name: "operation", params: { id: item.id }, }) this.$router.push({ name: "operation", params: { id: item.id } });
} }
}); });
}, },
@ -1063,19 +1125,17 @@ wproductSubmit()
record_data: _this.field1, record_data: _this.field1,
}); });
}); });
this.workData.step=this.step; this.workData.step = this.step;
this.workData.wproducts=this.wproducts; this.workData.wproducts = this.wproducts;
this.workData.input=this.input; this.workData.input = this.input;
this.workData.output=this.output; this.workData.output = this.output;
this.workData.forms=this.from; this.workData.forms = this.from;
this.workData.remark=this.remark; this.workData.remark = this.remark;
if (this.subproduction_plan != "") { if (this.subproduction_plan != "") {
this.wproductdata.subproduction_plan = this.subproduction_plan; this.wproductdata.subproduction_plan = this.subproduction_plan;
} }
console.log(this.remark); console.log(this.remark);
submitWork(this.workData).then((res) => { submitWork(this.workData).then((res) => {
if (res.code >= 200) { if (res.code >= 200) {
@ -1085,7 +1145,6 @@ wproductSubmit()
} }
}); });
}, },
}, },
}; };
</script> </script>