From 4cac5876dda4a77a8ab36001dc70f3f70cf2e24c Mon Sep 17 00:00:00 2001
From: Renpc-kilig <308442850@qq.com>
Date: Mon, 21 Jun 2021 17:27:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E7=8F=AD=E8=AE=A1=E5=88=92=E5=96=9D?=
=?UTF-8?q?=E8=80=83=E8=AF=95=E7=94=B3=E8=AF=B7=E5=88=97=E8=A1=A8=E6=96=B0?=
=?UTF-8?q?=E5=A2=9E=E5=AE=A1=E6=A0=B8=E4=BA=BA=E8=A7=92=E8=89=B2=E6=A0=8F?=
=?UTF-8?q?=E7=9B=AE=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../static/route/examapply/list-check.html | 45 +++++++++++--------
.../static/route/examcheck/list.html | 45 +++++++++++--------
2 files changed, 54 insertions(+), 36 deletions(-)
diff --git a/src/main/resources/static/route/examapply/list-check.html b/src/main/resources/static/route/examapply/list-check.html
index 2ab26d9..14dc9c3 100644
--- a/src/main/resources/static/route/examapply/list-check.html
+++ b/src/main/resources/static/route/examapply/list-check.html
@@ -213,6 +213,33 @@
[
{type:'checkbox', fixed: 'left'},
{field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '{{d.LAY_INDEX}}'},
+ {field: 'point', width: 180, title: '审核人角色', align:'center',
+ templet: function(row) {
+ var rowData = row[this.field];
+ if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+ return '-';
+ }
+ return rowData;
+ }
+ },
+ {field: 'checkStatus', width: 150, title: '审批状态', align:'center',
+ templet: function(row) {
+ var rowData = row[this.field];
+ if(typeof(rowData) === 'undefined' || rowData === null || rowData === '') {
+ return '-';
+ }
+ if(rowData == '0') {
+ rowData = '待审批';
+ }
+ if(rowData == '1') {
+ rowData = '审批通过';
+ }
+ if(rowData == '2') {
+ rowData = '审批驳回';
+ }
+ return rowData;
+ }
+ },
{field: 'planName', width: 180, title: '计划名称', align:'center',
templet: function(row) {
point = row['point'];
@@ -285,24 +312,6 @@
return rowData;
}
},
- {field: 'checkStatus', width: 150, title: '审批状态', align:'center',
- templet: function(row) {
- var rowData = row[this.field];
- if(typeof(rowData) === 'undefined' || rowData === null || rowData === '') {
- return '-';
- }
- if(rowData == '0') {
- rowData = '待审批';
- }
- if(rowData == '1') {
- rowData = '审批通过';
- }
- if(rowData == '2') {
- rowData = '审批驳回';
- }
- return rowData;
- }
- },
{field: 'reason', width: 150, title: '审核原因', align:'center',
templet: function(row) {
var rowData = row[this.field];
diff --git a/src/main/resources/static/route/examcheck/list.html b/src/main/resources/static/route/examcheck/list.html
index b6e3e65..7ca4eac 100644
--- a/src/main/resources/static/route/examcheck/list.html
+++ b/src/main/resources/static/route/examcheck/list.html
@@ -198,6 +198,33 @@
[
{type:'checkbox', fixed: 'left'},
{field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '{{d.LAY_INDEX}}'},
+ {field: 'point', width: 180, title: '审核人角色', align:'center',
+ templet: function(row) {
+ var rowData = row[this.field];
+ if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+ return '-';
+ }
+ return rowData;
+ }
+ },
+ {field: 'checkStatus', width: 180, title: '审核状态', align:'center',
+ templet: function(row) {
+ var rowData = row[this.field];
+ if(typeof(rowData) === 'undefined' || rowData === null || rowData === '') {
+ return '-';
+ }
+ if('0' == rowData) {
+ rowData = '待审核';
+ }
+ if('1' == rowData) {
+ rowData = '审核通过';
+ }
+ if('-1' == rowData) {
+ rowData = '审核驳回';
+ }
+ return rowData;
+ }
+ },
{field: 'planName', width: 180, title: '计划名称', align:'center',
templet: function(row) {
var rowData = row.classPlanDTO[this.field];
@@ -268,24 +295,6 @@
return rowData;
}
},
- {field: 'checkStatus', width: 180, title: '审核状态', align:'center',
- templet: function(row) {
- var rowData = row[this.field];
- if(typeof(rowData) === 'undefined' || rowData === null || rowData === '') {
- return '-';
- }
- if('0' == rowData) {
- rowData = '待审核';
- }
- if('1' == rowData) {
- rowData = '审核通过';
- }
- if('-1' == rowData) {
- rowData = '审核驳回';
- }
- return rowData;
- }
- },
{field: 'reason', width: 180, title: '审核原因', align:'center',
templet: function(row) {
var rowData = row[this.field];