Commit 9287735a authored by 高宇's avatar 高宇

工序印刷修改

parent 9784f2ce
......@@ -305,35 +305,35 @@ export default {
jbcode: [
{
validator: (rule, value, callback) => {
this.validateField(value, callback, 'jbcode');
this.validateField(value, callback, 'jbcode')
},
trigger: 'blur',
},
trigger: 'blur'
}
],
wbcode: [
{
validator: (rule, value, callback) => {
this.validateField(value, callback, 'wbcode');
this.validateField(value, callback, 'wbcode')
},
trigger: 'blur',
},
trigger: 'blur'
}
],
wblot: [
{
validator: (rule, value, callback) => {
this.validateField(value, callback, 'wblot');
this.validateField(value, callback, 'wblot')
},
trigger: 'blur',
},
trigger: 'blur'
}
],
jlcod: [
{
validator: (rule, value, callback) => {
this.validateField(value, callback, 'jlcod');
this.validateField(value, callback, 'jlcod')
},
trigger: 'blur',
},
],
trigger: 'blur'
}
]
},
pissbList: [],
......@@ -352,16 +352,17 @@ export default {
watch: {
'form.jbcode': {
handler(newJbcode) {
console.log('newJbcode', newJbcode)
if (newJbcode) { // 检查是否为空或未定义
const parts = newJbcode.split(',');
this.form.ptype = parts[0] || '';
this.form.jbrank = parts[1] || '';
this.form.jblot = parts[2] || '';
const parts = newJbcode.split(',')
this.form.ptype = parts[0] || ''
this.form.jbrank = parts[1] || ''
this.form.jblot = parts[2] || ''
} else {
// 如果 newJbcode 为空,可以选择在这里重置相关字段
this.form.ptype = '';
this.form.jbrank = '';
this.form.jblot = '';
this.form.ptype = ''
this.form.jbrank = ''
this.form.jblot = ''
}
},
immediate: true
......@@ -369,15 +370,15 @@ export default {
'form.jlcod': {
handler(newJlcod) {
if (newJlcod) { // 检查是否为空或未定义
const parts = newJlcod.split(',');
this.form.jlname = parts[0] || '';
this.form.jllot = parts[1] || '';
this.form.jlvalidDate = parts[2] || '';
const parts = newJlcod.split(',')
this.form.jlname = parts[0] || ''
this.form.jllot = parts[1] || ''
this.form.jlvalidDate = parts[2] || ''
} else {
// 如果 newJlcod 为空,可以选择在这里重置相关字段
this.form.jlname = '';
this.form.jllot = '';
this.form.jlvalidDate = '';
this.form.jlname = ''
this.form.jllot = ''
this.form.jlvalidDate = ''
}
},
immediate: true
......@@ -405,15 +406,15 @@ export default {
validateField(value, callback, fieldName) {
if (this[fieldName + 'Enabled']) { // 检查是否开启验证
if (value) { // 检查是否为空或未定义
value = value.trim(); // 去掉前导和尾随空格
value = value.trim() // 去掉前导和尾随空格
}
if (!value) {
callback(new Error(fieldName + '不能为空'));
callback(new Error(fieldName + '不能为空'))
} else {
callback();
callback()
}
} else {
callback(); // 如果验证未开启,直接通过
callback() // 如果验证未开启,直接通过
}
},
handlePgxChange() {
......@@ -438,17 +439,29 @@ export default {
.then(response => {
if (response.code === 200) {
// 如果后端返回成功信息,显示成功提示
this.queryInputsEnabled = true;
this.queryInputsEnabled = true
console.log('data', response.data)
if (response.data.jbcode !== '') {
this.jbcodeEnabled = true
this.form.jbcode = ''
this.form.wbcode = ''
this.form.wblot = ''
this.form.jlcod = ''
}
if (response.data.wb !== '') {
this.wbcodeEnabled = true
this.wblotEnabled = true
this.form.jbcode = ''
this.form.wbcode = ''
this.form.wblot = ''
this.form.jlcod = ''
}
if (response.data.jl !== '') {
this.jlcodEnabled = true
this.form.jbcode = ''
this.form.wbcode = ''
this.form.wblot = ''
this.form.jlcod = ''
}
if (response.data.jbcode === '' && response.data.wb === '' && response.data.jl === '') {
// 所有输入框都锁定,报错
......@@ -468,7 +481,7 @@ export default {
type: 'error'
})
}
this.queryButtonVisible = false;
this.queryButtonVisible = false
}
}).catch(() => {
console.log('Setting lockUserEnabled to true')
......@@ -479,7 +492,7 @@ export default {
this.jlcodEnabled = false
this.queryInputsEnabled = true
this.lockUserEnabled = true
this.unlockButtonVisible = true,
this.unlockButtonVisible = true
this.form.jbcode = ''
this.form.wbcode = ''
this.form.wblot = ''
......@@ -519,11 +532,11 @@ export default {
this.form.unlockUsername = ''
// 显示成功提示
this.$message({
showClose: true,
message: '解锁成功',
type: 'success',
duration: 5000,
});
showClose: true,
message: '解锁成功',
type: 'success',
duration: 5000
})
} else {
// 解锁失败,显示解锁失败的弹出框
MessageBox.alert(response.data.message, '解锁失败', {
......@@ -551,9 +564,18 @@ export default {
pn: '',
lot: '',
gx: '',
machine: ''
machine: '',
jbcode: '',
ptype: '',
jbrank: '',
jblot: '',
jlcod: '',
jlname: '',
jllot: '',
jlvalidDate: '',
unlockUsername: ''
}
this.queryInputsEnabled = false;
this.queryInputsEnabled = false
this.jbcodeEnabled = false
this.wbcodeEnabled = false
this.wblotEnabled = false
......@@ -561,10 +583,10 @@ export default {
this.lockUserEnabled = false
this.queryButtonVisible = true
// 手动重置错误信息
this.$refs.form.clearValidate(); // 清空表单验证信息
this.$refs.form.clearValidate() // 清空表单验证信息
this.$nextTick(() => {
this.$refs.form.resetFields(); // 重置表单字段
});
this.$refs.form.resetFields() // 重置表单字段
})
sessionStorage.setItem('applicationForm', JSON.stringify(this.form))
},
......@@ -594,22 +616,22 @@ export default {
this.getDict()
},
// 保存时要调的接口
// 提交表单
submitForm() {
this.$refs.form.validate((valid) => {
if (valid) {
// 验证通过,继续处理 jlvalidDate 字段
const jlcodParts = this.form.jlcod.split(',');
const jlvalidDatePart = jlcodParts[2] || '';
const jlcodParts = this.form.jlcod.split(',')
const jlvalidDatePart = jlcodParts[2] || ''
// 校验 jlvalidDate 字段格式
const jlvalidDateRegex = /^\d{4}\/\d{2}\/\d{2}$/; // yyyy/mm/dd 格式
const jlvalidDateRegex = /^\d{4}\/\d{2}\/\d{2}$/ // yyyy/mm/dd 格式
if (jlvalidDatePart.trim() === '' || jlvalidDateRegex.test(jlvalidDatePart)) {
// 如果 jlvalidDate 符合格式或为空,执行保存操作
addApplication(this.form)
.then((res) => {
console.log('res', res);
console.log('res', res)
if (res.code === 200) {
if (res.data !== null) {
// 保存成功,重置表单和字段状态
......@@ -629,19 +651,19 @@ export default {
showClose: true,
message: '保存成功',
type: 'success',
duration: 5000,
});
this.resetForm();
duration: 5000
})
this.resetForm()
}
} else {
// 保存失败,设置字段状态和显示错误消息
this.setFieldEnabledStatus(false);
this.showErrorMessage(res.message);
this.setFieldEnabledStatus(false)
this.showErrorMessage(res.message)
}
})
.catch(() => {
// 请求失败,设置字段状态
this.setFieldEnabledStatus(false);
this.setFieldEnabledStatus(false)
this.jbcodeEnabled = false
this.wbcodeEnabled = false
this.wblotEnabled = false
......@@ -654,23 +676,23 @@ export default {
this.form.wblot = ''
this.form.jlcod = ''
this.form.lockUser = ''
});
})
} else {
// jlvalidDate 不符合格式,显示错误消息
this.showErrorMessage('jlcod 中的 jlbzq 不符合规范,请输入有效的日期格式(yyyy/mm/dd)');
this.showErrorMessage('jlcod 中的 jlbzq 不符合规范,请输入有效的日期格式(yyyy/mm/dd)')
}
}
});
})
},
// 设置字段状态
setFieldEnabledStatus(enabled) {
this.jbcodeEnabled = enabled;
this.wbcodeEnabled = enabled;
this.wblotEnabled = enabled;
this.jlcodEnabled = enabled;
this.queryInputsEnabled = !enabled;
this.lockUserEnabled = enabled;
this.unlockButtonVisible = enabled;
this.jbcodeEnabled = enabled
this.wbcodeEnabled = enabled
this.wblotEnabled = enabled
this.jlcodEnabled = enabled
this.queryInputsEnabled = !enabled
this.lockUserEnabled = enabled
this.unlockButtonVisible = enabled
},
// 显示错误消息
showErrorMessage(message) {
......@@ -678,11 +700,10 @@ export default {
showClose: true,
message,
type: 'error',
duration: 5000,
});
duration: 5000
})
},
// 调数据字典查询
getDict() {
const obj = {
......
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