Merge branch 'dev' of http://47.106.221.167:8088/zhuliu/RMS-FrontEnd into dev

RMS-FrontEnd/src/views/report/FTO/FTOPage/components/ContrasrProduct.vue

@@ -310,7 +310,7 @@ export default {
         this.visibleWork=val
       },
     isRead(val) {
-      if(this.patentStatus2==0 && this.reportType != 4){
+      if(this.patentStatus2==0){
         this.changeStatus(val)
       }
       if(this.reportType == 4 && this.reportStatus == 1){

RMS-FrontEnd/src/views/report/FTO/FTOPage/components/PatentFeatures.vue

@@ -11,7 +11,7 @@
       <div>
         <!-- table按钮部分 -->
         <div style="margin-top:20px;display:flex;justify-content:space-between">
-          <el-button-group  v-if="show" >
+          <el-button-group :style="{visibility:show&&typeFto!=1?'visible':'hidden'}">
               <el-button @click="merge" :disabled="row.length>0?false:true">合并</el-button>
               <el-button @click="split" :disabled="row.length>0?false:true">拆分</el-button>
           </el-button-group>
@@ -135,7 +135,7 @@
           <el-table-column v-if="this.taskWorkRemakA==0" prop="compareResult2" align="center" label="协同比对结果" width="300px">
             <template slot-scope="scope">
               <div v-if="scope.row">
-                  <span v-if="scope.row.compareResult2.toString()!=''">{{ options.filter(item=>item.value==scope.row.compareResult2)[0].label }}</span> 
+                  <span v-if="scope.row.hasOwnProperty('compareResult2') && scope.row.compareResult2.toString()!=''">{{ options.filter(item=>item.value==scope.row.compareResult2)[0].label }}</span> 
                </div>
               <!-- <el-select v-model="scope.row.compareResult2" placeholder="请选择">
                 <el-option
@@ -239,7 +239,7 @@
     //   }
     // },
     mounted() {
-      this.show = this.isshow == false ? this.isshow : true
+      this.show = this.isshow == false ? this.isshow : this.show
       console.log(this.coordinationA, this.taskWorkRemakA);
       if (this.typeFto==1) {
         this.queryCompareMessage()

RMS-FrontEnd/src/views/report/reportDetails/components/taskDetails.vue

@@ -69,11 +69,11 @@
 			  <el-table-column prop="finishTime" label="实际完成时间" width="180" sortable  align="center"></el-table-column>
 			  <el-table-column prop="result" label="结果" sortable  align="center">
 				<template slot-scope="scope">
-					<div v-if="btnObj.filter(item=>{return item.value == scope.row.result}).length>0 && scope.row.type==0">
-						{{btnObj.filter(item=>{return item.value == scope.row.result})[0].label}}
+					<div v-if="scope.row.type==0">
+						<span v-if="btnObj.filter(item=>{return item.value == scope.row.result}).length>0">{{btnObj.filter(item=>{return item.value == scope.row.result})[0].label}}</span>
 					</div>
-					<div v-if="scope.row.type==3||scope.row.type==2&&scope.row.result">
-						{{finish}}
+					<div v-else>
+						{{status[scope.row.taskStatus]}}
 					</div>
 				</template>
 			  </el-table-column>
@@ -135,7 +135,10 @@
 		total: 0,
 		loading:false,
       showDialog: false,
-      finish: "完成",
+      // finish: {
+      //           '0':'未完成',
+      //           '1':'完成'
+      //         },
       status: ['未完成', '已完成','负责人处理中'],
       taskId: null,
       visible: false,

RMS-FrontEnd/src/views/task/MyHandle.vue

@@ -58,11 +58,11 @@
 			  <el-table-column prop="finishTime" label="实际完成时间" width="180" sortable  align="center" v-if="queryParams.taskStatus == 1"></el-table-column>
 			  <el-table-column prop="result" label="结果" sortable  align="center" v-if="queryParams.taskStatus == 1">
 				<template slot-scope="scope">
-					<div v-if="btnObj.filter(item=>{return item.value == scope.row.result}).length>0 && scope.row.type==0">
-						{{btnObj.filter(item=>{return item.value == scope.row.result})[0].label}}
+					<div v-if="scope.row.type==0">
+						<span v-if="btnObj.filter(item=>{return item.value == scope.row.result}).length>0">{{btnObj.filter(item=>{return item.value == scope.row.result})[0].label}}</span>
 					</div>
-					<div v-if="scope.row.type==3||scope.row.type==2">
-						{{finish}}
+					<div v-else>
+						{{status[scope.row.taskStatus]}}
 					</div>
 				</template>
 			  </el-table-column>
@@ -172,7 +172,10 @@
 		total: 0,
 		loading:false,
       showDialog: false,
-      finish: "完成",
+    //   finish: {
+	// 	'0':'未完成',
+	// 	'1':'完成'
+	//   },
       coordination:true,
 	  };
 	},