|
|
@@ -1,32 +1,14 @@
|
|
|
<template>
|
|
|
<div style="padding:20px">
|
|
|
- <!-- <div style="display: flex; justify-content: space-between;margin:20px 0px 20px 0 ;">
|
|
|
- <el-button-group>
|
|
|
- <el-button @click="merge" :disabled="checkList.length > 1 ? false : true">合并</el-button>
|
|
|
- <el-button @click="split" :disabled="checkList.length > 0 ? false : true">拆分</el-button>
|
|
|
- </el-button-group>
|
|
|
- <div>
|
|
|
- <el-select placeholder="请选择拆分类型" v-model="splitType1" style="margin-left: 50px;"
|
|
|
- @change="splitTypeSelect($event)">
|
|
|
- <el-option label="仅拆主权要" value="0"></el-option>
|
|
|
- <el-option label="全部拆分" value="1"></el-option>
|
|
|
- </el-select>
|
|
|
- <el-select placeholder="请选择拆分符号" v-model="splitBy1" style="margin-left: 10px;" @change="splitBySelect($event)">
|
|
|
- <el-option label="逗号拆分" value="0"></el-option>
|
|
|
- <el-option label="分号拆分" value="1"></el-option>
|
|
|
- <el-option label="逗号和分号拆分" value="2"></el-option>
|
|
|
- </el-select>
|
|
|
- <el-select placeholder="请选择显示类型" v-model="Type" style="margin-left: 10px;" @change="TypeSelect($event)">
|
|
|
- <el-option label="仅显示主权要" value="1"></el-option>
|
|
|
- <el-option label="全部显示" value="0"></el-option>
|
|
|
- </el-select>
|
|
|
- </div>
|
|
|
- <div>
|
|
|
- <el-button @click="keep" type="primary">保存</el-button>
|
|
|
- </div>
|
|
|
-
|
|
|
- </div> -->
|
|
|
- <el-button @click="taskWork" type="primary" size="small" style="float: right;margin-bottom: 10px;">协同办公</el-button>
|
|
|
+
|
|
|
+ <div style="display: flex;justify-content: center;margin-bottom: 10px;">
|
|
|
+ <el-select placeholder="请选择显示类型" v-model="Type" style="" @change="TypeSelect($event)">
|
|
|
+ <el-option label="仅显示主权要" value="1"></el-option>
|
|
|
+ <el-option label="全部显示" value="0"></el-option>
|
|
|
+ </el-select>
|
|
|
+ </div>
|
|
|
+
|
|
|
+ <!-- <el-button @click="taskWork" type="primary" size="small" style="float: right;margin-bottom: 10px;">协同办公</el-button> -->
|
|
|
<template>
|
|
|
<el-table :data="tableData" border ref="table" :span-method="objectSpanMethod" v-loading="loading"
|
|
|
style="width: 100%" :height="tableHeight">
|
|
|
@@ -40,40 +22,23 @@
|
|
|
<el-table-column prop="content" label="特征" width="300" align="center">
|
|
|
<template slot-scope="scope">
|
|
|
<p> {{ scope.row.content }}</p>
|
|
|
- <!-- <el-checkbox-group v-model="checkList">
|
|
|
- <el-checkbox :label="scope.row.id" @change="getRow(scope)" style="display: flex;align-items: center;">
|
|
|
- <el-input type="textarea" style="width:250px" autosize v-model="scope.row.content">
|
|
|
- {{ scope.row.content }}</el-input>
|
|
|
- </el-checkbox>
|
|
|
- </el-checkbox-group> -->
|
|
|
+
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="explainText" label="解释(可粘贴图片)" align="center">
|
|
|
+ <el-table-column prop="explainText" label="解释" align="center">
|
|
|
<template slot-scope="scope">
|
|
|
<p style="width:100%;outline: #dcdfe6;"
|
|
|
v-html="scope.row.explainText" >
|
|
|
</p>
|
|
|
- <!-- <div style="width:100%;outline: #dcdfe6;border:1px solid #DCDFE6;border-radius:5px" id="preview"
|
|
|
- contenteditable="true" v-html="scope.row.explainText" @input="saveValue($event.target.innerHTML)"
|
|
|
- @click="saveValue($event.target.innerHTML)" @blur="getValue(scope.row, 'explainText')"
|
|
|
- v-on:paste="handlePaste($event, scope.row, 'explainText')">
|
|
|
-
|
|
|
- </div> -->
|
|
|
- <!-- <el-input type="textarea" style="width:250px" autosize v-model="scope.row.explainText"> {{scope.row.explainText}}</el-input> -->
|
|
|
+
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="littleDirection" label="回避设计方向(可粘贴图片)" align="center">
|
|
|
+ <el-table-column prop="littleDirection" label="回避设计方向" align="center">
|
|
|
<template slot-scope="scope">
|
|
|
<p style="width:100%;outline: #dcdfe6;"
|
|
|
v-html="scope.row.littleDirection" >
|
|
|
</p>
|
|
|
- <!-- <div style="width:100%;outline: #dcdfe6;border:1px solid #DCDFE6;border-radius:5px" id="preview"
|
|
|
- contenteditable="true" v-html="scope.row.littleDirection" @input="saveValue($event.target.innerHTML)"
|
|
|
- @click="saveValue($event.target.innerHTML)" @blur="getValue(scope.row, 'littleDirection')"
|
|
|
- v-on:paste="handlePaste($event, scope.row, 'littleDirection')">
|
|
|
-
|
|
|
- </div> -->
|
|
|
- <!-- <el-input type="textarea" style="width:250px" autosize v-model="scope.row.littleDirection"> {{scope.row.littleDirection}}</el-input> -->
|
|
|
+
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
@@ -86,17 +51,10 @@
|
|
|
v-html="textarea1.wholeDirection" >
|
|
|
</p>
|
|
|
</div>
|
|
|
-
|
|
|
- <!-- <div style="min-height:60px;outline: #dcdfe6;border:1px solid #DCDFE6;border-radius:5px;padding: 10px;"
|
|
|
- id="preview" class="edit-box" contenteditable="true" placeholder="请输入回避设计总体方向（可粘贴图片）"
|
|
|
- v-html="textarea1.wholeDirection" @input="saveValue($event.target.innerHTML)"
|
|
|
- @click="saveValue($event.target.innerHTML)" @blur="getValue(textarea1, 'wholeDirection')"
|
|
|
- v-on:paste="handlePaste($event, textarea1, 'wholeDirection')">
|
|
|
- </div> -->
|
|
|
</div>
|
|
|
|
|
|
</div>
|
|
|
- <sendCollaboration :visibleCollaborations="visibleWork" @collaboration="collaboration" :reportId="reportId" :reportType="row.type" :patentNo1="row.signPatentNo"></sendCollaboration>
|
|
|
+ <sendCollaboration :visibleCollaborations="visibleWork" @collaboration="collaboration" :reportId="reportId" :reportType="row.type" :patentNo1="row.signPatentNo" :choiceFormS="choiceFormS" :selected="selected"></sendCollaboration>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
@@ -115,8 +73,6 @@ export default {
|
|
|
tableData: [],
|
|
|
tableData1: [],
|
|
|
checkList: [],
|
|
|
- // splitType1:this.$s.getSession('reportMessage1').splitType?this.$s.getSession('reportMessage1').splitType.toString():"0",//拆分类型0仅拆主权要，1全部拆分
|
|
|
- // splitBy1: this.$s.getSession('reportMessage1').splitBy?this.$s.getSession('reportMessage1').splitBy.toString():"2",
|
|
|
splitType1: "0",//拆分类型0仅拆主权要，1全部拆分
|
|
|
splitBy1: "2",
|
|
|
Type: "0",
|
|
|
@@ -125,12 +81,14 @@ export default {
|
|
|
mergeObj: {},
|
|
|
typeArr: [1],//显示权要还是全部显示
|
|
|
loading: false,
|
|
|
- row: [],
|
|
|
+ rows: [],
|
|
|
Index_row: [],
|
|
|
isNum: 1,
|
|
|
isTypeBy: 0,
|
|
|
tableHeight: null,
|
|
|
visibleWork: false,
|
|
|
+ choiceFormS: {},
|
|
|
+ selected: [],
|
|
|
};
|
|
|
},
|
|
|
watch: {
|
|
|
@@ -141,10 +99,8 @@ export default {
|
|
|
},
|
|
|
},
|
|
|
mounted() {
|
|
|
- // console.log( this.$s.getSession('reportMessage1'),this.reportId);
|
|
|
- // this.splitPatentRight()
|
|
|
+
|
|
|
this.getSplitMessage()
|
|
|
- // console.log(this.reportId);
|
|
|
},
|
|
|
methods: {
|
|
|
setHeight() {
|
|
|
@@ -302,7 +258,7 @@ export default {
|
|
|
},
|
|
|
//获取每个元素所需合并的行数
|
|
|
getSpanArr(data) {
|
|
|
- this.row = []
|
|
|
+ this.rows = []
|
|
|
this.mergeArr.forEach((key, index1) => {
|
|
|
let count = 0;
|
|
|
this.mergeObj[key] = [];
|
zhuhao