fix:表格优化
This commit is contained in:
parent
aff4bcc201
commit
84562cfb37
|
|
@ -204,7 +204,7 @@
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col v-for="item2 in defectlists" :key="item2.id" :span="12">
|
<el-col v-for="item2 in defectlists" :key="item2.id" :span="12">
|
||||||
<el-form-item :label="item2.defect_name">
|
<el-form-item :label="item2.defect_name">
|
||||||
<el-switch v-model="item2.value"></el-switch>
|
<el-switch v-model="item2.value" @change="defect_change(item2)"></el-switch>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col>
|
<el-col>
|
||||||
|
|
@ -216,11 +216,13 @@
|
||||||
</el-row>
|
</el-row>
|
||||||
</el-form>
|
</el-form>
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-table :data="selectWpr" border>
|
<el-table :data="selectWprList" border>
|
||||||
<el-table-column type="index"></el-table-column>
|
<el-table-column type="index"></el-table-column>
|
||||||
<el-table-column prop="number" label="物料编号"></el-table-column>
|
<el-table-column prop="number" label="物料编号"></el-table-column>
|
||||||
<el-table-column v-for="item2 in defectlists" :key="item2.id" :label="item2.defect_name">
|
<el-table-column v-for="item2 in defectlists" :key="item2.id" :label="item2.defect_name">
|
||||||
<el-switch v-model="item2.value" disabled></el-switch>
|
<template #default="scope">
|
||||||
|
<el-switch v-model="scope.row[item2.defect_name]" disabled></el-switch>
|
||||||
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="操作" width="90" align="center" fixed="right">
|
<el-table-column label="操作" width="90" align="center" fixed="right">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
|
|
@ -231,7 +233,7 @@
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-footer>
|
<el-footer>
|
||||||
<el-button type="primary" :loading="isSaveing" @click.stop="saveSetting" save>保存</el-button>
|
<el-button type="primary" :loading="isSaveing" @click.stop="saveSetting" save>保存</el-button>
|
||||||
<el-button @click="saveCancel">取消</el-button>
|
<el-button @click="saveSettingCancel">取消</el-button>
|
||||||
</el-footer>
|
</el-footer>
|
||||||
</el-main>
|
</el-main>
|
||||||
</el-container>
|
</el-container>
|
||||||
|
|
@ -366,7 +368,6 @@ export default {
|
||||||
selectWprList:[],
|
selectWprList:[],
|
||||||
selectedindexes:[],
|
selectedindexes:[],
|
||||||
qct_defects_origin:[],
|
qct_defects_origin:[],
|
||||||
selectWpr:[],
|
|
||||||
tableHeight:500,
|
tableHeight:500,
|
||||||
apiObjPrint:this.$API.cm.labelmat.fromWm,
|
apiObjPrint:this.$API.cm.labelmat.fromWm,
|
||||||
printer_name:localStorage.getItem("printer_name")
|
printer_name:localStorage.getItem("printer_name")
|
||||||
|
|
@ -488,15 +489,6 @@ export default {
|
||||||
that.options = res;
|
that.options = res;
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
optionChange(row){
|
|
||||||
let that = this;
|
|
||||||
that.options.forEach((item) => {
|
|
||||||
if(item.id == row.wpr){
|
|
||||||
let index = that.mlogbwlist.indexOf(row);
|
|
||||||
that.mlogbwlist[index].number = item.number;
|
|
||||||
}
|
|
||||||
})
|
|
||||||
},
|
|
||||||
getList(){
|
getList(){
|
||||||
let that = this;
|
let that = this;
|
||||||
let params = {};
|
let params = {};
|
||||||
|
|
@ -766,7 +758,7 @@ export default {
|
||||||
that.qct_defects.forEach(item => {
|
that.qct_defects.forEach(item => {
|
||||||
if(that.form.defectids.indexOf(item.defect) > -1){
|
if(that.form.defectids.indexOf(item.defect) > -1){
|
||||||
item.canEdit = true;
|
item.canEdit = true;
|
||||||
item.value=null;
|
item.value=false;
|
||||||
that.defectlists.push(item);
|
that.defectlists.push(item);
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
@ -783,7 +775,7 @@ export default {
|
||||||
if(that.checkAll){
|
if(that.checkAll){
|
||||||
that.qct_defects.forEach(item => {
|
that.qct_defects.forEach(item => {
|
||||||
item.canEdit = true;
|
item.canEdit = true;
|
||||||
item.value=null;
|
item.value=false;
|
||||||
that.defectlists.push(item);
|
that.defectlists.push(item);
|
||||||
that.form.defectids.push(item.defect);
|
that.form.defectids.push(item.defect);
|
||||||
})
|
})
|
||||||
|
|
@ -823,7 +815,6 @@ export default {
|
||||||
that.qct_testitems = [];
|
that.qct_testitems = [];
|
||||||
that.qct_testitems = that.testitemlists;
|
that.qct_testitems = that.testitemlists;
|
||||||
that.tableHeight = document.getElementById('mlogbwMain').clientHeight-80;
|
that.tableHeight = document.getElementById('mlogbwMain').clientHeight-80;
|
||||||
// that.getList();
|
|
||||||
}).catch(() => {
|
}).catch(() => {
|
||||||
that.isSaveing = false;
|
that.isSaveing = false;
|
||||||
})
|
})
|
||||||
|
|
@ -838,13 +829,11 @@ export default {
|
||||||
this.form.defectids = [];
|
this.form.defectids = [];
|
||||||
this.checkVisible = false;
|
this.checkVisible = false;
|
||||||
},
|
},
|
||||||
|
//批量操作
|
||||||
check_set(){
|
check_set(){
|
||||||
this.wprNumber = "";
|
let that = this;
|
||||||
this.selectWpr = [];
|
that.wprNumber = "";
|
||||||
if(this.selectWprList.length>0){
|
that.setVisible=true;
|
||||||
this.selectWpr = this.selectWprList;
|
|
||||||
}
|
|
||||||
this.setVisible=true;
|
|
||||||
},
|
},
|
||||||
//扫描物料将这一行放到第一行并编辑这一行
|
//扫描物料将这一行放到第一行并编辑这一行
|
||||||
wprinputChange(){
|
wprinputChange(){
|
||||||
|
|
@ -912,24 +901,30 @@ export default {
|
||||||
let that = this;
|
let that = this;
|
||||||
that.mlogbwlist.forEach(item => {
|
that.mlogbwlist.forEach(item => {
|
||||||
if(item.number == wprNumber){
|
if(item.number == wprNumber){
|
||||||
that.selectWpr.push(item);
|
that.selectWprList.push(item);
|
||||||
that.wprNumber = "";
|
that.wprNumber = "";
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
selectWprDel(row){
|
selectWprDel(row){
|
||||||
let that = this;
|
let that = this;
|
||||||
that.selectWpr.forEach((item,index) => {
|
that.selectWprList.forEach((item,index) => {
|
||||||
if(item.number == row.number){
|
if(item.number == row.number){
|
||||||
that.selectWpr.splice(index,1);
|
that.selectWprList.splice(index,1);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
defect_change(item){
|
||||||
|
let that = this;
|
||||||
|
that.selectWprList.forEach(row => {
|
||||||
|
row[item.defect_name] = item.value;
|
||||||
|
});
|
||||||
|
},
|
||||||
saveSetting(){
|
saveSetting(){
|
||||||
let that = this;
|
let that = this;
|
||||||
that.$refs.dialogForm.validate((valid) => {
|
that.$refs.dialogForm.validate((valid) => {
|
||||||
if (valid) {
|
if (valid) {
|
||||||
that.selectWpr.forEach(item => {
|
that.selectWprList.forEach(item => {
|
||||||
if(!item.ftest){
|
if(!item.ftest){
|
||||||
item.ftest = {};
|
item.ftest = {};
|
||||||
}
|
}
|
||||||
|
|
@ -938,12 +933,12 @@ export default {
|
||||||
that.defectlists.forEach((item1) => {
|
that.defectlists.forEach((item1) => {
|
||||||
let obj = {};
|
let obj = {};
|
||||||
obj.defect = item1.defect;
|
obj.defect = item1.defect;
|
||||||
obj.has = item1.value;
|
obj.has = item[item1.defect_name]?item[item1.defect_name]:false;
|
||||||
item.ftest.ftestdefects.push(obj);
|
item.ftest.ftestdefects.push(obj);
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
that.$API.wpm.mlogbw.update.req("bulk",that.selectWpr).then((res) => {
|
that.$API.wpm.mlogbw.update.req("bulk",that.selectWprList).then((res) => {
|
||||||
that.setVisible = false;
|
that.setVisible = false;
|
||||||
that.selectedAll = false;
|
that.selectedAll = false;
|
||||||
that.selectWprList = [];
|
that.selectWprList = [];
|
||||||
|
|
@ -958,6 +953,16 @@ export default {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
saveSettingCancel(){
|
||||||
|
let that = this;
|
||||||
|
that.setVisible = false;
|
||||||
|
that.selectedAll = false;
|
||||||
|
that.selectWprList = [];
|
||||||
|
that.selectedindexes = [];
|
||||||
|
// that.defectlists.forEach(item => {
|
||||||
|
// item.value = false;
|
||||||
|
// });
|
||||||
|
},
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue