From fad74cd63c85b40c0b5bc611ba71ebff52a4019b Mon Sep 17 00:00:00 2001
From: ndbs <nabs@LAPTOP-FJ5VQJ6J>
Date: Tue, 14 Mar 2023 18:18:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E6=8C=89=E5=A4=A9=E8=AF=B7?=
 =?UTF-8?q?=E5=81=87=E5=8A=9F=E8=83=BD=20=E8=B0=83=E6=95=B4=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2,=E4=BF=AE=E6=94=B9=E7=BB=91=E5=AE=9A=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StuLeaveManagement/Check/list.vue         | 17 +++++---
 .../StuLeaveManagement/Check/single.vue       | 41 ++++++++++++++-----
 .../StuLeaveManagement/single.vue             | 35 +++++++++++++---
 3 files changed, 70 insertions(+), 23 deletions(-)

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 4c86865a2..ccbdfeb97 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	
@@ -26,7 +26,7 @@
 						</view> -->
 
 
-						<view class="customlist-item-field">
+						<!-- <view class="customlist-item-field">
 							<text class="customlist-item-field-title">审核时间：</text>
 							{{ displayListItem(item, "CheckTime") }}
 						</view>
@@ -34,7 +34,7 @@
 						<view class="customlist-item-field">
 							<text class="customlist-item-field-title">审核人：</text>
 							{{ displayListItem(item, "CheckUserNo") }}
-						</view>
+						</view> -->
 
 						<view class="customlist-item-field">
 							<text class="customlist-item-field-title">请假类型：</text>
@@ -391,7 +391,6 @@
 						this.NAV_TO(`./single?type=edit&id=${id}`);
 						return;
 					case "join":
-						// console.log(123);
 						this.NAV_TO(`/pages/EducationalAdministration/StuLeaveManagement/Check/list?meetId=${id}`);
 						return;
 
