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

cheeckTableChange

This commit is contained in:
shijing 2022-02-21 10:23:22 +08:00
parent 87e94c7b9f
commit 6b73a12840
4 changed files with 126 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

124
hb_client/src/components/customForm/index.vue
View File

@ -9,7 +9,7 @@
<el-row> <el-row>
<el-col <el-col
v-for="(item, $index) in formData" v-for="(item, $index) in formData"
v-show="filterBlock(item.parent,item.display_expression,$index,item.field_key)" v-show="filterBlock(item.display_expression,$index,item.field_key)"
:key="$index" :key="$index"
:span="12" :span="12"
style="position: relative" style="position: relative"
@ -281,79 +281,71 @@
} }
}, },
methods:{ methods:{
filterBlock(parent,rule,index,field_key){ filterBlock(rule,index,field_key){
let that = this; let that = this;
if(parent!==''&&parent!==null&&parent!==undefined){ if(rule!==''&&rule!==null&&rule!==undefined){
if(rule!==''&&rule!==null&&rule!==undefined){ let reg = /\{(.+?)\}/g;
let reg = /\{(.+?)\}/g; if(rule.indexOf('||')>-1||rule.indexOf('&&')>-1){
//let str = rule.replace(temp,'').replace('$','');//=='有' let tam = '', arr = [];
//let y = that.checkForm[key]; if(rule.indexOf('||')>-1){
if(rule.indexOf('||')>-1||rule.indexOf('&&')>-1){ arr = rule.split('||');
let tam = '', arr = []; }else{
if(rule.indexOf('||')>-1){ arr = rule.split('&&');
arr = rule.split('||'); }
}else{ for (let i = 0;i<arr.length;i++){
arr = rule.split('&&'); //获取判断依据
} let a = '';
for (let i = 0;i<arr.length;i++){ a = arr[i].replace(/`/g,'');
//获取判断依据 a = '`'+ a+'`';
let a = ''; let tem =a.match(reg)[0];
a = arr[i].replace(/`/g,''); let ky = tem.replace(/\{|\}/g, '');//qipao
a = '`'+ a+'`'; if(that.checkForm[ky]){
let tem =a.match(reg)[0]; //替换变量
let ky = tem.replace(/\{|\}/g, '');//qipao a = a.replace(ky, 'yyy');
if(that.checkForm[ky]){ let yyy = "'"+that.checkForm[ky]+"'";
//替换变量 if(eval(eval( a))){
a = a.replace(ky, 'yyy'); tam += 'true';
let yyy = "'"+that.checkForm[ky]+"'";
if(eval(eval( a))){
tam += 'true';
}else{
tam += 'false';
}
}else{ }else{
tam += 'false'; tam += 'false';
} }
}
let rea = true;
if(rule.indexOf('||')>-1){
if( tam.indexOf('true')>-1){
rea = true;
}else{
rea = false;
}
}else{ }else{
if( tam.indexOf('false')>-1){ tam += 'false';
rea = false;
}else{
rea = true;
}
} }
if(rea){
that.formData[index].is_hidden = false;
}else{
that.formData[index].is_hidden = true;
that.checkForm[field_key] = null;
}
return rea;
}else{
let temp =rule.match(reg)[0];
let key = temp.replace(/\{|\}/g, '');//qipao
let a = rule.replace(key, 'yy');
a = a.replace(key, 'yy');
let yy = "'"+that.checkForm[key]+"'";
if(eval(eval(a))){
that.formData[index].is_hidden = false;
}else{
that.formData[index].is_hidden = true;
that.checkForm[field_key] = null;
}
return eval(eval(a));
} }
let rea = true;
if(rule.indexOf('||')>-1){
if( tam.indexOf('true')>-1){
rea = true;
}else{
rea = false;
}
}else{
if( tam.indexOf('false')>-1){
rea = false;
}else{
rea = true;
}
}
if(rea){
that.formData[index].is_hidden = false;
}else{
that.formData[index].is_hidden = true;
that.checkForm[field_key] = null;
}
return rea;
}else{ }else{
that.formData[index].is_hidden = true; let temp =rule.match(reg)[0];
that.checkForm[field_key] = null; let key = temp.replace(/\{|\}/g, '');//qipao
return false; let a = rule.replace(key, 'yy');
a = a.replace(key, 'yy');
let yy = "'"+that.checkForm[key]+"'";
if(eval(eval(a))){
that.formData[index].is_hidden = false;
}else{
that.formData[index].is_hidden = true;
that.checkForm[field_key] = null;
}
return eval(eval(a));
} }
}else{ }else{
that.formData[index].is_hidden = false; that.formData[index].is_hidden = false;

123
hb_client/src/components/customForm/review.vue
View File

@ -9,7 +9,7 @@
<el-row> <el-row>
<el-col <el-col
v-for="(item, $index) in formData" v-for="(item, $index) in formData"
v-show="filterBlock(item.parent,item.display_expression,$index,item.field_key)" v-show="filterBlock(item.display_expression,$index,item.field_key)"
:key="$index" :key="$index"
:span="12" :span="12"
style="position: relative" style="position: relative"
@ -375,78 +375,73 @@
} }
}, },
methods:{ methods:{
filterBlock(parent,rule,index,field_key){ filterBlock(rule,index,field_key){
// debugger; // debugger;
let that = this; let that = this;
if(parent!==''&&parent!==null&&parent!==undefined){ if(rule!==''&&rule!==null&&rule!==undefined){
if(rule!==''&&rule!==null&&rule!==undefined){ let reg = /\{(.+?)\}/g;
let reg = /\{(.+?)\}/g; debugger;
if(rule.indexOf('||')>-1||rule.indexOf('&&')>-1){ if(rule.indexOf('||')>-1||rule.indexOf('&&')>-1){
let tam = '', arr = []; let tam = '', arr = [];
if(rule.indexOf('||')>-1){ if(rule.indexOf('||')>-1){
arr = rule.split('||'); arr = rule.split('||');
}else{ }else{
arr = rule.split('&&'); arr = rule.split('&&');
} }
for (let i = 0;i<arr.length;i++){ for (let i = 0;i<arr.length;i++){
//获取判断依据 //获取判断依据
let a = ''; let a = '';
a = arr[i].replace(/`/g,''); a = arr[i].replace(/`/g,'');
a = '`'+ a+'`'; a = '`'+ a+'`';
let tem =a.match(reg)[0]; let tem =a.match(reg)[0];
let ky = tem.replace(/\{|\}/g, '');//qipao let ky = tem.replace(/\{|\}/g, '');//qipao
if(that.checkForm[ky]){ if(that.checkForm[ky]){
//替换变量 //替换变量
a = a.replace(ky, 'yyy'); a = a.replace(ky, 'yyy');
let yyy = "'"+that.checkForm[ky]+"'"; let yyy = "'"+that.checkForm[ky]+"'";
if(eval(eval( a))){ if(eval(eval( a))){
tam += 'true'; tam += 'true';
}else{
tam += 'false';
}
}else{ }else{
tam += 'false'; tam += 'false';
} }
}
let rea = true;
if(rule.indexOf('||')>-1){
if( tam.indexOf('true')>-1){
rea = true;
}else{
rea = false;
}
}else{ }else{
if( tam.indexOf('false')>-1){ tam += 'false';
rea = false;
}else{
rea = true;
}
} }
if(rea){
that.formData[index].is_hidden = false;
}else{
that.formData[index].is_hidden = true;
that.checkForm[field_key] = null;
}
return rea;
}else{
let temp =rule.match(reg)[0];
let key = temp.replace(/\{|\}/g, '');//qipao
let a = rule.replace(key, 'yy');
a = a.replace(key, 'yy');
let yy = "'"+that.checkForm[key]+"'";
if(eval(eval(a))){
that.formData[index].is_hidden = false;
}else{
that.formData[index].is_hidden = true;
that.checkForm[field_key] = null;
}
return eval(eval(a));
} }
let rea = true;
if(rule.indexOf('||')>-1){
if( tam.indexOf('true')>-1){
rea = true;
}else{
rea = false;
}
}else{
if( tam.indexOf('false')>-1){
rea = false;
}else{
rea = true;
}
}
if(rea){
that.formData[index].is_hidden = false;
}else{
that.formData[index].is_hidden = true;
that.checkForm[field_key] = null;
}
return rea;
}else{ }else{
that.formData[index].is_hidden = true; let temp =rule.match(reg)[0];
that.checkForm[field_key] = null; let key = temp.replace(/\{|\}/g, '');//qipao
return false; let a = rule.replace(key, 'yy');
a = a.replace(key, 'yy');
let yy = "'"+that.checkForm[key]+"'";
if(eval(eval(a))){
that.formData[index].is_hidden = false;
}else{
that.formData[index].is_hidden = true;
that.checkForm[field_key] = null;
}
return eval(eval(a));
} }
}else{ }else{
that.formData[index].is_hidden = false; that.formData[index].is_hidden = false;

8
hb_client/src/views/statistics/materialStatistics.vue
View File

@ -202,14 +202,6 @@
xAxisData: ["供应商1", "供应商2", "供应商3", "供应商4", "供应商5", "供应商6", "供应商7"], xAxisData: ["供应商1", "供应商2", "供应商3", "供应商4", "供应商5", "供应商6", "供应商7"],
seriesData:[2, 2, 4, 5,1, 0,1], seriesData:[2, 2, 4, 5,1, 0,1],
}, },
xAxisData1: ["气泡", "破点", "划伤", "其他"],
xAxisbar21: ["物料1", "物料2", "物料3", "物料4", "物料5", "物料6", "物料7"],
xAxisbar22: ["供应商1", "供应商2", "供应商3", "供应商4", "供应商5", "供应商6", "供应商7"],
xAxisbar3: ["供应商1", "供应商2", "供应商3", "供应商4", "供应商5", "供应商6", "供应商7"],
barData1: [30, 25, 35, 10],
barData21: [800, 950, 960, 906, 600, 800, 900],
barData22: [5, 20, 15, 25,10, 10,15],
barData: [80, 95, 96, 96, 96, 98, 99],
list: [ list: [
{id: 1, name: 'HIehd91', card: '3331', sco: 'REF-31', num: 2, reason: "气泡"}, {id: 1, name: 'HIehd91', card: '3331', sco: 'REF-31', num: 2, reason: "气泡"},
{id: 2, name: 'HIehd92', card: '3332', sco: 'REF-32', num: 1, reason: "划痕"}, {id: 2, name: 'HIehd92', card: '3332', sco: 'REF-32', num: 1, reason: "划痕"},

22
hb_client/src/views/wpm/need.vue
View File

@ -1008,25 +1008,23 @@
handleInspection(scope, index) { handleInspection(scope, index) {
//调该物料对应的检查表 //调该物料对应的检查表
let that = this; let that = this;
this.innerIndex = index; that.innerIndex = index;
// this.outerVisible = true; // this.outerVisible = true;
this.wproduct = scope.row.id;//半成品ID that.wproduct = scope.row.id;//半成品ID
debugger; that.listQueryrecordform.material = scope.row.material;
console.log(scope.row.material_check); that.listQueryrecordform.type = 20;
this.listQueryrecordform.material = scope.row.material_check!==null ? scope.row.material_check :scope.row.material;// that.listQueryrecordform.enabled = true;
this.listQueryrecordform.type = 2; that.recordform = null;
this.listQueryrecordform.enabled = true; getrecordformList(that.listQueryrecordform).then((response) => {
this.recordform = null;
getrecordformList(this.listQueryrecordform).then((response) => {
if (response.data) { if (response.data) {
this.recordformList = response.data; that.recordformList = response.data;
if (response.data.length === 1) { if (response.data.length === 1) {
that.recordform = response.data[0].id; that.recordform = response.data[0].id;
that.formName = response.data[0].name; that.formName = response.data[0].name;
that.submitrecordform(index); that.submitrecordform(index);
} else { } else {
//弹出列表选择框 //弹出列表选择框
this.outerVisible = true; that.outerVisible = true;
} }
} }
}); });
@ -1038,8 +1036,6 @@
return item.id === that.recordform; return item.id === that.recordform;
}); });
that.formName = arr[0].name; that.formName = arr[0].name;
// this.outerVisible = false;
// that.submitrecordform(that.innerIndex);
}, },
//检验记录 //检验记录
checkRecord(scope, index) { checkRecord(scope, index) {