From 2b3f56bea5e9d7d1970795ffa511f0843544a92e Mon Sep 17 00:00:00 2001 From: luojie <125330818@qq.com> Date: Tue, 24 Feb 2026 21:51:36 +0800 Subject: [PATCH] =?UTF-8?q?feat:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86][upd?= =?UTF-8?q?ate]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Template/BaseInfoFormPackage.vue | 12 +++ src/components/Template/HandleFormItem.vue | 85 +++++++++++++++++++--- .../Template/mixins/formPackageMixins.js | 8 ++ .../comps/template/formConfig/sp/SP0019.js | 2 +- 4 files changed, 97 insertions(+), 10 deletions(-) diff --git a/src/components/Template/BaseInfoFormPackage.vue b/src/components/Template/BaseInfoFormPackage.vue index b9c1b81..c2a4a12 100644 --- a/src/components/Template/BaseInfoFormPackage.vue +++ b/src/components/Template/BaseInfoFormPackage.vue @@ -103,6 +103,12 @@ @resetRecord="resetRecord(key)" :item="sItem" :value="formFields[key]" /> +
+ +
+
+ +
{{ option.label }} +
+ +
@@ -168,7 +174,7 @@ export default { }, // v-model 值 value: { - type: [String, Number, Array, Boolean], + type: [String, Number, Array, Boolean, Object], default: '' }, // 错误状态 @@ -200,9 +206,21 @@ export default { }, }, data() { + let initialValue = this.value; + let initialOtherValues = {}; + + // 如果是checkboxList类型且value是对象格式 + if (this.type === 'checkboxList' && this.value && typeof this.value === 'object') { + initialValue = this.value.checkboxValues || []; + initialOtherValues = this.value.otherValues || {}; + } else if (this.type === 'checkboxList' && !Array.isArray(this.value)) { + initialValue = []; + } return { - inputValue: this.type === 'checkboxList' && !Array.isArray(this.value) ? [] : this.value, - oldValue: this.type === 'checkboxList' && !Array.isArray(this.value) ? [] : this.value, // 记录上一次的值 + inputValue: initialValue, + oldValue: initialValue, // 记录上一次的值 + otherValues: initialOtherValues, // 存储checkboxList中otherCode对应的输入值 + oldOtherValues: {...initialOtherValues}, // 记录上一次的otherValues showModal: false, // 控制模态框显示 modificationRecords: [], // 存储修改记录 modalTimer: null, // 用于延迟隐藏模态框 @@ -226,7 +244,12 @@ export default { }, watch: { value(newVal) { - this.inputValue = this.type === 'checkboxList' && !Array.isArray(newVal) ? [] : newVal; + if (this.type === 'checkboxList' && newVal && typeof newVal === 'object') { + this.inputValue = newVal.checkboxValues || []; + this.otherValues = newVal.otherValues || {}; + } else { + this.inputValue = this.type === 'checkboxList' && !Array.isArray(newVal) ? [] : newVal; + } } }, filters: { @@ -270,7 +293,6 @@ export default { onInstrumentSubmit(data) { if (data.uuid !== this.uuid) return; this.selectRegentInfo = data; - console.log(data, "yq") }, // 文件状态改变时的钩子，添加文件、上传成功、上传失败时都会被调用 @@ -500,7 +522,6 @@ export default { }, onDateChange(val, format) { this.inputValue = moment(val).format(format); - console.log(this.inputValue, "inputValue") this.onCommonHandleSaveRecord(this.inputValue); }, getUserName(record) { @@ -690,10 +711,35 @@ export default { }, // 统一处理输入变化 onInputChange(val) { - const value = val !== undefined ? val : this.inputValue; + let value = val !== undefined ? val : this.inputValue; + // 如果是checkboxList类型，需要同时发送checkboxValues和otherValues + if (this.type === 'checkboxList') { + // 检查是否有被取消选中的checkbox + if (this.oldValue && Array.isArray(this.oldValue)) { + const uncheckedValues = this.oldValue.filter(oldVal => !this.inputValue.includes(oldVal)); + + // 清除被取消选中的checkbox对应的otherValues + if (uncheckedValues.length > 0) { + this.item.options.forEach(option => { + if (uncheckedValues.includes(option.value) && option.otherCode) { + this.$delete(this.otherValues, option.otherCode); + } + }); + } + } + + value = { + checkboxValues: this.inputValue, + otherValues: this.otherValues + }; + this.onCommonHandleSaveRecord(); + } + this.$emit('input', value); this.$emit('change', value); + + // 根据输入值判断是否显示错误状态 const isEmpty = this.isValueEmpty(value); if (this.error && !isEmpty) { @@ -702,6 +748,11 @@ export default { this.$emit('update:error', true); } }, + // 处理checkboxList中otherCode对应的输入框变化 + onOtherInputChange(code, value) { + this.otherValues[code] = value; + this.onInputChange(); + }, // 统一处理失去焦点事件 onBlur(e) { this.onCommonHandleSaveRecord(e.target.value); @@ -735,7 +786,6 @@ export default { } }, async onCommonHandleSaveRecord(val) { - const isEmpty = this.isValueEmpty(this.inputValue); if (this.error && !isEmpty) { this.$emit('update:error', false); @@ -780,7 +830,12 @@ export default { } // 值发生了变化，需要弹出密码输入框 const isSame = this.isEqual(this.oldValue, this.inputValue); - if (isSame) { + let isOtherValuesSame = true; + // 如果是checkboxList类型，需要同时比较otherValues + if (this.type === 'checkboxList' && this.otherValues) { + isOtherValuesSame = this.isEqual(this.oldOtherValues, this.otherValues); + } + if (isSame && isOtherValuesSame) { return; } if (!this.isValueEmpty(this.oldValue) && !isSame && this.templateFillType === "actFill") { @@ -825,6 +880,11 @@ export default { } //用户输入密码并点击确定，保存修改 this.oldValue = this.inputValue; // 更新旧值 + // 更新oldValue和oldOtherValues + if (this.type === 'checkboxList') { + this.oldValue = [...this.inputValue]; + this.oldOtherValues = { ...this.otherValues }; + } this.$emit("blur", this.inputValue); this.$emit('input', this.inputValue); this.$emit("change", this.inputValue, data ? "save" : ""); @@ -1391,10 +1451,17 @@ export default { .checkbox-item { margin-right: 16px; + display: flex; + align-items: center; &:not(:last-child) { margin-bottom: 10px; } // display: inline-block; + + .el-input { + width: 200px; + margin-left: 10px; + } } .el-checkbox { diff --git a/src/components/Template/mixins/formPackageMixins.js b/src/components/Template/mixins/formPackageMixins.js index 5a6b644..4b90ecc 100644 --- a/src/components/Template/mixins/formPackageMixins.js +++ b/src/components/Template/mixins/formPackageMixins.js @@ -409,6 +409,14 @@ export default { if (this.errors[key]) { this.$set(this.errors, key, false); } + + // 如果是checkboxList类型，需要处理otherValues + if (val && typeof val === 'object' && val.otherValues) { + // 将otherValues中的每个值也保存到formFields中 + Object.keys(val.otherValues).forEach(otherCode => { + this.formFields[otherCode] = val.otherValues[otherCode]; + }); + } }, //复制 onCopy(config, key) { diff --git a/src/views/business/comps/template/formConfig/sp/SP0019.js b/src/views/business/comps/template/formConfig/sp/SP0019.js index 0a85f85..682e14a 100644 --- a/src/views/business/comps/template/formConfig/sp/SP0019.js +++ b/src/views/business/comps/template/formConfig/sp/SP0019.js @@ -139,7 +139,7 @@ export const getYqphFormConfig = () => { options: [ { label: '流动相平衡', value: 1 }, { label: '样品平衡', value: 2 }, - { label: '样品', value: 3 }, + { label: '样品', value: 3 ,otherCode:'ypOther'}, { label: '未平衡', value: 4 } ] },