diff --git a/src/components/Template/HandleFormItem.vue b/src/components/Template/HandleFormItem.vue index 03b3a59..4e4a368 100644 --- a/src/components/Template/HandleFormItem.vue +++ b/src/components/Template/HandleFormItem.vue @@ -591,8 +591,8 @@ export default { this.inputValue = data.selectedId; const { filledCodes = [] } = this.item; console.log(filledCodes, "filledCodes") - const { selectInfo, row } = data; - if (filledCodes.length > 0) { + const { selectInfo, row,checkType } = data; + if (filledCodes.length > 0 && checkType !=="checkbox") { this.inputValue = row[filledCodes[0]] + "(" + row[filledCodes[1]] + ")"; } this.selectRegentInfo = data; @@ -631,9 +631,11 @@ export default { }; if (type === "mix") { params.mixType = true; - } else if (item.qxbdType) { + } + if (item.qxbdType) { params.qxbdType = item.qxbdType; - } else if (item.checkType) { + } + if (item.checkType) { params.checkType = item.checkType; } } diff --git a/src/components/Template/mixins/formPackageMixins.js b/src/components/Template/mixins/formPackageMixins.js index 77f44da..1abcb5f 100644 --- a/src/components/Template/mixins/formPackageMixins.js +++ b/src/components/Template/mixins/formPackageMixins.js @@ -67,6 +67,7 @@ export default { }, getRegentItem(item, fieldCode = "type") { const type = item[fieldCode]; + console.log(item, "type") return { label: "", type, diff --git a/src/views/business/comps/template/comps/dl/DL016.vue b/src/views/business/comps/template/comps/dl/DL016.vue index 8953cae..06abc10 100644 --- a/src/views/business/comps/template/comps/dl/DL016.vue +++ b/src/views/business/comps/template/comps/dl/DL016.vue @@ -12,14 +12,14 @@ diff --git a/src/views/business/comps/template/comps/pcr/PCR008.vue b/src/views/business/comps/template/comps/pcr/PCR008.vue index 495ca17..e017cc0 100644 --- a/src/views/business/comps/template/comps/pcr/PCR008.vue +++ b/src/views/business/comps/template/comps/pcr/PCR008.vue @@ -15,7 +15,7 @@
+ :formConfig="stepFormConfig" @blur="onHandleBlur" :formData="formData" @onRegentSubmit="onRegentSubmit" />
{{ $t('form.delete') }} @@ -177,7 +177,7 @@ export default { type: 'qxbd', fillType: 'preFill', qxbdType: 'PCR007', - checkType: 'checkBox', + checkType: 'checkbox', filledCodes: ['bdmc', 'bdbh'], }, yjry: { @@ -230,6 +230,9 @@ export default { this.onHandleTableBlur() }, methods: { + onRegentSubmit(data){ + console.log(data,"回调") + }, onClickDelete() { this.$modal.confirm(this.$t('form.confirmDelete')).then(() => { diff --git a/src/views/business/comps/template/dialog/SelectMixReagentDialog.vue b/src/views/business/comps/template/dialog/SelectMixReagentDialog.vue index 0e075c4..12aebcd 100644 --- a/src/views/business/comps/template/dialog/SelectMixReagentDialog.vue +++ b/src/views/business/comps/template/dialog/SelectMixReagentDialog.vue @@ -188,16 +188,29 @@ export default { ndz: (row.nd||"")+(row.nddw||""), type: Number(this.selectType), } - if(this.qxbdType && row.templateSn !== this.qxbdType){ - this.$message.error(`请选择正确前序表单`); - return + const {qxbdType,checkType} = this; + if(qxbdType){ + if(checkType === "radio"&& row.templateSn !== qxbdType){ + this.$message.error(`请选择正确前序表单`); + return + } + if(checkType === "checkbox" ){ + const isAllType = row.every((item)=>item.templateSn === qxbdType) + if(!isAllType){ + this.$message.error(`请选择正确前序表单`); + return + } + } + } this.$emit('submit', selectedValue, row); - let callbackData = { selectInfo, uuid: this.uuid, selectedId: selectedValue, row,selectType:this.selectType }; + let callbackData = { selectInfo, uuid: this.uuid, selectedId: selectedValue, row,selectType:this.selectType,checkType }; if(this.checkType === "checkbox"){ callbackData = { uuid: this.uuid, selectedRows: row, + selectedId:row.map((item)=>item.bdbh).join(","), + checkType } } // 触发eventBus事件