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

fix: worktask_form批次号限制及其他一些问题

This commit is contained in:
caoqianming 2023-12-21 00:58:25 +08:00
parent 4a8bae6c00
commit 4b822b7b52
3 changed files with 80 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/wpm/mlog_dept10.vue
View File

@ -257,7 +257,9 @@
</el-container> </el-container>
</el-main> </el-main>
<save-dialog v-if="dialogSave" ref="saveDialog" :mtask="currentMtask.id" :mgroup="mgroup" <save-dialog v-if="dialogSave" ref="saveDialog" :mtask="currentMtask.id" :mgroup="mgroup"
:material_out="material_out" :brothersList="brothersList" :activeType="activeName" @success="handleSaveSuccess" :material_out="material_out" :brothersList="brothersList"
:material_in="material_in"
:activeType="activeName" @success="handleSaveSuccess"
@closed="dialogSave = false"></save-dialog> @closed="dialogSave = false"></save-dialog>
<showDrawer ref="showDrawer" v-if="visibleDrawer" :mlogId="mlogId" @closed="visibleDrawer = false"> <showDrawer ref="showDrawer" v-if="visibleDrawer" :mlogId="mlogId" @closed="visibleDrawer = false">
</showDrawer> </showDrawer>

2
src/views/wpm/mlog_dept7.vue
View File

@ -256,7 +256,7 @@
</el-container> </el-container>
</el-main> </el-main>
<save-dialog v-if="dialogSave" ref="saveDialog" :mtask="currentMtask.id" :mgroup="mgroup" <save-dialog v-if="dialogSave" ref="saveDialog" :mtask="currentMtask.id" :mgroup="mgroup"
:material_out="material_out" :activeType="activeName" @success="handleSaveSuccess" :material_out="material_out" :material_in="material_in" :activeType="activeName" @success="handleSaveSuccess"
@closed="dialogSave = false"></save-dialog> @closed="dialogSave = false"></save-dialog>
<showDrawer ref="showDrawer" v-if="visibleDrawer" :mlogId="mlogId" @closed="visibleDrawer = false"> <showDrawer ref="showDrawer" v-if="visibleDrawer" :mlogId="mlogId" @closed="visibleDrawer = false">
</showDrawer> </showDrawer>

112
src/views/wpm/worktask_form.vue
View File

