diff --git a/src/components/Template/BaseInfoFormPackage.vue b/src/components/Template/BaseInfoFormPackage.vue index 96487f6..78551ba 100644 --- a/src/components/Template/BaseInfoFormPackage.vue +++ b/src/components/Template/BaseInfoFormPackage.vue @@ -167,9 +167,9 @@ :error="errors[key]" @update:error="errors[key] = false" :orange-bg="orangeBgFields[key]" /> -
+
diff --git a/src/views/business/comps/template/comps/dl/DL023.vue b/src/views/business/comps/template/comps/dl/DL023.vue index 18e50ff..7d100ec 100644 --- a/src/views/business/comps/template/comps/dl/DL023.vue +++ b/src/views/business/comps/template/comps/dl/DL023.vue @@ -8,27 +8,21 @@
- - - - - + + + + + - - - + + +
@@ -52,10 +46,10 @@ import TableOpertaionDelete from "@/components/Template/operation/TableOpertaion export default { name: "dl023", - dicts: [ - 'business_dl_xbmc' - ], - components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable,TableOpertaionDelete }, + dicts: [ + 'business_dl_xbmc' + ], + components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable, TableOpertaionDelete }, mixins: [templateMixin], props: { fillType: { @@ -103,67 +97,70 @@ export default { } ] }, - //yqsyxxColumns仪器使用信息 - yqsyxxColumns() { + //yqsyxxColumns仪器使用信息 + yqsyxxColumns() { return [{ label: 'template.dl.dl023.yqbh', prop: 'yqbh', bodyType: 'input', bodyFillType: 'actFill', bodyDisabled: true, - disabled: true - },{ + disabled: true + }, { label: 'template.dl.dl023.yqmc', prop: 'yqmc', bodyType: 'input', bodyFillType: 'actFill', bodyDisabled: true, - disabled: true - },{ + disabled: true + }, { label: 'template.dl.dl023.yqxh', prop: 'yqxh', bodyType: 'input', bodyFillType: 'actFill', bodyDisabled: true, - disabled: true - },{ + disabled: true + }, { label: 'template.dl.dl023.xcrq', prop: 'xcrq', bodyType: 'input', bodyFillType: 'actFill', bodyDisabled: true, - disabled: true + disabled: true }] }, - // 操作记录 + // 操作记录 stepFormConfig() { return [ { - type: "cellItem", + type: "step", config: { - dwzshxbx: { + dwzshxbx: { // span:1, label: 'template.dl.dl023.dwzshxbx', - type: 'qxbd', + type: 'radio', fillType: 'actFill', - filledCodes:['bdmc','bdbh'], + options:[ + {label:"动物种属",value:"动物种属"}, + {label:"细胞系",value:"细胞系"} + ] }, - sydd: { + sydd: { label: 'template.dl.dl023.sydd', type: 'select', fillType: 'actFill', options: this.getDictOptions('business_dl_sydd'), otherCode: 'syddOther', - showOtherLabel:false + showOtherLabel: false + }, + zwbh: { + label: 'template.dl.dl023.zwbh', + type: 'input', + fillType: 'actFill', + bodyMaxlength: 50, }, - zwbh:{ - label: 'template.dl.dl023.zwbh', - type: 'input', - fillType: 'actFill', - bodyMaxlength: 50, - }, - uvazsjl: { + uvazsjl: { label: "template.dl.dl023.uvazsjl", type: "input", fillType: "actFill", @@ -172,32 +169,32 @@ export default { subFillType: "actFill", maxlength: 20, }, - zszsj:{ - span:1, - label: 'template.dl.dl023.zszsj', - type: 'input', - with:100, - fillType: 'actFill', - bodyMaxlength: 50, - }, - zskssj: { - label: 'template.dl.dl023.zskssj', - type: 'input', - fillType: 'actFill', - maxlength: 200, - subType: 'button', - subKey: 'zskssj', - buttonName: 'template.dl.dl023.ksButton', - }, - zsjssj: { - label: 'template.dl.dl023.zsjssj', - type: 'input', - fillType: 'actFill', - maxlength: 200, - subType: 'button', - subKey: 'zsjssj', - buttonName: 'template.dl.dl023.jsButton', - }, + zszsj: { + span: 1, + label: 'template.dl.dl023.zszsj', + type: 'input', + with: 100, + fillType: 'actFill', + bodyMaxlength: 50, + }, + zskssj: { + label: 'template.dl.dl023.zskssj', + type: 'input', + fillType: 'actFill', + maxlength: 200, + subType: 'button', + subKey: 'zskssj', + buttonName: 'template.dl.dl023.ksButton', + }, + zsjssj: { + label: 'template.dl.dl023.zsjssj', + type: 'input', + fillType: 'actFill', + maxlength: 200, + subType: 'button', + subKey: 'zsjssj', + buttonName: 'template.dl.dl023.jsButton', + }, } } ] @@ -211,46 +208,46 @@ export default { mounted() { }, methods: { - // 选择仪器编号预留 - onRegentSubmit(e) { - const { selectInfo, key, rowIndex } = e - const { row } = selectInfo - console.log('选择仪器编号预留===',row) - // if (key === 'yqbh' && this.$refs.yqsyTableRef) { - // const params = { - // yqmc: row.mc, - // yqxh: row.xh, - // xccsjzjdrq: row.jzrq - // } - // this.$refs.yqsyTableRef.updateDataSourceByRowIndex(rowIndex, params) - // } - }, - onFormSelect(fields){ + // 选择仪器编号预留 + onRegentSubmit(e) { + const { selectInfo, key, rowIndex } = e + const { row } = selectInfo + console.log('选择仪器编号预留===', row) + // if (key === 'yqbh' && this.$refs.yqsyTableRef) { + // const params = { + // yqmc: row.mc, + // yqxh: row.xh, + // xccsjzjdrq: row.jzrq + // } + // this.$refs.yqsyTableRef.updateDataSourceByRowIndex(rowIndex, params) + // } + }, + onFormSelect(fields) { this.onHandleBlur(fields) }, - //选择table header下拉框也要更新体积 - onHeaderSelectChange(data){ - const {key, headerSelectFields,dataSource=[]} = data; + //选择table header下拉框也要更新体积 + onHeaderSelectChange(data) { + const { key, headerSelectFields, dataSource = [] } = data; const keys = [ 'targetStartSolutionVolumeUnit', 'targetDiluentVolumeUnit', 'targetSolutionConcentrationUnit', 'targetSolutionVolumeUnit', ] - if(keys.includes(key)){ - const {targetStartSolution,subTargetStartSolution} = this.$refs.swypyjInfoRef?.getFilledFormData(); + if (keys.includes(key)) { + const { targetStartSolution, subTargetStartSolution } = this.$refs.swypyjInfoRef?.getFilledFormData(); const params = { subTargetStartSolution, headerSelectFields } - this.batchUpdateTargetStartSolutionVolume(dataSource,targetStartSolution,params) + this.batchUpdateTargetStartSolutionVolume(dataSource, targetStartSolution, params) } }, - beforeSaveRecord(data){ + beforeSaveRecord(data) { const formFields = this.$refs.swypyjInfoRef?.getFilledFormData(); - this.onCommonVerifyNdException(formFields,data); + this.onCommonVerifyNdException(formFields, data); }, - configComplete(val) { + configComplete(val) { const { rowData, headerSelectFields } = val; //计算实际目标溶液体积(实际起始溶液体积+实际稀释液体积) const { total, unit } = addTj([rowData.actStartSolutionVolume, rowData.actDiluentVolume], [headerSelectFields.actStartSolutionVolumeUnit, headerSelectFields.actDiluentVolumeUnit]) @@ -260,14 +257,14 @@ export default { nd: rowData.actSolutionConcentration,//实际目标溶液浓度 nddw: headerSelectFields.actSolutionConcentrationUnit, studySubjectId: this.formData.studySubjectId, - studyFormId:this.formData.id, - studyId:this.formData.studyId, + studyFormId: this.formData.id, + studyId: this.formData.studyId, kc: total, kcdw: unit, } this.configCompleteRequest(postData); }, - //分装回调 + //分装回调 subPackageSubmit(data) { const { fzsj, rowData, headerSelectFields } = data; const { fzList = [], dw = "", mybh } = fzsj; @@ -286,7 +283,7 @@ export default { nd: rowData.actSolutionConcentration || 0, nddw: headerSelectFields.actSolutionConcentrationUnit, studySubjectId: this.formData.studySubjectId, - studyFormId:this.formData.id, + studyFormId: this.formData.id, list: list } this.subPackageRequest(postData); @@ -294,11 +291,11 @@ export default { }, //获取已填写的表单数据 getFilledFormData() { - return this.getFilledFormDataByRefs(["baseInfoRef", "swypyjInfoRef","remarkRef","tableRef"]) + return this.getFilledFormDataByRefs(["baseInfoRef", "swypyjInfoRef", "remarkRef", "tableRef"]) }, //获取填写完成的表单数据 async getFormData() { - let content = await this.validFormFields(["baseInfoRef", "swypyjInfoRef","remarkRef","tableRef"]); + let content = await this.validFormFields(["baseInfoRef", "swypyjInfoRef", "remarkRef", "tableRef"]); return content; }, getResource() { @@ -323,5 +320,4 @@ export default { } }; - +