Skip to content

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

3.再利用添加废弃按钮，添加bz dd machine dbxi 四个字段

parent caf032c7
Hide whitespace changes
Inline Side-by-side
Showing with 133 additions and 26 deletions
src/api/magnagement.js
View file @ e3205877
......@@ -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) {
return request({
......
src/views/processManagement/deviceReuse/index.vue
View file @ e3205877
......@@ -26,7 +26,7 @@
<el-col :span="12">
<el-form-item label="厚度:" style="flex-basis: 50%;" prop="phd">
<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-col>
</el-row>
......@@ -35,9 +35,9 @@
<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-form-item>
<!-- <el-form-item v-if="form.exitPsm" label="当前psm:">-->
<!-- <span>{{ form.currentPsm }}</span>-->
<!-- </el-form-item>-->
<!-- <el-form-item v-if="form.exitPsm" label="当前psm:">-->
<!-- <span>{{ form.currentPsm }}</span>-->
<!-- </el-form-item>-->
</el-col>
<el-col :span="12">
<el-form-item label="pzl:" style="flex-basis: 50%;" prop="pzl">
......@@ -57,9 +57,47 @@
<!-- </el-row>-->
<el-row :gutter="40">
<el-col :span="12" style="padding-left: 10%;">
<el-form-item label="印刷原因:" style="flex-basis: 50%;" prop="tempYY">
<span>{{ getDictValue(form.tempYY) || '无' }}</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 label="废弃原因:" style="flex-basis: 50%;" prop="fq_yy" :rules="[{required: this.type === '3', message: '请选择废弃原因', trigger: 'blur' }]">
<el-select
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-col>
</el-row>
......@@ -70,6 +108,7 @@
<el-form-item style="flex-basis: 50%;">
<el-button type="primary" @click="submitForm">提交</el-button>
<el-button @click="resetQuery">重置</el-button>
<el-button @click="abandon">废弃</el-button>
</el-form-item>
</el-col>
</el-row>
......@@ -78,7 +117,7 @@
</template>
<script>
import { recycle } from '@/api/magnagement'
import { recycle, recycleAndAbandon } from '@/api/magnagement'
import { getWbWarehouseByLot } from '@/api/processMangement/InventoryRecord'
import { getDictData } from '@/api/equipment/application'
......@@ -86,6 +125,8 @@ export default {
name: 'Role',
data() {
return {
// 操作类型 1:提交,2:重置,3废弃
type: '1',
pgxList: [],
// 缓存判断
recycleexist: false,
......@@ -103,7 +144,11 @@ export default {
ptype: '',
pstatus: 0,
// 只在前端显示原因,
tempYY: ''
fq_yy: null,
fq_bz: null,
fq_dd: null,
fq_mcode: null,
fq_dbxi: null
},
historForm: {},
rule: {
......@@ -161,6 +206,30 @@ export default {
}
},
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) {
const item = this.pgxList.find(item => item.dictLabel === fqYy)
......@@ -191,27 +260,42 @@ export default {
this.form.phd = res.data.phd
this.form.psm = res.data.psm
this.form.exitPsm = true
this.form.tempYY = res.data.fq_yy
this.form.fq_yy = res.data.fq_yy
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() {
this.form = {
exitPsm: false,
pn: '',
lot: '',
plocation: '工序网板库',
phd: '',
psm: '',
pzl: '',
prank: '',
flag: 1,
ptype: '',
pstatus: 0,
tempYY: ''
}
sessionStorage.setItem('recycleform', JSON.stringify(this.form))
this.$confirm('是否确认重置?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(res => {
this.type = '2'
this.form = {
exitPsm: false,
pn: '',
lot: '',
plocation: '工序网板库',
phd: '',
psm: '',
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) {
......@@ -237,8 +321,14 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(res => {
this.type = '1'
this.$refs.form.validate((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 => {
if (res.code === 200) {
......@@ -266,7 +356,11 @@ export default {
flag: 1,
ptype: '',
pstatus: 0,
tempYY: ''
fq_yy: null,
fq_bz: null,
fq_dd: null,
fq_mcode: null,
fq_dbxi: null
}
// 重置表单校验
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