Sfoglia il codice sorgente

确认协同结果没反应

zhuliu 1 anno fa
parent
commit
a308993006

+ 8 - 3
src/views/report/components/splitPage/splitPage.vue

@@ -234,9 +234,14 @@ export default {
         var str = row
         if (field.value && field.value.length > 0) {
           try {
-            field.value.forEach(item => {
+            field.value.forEach((item,index) => {
               if (str[item] != 0 && !str[item]) {
-                throw Error();
+                // throw Error();
+                if(index!= field.value.length-1){
+                  this.$set(str,item,{})
+                }else{
+                  this.$set(str,item,null)
+                }
               }
               str = str[item]
             })
@@ -539,7 +544,7 @@ export default {
     },
     // 协同对比结果高亮
     checkDel({ row, rowIndex }) {
-      for (let k in row.finalRecordVO) {
+      for (let k in row.currentRecordVO) {
         if (k != 'id') {
           if (row.finalRecordVO[k] != row.currentRecordVO[k]) {
             return 'success-rowCheck'

+ 2 - 3
src/views/report/tort/components/tortContrast1.vue

@@ -230,7 +230,6 @@ export default {
           break
         }
       }
-      console.log(row)
     },
 
     // 切换产品信息
@@ -259,7 +258,7 @@ export default {
               this.$message.success('保存成功')
             }
           })
-        } else if (this.taskId && this.isResult == 1) {//处理协同结果保存或查看协同结果
+        } else if (this.taskId && (this.isResult == 1)) {//处理协同结果保存或查看协同结果
           for (let i = 0; i < val.length; i++) {
             if (val[i].currentRecordVO) {
               for (let key in val[i].currentRecordVO) {
@@ -373,7 +372,7 @@ export default {
             this.getInterface(res)
           }
         })
-      } else if (this.taskId && this.isResult == 3) {//确认协同结果,
+      } else if (this.taskId && (this.isResult == 3|| this.isResult == 2)) {//确认协同结果,
         this.$api[api[this.reportType][1]](params).then(res => {
           if (res.code == 200) {
             this.getInterface(res)