查出所有的待办和已办任务

src/dashoo.cn/backend/api/controllers/lims/limsdataentry.go

@@ -232,7 +232,9 @@ func (this *LimsDataEntryController) GetToDoList() {
 	var RoleSet auditsetting.Base_OilAuditSetting
 	rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
 	rsvc.GetAuditStepRoleEntity(OilAuditSettingName, this.User.DepartmentId, workflow.DATAAUDIT, &RoleSet)
-	processInstanceId = svcActiviti.GetMyTasks(RoleSet.WorkFlowCord, this.User.Id)
+	//processInstanceId = svcActiviti.GetMyTasks(RoleSet.WorkFlowCord, this.User.Id)
+	//查出所有的待办和已办任务
+	processInstanceId = svcActiviti.GetAllMyTasks(RoleSet.WorkFlowCord, this.User.Id)
 	if len(processInstanceId) <= 0 {
 		processInstanceId = "0"
 	}

src/dashoo.cn/frontend_web/src/pages/lims/checkequipmentlist/warning.vue

@@ -42,6 +42,8 @@
               </el-form-item>
             </el-form>
           </div>
+          <el-alert title="提示： 已过期为【红色】, 当月到期为【黄色】" type="warning" :closable="false">
+          </el-alert>
           <el-table :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby" :row-class-name="tableRowClassName" size="mini">
             <el-table-column label="操作" width="160px" align="center" fixed>
               <template slot-scope="scope">

src/dashoo.cn/frontend_web/src/pages/lims/dataentry/tacktodo.vue

@@ -1,13 +1,13 @@
 <template>
   <div>
-    <el-breadcrumb class="heading">
+    <!--<el-breadcrumb class="heading">
       <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
       <el-breadcrumb-item :to="{ path: '/lims/dataentry' }">检测数据录入</el-breadcrumb-item>
-    </el-breadcrumb>
-    <el-card class="box-card" style="height: calc(100vh - 115px);">
+    </el-breadcrumb>-->
+    <el-card class="box-card" style="height: calc(100vh - 105px);">
       <div slot="header">
         <span>
-          <i class="icon icon-table2"></i> 检测数据录入
+          <i class="icon icon-table2"></i> 数据录入
         </span>
         <span style="float: right; margin-top: -5px" class="cardrightform">
           <el-button type="primary" size="mini" @click="adddataentry">添加</el-button>
@@ -40,7 +40,7 @@
           </el-form-item>
         </el-form>
       </div>
-      <el-table :data="taskbalacelist" border height="calc(100vh - 243px)" :row-class-name="tableRowClassName"
+      <el-table :data="taskbalacelist" size="small" border height="calc(100vh - 243px)" :row-class-name="tableRowClassName"
         @sort-change="orderby" @selection-change="handleSelectionChange">
         <el-table-column label="操作" width="180" align="center" fixed>
           <template slot-scope="scope">