From 331e53e3c80c6515a8b12b03711cb321f20960b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=99=93=E7=90=AA?= <y1530857136@163.com>
Date: Wed, 2 Nov 2022 17:58:46 +0800
Subject: [PATCH] =?UTF-8?q?app2.0=20=E8=AF=B7=E5=81=87=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StuAttendanceLeave/list.vue               | 58 ++++++++++++-------
 .../StuAttendanceLeave/single.vue             |  8 +--
 2 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuAttendanceLeave/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuAttendanceLeave/list.vue
index 0941de7c9..bf41ee1f4 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuAttendanceLeave/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuAttendanceLeave/list.vue	
@@ -31,7 +31,7 @@
 			  <text class="customlist-item-field-title">审核状态：</text> 
 			  {{ displayListItem(item, 'CheckStatus') || '--' }}
 			</view>
-            <l-customlist-action :showButton="!checkDisable&&item.CheckStatus === '1'" :buttonText="'审核'" @join="action('check',item)" :showEdit="item.CheckStatus === '0'" @edit="action('edit', item.Id)" :showDelete="item.CheckStatus === '0'" @delete="action('delete', item.Id)" @view="action('view', item.Id)" /> 
+            <l-customlist-action :showButton="!checkDisable&&['0','1'].includes(item.CheckStatus)" :buttonText="item.CheckStatus==='1'?'审核':'提交'" @join="action(item.CheckStatus==='1'?'check':'submit',item)" :showEdit="item.CheckStatus === '0'" @edit="action('edit', item.Id)" :showDelete="item.CheckStatus === '0'" @delete="action('delete', item.Id)" @view="action('view', item.Id)" /> 
           </view> 
         </l-customlist> 
       </l-scroll-list> 
@@ -89,6 +89,7 @@
 	  </view>
 	  <l-button @click="action('checkAgree','1')" color="blue" class="block" block>同意</l-button>
 	  <l-button @click="action('checkAgree','2')" color="red" class="block margin-top-sm" block>不同意</l-button>
+	  
 	  <l-button @click="modal = false" line="blue" class="block margin-top-sm" block>取消</l-button>
 	</l-modal>
   </view>
@@ -177,8 +178,7 @@ export default {
   
   methods: { 
     // 页面初始化 
-    async init() { 
-		console.log(this.GET_GLOBAL('loginUser'))
+    async init() {
 		if(['教师','管理员'].includes(this.GET_GLOBAL('loginUser').Description)){
 			this.checkDisable = false
 		}
@@ -288,25 +288,41 @@ export default {
 		    return
 			
 		  case 'checkAgree':
-			// if (!(await this.CONFIRM('删除项目', '确定要删除该项吗？', true))) {
-			//   return
-			// } 
-			this.modal = false
-			const postData = {
-				keyValue:this.selectItem.Id,
-				strEntity:JSON.stringify({
-						...this.selectItem,
-						CheckStatus:id,
-						CheckUserNo:this.GET_GLOBAL('loginUser').account,
-						CheckUserId:this.GET_GLOBAL('loginUser').userId,
-					})
-			}
-			this.HTTP_POST('learun/adms/stuleavemanagement/savecheck',postData , '提交失败').then(success => { 
-			  if(!success) { return } 
-			  this.TOAST('提交成功', 'success') 
-			  this.refreshList() 
-			}) 
+				this.modal = false
+				const postData = {
+					keyValue:this.selectItem.Id,
+					strEntity:JSON.stringify({
+							...this.selectItem,
+							CheckStatus:id,
+							CheckUserNo:this.GET_GLOBAL('loginUser').account,
+							CheckUserId:this.GET_GLOBAL('loginUser').userId,
+						})
+				}
+				this.HTTP_POST('learun/adms/stuleavemanagement/savecheck',postData , '提交失败').then(success => { 
+				  if(!success) { return } 
+				  this.TOAST('提交成功', 'success') 
+				  this.refreshList() 
+				})
 			return
+			
+			case 'submit':
+				if (!(await this.CONFIRM('提交申请', '是否确认提交请假申请？', true))) {
+				  return
+				} 
+				const postdata = {
+					keyValue:id.Id,
+					strEntity:JSON.stringify(id)
+				}
+				  
+				this.HTTP_POST('learun/adms/stuleavemanagement/submit', postdata, '表单提交保存失败').then(success => { 
+				  this.HIDE_LOADING() 
+				  if (!success) { 
+					return
+				  } 
+				  this.TOAST('提交保存成功') 
+				  this.refreshList() 
+				}) 
+				return
   
         default: 
           return
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuAttendanceLeave/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuAttendanceLeave/single.vue
index 0b39a438f..5f790a45a 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuAttendanceLeave/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuAttendanceLeave/single.vue	
@@ -57,12 +57,12 @@
   
     <view v-if="ready && edit" class="bg-white margin-tb padding" style="padding-top: 0; overflow: hidden;"> 
 		<template v-if="edit">
-		  <l-button v-if="edit" @click="action('save','0')" size="lg" color="green" class="block margin-top" block> 
+		  <l-button v-if="edit" @click="action('save')" size="lg" color="green" class="block margin-top" block> 
 			保存草稿
 		  </l-button> 
-		  <l-button v-if="edit&&getValue('StuMail.CheckStatus') === '0'" @click="action('save','1')" size="lg" color="blue" class="block margin-top" block>
+		  <!-- <l-button v-if="edit&&getValue('StuMail.CheckStatus') === '0'" @click="action('save','1')" size="lg" color="blue" class="block margin-top" block>
 			提交申请
-		  </l-button> 
+		  </l-button> -->
 		</template>
       <!-- <l-button v-if="!edit && mode !== 'create'" @click="action('edit')" size="lg" line="orange" class="block margin-top" block> 
         编辑本页 
@@ -204,7 +204,7 @@ export default {
           this.LOADING('正在提交...') 
           const postData = await this.getPostData(this.id) 
   
-          this.HTTP_POST('learun/adms/stuleavemanagement/'+ (checkType === '0'?'save':'submit'), postData, '表单提交保存失败').then(success => { 
+          this.HTTP_POST('learun/adms/stuleavemanagement/save', postData, '表单提交保存失败').then(success => { 
             this.HIDE_LOADING() 
             if (!success) { 
               return