zhuliu пре 1 година
родитељ
комит
29f5099e35

+ 1 - 0
src/utils/model/RichText/index.vue

@@ -94,6 +94,7 @@ export default {
       var SplitHtmls = this.SplitHtmlTag1(this.$refs.myEditBox.innerHTML)
       //  var html = this.addTag(SplitHtmls,method)
        var html = this.changeHtml(SplitHtmls,method)
+      //  html = html.replace(/<highlight>/g,'').replace(/<\/highlight>/g,'')
       this.content = html
 
       this.$emit('input',html)

+ 0 - 1
src/utils/model/RichText/mixins.js

@@ -135,7 +135,6 @@ export default {
             var endIndex = 0
             var currentIndex = 0
             var currentIndex1 = 0
-            debugger
             for(var i = 0;i<data.length;i++){
                 // var a = data[i].text
                 // if(data[i].text.indexOf('&nbsp;')!=-1){

+ 1 - 1
src/views/product/components/view/productTable.vue

@@ -208,7 +208,7 @@ export default {
       this.$api.queryProduct(params).then(res => {
         if (res.code == 200) {
           if(type == 1){
-            var startIndex = (params.current-1)*size
+            var startIndex = (params.current-1)*params.size
             var endIndex = this.data.length
             var len = endIndex - startIndex
             this.data.splice(startIndex,len,...res.data.data)

+ 5 - 0
src/views/project/patentCollection/components/mixins/fastSelectPatent.js

@@ -224,5 +224,10 @@ export const fastSelectPatent = {
       }
       this.$refs.PatentBatchIndexVue.open(obj)
     },
+
+    //批量删除专利
+    deletePatents(){
+
+    },
   },
 }

+ 0 - 1
src/views/project/patentCollection/components/views/Table.vue

@@ -90,7 +90,6 @@
           <div v-else v-html="getView(scope.row, item.value, item.type)"></div>
         </template>
       </el-table-column>
-
     </el-table>
   </div>
 </template>

+ 2 - 1
src/views/project/patentCollection/index.vue

@@ -167,7 +167,7 @@
                   class="el-icon-arrow-down el-icon--right"></i></el-button>
             </el-popover>
 
-            <div v-show="patentNoList.length" class="margin-left_10">
+            <div v-show="selectedTotal > 0" class="margin-left_10">
               <el-dropdown size="medium">
                 <el-button type="primary" size="small">
                   批量操作<i class="el-icon-arrow-down el-icon--right"></i>
@@ -179,6 +179,7 @@
                     :disabled="!$permission('/workspace/folder/isRead')">未读</el-dropdown-item> -->
                   <el-dropdown-item @click.native="handleIndex">批量标引</el-dropdown-item>
                   <el-dropdown-item @click.native="checkPatentWorth">价值曲线</el-dropdown-item>
+                  <el-dropdown-item @click.native="deletePatents">删除</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </div>