fix:检验设备默认上一次的设备
This commit is contained in:
parent
f7ab449054
commit
f968b951f4
|
@ -503,8 +503,10 @@ 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(){
|
||||||
|
@ -751,11 +753,6 @@ 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);
|
||||||
|
@ -809,6 +806,7 @@ 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;
|
||||||
|
|
Loading…
Reference in New Issue