1

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

@@ -142,7 +142,7 @@
       </el-row>
       <el-row>
         <el-col :span="24">
-          <el-form-item label="产品/技术：">
+          <el-form-item label="技术简称：">
             <div class="box1" v-html="$commonJS.getColumnData(form, { type: 'String', value: 'productOrTech' })"></div>
           </el-form-item>
         </el-col>

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

@@ -114,6 +114,11 @@
                 </el-form-item>
               </el-col>
               <el-col :span="24">
+                <el-form-item label="涉诉对象" prop="litigationParty">
+                  <el-input v-model="form.litigationParty" autocomplete="off" placeholder="请输入涉诉对象"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
                 <el-form-item :label="form.reportType == '7'?'无效结果':'报告结果'" prop="cronIds">
                   <el-checkbox-group v-model="form.cronIds" class="reportCheckbox">
                     <el-checkbox v-for="item in conclusion" :key="parseInt(item.value)" :label="parseInt(item.value)">{{
@@ -198,8 +203,8 @@
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item label="产品/技术" prop="productOrTech">
-              <el-input v-model="form.productOrTech" autocomplete="off" placeholder="请输入产品/技术"></el-input>
+            <el-form-item label="技术简称" prop="productOrTech">
+              <el-input v-model="form.productOrTech" autocomplete="off" placeholder="请输入技术简称"></el-input>
             </el-form-item>
           </el-col>
         </el-row>

src/views/report/components/index.vue

@@ -254,7 +254,7 @@ export default {
       await this.tabChange(this.componentType)
     }
     // 获取搜索/分组
-    await this.getColumn()
+    // await this.getColumn()
     //获取报告清单
     this.getList()
     this.showViews()
@@ -291,13 +291,13 @@ export default {
       var type = Number(name)
       switch(type){
         case 1:
-         this.fixedSearch={}
-         this.type = 'reportProject'
-         if(!this.columnType.columnList1){
-          // 获取table栏位
-          this.columnList = await this.$commonJS.getCustomField('reportProject')
-          this.columnType.columnList1 = this.columnList
-         }
+          this.fixedSearch={}
+          this.type = 'reportProject'
+          if(!this.columnType.columnList1){
+            // 获取table栏位
+            this.columnList = await this.$commonJS.getCustomField('reportProject')
+            this.columnType.columnList1 = this.columnList
+          }
           break;
         case 2:
           this.type = 'invalidReportProject'
@@ -311,6 +311,8 @@ export default {
           break;
       }
       this.columnList = this.columnType['columnList' + type]
+      // 获取搜索/分组
+      await this.getColumn()
       this.queryParams.current = 1
       this.isGrouping()
     },
@@ -335,7 +337,8 @@ export default {
     },
     //获取table栏位及分组字段、检索字段
     async getColumn() {
-      let params = ['reportProject']
+      // let params = ['reportProject']
+      let params = [this.type]
       await this.$api.getParamsCommon(params).then(res => {
         if (res.code == 200) {
           let conditionDTOList = JSON.parse(JSON.stringify(res.data[0].conditionDTOList))