Commit 9930433f authored by 刘宇扬's avatar 刘宇扬

申请6

parent 5185dd77
...@@ -4,18 +4,21 @@ ...@@ -4,18 +4,21 @@
<!-- TODO: 基础设备管理--> <!-- TODO: 基础设备管理-->
<el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true"> <el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
<el-form-item label="设备名称" prop="roleName"> <el-form-item label="申请状态" prop="state">
<el-input <el-select
v-model="queryParams.deviceName" v-model="queryParams.state"
placeholder="请输入设备名称" placeholder="请选择状态"
clearable clearable
:maxlength="30"
size="small" size="small"
style="width: 150px" style="width: 150px"
@keyup.enter.native="handleQuery" @change="handleQuery"
/> >
<el-option label="所有" value="all"></el-option>
<el-option label="驳回" value="rejected"></el-option>
<el-option label="待审核" value="pending"></el-option>
<el-option label="通过" value="approved"></el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" size="small" icon="el-icon-search" @click="handleQuery">查询</el-button> <el-button type="primary" size="small" icon="el-icon-search" @click="handleQuery">查询</el-button>
</el-form-item> </el-form-item>
...@@ -40,22 +43,7 @@ ...@@ -40,22 +43,7 @@
{{ scope.row.deviceId || '-' }} {{ scope.row.deviceId || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="LOT" prop="LOT"> <el-table-column label="申请人" prop="createBy">
<template slot-scope="scope">
{{ scope.row.deviceId || '-' }}
</template>
</el-table-column>
<el-table-column label="位置" prop="location">
<template slot-scope="scope">
{{ scope.row.location || '-' }}
</template>
</el-table-column>
<el-table-column label="厚度" prop="ply">
<template slot-scope="scope">
{{ scope.row.ply || '-' }}
</template>
</el-table-column>
<el-table-column label="操作员" prop="createBy">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.createBy || '-' }} {{ scope.row.createBy || '-' }}
</template> </template>
...@@ -72,7 +60,7 @@ ...@@ -72,7 +60,7 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" class-name="small-padding fixed-width" width="140px"> <el-table-column label="操作" class-name="small-padding fixed-width" width="140px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="scope.row.state !== ' '" type="typeParent" :size="size" @click="handleDetail(scope.row)"> <el-button v-if="scope.row.state !== ' '" :type="typeParent" :size="size" @click="handleDetail(scope.row)">
详情 详情
</el-button> </el-button>
<!-- <el-button v-if="scope.row.state !== ' '" type="typeParent" :size="size" @click="handleUpdate(scope.row)"> <!-- <el-button v-if="scope.row.state !== ' '" type="typeParent" :size="size" @click="handleUpdate(scope.row)">
...@@ -145,6 +133,10 @@ ...@@ -145,6 +133,10 @@
<el-form-item label="状态" prop="state"> <el-form-item label="状态" prop="state">
<el-input v-model.trim="singleDetails.state" :readonly="isReadOnly" /> <el-input v-model.trim="singleDetails.state" :readonly="isReadOnly" />
</el-form-item> </el-form-item>
<el-form-item>
<el-button type="success" @click="handleApprove">通过</el-button>
<el-button type="primary" @click="handleReject">驳回</el-button>
</el-form-item>
</el-form> </el-form>
</el-dialog> </el-dialog>
...@@ -322,6 +314,22 @@ export default { ...@@ -322,6 +314,22 @@ export default {
console.log(this.roleList) console.log(this.roleList)
this.loading = false this.loading = false
}, },
handleReject() {
this.$message({
message: '操作完成',
type: 'warning'
});
this.openDetails = false
this.reset()
},
handleApprove(){
this.$message({
message: '操作完成',
type: 'success'
});
this.openDetails = false
this.reset()
},
// 取消按钮 // 取消按钮
cancel() { cancel() {
this.open = false this.open = false
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment