Skip to content

T
template_vue
Commit f671b388 authored by wdy's avatar wdy
Browse files
Options

工序库设备领用

parent fd7d85dd
Hide whitespace changes
Inline Side-by-side
Showing with 155 additions and 11 deletions
src/api/equipment/check.js
View file @ f671b388
......@@ -12,7 +12,7 @@ export function listCheck(query) {
export function abandon(data) {
return request({
url: '/wbwarehouse/abandon',
url: '/wbwarehouse/abandon',
method: 'put',
data,
headers: {
......@@ -51,4 +51,4 @@ export function checkInventory(query) {
url: '/wbwarehouse/checkInventory/' + query,
method: 'get',
});
}
\ No newline at end of file
}
src/views/equipment/draw.vue
View file @ f671b388
......@@ -232,6 +232,61 @@
<!-- TODO: 处理 -->
<el-dialog :title="title" :visible.sync="openHandle" width="1200px" append-to-body :close-on-click-modal="false" @close="handlecanceClose">
<el-form class="aboutSingleDetails" ref="formDetails" :model="singleDetails" size="small" label-width="90px">
<el-row>
<el-col :span="12">
<el-form-item label="pn：" prop="pn">
<el-input v-model.trim="singleDetails.pn" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="phd：" prop="phd">
<el-input v-model.trim="singleDetails.phd" :readonly="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="prank：" prop="prank">
<el-input v-model.trim="singleDetails.prank" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="pgx：" prop="pgx">
<el-input v-model.trim="singleDetails.pgx" :readonly="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="pissb：" prop="pissb">
<el-input v-model.trim="singleDetails.pissb" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="状态：" prop="pstatus">
<template>
<span v-if="singleDetails.pstatus === '0'" style="color: red">未完成</span>
<span v-else style="color: green">已完成</span>
</template>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="申请人：" prop="createName">
<el-input v-model.trim="singleDetails.createName" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label=" 申请时间：" prop="createDate">
<el-input v-model.trim="singleDetails.createDate" :readonly="true" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<!-- 分割线-->
<el-divider></el-divider>
<el-form ref="queryFormWarehouse" style="padding: 0 0 0 10px" :model="queryParamsDetail" :inline="true">
<el-form-item label="pn" prop="pn">
<el-input
......@@ -322,9 +377,12 @@
<!-- 登录验证-->
<el-dialog :title="title" :visible.sync="openLogin" width="500px" append-to-body :close-on-click-modal="false">
<div style="text-align: center">
<span style="font-size: 15px">该操作需要权限认证</span>
</div>
<el-form ref="form" :model="loginform" label-width="80px">
<el-form-item label="密码">
<el-input v-model="loginform.password" type="password" placeholder="请输入权限菜单密码" />
<el-input v-model="loginform.password" type="password" placeholder="请输入密码" />
</el-form-item>
<el-form-item>
<el-button type="primary" @click="handleConfirm">确定</el-button>
......@@ -602,6 +660,8 @@ export default {
// 处理点击
handle(row) {
const id = row.businessId
this.singleDetails = row
this.openHandle = true
this.applyId = row.businessId
this.pn = row.pn
......@@ -618,6 +678,12 @@ export default {
page: this.queryParamsDetail.page,
rows: this.queryParamsDetail.rows
}
detail(id).then(res => {
res.data.createDate = parseTime(res.data.createDate, '{y}-{m}-{d}')
this.applyList = res.data.wbApplyDetailList
this.applyStatus = res.data.pstatus
this.loadingDetail = false
})
// 调warehouse分页查询接口
getEquipment(obj).then(res => {
if (res.code === 200) {
......@@ -704,7 +770,7 @@ export default {
// 菜单权限验证
login() {
this.title = '菜单权限'
this.title = '权限校验'
this.openLogin = true
this.openHandle = false
},
......
src/views/processManagement/basicProcessManagement/index.vue
View file @ f671b388
......@@ -73,6 +73,11 @@
{{ scope.row.phd || '-' }}
</template>
</el-table-column>
<el-table-column label="入库时间" :show-overflow-tooltip="true" align="center" prop="recycleDate">
<template slot-scope="scope">
<span>{{ scope.row.recycleDate | transformDateByFormat('YYYY-MM-DD') }}</span>
</template>
</el-table-column>
<el-table-column label="操作员" prop="createName" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.createName || '-' }}
......@@ -173,9 +178,18 @@
</el-form-item>
</el-col>
</el-row>
<el-form-item label="parnk：" prop="prank">
<el-input v-model.trim="singleDetails.prank" :readonly="true" />
</el-form-item>
<el-row>
<el-col :span="12">
<el-form-item label="parnk：" prop="prank">
<el-input v-model.trim="singleDetails.prank" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="入库日期：" prop="recycleDate">
<el-input v-model.trim="singleDetails.recycleDate" :readonly="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="操作员：" prop="createName">
......@@ -218,7 +232,8 @@ export default {
location: '',
thickness: '',
createName: '',
createTime: ''
createTime: '',
recycleDate: ''
},
// 是否显示弹出层（数据详情）
openDetails: false,
......
src/views/processManagement/draw.vue
View file @ f671b388
......@@ -238,6 +238,61 @@
<!-- TODO: 处理 -->
<el-dialog :title="title" :visible.sync="openHandle" width="1200px" append-to-body :close-on-click-modal="false" @close="handlecanceClose">
<el-form class="aboutSingleDetails" ref="formDetails" :model="singleDetails" size="small" label-width="90px">
<el-row>
<el-col :span="12">
<el-form-item label="pn：" prop="pn">
<el-input v-model.trim="singleDetails.pn" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="phd：" prop="phd">
<el-input v-model.trim="singleDetails.phd" :readonly="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="prank：" prop="prank">
<el-input v-model.trim="singleDetails.prank" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="pgx：" prop="pgx">
<el-input v-model.trim="singleDetails.pgx" :readonly="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="pissb：" prop="pissb">
<el-input v-model.trim="singleDetails.pissb" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="状态：" prop="pstatus">
<template>
<span v-if="singleDetails.pstatus === '0'" style="color: red">未完成</span>
<span v-else style="color: green">已完成</span>
</template>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="申请人：" prop="createName">
<el-input v-model.trim="singleDetails.createName" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label=" 申请时间：" prop="createDate">
<el-input v-model.trim="singleDetails.createDate" :readonly="true" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<!-- 分割线-->
<el-divider></el-divider>
<el-form ref="queryFormWarehouse" style="padding: 0 0 0 10px" :model="queryParamsDetail" :inline="true">
<el-form-item label="pn" prop="pn">
<el-input
......@@ -337,7 +392,7 @@
</div>
</el-dialog>
<el-dialog title="权限认证" :visible.sync="menu" width="500px" append-to-body :close-on-click-modal="false">
<el-dialog title="权限校验" :visible.sync="menu" width="500px" append-to-body :close-on-click-modal="false">
<div style="text-align: center">
<span style="font-size: 15px">当前选择跨越设备需要权限密码</span>
</div>
......@@ -699,7 +754,8 @@ export default {
// 处理点击
handle(row) {
console.log('row', row)
const id = row.businessId
this.singleDetails = row
this.monthDate = false
this.openHandle = true
this.applyId = row.businessId
......@@ -719,6 +775,13 @@ export default {
page: this.queryParamsDetail.page,
rows: this.queryParamsDetail.rows
}
detail(id).then(res => {
console.log('res', res)
res.data.createDate = parseTime(res.data.createDate, '{y}-{m}-{d}')
this.applyList = res.data.wbApplyDetailList
this.applyStatus = res.data.pstatus
this.loadingDetail = false
})
// 调warehouse分页查询接口
getEquipment(obj).then(res => {
if (res.code === 200) {
......@@ -820,7 +883,7 @@ export default {
},
// 登录
login() {
this.title = '权限认证'
this.title = '权限校验'
this.openLogin = true
this.openHandle = false
},
......
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