master
e 3 years ago
parent cd56409e6b
commit 94207d4bf1
  1. 45
      src/views/Transaction.vue

@ -454,15 +454,41 @@ export default {
let tableData = this.tableData let tableData = this.tableData
this.tableData = [] this.tableData = []
this.anewPosttingDatas(list) this.anewPosttingDatas(list)
for(var i=0;i<this.tableData.length;i++){ for (var j=0;j<tableData.length;j++){
for (var j=0;j<tableData.length;j++){ for(var i=0;i<this.tableData.length;i++){
if (tableData[j].name == this.tableData[i].name){ if (tableData[j].name == this.tableData[i].name && tableData[j].operationIds == this.tableData[i].name){
if (tableData[j].emptyTwo){ this.tableData[i].type = tableData[j].type
this.tableData[i].emptyTwo = tableData[j].emptyTwo if (tableData[j].type == 1 || tableData[j].type == 2) {
this.tableData[i].value1 = tableData[j].value1 this.tableData[i].subjectId = Number(tableData[j].emptyOne);
this.tableData[i].type = tableData[j].type this.tableData[i].value1 = tableData[j].emptyTwo;
}else{ } else if (tableData[j].type == 3) {
this.tableData[i].subjectId = Number(tableData[j].emptyOne);
this.tableData[i].value1 = tableData[j].emptyTwo;
} else if (tableData[j].type == 4) {
// id
if (tableData[j].emptyOne === "无限制") {
this.tableData[i].value1 = tableData[j].emptyOne;
this.tableData[i].value2 = "";
} else {
this.tableData[i].value1 = tableData[j].emptyOne.substring(0, tableData[j].emptyOne.indexOf(","));
this.tableData[i].value2 = tableData[j].emptyOne.substring(tableData[j].emptyOne.indexOf(",") + 1, tableData[j].emptyOne.length);
}
this.tableData[i].value3 = tableData[j].emptyTwo;
} else if (tableData[j].type == 5) {
this.tableData[i].subjectId = Number(tableData[j].emptyOne);
this.tableData[i].value2 = tableData[j].emptyTwo[0];
this.tableData[i].value3 = tableData[j].emptyTwo.substring(1, tableData[j].emptyTwo.indexOf("~"));
this.tableData[i].value4 = tableData[j].emptyTwo.substring(tableData[j].emptyTwo.indexOf("~") + 1, tableData[j].emptyTwo.length - 1);
this.tableData[i].value5 = tableData[j].emptyTwo[tableData[j].emptyTwo.length - 1];
} }
this.tableData[i].isDisabled=true//
this.tableData[i].isSave=true //
break
}
if(tableData[j].operationIds == this.tableData[i].operationIds){
this.tableData[i].isDisabled=true//
this.tableData[i].isSave=true //
break
} }
} }
} }
@ -544,7 +570,6 @@ export default {
obj.subjectId = Number(item.emptyOne); obj.subjectId = Number(item.emptyOne);
obj.value1 = item.emptyTwo; obj.value1 = item.emptyTwo;
} else if (item.type == 3) { } else if (item.type == 3) {
console.log('============')
obj.subjectId = Number(item.emptyOne); obj.subjectId = Number(item.emptyOne);
obj.value1 = item.emptyTwo; obj.value1 = item.emptyTwo;
} else if (item.type == 4) { } else if (item.type == 4) {
@ -759,8 +784,6 @@ export default {
}, },
addRules(){ addRules(){
this.configVisible = true; this.configVisible = true;
console.log(this.formData.lcJudgmentRuleList)
let operationIds = [] let operationIds = []
this.tableData.forEach(async (item, index) => { this.tableData.forEach(async (item, index) => {
// //

Loading…
Cancel
Save