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

Revert "fix:检验设备默认上一次的设备" 

This reverts commit f968b951f4.
This commit is contained in:
zty 2025-10-15 13:15:30 +08:00
parent c33a1e3c80
commit b4b1f92c9a
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/views/wpm_bx/mlogbw_check_table.vue
View File

@ -503,10 +503,8 @@ export default {
}, },
getEquipments(){ getEquipments(){
let that = this; let that = this;
let eqId = localStorage.getItem("bxerpChenckEquipmentId");
that.$API.em.equipment.list.req({page:0,cate__code:"6"}).then((res) => { that.$API.em.equipment.list.req({page:0,cate__code:"6"}).then((res) => {
that.equipmentOptions = res; that.equipmentOptions = res;
that.form.equipment = eqId;
}) })
}, },
getdefects(){ getdefects(){
@ -753,6 +751,11 @@ export default {
if(item.rule_expression!==''&&item.rule_expression!==undefined&&item.rule_expression!==null){ if(item.rule_expression!==''&&item.rule_expression!==undefined&&item.rule_expression!==null){
let str = item.rule_expression.replace(/`/g, ''); let str = item.rule_expression.replace(/`/g, '');
str = str.replace(/\${(.*?)}/g, 'row.\$1'); str = str.replace(/\${(.*?)}/g, 'row.\$1');
// if(str.indexOf('row.剪切值18mm')>-1){
// if(row.剪切值18mm==null||row.剪切值18mm==''||row.剪切值18mm==undefined){
// str = str.split('||')[0];
// }
// }
let judge = false; let judge = false;
try { try {
judge = eval(str); judge = eval(str);
@ -806,7 +809,6 @@ export default {
}, },
equipmentChange(){ equipmentChange(){
let that = this; let that = this;
localStorage.setItem("bxerpChenckEquipmentId",that.form.equipment);
that.equipmentOptions.forEach(item => { that.equipmentOptions.forEach(item => {
if(item.id == that.form.equipment){ if(item.id == that.form.equipment){
that.form.equipment_name = item.name; that.form.equipment_name = item.name;