diff --git a/element-vue/src/components/supManager/checking.vue b/element-vue/src/components/supManager/checking.vue index e36ef19..58f10e9 100644 --- a/element-vue/src/components/supManager/checking.vue +++ b/element-vue/src/components/supManager/checking.vue @@ -70,6 +70,7 @@ import {get, post} from "~/utils"; import detail from "~/components/supManager/detail" ; import refuseReason from "~/components/supManager/refuseReason" ; + export default { name:'checking', @@ -162,8 +163,16 @@ }, refuse_apply(rowData){ //拒绝申请,路径 参数是rowData里的数据+拒绝理由 - this.$refs.refuseReason.isshowrefuse=true - + // this.$prompt('请输入拒绝的理由', '提示', { + // confirmButtonText: '确定', + // cancelButtonText: '取消' + // }).then(async ({ value }) => { + // this.data.refuseReason = value + // await post('lb/labrecord/refuse',this.data) + // this.$emit('complete') + // this.show = false + // showSuccess('已拒绝申请!',this) + // }).catch(()=>{}) } } @@ -174,4 +183,4 @@ \ No newline at end of file + diff --git a/element-vue/src/components/supManager/navBar.vue b/element-vue/src/components/supManager/navBar.vue index f5a3e78..18158c2 100644 --- a/element-vue/src/components/supManager/navBar.vue +++ b/element-vue/src/components/supManager/navBar.vue @@ -12,6 +12,7 @@ 首页 实验室管理 用户管理 + 审核 diff --git a/element-vue/src/pages/manager/applyRecord.vue b/element-vue/src/pages/manager/applyRecord.vue index b6ac854..da15166 100644 --- a/element-vue/src/pages/manager/applyRecord.vue +++ b/element-vue/src/pages/manager/applyRecord.vue @@ -9,7 +9,23 @@ - + + + + + 待审核 + + + + + 已审核 + + + + + @@ -29,15 +45,16 @@ :type="scope.row.status === 0 ? 'primary' : scope.row.status ===2 ? 'success': 'warning'" disable-transitions> {{scope.row.status ===0 ? '待审核' : - scope.row.status ===2 ? '审核通过': '审核失败'}} + scope.row.status ===2 ? '审核通过': '未通过'}} @@ -60,6 +77,7 @@ }, data() { return { + isCheck:0, tableData: [] } }, @@ -67,6 +85,9 @@ async load(){ this.tableData = await get('/lb/labrecord/getRecordList') }, + cellStyle(){ + return "" + }, async showDetail(item){ const data = await get('lb/labrecord/getRecordDetail',item) data.create_time = new Date(data.create_time).toLocaleString( ) @@ -75,6 +96,17 @@ this.$refs.detail.show = true } }, + computed:{ + tableDataComputed(){ + if (this.isCheck===0){ + return this.tableData.filter(data=>data.status===0) + }else { + return this.tableData.filter(data=>data.status===1 || data.status===2) + + } + + } + }, async mounted() { await this.load() } diff --git a/element-vue/src/router.js b/element-vue/src/router.js index c843af7..c67dc51 100644 --- a/element-vue/src/router.js +++ b/element-vue/src/router.js @@ -22,7 +22,6 @@ import labManager from "~/components/supManager/labManage"; //manager -import check from "~/components/supManager/check"; import applyRecord from "~/pages/manager/applyRecord"; import managerHome from "~/components/manager/home" import managerIndex from "~/components/manager/index"; @@ -122,7 +121,7 @@ const routes = [ }, { path: 'check', - component: check + component: applyRecord } ] }