Skip to content

T
template_vue
Commit ee16b1da authored by cat's avatar cat
Browse files
Options

Merge remote-tracking branch 'origin/project9-8' into project9-8

parents 8c562b61 8b748f15
Hide whitespace changes
Inline Side-by-side
Showing with 320 additions and 332 deletions
src/api/equipment/printingCheck/index.js
View file @ ee16b1da
...@@ -28,3 +28,11 @@ export function deleteYs(id) { ...@@ -28,3 +28,11 @@ export function deleteYs(id) {
method: 'delete' method: 'delete'
}) })
} }
// 获取印刷详情接口
export function detailYs(id) {
return request({
url: '/wbwarehouseys/detail/' + id,
method: 'get'
})
}
src/api/magnagement.js
View file @ ee16b1da
...@@ -45,6 +45,19 @@ export function recycle(data) { ...@@ -45,6 +45,19 @@ export function recycle(data) {
} }
}) })
} }
// 再利用中的废弃
export function recycleAndAbandon(data) {
return request({
url: '/wbwarehouse/recycleAndAbandon',
method: 'put',
data,
headers: {
'Content-Type': 'application/json;charset=UTF-8'
}
})
}
// 逻辑删除基础信息接口 // 逻辑删除基础信息接口
export function deletedevice(id) { export function deletedevice(id) {
return request({ return request({
......
src/layout/components/TagsView/index.vue
View file @ ee16b1da
...@@ -150,13 +150,15 @@ export default { ...@@ -150,13 +150,15 @@ export default {
}) })
}, },
closeSelectedTag(view) { closeSelectedTag(view) {
// 关闭标签页清除存储的筛选条件数据
this.$store.dispatch('searchSave/clearOneParams',this.$route.path)
this.$store.dispatch('tagsView/delView', view).then(({ visitedViews }) => { this.$store.dispatch('tagsView/delView', view).then(({ visitedViews }) => {
if (this.isActive(view)) { if (this.isActive(view)) {
this.toLastView(visitedViews, view) this.toLastView(visitedViews, view)
} }
if (view.path === '/processManagement/deviceReuse') { // if (view.path === '/processManagement/deviceReuse') {
if (sessionStorage.getItem('recycleform') !== null) { sessionStorage.removeItem('recycleform') } // if (sessionStorage.getItem('recycleform') !== null) { sessionStorage.removeItem('recycleform') }
} // }
}) })
}, },
closeOthersTags() { closeOthersTags() {
......
src/store/modules/searchSave.js
View file @ ee16b1da
...@@ -18,7 +18,8 @@ const mutations = { ...@@ -18,7 +18,8 @@ const mutations = {
state.searchParams = {} state.searchParams = {}
}, },
CLEAR_ONE_PARAMS: (state, path) => { CLEAR_ONE_PARAMS: (state, path) => {
path && state.searchParams[path] && delete state.searchParams[path] // path && state.searchParams[path] && delete state.searchParams[path]
state.searchParams[path] = ''
} }
} }
...@@ -32,7 +33,10 @@ const actions = { ...@@ -32,7 +33,10 @@ const actions = {
commit('RSET_SEARCH_PARAMS') commit('RSET_SEARCH_PARAMS')
}, },
clearOneParams({ commit }, path) { clearOneParams({ commit }, path) {
commit('CLEAR_ONE_PARAMS', path) // 延时清除缓存数据，防止路由离开前重新赋值
setTimeout(() => {
commit('CLEAR_ONE_PARAMS', path)
}, 2000)
} }
} }
......
src/views/equipment/basicInfo.vue
View file @ ee16b1da
...@@ -310,6 +310,7 @@ export default { ...@@ -310,6 +310,7 @@ export default {
}, },
/** 路由离开前存储筛选条件*/ /** 路由离开前存储筛选条件*/
beforeRouteLeave(to, from, next) { beforeRouteLeave(to, from, next) {
console.log("離開路由前賦值")
this.$store.dispatch('searchSave/searchParamsSet', { this.$store.dispatch('searchSave/searchParamsSet', {
path: this.$route.path, path: this.$route.path,
param: { param: {
......
src/views/equipment/income.vue
View file @ ee16b1da
...@@ -71,6 +71,11 @@ ...@@ -71,6 +71,11 @@
<el-input v-model="form.plocation" placeholder="请输入位置" :style="{ width: '400px', height: '30px' }" :maxlength="100" /> <el-input v-model="form.plocation" placeholder="请输入位置" :style="{ width: '400px', height: '30px' }" :maxlength="100" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item label="寿命:" style="flex-basis: 50%;" prop="psm">
<el-input v-model="form.psm" placeholder="请输入寿命" :style="{ width: '400px', height: '30px' }" :maxlength="9" />
</el-form-item>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
<el-form label-width="80px"> <el-form label-width="80px">
...@@ -78,7 +83,7 @@ ...@@ -78,7 +83,7 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item style="flex-basis: 50%;"> <el-form-item style="flex-basis: 50%;">
<el-button type="primary" @click="submitForm">提交</el-button> <el-button type="primary" @click="submitForm">提交</el-button>
<el-button @click="resetQuery">重置</el-button> <el-button @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -104,7 +109,8 @@ export default { ...@@ -104,7 +109,8 @@ export default {
phd: '', phd: '',
flag: 1, flag: 1,
ptype: 1, ptype: 1,
pstatus: 0 pstatus: 0,
psm: undefined
}, },
tableData: [], // 表格数据 tableData: [], // 表格数据
selectedRows: [], selectedRows: [],
...@@ -125,6 +131,10 @@ export default { ...@@ -125,6 +131,10 @@ export default {
{ required: true, message: '请输入位置', trigger: 'blur' }, { required: true, message: '请输入位置', trigger: 'blur' },
{ pattern: /^[^[\uD800-\uDFFF]+$/, message: '不能包含表情符号', trigger: 'change' }, { pattern: /^[^[\uD800-\uDFFF]+$/, message: '不能包含表情符号', trigger: 'change' },
{ max: 100, message: '输入长度不能超过100个字符', trigger: 'change' } { max: 100, message: '输入长度不能超过100个字符', trigger: 'change' }
],
psm: [
{ required: true, message: '请输入寿命', trigger: 'blur' },
{ pattern: /^[1-9]\d*$/, message: '请输入正整数', trigger: 'blur' }
] ]
} }
} }
...@@ -161,7 +171,8 @@ export default { ...@@ -161,7 +171,8 @@ export default {
phd: '', phd: '',
flag: 1, flag: 1,
ptype: 1, ptype: 1,
pstatus: 0 pstatus: 0,
psm: undefined
} }
this.tableData = [] this.tableData = []
}, },
...@@ -298,7 +309,7 @@ export default { ...@@ -298,7 +309,7 @@ export default {
lot: '', lot: '',
plocation: '', plocation: '',
phd: '', phd: '',
psm: '', psm: undefined,
pzl: '', pzl: '',
prank: '' prank: ''
} }
...@@ -316,18 +327,16 @@ export default { ...@@ -316,18 +327,16 @@ export default {
this.$message.warning('请先确定表格数据') this.$message.warning('请先确定表格数据')
return return
} }
this.$confirm('是否确认操作?', '提示', { this.$refs.form.validate((valid) => {
confirmButtonText: '确定', if (valid) {
cancelButtonText: '取消', this.$confirm('是否确认操作?', '提示', {
type: 'warning' confirmButtonText: '确定',
}).then(() => { cancelButtonText: '取消',
// const newRow = { type: 'warning'
// plocation }).then(() => {
// }
this.$refs.form.validate((valid) => {
if (valid) {
console.log('form', this.form) console.log('form', this.form)
this.tableData.forEach(item => { this.tableData.forEach(item => {
item.psm = this.form.psm
item.plocation = this.form.plocation item.plocation = this.form.plocation
}) })
add(this.tableData).then(res => { add(this.tableData).then(res => {
...@@ -336,16 +345,17 @@ export default { ...@@ -336,16 +345,17 @@ export default {
this.$message.success('操作成功') this.$message.success('操作成功')
this.tableData = [] this.tableData = []
this.form.plocation = '' this.form.plocation = ''
this.form.psm = undefined
} else if (res.code === null) { } else if (res.code === null) {
this.$message.error(res.message) this.$message.error(res.message)
// this.tableData = [] // this.tableData = []
// this.form.plocation = '' // this.form.plocation = ''
} }
}) })
} else { })
// 校验失败，显示错误信息或进行其他操作 } else {
} // 校验失败，显示错误信息或进行其他操作
}) }
}) })
}, },
// 调数据字典查询 // 调数据字典查询
......
src/views/equipment/inventoryRecord/index.vue
View file @ ee16b1da
...@@ -225,7 +225,7 @@ ...@@ -225,7 +225,7 @@
</template> </template>
<script> <script>
import {exportInventoryRecord, exportTest, findSingleLogDetail, listLog} from '@/api/processMangement/InventoryRecord' import { exportInventoryRecord, exportTest, findSingleLogDetail, listLog } from '@/api/processMangement/InventoryRecord'
import BaseTable from '@/components/Table/BaseTable/index.vue' import BaseTable from '@/components/Table/BaseTable/index.vue'
import { BaseTableArgumentsTest } from '@/components/Table/AllTableArguments/BaseTableArguments' import { BaseTableArgumentsTest } from '@/components/Table/AllTableArguments/BaseTableArguments'
import { getDictData } from '@/api/equipment/application' import { getDictData } from '@/api/equipment/application'
...@@ -449,6 +449,7 @@ export default { ...@@ -449,6 +449,7 @@ export default {
}, },
created() { created() {
if (this.$store.getters.searchParams[this.$route.path]) { if (this.$store.getters.searchParams[this.$route.path]) {
console.log('111', this.$store.getters.searchParams[this.$route.path])
const { searchParams } = this.$store.getters; const { path } = this.$route const { searchParams } = this.$store.getters; const { path } = this.$route
const param = JSON.parse(searchParams[path]) // 保留着的查询条件 const param = JSON.parse(searchParams[path]) // 保留着的查询条件
this.queryParams = { ...param } this.queryParams = { ...param }
...@@ -592,7 +593,7 @@ export default { ...@@ -592,7 +593,7 @@ export default {
} }
this.openDetails = true this.openDetails = true
}, },
test(){ test() {
exportTest().then(response => { exportTest().then(response => {
const blob = new Blob([response]) const blob = new Blob([response])
const downloadElement = document.createElement('a') const downloadElement = document.createElement('a')
......
src/views/equipment/printingCheck/index.vue
View file @ ee16b1da
...@@ -98,12 +98,12 @@ ...@@ -98,12 +98,12 @@
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
>删除 >删除
</el-button> </el-button>
<!-- <el-button--> <el-button
<!-- size="mini"--> size="mini"
<!-- type="text"--> type="text"
<!-- @click="handleDetail(scope.row)"--> @click="handleDetail(scope.row)"
<!-- >详情--> >详情
<!-- </el-button>--> </el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -116,326 +116,163 @@ ...@@ -116,326 +116,163 @@
@pagination="getYsList" @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-row>
<el-col :span="8"> <el-col>
<el-form-item label="pn：" prop="pn"> <el-form-item label="批号" prop="lot">
<el-input v-model.trim="singleDetails.pn" :readonly="true" /> <el-input v-model="form.lot" placeholder="请输入批号" />
</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-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col>
<el-form-item label="pgx：" prop="pgx"> <el-form-item label="印刷次数" prop="fqYs">
{{ replaced(singleDetails.pgx) }} <el-input v-model="form.fqYs" placeholder="请输入印刷次数" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> </el-row>
<el-form-item label="pissb：" prop="pissb"> <el-row>
{{ selectedPissb(singleDetails.pissb) }} <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-form-item>
</el-col> </el-col>
<el-col :span="8"> </el-row>
<el-form-item label="pnumber：" prop="pnumber"> <el-row v-if="form.poperate === 1">
<el-input v-model.trim="singleDetails.pnumber" :readonly="true" /> <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-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row v-if="form.poperate === 1">
<el-col :span="8"> <el-col>
<el-form-item label="解锁人：" prop="unlockUsername"> <el-form-item label="fqBz" prop="fqBz">
<el-input v-model.trim="singleDetails.unlockUsername" :readonly="true" /> <el-input v-model.trim="form.fqBz" :maxlength="100" placeholder="请输入fqBz" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> </el-row>
<el-form-item label="解锁时间：" prop="unlockDate"> <el-row v-if="form.poperate === 1">
<el-input v-model.trim="singleDetails.unlockDate" :readonly="true" /> <el-col>
<el-form-item label="fqDd" prop="fqDd">
<span>{{ form.fqDd }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-if="form.poperate === 1">
<el-row> <el-col>
<el-col :span="8"> <el-form-item label="fqMcode" prop="fqMcode">
<el-form-item label="申请人：" prop="createName"> <el-input v-model.trim="form.fqMcode" :maxlength="100" placeholder="请输入fqMcode" />
<el-input v-model.trim="singleDetails.createName" :readonly="true" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> </el-row>
<el-form-item label=" 申请时间：" prop="createDate"> <el-row v-if="form.poperate === 1">
<el-input v-model.trim="singleDetails.createDate" :readonly="true" /> <el-col>
<el-form-item label="fqDbxi" prop="fqDbxi">
<el-input v-model.trim="form.fqDbxi" :maxlength="100" placeholder="请输入fqDbxi" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer">
<!-- apply详情--> <el-button @click="cancel">取 消</el-button>
<el-table <el-button type="primary" @click="submitForm">确 定</el-button>
v-if="applyStatus === '1'" </div>
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>
</el-dialog> </el-dialog>
<!-- 印刷模态框-->
<!-- TODO: 处理 --> <!-- 详情配置对话框 -->
<el-dialog <el-dialog title="印刷" :visible.sync="detailOpen" width="500px" append-to-body :close-on-click-modal="false">
title="设备领用" <el-form ref="form" :model="detailForm" label-width="82px">
: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-row> <el-row>
<el-col :span="8"> <el-col>
<el-form-item label="pn：" prop="pn"> <el-form-item label="批号" prop="lot">
<el-input v-model.trim="singleDetails.pn" :readonly="true" /> <span>{{detailForm.lot || '-'}}</span>
</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-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col>
<el-form-item label="pgx：" prop="pgx"> <el-form-item label="印刷次数" prop="fqYs">
{{ replaced(singleDetails.pgx) }} <span>{{detailForm.fqYs || '-'}}</span>
</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-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col>
<el-form-item label="申请人：" prop="createName"> <el-form-item label="是否废弃" prop="poperate">
<el-input v-model.trim="singleDetails.createName" :readonly="true" /> <span v-if="detailForm.poperate">{{detailForm.poperate === '0'? '无需废弃':'已废弃'}}</span>
<span v-else>-</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> </el-row>
<el-form-item label=" 申请时间：" prop="createDate"> <el-row v-if="detailForm.poperate === '1'">
<el-input v-model.trim="singleDetails.createDate" :readonly="true" /> <el-col>
<el-form-item label="废弃原因" prop="fqYy">
<span>{{getDictValue(detailForm.fqYy)}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> <el-row v-if="detailForm.poperate === '1'">
<!-- 分割线-->
<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-col> <el-col>
<el-form-item label="批号" prop="lot"> <el-form-item label="fqBz" prop="fqBz">
<el-input v-model="form.lot" placeholder="请输入批号" /> <span>{{detailForm.fqBz || '-'}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row v-if="detailForm.poperate === '1'">
<el-col> <el-col>
<el-form-item label="印刷次数" prop="fqYs"> <el-form-item label="fqDd" prop="fqDd">
<el-input v-model="form.fqYs" placeholder="请输入印刷次数" /> <span>{{detailForm.fqDd || '-'}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row v-if="detailForm.poperate === '1'">
<el-col> <el-col>
<el-form-item label="是否废弃" prop="poperate"> <el-form-item label="fqMcode" prop="fqMcode">
<el-radio-group v-model="form.poperate"> <span>{{detailForm.fqMcode || '-'}}</span>
<el-radio :label="0">无需废弃</el-radio>
<el-radio :label="1">已废弃</el-radio>
</el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-if="form.poperate === 1"> <el-row v-if="detailForm.poperate === '1'">
<el-col> <el-col>
<el-form-item label="废弃原因" prop="fqYy"> <el-form-item label="fqDbxi" prop="fqDbxi">
<el-select <span>{{detailForm.fqDbxi || '-'}}</span>
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-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </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> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { import {
listWbApply, listWbApply,
deleteLogical,
batchAddition, batchAddition,
detail,
canceListByType, canceListByType,
checkPermission checkPermission
} from '@/api/equipment/draw' } from '@/api/equipment/draw'
import { parseTime } from '@/utils' import { parseTime } from '@/utils'
import { getDictData, getEquipment } from '@/api/equipment/application' 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 { export default {
name: 'Draw', name: 'Draw',
...@@ -459,7 +296,8 @@ export default { ...@@ -459,7 +296,8 @@ export default {
], ],
fqYy: [ fqYy: [
{ required: true, message: '请选择废弃原因', trigger: 'change', validator: this.validateFqYy } { required: true, message: '请选择废弃原因', trigger: 'change', validator: this.validateFqYy }
] ],
fqBz: [{ required: true, message: '请输入fqBz', trigger: 'change' }]
}, },
twoerrorPassword: false, twoerrorPassword: false,
// 字典数据 // 字典数据
...@@ -564,8 +402,16 @@ export default { ...@@ -564,8 +402,16 @@ export default {
lot: '', lot: '',
fq_ys: '', fq_ys: '',
poperate: 1, // 默认为已废弃 poperate: 1, // 默认为已废弃
fq_yy: '' fq_yy: '',
fqBz: '',
fqDd: this.$store.getters.name ? this.$store.getters.name : '',
fqMcode: '',
fqDbxi: ''
}, },
// 印刷详情表单
detailForm: {},
// 是否显示详情弹出层
detailOpen: false,
// 判断状态显示表单 // 判断状态显示表单
applyStatus: '' applyStatus: ''
} }
...@@ -581,16 +427,23 @@ export default { ...@@ -581,16 +427,23 @@ export default {
next() next()
}, },
created() { created() {
this.getUserName()
this.getYsList() this.getYsList()
this.getDict() this.getDict()
// this.getList() // this.getList()
// this.getCodeDict() // this.getCodeDict()
}, },
methods: { methods: {
// 获取当前用户名称
getUserName() {
if (this.$store.getters.name) {
this.form.fqDd = this.$store.getters.name
}
},
// 废弃原因匹配 // 废弃原因匹配
getDictValue(fqYy) { getDictValue(fqYy) {
const item = this.pgxList.find(item => item.dictLabel === fqYy) const item = this.pgxList.find(item => item.dictLabel === fqYy)
return item ? item.dictValue : '' return item ? item.dictValue : '-'
}, },
// 废弃原因下拉框 // 废弃原因下拉框
getDict() { getDict() {
...@@ -968,14 +821,12 @@ export default { ...@@ -968,14 +821,12 @@ export default {
// 获取所选行详情信息 // 获取所选行详情信息
handleDetail(row) { handleDetail(row) {
const id = row.businessId const id = row.businessId
this.openDetails = true detailYs(id).then(res => {
this.singleDetails = row console.log('印刷信息详情', res)
this.title = '详情' if (res.code === 200) {
detail(id).then(res => { this.detailForm = res.data
res.data.createDate = parseTime(res.data.createDate, '{y}-{m}-{d}') this.detailOpen = true
this.applyList = res.data.wbApplyDetailList }
this.applyStatus = res.data.pstatus
this.loadingDetail = false
}) })
}, },
...@@ -995,19 +846,19 @@ export default { ...@@ -995,19 +846,19 @@ export default {
// 表单重置 // 表单重置
reset() { reset() {
this.form = { // this.form = {
pn: undefined, // pn: undefined,
ptype: undefined, // ptype: undefined,
pgx: undefined, // pgx: undefined,
flag: undefined, // flag: undefined,
menuIds: [], // menuIds: [],
menuName: undefined, // menuName: undefined,
deptIds: [], // deptIds: [],
menuCheckStrictly: true, // menuCheckStrictly: true,
deptCheckStrictly: true, // deptCheckStrictly: true,
remark: undefined, // remark: undefined,
poperate: 0 // poperate: 0
} // }
this.resetForm('form') this.resetForm('form')
}, },
// warehouse查询 // warehouse查询
......
src/views/processManagement/deviceReuse/index.vue
View file @ ee16b1da
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="厚度:" style="flex-basis: 50%;" prop="phd"> <el-form-item label="厚度:" style="flex-basis: 50%;" prop="phd">
<span>{{ form.phd }}</span> <span>{{ form.phd }}</span>
<!-- <el-input ref="input4" v-model="form.phd" :readonly="true" placeholder="请输入厚度" clearable style="width: 400px" :maxlength="8" @keyup.enter.native="handelTab(4,$event)" />--> <!-- <el-input ref="input4" v-model="form.phd" :readonly="true" placeholder="请输入厚度" clearable style="width: 400px" :maxlength="8" @keyup.enter.native="handelTab(4,$event)" />-->
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -35,9 +35,9 @@ ...@@ -35,9 +35,9 @@
<el-form-item label="psm:" style="flex-basis: 50%;" prop="psm"> <el-form-item label="psm:" style="flex-basis: 50%;" prop="psm">
<el-input ref="input5" v-model="form.psm" placeholder="请输入psm" clearable style="width: 400px" :maxlength="8" @keyup.enter.native="handelTab(5,$event)" /> <el-input ref="input5" v-model="form.psm" placeholder="请输入psm" clearable style="width: 400px" :maxlength="8" @keyup.enter.native="handelTab(5,$event)" />
</el-form-item> </el-form-item>
<!-- <el-form-item v-if="form.exitPsm" label="当前psm:">--> <!-- <el-form-item v-if="form.exitPsm" label="当前psm:">-->
<!-- <span>{{ form.currentPsm }}</span>--> <!-- <span>{{ form.currentPsm }}</span>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="pzl:" style="flex-basis: 50%;" prop="pzl"> <el-form-item label="pzl:" style="flex-basis: 50%;" prop="pzl">
...@@ -57,9 +57,47 @@ ...@@ -57,9 +57,47 @@
<!-- </el-row>--> <!-- </el-row>-->
<el-row :gutter="40"> <el-row :gutter="40">
<el-col :span="12" style="padding-left: 10%;"> <el-col :span="12" style="padding-left: 10%;">
<el-form-item label="印刷原因:" style="flex-basis: 50%;" prop="fq_yy"> <el-form-item label="废弃原因:" style="flex-basis: 50%;" prop="fq_yy" :rules="[{required: this.type === '3', message: '请选择废弃原因', trigger: 'blur' }]">
<span>{{ getDictValue(form.fq_yy) || '无' }}</span> <el-select
<!-- <el-input ref="input7" v-model="form.fq_yy" :readonly="true" placeholder="请输入印刷原因" clearable style="width: 400px" :maxlength="100" @keyup.enter.native="handelTab(7,$event)" />--> v-model.trim="form.fq_yy"
style="width: 400px"
clearable
placeholder="请选择废弃原因"
>
<el-option
v-for="(dict,index) in pgxList"
:key="index"
:label="dict.dictValue"
:value="dict.dictLabel"
/>
</el-select>
<!-- <span v-if="!form.fq_yy">无</span>-->
<!-- <span v-else>{{ getDictValue(form.fq_yy)}}</span>-->
<!-- <el-input ref="input7" v-model="form.fq_yy" :readonly="true" placeholder="请输入印刷原因" clearable style="width: 400px" :maxlength="100" @keyup.enter.native="handelTab(7,$event)" />-->
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="fq_bz:" style="flex-basis: 50%;" prop="fq_bz" :rules="[{required: this.type === '3', message: '请输入fq_bz', trigger: 'blur' }]">
<el-input ref="input7" v-model="form.fq_bz" placeholder="请输入fq_bz" clearable style="width: 400px" :maxlength="100" @keyup.enter.native="handelTab(7,$event)" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="40">
<el-col :span="12" style="padding-left: 10%;">
<el-form-item label="fq_dd:" style="flex-basis: 50%;" prop="fq_dd">
<el-input ref="input8" v-model="form.fq_dd" placeholder="请输入fq_bz" clearable style="width: 400px" :maxlength="100" @keyup.enter.native="handelTab(8,$event)" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="fq_mcode:" style="flex-basis: 50%;" prop="fq_mcode">
<el-input ref="input9" v-model="form.fq_mcode" placeholder="请输入fq_mcode" clearable style="width: 400px" :maxlength="100" @keyup.enter.native="handelTab(9,$event)" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="40">
<el-col :span="12" style="padding-left: 10%;">
<el-form-item label="fq_dbxi:" style="flex-basis: 50%;" prop="fq_dbxi">
<el-input ref="input10" v-model="form.fq_dbxi" placeholder="请输入fq_dbxi" clearable style="width: 400px" :maxlength="100" @keyup.enter.native="handelTab(10,$event)" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -70,6 +108,7 @@ ...@@ -70,6 +108,7 @@
<el-form-item style="flex-basis: 50%;"> <el-form-item style="flex-basis: 50%;">
<el-button type="primary" @click="submitForm">提交</el-button> <el-button type="primary" @click="submitForm">提交</el-button>
<el-button @click="resetQuery">重置</el-button> <el-button @click="resetQuery">重置</el-button>
<el-button style="background-color: #EFBF16FF; color: #FFFFFF;border: 1px solid #EFBF16FF" @click="abandon">废弃</el-button>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -78,7 +117,7 @@ ...@@ -78,7 +117,7 @@
</template> </template>
<script> <script>
import { recycle } from '@/api/magnagement' import { recycle, recycleAndAbandon } from '@/api/magnagement'
import { getWbWarehouseByLot } from '@/api/processMangement/InventoryRecord' import { getWbWarehouseByLot } from '@/api/processMangement/InventoryRecord'
import { getDictData } from '@/api/equipment/application' import { getDictData } from '@/api/equipment/application'
...@@ -86,6 +125,8 @@ export default { ...@@ -86,6 +125,8 @@ export default {
name: 'Role', name: 'Role',
data() { data() {
return { return {
// 操作类型 1:提交,2:重置,3废弃
type: '1',
pgxList: [], pgxList: [],
// 缓存判断 // 缓存判断
recycleexist: false, recycleexist: false,
...@@ -101,7 +142,13 @@ export default { ...@@ -101,7 +142,13 @@ export default {
fq_ys: '', fq_ys: '',
flag: 1, flag: 1,
ptype: '', ptype: '',
pstatus: 0 pstatus: 0,
// 只在前端显示原因,
fq_yy: null,
fq_bz: null,
fq_dd: null,
fq_mcode: null,
fq_dbxi: null
}, },
historForm: {}, historForm: {},
rule: { rule: {
...@@ -159,6 +206,30 @@ export default { ...@@ -159,6 +206,30 @@ export default {
} }
}, },
methods: { methods: {
abandon() {
this.$confirm('是否确认废弃?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(res => {
this.type = '3'
this.$nextTick().then(() => {
this.$refs.form.validate(valid => {
if (valid) {
recycleAndAbandon(this.form).then(res => {
if (res.code === 200) {
this.form.exitPsm = false
this.$message.success('操作成功')
this.resetFrom()
} else if (res.code === null) {
this.$message.error(res.message)
}
})
}
})
})
})
},
// 废弃原因匹配 // 废弃原因匹配
getDictValue(fqYy) { getDictValue(fqYy) {
const item = this.pgxList.find(item => item.dictLabel === fqYy) const item = this.pgxList.find(item => item.dictLabel === fqYy)
...@@ -191,24 +262,40 @@ export default { ...@@ -191,24 +262,40 @@ export default {
this.form.exitPsm = true this.form.exitPsm = true
this.form.fq_yy = res.data.fq_yy this.form.fq_yy = res.data.fq_yy
this.form.pzl = res.data.pzl this.form.pzl = res.data.pzl
this.form.fq_bz = res.data.fq_bz
this.form.fq_dd = res.data.fq_dd
this.form.fq_mcode = res.data.fq_mcode
this.form.fq_dbxi = res.data.fq_dbxi
}) })
} }
}, },
resetQuery() { resetQuery() {
this.form = { this.$confirm('是否确认重置?', '提示', {
exitPsm: false, confirmButtonText: '确定',
pn: '', cancelButtonText: '取消',
lot: '', type: 'warning'
plocation: '工序网板库', }).then(res => {
phd: '', this.type = '2'
psm: '', this.form = {
pzl: '', exitPsm: false,
prank: '', pn: '',
flag: 1, lot: '',
ptype: '', plocation: '工序网板库',
pstatus: 0 phd: '',
} psm: '',
sessionStorage.setItem('recycleform', JSON.stringify(this.form)) pzl: '',
prank: '',
flag: 1,
ptype: '',
pstatus: 0,
fq_yy: null,
fq_bz: null,
fq_dd: null,
fq_mcode: null,
fq_dbxi: null
}
sessionStorage.setItem('recycleform', JSON.stringify(this.form))
})
}, },
// 回车跳转下一个输入框 // 回车跳转下一个输入框
focusNextInput(form) { focusNextInput(form) {
...@@ -234,8 +321,14 @@ export default { ...@@ -234,8 +321,14 @@ export default {
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(res => { }).then(res => {
this.type = '1'
this.$refs.form.validate((valid) => { this.$refs.form.validate((valid) => {
if (valid) { if (valid) {
this.form.fq_yy = null
this.form.fq_bz = null
this.form.fq_dd = null
this.form.fq_mcode = null
this.form.fq_dbxi = null
// 提价时要调的接口 // 提价时要调的接口
recycle(this.form).then(res => { recycle(this.form).then(res => {
if (res.code === 200) { if (res.code === 200) {
...@@ -262,7 +355,12 @@ export default { ...@@ -262,7 +355,12 @@ export default {
prank: '', prank: '',
flag: 1, flag: 1,
ptype: '', ptype: '',
pstatus: 0 pstatus: 0,
fq_yy: null,
fq_bz: null,
fq_dd: null,
fq_mcode: null,
fq_dbxi: null
} }
// 重置表单校验 // 重置表单校验
this.$refs.form.clearValidate() this.$refs.form.clearValidate()
......
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