Merge branch 'product' into test

src/views/patentMining/components/fileMessage.vue

@@ -52,7 +52,7 @@
                   预览
                   <el-dropdown-menu slot="dropdown">
                     <el-dropdown-item command="1">下载</el-dropdown-item>
-                    <el-dropdown-item command="2" divided style="color: red;">删除</el-dropdown-item>
+                    <el-dropdown-item command="2" divided style="color: red;" v-if="scope.row.id">删除</el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
               </div>

src/views/patentMining/components/mixins/index.js

@@ -36,6 +36,10 @@ export default {
   methods: {
     // 点击名称等事件
     handleItem(row, key) {
+      if(row.state == 0){
+        this.$message.warning('项目审核中')
+        return
+      }
       // 跳转详情页面
       this.$router.push({
         path: '/details',

src/views/project/patentCollection/components/dialog/PatentBatchIndex.vue

@@ -12,11 +12,11 @@
                 @change="change(item)"></el-switch>
               <div v-if="item.enabled" class="patent-batch-index-field-content">
                 <template v-if="item.type === 0 || item.type === 2">
-                  <el-input type="textarea" v-model="item.text" @change="changeOption(item)" placeholder="请输入内容"
+                  <el-input type="textarea" v-model="item.selected" @change="changeOption(item)" placeholder="请输入内容"
                     size="small"></el-input>
                 </template>
                 <template v-if="item.type === 1">
-                  <el-date-picker v-model="item.text" @change="changeOption(item)" value-format="yyyy-MM-dd" type="date"
+                  <el-date-picker v-model="item.selected" @change="changeOption(item)" value-format="yyyy-MM-dd" type="date"
                     size="small" placeholder="选择日期" class="width_100"></el-date-picker>
                 </template>
                 <template v-if="item.type === 4">
@@ -92,7 +92,6 @@ export default {
   methods: {
     // 
     changeOption(val) {
-      // console.log(val);
       var obj = {
         projectId: this.projectId,
         fieldType: val.type,
@@ -100,7 +99,7 @@ export default {
         optionType: 2,//操作类型 0取消 1增加 2覆盖
       }
       if ([0, 1, 2,4].includes(val.type)) {
-        obj.fieldValue = val.text ? [val.text] : null
+        obj.fieldValue = val.selected ? [val.selected] : null
       } else {
         obj.fieldValue = val.selected
       }

src/views/project/patentCollection/components/dialog/PatentIndexSetting.vue

@@ -367,6 +367,7 @@ export default {
           projectId: this.projectId,
           ...this.search,//选择的信息
           esCustomFieldDTOS: selected,
+          taskId: this.taskId,
         }
         this.$api.batchAddCustomField(params).then(res => {
           if (res.code == 200) {

src/views/project/patentCollection/index.vue

@@ -346,7 +346,12 @@ export default {
           } else {
             var checkName = []
             if (item.type == 'Array' || item.type == 'tree' || item.type == 'DateTime') {
-              checkName = item.options.filter(item2 => item.check.includes(item2.id || item2.name)).map(item3 => item3.name);
+              if(item.type == 'tree'){
+                checkName = item.checkData.map(item=>item.name)
+              }else{
+                checkName = item.options.filter(item2 => item.check.includes(item2.id || item2.name)).map(item3 => item3.name);
+              }
+              
             }
             var obj = {
               value: item.value,

src/views/report/analysisAndOpinion/components/searchRecords/dialog/addAndEditSearchRecords.vue

@@ -30,7 +30,7 @@
                 <el-date-picker
                     v-model="form.searchTime"
                     type="date"
-                    value-format="yyyyMMdd"
+                    value-format="yyyy-MM-dd"
                     placeholder="选择检索时间"
                     style="width:100%"
                     >

src/views/report/components/details/components/basicMessage.vue

@@ -1,6 +1,8 @@
 <template>
-  <div>
-    <el-form :model="form" ref="reportForm" label-width="140px">
+  <div >
+    <div style="display:flex;align-items: self-start;flex-direction: row-reverse;">
+    <el-button type="primary" size="small" style="width:80px;" @click="edit">编辑</el-button>
+    <el-form style="width:100%" :model="form" ref="reportForm" label-width="140px">
       <el-row>
         <el-col :span="12">
           <template>
@@ -159,17 +161,20 @@
         <div class="box1" v-html="$commonJS.getColumnData(form, { type: 'String', value: 'description' })"></div>
       </el-form-item>
     </el-form>
-
+  </div>
     <flow-Path :projectId="projectId" :taskId="taskId" v-if="reportType == 7"></flow-Path>
+    <CreateReport ref="ReportForm" @getList="save"></CreateReport>
   </div>
 </template>
   
 <script>
 import { mapGetters } from 'vuex';
 import flowPath from '@/views/report/InvalidResponse/components/flowPath/flowPath.vue';
+import CreateReport from '@/views/report/components/dialog/addAndEditReport.vue'
 export default {
   components: {
-    flowPath
+    flowPath,
+    CreateReport
   },
   props: {
     projectId:{
@@ -198,6 +203,18 @@ export default {
     this.getReportMessage()
   },
   methods: {
+    //编辑报告信息
+    edit(){
+      if(!this.form.id){
+        this.$message.error('没有报告信息可以编辑')
+        return 
+      }
+      this.$refs.ReportForm.open(this.form)
+    },
+    save(){
+      this.getReportMessage()
+      this.$emit('refreshData',true)
+    },
     //编辑案件梳理意见
     editSuggestions(row){
         this.$set(this,'editSuggestion',!this.editSuggestion)

src/views/report/components/mixins/index.js

@@ -24,6 +24,10 @@ export default {
   methods: {
     // 点击表格名称等事件
     handleItem(row, key) {
+      if(row.status == 0){
+        this.$message.warning('项目审核中')
+        return
+      }
       this.$router.push({
         path: '/reportDetails',
         query: {

src/views/report/components/patentList/components/customFields/components/mixins/index.js

@@ -12,8 +12,8 @@ export default {
 
   },
   methods: {
-    checkData(value,row,checked) {
-      this.$emit('checkData',value,row,checked)
+    checkData(value,row,checked,name) {
+      this.$emit('checkData',value,row,checked,name)
     },
     // 点击面板
     handleChange(data, type) {

src/views/report/components/patentList/components/customFields/components/tab2.vue

@@ -18,12 +18,15 @@
                 check-strictly default-expand-all :props="{ children: 'child', label: 'name' }">
                 <span class="custom-tree-node" slot-scope="{ node, data }">
                   <el-checkbox-group v-model="item.check">
-                    <el-checkbox :label="data.id" @change="(val)=>checkData(data.id,item,val)">
-                      <!-- {{ data.name }}({{ getCount(item, data.id) }}) -->
-                      <myTooltip :content="data.name + '('+ getCount(item, data.id) +')'" placement="top" effect="light">
-                        <span class="source-checkbox-label text noWrap">{{ data.name }}({{ getCount(item, data.id) }})</span>
-                      </myTooltip>
-                    </el-checkbox>
+                    <div class="source-checkbox">
+                      <el-checkbox :label="data.id" @change="(val)=>checkData(data.id,item,val,data.name)">
+                        <!-- {{ data.name }}({{ getCount(item, data.id) }}) -->
+                        <myTooltip :content="data.name + '('+ getCount(item, data.id) +')'" placement="top" effect="light">
+                          <span class="source-checkbox-label text noWrap">{{ data.name }}({{ getCount(item, data.id) }})</span>
+                        </myTooltip>
+                      </el-checkbox>
+                    </div>
+                    
                   </el-checkbox-group>
                 </span>
               </el-tree>
@@ -96,4 +99,14 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+  .text {
+    /* 超出10个字隐藏，之所以设置11em是因为省略号占一个位置 */
+    max-width: 11em;
+    overflow: hidden;
+    /* 显示省略符号来代表被修剪的文本。 */
+    text-overflow: ellipsis;
+    /* 文本不换行 */
+    white-space: nowrap;
+  }
+</style>

src/views/report/components/patentList/components/customFields/index.vue

@@ -566,17 +566,19 @@ export default {
       this.$refs.fieldsVue.open(data)
     },
     //获取子组件选择的值
-    checkData(value,row,checked) {
+    checkData(value,row,checked,name) {
       if (checked) {
         if (!row.checkData) {
           row.checkData=[]
         }
-        row.checkData.push(
-          {
-            field: (row.children && row.children.length>0)?row.select:row.value,
-            value:value
-          }
-        )
+        var obj = {
+          field: (row.children && row.children.length>0)?row.select:row.value,
+          value:value
+        }
+        if(name){
+          obj.name = name
+        }
+        row.checkData.push(obj)
       } else {
         var index = row.checkData.findIndex(item => {
           return item.field == ((row.children && row.children.length>0)?row.select:row.value) && item.value == value
@@ -711,7 +713,7 @@ export default {
 }
 
 .source-checkbox {
-  margin-top: 10px;
+  // margin-top: 10px;
 
   span {
     display: inline-block;

src/views/report/components/patentList/components/index.vue

@@ -225,7 +225,11 @@ export default {
           } else {
             var checkName = []
             if (item.type == 'Array' || item.type == 'tree' || item.type == 'DateTime') {
-              checkName = item.options.filter(item2 => item.check.includes(item2.id || item2.name)).map(item3 => item3.name); 
+              if(item.type == 'tree'){
+                checkName = item.checkData.map(item=>item.name)
+              }else{
+                checkName = item.options.filter(item2 => item.check.includes(item2.id || item2.name)).map(item3 => item3.name);
+              }
             }
             var obj = {
               value: item.value,