报告结果的编辑

src/views/components/import/conditionImport/searchResult.vue

@@ -577,7 +577,7 @@ export default {
           this.$store.commit("SET_PATENT_PARAMS", queryParams);
           this.$store.commit("SET_PATENT_RECORDS", records);
           this.getImageAndStatus()
-          this.getPatentSimilarMess()
+          // this.getPatentSimilarMess()
           this.loading = false;
           if(response.data.redisKey && !this.condition.redisKey){
             this.condition.redisKey = response.data.redisKey

src/views/project/patentCollection/components/views/Table.vue

@@ -99,11 +99,11 @@
           <div v-else v-html="getView(scope.row, item.value, item.type)"></div>
         </template>
       </el-table-column>
-      <el-table-column v-if="noveltySearch" label="相关度" width="100" fixed="right">
+      <!-- <el-table-column v-if="noveltySearch" label="相关度" width="100" fixed="right">
         <template slot-scope="scope">
           <el-progress v-if="scope.row.score" :text-inside="true" :stroke-width="20"  :percentage="scope.row.score*100"  :color="customColors"></el-progress>
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
     <addRemark ref="addRemark" :projectId="projectId" v-on="$listeners"></addRemark>
   </div>

src/views/report/components/dialog/addAndEditReport.vue

@@ -118,18 +118,18 @@
               </el-col>
             </el-row>
         
-        <template v-if="!form.id && form.status == 3">
+        <template>
           <div>
             <el-form-item label="报告结果" prop="cronIds">
               <el-checkbox-group v-model="form.cronIds">
-                <el-checkbox v-for="item in conclusion" :key="item.value" :label="item.value">{{
+                <el-checkbox v-for="item in conclusion" :key="parseInt(item.value)" :label="parseInt(item.value)">{{
                   item.label }}</el-checkbox>
               </el-checkbox-group>
             </el-form-item>
             <el-form-item label="结果论述" prop="cronDescription">
               <el-input v-model="form.cronDescription" type="textarea" placeholder="请输入结果论述"></el-input>
             </el-form-item>
-            <el-form-item label="后续跟进事项" prop="followUps">
+            <el-form-item label="后续跟进事项" prop="followUps" v-if="!form.id && form.status == 3">
               <span v-if="form.followUps"><span v-for="item in form.followUps" :key="item.name"
                   style="margin-right:10px">{{ item.name }}</span></span>
               <span>
@@ -778,6 +778,12 @@ export default {
 
       var reportType = this.dictMessage.REPORT_TYPE.filter(item => { return item.value == this.form.reportType })[0].label
       this.title = a + reportType + '报告'
+      //报告结果选项
+      this.conclusion = this.dictMessage[this.reportAsDicItem[this.form.reportType]]
+      if(!this.form.cronIds){
+        this.$set(this.form,'cronIds',[])
+      }
+      
       // 负责人
       if(!this.form.headId){
         this.$set(this.form,'headId',Number(this.userinfo.id))
@@ -879,21 +885,10 @@ export default {
       if (val == 3) {
         this.rules.headId[0].required = false
         this.rules.entrustId[0].required = false
-        if (!this.form.id) {
-          this.$set(this.form, 'cronIds', [])
-        }
-        let params = {
-          reportType: this.form.reportType
-        }
-        // await this.$api.queryCrons(params).then(res => {
-        //   if (res.code == 200) {
-        //     this.conclusion = res.data.data
-        //   }
-        // }).catch(error => {
-        //   this.conclusion = []
-        //   this.$message.error(error.message)
-        // })
-        this.conclusion = this.dictMessage[this.reportAsDicItem[this.form.reportType]]
+        // if (!this.form.id) {
+        //   this.$set(this.form, 'cronIds', [])
+        // }
+        // this.conclusion = this.dictMessage[this.reportAsDicItem[this.form.reportType]]
         this.matterType = 2
       } else {
         this.rules.headId[0].required = true
@@ -1079,8 +1074,8 @@ export default {
               return false
             }
           }else if(this.form.status != 3 && !this.form.id){
-            this.form.cronIds = []
-            this.form.cronDescription=''
+            // this.form.cronIds = []
+            // this.form.cronDescription=''
             this.followUps = []
           }
           
@@ -1159,6 +1154,7 @@ export default {
         matterIds: [],
         systemFileList: [],
         fileGuids: [],
+        cronIds:[]
       }
       this.show = false
       this.showDialog = false

src/views/report/components/dialog/cronConclusion.vue

@@ -4,7 +4,7 @@
             <el-form :model="form" label-width="120px">
                 <el-form-item label="报告结果">
                 <el-checkbox-group v-model="form.cronIds">
-                    <el-checkbox v-for="item in conclusion" :key="item.value" :label="item.value">{{ item.label }}</el-checkbox>
+                    <el-checkbox v-for="item in conclusion" :key="parseInt(item.value)" :label="parseInt(item.value)">{{ item.label }}</el-checkbox>
                 </el-checkbox-group>
                 </el-form-item>
                 <el-form-item label="结论论述" >