diff --git a/src/views/business/comps/template/comps/dl/DL010.vue b/src/views/business/comps/template/comps/dl/DL010.vue index 7946e31..f4e43ab 100644 --- a/src/views/business/comps/template/comps/dl/DL010.vue +++ b/src/views/business/comps/template/comps/dl/DL010.vue @@ -376,7 +376,13 @@ export default { prop: 'sjgs', bodyType: 'checkbox', checkboxLabel: '', - bodyFillType: 'actFill' + bodyFillType: 'actFill', + headerColumns: [ + { type: 'span', label: '收集' }, + { type: 'inputNumber', fillType: 'actFill', key: 'gs' }, + { type: 'span', label: '骨髓' } + ], + span: 3 }, { label: 'template.dl.dl010.lx', diff --git a/src/views/business/comps/template/comps/dl/DL012.vue b/src/views/business/comps/template/comps/dl/DL012.vue index 8b1bc00..fc2e82b 100644 --- a/src/views/business/comps/template/comps/dl/DL012.vue +++ b/src/views/business/comps/template/comps/dl/DL012.vue @@ -78,6 +78,7 @@ label="" :ref="refConf.pyxx" :formConfig="pyxxConfig" + @clickButton="handleClickButton" :formData="formData" /> @@ -188,12 +189,12 @@ export default { type: 'cellItem', label: 'template.dl.dl012.czsj', config: { - kssj: { + startDate: { label: 'template.dl.dl012.kssj', type: 'input', disabled: true }, - jssj: { + endDate: { label: 'template.dl.dl012.jssj', type: 'input', disabled: true @@ -303,35 +304,48 @@ export default { }, // 细胞信息配置 xbxxConfig() { + const config = { + xbmc: { + label: 'template.dl.dl012.xbmc', + type: 'select', + options: this.getDictOptions('business_dl_xbmc'), + fillType: 'preFill', + otherCode: 'xbmcOther' + }, + xbzbqbh: { + label: 'template.dl.dl012.xbzbqbh', + type: 'xb', + fillType: 'actFill' + }, + zbxbs: { + label: 'template.dl.dl012.zbxbs', + type: 'inputNumber', + fillType: 'preFill' + } + } + for (let index = 1; index <= this.zbxbs; index++) { + config['zbhxbbh_' + index] = { + label: 'template.dl.dl012.zbhxbbh', + type: 'input', + subType: 'span', + maxlength: 20, + subKey: 'zbhxbbhCodeSn_' + index, + fillType: 'preFill' + } + } return [ { type: 'step', config: { - xbmc: { - label: 'template.dl.dl012.xbmc', - type: 'select', - options: [], - fillType: 'preFill', - otherCode: 'xbmcOther' - }, - xbzbqbh: { - label: 'template.dl.dl012.xbzbqbh', - type: 'xb', - fillType: 'actFill' - }, - zbxbs: { - label: 'template.dl.dl012.zbxbs', - type: 'inputNumber', - fillType: 'preFill' - }, - zbhxbbh: { - label: 'template.dl.dl012.zbhxbbh', - type: 'input', - subType: 'span', - maxlength: 20, - subKey: 'zbhxbbhCodeSn', - fillType: 'preFill' - }, + ...config, + // zbhxbbh: { + // label: 'template.dl.dl012.zbhxbbh', + // type: 'input', + // subType: 'span', + // maxlength: 20, + // subKey: 'zbhxbbhCodeSn', + // fillType: 'preFill' + // }, zbhxbyjtj: { label: 'template.dl.dl012.zbhxbyjtj', type: 'inputNumber', @@ -365,14 +379,46 @@ export default { { isUpdateRecord: false, signData: null } ) }) + const data = this.getFilledFormDataByRefs([refConf.xbxx, refConf.base]) + console.log(data) + const { zbxbs, zbhxbbh_1, startDate } = data || {} + if (!zbxbs) return + try { + this.zbxbs = Number(zbxbs) + } catch (error) { + this.zbxbs = 1 + } + this.$nextTick(() => { + const updateData = {} + // Convert startDate from "2026-03-07 14:02:15" to "260307" (YYMMDD) + const formattedDate = startDate ? moment(startDate).format('YYMMDD') : '' + for (let index = 1; index <= this.zbxbs; index++) { + updateData['zbhxbbh_' + index] = zbhxbbh_1 + updateData['zbhxbbhCodeSn_' + index] = + formattedDate + '-' + `${index}`.padStart(2, '0') + } + this.$refs[refConf.xbxx].batchUpdateFormData(updateData) + }) }, data() { return { formData: {}, - refConf + refConf, + zbxbs: 1 } }, methods: { + handleClickButton(e,signData) { + console.log(e) + const { subKey } = e || {} + if (subKey === 'pykssjButton') { + this.$refs[refConf.pyxx].updateFormData( + 'pykssj', + moment().format('YYYY/MM/DD HH:mm'), + { isUpdateRecord: true, signData } + ) + } + }, // 删除表格行 deleteTableRow(rowIndex, refName) { this.$refs[refName].deleteRow(rowIndex) diff --git a/src/views/business/comps/template/comps/dl/DL013.vue b/src/views/business/comps/template/comps/dl/DL013.vue index 3069a7d..df575dc 100644 --- a/src/views/business/comps/template/comps/dl/DL013.vue +++ b/src/views/business/comps/template/comps/dl/DL013.vue @@ -36,11 +36,57 @@ - + +
+ +
- + +
+ +
+ 新增 +
+
+ +
+
+ 第{{ index + 1 }}次 + 删除 +
+ +
diff --git a/src/views/business/comps/template/mixins/templateMixin.js b/src/views/business/comps/template/mixins/templateMixin.js index 44c873a..9514b34 100644 --- a/src/views/business/comps/template/mixins/templateMixin.js +++ b/src/views/business/comps/template/mixins/templateMixin.js @@ -42,6 +42,7 @@ export default { 'business_dl_amescltj', // 毒理-Ames处理条件 'business_dl_amesbjjt', // 毒理-Ames背景菌苔 'business_dl_amescdqk', // 毒理-Ames沉淀情况 + 'business_dl_xbmc', // 毒理-Ames细胞名称 'business_rylx', // 溶液类型 'business_xbzb', // 细胞组别 'business_xblx', // 细胞类型