Эх сурвалжийг харах

Merge branch 'http_mock' of https://git.xiaojukeji.com/pu_qa_tool/thoth-frontend into http_mock

wenbobowen 4 жил өмнө
parent
commit
8565dc3ffc

+ 3 - 2
src/views/reportManagement/ReleaseReport/newReleaeTemplate.vue

@@ -192,6 +192,7 @@ export default {
           this.reportreleaseGetReportById(newV.id)
         } else { // 新建
           this.tpsltId = newV
+          // this.reportreleaseInitReportRelease(newV)
           this.settingGetReportModuleById(newV)
         }
       },
@@ -252,9 +253,9 @@ export default {
         } else {
           this.customList = [...this.customList]
         }
-        this.from = res.data
+        // this.from = res.data
         this.modelID = res.data.id
-        this.from = { ...this.from, 'moduleName': res.data.moduleName, 'passStatus': 0 }
+        this.from = { ...this.from, ...res.data, 'moduleName': res.data.moduleName, 'passStatus': 0 }
       }
     },