zhuliu пре 11 месеци
родитељ
комит
ba7990bc22

+ 57 - 0
public/reportTemplate/ningde/ningde.css

@@ -0,0 +1,57 @@
+.ningde{
+    width: 800px;
+        margin: 0px auto;
+        font-size: 20px black;
+}
+.ningde .basicMessage{
+    padding: 0;
+}
+.ningde .flex-container {
+    width: 100%;
+    display: flex;
+    justify-content: space-between; /* 水平等间距对齐 */
+    align-items: stretch;
+}
+.ningde .flex-container>div{
+    display: flex;
+    align-items: center;
+    width: 100%;
+    border-right: 1px solid black; /* 修改为黑色边框 */
+    padding: 10px; /* 添加内边距 */
+}
+.ningde .flex-container>div:last-child{
+    border-right: 0; 
+}
+.ningde .reportTitle{
+    font-size: 20px;
+    padding: 20px;
+}
+.ningde .center{
+    text-align: center !important;
+    justify-content:center;
+}
+.ningde .height{
+    min-height: 100px;
+}
+.ningde .width{
+    width: 150px !important;
+}
+.ningde .blue_white{
+    color: white;
+    background-color: rgb(16, 16, 173);
+}
+.ningde .border_bottom{
+    border-bottom: 1px solid black;;
+}
+.ningde table{
+    width: 100%;
+    border-collapse: collapse;
+    
+}
+.ningde table tr>td{
+    padding: 10px;
+}
+.ningde table td{
+    border: 1px solid black;
+    border-top: 0;
+}

+ 114 - 0
public/reportTemplate/ningde/ningde.txt

@@ -0,0 +1,114 @@
+<div class="ningde">
+    <div class="reportTitle border_bottom center blue_white"><strong>案情检索报告</strong></div>
+        <div>
+            <table>
+                <tr>
+                    <td colspan="4" class="basicMessage">
+                        <div class="flex-container">
+                            <div class="center width"><strong>案号</strong></div>
+                            <div>CN123456789都不能尽可能</div>
+                            <div class="center width"><strong>检索人</strong></div>
+                            <div>朱</div>
+                        </div>
+                    </td>
+                </tr>
+            
+                <tr>
+                    <td colspan="4"><strong>一、检索确定的主题分类(IPC)及主要技术点</strong></td>
+                </tr>
+                <tr>
+                    <td colspan="4">
+                        <div class="height" >
+                            123 
+                        </div>
+                    </td>
+                </tr>
+                <tr>
+                    <td colspan="4"><strong>二、检索工具(检索所使用的专利工具与数据库)</strong></td>
+                </tr>
+                <tr>
+                    <td colspan="4">
+                        <el-checkbox-group v-model="checkList">
+                            <el-checkbox label="其他">其他</el-checkbox>
+                        </el-checkbox-group>
+                    </td>
+                </tr>
+                <tr>
+                    <td colspan="4"><strong>三、主要检索式</strong></td>
+                </tr>
+                <tr>
+                    <td colspan="4">
+                        <div class="height" >
+                            123 
+                        </div>
+                    </td>
+                </tr>
+                <tr>
+                    <td colspan="4"><strong>四、相关专利文献或非专利文献(例举相关专利列表;命名规则:DN-公开号,N为相关性排序的序号)</strong></td>
+                </tr>
+                <tr>
+                    <td class="center width"><strong>编号</strong></td>
+                    <td class="center width"><strong>公开号/公告号</strong></td>
+                    <td class="center width"><strong>公开日/公告日</strong></td>
+                    <td class="center"><strong>备注</strong></td>
+                </tr>
+                <tr>
+                    <td>1</td>
+                    <td>2</td>
+                    <td>3</td>
+                    <td>4</td>
+                </tr>
+                <tr>
+                    <td>1</td>
+                    <td>2</td>
+                    <td>3</td>
+                    <td>4</td>
+                </tr>
+                <tr>
+                    <td>1</td>
+                    <td>2</td>
+                    <td>3</td>
+                    <td>4</td>
+                </tr>
+                <tr>
+                    <td>1</td>
+                    <td>2</td>
+                    <td>3</td>
+                    <td>4</td>
+                </tr>
+                <tr>
+                    <td colspan="4"><strong>五、关于是否具有新颖性、创造性的结论:</strong></td>
+                </tr>
+                <tr>
+                    <td colspan="4">
+                        <div>
+                            <p><strong>5.1 有关检索项目的新颖性和/或创造性的</strong></p>
+                
+                            <div class="height">123456789</div>
+                        </div>
+                    </td>
+                </tr>
+                <tr>
+                    <td colspan="4">
+                        <div>
+                            <p><strong>5.2 检索结论:</strong></p>
+
+                            <div class="height">123456789</div>
+                        </div>
+                    </td>
+                </tr>
+                <tr>
+                    <td class="blue_white" colspan="4"><strong>注:</strong></td>
+                </tr>
+                <tr>
+                    <td colspan="4">
+                        <p><strong>1. 检索结果仅供参考,不作为任何法律依据。</strong></p>
+                        <p>2. 文件名命名要求:CATL案号-代理机构案号-案情检索报告-日期(报告完成日)</p>
+                        <p>3. 对比文件命名规则:例如“D1-CN1234567A”</p>
+                        <p>4. 代理机构启动核稿流程一律<strong>必须</strong>上传“案情检索报告”和相关的对比文件。</p>
+                        <p>5. 非必要邮件请<strong>勿抄送无关人员及CATL-IP邮箱</strong>(CATL-IP为我司流程特定邮箱)</p>
+                    </td>
+                </tr>
+            </table>
+        </div>
+  </div>

