diff --git a/src/api/dormitory/outsideAccommodation/outsideAccommodationApply.js b/src/api/dormitory/outsideAccommodation/outsideAccommodationApply.js
index 8ad3793..ad7c6d2 100644
--- a/src/api/dormitory/outsideAccommodation/outsideAccommodationApply.js
+++ b/src/api/dormitory/outsideAccommodation/outsideAccommodationApply.js
@@ -42,3 +42,19 @@ export function delOutsideAccommodationApply(id) {
method: 'post'
})
}
+
+export function getOwnInfo(){
+ return request({
+ url:'/comprehensive/stuInfoView/getOwnInfo',
+ method:'GET'
+ })
+}
+
+// 查询宿舍学生关联列表
+export function listStudent(query) {
+ return request({
+ url: '/dormitory/srs-dormitory-student/checkInInformation',
+ method: 'get',
+ params: query
+ })
+}
diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index 10e89aa..b38d081 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -15,7 +15,7 @@
class="upload-file-uploader"
>
- 选取文件
+ {{ text }}
请上传
@@ -45,6 +45,11 @@ import { getTokenKeySessionStorage as getToken } from '@/utils/auth'
export default {
name: 'FileUpload',
props: {
+ // 按钮文本
+ text: {
+ type: String,
+ default: () => "选取文件",
+ },
// 值
value: [String, Object, Array],
// 数量限制
diff --git a/src/components/affix/index.vue b/src/components/affix/index.vue
index 3d95f0d..1b3f3ae 100644
--- a/src/components/affix/index.vue
+++ b/src/components/affix/index.vue
@@ -12,7 +12,7 @@
:show-file-list="false"
:before-upload="handleBeforeUpload"
>
-
点击上传
+
点击上传
+
+
+
+
+
+ 仅限南宁市学生申请外宿,需完整填写所有必填项并上传对应附件
+ 外宿原因需上传佐证材料(因病提供病例,外宿居所提供住房证明等)
+ 家长意见需上传签字扫描件,本人承诺需完成电子签名
+ 审批通过后需经学院领导签署意见,方可办理退房手续
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 已交当前学年住宿费
+ 未交当前学年住宿费
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 支持上传jpg/png/pdf格式文件,单个文件不超过10MB(如病例、住房证明等)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 同意外宿
+ 不同意外宿
+
+
+
+
+
+
+
+
+
+
+ 点击上传
+ 只能上传jpg/png文件,且不超过2M
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1. 自觉遵守国家法律、法规;
+ 2. 自觉遵守学生行为规范和学校的规章制度,遵守社会公德;
+ 3. 自觉遵守外宿住址所在社区的有关管理规定;
+
+ 4.
+ 本人申请外宿,属个人自愿行为,外宿期间发生的一切事故,造成本人、他人或集体的人身、财产损害的,学校不负责任。
+
+
+
+
+
+
+
+
+
+ 签署承诺签名
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+
+
+
+ 提交申请
+
+
+
+ 重置表单
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/dormitory/outsideAccommodation/outsideAccommodationApply/index.vue b/src/views/dormitory/outsideAccommodation/outsideAccommodationApply/index.vue
index 45a7212..6c0e6eb 100644
--- a/src/views/dormitory/outsideAccommodation/outsideAccommodationApply/index.vue
+++ b/src/views/dormitory/outsideAccommodation/outsideAccommodationApply/index.vue
@@ -1,12 +1,6 @@
-
-
-
-
-
-
-
+
@@ -16,93 +10,21 @@
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
搜索
重置
@@ -136,18 +48,22 @@
-
+
+ 外宿申请
+
+
导出
@@ -157,43 +73,43 @@
-
-
-
-
+
+
+
+ 男
+ 女
+
+
+
{{ parseTime(scope.row.birthDate, '{y}-{m}-{d}') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
- {{ parseTime(scope.row.promiseDate, '{y}-{m}-{d}') }}
+ 未交
+ 已交
+
+
+
+
+
+ {{ scope.row.applyReason }}
+
+
+
+
+
+
+ {{ scope.row.address + " " + scope.row.outsideAddress }}
+
@@ -206,13 +122,23 @@
{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}
-
-
-
-
-
-
-
+
+
+ 待提交
+ 审批驳回
+ 待辅导员审批
+ 待学院书记审批
+ 待学工处审批
+ 待学校领导审批
+ 审核通过
+
+
+
+
+ 到期
+ 有效
+
+
{
- this.form = response.data;
- this.open = true;
- this.title = "修改外宿申请";
+ // const id = row.id || this.ids
+ // getOutsideAccommodationApply(id).then(response => {
+ // this.form = response.data;
+ // this.open = true;
+ // this.title = "修改外宿申请";
+ // });
+ this.$router.push({
+ path: "/dormitory/outsideAccommodation/applicationForm",
+ query: { id: row.id } // 将 row.id 放在 query 中
});
},
/** 提交按钮 */
@@ -676,7 +606,22 @@ export default {
this.download('dormitory/outsideAccommodationApply/export', {
...this.queryParams
}, `outsideAccommodationApply_${new Date().getTime()}.xlsx`)
+ },
+ // 跳转申请表
+ openForm() {
+ this.$router.push("/dormitory/outsideAccommodation/applicationForm");
}
}
};
+
+
diff --git a/src/views/dormitory/outsideAccommodation/outsideAccommodationApproval/index.vue b/src/views/dormitory/outsideAccommodation/outsideAccommodationApproval/index.vue
index e0c8ffe..5265b1e 100644
--- a/src/views/dormitory/outsideAccommodation/outsideAccommodationApproval/index.vue
+++ b/src/views/dormitory/outsideAccommodation/outsideAccommodationApproval/index.vue
@@ -1,9 +1,6 @@
-
-
-
@@ -11,30 +8,15 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -69,8 +51,10 @@
-
-
+
+
+
+
@@ -83,9 +67,7 @@
{{ parseTime(scope.row.approvalTime, '{y}-{m}-{d}') }}
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -56,16 +39,16 @@
-
-
+
+
+
+
-
-