diff --git a/src/components/Template/Step.vue b/src/components/Template/Step.vue index c933ee5..32f2cff 100644 --- a/src/components/Template/Step.vue +++ b/src/components/Template/Step.vue @@ -10,7 +10,7 @@ - @@ -282,7 +282,7 @@ import dypyy from './StepComponents/xbjzpz/dypyy.vue';//细胞/菌株配制-倒 import xd from './StepComponents/xbjzpz/xd.vue';//细胞/菌株配制-洗涤 //细胞/菌株配制-消化：使用细胞/菌株配制-洗涤 //细胞/菌株配制-终止消化：使用细胞/菌株配制-洗涤 -import copy from './StepComponents/xbjzpz/copy.vue';//细胞/菌株配制-CO2培养 +import copy from './StepComponents/xbjzpz/copy.vue';//细胞/菌株配制-CO₂‌培养 import gc from './StepComponents/xbjzpz/gc.vue';//细胞/菌株配制-观察 import cdmd from './StepComponents/xbjzpz/cdmd.vue';//细胞/菌株配制-测定密度 //细胞/菌株配制-低渗：使用细胞/菌株配制-洗涤 @@ -1196,4 +1196,7 @@ export default { } } } +.w-0{ + width: 0; +} \ No newline at end of file diff --git a/src/components/Template/StepComponents/stepNameConfig.js b/src/components/Template/StepComponents/stepNameConfig.js index 7fd6e5c..68abe84 100644 --- a/src/components/Template/StepComponents/stepNameConfig.js +++ b/src/components/Template/StepComponents/stepNameConfig.js @@ -1,208 +1,214 @@ const result = { - czdd: "操作地点", - czhj: "操作环境", - xzrq: "选择容器", - jrry: "加入溶液", - tpjysd: "天平校验（双点）", - tpjydd: "天平校验（单点）", - zlfz: "质量分装", - qywz: "取用物质", - clcz: "称量（传值）", - clfcz: "称量（非传值）", - bdtj: "标定（体积）", - bdzl: "标定（质量）", - tjphcz: "调节PH（传值）", - tjphfcz: "调节PH（非传值）", - lx: "离心", - ym: "研磨", - ddhy: "颠倒混匀", - jrjb: "加热搅拌", - jb: "搅拌", - cs: "超声", - sy: "水浴", - zy: "正压", - dc: "氮吹", - glzd: "过滤（自动）", - glsd: "过滤（手动）", - jz: "静置", - jd: "解冻", - fy: "孵育", - qcyy: "取出原药", - frdrq: "复溶（多容器）", - fr: "复溶", - hb: "合并", - rs: "染色", - js: "计数", - mj: "灭菌", - fs: "复苏", - fb: "封板", - wxhy: "涡旋混匀", - zyhy: "振摇混匀", - hwhy: "恒温混匀", - kbyq: "空白（仪器）", - kbsjgsp: "空白（试剂/供试品）", - kb: "空白", - jr: "加热", - fz: "分装", - jrry_b: "加入溶液", - cl: "称量", - lx_b: "离心", - cs_b: "超声", - ddhy_b: "颠倒混匀", - wxhy_b: "涡旋混匀", - zyhy_b: "振摇混匀", - hwhy_b: "恒温混匀", - jb_b: "搅拌", - jrjb_b: "加热搅拌", - sy_b: "水浴", - zy_b: "正压", - dc_b: "氮吹", - glzd_b: "过滤（自动）", - glsd_b: "过滤（手动）", - jz_b: "静置", - jd_b: "解冻", - fy_b: "孵育", - fr_b: "复溶", - jd_swypfx: "解冻", - jryp: "加入样品", - ysfy: "衍生反应", - hhspe: "活化（SPE）", - phspe: "平衡（SPE）", - syspe: "上样（SPE）", - lxspe: "淋洗（SPE）", - xtspe: "洗脱（SPE）", - zyfc: "转移（分层）", - jszz: "剪碎组织", - cqzz: "称取组织", - jryjry: "加入匀浆溶液", - ymyj: "研磨匀浆", - yjyfz2: "匀浆液分装2", - yjyfz3: "匀浆液分装3", - yjbc: "匀浆保存", - yjyhh: "匀浆液混合", - fy_spyjzzb: "孵育", - jz_spyjzzb: "静置", - ddhy_qxwdx: "颠倒混匀", - hwph: "恒温平衡", - qxfz: "全血分装", - qxjz: "全血静置", - qxlx: "全血离心", - qxqy: "全血取样", - jzhlx: "静置后离心", - fq2: "分取2", - fq3: "分取3", - hh: "混合", - qx: "清洗", - zc: "暂存", - qy: "弃液", - sjjy: "试剂加样", - jryp_pcr: "加入样品", - bzyp: "补足样品", - jz_pcr: "静置", - nscyp: "NSC样品", - qrhy: "轻柔混匀", - pebwfz: "PE板位放置", - tgbwfz: "天根板位放置", - lsbwfz: "罗氏板位放置", - tqsj: "提取上机", - lssj: "罗氏上机", - yqzt: "仪器暂停", - ecsj: "二次上机", - czclcl: "磁珠残留处理", - ypzy: "样品转移", - lx_pcr: "离心", - hsypfz: "核酸样品分装", - ypbc: "样品保存", - jd_pcr: "解冻", - sjjyst: "试剂加样（手提）", - ddhy_pcr: "颠倒混匀", - wxhy_pcr: "涡旋混匀", - sy_pcr: "水浴", - sslx: "瞬时离心", - xfzcl: "吸附柱处理", - lxdy: "离心（倒液）", - xfzzysjg: "吸附柱转移（收集管）", - xfzzylxg: "吸附柱转移（离心管）", - xt: "洗脱", - ecxt: "二次洗脱", - ndcd: "浓度测定", - jrry_pcrcjg: "加入溶液", - jszz_pcryj: "剪碎组织", - cqzz_pcryj: "称取组织", - jryjry_pcryj: "加入匀浆溶液", - xs: "稀释", - sjjy_pcrfxyp: "试剂加样", - jryp_pcrfxyp: "加入样品", - fmlx: "封膜离心", - pcrsj: "PCR上机", - pbsz: "排版设置", - cbygxz: "参比荧光选择", - yxpcry: "运行PCR仪", - cdnsypfz: "cDNA样品分装", - bb: "包被", - xb: "洗板", - fb_jcb: "封闭", - jy: "加样", - zh: "中和", - jjcsj: "加检测试剂", - sj: "酸解", - sjjy_jcb: "酸解加样", - zhfy: "中和孵育", - ecsj_jcb: "二次酸解", - xs_jcb: "显色", - zz: "终止", - jc: "检测", - dbmby: "读板（酶标仪）", - dbhxfgxt: "读板（化学发光系统）", - dbdhxfgxt: "读板（电化学发光系统）", - dbygxt: "读板（荧光系统）", - dzacl: "读值（ACL）", - qb: "取板", - jzks: "静置开始", - fyxks: "孵育箱开始", - ycfyks: "摇床孵育开始", - ycks: "摇床开始", - js_jcb: "结束", - fm: "覆膜", - pg: "拍干", - czqx: "磁珠清洗", - czzx: "磁珠重悬", - ychy: "摇床混匀", - czzy: "磁珠转移", - sjbj: "试剂标记", - qxb: "取细胞", - qjz: "取菌株", - fr_xbjzpz: "复溶", - lxqy: "离心（弃液）", - cd: "吹打", - xbzy: "细胞转移", - jzzy: "菌株转移", - dypyy: "倒原培养液", - xd: "洗涤", - xh: "消化", - zzxh: "终止消化", - copy: "CO2培养", - gc: "观察", - cdmd: "测定密度", - ds: "低渗", - gd: "固定", - cdxs: "传代/稀释", - gc_xb: "观察", - xdlc: "洗涤（2次）", - bzpyy: "补足培养液", - xh_xb: "消化", - jrrydh: "加入溶液（多行）", - gd_xb: "固定", - rs_xb: "染色", - bpqr: "破片确认", - dp: "滴片", - bprs: "破片染色", - cx: "冲洗", - lg: "晾干", - hygh: "混匀固化", - hwzd: "恒温振荡", - jbcpyj: "加表层培养基", - xs_ptjhfxyp: "稀释" -}; + czdd: '操作地点', + czhj: '操作环境', + xzrq: '选择容器', + jrry: '加入溶液', + tpjysd: '天平校验（双点）', + tpjydd: '天平校验（单点）', + zlfz: '质量分装', + qywz: '取用物质', + clcz: '称量（传值）', + clfcz: '称量（非传值）', + bdtj: '标定（体积）', + bdzl: '标定（质量）', + tjphcz: '调节PH（传值）', + tjphfcz: '调节PH（非传值）', + lx: '离心', + ym: '研磨', + ddhy: '颠倒混匀', + jrjb: '加热搅拌', + jb: '搅拌', + cs: '超声', + sy: '水浴', + zy: '正压', + dc: '氮吹', + glzd: '过滤（自动）', + glsd: '过滤（手动）', + jz: '静置', + jd: '解冻', + fy: '孵育', + qcyy: '取出原药', + frdrq: '复溶（多容器）', + fr: '复溶', + hb: '合并', + rs: '染色', + js: '计数', + mj: '灭菌', + fs: '复苏', + fb: '封板', + wxhy: '涡旋混匀', + zyhy: '振摇混匀', + hwhy: '恒温混匀', + kbyq: '空白（仪器）', + kbsjgsp: '空白（试剂/供试品）', + kb: '空白', + jr: '加热', + fz: '分装', + ypfz: '样品分装', + gyzjfz: '给药制剂分装', + gspypfz: '供试品样品分装', + csqx: '超声清洗', + rj: '融解', + dr: '定容', + jrry_b: '加入溶液', + cl: '称量', + lx_b: '离心', + cs_b: '超声', + ddhy_b: '颠倒混匀', + wxhy_b: '涡旋混匀', + zyhy_b: '振摇混匀', + hwhy_b: '恒温混匀', + jb_b: '搅拌', + jrjb_b: '加热搅拌', + sy_b: '水浴', + zy_b: '正压', + dc_b: '氮吹', + glzd_b: '过滤（自动）', + glsd_b: '过滤（手动）', + jz_b: '静置', + jd_b: '解冻', + fy_b: '孵育', + fr_b: '复溶', + jd_swypfx: '融解', + jryp: '加入样品', + ysfy: '衍生反应', + hhspe: '活化（SPE）', + phspe: '平衡（SPE）', + syspe: '上样（SPE）', + lxspe: '淋洗（SPE）', + xtspe: '洗脱（SPE）', + zyfc: '转移（分层）', + jszz: '剪碎组织', + cqzz: '称取组织', + jryjry: '加入匀浆溶液', + ymyj: '研磨匀浆', + yjyfz2: '匀浆液分装2', + yjyfz3: '匀浆液分装3', + yjbc: '匀浆保存', + yjyhh: '匀浆液混合', + fy_spyjzzb: '孵育', + jz_spyjzzb: '静置', + ddhy_qxwdx: '颠倒混匀', + hwph: '恒温平衡', + qxfz: '全血分装', + qxjz: '全血静置', + qxlx: '全血离心', + qxqy: '全血取样', + jzhlx: '静置后离心', + fq2: '分取2', + fq3: '分取3', + hh: '混合', + qx: '清洗', + zc: '暂存', + qy: '弃液', + sjjy: '试剂加样', + jryp_pcr: '加入样品', + bzyp: '补足样品', + jz_pcr: '静置', + nscyp: 'NSC样品', + qrhy: '轻柔混匀', + pebwfz: 'PE板位放置', + tgbwfz: '天根板位放置', + lsbwfz: '罗氏板位放置', + tqsj: '提取上机', + lssj: '罗氏上机', + yqzt: '仪器暂停', + ecsj: '二次上机', + czclcl: '磁珠残留处理', + ypzy: '样品转移', + lx_pcr: '离心', + hsypfz: '核酸样品分装', + ypbc: '样品保存', + jd_pcr: '解冻', + sjjyst: '试剂加样（手提）', + ddhy_pcr: '颠倒混匀', + wxhy_pcr: '涡旋混匀', + sy_pcr: '水浴', + sslx: '瞬时离心', + xfzcl: '吸附柱处理', + lxdy: '离心（倒液）', + xfzzysjg: '吸附柱转移（收集管）', + xfzzylxg: '吸附柱转移（离心管）', + xt: '洗脱', + ecxt: '二次洗脱', + ndcd: '浓度测定', + jrry_pcrcjg: '加入溶液', + jszz_pcryj: '剪碎组织', + cqzz_pcryj: '称取组织', + jryjry_pcryj: '加入匀浆溶液', + xs: '稀释', + sjjy_pcrfxyp: '试剂加样', + jryp_pcrfxyp: '加入样品', + fmlx: '封膜离心', + pcrsj: 'PCR上机', + pbsz: '排版设置', + cbygxz: '参比荧光选择', + yxpcry: '运行PCR仪', + cdnsypfz: 'cDNA样品分装', + bb: '包被', + xb: '洗板', + fb_jcb: '封闭', + jy: '加样', + zh: '中和', + jjcsj: '加检测试剂', + sj: '酸解', + sjjy_jcb: '酸解加样', + zhfy: '中和孵育', + ecsj_jcb: '二次酸解', + xs_jcb: '显色', + zz: '终止', + jc: '检测', + dbmby: '读板（酶标仪）', + dbhxfgxt: '读板（化学发光系统）', + dbdhxfgxt: '读板（电化学发光系统）', + dbygxt: '读板（荧光系统）', + dzacl: '读值（ACL）', + qb: '取板', + jzks: '静置开始', + fyxks: '孵育箱开始', + ycfyks: '摇床孵育开始', + ycks: '摇床开始', + js_jcb: '结束', + fm: '覆膜', + pg: '拍干', + czqx: '磁珠清洗', + czzx: '磁珠重悬', + ychy: '摇床混匀', + czzy: '磁珠转移', + sjbj: '试剂标记', + qxb: '取细胞', + qjz: '取菌株', + fr_xbjzpz: '复融', + lxqy: '离心（弃液）', + cd: '吹打', + xbzy: '细胞转移', + jzzy: '菌株转移', + dypyy: '倒原培养液', + xd: '洗涤', + xh: '消化', + zzxh: '终止消化', + copy: 'CO₂‌培养', + gc: '观察', + cdmd: '测定密度', + ds: '低渗', + gd: '固定', + cdxs: '传代/稀释', + gc_xb: '观察', + xdlc: '洗涤（2次）', + bzpyy: '补足培养液', + xh_xb: '消化', + jrrydh: '加入溶液（多行）', + gd_xb: '固定', + rs_xb: '染色', + bpqr: '破片确认', + dp: '滴片', + bprs: '破片染色', + cx: '冲洗', + lg: '晾干', + hygh: '混匀固化', + hwzd: '恒温振荡', + jbcpyj: '加表层培养基', + xs_ptjhfxyp: '稀释' +} export default result diff --git a/src/components/Template/StepComponents/xbjzpz/copy.vue b/src/components/Template/StepComponents/xbjzpz/copy.vue index 11171e1..374a8b6 100644 --- a/src/components/Template/StepComponents/xbjzpz/copy.vue +++ b/src/components/Template/StepComponents/xbjzpz/copy.vue @@ -1,4 +1,4 @@ - + @@ -23,7 +23,7 @@ export default { let config = [{ config: { text1: { - label: "使用CO2培养箱", + label: "使用CO₂‌培养箱", type: "text", }, yq: { @@ -31,7 +31,7 @@ export default { fillType: "actFill", }, text2: { - label: "仪器，在温度为37±2°C、CO2浓度为5%±0.5%的条件下进行培养，培养", + label: "仪器，在温度为37±2°C、CO₂‌浓度为5%±0.5%的条件下进行培养，培养", type: "text", }, startDate: { diff --git a/src/components/Template/StepComponents/xbjzpz/fr_xbjzpz.vue b/src/components/Template/StepComponents/xbjzpz/fr_xbjzpz.vue index 35147f8..954de40 100644 --- a/src/components/Template/StepComponents/xbjzpz/fr_xbjzpz.vue +++ b/src/components/Template/StepComponents/xbjzpz/fr_xbjzpz.vue @@ -1,4 +1,4 @@ - + diff --git a/src/components/Template/StepFormPackage.vue b/src/components/Template/StepFormPackage.vue index bdb487b..321006d 100644 --- a/src/components/Template/StepFormPackage.vue +++ b/src/components/Template/StepFormPackage.vue @@ -250,6 +250,7 @@ export default { o.syldw = formFields[item.dwCode];//单位 } sjResource.push(o); + } }else if(item.type === "yq"){ if(formFields[key]){ @@ -261,6 +262,7 @@ export default { } } } + console.log(sjResource,yqResource,allFieldsConfig,formFields,"sjResource") return { sjResource, yqResource, diff --git a/src/components/Template/mixins/formPackageMixins.js b/src/components/Template/mixins/formPackageMixins.js index f9590c2..a366af5 100644 --- a/src/components/Template/mixins/formPackageMixins.js +++ b/src/components/Template/mixins/formPackageMixins.js @@ -1,5 +1,5 @@ import _ from 'lodash' -import { getuuid, isEqual, isValueEmpty,isRegent } from '@/utils/index.js' +import { getuuid, isEqual, isValueEmpty, isRegent } from '@/utils/index.js' import { isShowOtherByCheckboxTree } from '@/utils/formPackageCommon.js' import moment from 'moment' @@ -63,8 +63,8 @@ export default { this.$set(this.errors, key, false) } }, - getOrangeBg(key,sItem) { - if(sItem.compareText){ + getOrangeBg(key, sItem) { + if (sItem.compareText) { return sItem.compareText == this.formFields[key] } return this.orangeBgFields[key] @@ -82,7 +82,9 @@ export default { }, //试剂/仪器等弹窗提交 onRegentSubmit(data, inputValue, key, item) { - this.formFields[`selectInfo_${key}`] = JSON.parse(JSON.stringify(data.selectInfo)); + if (data.selectInfo) { + this.formFields[`selectInfo_${key}`] = JSON.parse(JSON.stringify(data.selectInfo)); + } if (data.type === "yq") { this.formFields[`yqInfo_${key}`] = JSON.parse(JSON.stringify(data.row)); } @@ -389,45 +391,46 @@ export default { currentConfig.otherCode ) } - }) - // 处理可能存在的直接otherCode字段 - if (item.config?.otherCode) { - config[item.config?.otherCode] = item.config?.otherCode - } - if (item.config?.thirdOtherCode) { - config[item.config?.thirdOtherCode] = item.config?.thirdOtherCode - } - if (isRegent(item.config) || isRegent(item.config,"subType")) { - // 处理selectInfo_开头的字段，步骤表单需要保留selectInfo_开头的字段 - // 优先使用this.formFields中以selectInfo_开头的字段 - let selectInfoKeys = [], yqInfoKeys = []; - if (this.formFields) { - selectInfoKeys = Object.keys(this.formFields).filter((key) => - key.startsWith('selectInfo_') - ) - yqInfoKeys = Object.keys(this.formFields).filter((key) => - key.startsWith('yqInfo_') - ) + // 处理可能存在的直接otherCode字段 + if (currentConfig.otherCode) { + config[currentConfig.otherCode] = currentConfig.otherCode } - // 如果this.formFields中没有，则使用formData中的 - if (selectInfoKeys.length === 0 && formData) { - selectInfoKeys = Object.keys(formData).filter((key) => - key.startsWith('selectInfo_') - ) + if (currentConfig.thirdOtherCode) { + config[currentConfig.thirdOtherCode] = currentConfig.thirdOtherCode } - if (yqInfoKeys.length === 0 && formData) { - yqInfoKeys = Object.keys(formData).filter((key) => - key.startsWith('yqInfo_') - ) + if (isRegent(currentConfig) || isRegent(currentConfig, "subType")) { + // 处理selectInfo_开头的字段，步骤表单需要保留selectInfo_开头的字段 + // 优先使用this.formFields中以selectInfo_开头的字段 + let selectInfoKeys = [], yqInfoKeys = []; + if (this.formFields) { + selectInfoKeys = Object.keys(this.formFields).filter((key) => + key.startsWith('selectInfo_') + ) + yqInfoKeys = Object.keys(this.formFields).filter((key) => + key.startsWith('yqInfo_') + ) + } + // 如果this.formFields中没有，则使用formData中的 + if (selectInfoKeys.length === 0 && formData) { + selectInfoKeys = Object.keys(formData).filter((key) => + key.startsWith('selectInfo_') + ) + } + if (yqInfoKeys.length === 0 && formData) { + yqInfoKeys = Object.keys(formData).filter((key) => + key.startsWith('yqInfo_') + ) + } + selectInfoKeys.forEach((key) => { + result[key] = this.formFields[key] || formData[key] || '' + }) + yqInfoKeys.forEach((key) => { + result[key] = this.formFields[key] || formData[key] || '' + }) } - selectInfoKeys.forEach((key) => { - result[key] = this.formFields[key] || formData[key] || '' - }) - yqInfoKeys.forEach((key) => { - result[key] = this.formFields[key] || formData[key] || '' - }) - } + }) + } }) @@ -647,7 +650,6 @@ export default { return new Promise((resolve, reject) => { if (validateResult.valid && subComponentValidateResult.valid) { - console.log(this.formFields, 'this.formFields') resolve(this.formFields) } else if (!validateResult.valid) { // this.$message.error("表单内容未填完,请填写后再提交"); diff --git a/src/lang/en/template/commonTemplate.js b/src/lang/en/template/commonTemplate.js index 631b9c8..b9c46ee 100644 --- a/src/lang/en/template/commonTemplate.js +++ b/src/lang/en/template/commonTemplate.js @@ -9,6 +9,7 @@ export default { instrumentInfo: 'Instrument Usage', storageCondition: 'Storage Conditions', operationSteps: 'Operation Workflow', + bzgzypz: '标曲工作液配制', remark: 'Comments', step: 'Step', bqdy: 'Label Print', @@ -23,7 +24,7 @@ export default { sjInfo:'Reagent Info', gyzjInfo:'Formulation Info', gspInfo:'Specimen Info', - gspsywzInfo:'试验物资信息', + gspsywzInfo:'试验物质信息', mjyInfo:'Controlled Drug Info', storageConditionLabel: 'Storage Condition', @@ -56,6 +57,7 @@ export default { addBtn: 'Add', deleteBtn: 'Delete', downloadTemplate: 'Download Template', + downloadTableData: 'Download Table', importTemplate: 'Import Template', // 错误提示 diff --git a/src/lang/en/template/dl.js b/src/lang/en/template/dl.js index ce4ba9a..6262c50 100644 --- a/src/lang/en/template/dl.js +++ b/src/lang/en/template/dl.js @@ -168,7 +168,11 @@ export default { pytjText: 'Culture Conditions', pykssj: 'Culture Start Time', pykssjButton: 'Start', - bqdy: 'Label Print' + bqdy: 'Label Print', + gcbz:'View Remark', + czrqm:'Signed By', + czrqmsj:'Date', + xbfshzk:'Post-thaw cell condition' }, dl012: { ...common, diff --git a/src/lang/zh/template/commonTemplate.js b/src/lang/zh/template/commonTemplate.js index 5c63563..9f52319 100644 --- a/src/lang/zh/template/commonTemplate.js +++ b/src/lang/zh/template/commonTemplate.js @@ -7,14 +7,15 @@ export default { sjInfo:'试验试剂信息', gyzjInfo:'给药制剂信息', gspInfo:'供试品信息', - gspsywzInfo:'试验物资信息', + gspsywzInfo:'试验物质信息', mjyInfo:'麻精药信息', reagentInfo: '试验试剂信息', - wzInfo: '试验物资信息', + wzInfo: '试验物质信息', instrumentInfo: '仪器使用信息', storageCondition: '存储条件', operationSteps: '操作步骤', + bzgzypz: '标曲工作液配制', step: '步骤', remark: '备注', bqdy: '标签打印', @@ -57,6 +58,7 @@ export default { saveBtn: '保存', deleteBtn: '刪除', downloadTemplate: '下载模板', + downloadTableData: '下载表格数据', importTemplate: '导入模板', // 错误提示 diff --git a/src/lang/zh/template/dl.js b/src/lang/zh/template/dl.js index c1eae5f..409e055 100644 --- a/src/lang/zh/template/dl.js +++ b/src/lang/zh/template/dl.js @@ -165,7 +165,11 @@ export default { pytjText: '培养条件', pykssj: '培养开始时间', pykssjButton: '开始', - bqdy: '标签打印' + bqdy: '标签打印', + gcbz:'观察备注', + czrqm:'操作人签名', + czrqmsj:'操作人签名时间', + xbfshzk:'细胞复苏后状况' }, dl012: { ...common, diff --git a/src/utils/calUnitTools.js b/src/utils/calUnitTools.js index 4ad979f..a5f6ecb 100644 --- a/src/utils/calUnitTools.js +++ b/src/utils/calUnitTools.js @@ -9,6 +9,13 @@ export function addTj(valueArr, unitArr) { mixIndex = thisIndex < mixIndex ? thisIndex : mixIndex } + if (mixIndex === -1) { + return { + total: 0, + unit: 'mL' + } + } + let total = 0 for (let i = 0; i < unitArr.length; i++) { let thisIndex = unit.indexOf(unitArr[i]) @@ -38,6 +45,13 @@ export function subTj(valueArr, unitArr) { mixIndex = thisIndex < mixIndex ? thisIndex : mixIndex } + if (mixIndex === -1) { + return { + total: 0, + unit: 'mL' + } + } + let total = multiplyDecimals( parseFloat(valueArr[0]), Math.pow(1000, unit.indexOf(unitArr[0]) - mixIndex) diff --git a/src/views/business/comps/select/SelectStudy.vue b/src/views/business/comps/select/SelectStudy.vue index bb2127a..f4c76fc 100644 --- a/src/views/business/comps/select/SelectStudy.vue +++ b/src/views/business/comps/select/SelectStudy.vue @@ -2,9 +2,11 @@ @@ -30,6 +32,10 @@ export default { type: Number, default: 0 }, + showSn: { + type: Boolean, + default: false + } }, watch: { value: { @@ -43,7 +49,8 @@ export default { return { selected: { id: '', - name: '' + name: '', + sn: '' }, }; }, @@ -60,6 +67,7 @@ export default { handleChange(obj) { this.selected.name = obj.name this.selected.id = obj.id + this.selected.sn = obj.sn this.$emit('change', _.merge({}, obj, { key: this.selectkey })) this.$emit('input', obj.id) }, diff --git a/src/views/business/comps/select/SelectStudyDialog.vue b/src/views/business/comps/select/SelectStudyDialog.vue index f202e0a..a2fc7f6 100644 --- a/src/views/business/comps/select/SelectStudyDialog.vue +++ b/src/views/business/comps/select/SelectStudyDialog.vue @@ -68,6 +68,10 @@ export default { name: "SelectStudyDialog", components: { SelectDeptUser }, props: { + showSn: { + type: Boolean, + default: false + } }, watch: { }, @@ -106,11 +110,13 @@ export default { this.selectList = selection this.selectedId = _.map(this.selectList, 'id').join(',') this.selectedName = _.map(this.selectList, 'name').join(',') + this.selectedSn = _.map(this.selectList, 'sn').join(',') }, show(val) { this.searchForm = _.merge({}, this.searchForm, val) this.selectedId = '' this.selectedName = '' + this.selectedSn = '' this.checkedOther = false this.others = '' this.$emit('callback', { id: '', name: '', other: '' }) @@ -121,6 +127,7 @@ export default { this.open = true this.selectedId = '' this.selectedName = '' + this.selectedSn = '' this.checkedOther = false this.others = '' this.$emit('callback', { id: '', name: '', other: '' }) @@ -146,12 +153,15 @@ export default { }, handleSelect() { let name='' + let sn = '' if(this.selectedName!=''&&this.others!=''){ name=this.selectedName+','+this.others + sn=this.selectedSn+','+this.others }else{ name=this.selectedName+this.others + sn=this.selectedSn+this.others } - this.$emit('callback', { id: this.selectedId, name: name, mdOther: this.others }) + this.$emit('callback', { id: this.selectedId, name: name, mdOther: this.others, sn: sn }) this.open = false } } diff --git a/src/views/business/comps/template/comps/bl/BL002.vue b/src/views/business/comps/template/comps/bl/BL002.vue index 086ba4a..367cab5 100644 --- a/src/views/business/comps/template/comps/bl/BL002.vue +++ b/src/views/business/comps/template/comps/bl/BL002.vue @@ -219,10 +219,10 @@ export default { if( stepTableFormData && stepTableFormData.length >0 ){ stepTableFormData.map((item,index)=>{ if(!item.smryqrxx && item.smryqrxx !== false){ - this.$refs.yqsyTableRef.updateDataSourceByRowIndex(index, {...item,smryqrxx:false}) + this.$refs.dwybTableRef.updateDataSourceByRowIndex(index, {...item,smryqrxx:false}) } if(!item.ztblxjqrxx && item.ztblxjqrxx !== false){ - this.$refs.yqsyTableRef.updateDataSourceByRowIndex(index, {...item,ztblxjqrxx:false}) + this.$refs.dwybTableRef.updateDataSourceByRowIndex(index, {...item,ztblxjqrxx:false}) } }) } diff --git a/src/views/business/comps/template/comps/dl/DL003.vue b/src/views/business/comps/template/comps/dl/DL003.vue index 85031c6..6ed3a63 100644 --- a/src/views/business/comps/template/comps/dl/DL003.vue +++ b/src/views/business/comps/template/comps/dl/DL003.vue @@ -551,6 +551,9 @@ export default { if (this.$refs.jzjzTableRef) { this.$refs.jzjzTableRef.updateDataSourceByRowIndex(rowIndex, { ...currentItem }); } + setTimeout(() => { + this.justUpdateFilledFormData() + }, 100) } catch (error) { // 8. 异常捕获，给出友好提示 this.$message.error('子码生成失败，请重试'); diff --git a/src/views/business/comps/template/comps/dl/DL011.vue b/src/views/business/comps/template/comps/dl/DL011.vue index 3f34350..e7c8480 100644 --- a/src/views/business/comps/template/comps/dl/DL011.vue +++ b/src/views/business/comps/template/comps/dl/DL011.vue @@ -8,24 +8,11 @@
- + - - + + @@ -35,14 +22,8 @@ $t('template.dl.dl011.bqdy') }}
- +
@@ -51,24 +32,55 @@
- +
- + + @@ -76,6 +88,7 @@