fix:玻纤分批和检验表判断问题

This commit is contained in:
shijing 2025-10-22 14:09:04 +08:00
parent 29f986b5e0
commit d43c63e085
2 changed files with 33 additions and 13 deletions

View File

@ -33,9 +33,9 @@
<span style="margin: 0 0 0 20px;">选择物料:</span> <span style="margin: 0 0 0 20px;">选择物料:</span>
<el-input ref="codeInput" <el-input ref="codeInput"
placeholder="扫描交接物料" placeholder="扫描交接物料"
v-model="wm_in" clearable v-model="listItem.wm_in" clearable
style="width: 120px;margin: 0 10px;" style="width: 120px;margin: 0 10px;"
@change="formWminChange($index,wm_in)" @change="formWminChange($index,listItem.wm_in)"
></el-input> ></el-input>
<el-select <el-select
v-model="listItem.wpr" v-model="listItem.wpr"
@ -177,6 +177,7 @@ export default {
obj.batch = that.batchOrign.batch+"-"+that.addBactchNum; obj.batch = that.batchOrign.batch+"-"+that.addBactchNum;
that.addBactchNum++; that.addBactchNum++;
obj.count = 0; obj.count = 0;
obj.wm_in = "";
obj.handoverbw=[]; obj.handoverbw=[];
that.form.handoverb.push(obj); that.form.handoverb.push(obj);
}) })
@ -208,23 +209,40 @@ export default {
}, },
formWminChange(index,number){ formWminChange(index,number){
let that = this; let that = this;
//handoverbdisabled // console.log('number',number.split(" "));
that.wprOptions.forEach(item=>{ let arrs = number.split(" ");
if(item.number== number){ that.form.handoverb[index].wm_in = "";
if(item.disabled){ if(arrs.length>1){
that.$message.error("该物料已被分配"); that.form.handoverb[index].wpr = '';
that.form.handoverb[index].wpr = ''; that.wprOptions.forEach(item=>{
}else{ if(arrs.indexOf(item.number) > -1&&!item.disabled){
item.disabled = true; item.disabled = true;
let obj = {}; let obj = {};
obj.number = item.number; obj.number = item.number;
obj.wpr = item.id; obj.wpr = item.id;
that.form.handoverb[index].handoverbw.push(obj); that.form.handoverb[index].handoverbw.push(obj);
that.form.handoverb[index].count = that.form.handoverb[index].handoverbw.length; that.form.handoverb[index].count = that.form.handoverb[index].handoverbw.length;
that.form.handoverb[index].wpr = '';
} }
} })
}) }else{
//handoverbdisabled
that.wprOptions.forEach(item=>{
if(item.number== number){
if(item.disabled){
that.$message.error("该物料已被分配");
that.form.handoverb[index].wpr = '';
}else{
item.disabled = true;
let obj = {};
obj.number = item.number;
obj.wpr = item.id;
that.form.handoverb[index].handoverbw.push(obj);
that.form.handoverb[index].count = that.form.handoverb[index].handoverbw.length;
that.form.handoverb[index].wpr = '';
}
}
})
}
this.$refs.codeInput.focus(); this.$refs.codeInput.focus();
}, },
deleteWpr(index1,index2,wpr){ deleteWpr(index1,index2,wpr){
@ -240,6 +258,7 @@ export default {
batchAdd(){ batchAdd(){
let that = this; let that = this;
let obj = { }; let obj = { };
obj.wm_in = "";
obj.wm = that.batchOrign.id; obj.wm = that.batchOrign.id;
obj.batch = that.batchOrign.batch+"-"+that.addBactchNum; obj.batch = that.batchOrign.batch+"-"+that.addBactchNum;
that.addBactchNum++; that.addBactchNum++;
@ -327,6 +346,7 @@ export default {
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
margin-right: 20px; margin-right: 20px;
margin-top: 5px;
} }
.circleCloseFilled{ .circleCloseFilled{
position: absolute; position: absolute;

View File

@ -639,7 +639,7 @@ export default {
let judge = false; let judge = false;
try { try {
judge = eval(str); judge = eval(str);
row[index][item.defect_name] = judge; that.mlogbwlist[editIndex][item.defect_name] = judge;
}catch (error) { }catch (error) {
console.error('error',error); console.error('error',error);
} }