@ -35,21 +35,26 @@
</el-form-item> </el-form-item>
</el-col> --> </el-col> -->
<el-col :md="12" :sm="24"> <el-col :md="12" :sm="24">
<el-form-item label="生产路线" prop="material_out"> <el-form-item label="生产路线" v-if="mode == 'add'">
<el-select <el-select
v-model="form.material_out" v-model="currentRoute"
placeholder="生产路线" placeholder="生产路线"
clearable clearable
filterable
style="width: 100%" style="width: 100%"
@change="routeChange"
> >
<el-option <el-option
v-for="item in routeOptions" v-for="item in routeOptions"
:key="item.material_out" :key="item.id"
:label="item.label" :label="item.label"
:value="item.material_out" :value="item"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="生产路线" v-if="mode == 'edit'">
<span>{{ form.material_in_name}}->{{ form.material_out_name }}</span>
</el-form-item>
</el-col> </el-col>
<!-- <el-col :md="12" :sm="24"> <!-- <el-col :md="12" :sm="24">
<el-form-item label="班次" prop="material"> <el-form-item label="班次" prop="material">
@ -69,11 +74,11 @@
</el-form-item> </el-form-item>
</el-col> --> </el-col> -->
<el-col :md="12" :sm="24"> <el-col :md="12" :sm="24">
<el-form-item label="物料批次" width="100"> <el-form-item label="批次号" width="100">
<el-input <el-input
v-model="form.batch" v-model="form.batch"
tyle="width:100%" tyle="width:100%"
placeholder="请输入批次" placeholder="批次号"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -165,21 +170,25 @@
</el-form-item> </el-form-item>
</el-col> --> </el-col> -->
<el-col :md="12" :sm="24"> <el-col :md="12" :sm="24">
<el-form-item label="生产路线" prop="material_out"> <el-form-item label="生产路线" v-if="mode == 'add'">
<el-select <el-select
v-model="form.material_out" v-model="currentRoute"
placeholder="生产路线" placeholder="生产路线"
clearable filterable
style="width: 100%" style="width: 100%"
@change="routeChange"
> >
<el-option <el-option
v-for="item in routeOptions" v-for="item in routeOptions"
:key="item.id" :key="item.id"
:label="item.label" :label="item.label"
:value="item.id" :value="item"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="生产路线" v-if="mode == 'edit'">
<span>{{ form.material_in_name}}->{{ form.material_out_name }}</span>
</el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24"> <el-col :md="12" :sm="24">
<el-form-item label="合格数"> <el-form-item label="合格数">
@ -208,11 +217,13 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24"> <el-col :md="12" :sm="24">
<el-form-item label="物料批次" prop="material_in"> <el-form-item label="批次号" prop="material_in">
<el-select <el-select
v-model="form.batch" v-model="form.batch"
placeholder="物料批次" placeholder="批次号"
filterable
clearable clearable
allow-create
style="width: 100%" style="width: 100%"
> >
<el-option <el-option
@ -457,7 +468,21 @@
</el-col> </el-col>
<el-col :md="12" :sm="24"> <el-col :md="12" :sm="24">
<el-form-item label="批次号"> <el-form-item label="批次号">
<el-input v-model="form.batch" placeholder="批次号"></el-input> <el-select
v-model="form.batch"
placeholder="批次号"
clearable
filterable
allow-create
style="width: 100%"
>
<el-option
v-for="item in wMaterialOptions"
:key="item.batch"
:label="item.batch"
:value="item.batch"
></el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :md="12" :sm="24"> <!-- <el-col :md="12" :sm="24">
@ -481,7 +506,7 @@
<el-form-item label="炉号"> <el-form-item label="炉号">
<el-select <el-select
v-model="form.equipment" v-model="form.equipment"
placeholder="锅号" placeholder="炉号"
clearable clearable
style="width: 100%" style="width: 100%"
> >
@ -849,10 +874,21 @@
</el-col> </el-col>
<el-col :md="12" :sm="24"> <el-col :md="12" :sm="24">
<el-form-item label="批次号"> <el-form-item label="批次号">
<el-input <el-select
v-model="form.batch" v-model="form.batch"
placeholder="请输入请输入批次号" placeholder="批次号"
></el-input> clearable
filterable
allow-create
style="width: 100%"
>
<el-option
v-for="item in wMaterialOptions"
:key="item.batch"
:label="item.batch"
:value="item.batch"
></el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -860,7 +896,7 @@
<div v-if="brothersList.length > 0"> <div v-if="brothersList.length > 0">
<el-row v-for="item in mlogb" :key="item"> <el-row v-for="item in mlogb" :key="item">
<el-col :md="12" :sm="24"> <el-col :md="12" :sm="24">
<el-form-item label="产品名称" prop="material"> <el-form-item label="生产任务">
<el-select <el-select
v-model="item.material_out" v-model="item.material_out"
placeholder="产品名称" placeholder="产品名称"
@ -1041,6 +1077,7 @@ export default {
}, },
data() { data() {
return { return {
currentRoute: "",
yseorno: ["是", "否"], yseorno: ["是", "否"],
loading: false, loading: false,
mode: "add", mode: "add",
@ -1092,19 +1129,22 @@ export default {
console.log('brothersList') console.log('brothersList')
console.log(this.brothersList) console.log(this.brothersList)
this.getMaterial(); this.getMaterial();
this.getMgroupList(); // this.getMgroupList();
this.getUserList(); this.getUserList();
this.getEquipment(); this.getEquipment();
this.getShiftOptions(); this.getShiftOptions();
this.getRouteOptions(); this.getRouteOptions();
this.getWorkShopMaterial();
let date = new Date(); let date = new Date();
let year = date.getFullYear(); let year = date.getFullYear();
let month = date.getMonth() + 1; let month = date.getMonth() + 1;
let day = date.getDate(); let day = date.getDate();
this.form.material_out = this.material_out; this.form.material_out = this.material_out;
this.form.material_in = this.material_in;
this.form.mtask = this.mtask;
this.form.mgroup = this.mgroup; this.form.mgroup = this.mgroup;
this.form.handle_date = year + "-" + month + "-" + day; this.form.handle_date = year + "-" + month + "-" + day;
this.getWorkShopMaterial();
if (this.activeType == "10车间") { if (this.activeType == "10车间") {
let mlogb = []; let mlogb = [];
this.brothersList.forEach((item) => { this.brothersList.forEach((item) => {
@ -1122,6 +1162,12 @@ export default {
} }
}, },
methods: { methods: {
routeChange(item) {
this.form.material = item.material_out
this.form.material_in = item.material_in
this.form.mgroup = item.mgroup
this.getWorkShopMaterial();
},
getRouteOptions() { getRouteOptions() {
let mgroup__name = ''; let mgroup__name = '';
if(this.activeType=='8车间'){ if(this.activeType=='8车间'){
@ -1147,13 +1193,13 @@ export default {
this.shiftOptions = []; this.shiftOptions = [];
if(this.activeType == "10车间"){ if(this.activeType == "10车间"){
res.forEach(item=>{ res.forEach(item=>{
if(item.rule=='两倒'){ if(item.rule=='三倒'){
this.shiftOptions.push(item); this.shiftOptions.push(item);
} }
}) })
}else{ }else{
res.forEach(item=>{ res.forEach(item=>{
if(item.rule=='默认'){ if(item.rule=='长白班'){
this.form.shift = item.id; this.form.shift = item.id;
} }
}) })
@ -1174,15 +1220,6 @@ export default {
that.userList = res; that.userList = res;
}); });
}, },
//获取车间物料批次号
getBatchs() {
let that = this;
this.$API.wpm.wmaterial.batchs
.req({ belong_dept_name: "6车间" })
.then((res) => {
that.batchOptions = res;
});
},
//获取集合列表 //获取集合列表
getMgroupList() { getMgroupList() {
let that = this; let that = this;
@ -1237,11 +1274,14 @@ export default {
// }, // },
getWorkShopMaterial() { getWorkShopMaterial() {
let that = this; let that = this;
this.$API.wpm.wmaterial.list if(this.form.material_in){
.req({ belong_dept__name: "8车间", page: 0 }) this.$API.wpm.wmaterial.list
.then((res) => { .req({ material: this.form.material_in, page: 0, count__gte: 1 })
that.wMaterialOptions = res; .then((res) => {
}); that.wMaterialOptions = res;
});
}
}, },
//显示 //显示
open(mode = "add") { open(mode = "add") {