|
@@ -70,11 +70,11 @@
|
|
</el-checkbox>
|
|
</el-checkbox>
|
|
</el-checkbox-group> -->
|
|
</el-checkbox-group> -->
|
|
<p v-if="typeFto==1" style="width:100%;outline: #dcdfe6;"
|
|
<p v-if="typeFto==1" style="width:100%;outline: #dcdfe6;"
|
|
- v-html="scope.row.content.trim()" >
|
|
|
|
|
|
+ v-html="scope.row.content" >
|
|
</p>
|
|
</p>
|
|
<el-checkbox-group v-else v-model="checkList" >
|
|
<el-checkbox-group v-else v-model="checkList" >
|
|
<el-checkbox :label="scope.row.id" @change="getFunInfo(scope.row,scope)" style="display: flex; align-items: center;">
|
|
<el-checkbox :label="scope.row.id" @change="getFunInfo(scope.row,scope)" style="display: flex; align-items: center;">
|
|
- <el-input type="textarea" style="width:250px" autosize v-model="scope.row.content"> {{scope.row.content.trim()}}</el-input>
|
|
|
|
|
|
+ <el-input type="textarea" style="width:250px" autosize v-model="scope.row.content"> {{scope.row.content}}</el-input>
|
|
</el-checkbox>
|
|
</el-checkbox>
|
|
</el-checkbox-group>
|
|
</el-checkbox-group>
|
|
</template>
|
|
</template>
|
|
@@ -342,13 +342,13 @@
|
|
}
|
|
}
|
|
for (var i = 0; i < this.row.length; i++) {
|
|
for (var i = 0; i < this.row.length; i++) {
|
|
if (i < row.length - 1) {
|
|
if (i < row.length - 1) {
|
|
- str = str + row[i].content.trim()
|
|
|
|
|
|
+ str = str + row[i].content
|
|
strText = strText + row[i].explainText
|
|
strText = strText + row[i].explainText
|
|
targetDescription = targetDescription + row[i].targetDescription
|
|
targetDescription = targetDescription + row[i].targetDescription
|
|
let Index = this.tableData1.findIndex(item => { return item.id == row[i].id })
|
|
let Index = this.tableData1.findIndex(item => { return item.id == row[i].id })
|
|
this.tableData1.splice(Index, 1)
|
|
this.tableData1.splice(Index, 1)
|
|
} else if (i == row.length - 1) {
|
|
} else if (i == row.length - 1) {
|
|
- str = str + row[i].content.trim()
|
|
|
|
|
|
+ str = str + row[i].content
|
|
targetDescription = targetDescription + row[i].targetDescription
|
|
targetDescription = targetDescription + row[i].targetDescription
|
|
strText = strText + row[i].explainText
|
|
strText = strText + row[i].explainText
|
|
}
|
|
}
|
|
@@ -652,7 +652,7 @@
|
|
a.forEach(item=>{
|
|
a.forEach(item=>{
|
|
if (!res.data.patentRightVos[i].features[m].hasOwnProperty(item)) {//hasOwnProperty判断属性是否存在
|
|
if (!res.data.patentRightVos[i].features[m].hasOwnProperty(item)) {//hasOwnProperty判断属性是否存在
|
|
if(item == 'explainText'){
|
|
if(item == 'explainText'){
|
|
- res.data.patentRightVos[i].features[m][item]=res.data.patentRightVos[i].features[m].contentOut.trim()
|
|
|
|
|
|
+ res.data.patentRightVos[i].features[m][item]=res.data.patentRightVos[i].features[m].contentOut
|
|
}else{
|
|
}else{
|
|
res.data.patentRightVos[i].features[m][item]=''
|
|
res.data.patentRightVos[i].features[m][item]=''
|
|
}
|
|
}
|