- 入库
- 返修
+
+ 返工
报废
合批
-
+
@@ -180,7 +180,7 @@
:cate = "cate_type"
:process = "processId"
:mgroupId = "mgroupId"
- :deptId = "params.belong_dept"
+ :deptId = "deptId"
@success="handleinmSuccess"
>
@@ -261,7 +261,7 @@ export default {
stateOptions:[
{ value: 10, name: "合格"},
{ value: 20, name: "不合格"},
- { value: 30, name: "返修"},
+ { value: 30, name: "返工"},
],
queryWm: {
search: "",
@@ -345,7 +345,7 @@ export default {
})
}
},
- //添加返修/报废
+ //添加返工/报废
table_add(type) {
this.dialog.scrap = true;
this.type = type;
diff --git a/src/views/wpm_gx/inm_record_form.vue b/src/views/wpm_gx/inm_record_form.vue
index 68efd522..7a5eabe7 100644
--- a/src/views/wpm_gx/inm_record_form.vue
+++ b/src/views/wpm_gx/inm_record_form.vue
@@ -277,7 +277,7 @@ export default {
if(data==''||data==undefined||data==null){
return;
}
- data = data.replace(' ','');
+ // data = data.replace(' ','');
let id = data.split('#')[1];
this.$API.cm.labelmat.item.req(id).then((res) => {
console.log('res',res);
@@ -336,16 +336,29 @@ export default {
}
}
},
- selectBatchChange(item) {
- this.form.batch = item.batch;
- this.form.warehouse = item.warehouse;
- this.form.mb = item.id;
+ selectBatchChange(id) {
+ let that = this;
+ that.batchOptions.forEach((item) => {
+ if(item.id == id){
+ console.log('item',item);
+ this.form.batch = item.batch;
+ this.form.warehouse = item.warehouse;
+ this.form.mb = item.id;
+ that.form.count = Number(item.count);
+ }
+ })
},
//选择车间库存物料后的处理
- selectwmChange(item){
+ selectwmChange(id){
let that = this;
- that.form.batch = item.batch;
- that.form.wm = item.id;
+ that.wbatchOptions.forEach((item) => {
+ if(item.id == id){
+ console.log('item',item);
+ that.form.batch = item.batch;
+ that.form.wm = item.id;
+ that.form.count = Number(item.count);
+ }
+ })
},
selectBatchClear() {
this.form.batch = "";
diff --git a/src/views/wpm_gx/inmrecord.vue b/src/views/wpm_gx/inmrecord.vue
index 5e5543c1..863a865b 100644
--- a/src/views/wpm_gx/inmrecord.vue
+++ b/src/views/wpm_gx/inmrecord.vue
@@ -160,6 +160,7 @@
:process = "processId"
:mgroupId = "mgroupId"
:deptId = " deptId"
+ @closed = "handleinmSuccess"
@success="handleinmSuccess"
>
@@ -318,8 +319,7 @@ export default {
resetQuery() {
this.query = {};
},
- handleinmSuccess(){},
- handleSaveSuccess() {
+ handleinmSuccess(){
this.$refs.table.refresh();
},
},
diff --git a/src/views/wpm_gx/mlog_detail.vue b/src/views/wpm_gx/mlog_detail.vue
index f2030895..34fa421c 100644
--- a/src/views/wpm_gx/mlog_detail.vue
+++ b/src/views/wpm_gx/mlog_detail.vue
@@ -183,7 +183,7 @@
@@ -462,6 +465,10 @@ export default {
type: String,
default: "",
},
+ mgroupMtype:{
+ type: String,
+ default: "",
+ }
},
components: {
editDialog,
@@ -522,7 +529,7 @@ export default {
4: "已完成",
5: "已关闭",
},
- defectform:{},
+ defectinform:{},
fileList:[],
cellsList:[],
qct_defects:[],
@@ -548,6 +555,7 @@ export default {
},
],
},
+ is_fix:false,
wmId:'',
wmtype:'',
batchContains:'',
@@ -578,6 +586,7 @@ export default {
that.fileList = [{name:res.test_file,url:res.test_file}];
that.form.test_file = res.test_file;
}
+ that.is_fix = res.is_fix;
that.mgroup = res.mgroup;
that.paramsWm.mgroup = res.mgroup;
that.materialIn = res.material_in;
@@ -601,13 +610,13 @@ export default {
if(res.length>0){
that.$API.qm.qct.item.req(res[0].id).then((res) => {
res.qct_defects.forEach((item) => {
- that.defectform[item.defect_name] = 0;
+ that.defectinform[item.defect_name] = 0;
})
that.qct_defects=res.qct_defects;
console.log('that.saveInForm.mlogbdefect',that.saveInForm.mlogbdefect);
if(that.saveInForm.mlogbdefect&&that.saveInForm.mlogbdefect.length>0){
that.saveInForm.mlogbdefect.forEach((item) => {
- that.defectform[item.defect_name] = Number(item.count);
+ that.defectinform[item.defect_name] = Number(item.count);
})
}
})
@@ -620,7 +629,7 @@ export default {
that.saveInForm.count_pn_jgqbl = 0;
that.qct_defects.forEach(item => {
if(item.defect_okcate==30){
- that.saveInForm.count_pn_jgqbl += that.defectform[item.defect_name];
+ that.saveInForm.count_pn_jgqbl += that.defectinform[item.defect_name];
}
})
// that.countCellChanges();
@@ -643,15 +652,24 @@ export default {
table_add() {
this.dialog.save = true;
this.$nextTick(() => {
- this.$refs.saveDialog.open();
+ this.$refs.saveDialog.open('add');
});
},
//自检
table_in_edit(row) {
- this.saveInForm = row;
- this.getdefects();
- this.saveInDialog = true;
+ let that = this;
+ if(that.mlogItem.mgroup_name=='黑化'||that.mlogItem.mgroup_name=='退火'){
+ that.dialog.save = true;
+ that.$nextTick(() => {
+ that.$refs.saveDialog.open('edit',row);
+ });
+ }else{
+ that.saveInForm = row;
+ that.getdefects();
+ that.saveInDialog = true;
+ }
},
+
//提交自检
saveInSubmit() {
let that = this;
@@ -659,17 +677,17 @@ export default {
if (valid) {
that.isSaveing = true;
let obj = {};
- let count_pn_jgqbl = 0,mlogbdefect=[];
+ let count_pn_jgqbl = 0,mlogbindefect=[];
that.qct_defects.forEach(item => {
- count_pn_jgqbl += that.defectform[item.defect_name] ;
+ count_pn_jgqbl += that.defectinform[item.defect_name] ;
let obj = {};
obj.defect = item.defect;
- obj.count = that.defectform[item.defect_name];
+ obj.count = that.defectinform[item.defect_name];
obj.mlogb = that.saveInForm.id;
- mlogbdefect.push(obj);
+ mlogbindefect.push(obj);
})
obj.count_use = that.saveInForm.count_use;
- obj.mlogbdefect = mlogbdefect;
+ obj.mlogbindefect = mlogbindefect;
obj.count_pn_jgqbl = count_pn_jgqbl;
that.$API.wpm.mlogb.updateIn.req(that.saveInForm.id, obj).then((res) => {
that.isSaveing = false;
diff --git a/src/views/wpm_gx/mlog_form.vue b/src/views/wpm_gx/mlog_form.vue
index 87bbee85..37f187c9 100644
--- a/src/views/wpm_gx/mlog_form.vue
+++ b/src/views/wpm_gx/mlog_form.vue
@@ -56,7 +56,7 @@
-
+
+
@@ -196,24 +196,6 @@
-
-
+
-
+
+
+
+
+ {{ form.count_real }}
+
+
+
+
+
+
+
+ {{ count_json_wx.ok_num }}
+
+
+
+
+
+ {{ count_json_wx.notok_num }}
+
+
+
+ 合格数抽检
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 不合格全检
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
不良统计（最大不合格数：{{max_defect_rate}},超过0.5则整层不合格）
@@ -84,36 +187,40 @@
-
+
+
- 所在层数
- 本层总数
- 抽检数
- 不合格数
+ 所在层数
+ 本层总数
+ 抽检数
+ 不合格数
-
-
+
+
-
+
-
+
-
+
+
+ 删除
+
-
@@ -150,6 +259,12 @@