diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/Check/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/Check/list.vue
index 17ce388f0..4c86865a2 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/Check/list.vue
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/Check/list.vue
@@ -17,11 +17,18 @@
审核状态:
{{ CheckStatusitem(displayListItem(item, "CheckStatus")) }}
+
-
+
+
+
+
+ 审核时间:
+ {{ displayListItem(item, "CheckTime") }}
@@ -36,7 +43,7 @@
开始时间:
- {{ itmeDel(displayListItem(item, "StartTime")) }}
+ {{ itmeDel(displayListItem(item, "StartTime"))}}
@@ -49,10 +56,10 @@
{{ displayListItem(item, "LeaveDay") }}
-
+
学号:
@@ -75,7 +82,7 @@
- 系部:
+ 系部:
{{ displayListItem(item, "DeptNo") }}
@@ -85,8 +92,8 @@
- 班主任:
- {{ displayListItem(item, "ClassDiredctorNo") }}
+ 班主任:
+ {{ displayListItem(item, "ClassDiredctorNo") }}
@@ -94,9 +101,8 @@
{{ displayListItem(item, "ClassTutorNo") }}
-
+
@@ -121,7 +127,7 @@
-
+
@@ -155,7 +161,8 @@
// 数据项的数据类型、结构
scheme: {
CheckStatus: {
- type: "text"
+ type: "text",
+ // type: "select",dataSource: '1', dataSourceId: 'CheckStatus'
},
CheckRemark: {
type: "text"
@@ -164,10 +171,14 @@
type: "text"
},
CheckUserNo: {
- type: "select",dataSource: '1', dataSourceId: 'CheckUserNo'
+ type: "select",
+ dataSource: '1',
+ dataSourceId: 'CheckUserNo'
},
LeaveType: {
- type: "select",dataSource: '1', dataSourceId: 'LeaveType'
+ type: "select",
+ dataSource: '1',
+ dataSourceId: 'LeaveType'
},
StartTime: {
type: "text"
@@ -252,14 +263,14 @@
await this.init();
},
onUnload() {
- this.OFF("EducationalAdministrationStuLeaveManagement-list-change");
+ this.OFF("EducationalAdministrationStuLeaveManagementCheck-list-change");
},
methods: {
// 页面初始化
async init() {
this.ON(
- "EducationalAdministrationStuLeaveManagement-list-change",
+ "EducationalAdministrationStuLeaveManagementCheck-list-change",
this.refreshList
);
@@ -283,8 +294,6 @@
this.FETCH_DATASOURCE('CdMajorInfo').then(result => {
this.dataSource.MajorNo = result.data.map(t => ({ text: t.majorname, value: t.majorno }));
}),
-
-
]);
await this.fetchList();
// 初始化查询条件
@@ -299,7 +308,7 @@
}
const result = await this.HTTP_GET(
- "/Learun/adms/EducationalAdministration/StuLeaveManagement/pagelist", {
+ "/Learun/adms/EducationalAdministration/StuLeaveManagement/checkpagelist", {
// 这里 sidx 表示排序字段,sord 表示排序方式(DESC=降序,ASC=升序)
// 代码生成器生成时默认按照主键排序,您可以修改成按创建时间的字段降序
pagination: {
@@ -308,9 +317,7 @@
sidx: "CreateTime",
sord: "DESC"
},
- queryJson: JSON.stringify(Object.assign(this.searchData, {
- StuNo: this.user.account
- })),
+ queryJson: JSON.stringify(this.searchData),
},
"加载数据时出错"
);
@@ -385,7 +392,7 @@
return;
case "join":
// console.log(123);
- this.NAV_TO(`/pages/EducationalAdministration/StuLeaveManagement/list?meetId=${id}`);
+ this.NAV_TO(`/pages/EducationalAdministration/StuLeaveManagement/Check/list?meetId=${id}`);
return;
case "delete":
@@ -406,6 +413,18 @@
});
return;
+ case 'check':
+ await this.HTTP_GET('/Learun/adms/EducationalAdministration/StuLeaveManagement/ischeck', id)
+ .then(res => {
+ if (res) {
+ this.NAV_TO(`./single?type=edit&id=${id}`)
+ return
+ } else {
+ return;
+ }
+ })
+ return;
+
default:
return;
}
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/list.vue
index dc19ac20f..17ce388f0 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/list.vue
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/list.vue
@@ -36,12 +36,12 @@
开始时间:
- {{ displayListItem(item, "StartTime") }}
+ {{ itmeDel(displayListItem(item, "StartTime")) }}
结束时间:
- {{ displayListItem(item, "EndTime") }}
+ {{ itmeDel(displayListItem(item, "EndTime")) }}
@@ -466,6 +466,10 @@
LeaveTypeItem(data) {
},
+ itmeDel(data){
+ var newDate = /\d{4}-\d{1,2}-\d{1,2}/g.exec(data)
+ return newDate[0]
+ }
},
created() {
this.user = this.GET_GLOBAL('loginUser');