+ 3 - 3
public/reportTemplate/noveltyCommon/noveltyCommon.txt

@@ -4,7 +4,7 @@
     </div>
     <div class="mainContent">
         <div class="title">一、专利性检索结论:</div>
-        <div class="content" v-html="getColumnData('baseMessage','finalConclusions',setValue([{value:dataObj.baseMessage.preliminaryConclusions},{value:'因此建议'} ,{value:dataObj.baseMessage.applicationAdvice}]))"></div>
+        <div class="content" v-html="getColumnData('baseMessage','finalConclusions',setValue([{value:dataObj.baseMessage.preliminaryConclusions} ,{value:dataObj.baseMessage.applicationAdvice}]))"></div>
     </div>
     <div class="mainContent">
         <div class="title">二. 专利申请信息</div>
@@ -251,7 +251,7 @@
                     <div class="title1">结论:</div>
                     <div class="content">
                         <div v-if="isEdit('baseMessage','preliminaryConclusions')">
-                            <myRichText v-model="reportData.baseMessage.preliminaryConclusions" customStyle="border:none;padding:0" :autoFocus="true" @blur="(value)=>saveMessage(value,(value)=>{this.reportData.baseMessage.finalConclusions = setValue([{value:value},{value:'因此建议'} ,{value:reportData.baseMessage.applicationAdvice}])})"></myRichText>
+                            <myRichText v-model="reportData.baseMessage.preliminaryConclusions" customStyle="border:none;padding:0" :autoFocus="true" @blur="(value)=>saveMessage(value,(value)=>{this.reportData.baseMessage.finalConclusions = setValue([{value:value} ,{value:reportData.baseMessage.applicationAdvice}])})"></myRichText>
                         </div>
                         <div v-else v-html="getColumnData('baseMessage','preliminaryConclusions',dataObj.baseMessage.preliminaryConclusions)"></div>
                     </div>
@@ -263,7 +263,7 @@
                     <div class="title1">建议:</div>
                     <div class="content">
                         <div v-if="isEdit('baseMessage','applicationAdvice')">
-                            <myRichText v-model="reportData.baseMessage.applicationAdvice" customStyle="border:none;padding:0" :autoFocus="true" @blur="(value)=>saveMessage(value,(value)=>{this.reportData.baseMessage.finalConclusions = setValue([{value:reportData.baseMessage.preliminaryConclusions},{value:'因此建议'} ,{value:value}])})"></myRichText>
+                            <myRichText v-model="reportData.baseMessage.applicationAdvice" customStyle="border:none;padding:0" :autoFocus="true" @blur="(value)=>saveMessage(value,(value)=>{this.reportData.baseMessage.finalConclusions = setValue([{value:reportData.baseMessage.preliminaryConclusions},{value:value}])})"></myRichText>
                         </div>
                         <div v-else v-html="getColumnData('baseMessage','applicationAdvice',dataObj.baseMessage.applicationAdvice)"></div>
                     </div>

+ 2 - 2
src/views/noveltySearch/components/dialog/inventionPoint/inventionPoint.vue

@@ -96,7 +96,7 @@
         </div>
 
         <!-- 对比文件 -->
-        <div v-if="contrastFileList.length>0" style="border-top:1px solid black;margin-top:20px">
+        <div v-if="contrastFileList.length>0" class="main_result" style="border-top:1px solid black;margin-top:20px">
           <div class="main_head">
             <span style="font-size:12px">对比文件:</span>
             <div>
@@ -461,7 +461,7 @@ export default {
         }
         .result {
           margin-top: 10px;
-          height: 300px;
+          max-height: 300px;
           overflow: auto;
           display: flex;
           flex-direction: column;

+ 18 - 0
src/views/noveltySearch/components/exportReport/components/mixins.js

@@ -72,11 +72,29 @@ export default{
             for(var i = 0;i<data.length;i++){
                 var str2 = data[i].value
                 if(str2){
+                    str2 = str2.trim()
+                    var char = str2.slice(-1)
+                    var sign = this.isPunctuation(char)
+                    if(sign){
+                        str2 = str2.substring(0,str2.length-1)
+                    }
                     str+=str2
+                    if(i == data.length - 1){
+                        str+='。'
+                    }else{
+                        str+=','
+                    }
                 }
             }
             return str
         },
+        //判断是不是标点符号
+        isPunctuation(char) {  
+            // 定义一个更全面的标点符号正则表达式,基于 Unicode 范围  
+            const punctuationRegex = /[\p{P}\p{So}]/u;  
+            // 测试字符是否匹配正则表达式  
+            return punctuationRegex.test(char);  
+        },
         getColumnData(field,property,value){
             var key = field + '-' + property
             if(!this.editModel && !this.hasCopy[key]){