|
@@ -90,9 +90,7 @@
|
|
|
</p>
|
|
|
<div v-else 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')">
|
|
|
- <!-- {{scope.row.explainText}} -->
|
|
|
- </div>
|
|
|
+ @blur="getValue(scope.row,'explainText')" v-on:paste="handlePaste($event,scope.row,'explainText')"></div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="targetDescription" align="center" label="标的说明(可粘贴图片)" min-width="300px">
|
|
@@ -102,9 +100,7 @@
|
|
|
</div> -->
|
|
|
<div style="width:100%;outline: #dcdfe6;border:1px solid #DCDFE6;border-radius:5px" id="preview" contenteditable="true"
|
|
|
v-html="scope.row.targetDescription" @input="saveValue($event.target.innerHTML)" @click="saveValue($event.target.innerHTML)"
|
|
|
- @blur="getValue(scope.row,'targetDescription')" v-on:paste="handlePaste($event,scope.row,'targetDescription')">
|
|
|
- <!-- {{scope.row.explainText}} -->
|
|
|
- </div>
|
|
|
+ @blur="getValue(scope.row,'targetDescription')" v-on:paste="handlePaste($event,scope.row,'targetDescription')"> </div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
|
|
@@ -521,12 +517,22 @@
|
|
|
if (this.tableData[i].compareDescription2 ==undefined) {
|
|
|
this.tableData[i].compareDescription2=''
|
|
|
}
|
|
|
- if (this.tableData[i].targetDescription!=this.tableData[i].targetDescription2||this.tableData[i].compareDescription!=this.tableData[i].compareDescription2||this.tableData[i].compareResult != this.tableData[i].compareResult2) {
|
|
|
- this.tableData[i].isDelShow=1
|
|
|
- } else {
|
|
|
- this.tableData[i].isDelShow=0
|
|
|
- //console.log(2);
|
|
|
+ if(this.tableData[i].targetDescription2!='' || this.tableData[i].compareDescription2!='' || this.tableData[i].compareResult2!=''){
|
|
|
+ if (this.tableData[i].targetDescription!=this.tableData[i].targetDescription2||this.tableData[i].compareDescription!=this.tableData[i].compareDescription2||this.tableData[i].compareResult != this.tableData[i].compareResult2) {
|
|
|
+ this.tableData[i].isDelShow=1
|
|
|
+ } else {
|
|
|
+ this.tableData[i].isDelShow=0
|
|
|
+ //console.log(2);
|
|
|
+ }
|
|
|
+ }else{
|
|
|
+ this.tableData[i].isDelShow = 0
|
|
|
}
|
|
|
+ // if (this.tableData[i].targetDescription!=this.tableData[i].targetDescription2||this.tableData[i].compareDescription!=this.tableData[i].compareDescription2||this.tableData[i].compareResult != this.tableData[i].compareResult2) {
|
|
|
+ // this.tableData[i].isDelShow=1
|
|
|
+ // } else {
|
|
|
+ // this.tableData[i].isDelShow=0
|
|
|
+ // //console.log(2);
|
|
|
+ // }
|
|
|
}
|
|
|
//console.log(this.tableData);
|
|
|
},
|
|
@@ -609,11 +615,14 @@
|
|
|
if (row.compareDescription2 ==undefined) {
|
|
|
row.compareDescription2=''
|
|
|
}
|
|
|
- if (row.targetDescription!=row.targetDescription2||row.compareDescription!=row.compareDescription2||row.compareResult != row.compareResult2) {
|
|
|
+ if(row.targetDescription2!=''||row.compareDescription2!=''||row.compareResult2!=''){
|
|
|
+ if (row.targetDescription!=row.targetDescription2||row.compareDescription!=row.compareDescription2||row.compareResult != row.compareResult2) {
|
|
|
|
|
|
- return 'success-rowCheck';
|
|
|
+ return 'success-rowCheck';
|
|
|
|
|
|
- }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
},
|
|
|
//拆分权要
|
|
|
splitPatentRight() {//patentRightVos
|
|
@@ -812,7 +821,9 @@
|
|
|
handleClick(row) {
|
|
|
row.targetDescription=row.targetDescription2
|
|
|
row.compareDescription=row.compareDescription2
|
|
|
- row.compareResult = Number(row.compareResult2)
|
|
|
+ if(row.compareResult2!=''){
|
|
|
+ row.compareResult = Number(row.compareResult2)
|
|
|
+ }
|
|
|
this.$message.success("修改成功,请进行保存")
|
|
|
},
|
|
|
// 全部修改
|