@@ -475,10 +474,16 @@
 			},
 			// 审核状态
 			CheckStatusitem(data) {
-				if (data) {
-					return data == '1' ? '通过' : '不通过'
+				if (data == '0') {
+					return '草稿'
+				} else if(data == '1') {
+					return '审核中'
+				} else if(data == '2') {
+					return '审核通过'
+				} else if(data == '3') {
+					return '审核未通过'
 				} else {
-					return '申请中'
+					return data
 				}
 			},
 			// 请假类型审核
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/Check/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/Check/single.vue
index 4ce7433c1..e7a516693 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/Check/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/Check/single.vue	
@@ -1,15 +1,24 @@
 <template>
   <view class="page">
     <view v-if="ready">
-      <l-select
+      <!-- <l-select
         @input="setValue('StuLeaveManagement.CheckStatus', $event)"
         :value="getValue('StuLeaveManagement.CheckStatus')"
         :range="dataSource.StuLeaveManagement.CheckStatus"
         title="审核状态"
 		:disabled="!edit"
 		required
-      />
-      <l-textarea
+      /> -->
+	  
+	  <l-input
+	    @input="setValue('StuLeaveManagement.CheckStatus', $event)"
+	    :value=" CheckStatusitem(getValue('StuLeaveManagement.CheckStatus'))"
+	    title="审核状态"
+		required
+		:disabled="!edit"
+	  />
+	  
+      <!-- <l-textarea
         @input="setValue('StuLeaveManagement.CheckRemark', $event)"
         :value="getValue('StuLeaveManagement.CheckRemark')"
         title="审核备注"
@@ -29,7 +38,7 @@
 	    title="审核人"
 		v-if="!edit"
 		:disabled="!edit"
-	  />
+	  /> -->
 	  <l-select
 	    @input="setValue('StuLeaveManagement.LeaveType', $event)"
 	    :value="getValue('StuLeaveManagement.LeaveType')"
@@ -188,7 +197,7 @@ export default {
       // 表单项数据结构
       scheme: {
         StuLeaveManagement: {
-          CheckStatus: { type: 'select', title: '审核状态', dataSource: '0',verify:"NotNull" },
+          CheckStatus: { type: 'text', title: '审核状态' },
           CheckRemark: { type: 'texteditor', title: '审核备注', },
 		  CheckTime:{ type: 'text', title: '审核人' },
 		  CheckUserNo: { type: 'select', title: '审核人',dataSource: '1' },
@@ -220,7 +229,7 @@ export default {
 			  ClassDiredctorNo:[],
 			  CheckUserNo:[],
 			  LeaveType: Object.values(this.GET_GLOBAL('dataDictionary').LeaveType).map(t => ({ value: t.value, text: t.text })),
-			  CheckStatus: Object.values(this.GET_GLOBAL('dataDictionary').LeaveCheck).map(t => ({ value: t.value, text: t.text }))
+			  // CheckStatus: Object.values(this.GET_GLOBAL('dataDictionary').LeaveCheck).map(t => ({ value: t.value, text: t.text }))
 		  }
       }
     }
@@ -242,7 +251,6 @@ export default {
       // 拉取表单数据，同时拉取所有来自数据源的选单数据
       await Promise.all([
 		  this.FETCH_DATASOURCE('bjsj').then(result => {
-		  			  console.log(result)
 		    this.dataSource.StuLeaveManagement.ClassNo = result.data.sort((a,b)=>{return b.classno-a.classno}).map(t => ({ text: t.classname, value: t.classno })) 
 		  }),
 		  this.FETCH_DATASOURCE('EmpInfo').then(result => {
@@ -258,7 +266,6 @@ export default {
 		  	this.dataSource.StuLeaveManagement.DeptNo = result.data.map(t => ({ text: t.deptname, value: t.deptno }));
 		  }),
 		  this.FETCH_DATASOURCE('CdMajorInfo').then(result => {
-		  			  console.log()
 		  	this.dataSource.StuLeaveManagement.MajorNo = result.data.map(t => ({ text: t.majorname, value: t.majorno }));
 		  }),
       ])
@@ -275,7 +282,6 @@ export default {
       } else {
         const result = await this.HTTP_GET('/Learun/adms/EducationalAdministration/StuLeaveManagement/form', this.id)
         this.origin = await this.formatFormData(result)
-		// console.log(this.origin,this.origin.prototype)
       }
       this.current = this.COPY(this.origin)
     },
@@ -293,7 +299,6 @@ export default {
           break
 
         case 'save':
-		  // console.log(this.current)
           const verifyResult = this.verifyForm()
           if (verifyResult.length > 0) {
             this.CONFIRM('表单验证失败', verifyResult.join('\n'))
@@ -350,7 +355,21 @@ export default {
     // 设置表单值
     setValue(path, val) {
       set(this.current, path, val)
-    }
+    },
+	// 审核状态
+	CheckStatusitem(data) {
+		if (data == '0') {
+			return '草稿'
+		} else if(data == '1') {
+			return '审核中'
+		} else if(data == '2') {
+			return '审核通过'
+		} else if(data == '3') {
+			return '审核未通过'
+		} else {
+			return data
+		}
+	},
   }
 }
 </script>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/single.vue
index 98c73f83d..86b7d435c 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/single.vue	
@@ -1,14 +1,23 @@
 <template>
   <view class="page">
     <view v-if="ready">
-      <l-select
+      <!-- <l-select
         @input="setValue('StuLeaveManagement.CheckStatus', $event)"
         :value="getValue('StuLeaveManagement.CheckStatus')"
         :range="dataSource.StuLeaveManagement.CheckStatus"
         title="审核状态"
 		:disabled="!edit"
 		v-if="!edit"
-      />
+      /> -->
+	  
+	  <l-input
+	    @input="setValue('StuLeaveManagement.CheckStatus', $event)"
+	    :value=" CheckStatusitem(getValue('StuLeaveManagement.CheckStatus'))"
+	    title="审核状态"
+		:disabled="!edit"
+		v-if="!edit"
+	  />
+	  
       <l-textarea
         @input="setValue('StuLeaveManagement.CheckRemark', $event)"
         :value="getValue('StuLeaveManagement.CheckRemark')"
@@ -196,7 +205,7 @@ export default {
       // 表单项数据结构
       scheme: {
         StuLeaveManagement: {
-          CheckStatus: { type: 'select', title: '审核状态', dataSource: '0' },
+          CheckStatus: { type: 'text', title: '审核状态' },
           CheckRemark: { type: 'texteditor', title: '审核备注', },
 		  CreateUserNo: { type: 'text', title: '学号' },
 		  LeaveType: { type: 'select', title: '请假类型', dataSource: '0',verify:"NotNull" },
@@ -230,7 +239,7 @@ export default {
 			  ClassDiredctorNo:[],
 			  CheckUserNo:[],
 			  LeaveType: Object.values(this.GET_GLOBAL('dataDictionary').LeaveType).map(t => ({ value: t.value, text: t.text })),
-			  CheckStatus: Object.values(this.GET_GLOBAL('dataDictionary').LeaveCheck).map(t => ({ value: t.value, text: t.text }))
+			  // CheckStatus: Object.values(this.GET_GLOBAL('dataDictionary').LeaveCheck).map(t => ({ value: t.value, text: t.text }))
 		  }
       }
     }
@@ -255,7 +264,6 @@ export default {
 		  //   this.dataSource.StuLeaveManagement.CheckStatus = result.data.map(t => ({ text: t.name, value: t.id }))
 		  // }),
 		  this.FETCH_DATASOURCE('bjsj').then(result => {
-			  console.log(result)
 		    this.dataSource.StuLeaveManagement.ClassNo = result.data.sort((a,b)=>{return b.classno-a.classno}).map(t => ({ text: t.classname, value: t.classno })) 
 		  }),
 		  this.FETCH_DATASOURCE('EmpInfo').then(result => {
@@ -374,7 +382,22 @@ export default {
     // 设置表单值
     setValue(path, val) {
       set(this.current, path, val)
-    }
+    },
+	// 审核状态
+	CheckStatusitem(data) {
+		// console.log(data)
+		if (data == '0') {
+			return '草稿'
+		} else if(data == '1') {
+			return '审核中'
+		} else if(data == '2') {
+			return '审核通过'
+		} else if(data == '3') {
+			return '审核未通过'
+		} else {
+			return data
+		}
+	},
   }
 }
 </script>