Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/Check/list.vue

@@ -17,18 +17,11 @@
 						<view class="customlist-item-field">
 							<text class="customlist-item-field-title">审核状态：</text>
 							{{ CheckStatusitem(displayListItem(item, "CheckStatus")) }}
-							<!-- {{ CheckStatusitem(item, "CheckStatus") }} -->
 						</view>
 
-						<!-- <view class="customlist-item-field">
+						<view class="customlist-item-field">
 							<text class="customlist-item-field-title">审核备注：</text>
 							{{ displayListItem(item, "CheckRemark") }}
-						</view> -->
-
-
-						<view class="customlist-item-field">
-							<text class="customlist-item-field-title">审核时间：</text>
-							{{ displayListItem(item, "CheckTime") }}
 						</view>
 
 						<view class="customlist-item-field">
@@ -43,7 +36,7 @@
 
 						<view class="customlist-item-field">
 							<text class="customlist-item-field-title">开始时间：</text>
-							{{ itmeDel(displayListItem(item, "StartTime"))}}
+							{{ itmeDel(displayListItem(item, "StartTime"))  }}
 						</view>
 
 						<view class="customlist-item-field">
@@ -56,10 +49,10 @@
 							{{ displayListItem(item, "LeaveDay") }}
 						</view>
 
-						<!-- <view class="customlist-item-field">
+						<view class="customlist-item-field">
 							<text class="customlist-item-field-title">请假事由：</text>
 							{{ displayListItem(item, "LeaveReason") }}
-						</view> -->
+						</view>
 
 						<view class="customlist-item-field">
 							<text class="customlist-item-field-title">学号：</text>
@@ -82,7 +75,7 @@
 						</view>
 
 						<view class="customlist-item-field">
-							<text class="customlist-item-field-title">系部：</text>
+			  		<text class="customlist-item-field-title">系部：</text>
 							{{ displayListItem(item, "DeptNo") }}
 						</view>
 
@@ -92,8 +85,8 @@
 						</view>
 
 						<view class="customlist-item-field">
-							<text class="customlist-item-field-title">班主任：</text>
-							{{ displayListItem(item, "ClassDiredctorNo") }}
+			 			<text class="customlist-item-field-title">班主任：</text>
+			  		{{ displayListItem(item, "ClassDiredctorNo") }}
 						</view>
 
 						<view class="customlist-item-field">
@@ -101,8 +94,9 @@
 							{{ displayListItem(item, "ClassTutorNo") }}
 						</view>
 
-						<l-customlist-action :showButton="!item.CheckStatus" buttonText="审核"
-							@join="action('check', item.Id)" @view="action('view', item.Id)" />
+						<l-customlist-action @join="action('join', item.Id)" :showEdit="!item.CheckStatus"
+							@edit="action('edit', item.Id)" :showDelete="!item.CheckStatus"
+							@delete="action('delete', item.Id)" @view="action('view', item.Id)" />
 					</view>
 				</l-customlist>
 			</l-scroll-list>
@@ -127,7 +121,7 @@
 			</view>
 		</scroll-view>
 
-		<!-- <l-customlist-add v-if="!sideOpen" @click="action('add')" /> -->
+		<l-customlist-add v-if="!sideOpen" @click="action('add')" />
 	</view>
 </template>
 
@@ -161,8 +155,7 @@
 				// 数据项的数据类型、结构
 				scheme: {
 					CheckStatus: {
-						type: "text",
-						// type: "select",dataSource: '1', dataSourceId: 'CheckStatus'
+						type: "text"
 					},
 					CheckRemark: {
 						type: "text"
@@ -171,14 +164,10 @@
 						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"
@@ -263,14 +252,14 @@
 			await this.init();
 		},
 		onUnload() {
-			this.OFF("EducationalAdministrationStuLeaveManagementCheck-list-change");
+			this.OFF("EducationalAdministrationStuLeaveManagement-list-change");
 		},
 
 		methods: {
 			// 页面初始化
 			async init() {
 				this.ON(
-					"EducationalAdministrationStuLeaveManagementCheck-list-change",
+					"EducationalAdministrationStuLeaveManagement-list-change",
 					this.refreshList
 				);
 
@@ -294,6 +283,8 @@
 					this.FETCH_DATASOURCE('CdMajorInfo').then(result => {
 						this.dataSource.MajorNo = result.data.map(t => ({ text: t.majorname, value: t.majorno }));
 					}),
+					
+					
 				]);
 				await this.fetchList();
 				// 初始化查询条件
@@ -308,7 +299,7 @@
 				}
 
 				const result = await this.HTTP_GET(
-					"/Learun/adms/EducationalAdministration/StuLeaveManagement/checkpagelist", {
+					"/Learun/adms/EducationalAdministration/StuLeaveManagement/pagelist", {
 						// 这里 sidx 表示排序字段，sord 表示排序方式(DESC=降序，ASC=升序)
 						// 代码生成器生成时默认按照主键排序，您可以修改成按创建时间的字段降序
 						pagination: {
@@ -317,7 +308,9 @@
 							sidx: "CreateTime",
 							sord: "DESC"
 						},
-						queryJson: JSON.stringify(this.searchData),
+						queryJson: JSON.stringify(Object.assign(this.searchData, {
+							StuNo: this.user.account
+						})),
 					},
 					"加载数据时出错"
 				);
@@ -392,7 +385,7 @@
 						return;
 					case "join":
 						// console.log(123);
-						this.NAV_TO(`/pages/EducationalAdministration/StuLeaveManagement/Check/list?meetId=${id}`);
+						this.NAV_TO(`/pages/EducationalAdministration/StuLeaveManagement/list?meetId=${id}`);
 						return;
 
 					case "delete":
@@ -413,18 +406,6 @@
 						});
 						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;
 				}