Skip to content

T
template_vue
Commit 0462a7c3 authored by shifangwuji's avatar shifangwuji
Browse files
Options

9/22(first)

parent afd7a32d
Show whitespace changes
Inline Side-by-side
Showing with 112 additions and 46 deletions
src/views/production/gfual/index.vue
View file @ 0462a7c3
......@@ -85,38 +85,38 @@
<hr style="margin: 0 0 20px 0; width: 81%" />
<!-- jbcode 输入框 -->
<!-- jbcod 输入框 -->
<el-row :gutter="40">
<el-col :span="12">
<el-form-item
label="jbcode："
style="flex-basis: 50%"
prop="jbcode"
prop="jbcod"
>
<el-input
ref="input5"
v-model="form.jbcode"
v-model="form.jbcod"
placeholder="请输入jbcode"
:minlength="3"
style="width: 868px"
:maxlength="100"
:disabled="!jbcodeEnabled"
:disabled="!jbcodEnabled"
@keyup.enter.native="handleTab(4, $event)"
/>
</el-form-item>
</el-col>
</el-row>
<!-- 提取 ptype、jbrank 和 jbLot -->
<!-- 提取 jbcode、jbrank 和 jbLot -->
<el-row :gutter="0" style="display: flex; width: 81%">
<el-col :span="8">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="jbtype：" prop="ptype">
<template v-if="form.ptype && form.ptype.length > 21">
<el-tooltip :content="form.ptype" effect="dark">
<el-form-item label="jbtype：" prop="jbcode">
<template v-if="form.jbcode && form.jbcode.length > 21">
<el-tooltip :content="form.jbcode" effect="dark">
<el-input
v-model="form.ptype"
placeholder="ptype"
v-model="form.jbcode"
placeholder="jbcode"
:disabled="true"
style="width: 100%"
/>
......@@ -124,7 +124,7 @@
</template>
<template v-else>
<el-input
v-model="form.ptype"
v-model="form.jbcode"
placeholder="jbtype"
:disabled="true"
style="width: 100%"
......@@ -387,7 +387,7 @@ export default {
name: 'Role',
data() {
return {
jbcodeEnabled: false,
jbcodEnabled: false,
wbcodeEnabled: false,
wblotEnabled: false,
jlcodEnabled: false,
......@@ -406,8 +406,8 @@ export default {
lot: '',
gx: '',
machine: '',
jbcod: '',
jbcode: '',
ptype: '',
jbrank: '',
jblot: '',
jlcod: '',
......@@ -421,13 +421,13 @@ export default {
lot: [{ required: true, message: '请输入lot', trigger: 'blur' }],
gx: [{ required: true, message: '请选择gx', trigger: 'blur' }],
machine: [{ required: true, message: '请输入machine', trigger: 'blur' }],
jbcode: [
jbcod: [
{
validator: (rule, value, callback) => {
this.validateField(value, callback, 'jbcode')
this.validateJbcod(value, callback);
},
trigger: 'blur',
},
trigger: 'blur'
}
],
wbcode: [
{
......@@ -448,11 +448,11 @@ export default {
jlcod: [
{
validator: (rule, value, callback) => {
this.validateField(value, callback, 'jlcod')
this.validateJlcod(value, callback);
},
trigger: 'blur'
}
]
trigger: 'blur',
},
],
},
pissbList: [],
......@@ -469,17 +469,17 @@ export default {
}
},
watch: {
'form.jbcode': {
handler(newJbcode) {
if (newJbcode) {
'form.jbcod': {
handler(newJbcod) {
if (newJbcod) {
// 检查是否为空或未定义
const parts = newJbcode.split(',')
this.form.ptype = parts[0] || ''
const parts = newJbcod.split(',')
this.form.jbcode = parts[0] || ''
this.form.jbrank = parts[1] || ''
this.form.jblot = parts[2] || ''
} else {
// 如果 newJbcode 为空，可以选择在这里重置相关字段
this.form.ptype = ''
// 如果 newJbcod 为空，可以选择在这里重置相关字段
this.form.jbcode = ''
this.form.jbrank = ''
this.form.jblot = ''
}
......@@ -525,6 +525,39 @@ export default {
this.init()
},
methods: {
validateJbcod(value, callback) {
if (this.jbcodEnabled) {
// 检查是否开启验证
if (value) {
}else {
callback(new Error('jbcode不能为空'));
}
if (!jbcod || !jbcode || !jbrank || !jblot) {
callback(new Error('jbtype、jbrank、jblot不能为空'));
} else {
callback();
}
} else {
callback(); // 如果验证未开启，直接通过
}
},
validateJlcod(value, callback) {
if (this.jlcodEnabled) {
// 检查是否开启验证
if (value) {
} else {
callback(new Error('jlcod不能为空'));
}
if (!jlcod || !jlname || !jllot || !jlvalidDate) {
callback(new Error('jltype、jllot、jlbzq不能为空'));
} else {
callback();
}
} else {
callback(); // 如果验证未开启，直接通过
}
},
validateField(value, callback, fieldName) {
if (this[fieldName + 'Enabled']) {
// 检查是否开启验证
......@@ -566,14 +599,21 @@ export default {
this.queryInputsEnabled = true
console.log('data', response.data)
if (response.data.jbcode !== '') {
this.jbcodeEnabled = true
this.jbcodEnabled = true
}else{
this.jbcodEnabled = false
}
if (response.data.wb !== '') {
this.wbcodeEnabled = true
this.wblotEnabled = true
}else{
this.wbcodeEnabled = false
this.wblotEnabled = false
}
if (response.data.jl !== '') {
this.jlcodEnabled = true
}else{
this.jlcodEnabled = false
}
if (
response.data.jbcode === '' &&
......@@ -581,14 +621,14 @@ export default {
response.data.jl === ''
) {
// 所有输入框都锁定，报错
this.jbcodeEnabled = false
this.jbcodEnabled = false
this.wbcodeEnabled = false
this.wblotEnabled = false
this.jlcodEnabled = false
this.queryInputsEnabled = true
this.lockUserEnabled = true
this.unlockButtonVisible = true
this.form.jbcode = ''
this.form.jbcod = ''
this.form.wbcode = ''
this.form.wblot = ''
this.form.jlcod = ''
......@@ -607,7 +647,7 @@ export default {
.catch(() => {
console.log('Setting lockUserEnabled to true')
// 查询失败时，将所有输入框锁定并显示错误提示
this.jbcodeEnabled = false
this.jbcodEnabled = false
this.wbcodeEnabled = false
this.wblotEnabled = false
this.jlcodEnabled = false
......@@ -627,13 +667,25 @@ export default {
// 先触发表单验证
this.$refs.form.validate(valid => {
if (valid) {
// 向后端发送解锁请求，并将 lockUser 的值传递过去
// 向后端发送解锁请求，并将值传递过去
unlockUser({
unlockUsername: this.form.unlockUsername
unlockUsername: this.form.unlockUsername,
pn: this.form.pn,
lot: this.form.lot,
gx: this.form.gx,
machine: this.form.machine,
jbcod: this.form.jbcod,
jbcode: this.form.jbcode,
jbrank: this.form.jbrank,
jblot: this.form.jblot,
jlcod: this.form.jlcod,
jlname: this.form.jlname,
jllot: this.form.jllot,
jlvalidDate: this.form.jlvalidDate
}).then(response => {
if (response.code === 200) {
// 解锁成功，恢复页面状态
this.jbcodeEnabled = false
this.jbcodEnabled = false
this.wbcodeEnabled = false
this.wblotEnabled = false
this.jlcodEnabled = false
......@@ -677,8 +729,8 @@ export default {
lot: '',
gx: '',
machine: '',
jbcod: '',
jbcode: '',
ptype: '',
jbrank: '',
jblot: '',
jlcod: '',
......@@ -688,7 +740,7 @@ export default {
unlockUsername: ''
}
this.queryInputsEnabled = false
this.jbcodeEnabled = false
this.jbcodEnabled = false
this.wbcodeEnabled = false
this.wblotEnabled = false
this.jlcodEnabled = false
......@@ -746,7 +798,7 @@ export default {
if (res.code === 200) {
if (res.data !== null) {
// 保存成功，重置表单和字段状态
this.jbcodeEnabled = false
this.jbcodEnabled = false
this.wbcodeEnabled = false
this.wblotEnabled = false
this.jlcodEnabled = false
......@@ -754,7 +806,7 @@ export default {
this.queryInputsEnabled = false
this.unlockButtonVisible = false
this.queryButtonVisible = true
this.form.jbcode = ''
this.form.jbcod = ''
this.form.wbcode = ''
this.form.wblot = ''
this.form.jlcod = ''
......@@ -776,7 +828,7 @@ export default {
.catch(() => {
// 请求失败，设置字段状态
this.setFieldEnabledStatus(false)
this.jbcodeEnabled = false
this.jbcodEnabled = false
this.wbcodeEnabled = false
this.wblotEnabled = false
this.jlcodEnabled = false
......@@ -784,11 +836,7 @@ export default {
this.lockUserEnabled = true
this.unlockButtonVisible = true
this.queryButtonVisible = false
this.form.jbcode = ''
this.form.wbcode = ''
this.form.wblot = ''
this.form.jlcod = ''
this.form.lockUser = ''
this.form.unlockUsername = ''
})
} else {
// jlvalidDate 不符合格式，显示错误消息
......@@ -801,7 +849,7 @@ export default {
},
// 设置字段状态
setFieldEnabledStatus(enabled) {
this.jbcodeEnabled = enabled
this.jbcodEnabled = enabled
this.wbcodeEnabled = enabled
this.wblotEnabled = enabled
this.jlcodEnabled = enabled
......
src/views/production/gxlog/index.vue
View file @ 0462a7c3
......@@ -140,6 +140,15 @@
{{ scope.row.jblot || '-' }}
</template>
</el-table-column>
<el-table-column
label="解锁人"
prop="unlockUsername"
:show-overflow-tooltip="true"
>
<template slot-scope="scope">
{{ scope.row.unlockUsername || '-' }}
</template>
</el-table-column>
<el-table-column
label="操作人"
prop="createName"
......@@ -299,6 +308,14 @@
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="解锁人：" prop="unlockUsername">
<el-input
v-model.trim="singleDetails.unlockUsername"
:readonly="true"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="操作人：" prop="createName">
<el-input
......@@ -370,6 +387,7 @@ export default {
pissb: '',
pstatus: '',
pnumber: '',
unlockUsername : '',
createName: '',
createTime: ''
},
......
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