From 28c9fb95932766df567cf58b2d0cd1d33967cea5 Mon Sep 17 00:00:00 2001 From: luojie <125330818@qq.com> Date: Tue, 24 Mar 2026 16:55:28 +0800 Subject: [PATCH 01/18] =?UTF-8?q?feat:[=E6=A8=A1=E6=9D=BF=E7=AE=A1?= =?UTF-8?q?=E7=90=86][update]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Template/HandleFormItem.vue | 9 ++- src/components/Template/StepComponents/ry/jd.vue | 7 ++ .../comps/template/mixins/templateMixin.js | 94 ++++++++++++---------- src/views/business/form/drug/comp/sqbdList.vue | 8 +- 4 files changed, 67 insertions(+), 51 deletions(-) diff --git a/src/components/Template/HandleFormItem.vue b/src/components/Template/HandleFormItem.vue index 096ac34..d2955b2 100644 --- a/src/components/Template/HandleFormItem.vue +++ b/src/components/Template/HandleFormItem.vue @@ -340,9 +340,9 @@ export default { currentCheckboxTreeValue: '',//当前操作的checkboxTree值 isShowOtherByCheckboxTree, pickerOptions: { - disabledDate(time) { - return time.getTime() > Date.now(); - }, + // disabledDate(time) { + // return time.getTime() > Date.now(); + // }, shortcuts: type === 'dateTimeRange' ? undefined:[{ text: '今天', onClick(picker) { @@ -524,7 +524,7 @@ export default { // 所有删除操作都需要验证电子签名 // 保存待删除的文件信息 this.pendingRemoveFile = { file, fileList: this.fileList }; - +console.log("fillll") // 触发电子签名弹窗 EventBus.$emit('showEditSignDialog', { uuid: this.uuid }); @@ -1200,6 +1200,7 @@ export default { return; } if (!isOldValueEmpty && !(isSame) && (this.templateFillType === "actFill" || this.templateFillType === "blxjsh")&&this.type !== "attachment") { + console.log("需要电子签名") // 通过EventBus触发电子签名弹窗 EventBus.$emit('showEditSignDialog', { uuid: this.uuid }); } else {//如果是第一次填写,不需要密码验证 diff --git a/src/components/Template/StepComponents/ry/jd.vue b/src/components/Template/StepComponents/ry/jd.vue index 2486dcb..906c652 100644 --- a/src/components/Template/StepComponents/ry/jd.vue +++ b/src/components/Template/StepComponents/ry/jd.vue @@ -1,6 +1,7 @@ @@ -16,9 +17,15 @@ export default { default: 'jd', }, }, + components: { StepFormPackage }, + methods: { + select(data) { + console.log(data, "select") + } + }, computed: { formConfig() { let config = this.sn==='jd_swypfx'? diff --git a/src/views/business/comps/template/mixins/templateMixin.js b/src/views/business/comps/template/mixins/templateMixin.js index f1eb8a3..1e24bf4 100644 --- a/src/views/business/comps/template/mixins/templateMixin.js +++ b/src/views/business/comps/template/mixins/templateMixin.js @@ -1,6 +1,6 @@ import moment from 'moment' import { getLatestSn, getLatestSnArr } from '@/api/template'; -import { isValueEmpty, getStringWidth,getuuid } from '@/utils/index'; +import { isValueEmpty, getStringWidth, getuuid } from '@/utils/index'; import { isCommonUnit } from "@/utils/conTools"; import { sj_subpackage, sj_startConfiguration, sj_configurationCompleted } from '@/api/business/sj/sj'; import { convertConcentration } from "@/utils/conConverter";//浓度单位转换 @@ -142,7 +142,7 @@ export default { templateId, templateSn, startDate, - submittedCodes, + submittedCodes, bdmc, endDate, id @@ -157,7 +157,7 @@ export default { templateMcEn, templateId, templateSn, - submittedCodes, + submittedCodes, startDate, bdmc, endDate, @@ -288,12 +288,12 @@ export default { onBeforeReagentSubmit(data) { const { selectData, callback, key, formFields } = data; const { subTargetStartSolution } = formFields; - + //判断选择的浓度单位和预制的浓度单位是否一致 if (key === "subStartSolution" && !isCommonUnit(selectData.row.nddw, [subTargetStartSolution])) {//选择起始源溶液需要同步更新table的变更记录。 callback.prevent('浓度单位与预制不符,请重新选择或申请废止并重新预制。'); } - if(selectData.row.nd === "NA"){ + if (selectData.row.nd === "NA") { callback.prevent('当前实际浓度为NA,请重新选择'); } }, @@ -503,19 +503,19 @@ export default { targetDiluentVolumePrecision: 3, //小数点精度默认为3 targetStartSolutionVolumePrecision: 3, //小数点精度默认为3 targetSolutionCode: `CA-WS-STD${Number(codeSTD) - index}`, - id:getuuid(), - rowIndex:index, + id: getuuid(), + rowIndex: index, })) this.$refs.stepTableRef.updateDataSource(arr) } else if (key === 'targetStartSolution' || key === 'subTargetStartSolution') { //起始溶液体积失焦时,更新目标溶液预计浓度 const arr = this.$refs.stepTableRef?.getDataSource(); - const { headerSelectFields,stepTableFormData=[] } = this.$refs.stepTableRef?.getFilledFormData(); + const { headerSelectFields, stepTableFormData = [] } = this.$refs.stepTableRef?.getFilledFormData(); const params = { subTargetStartSolution, headerSelectFields, - dataSource:stepTableFormData, - } + dataSource: stepTableFormData, + } arr.forEach((item, rowIndex) => { this.updateTargetStartSolutionVolume( item, @@ -583,7 +583,7 @@ export default { } if (isValueEmpty(initNd)) { - console.log("initNd",initNd) + console.log("initNd", initNd) this.$message.error('请先选择起始源溶液') return } else { @@ -598,7 +598,7 @@ export default { //计算目标溶液浓度 calcNd(item, targetAcSolution, params) { - console.log(item,params, "ppp") + console.log(item, params, "ppp") // debugger //targetStartSolutionUnit(实际起始源溶液浓度单位) const { targetStartSolutionUnit, headerSelectFields } = params; @@ -606,7 +606,7 @@ export default { let initUnit = targetStartSolutionUnit; if (item.rowIndex > 0) { initUnit = actSolutionConcentrationUnit; - } + } //actStartSolutionVolumeUnit(实际起始源溶液体积单位)actSolutionVolumeUnit(实际目标溶液体积单位) //actDiluentVolumeUnit(实际稀释液体积单位)actSolutionConcentrationUnit(实际目标溶液浓度单位) //实际源溶液浓度÷(实际终体积÷源溶液加入体积); @@ -619,6 +619,14 @@ export default { if (isValueEmpty(actStartSolutionVolume) || isValueEmpty(actDiluentVolume) || isValueEmpty(initUnit)) { return false } + const splitXsytj = actDiluentVolume.split("/"); + const splitYrytj = actStartSolutionVolume.split("/"); + const sjZtj = splitXsytj.map((item,index) => { + const xsytj = volumeConverter.convert(item + actDiluentVolumeUnit, actSolutionVolumeUnit); + const yrytj = volumeConverter.convert(splitYrytj[index] + actStartSolutionVolumeUnit, actSolutionVolumeUnit); + return (Number(xsytj) + Number(yrytj)).toFixed(volPrecision); + }) + console.log(sjZtj, "sjZtj") const converActDiluentVolume = volumeConverter.convert(actDiluentVolume + actDiluentVolumeUnit, actSolutionVolumeUnit) const converActStartSolutionVolume = volumeConverter.convert(actStartSolutionVolume + actStartSolutionVolumeUnit, actSolutionVolumeUnit) //实际源溶液加入体积+实际稀释液加入体积 @@ -628,11 +636,11 @@ export default { const targetStartVolUnit = actSolutionConcentrationUnit.split("/")[1];//先按照预设目标溶液浓度的单位标准 const converActVol = volumeConverter.convert(actVol + actSolutionVolumeUnit, targetStartVolUnit) const converActDiluentVolume1 = volumeConverter.convert(actStartSolutionVolume + actStartSolutionVolumeUnit, targetStartVolUnit) - const converArr = (targetAcSolution+'').split("/"); - converArr.map((item)=>{ + const converArr = (targetAcSolution + '').split("/"); + converArr.map((item) => { return convertConcentration.convert(item + initUnit, actSolutionConcentrationUnit) }) - console.log(converArr,"converArr") + console.log(converArr, "converArr") const converTargetAcSolution = convertConcentration.convert(targetAcSolution + initUnit, actSolutionConcentrationUnit) // 实际目标溶液浓度 = 实际源溶液浓度÷(实际终体积÷源溶液加入体积); const actNd = ( @@ -653,16 +661,17 @@ export default { //更新起始溶液体积时,计算预设起始溶液体积和预设稀释液体积 updateTargetStartSolutionVolume(item, volume, unitParams) { const { rowIndex } = item - const { subTargetStartSolution, headerSelectFields, dataSource=[] } = unitParams + const { subTargetStartSolution, headerSelectFields, dataSource = [] } = unitParams const { targetSolutionConcentrationUnit, targetSolutionVolumeUnit, targetStartSolutionVolumeUnit, targetDiluentVolumeUnit } = headerSelectFields - let initNd = volume,unit = subTargetStartSolution; + let initNd = volume, unit = subTargetStartSolution; //平行配置不会传dataSource; if (rowIndex > 0 && dataSource.length > 0) { initNd = dataSource[rowIndex - 1].targetSolutionConcentration; unit = targetSolutionConcentrationUnit; - } + } const precision = item.targetStartSolutionVolumePrecision || 0 + const precision1 = item.targetDiluentVolumePrecision || 0; const concentration = item.targetSolutionConcentration const targetVolume = item.targetSolutionVolume if ( @@ -676,34 +685,33 @@ export default { ) { return; } - const targetStartVolUnit = targetSolutionConcentrationUnit.split("/")[1];//先按照预设目标溶液浓度的单位标准 - const volumeArr = (initNd+'').split("/"); - const converArr = volumeArr.map((item)=>{ - return convertConcentration.convert(item + unit, targetSolutionConcentrationUnit) - }) - console.log(converArr,"converArr") - //将起始溶液浓度转换为和预设目标溶液浓度一样的单位再计算; - const converStartCon = convertConcentration.convert(initNd + unit, targetSolutionConcentrationUnit) //将预设目标溶液体积转换为和预设目标溶液浓度单位的分母一样的单位再计算;如:预设目标溶液浓度单位为mg/mL,预设目标溶液体积单位为uL,则将预设目标溶液体积转换为mL const convertTargetVol = volumeConverter.convert(targetVolume + targetSolutionVolumeUnit, targetStartVolUnit) + const convertTargetVol1 = volumeConverter.convert(targetVolume + targetSolutionVolumeUnit, targetStartSolutionVolumeUnit) - //预设起始溶液体积:(目标溶液预计浓度 乘以 目标溶液预计体积)除以 起始溶液浓度 - const result = Number((concentration * convertTargetVol) / converStartCon) - //根据预设起始溶液体积单位转换计算后的数据 - const convertYsVol = volumeConverter.convert(result + targetStartVolUnit, targetStartSolutionVolumeUnit) - item.targetStartSolutionVolume = Number(convertYsVol.toFixed( - precision - )) - // this.$refs.stepTableRef.updateDataSourceByRowIndex(rowIndex, { targetStartSolutionVolume: result }); - if (targetVolume) { - //预设稀释液体积:目标溶液预计体积 减去 源溶液预计体积; - const precision1 = item.targetDiluentVolumePrecision || 0; - //将预设目标溶液体积转换为和预设起始溶液体积单位一样的单位再计算; - const convertTargetVol1 = volumeConverter.convert(targetVolume + targetSolutionVolumeUnit, targetStartSolutionVolumeUnit) - const result1 = (convertTargetVol1 - convertYsVol) - item.targetDiluentVolume = Number(volumeConverter.convert(result1 + targetStartSolutionVolumeUnit, targetDiluentVolumeUnit).toFixed(precision1)) - // this.$refs.stepTableRef.updateDataSourceByRowIndex(rowIndex, { targetDiluentVolume: result1 }); + const initNdArr = (initNd + '').split("/"); + const transNdArr = initNdArr.map((con) => { + return convertConcentration.convert(con + unit, targetSolutionConcentrationUnit) + }) + const mbyjndArr = (concentration + '').split("/");//目标预计浓度 + if (initNdArr.length == 1 || mbyjndArr.length == initNdArr.length) { + //预设体积 + const ystjArr = mbyjndArr.map((con, index) => { + const ystj = Number((con * convertTargetVol) / (transNdArr[index] || transNdArr[0])) + const convertYsVol = volumeConverter.convert(ystj + targetStartVolUnit, targetStartSolutionVolumeUnit) + const xstj = (convertTargetVol1 - convertYsVol)//稀释体积 + return {qsrytj:convertYsVol,xstj} + }) + item.targetStartSolutionVolume = ystjArr.map((item) => { + return Number((item.qsrytj).toFixed(precision)) + }).join("/"); + item.targetDiluentVolume = ystjArr.map((item) => { + return Number((volumeConverter.convert(item.xstj + targetStartSolutionVolumeUnit, targetDiluentVolumeUnit)).toFixed(precision1)) + }).join("/"); + } else { + this.$message.error("起始溶液浓度和目标溶液浓度格式不一致,请重新输入") + return } }, // 导出excel模板 diff --git a/src/views/business/form/drug/comp/sqbdList.vue b/src/views/business/form/drug/comp/sqbdList.vue index 0c5983c..9ad7354 100644 --- a/src/views/business/form/drug/comp/sqbdList.vue +++ b/src/views/business/form/drug/comp/sqbdList.vue @@ -192,13 +192,13 @@ - + - + - + - + From e6eda4ff3ecc9d6788fce7beb57e31226400f271 Mon Sep 17 00:00:00 2001 From: HanLong <404402223@qq.com> Date: Tue, 24 Mar 2026 19:23:26 +0800 Subject: [PATCH 02/18] =?UTF-8?q?fix:[=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86?= =?UTF-8?q?][=E5=AD=98=E5=82=A8=E4=BD=8D=E7=BD=AE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/business/storageLocation/list.vue | 40 +++++++++++++++-------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/src/views/business/storageLocation/list.vue b/src/views/business/storageLocation/list.vue index 330fc80..db210d0 100644 --- a/src/views/business/storageLocation/list.vue +++ b/src/views/business/storageLocation/list.vue @@ -11,8 +11,9 @@ - - + + @@ -115,8 +116,8 @@
- +
@@ -127,12 +128,12 @@ - + diff --git a/src/views/business/storageLocation/comps/Xz.vue b/src/views/business/storageLocation/comps/Xz.vue new file mode 100644 index 0000000..62b07aa --- /dev/null +++ b/src/views/business/storageLocation/comps/Xz.vue @@ -0,0 +1,187 @@ + + + diff --git a/src/views/business/storageLocation/list.vue b/src/views/business/storageLocation/list.vue index db210d0..fdc0748 100644 --- a/src/views/business/storageLocation/list.vue +++ b/src/views/business/storageLocation/list.vue @@ -57,111 +57,36 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
-
-
-
- -
+ + From d6cfc5bf323304a67228987cae8e88f6a21181c0 Mon Sep 17 00:00:00 2001 From: memorylkf <312904636@qq.com> Date: Tue, 24 Mar 2026 21:27:38 +0800 Subject: [PATCH 04/18] =?UTF-8?q?fix:=20[=E7=94=A8=E6=88=B7=E7=AE=A1?= =?UTF-8?q?=E7=90=86]=20resetyForm=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/ruoyi.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/utils/ruoyi.js b/src/utils/ruoyi.js index a5af056..76132fc 100644 --- a/src/utils/ruoyi.js +++ b/src/utils/ruoyi.js @@ -51,11 +51,18 @@ export function parseTime(time, pattern) { // 表单重置 export function resetForm(refName) { + if (this.$refs[refName]) { + this.$refs[refName].resetFields() + } +} + +// 表单重置- 延时 +export function resetFormTime(refName) { setTimeout(() => { if (this.$refs[refName]) { this.$refs[refName].resetFields() } - }, 100) + }, 1000) } // 添加日期范围 From f4d8c923d514a4f1ad50e0a5f84e495871c3075c Mon Sep 17 00:00:00 2001 From: memorylkf <312904636@qq.com> Date: Tue, 24 Mar 2026 21:43:36 +0800 Subject: [PATCH 05/18] =?UTF-8?q?fix:=20[=E8=A1=A8=E5=8D=95=E7=AD=BE?= =?UTF-8?q?=E5=90=8D]=20=E5=BC=B9=E7=AA=97=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main.js | 2 ++ src/utils/ruoyi.js | 16 ++++++++++++---- src/views/business/comps/common/sign.vue | 3 ++- src/views/business/comps/template/dialog/EditSign.vue | 2 +- src/views/business/form/drug/comp/sign.vue | 3 ++- src/views/business/form/nonTrial/comp/sign.vue | 3 ++- src/views/business/study/comp/sign.vue | 4 +++- 7 files changed, 24 insertions(+), 9 deletions(-) diff --git a/src/main.js b/src/main.js index 13bec0d..5afc8d9 100644 --- a/src/main.js +++ b/src/main.js @@ -21,6 +21,7 @@ import { getConfigKey } from '@/api/system/config' import { parseTime, resetForm, + clearFormValidate, addDateRange, selectDictLabel, selectDictLabels, @@ -50,6 +51,7 @@ Vue.prototype.getDicts = getDicts Vue.prototype.getConfigKey = getConfigKey Vue.prototype.parseTime = parseTime Vue.prototype.resetForm = resetForm +Vue.prototype.clearFormValidate = clearFormValidate Vue.prototype.addDateRange = addDateRange Vue.prototype.selectDictLabel = selectDictLabel Vue.prototype.selectDictLabels = selectDictLabels diff --git a/src/utils/ruoyi.js b/src/utils/ruoyi.js index 76132fc..23f4b6a 100644 --- a/src/utils/ruoyi.js +++ b/src/utils/ruoyi.js @@ -56,13 +56,21 @@ export function resetForm(refName) { } } -// 表单重置- 延时 -export function resetFormTime(refName) { +// 表单清除验证 +export function clearFormValidate(refName) { setTimeout(() => { if (this.$refs[refName]) { - this.$refs[refName].resetFields() + this.$refs[refName].clearValidate() } - }, 1000) + }, 100) + // if (this.$refs[refName]) { + // this.$refs[refName].clearValidate() + // } + // else { + // setTimeout(() => { + // this.clearFormValidate(refName) + // }, 100) + // } } // 添加日期范围 diff --git a/src/views/business/comps/common/sign.vue b/src/views/business/comps/common/sign.vue index c1ef81b..6e3a035 100644 --- a/src/views/business/comps/common/sign.vue +++ b/src/views/business/comps/common/sign.vue @@ -106,7 +106,7 @@ export default { jyksrq: selectedDate && selectedDate.length > 0 ? selectedDate[0] : '', jyjsrq: selectedDate && selectedDate.length > 0 ? selectedDate[1] : '' } - this.resetForm("signForm") + this.open = true this.isReson = isReson || false @@ -142,6 +142,7 @@ export default { }] } } + this.clearFormValidate("signForm") }, cancel() { this.open = false diff --git a/src/views/business/comps/template/dialog/EditSign.vue b/src/views/business/comps/template/dialog/EditSign.vue index a84e291..0d5b4a7 100644 --- a/src/views/business/comps/template/dialog/EditSign.vue +++ b/src/views/business/comps/template/dialog/EditSign.vue @@ -98,8 +98,8 @@ export default { qmrmm:'', } this.isChecked = false - this.resetForm("formEditSignForm") this.open = true + this.clearFormValidate("formEditSignForm") }, cancel() { this.open = false diff --git a/src/views/business/form/drug/comp/sign.vue b/src/views/business/form/drug/comp/sign.vue index e3d67c7..885ef1e 100644 --- a/src/views/business/form/drug/comp/sign.vue +++ b/src/views/business/form/drug/comp/sign.vue @@ -114,7 +114,7 @@ export default { startDate:selectedDate&&selectedDate.length>0?selectedDate[0]:'', endDate:selectedDate&&selectedDate.length>1?selectedDate[1]:'' } - this.resetForm("signForm") + this.open = true this.isReson = isReson || false @@ -150,6 +150,7 @@ export default { }] } } + this.clearFormValidate("signForm") }, cancel() { this.open = false diff --git a/src/views/business/form/nonTrial/comp/sign.vue b/src/views/business/form/nonTrial/comp/sign.vue index e3d67c7..885ef1e 100644 --- a/src/views/business/form/nonTrial/comp/sign.vue +++ b/src/views/business/form/nonTrial/comp/sign.vue @@ -114,7 +114,7 @@ export default { startDate:selectedDate&&selectedDate.length>0?selectedDate[0]:'', endDate:selectedDate&&selectedDate.length>1?selectedDate[1]:'' } - this.resetForm("signForm") + this.open = true this.isReson = isReson || false @@ -150,6 +150,7 @@ export default { }] } } + this.clearFormValidate("signForm") }, cancel() { this.open = false diff --git a/src/views/business/study/comp/sign.vue b/src/views/business/study/comp/sign.vue index 7e28456..5613c69 100644 --- a/src/views/business/study/comp/sign.vue +++ b/src/views/business/study/comp/sign.vue @@ -114,7 +114,7 @@ export default { startDate:selectedDate&&selectedDate.length>0?selectedDate[0]:'', endDate:selectedDate&&selectedDate.length>1?selectedDate[1]:'' } - this.resetForm("signForm") + this.open = true this.isReson = isReson || false @@ -150,6 +150,8 @@ export default { }] } } + + this.clearFormValidate("signForm") }, cancel() { this.open = false From 1cdf0a0a9074a9904e400ed9ba8a93f773f3c69d Mon Sep 17 00:00:00 2001 From: luojie <125330818@qq.com> Date: Tue, 24 Mar 2026 21:57:51 +0800 Subject: [PATCH 06/18] =?UTF-8?q?feat:[=E6=A8=A1=E6=9D=BF=E7=AE=A1?= =?UTF-8?q?=E7=90=86][update]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Template/Step.vue | 3 + src/components/Template/StepComponents/pcr/lx.vue | 186 +++++++++++++++++++++ src/components/Template/StepComponents/ry/jd.vue | 13 +- src/components/Template/StepComponents/xb/bpqr.vue | 10 +- src/components/Template/StepFormPackage.vue | 11 +- src/components/Template/mixins/stepMixins.js | 8 + .../Template/operation/TableOpertaion.vue | 2 +- .../comps/template/mixins/templateMixin.js | 30 ++-- 8 files changed, 237 insertions(+), 26 deletions(-) create mode 100644 src/components/Template/StepComponents/pcr/lx.vue diff --git a/src/components/Template/Step.vue b/src/components/Template/Step.vue index bc7446d..b0070bb 100644 --- a/src/components/Template/Step.vue +++ b/src/components/Template/Step.vue @@ -193,6 +193,7 @@ import xfzzysjg from './StepComponents/pcr/xfzzysjg.vue';//PCR-吸附柱转移 import xfzzylxg from './StepComponents/pcr/xfzzylxg.vue';//PCR-吸附柱转移(离心管) import xt from './StepComponents/pcr/xt.vue';//PCR-洗脱 import ecxt from './StepComponents/pcr/ecxt.vue';//PCR-二次洗脱 +import lx_pcr from './StepComponents/pcr/lx.vue';//PCR-离心 //PCR分析核酸提取浓度测定表 @@ -491,6 +492,7 @@ export default { xfzzylxg, xt, ecxt, + lx_pcr, //PCR分析核酸提取浓度测定表 ndcd, @@ -726,6 +728,7 @@ export default { 'xfzzylxg':'xfzzylxg', 'xt':'xt', 'ecxt':'ecxt', + 'lx_pcr':'lx_pcr', //PCR分析核酸提取浓度测定表 'ndcd':'ndcd', diff --git a/src/components/Template/StepComponents/pcr/lx.vue b/src/components/Template/StepComponents/pcr/lx.vue new file mode 100644 index 0000000..5196f88 --- /dev/null +++ b/src/components/Template/StepComponents/pcr/lx.vue @@ -0,0 +1,186 @@ + + + + + + \ No newline at end of file diff --git a/src/components/Template/StepComponents/ry/jd.vue b/src/components/Template/StepComponents/ry/jd.vue index 906c652..f4aad70 100644 --- a/src/components/Template/StepComponents/ry/jd.vue +++ b/src/components/Template/StepComponents/ry/jd.vue @@ -23,7 +23,10 @@ export default { }, methods: { select(data) { - console.log(data, "select") + const {value,key} = data; + if(key==='sjccwz'){ + this.updateWcData("sjwd",value); + } } }, computed: { @@ -36,8 +39,8 @@ export default { type: "text", }, ccwz: { - type: "select", - options: this.getDictOptions("business_ccwz"), + type: "input", + // options: this.getDictOptions("business_ccwz"), fillType: "preFill", otherCode: "ccwzOther", }, @@ -149,8 +152,8 @@ export default { type: "text", }, ccwz: { - type: "select", - options: this.getDictOptions("business_ccwz"), + type: "input", + // options: this.getDictOptions("business_ccwz"), fillType: "preFill", otherCode: "ccwzOther", }, diff --git a/src/components/Template/StepComponents/xb/bpqr.vue b/src/components/Template/StepComponents/xb/bpqr.vue index d874c15..4785a9e 100644 --- a/src/components/Template/StepComponents/xb/bpqr.vue +++ b/src/components/Template/StepComponents/xb/bpqr.vue @@ -1,6 +1,6 @@ \ No newline at end of file From 282d4e87400dbca7e5f2764d67636c18525501dc Mon Sep 17 00:00:00 2001 From: luojie <125330818@qq.com> Date: Wed, 25 Mar 2026 20:17:37 +0800 Subject: [PATCH 16/18] =?UTF-8?q?feat:[=E6=A8=A1=E6=9D=BF=E7=AE=A1?= =?UTF-8?q?=E7=90=86][=E5=A4=84=E7=90=86=E5=AF=86=E7=A0=81=E8=BE=93?= =?UTF-8?q?=E5=85=A5=E6=A1=86=E5=A4=8D=E5=88=B6=E5=89=AA=E5=88=87=E9=97=AE?= =?UTF-8?q?=E9=A2=98]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/business/comps/common/sign.vue | 4 ++-- src/views/business/comps/template/dialog/EditSign.vue | 2 +- src/views/business/form/drug/comp/sign.vue | 2 +- src/views/business/form/nonTrial/comp/sign.vue | 2 +- src/views/business/form/nonTrial/comp/syff/Xz.vue | 4 ++-- src/views/business/form/nonTrial/comp/syff/Yd.vue | 4 ++-- src/views/business/resource/gsp/comps/ffjl/Gd.vue | 4 ++-- src/views/business/resource/gsp/comps/ffjl/Jd.vue | 2 +- src/views/business/resource/gsp/comps/ffjl/Jq.vue | 2 +- src/views/business/resource/gsp/comps/ffjl/Js.vue | 4 ++-- src/views/business/resource/gsp/comps/ffjl/Jy.vue | 4 ++-- src/views/business/resource/gsp/comps/ffjl/Sd.vue | 4 ++-- src/views/business/resource/gsp/comps/gsp/Bj.vue | 4 ++-- src/views/business/resource/gsp/comps/gsp/Cc.vue | 6 +++--- src/views/business/resource/gsp/comps/gsp/Cz.vue | 4 ++-- src/views/business/resource/gsp/comps/gsp/CzBatch.vue | 4 ++-- src/views/business/resource/gsp/comps/gsp/Ff.vue | 10 +++++----- src/views/business/resource/gsp/comps/gsp/Gd.vue | 4 ++-- src/views/business/resource/gsp/comps/gsp/Gh.vue | 10 +++++----- src/views/business/resource/gsp/comps/gsp/Jd.vue | 4 ++-- src/views/business/resource/gsp/comps/gsp/Js.vue | 4 ++-- src/views/business/resource/gsp/comps/gsp/Jy.vue | 4 ++-- src/views/business/resource/gsp/comps/gsp/Sd.vue | 4 ++-- src/views/business/resource/gsp/comps/gsp/Shbj.vue | 4 ++-- src/views/business/resource/gsp/comps/gsp/Shxgkc.vue | 4 ++-- src/views/business/resource/gsp/comps/gsp/Xgkc.vue | 4 ++-- src/views/business/resource/gsp/comps/gsp/Xz.vue | 4 ++-- src/views/business/resource/gsp/comps/gsp/Ysff.vue | 4 ++-- src/views/business/resource/gsp/comps/rkjl/Bj.vue | 2 +- src/views/business/resource/gsp/comps/rkjl/Gd.vue | 4 ++-- src/views/business/resource/gsp/comps/rkjl/Jd.vue | 4 ++-- src/views/business/resource/gsp/comps/rkjl/Js.vue | 4 ++-- src/views/business/resource/gsp/comps/rkjl/Jy.vue | 4 ++-- .../business/resource/gsp/comps/rkjl/RkjlImport.vue | 2 +- src/views/business/resource/gsp/comps/rkjl/Sd.vue | 4 ++-- src/views/business/resource/gsp/comps/rkjl/Xz.vue | 4 ++-- src/views/business/resource/gyzj/comps/ffjl/Gd.vue | 4 ++-- src/views/business/resource/gyzj/comps/ffjl/Jd.vue | 4 ++-- src/views/business/resource/gyzj/comps/ffjl/Jq.vue | 4 ++-- src/views/business/resource/gyzj/comps/ffjl/Js.vue | 4 ++-- src/views/business/resource/gyzj/comps/ffjl/Jy.vue | 4 ++-- src/views/business/resource/gyzj/comps/ffjl/Sd.vue | 4 ++-- src/views/business/resource/gyzj/comps/gyzj/Bj.vue | 4 ++-- src/views/business/resource/gyzj/comps/gyzj/Cc.vue | 6 +++--- src/views/business/resource/gyzj/comps/gyzj/Czrq.vue | 8 ++++---- src/views/business/resource/gyzj/comps/gyzj/Czyj.vue | 8 ++++---- src/views/business/resource/gyzj/comps/gyzj/Ff.vue | 10 +++++----- src/views/business/resource/gyzj/comps/gyzj/Gd.vue | 4 ++-- src/views/business/resource/gyzj/comps/gyzj/Gh.vue | 6 +++--- src/views/business/resource/gyzj/comps/gyzj/Jd.vue | 4 ++-- src/views/business/resource/gyzj/comps/gyzj/Js.vue | 4 ++-- src/views/business/resource/gyzj/comps/gyzj/Jy.vue | 4 ++-- src/views/business/resource/gyzj/comps/gyzj/Qc.vue | 6 +++--- src/views/business/resource/gyzj/comps/gyzj/Rk.vue | 6 +++--- src/views/business/resource/gyzj/comps/gyzj/Sd.vue | 4 ++-- src/views/business/resource/gyzj/comps/gyzj/Shbj.vue | 4 ++-- src/views/business/resource/gyzj/comps/gyzj/Shxgkc.vue | 4 ++-- src/views/business/resource/gyzj/comps/gyzj/Sqgh.vue | 6 +++--- src/views/business/resource/gyzj/comps/gyzj/Sqrk.vue | 6 +++--- src/views/business/resource/gyzj/comps/gyzj/Xgkc.vue | 4 ++-- src/views/business/resource/gyzj/comps/gyzj/Ysff.vue | 8 ++++---- src/views/business/resource/mjy/comps/ffjl/Gd.vue | 4 ++-- src/views/business/resource/mjy/comps/ffjl/Jd.vue | 4 ++-- src/views/business/resource/mjy/comps/ffjl/Jq.vue | 4 ++-- src/views/business/resource/mjy/comps/ffjl/Js.vue | 4 ++-- src/views/business/resource/mjy/comps/ffjl/Jy.vue | 4 ++-- src/views/business/resource/mjy/comps/ffjl/Sd.vue | 4 ++-- src/views/business/resource/mjy/comps/mjy/Bj.vue | 4 ++-- src/views/business/resource/mjy/comps/mjy/Cc.vue | 6 +++--- src/views/business/resource/mjy/comps/mjy/Czrq.vue | 8 ++++---- src/views/business/resource/mjy/comps/mjy/Czyj.vue | 8 ++++---- src/views/business/resource/mjy/comps/mjy/Ff.vue | 10 +++++----- src/views/business/resource/mjy/comps/mjy/Gd.vue | 4 ++-- src/views/business/resource/mjy/comps/mjy/Gh.vue | 10 +++++----- src/views/business/resource/mjy/comps/mjy/Jd.vue | 4 ++-- src/views/business/resource/mjy/comps/mjy/Js.vue | 4 ++-- src/views/business/resource/mjy/comps/mjy/Jy.vue | 4 ++-- src/views/business/resource/mjy/comps/mjy/Qc.vue | 6 +++--- src/views/business/resource/mjy/comps/mjy/Rk.vue | 10 +++++----- src/views/business/resource/mjy/comps/mjy/Sd.vue | 4 ++-- src/views/business/resource/mjy/comps/mjy/Shbj.vue | 4 ++-- src/views/business/resource/mjy/comps/mjy/Shxgkc.vue | 4 ++-- src/views/business/resource/mjy/comps/mjy/Xgkc.vue | 4 ++-- src/views/business/resource/mjy/comps/mjy/Ysff.vue | 8 ++++---- src/views/business/resource/sj/comps/Bj.vue | 2 +- src/views/business/resource/sj/comps/Cz.vue | 2 +- src/views/business/resource/sj/comps/CzBatch.vue | 2 +- src/views/business/resource/sj/comps/Gd.vue | 2 +- src/views/business/resource/sj/comps/Jd.vue | 2 +- src/views/business/resource/sj/comps/Js.vue | 2 +- src/views/business/resource/sj/comps/Jy.vue | 2 +- src/views/business/resource/sj/comps/Sd.vue | 2 +- src/views/business/resource/sj/comps/Xgkc.vue | 2 +- src/views/business/resource/yq/list.vue | 2 +- src/views/business/resource/zcg/comps/Ysff.vue | 8 ++++---- src/views/business/resource/zcg/comps/Ysgh.vue | 8 ++++---- src/views/business/storageLocation/comps/Bj.vue | 2 +- src/views/business/storageLocation/comps/Xz.vue | 2 +- src/views/business/study/comp/jhbd/Bj.vue | 4 ++-- src/views/business/study/comp/jhbd/Fh.vue | 4 ++-- src/views/business/study/comp/jhbd/Ghgsr.vue | 4 ++-- src/views/business/study/comp/jhbd/Sy.vue | 4 ++-- src/views/business/study/comp/jhbd/Xq.vue | 2 +- src/views/business/study/comp/sign.vue | 2 +- src/views/business/study/comp/sqbd/Bj.vue | 4 ++-- src/views/business/study/comp/sqbd/Fh.vue | 4 ++-- src/views/business/study/comp/sqbd/Fz.vue | 4 ++-- src/views/business/study/comp/sqbd/Ghgsr.vue | 4 ++-- src/views/business/study/comp/sqbd/Jq.vue | 4 ++-- src/views/business/study/comp/sqbd/Qrfz.vue | 4 ++-- src/views/business/study/comp/sqbd/Sh.vue | 4 ++-- src/views/business/study/comp/sqbd/Sy.vue | 4 ++-- src/views/business/study/comp/sqbd/Xq.vue | 2 +- src/views/business/study/comp/syff/Xz.vue | 4 ++-- src/views/business/study/comp/syff/Yd.vue | 4 ++-- src/views/business/study/comp/syj/Bj.vue | 4 ++-- src/views/business/study/comp/syj/Js.vue | 2 +- src/views/business/study/comp/syj/Xz.vue | 4 ++-- src/views/business/study/comp/tbbd/Bj.vue | 16 ++++++++-------- src/views/business/study/comp/tbbd/Blxjsh.vue | 4 ++-- src/views/business/study/comp/tbbd/Fh.vue | 4 ++-- src/views/business/study/comp/tbbd/Fz.vue | 4 ++-- src/views/business/study/comp/tbbd/Gc.vue | 4 ++-- src/views/business/study/comp/tbbd/Ghgsr.vue | 4 ++-- src/views/business/study/comp/tbbd/Jq.vue | 4 ++-- src/views/business/study/comp/tbbd/Qrfz.vue | 4 ++-- src/views/business/study/comp/tbbd/Sy.vue | 4 ++-- src/views/business/study/comp/tbbd/Xq.vue | 2 +- src/views/business/study/comp/ytbd/Bj.vue | 4 ++-- src/views/business/study/comp/ytbd/Gb.vue | 4 ++-- src/views/business/study/comp/ytbd/Qrgb.vue | 4 ++-- src/views/business/study/comp/ytbd/Sh.vue | 8 ++++---- src/views/business/study/comp/ytbd/Xq.vue | 4 ++-- src/views/login.vue | 2 +- src/views/register.vue | 4 ++-- src/views/system/user/index.vue | 2 +- src/views/system/user/profile/resetPwd.vue | 6 +++--- 137 files changed, 300 insertions(+), 300 deletions(-) diff --git a/src/views/business/comps/common/sign.vue b/src/views/business/comps/common/sign.vue index 6e3a035..c9450ef 100644 --- a/src/views/business/comps/common/sign.vue +++ b/src/views/business/comps/common/sign.vue @@ -4,7 +4,7 @@ -
+
@@ -36,7 +36,7 @@
-
diff --git a/src/views/business/comps/template/dialog/EditSign.vue b/src/views/business/comps/template/dialog/EditSign.vue index 0d5b4a7..074d4a3 100644 --- a/src/views/business/comps/template/dialog/EditSign.vue +++ b/src/views/business/comps/template/dialog/EditSign.vue @@ -38,7 +38,7 @@
- +
diff --git a/src/views/business/form/drug/comp/sign.vue b/src/views/business/form/drug/comp/sign.vue index 885ef1e..1de9ff4 100644 --- a/src/views/business/form/drug/comp/sign.vue +++ b/src/views/business/form/drug/comp/sign.vue @@ -45,7 +45,7 @@
- +
diff --git a/src/views/business/form/nonTrial/comp/sign.vue b/src/views/business/form/nonTrial/comp/sign.vue index 885ef1e..1de9ff4 100644 --- a/src/views/business/form/nonTrial/comp/sign.vue +++ b/src/views/business/form/nonTrial/comp/sign.vue @@ -45,7 +45,7 @@
- +
diff --git a/src/views/business/form/nonTrial/comp/syff/Xz.vue b/src/views/business/form/nonTrial/comp/syff/Xz.vue index 3f47ceb..4660ac3 100644 --- a/src/views/business/form/nonTrial/comp/syff/Xz.vue +++ b/src/views/business/form/nonTrial/comp/syff/Xz.vue @@ -4,7 +4,7 @@ G