1

public/reportTemplate/weixinnuo/weixinnuo.txt

@@ -64,7 +64,13 @@
                         </tr>
                         <tr>
                             <td>是否具备专利性</td>
-                            <td colspan="3"> 是 否 公开不充分（与发明人沟通后仍无法达到公开充分标准而驳回）</td>
+                            <td colspan="3">
+                                <el-radio-group :value="getColumnData('baseMessage','ifPatentability',dataObj.baseMessage.ifPatentability)" @input="(value)=>{this.$set(this.reportData.baseMessage,'ifPatentability',value)}">
+                                    <el-radio label="是">是</el-radio>
+                                    <el-radio label="否">否</el-radio>
+                                    <el-radio label="公开不充分">公开不充分（与发明人沟通后仍无法达到公开充分标准而驳回）</el-radio>
+                                </el-radio-group>
+                            </td>
                         </tr>
                         <tr>
                             <td>建立申请类型</td>

src/views/noveltySearch/components/noveltySearchCard.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="height_100" v-loading="loading">
       <el-container>
-          <!-- <el-header>
+          <el-header>
               <div class="head">
                   <div class="head_left">
                     <mySearch style="width:500px" :SearchFields="searchFiled" @search="search" :searchValue="searchOption">
@@ -11,7 +11,7 @@
                       
                   </div>
               </div>
-          </el-header> -->
+          </el-header>
           <el-main class="height_100" v-DivHeight="getDivHeight">
             <div v-if="showTable" class="content" :style="`height:${tableHeight - 20}px`">
                 <myCard class="box-card" v-for="(item,index) in tableData" :key="item.id">
@@ -93,24 +93,64 @@ import createNoveltySearch from './dialog/createNoveltySearch.vue';
           total:0,
           tableData:[],
           column:column,
+          //检索字段
+        searchFiled: [],
+
+        //检索条件
+        searchOption: {
+        },
       };
     },
     watch: {},
     computed: {},
     created() {},
-    mounted() {
-      this.getList()
+    async mounted() {
+        //获取检索字段和分组字段
+        await this.getColumn()
+        this.getList()
     },
     methods: {
+         //获取检索字段和分组字段
+    async getColumn() {
+      let params = ['noveltyProject']
+      await this.$api.getParamsCommon(params).then(async res => {
+        if (res.code == 200) {
+          // 分组字段
+          let conditionDTOList = JSON.parse(JSON.stringify(res.data[0].conditionDTOList))
+          // 搜索字段
+          this.searchFiled = this.$commonJS.getField(conditionDTOList, (u) => u.ifSearch == true, {
+            label: 'name',
+            value: 'value',
+            type: 'type',
+          })
+        }
+      })
+      this.showViews()
+    },
       //检索
       search(){
+        let params = {}
+        val.forEach(item => {
+            if (item.type == 3) {
+            params[item.value] = item.searchValue.map(itemValue => {
+                return itemValue.value
+            })
+            } else {
+            params[item.value] = item.searchValue.label
+            }
+        })
+        this.searchOption = this.$commonJS.ArrayToArray(val)
           this.queryParams.current = 1
           this.getList()
       },
       //获取数据
       getList(){
         this.loading = true
-          this.$api.queryNoveltyProject(this.queryParams).then(response=>{
+        var params = {
+            ...this.queryParams,
+            searchQuery: this.$commonJS.objectToString(this.searchOption),//检索条件
+        }
+          this.$api.queryNoveltyProject(params).then(response=>{
             if(response.code == 200){
                 this.tableData = response.data.data
                 this.total = response.data.total