diff --git a/src/router/index.js b/src/router/index.js
index 975f516..f299d07 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -74,17 +74,17 @@ const routes = [
         component: OuterHistory
       },
       {
-        path: "/user/outer/:id/application",
+        path: "/user/outer/:id/appForm",
         name: "处理外出申请",
         component: OuterAppForm
       },
       {
-        path: "/user/outer/:id/appDetail",
-        name: "申请详情",
+        path: "/user/outer/:id/appDetail/",
+        name: "外出申请详情",
         component: OuterAppDetail
       }
     ]
-  },
+  }
 ]
 
 const router = new VueRouter({
diff --git a/src/views/OuterAppDetail.vue b/src/views/OuterAppDetail.vue
index 9eeb4ce..ed8bd00 100644
--- a/src/views/OuterAppDetail.vue
+++ b/src/views/OuterAppDetail.vue
@@ -1,10 +1,123 @@
 <template>
+  <div>
+    <el-table
+        :data="tableData"
+        border
+        style="width: 100%">
+      <el-table-column
+          fixed
+          prop="id"
+          label="编号"
+          width="100">
+      </el-table-column>
+      <el-table-column
+          prop="leave_time"
+          label="出发时间"
+          width="200">
+      </el-table-column>
+      <el-table-column
+          prop="back_time"
+          label="返回时间"
+          width="200">
+      </el-table-column>
+      <el-table-column
+          prop="place"
+          label="地点"
+          width="200">
+      </el-table-column>
+      <el-table-column
+          prop="reason"
+          label="外出原因"
+          width="200">
+      </el-table-column>
+      <el-table-column
+          prop="type"
+          label="状态"
+          width="120">
+      </el-table-column>
+      <el-table-column
+          width="200">
+        <template slot-scope="scope">
+          <el-button type="success" @click="choose(scope.row.id)">选择</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
 
+    <el-pagination
+        background
+        layout="prev, pager, next"
+        :page-size="pageSize"
+        :total="total"
+        @current-change="page">
+    </el-pagination>
+  </div>
 </template>
-
 <script>
+function $_GET(name, urls) {
+  let url = urls || window.location.href;
+  if (!name == true) {
+    let data = url.match(new RegExp("([^?&]*)=([^?&]*)", "ig"));
+    return data != null ? data : [];
+  } else {
+    let test = new RegExp(name + "=", "i").test(url);
+    return test ? url.match(new RegExp(name + "=([^?&]*)", "i"))[1] : "";
+  }
+}
+
 export default {
-  name: "OuterAppDetail"
+  name: "OuterAppDetail",
+  methods: {
+    page(currentPage) {
+      const _this = this
+      let id = window.location.pathname.split('/')[3];
+      let school_id = $_GET('school_id', window.location.href);
+      console.log(school_id);
+      axios.get('http://localhost:8181/leaveDetail/findFromSIDTimeLimit/' + school_id + "/" + (currentPage) + '/6').then(function (resp) {
+        _this.tableData = resp.data
+        _this.pageSize = 6
+        _this.total = resp.data.length
+      })
+    },
+
+    choose(id) {
+      const _this = this
+      axios.get('http://localhost:8181/leaveDetail/findByIDAndSaveOD/' + id).then(function (resp) {
+        if (resp.data == 'success') {
+          _this.$alert('成功', '消息', {
+            confirmButtonText: '确定',
+            callback: action => {
+              _this.$router.push('/user/outer/' + id + '/history')
+            }
+          })
+        } else {
+          _this.$alert('失败', '消息', {
+            confirmButtonText: '确定',
+            callback: action => {
+              _this.$router.push('/user/outer/' + id + '/history')
+            }
+          })
+        }
+      })
+    }
+  },
+  data() {
+    return {
+      pageSize: 6,
+      total: 11,
+      tableData: [{}]
+    }
+  },
+  created() {
+    const _this = this
+    let id = window.location.pathname.split('/')[3];
+    let school_id = $_GET('school_id', window.location.href);
+    console.log(school_id);
+    axios.get('http://localhost:8181/leaveDetail/findFromSIDTimeLimit/' + school_id + '/1/6').then(function (resp) {
+      _this.tableData = resp.data
+      _this.pageSize = 6
+      _this.total = resp.data.length
+    })
+  }
 }
 </script>
 
diff --git a/src/views/OuterAppForm.vue b/src/views/OuterAppForm.vue
index 78329c6..f393cb5 100644
--- a/src/views/OuterAppForm.vue
+++ b/src/views/OuterAppForm.vue
@@ -1,12 +1,13 @@
 <template>
   <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
 
-    <el-form-item label="学生id" prop="place">
-      <el-input v-model="ruleForm.place"></el-input>
+    <el-form-item label="学生id" prop="school_id">
+      <el-input v-model="ruleForm.school_id"></el-input>
     </el-form-item>
 
     <el-form-item>
-      <el-button type="primary" @click="submitForm('ruleForm')">查询</el-button>
+      <el-button type="primary" @click="submitOutForm('ruleForm')">批准外出</el-button>
+      <el-button type="primary" @click="submitInForm('ruleForm')">批准入内</el-button>
       <el-button @click="resetForm('ruleForm')">重置</el-button>
     </el-form-item>
   </el-form>
@@ -14,7 +15,7 @@
 
 <script>
 export default {
-  name: "StudentAppForm",
+  name: "OuterAppForm",
   data() {
     return {
       ruleForm: {
@@ -28,10 +29,37 @@ export default {
     };
   },
   methods: {
-    submitForm(formName) {
+    submitOutForm(formName) {
       const _this = this
       let id = window.location.pathname.split('/')[3];
+      let school_id = this.ruleForm.school_id;
+      console.log(school_id);
+      window.location.href = "/user/outer/" + id + "/appDetail?school_id=" + school_id;
 
+
+    },
+    submitInForm(formName) {
+      const _this = this
+      let id = window.location.pathname.split('/')[3];
+      let school_id = this.ruleForm.school_id;
+      console.log(school_id);
+      axios.get('http://localhost:8181/outDetail/findBySIDAndSetReturnTime/' + school_id).then(function (resp) {
+        if (resp.data == 'success') {
+          _this.$alert('成功', '消息', {
+            confirmButtonText: '确定',
+            callback: action => {
+              _this.$router.push('/user/outer/' + id + '/history')
+            }
+          })
+        } else {
+          _this.$alert('失败', '消息', {
+            confirmButtonText: '确定',
+            callback: action => {
+              _this.$router.push('/user/outer/' + id + '/history')
+            }
+          })
+        }
+      });
     },
     resetForm(formName) {
       this.$refs[formName].resetFields();
diff --git a/src/views/OuterUserIndex.vue b/src/views/OuterUserIndex.vue
index 06db324..a6fc02a 100644
--- a/src/views/OuterUserIndex.vue
+++ b/src/views/OuterUserIndex.vue
@@ -8,7 +8,7 @@
       <el-aside width="200px" style="background-color: rgb(238, 241, 246)">
         <el-menu router>
           <el-menu-item index="history">外出批准历史</el-menu-item>
-          <el-menu-item index="application">处理外出申请</el-menu-item>
+          <el-menu-item index="appForm">处理外出申请</el-menu-item>
         </el-menu>
       </el-aside>
 
diff --git a/src/views/TeacherApplication.vue b/src/views/TeacherApplication.vue
index 5c7c57a..de6b5a8 100644
--- a/src/views/TeacherApplication.vue
+++ b/src/views/TeacherApplication.vue
@@ -136,15 +136,6 @@ export default {
     const _this = this
     let id = window.location.pathname.split('/')[3];
     axios.get('http://localhost:8181/leaveDetail/findByTypeNoID/审核中/1/6').then(function (resp) {
-      /*
-      _this.id = resp.data.id
-      _this.leave_time = resp.data.leave_time
-      _this.back_time = resp.data.back_time
-      _this.place = resp.data.place
-      _this.reason = resp.data.reason
-      _this.type = resp.data.type
-      console.log(resp)
-      */
       _this.tableData = resp.data
       _this.pageSize = 6
       _this.total = resp.data.length