|
|
@@ -129,70 +129,122 @@ export default {
|
|
|
loading: false,
|
|
|
row: [],
|
|
|
Index_row: [],
|
|
|
+ isNum:1,
|
|
|
};
|
|
|
},
|
|
|
mounted() {
|
|
|
- this.splitPatentRight()
|
|
|
+ // console.log( this.$s.getSession('reportMessage1'));
|
|
|
+ // this.splitPatentRight()
|
|
|
+ this.getSplitMessage()
|
|
|
},
|
|
|
methods: {
|
|
|
//完成
|
|
|
// finish() {
|
|
|
-
|
|
|
+ // this.$confirm('请您确定任务不再修改, 是否继续?', '提示', {
|
|
|
+ // confirmButtonText: '确定',
|
|
|
+ // cancelButtonText: '取消',
|
|
|
+ // type: 'warning'
|
|
|
+ // }).then(() => {
|
|
|
+ // this.$message.success("任务已完成")
|
|
|
+ // // this.$api
|
|
|
+ // }).catch(() => {
|
|
|
+ // this.$message.info("任务继续进行")
|
|
|
+ // });
|
|
|
// },
|
|
|
+ getSplitMessage() {
|
|
|
+ let a = {
|
|
|
+ taskId:null,
|
|
|
+ patentNo:null,
|
|
|
+ reportId: this.reportId,
|
|
|
+ }
|
|
|
+ this.$api.getSplitMessage(a).then(res => {
|
|
|
+ console.log(res);
|
|
|
+ if (res.code == 200) {
|
|
|
+ console.log(JSON.stringify(res.data) =='{}');
|
|
|
+ if (JSON.stringify(res.data) =='{}') {
|
|
|
+ this.isNum=1
|
|
|
+ } else {
|
|
|
+ this.isNum=0
|
|
|
+ }
|
|
|
+ this.splitPatentRight()
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
//初始拆分
|
|
|
splitPatentRight() {
|
|
|
this.loading = true
|
|
|
this.tableData1=[]
|
|
|
- let PatentRight = {
|
|
|
+ var PatentRight = {
|
|
|
patentNo: this.patentNo,
|
|
|
splitType: this.splitType1,
|
|
|
splitBy: this.splitBy1,
|
|
|
ReportId: this.reportId,
|
|
|
}
|
|
|
- this.$api.splitPatentRight(PatentRight).then(res => {
|
|
|
- if (res.code == 200) {
|
|
|
- let a=this.$s.getSession('reportMessage1')
|
|
|
- a.splitBy=res.data.splitBy.toString()
|
|
|
- a.splitType = res.data.splitType.toString()
|
|
|
- this.$s.setSession('reportMessage1',a)
|
|
|
- if (res.data.patentRightVos.length>0) {
|
|
|
- res.data.patentRightVos.forEach(RightVosItem => {
|
|
|
- if (RightVosItem.features.length>0) {
|
|
|
- RightVosItem.features.forEach(FeaturesItem => {
|
|
|
- FeaturesItem.pRightName=RightVosItem.RightName
|
|
|
- FeaturesItem.pSignPatentNo=RightVosItem.signPatentNo
|
|
|
- FeaturesItem.pContentOut=RightVosItem.contentOut
|
|
|
- FeaturesItem.pContent=RightVosItem.content
|
|
|
- FeaturesItem.pReportId=RightVosItem.reportId
|
|
|
- FeaturesItem.pPatentId=RightVosItem.patentId
|
|
|
- FeaturesItem.pType=RightVosItem.type
|
|
|
- FeaturesItem.pSort=RightVosItem.sort
|
|
|
- if (!FeaturesItem.hasOwnProperty("explainText")) {
|
|
|
- FeaturesItem.explainText=FeaturesItem.contentOut
|
|
|
- } else {
|
|
|
- if (FeaturesItem.explainText=="") {
|
|
|
+ var PatentReportId = {
|
|
|
+ patentNo: this.patentNo,
|
|
|
+ reportId: this.reportId,
|
|
|
+ }
|
|
|
+ if (this.isNum==0) {
|
|
|
+ this.$api.getAvoidDesignDirection(PatentReportId).then(res => {
|
|
|
+ if (res.code==200) {
|
|
|
+ this.tableData1 = res.data.features
|
|
|
+ // this.tableData.pRightName = res.data.features.rightName
|
|
|
+ this.textarea1.wholeDirection = res.data.wholeDirection
|
|
|
+ this.tableData1.forEach(item => {
|
|
|
+ item.pRightName=res.data.features.rightName
|
|
|
+ })
|
|
|
+ this.TypeSelect(this.Type)
|
|
|
+ this.loading=false
|
|
|
+ }
|
|
|
+
|
|
|
+ })
|
|
|
+ } else {
|
|
|
+ this.$api.splitPatentRight(PatentRight).then(res => {
|
|
|
+ if (res.code == 200) {
|
|
|
+ let a=this.$s.getSession('reportMessage1')
|
|
|
+ a.splitBy=res.data.splitBy.toString()
|
|
|
+ a.splitType = res.data.splitType.toString()
|
|
|
+ this.$s.setSession('reportMessage1',a)
|
|
|
+ if (res.data.patentRightVos.length>0) {
|
|
|
+ res.data.patentRightVos.forEach(RightVosItem => {
|
|
|
+ if (RightVosItem.features.length>0) {
|
|
|
+ RightVosItem.features.forEach(FeaturesItem => {
|
|
|
+ FeaturesItem.pRightName=RightVosItem.RightName
|
|
|
+ FeaturesItem.pSignPatentNo=RightVosItem.signPatentNo
|
|
|
+ FeaturesItem.pContentOut=RightVosItem.contentOut
|
|
|
+ FeaturesItem.pContent=RightVosItem.content
|
|
|
+ FeaturesItem.pReportId=RightVosItem.reportId
|
|
|
+ FeaturesItem.pPatentId=RightVosItem.patentId
|
|
|
+ FeaturesItem.pType=RightVosItem.type
|
|
|
+ FeaturesItem.pSort=RightVosItem.sort
|
|
|
+ if (!FeaturesItem.hasOwnProperty("explainText")) {
|
|
|
FeaturesItem.explainText=FeaturesItem.contentOut
|
|
|
+ } else {
|
|
|
+ if (FeaturesItem.explainText=="") {
|
|
|
+ FeaturesItem.explainText=FeaturesItem.contentOut
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
- if (!FeaturesItem.hasOwnProperty("littleDirection")) {
|
|
|
- FeaturesItem.littleDirection=FeaturesItem.contentOut
|
|
|
- } else {
|
|
|
- if (FeaturesItem.littleDirection=="") {
|
|
|
+ if (!FeaturesItem.hasOwnProperty("littleDirection")) {
|
|
|
FeaturesItem.littleDirection=FeaturesItem.contentOut
|
|
|
+ } else {
|
|
|
+ if (FeaturesItem.littleDirection=="") {
|
|
|
+ FeaturesItem.littleDirection=FeaturesItem.contentOut
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
- this.tableData1.push(FeaturesItem)
|
|
|
- })
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
- })
|
|
|
+ this.tableData1.push(FeaturesItem)
|
|
|
+ })
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ })
|
|
|
+ }
|
|
|
+ console.log(this.tableData1);
|
|
|
+ this.TypeSelect(this.Type)
|
|
|
+ this.loading=false
|
|
|
}
|
|
|
- console.log(this.tableData1);
|
|
|
- this.TypeSelect(this.Type)
|
|
|
- this.loading=false
|
|
|
- }
|
|
|
- })
|
|
|
+ })
|
|
|
+ }
|
|
|
+
|
|
|
},
|
|
|
// 选择下拉框
|
|
|
splitTypeSelect(even) {
|
|
|
@@ -323,18 +375,14 @@ export default {
|
|
|
splitBy: this.tableData1[i].splitBy,
|
|
|
splitType: this.tableData1[i].splitType,
|
|
|
featuresOrder: this.tableData1[i].featuresOrder,
|
|
|
- id: this.tableData1[i].id,
|
|
|
+ partnerId: this.tableData1[i].partnerId,
|
|
|
+ rightId: this.tableData1[i].rightId,
|
|
|
+ rightType: this.tableData1[i].rightType,
|
|
|
+ // id: this.tableData1[i].id,
|
|
|
rightName: this.tableData1[i].rightName,
|
|
|
isFinal: this.tableData1[i].isFinal,
|
|
|
})
|
|
|
}
|
|
|
-// {
|
|
|
-// "reportId": 0,
|
|
|
-// "avoidDesignLittleDirectionDTOs": [
|
|
|
-// {}
|
|
|
-// ],
|
|
|
-// "wholeDirection": "string"
|
|
|
-// }
|
|
|
let keepStr = {
|
|
|
reportId: this.reportId,
|
|
|
avoidDesignLittleDirectionDTOs: keepArr,
|
