Skip to content

T
template_vue
Commit 9930433f authored by 刘宇扬's avatar 刘宇扬
Browse files
Options

申请6

parent 5185dd77
Hide whitespace changes
Inline Side-by-side
Showing with 123 additions and 73 deletions
src/views/equipment/application.vue
View file @ 9930433f
......@@ -4,18 +4,21 @@
<!-- TODO: 基础设备管理-->
<el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
<el-form-item label="设备名称" prop="roleName">
<el-input
v-model="queryParams.deviceName"
placeholder="请输入设备名称"
<el-form-item label="申请状态" prop="state">
<el-select
v-model="queryParams.state"
placeholder="请选择状态"
clearable
:maxlength="30"
size="small"
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-button type="primary" size="small" icon="el-icon-search" @click="handleQuery">查询</el-button>
</el-form-item>
......@@ -40,22 +43,7 @@
{{ scope.row.deviceId || '-' }}
</template>
</el-table-column>
<el-table-column label="LOT" prop="LOT">
<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">
<el-table-column label="申请人" prop="createBy">
<template slot-scope="scope">
{{ scope.row.createBy || '-' }}
</template>
......@@ -72,7 +60,7 @@
</el-table-column>
<el-table-column label="操作" class-name="small-padding fixed-width" width="140px">
<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 v-if="scope.row.state !== ' '" type="typeParent" :size="size" @click="handleUpdate(scope.row)">
......@@ -145,6 +133,10 @@
<el-form-item label="状态" prop="state">
<el-input v-model.trim="singleDetails.state" :readonly="isReadOnly" />
</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-dialog>
......@@ -322,6 +314,22 @@ export default {
console.log(this.roleList)
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() {
this.open = false
......
src/views/equipment/income.vue
View file @ 9930433f
<template>
<div class="app-container">
<!-- TODO: 基础工序管理-->
<!-- TODO: 基础设备管理-->
<el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
<el-form-item label="设备名称" prop="roleName">
<el-input
......@@ -24,24 +24,11 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="LOT" >
<el-input
v-model="queryParams.LOT"
placeholder="请输入LOT"
clearable
size="small"
style="width: 150px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" size="small" icon="el-icon-search" @click="handleQuery">查询</el-button>
</el-form-item>
<div style="float: right">
<el-form-item>
<coolbutton style="padding: 8px 7px;" :type="typePrimary" :name="application" :size="smallSize" :icon="addIcon" @btn-click="handleAdd" />
</el-form-item>
</div>
</el-form>
<div class="placeholder" />
......@@ -49,7 +36,7 @@
<!-- TODO: 中间的分隔符号 -->
<div style="padding:5px 10px">
<!-- TODO: 以下为基础工序管理列表 -->
<!-- TODO: 以下为基础设备管理列表 -->
<div class="mb12 font-small-bold">设备领用列表</div>
<el-table v-loading="loading" border :data="roleList" @selection-change="handleSelectionChange">
<el-table-column type="index" label="序号" width="50" />
......@@ -68,45 +55,48 @@
{{ scope.row.deviceId || '-' }}
</template>
</el-table-column>
<el-table-column label="创建时间" :show-overflow-tooltip="true" align="center" prop="createTime">
<el-table-column label="位置" prop="location">
<template slot-scope="scope">
<span>{{ scope.row.createTime | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
{{ 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">
<el-table-column label="操作员" prop="createBy">
<template slot-scope="scope">
{{ scope.row.createBy || '-' }}
</template>
</el-table-column>
<el-table-column label="操作" class-name="small-padding fixed-width" width="240px">
<el-table-column label="创建时间" :show-overflow-tooltip="true" align="center" prop="createTime">
<template slot-scope="scope">
<el-button :type="typeParent" :size="size" @click="handleDetail(scope.row)">
详情
</el-button>
<el-button :type="typeParent" :size="size" @click="handleUpdate(scope.row)">
<span>{{ scope.row.createTime | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" class-name="small-padding fixed-width" width="140px">
<template slot-scope="scope">
<el-button v-if="scope.row.state !== ' '" align="center" type="typeParent" :size="size" @click="handleUpdate(scope.row)">
{{ updataName }}
</el-button>
<el-button
size="mini"
type="text"
@click="handleDelete(scope.row)"
>删除</el-button>
</template>
</el-table-column>
</el-table>
</div>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<el-pagination
background
layout="prev, pager, next"
:total="1000">
</el-pagination>
<!-- TODO: 添加或修改工序配置对话框 -->
<!-- TODO: 添加或修改设备配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
<el-form-item label=" 设备名称" prop="deviceName">
<el-form-item label="设备名称" prop="deviceName">
<el-input v-model.trim="form.deviceName" show-word-limit :maxlength="30" placeholder="请输入设备名称" />
</el-form-item>
<el-form-item label="设备编码" prop="deviceId">
......@@ -115,7 +105,13 @@
<el-form-item label="LOT" prop="LOT">
<el-input v-model.trim="form.LOT" show-word-limit :maxlength="30" placeholder="请输入LOT" />
</el-form-item>
<el-form-item label="创建人" prop="createBy">
<el-form-item label="位置" prop="location">
<el-input v-model.trim="form.location" show-word-limit :maxlength="30" placeholder="请输入设备编码" />
</el-form-item>
<el-form-item label="厚度" prop="ply">
<el-input v-model.trim="form.ply" show-word-limit :maxlength="30" placeholder="请输入设备编码" />
</el-form-item>
<el-form-item label="操作员" prop="createBy">
<el-input v-model.trim="form.createBy" :maxlength="30" show-word-limit placeholder="请输入创建人" />
</el-form-item>
</el-form>
......@@ -131,15 +127,27 @@
<el-form-item label="名称：" prop="deviceName">
<el-input v-model.trim="singleDetails.deviceName" :readonly="isReadOnly" />
</el-form-item>
<el-form-item label="工厂车间：" prop="deviceId">
<el-form-item label="设备编码：" prop="deviceId">
<el-input v-model.trim="singleDetails.deviceId" :readonly="isReadOnly" />
</el-form-item>
<el-form-item label="LOT: " prop="LOT">
<el-input v-model.trim="singleDetails.LOT" :readonly="isReadOnly" />
</el-form-item>
<el-form-item label="位置：" prop="location">
<el-input v-model.trim="singleDetails.location" :readonly="isReadOnly" />
</el-form-item>
<el-form-item label="位置：" prop="ply">
<el-input v-model.trim="singleDetails.ply" :readonly="isReadOnly" />
</el-form-item>
<el-form-item label="创建时间：" prop="createTime">
<el-input v-model.trim="singleDetails.createTime" :readonly="isReadOnly" />
</el-form-item>
<el-form-item label="创建人：" prop="createBy">
<el-input v-model.trim="singleDetails.createBy" :readonly="isReadOnly" />
</el-form-item>
<el-form-item label="状态" prop="state">
<el-input v-model.trim="singleDetails.state" :readonly="isReadOnly" />
</el-form-item>
</el-form>
</el-dialog>
......@@ -201,6 +209,9 @@ export default {
deviceName: undefined,
deviceId: undefined,
LOT: undefined,
location: undefined,
ply: undefined,
state: undefined,
flag: undefined
},
defaultProps: {},
......@@ -209,6 +220,9 @@ export default {
deviceName: '',
deviceId: '',
LOT: '',
location:'',
ply:'',
state:'',
flag: '1',
remark: '',
createTime: new Date(),
......@@ -220,6 +234,10 @@ export default {
deviceName: '',
deviceId: '',
LOT: '',
location:'',
ply:'',
state:'',
state:'',
flag: '1',
createTime: new Date(),
updataTime: new Date(),
......@@ -230,6 +248,9 @@ export default {
deviceName: '',
deviceId: '',
LOT: '',
location:'',
ply:'',
state:'',
flag: '1',
createTime: new Date(),
updataTime: new Date(),
......@@ -237,10 +258,28 @@ export default {
},
// TODO: 模拟测试数据
simulateDeviceList: [{
deviceName: '挖掘机', deviceId: '0001', flag: 1, LOT: '0001', createTime: new Date(), updataTime: new Date(), createBy: '张三'
deviceName: '设备1', deviceId: '0001', flag: 1, LOT: '0001', location:'XXX', ply:'YYY', createTime: new Date(), updataTime: new Date(), createBy: 'admin',state:'驳回',
}, {
deviceName: '汽车', deviceId: '车间2', flag: 2, LOT: '0002', createTime: new Date(), updataTime: new Date(), createBy: '李四'
}],
deviceName: '设备2', deviceId: '0002', flag: 2, LOT: '0002', location:'XXX', ply:'YYY', createTime: new Date(), updataTime: new Date(), createBy: 'admin' ,state:'驳回',
},{
deviceName: '设备3', deviceId: '0003', flag: 2, LOT: '0003', location:'XXX', ply:'YYY', createTime: new Date(), updataTime: new Date(), createBy: 'admin' ,state:'驳回',
},{
deviceName: '设备4', deviceId: '0004', flag: 2, LOT: '0004', location:'XXX', ply:'YYY', createTime: new Date(), updataTime: new Date(), createBy: 'admin' ,state:'驳回',
},{
deviceName: '设备5', deviceId: '0005', flag: 2, LOT: '0005', location:'XXX', ply:'YYY', createTime: new Date(), updataTime: new Date(), createBy: 'admin' ,state:'待审核',
},{
deviceName: '设备6', deviceId: '0006', flag: 2, LOT: '0006', location:'XXX', ply:'YYY', createTime: new Date(), updataTime: new Date(), createBy: 'admin' ,state:'待审核',
},{
deviceName: '设备7', deviceId: '0007', flag: 2, LOT: '0007', location:'XXX', ply:'YYY', createTime: new Date(), updataTime: new Date(), createBy: 'admin' ,state:'待审核',
},{
deviceName: '设备8', deviceId: '0008', flag: 2, LOT: '0008', location:'XXX', ply:'YYY', createTime: new Date(), updataTime: new Date(), createBy: 'admin' ,state:'待审核',
},{
deviceName: '设备9', deviceId: '0009', flag: 2, LOT: '0009', location:'XXX', ply:'YYY', createTime: new Date(), updataTime: new Date(), createBy: 'admin' ,state:'通过',
},{
deviceName: '设备10', deviceId: '00010', flag: 2, LOT: '0010', location:'XXX', ply:'YYY', createTime: new Date(), updataTime: new Date(), createBy: 'admin' ,state:'通过',
},
],
// 表单校验
rules: {
......@@ -297,6 +336,9 @@ export default {
this.form = {
deviceName: '',
deviceId: '',
location:'',
ply:'',
state:'',
flag: '1',
createTime: new Date(),
updataTime: new Date(),
......@@ -316,7 +358,7 @@ export default {
handleAdd() {
// TODO: 初始化新增对话框的状态
this.reset()
this.title = '添加工序'
this.title = '申请领用设备'
this.open = !this.open
},
// TODO: 获取所选行详情信息操作
......@@ -329,7 +371,7 @@ export default {
/** TODO: 修改按钮操作 */
handleUpdate(row) {
this.reset()
this.title = '修改工序'
this.title = '修改申请'
const upddeviceName = row.deviceName
for (const pd of this.simulateDeviceList) {
if (pd.deviceName === upddeviceName) {
......@@ -348,7 +390,7 @@ export default {
this.simulateDeviceList = this.simulateDeviceList.map(obj =>
obj.deviceName === this.form.deviceName ? this.form : obj
)
this.msgSuccess('修改成功')
this.msgSuccess('申请成功')
this.getList()
this.reset()
this.open = !this.open
......@@ -356,7 +398,7 @@ export default {
} else {
if (this.form !== undefined && this.form !== null) {
this.simulateDeviceList.push(this.form)
this.msgSuccess('新增成功')
this.msgSuccess('申请成功')
this.getList()
this.reset()
this.open = !this.open
......
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