youhua

src/views/reportManagement/ReleaseReport/newReleaeTemplate.vue

@@ -184,7 +184,7 @@ export default {
           this.releaseType = true
           this.from = { ...this.from, ...newV.from }
           newV.name === '编辑模版' ? this.settingGetReportModuleById(newV.set_up) : ''
-          return false
+          return
         }
         this.releaseType = false
         if (newV.id) { // 编辑

src/views/reportManagement/Testing/newTestingTemplate.vue

@@ -206,7 +206,7 @@ export default {
           this.releaseType = true
           this.from = { ...this.from, ...newV.from }
           newV.name === '编辑模版' ? this.settingGetReportModuleById(newV.repot_up) : ''
-          return false
+          return
         }
         this.releaseType = false
         if (newV.id) { // 编辑
@@ -241,7 +241,6 @@ export default {
     },
 
     setFrom(e) {
-      console.log(e)
       this.$refs.moduleCustom.CustomSet(e)
     },
 
@@ -348,10 +347,9 @@ export default {
         delete newFrom[key]
       })
       this.from = { ...newFrom, ...params }
-      console.log(customs, params, 'customs')
     },
     customDialong() { // 点击自定义字段
-      console.log(this.customList, this.from, '模版组件返回')
+      this.from = { ...this.from }
       this.$emit('setCustom', this.customList, this.from)
     },
 

src/views/reportManagement/components/DailyReport.vue

@@ -186,6 +186,7 @@ export default {
 
     getCustom(arr) { // 自定义确认
       console.log(arr, this.temporary.name, '结果')
+      // this.templateId = { ...this.temporary.from }
       this.customList = [...arr]
       this.reportHome = this.temporary.name
     },

src/views/reportManagement/components/ReleaseReport.vue

@@ -199,7 +199,7 @@ export default {
     },
 
     open_new_template(val, show) { // 点击新建模版
-      !val ? this.templateId = { 'name': '新建模版', from: this.customList.length === 0 ? this.temporary.from : [] } : this.templateId = { 'name': '编辑模版', 'set_up': val.id }
+      !val ? this.templateId = { 'name': '新建模版', from: this.customList.length !== 0 ? this.temporary.from : {}} : this.templateId = { 'name': '编辑模版', 'set_up': val.id }
       this.tits = this.reportHome
       if (this.templateId.name === '新建模版') {
         this.reportTamplate = true // 编辑区域
@@ -234,6 +234,7 @@ export default {
 
     getCustom(arr) { // 自定义确认
       console.log(arr, this.temporary.name, '结果')
+      this.templateId = { 'from': this.temporary.from, 'name': this.temporary.name === '创建准出报告模版' ? '新建模版' : '编辑模版' }
       this.customList = [...arr]
       this.reportHome = this.temporary.name
     },

src/views/reportManagement/components/TestingReport.vue

@@ -186,7 +186,8 @@ export default {
     },
 
     getCustom(arr) { // 自定义确认
-      console.log(arr, this.temporary.name, '结果')
+      console.log(arr, this.temporary, '结果')
+      this.templateId = { 'from': this.temporary.from, 'name': this.temporary.name === '创建提测报告模版' ? '新建模版' : '编辑模版' }
       this.customList = [...arr]
       this.reportHome = this.temporary.name
     },
@@ -230,7 +231,7 @@ export default {
     },
 
     open_new_template(val, show) { // 点击新建模版
-      !val ? this.templateId = { 'name': '新建模版', from: this.customList.length === 0 ? this.temporary.from : [] } : this.templateId = { 'name': '编辑模版', 'repot_up': val.id }
+      !val ? this.templateId = { 'name': '新建模版', from: this.customList.length === 0 ? {} : this.temporary.from } : this.templateId = { 'name': '编辑模版', 'repot_up': val.id }
       this.tits = this.reportHome
       if (this.templateId.name === '新建模版') {
         this.reportHome = `创建提测报告模版` // 步骤条

src/views/reportManagement/daily/newReportTemplate.vue

@@ -101,6 +101,7 @@ export default {
   watch: {
     templateId: {
       handler(newV) {
+        console.log(newV)
         this.tpltId = newV
         this.tpltId ? this.settingGetReportModuleById(newV) : ''
       },