优化报告

src/views/reportManagement/ReleaseReport/newReleaeTemplate.vue

@@ -5,8 +5,8 @@
       <el-form-item v-if="releaseType" label="模版名称" prop="moduleName" :rules="[{ required: true, message: '模版名称不能为空', trigger: 'change'}]"><br>
         <el-input v-model="from.moduleName" size="small" style="width:100%;" placeholder="请输入模版名称（不可与现有模版重名）" />
       </el-form-item>
-      <el-form-item v-if="!releaseType" label="报告名称" prop="reportName" :rules="[{ required: true, message: '模版名称不能为空', trigger: 'change'}]"><br>
-        <el-input v-model="from.reportName" size="small" type="text" maxlength="50" style="width:100%;" placeholder="请输入模版名称（不可与现有模版重名）" />
+      <el-form-item v-if="!releaseType" label="报告名称" prop="reportName" :rules="[{ required: true, message: '报告名称不能为空', trigger: 'change'}]"><br>
+        <el-input v-model="from.reportName" size="small" type="text" maxlength="50" style="width:100%;" placeholder="请输入报告名称" />
       </el-form-item>
 
       <div class="backStyle">{{ !releaseType ? '报告内容' : '模版内容' }}</div>
@@ -285,7 +285,7 @@ export default {
         if (valid) {
           const data = {}
           data.bizId = localStorage.getItem('bizId')
-          data.content = this.content
+          data.content = this.fromData.content
           data.moduleName = this.from.moduleName
           data.type = 4 // 准出报告 4
           if (this.tpltId) {

src/views/reportManagement/Testing/newTestingTemplate.vue

@@ -3,7 +3,7 @@
   <div class="report-container">
     <el-form ref="fromCreateData" :model="from">
       <el-form-item v-if="releaseType" label="模版名称" prop="moduleName" :rules="[{ required: true, message: '模版名称不能为空', trigger: 'change'}]"><br>
-        <el-input v-model="fromCreateData.moduleName" size="small" style="width:100%;" placeholder="请输入模版名称（不可与现有模版重名）" />
+        <el-input v-model="from.moduleName" size="small" style="width:100%;" placeholder="请输入模版名称（不可与现有模版重名）" />
       </el-form-item>
       <el-form-item v-if="!releaseType" label="报告名称" prop="reportName" :rules="[{ required: true, message: '报告名称不能为空', trigger: 'change'}]"><br>
         <el-input v-model="from.reportName" size="small" type="text" maxlength="50" style="width:100%;" placeholder="请输入报告名称名称" />
@@ -286,6 +286,7 @@ export default {
       this.$refs.fromCreateData.validate((valid) => {
         if (valid) {
           this.fromCreateData.bizId = localStorage.getItem('bizId')
+          this.fromCreateData.moduleName = this.from.moduleName
           this.fromCreateData.type = e
           if (this.tpltId) {
             settingUpdateReportModule(this.fromCreateData).then(res => {