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

RMS-FrontEnd/src/views/report/Invalid/InvalidPage/AssignTasks.vue

@@ -280,6 +280,7 @@ export default {
           taskName:this.form.name,
           reportId:this.queryParams.reportId,
           endTime:this.form.date,
+          remark:this.form.remark,
           assigns:this.checkList,
         }
         if(this.params){

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

@@ -32,6 +32,7 @@
 			  <el-table-column prop="createName" label="发起人" width="150" align="center"></el-table-column>
 			  <el-table-column prop="createTime" label="创建时间" sortable width="180" align="center"></el-table-column>
 			  <el-table-column prop="endTime" label="期限" sortable width="200" align="center"></el-table-column>
+			  <el-table-column prop="remark" label="备注" sortable width="200" align="center"></el-table-column>
 			  <el-table-column prop="type" label="类型" sortable width="120" align="center">
 				<template slot-scope="scope">
 					<div>
@@ -369,7 +370,7 @@
 		var a = {
 			taskId:this.taskId,
 			status:1,
-			remark:this.remark,
+			// remark:this.remark,
 			result: this.btn.value,
 			reportStatus:this.btn.value
       }

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

@@ -35,6 +35,7 @@
 			  <el-table-column prop="createName" label="发起人" width="150" align="center"></el-table-column>
 			  <el-table-column prop="createTime" label="创建时间" sortable width="200" align="center"></el-table-column>
 			  <el-table-column prop="endTime" label="期限" sortable width="200" align="center"></el-table-column>
+			  <el-table-column prop="remark" label="备注" sortable width="200" align="center"></el-table-column>
 			  <el-table-column prop="type" label="类型" sortable width="150" align="center">
           <template slot-scope="scope">
             <div>