Skip to content

T
template_vue
Commit caf032c7 authored by 高宇's avatar 高宇
Browse files
Options

2.印刷记录 在印刷弹出框在 废弃状态下加 bz dd machine dbxi dd是文本框带入用户名称,印刷记录新增详情功能

parent 4d659c21
Show whitespace changes
Inline Side-by-side
Showing with 142 additions and 283 deletions
src/api/equipment/printingCheck/index.js
View file @ caf032c7
......@@ -29,3 +29,11 @@ export function deleteYs(id) {
method: 'delete'
})
}
// 获取印刷详情接口
export function detailYs(id) {
return request({
url: '/wbwarehouseys/detail/' + id,
method: 'get'
})
}
src/views/equipment/printingCheck/index.vue
View file @ caf032c7
......@@ -98,12 +98,12 @@
@click="handleDelete(scope.row)"
>删除
</el-button>
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- @click="handleDetail(scope.row)"-->
<!-- >详情-->
<!-- </el-button>-->
<el-button
size="mini"
type="text"
@click="handleDetail(scope.row)"
>详情
</el-button>
</template>
</el-table-column>
</el-table>
......@@ -116,326 +116,163 @@
@pagination="getYsList"
/>
<!-- TODO: 详情 -->
<el-dialog class="aboutSingleDetails" :title="title" :visible.sync="openDetails" width="1200px" append-to-body>
<el-form ref="formDetails" :model="singleDetails" size="small" label-width="90px">
<!-- 印刷模态框-->
<!-- 添加或修改参数配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
<el-form ref="form" :model="form" :rules="rules" label-width="82px">
<el-row>
<el-col :span="8">
<el-form-item label="pn：" prop="pn">
<el-input v-model.trim="singleDetails.pn" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="phd：" prop="phd">
<el-input v-model.trim="singleDetails.phd" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="prank：" prop="prank">
<el-input v-model.trim="singleDetails.prank" :readonly="true" :maxlength="100" />
<el-col>
<el-form-item label="批号" prop="lot">
<el-input v-model="form.lot" placeholder="请输入批号" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="pgx：" prop="pgx">
{{ replaced(singleDetails.pgx) }}
<el-col>
<el-form-item label="印刷次数" prop="fqYs">
<el-input v-model="form.fqYs" placeholder="请输入印刷次数" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="pissb：" prop="pissb">
{{ selectedPissb(singleDetails.pissb) }}
</el-row>
<el-row>
<el-col>
<el-form-item label="是否废弃" prop="poperate">
<el-radio-group v-model="form.poperate">
<el-radio :label="0">无需废弃</el-radio>
<el-radio :label="1">已废弃</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="pnumber：" prop="pnumber">
<el-input v-model.trim="singleDetails.pnumber" :readonly="true" />
</el-row>
<el-row v-if="form.poperate === 1">
<el-col>
<el-form-item label="废弃原因" prop="fqYy">
<el-select
v-model.trim="form.fqYy"
style="width: 340px"
clearable
placeholder="请选择废弃原因"
>
<el-option
v-for="(dict,index) in pgxList"
:key="index"
:label="dict.dictValue"
:value="dict.dictLabel"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="解锁人：" prop="unlockUsername">
<el-input v-model.trim="singleDetails.unlockUsername" :readonly="true" />
<el-row v-if="form.poperate === 1">
<el-col>
<el-form-item label="fqBz" prop="fqBz">
<el-input v-model.trim="form.fqBz" :maxlength="100" placeholder="请输入fqBz" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="解锁时间：" prop="unlockDate">
<el-input v-model.trim="singleDetails.unlockDate" :readonly="true" />
</el-row>
<el-row v-if="form.poperate === 1">
<el-col>
<el-form-item label="fqDd" prop="fqDd">
<span>{{ form.fqDd }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="申请人：" prop="createName">
<el-input v-model.trim="singleDetails.createName" :readonly="true" />
<el-row v-if="form.poperate === 1">
<el-col>
<el-form-item label="fqMcode" prop="fqMcode">
<el-input v-model.trim="form.fqMcode" :maxlength="100" placeholder="请输入fqMcode" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label=" 申请时间：" prop="createDate">
<el-input v-model.trim="singleDetails.createDate" :readonly="true" />
</el-row>
<el-row v-if="form.poperate === 1">
<el-col>
<el-form-item label="fqDbxi" prop="fqDbxi">
<el-input v-model.trim="form.fqDbxi" :maxlength="100" placeholder="请输入fqDbxi" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<!-- apply详情-->
<el-table
v-if="applyStatus === '1'"
v-loading="loadingDetail"
border
:data="applyList"
@selection-change="handleSelectionChange"
>
<el-table-column type="index" label="序号" width="50" />
<el-table-column label="pn" prop="pn">
<template slot-scope="scope">
{{ scope.row.pn || '-' }}
</template>
</el-table-column>
<el-table-column label="lot" prop="lot" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.lot || '-' }}
</template>
</el-table-column>
<el-table-column label="plocation" prop="plocation">
<template slot-scope="scope">
{{ scope.row.plocation || '-' }}
</template>
</el-table-column>
<el-table-column label="prank" prop="prank">
<template slot-scope="scope">
{{ scope.row.prank || '-' }}
</template>
</el-table-column>
<el-table-column label="pzl" prop="pzl">
<template slot-scope="scope">
{{ scope.row.pzl || '-' }}
</template>
</el-table-column>
<el-table-column label="phd" prop="phd">
<template slot-scope="scope">
{{ scope.row.phd || '-' }}
</template>
</el-table-column>
<el-table-column label="psm" prop="psm">
<template slot-scope="scope">
{{ scope.row.psm || '-' }}
</template>
</el-table-column>
</el-table>
<div slot="footer" class="dialog-footer">
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
<!-- TODO: 处理 -->
<el-dialog
title="设备领用"
:visible.sync="openHandle"
width="1200px"
append-to-body
:close-on-click-modal="false"
@close="handlecanceClose"
>
<el-form ref="formDetails" class="aboutSingleDetails" :model="singleDetails" size="small" label-width="90px">
<!-- 印刷模态框-->
<!-- 详情配置对话框 -->
<el-dialog title="印刷" :visible.sync="detailOpen" width="500px" append-to-body :close-on-click-modal="false">
<el-form ref="form" :model="detailForm" label-width="82px">
<el-row>
<el-col :span="8">
<el-form-item label="pn：" prop="pn">
<el-input v-model.trim="singleDetails.pn" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="phd：" prop="phd">
<el-input v-model.trim="singleDetails.phd" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="prank：" prop="prank">
<el-input v-model.trim="singleDetails.prank" :readonly="true" :maxlength="100" />
<el-col>
<el-form-item label="批号" prop="lot">
<span>{{detailForm.lot || '-'}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="pgx：" prop="pgx">
{{ replaced(singleDetails.pgx) }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="pissb：" prop="pissb">
<template>
<span v-if="singleDetails.pissb === '0'">否</span>
<span v-else>是</span>
</template>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="pnumber：" prop="pnumber">
<el-input v-model.trim="singleDetails.pnumber" :readonly="true" />
<el-col>
<el-form-item label="印刷次数" prop="fqYs">
<span>{{detailForm.fqYs || '-'}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="申请人：" prop="createName">
<el-input v-model.trim="singleDetails.createName" :readonly="true" />
<el-col>
<el-form-item label="是否废弃" prop="poperate">
<span v-if="detailForm.poperate">{{detailForm.poperate === '0'? '无需废弃':'已废弃'}}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label=" 申请时间：" prop="createDate">
<el-input v-model.trim="singleDetails.createDate" :readonly="true" />
</el-row>
<el-row v-if="detailForm.poperate === '1'">
<el-col>
<el-form-item label="废弃原因" prop="fqYy">
<span>{{getDictValue(detailForm.fqYy)}}</span>
</el-form-item>
</el-col>
</el-row>
</el-form>
<!-- 分割线-->
<el-divider />
<el-table v-loading="loadingDetail" border :data="detailApplyList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" />
<el-table-column type="index" label="序号" width="50" />
<el-table-column label="pn" prop="pn">
<template slot-scope="scope">
{{ scope.row.pn || '-' }}
</template>
</el-table-column>
<el-table-column label="lot" prop="lot" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.lot || '-' }}
</template>
</el-table-column>
<el-table-column label="plocation" prop="plocation">
<template slot-scope="scope">
{{ scope.row.plocation || '-' }}
</template>
</el-table-column>
<el-table-column label="prank" prop="prank">
<template slot-scope="scope">
{{ scope.row.prank || '-' }}
</template>
</el-table-column>
<el-table-column label="pzl" prop="pzl">
<template slot-scope="scope">
{{ scope.row.pzl || '-' }}
</template>
</el-table-column>
<el-table-column label="phd" prop="phd">
<template slot-scope="scope">
{{ scope.row.phd || '-' }}
</template>
</el-table-column>
<el-table-column label="psm" prop="psm">
<template slot-scope="scope">
{{ scope.row.psm || '-' }}
</template>
</el-table-column>
<el-table-column label="入库日期" prop="createDate">
<template slot-scope="scope">
{{ parseTime(scope.row.createDate, '{y}-{m}-{d}') || '-' }}
</template>
</el-table-column>
</el-table>
<div style="float: right;padding:3px 15px;">
<el-button
type="primary"
size="small"
@click="handleCance"
>确定
</el-button>
</div>
</el-dialog>
<!-- 权限验证-->
<el-dialog
:title="title"
:visible.sync="openLogin"
width="500px"
append-to-body
:close-on-click-modal="false"
@close="handleClose"
>
<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" placeholder="请输入用户名" />
</el-form-item>
<el-form-item>
<el-button type="primary" @click="handleConfirm">确定</el-button>
</el-form-item>
</el-form>
</el-dialog>
<!-- 印刷模态框-->
<!-- 添加或修改参数配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="82px">
<el-row>
<el-row v-if="detailForm.poperate === '1'">
<el-col>
<el-form-item label="批号" prop="lot">
<el-input v-model="form.lot" placeholder="请输入批号" />
<el-form-item label="fqBz" prop="fqBz">
<span>{{detailForm.fqBz || '-'}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-row v-if="detailForm.poperate === '1'">
<el-col>
<el-form-item label="印刷次数" prop="fqYs">
<el-input v-model="form.fqYs" placeholder="请输入印刷次数" />
<el-form-item label="fqDd" prop="fqDd">
<span>{{detailForm.fqDd || '-'}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-row v-if="detailForm.poperate === '1'">
<el-col>
<el-form-item label="是否废弃" prop="poperate">
<el-radio-group v-model="form.poperate">
<el-radio :label="0">无需废弃</el-radio>
<el-radio :label="1">已废弃</el-radio>
</el-radio-group>
<el-form-item label="fqMcode" prop="fqMcode">
<span>{{detailForm.fqMcode || '-'}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="form.poperate === 1">
<el-row v-if="detailForm.poperate === '1'">
<el-col>
<el-form-item label="废弃原因" prop="fqYy">
<el-select
v-model.trim="form.fqYy"
style="width: 340px"
clearable
placeholder="请选择废弃原因"
>
<el-option
v-for="(dict,index) in pgxList"
:key="index"
:label="dict.dictValue"
:value="dict.dictLabel"
/>
</el-select>
<el-form-item label="fqDbxi" prop="fqDbxi">
<span>{{detailForm.fqDbxi || '-'}}</span>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import {
listWbApply,
deleteLogical,
batchAddition,
detail,
canceListByType,
checkPermission
} from '@/api/equipment/draw'
import { parseTime } from '@/utils'
import { getDictData, getEquipment } from '@/api/equipment/application'
import { addUser, updateUser } from '@/api/system/user'
import { addYsList, deleteYs, getYsList } from '@/api/equipment/printingCheck'
import { addYsList, deleteYs, getYsList, detailYs } from '@/api/equipment/printingCheck'
export default {
name: 'Draw',
......@@ -459,7 +296,8 @@ export default {
],
fqYy: [
{ required: true, message: '请选择废弃原因', trigger: 'change', validator: this.validateFqYy }
]
],
fqBz: [{ required: true, message: '请输入fqBz', trigger: 'change' }]
},
twoerrorPassword: false,
// 字典数据
......@@ -567,8 +405,16 @@ export default {
lot: '',
fq_ys: '',
poperate: 1, // 默认为已废弃
fq_yy: ''
},
fq_yy: '',
fqBz: '',
fqDd: this.$store.getters.name ? this.$store.getters.name : '',
fqMcode: '',
fqDbxi: ''
},
// 印刷详情表单
detailForm: {},
// 是否显示详情弹出层
detailOpen: false,
// 判断状态显示表单
applyStatus: ''
}
......@@ -584,16 +430,23 @@ export default {
next()
},
created() {
this.getUserName()
this.getYsList()
this.getDict()
// this.getList()
// this.getCodeDict()
},
methods: {
// 获取当前用户名称
getUserName() {
if (this.$store.getters.name) {
this.form.fqDd = this.$store.getters.name
}
},
// 废弃原因匹配
getDictValue(fqYy) {
const item = this.pgxList.find(item => item.dictLabel === fqYy)
return item ? item.dictValue : ''
return item ? item.dictValue : '-'
},
// 废弃原因下拉框
getDict() {
......@@ -971,14 +824,12 @@ export default {
// 获取所选行详情信息
handleDetail(row) {
const id = row.businessId
this.openDetails = true
this.singleDetails = row
this.title = '详情'
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
detailYs(id).then(res => {
console.log('印刷信息详情', res)
if (res.code === 200) {
this.detailForm = res.data
this.detailOpen = true
}
})
},
......@@ -998,19 +849,19 @@ export default {
// 表单重置
reset() {
this.form = {
pn: undefined,
ptype: undefined,
pgx: undefined,
flag: undefined,
menuIds: [],
menuName: undefined,
deptIds: [],
menuCheckStrictly: true,
deptCheckStrictly: true,
remark: undefined,
poperate: 0
}
// this.form = {
// pn: undefined,
// ptype: undefined,
// pgx: undefined,
// flag: undefined,
// menuIds: [],
// menuName: undefined,
// deptIds: [],
// menuCheckStrictly: true,
// deptCheckStrictly: true,
// remark: undefined,
// poperate: 0
// }
this.resetForm('form')
},
// warehouse查询
......
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