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

fix:chengpinjianyan

This commit is contained in:
shijing 2024-08-13 13:51:17 +08:00
parent a5759b48b3
commit 404b2b71cb
4 changed files with 39 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/views/qm/products_form.vue
View File

@ -89,6 +89,7 @@
</el-form-item>
</el-col>
</el-row>
<el-divider style="margin-top:0"></el-divider>
<el-row v-if="mode=='sizeAdd'||mode=='sizeEdit'">
<el-col :md="12" :sm="24">
<el-form-item label="黑圈内径">
@ -335,6 +336,7 @@ export default {
},
loading: false,
form: {
type2:20,
test_date: "",
batch: "",
count: null,
@ -389,13 +391,14 @@ export default {
};
},
mounted() {
this.getMaterialBatch();
},
methods: {
//显示
open(mode = "sizeAdd") {
this.mode = mode;
this.visible = true;
this.getMaterialBatch();
return this;
},
handleCheckChange(){
@ -445,10 +448,12 @@ export default {
//获取物料批次
getMaterialBatch() {
let that = this;
let obj = {page: 0, count__gte: 0};
if(that.mode == "sizeAdd"||that.mode == "sizeEdit"){
let obj = {page: 0, count__gte: 0, count_xtest__gte: 0};
if(that.mode == "sizeAdd"||that.mode == "sizeEdit"||that.mode == "sizeShow"){
console.log('sizeAdd')
obj.material__process__name = '一次超洗'
}else{
}else {
console.log('facadeAdd')
obj.material__process__name = '二次超洗'
}
that.$API.wpm.wmaterial.list
@ -462,7 +467,7 @@ export default {
console.log(val);
that.options.forEach((item) => {
if (item.id == val) {
that.form.count = that.formCount = item.count;
that.form.count =that.form.count_ok = that.formCount = item.count;
that.form.batch = item.batch;
that.form.material = item.material;
that.form.wm = item.id;

12
src/views/wpm_gx/handover.vue
View File

@ -183,6 +183,7 @@
v-if="dialog.save"
ref="saveDialog"
:type="type"
:mgroupName="mgroupName"
:mgroupId="mgroupId"
@success="handleSaveSuccess"
@closed="dialog.save = false"
@ -221,8 +222,7 @@ export default {
permission: false,
},
params: {
mgroup: "",
count_xtest__gte: 0,
// count_xtest__gte: 0,
},
query: {
send_mgroup: "",
@ -249,12 +249,12 @@ export default {
mounted() {
let that = this;
if(that.mgroupName=="size"){
that.params.type=30;
that.params.send_mgroup__name="一次超洗";
// that.params.type=30;
that.params.material__process__name="一次超洗";
that.apiObj = that.$API.wpm.handover.list;
}else if(that.mgroupName=="facade"){
that.params.type=30;
that.params.send_mgroup__name="二次超洗";
// that.params.type=30;
that.params.material__process__name="二次超洗";
that.apiObj = that.$API.wpm.handover.list;
}else{
that.printer_name = localStorage.getItem("printer_name");

23
src/views/wpm_gx/handover_form.vue
View File

@ -161,6 +161,10 @@ export default {
type: String,
default: "",
},
mgroupName: {
type: String,
default: "",
},
},
data() {
return {
@ -281,13 +285,20 @@ export default {
mgroupx: that.mgroupId,
page: 0,
};
if (this.type == 10) {
req.notok_sign__isnull = 1;
} else if (this.type == 20) {
req.notok_sign__isnull = 0;}
else if (this.type == 30) {
req.notok_sign__isnull = 1;
if(that.mgroupName=="size"){
req.material__process__name="一次超洗";
}else if(that.mgroupName=="facade"){
req.material__process__name="二次超洗";
}else{
if (this.type == 10) {
req.notok_sign__isnull = 1;
} else if (this.type == 20) {
req.notok_sign__isnull = 0;}
else if (this.type == 30) {
req.notok_sign__isnull = 1;
}
}
this.$API.wpm.wmaterial.list
.req(req)
.then((res) => {

12
src/views/wpm_gx/inm.vue
View File

@ -85,24 +85,24 @@
prop="create_time"
width="150"
></el-table-column>
<!-- <el-table-column
<el-table-column
label="操作"
fixed="right"
align="center"
width="180"
width="80"
v-if="mgroupName!=='size'&&mgroupName!=='facade'"
>
<template #default="scope">
<el-button
link
size="small"
@click="table_edit(scope.row)"
@click="table_Check(scope.row)"
v-auth="'mgroup.update'"
type="primary"
>编辑</el-button
>抽检</el-button
>
<el-divider direction="vertical"></el-divider>
</template>
</el-table-column> -->
</el-table-column>
</scTable>
</el-main>
<el-dialog title="选择物料" v-model="materialsVisible" width="90%">