-
-
-
-
@@ -69,6 +69,7 @@ import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue';
import { EventBus } from "@/utils/eventBus";
import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
+import { addTj } from "@/utils/calUnitTools";
export default {
name: "JZXY",
@@ -116,7 +117,7 @@ export default {
}
]
},
-
+
baseInfoFormConfig() {
return [
{
@@ -140,7 +141,7 @@ export default {
},
versionNum: {
label: 'template.common.versionNumber',
- type: "input",
+ type: "inputNumber",
fillType: "actFill",
prepend: "V",
maxlength: 50
@@ -242,7 +243,7 @@ export default {
{ label: 'template.common.reagentCode', prop: "bh" },//编号
{ label: 'template.common.reagentNo', prop: "ph" },//批号 试剂，供试品才有
{ label: 'template.common.concentration', prop: "nd" },//浓度
- { label: 'template.common.source', prop: "source" },//来源
+ { label: 'template.common.source', prop: "source" },//来源
{ label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期
],
yqsColumns: [
@@ -328,6 +329,9 @@ export default {
for(let i=0;i {
@@ -405,13 +413,17 @@ export default {
},
configComplete(val){
console.log("完成配置数据："+JSON.stringify(val))
+ const { total, unit } = addTj([val.rowData.sjjzxql, val.rowData.sjryxql], [val.headerSelectFields.sjryxqlUnit, val.headerSelectFields.sjjzxqlUnit])
let postData = {
mc:null,
+ studyId:this.formData.studyId,
+ studyFormId:this.formData.id,
+ deptId: this.formData.studySubjectId,
bh:val.rowData.bh+val.rowData.bhCode,
nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit,
- kc: val.rowData.sjjzxql+val.rowData.sjryxql,//todo 单位不一致-计算
- kcdw: val.headerSelectFields.sjryxqlUnit || val.headerSelectFields.sjjzxqlUnit,//todo 单位不一致-计算-按最小算
+ kc: total,
+ kcdw: unit,
}
console.log("完成配置提交数据："+JSON.stringify(postData))
sj_configurationCompleted(postData).then(() => {
@@ -420,7 +432,7 @@ export default {
.finally(() => {
})
},
-
+
}
};
diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/QXWDX.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/QXWDX.vue
index ac85703..ec37ecb 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/QXWDX.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/QXWDX.vue
@@ -19,19 +19,19 @@
-
-
@@ -71,6 +71,7 @@ import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue';
import { EventBus } from "@/utils/eventBus";
import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
+import { addTj } from "@/utils/calUnitTools";
export default {
name: "QXWDX",
@@ -118,7 +119,7 @@ export default {
}
]
},
-
+
baseInfoFormConfig() {
return [
{
@@ -142,7 +143,7 @@ export default {
},
versionNum: {
label: 'template.common.versionNumber',
- type: "input",
+ type: "inputNumber",
fillType: "actFill",
prepend: "V",
maxlength: 50
@@ -244,7 +245,7 @@ export default {
{ label: 'template.common.reagentCode', prop: "bh" },//编号
{ label: 'template.common.reagentNo', prop: "ph" },//批号 试剂，供试品才有
{ label: 'template.common.concentration', prop: "nd" },//浓度
- { label: 'template.common.source', prop: "source" },//来源
+ { label: 'template.common.source', prop: "source" },//来源
{ label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期
],
yqsColumns: [
@@ -340,6 +341,9 @@ export default {
for(let i=0;i {
@@ -417,13 +425,17 @@ export default {
},
configComplete(val){
console.log("完成配置数据："+JSON.stringify(val))
+ const { total, unit } = addTj([val.rowData.sjjzxql, val.rowData.sjryxql], [val.headerSelectFields.sjryxqlUnit, val.headerSelectFields.sjjzxqlUnit])
let postData = {
mc:null,
+ studyId:this.formData.studyId,
+ studyFormId:this.formData.id,
+ deptId: this.formData.studySubjectId,
bh:val.rowData.bh+val.rowData.bhCode,
nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit,
- kc: val.rowData.sjjzxql+val.rowData.sjryxql,//todo 单位不一致-计算
- kcdw: val.headerSelectFields.sjryxqlUnit || val.headerSelectFields.sjjzxqlUnit,//todo 单位不一致-计算-按最小算
+ kc: total,
+ kcdw: unit,
}
console.log("完成配置提交数据："+JSON.stringify(postData))
sj_configurationCompleted(postData).then(() => {
@@ -432,7 +444,7 @@ export default {
.finally(() => {
})
},
-
+
}
};
diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/RXJZXY.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/RXJZXY.vue
index 4b724f6..ee48948 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/RXJZXY.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/RXJZXY.vue
@@ -19,19 +19,19 @@
-
-
@@ -71,6 +71,7 @@ import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue';
import { EventBus } from "@/utils/eventBus";
import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
+import { addTj } from "@/utils/calUnitTools";
export default {
name: "RXJZXY",
@@ -118,7 +119,7 @@ export default {
}
]
},
-
+
baseInfoFormConfig() {
return [
{
@@ -142,7 +143,7 @@ export default {
},
versionNum: {
label: 'template.common.versionNumber',
- type: "input",
+ type: "inputNumber",
fillType: "actFill",
prepend: "V",
maxlength: 50
@@ -244,7 +245,7 @@ export default {
{ label: 'template.common.reagentCode', prop: "bh" },//编号
{ label: 'template.common.reagentNo', prop: "ph" },//批号 试剂，供试品才有
{ label: 'template.common.concentration', prop: "nd" },//浓度
- { label: 'template.common.source', prop: "source" },//来源
+ { label: 'template.common.source', prop: "source" },//来源
{ label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期
],
yqsColumns: [
@@ -340,6 +341,9 @@ export default {
for(let i=0;i {
@@ -417,13 +425,17 @@ export default {
},
configComplete(val){
console.log("完成配置数据："+JSON.stringify(val))
+ const { total, unit } = addTj([val.rowData.sjjzxql, val.rowData.sjryxql], [val.headerSelectFields.sjryxqlUnit, val.headerSelectFields.sjjzxqlUnit])
let postData = {
mc:null,
+ studyId:this.formData.studyId,
+ studyFormId:this.formData.id,
+ deptId: this.formData.studySubjectId,
bh:val.rowData.bh+val.rowData.bhCode,
nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit,
- kc: val.rowData.sjjzxql+val.rowData.sjryxql,//todo 单位不一致-计算
- kcdw: val.headerSelectFields.sjryxqlUnit || val.headerSelectFields.sjjzxqlUnit,//todo 单位不一致-计算-按最小算
+ kc: total,
+ kcdw: unit,
}
console.log("完成配置提交数据："+JSON.stringify(postData))
sj_configurationCompleted(postData).then(() => {
@@ -432,7 +444,7 @@ export default {
.finally(() => {
})
},
-
+
}
};
diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/Recovery.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/Recovery.vue
index b0e020b..5dedc47 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/Recovery.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/Recovery.vue
@@ -2,7 +2,7 @@
- 
{{ formData.templateMc ||
+ {{ formData.bdmc ||
$t('template.sp.sp009.title') }}
{{ formData.templateMc ||
+ {{ formData.bdmc ||
$t('template.sp.sp009.title') }}
@@ -78,6 +78,7 @@ import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue';
import { EventBus } from "@/utils/eventBus";
import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
+import { addTj } from "@/utils/calUnitTools";
export default {
name: "SWYPFXRYPZB",
components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable, TableOpertaion, SelectReagentDialog },
@@ -147,7 +148,7 @@ export default {
},
versionNum: {
label: 'template.common.versionNumber',
- type: "input",
+ type: "inputNumber",
fillType: "actFill",
prepend: "V",
maxlength: 50
@@ -380,7 +381,6 @@ export default {
resourceList: null,
}
setTimeout(() => {
- debugger
EventBus.$emit('onModifyRecord', params,)
}, 10);
}
@@ -428,6 +428,9 @@ export default {
for(let i=0;i {
@@ -529,13 +537,25 @@ export default {
},
configComplete(val){
console.log("完成配置数据："+JSON.stringify(val))
+ let amount = {
+ total:0,
+ unit:''
+ }
+ if(val.rowData.sjgzyxql===undefined && val.headerSelectFields.sjgzyxqlUnit === undefined){
+ amount = addTj([val.rowData.sjjzxql, val.rowData.sjryxql], [val.headerSelectFields.sjjzxqlUnit, val.headerSelectFields.sjryxqlUnit])
+ }else{
+ amount = addTj([val.rowData.sjryxql, val.rowData.sjgzyxql,val.rowData.sjxsyxql], [val.headerSelectFields.sjryxqlUnit, val.headerSelectFields.sjgzyxqlUnit,val.headerSelectFields.sjxsyxqlUnit])
+ }
let postData = {
mc:null,
+ studyId:this.formData.studyId,
+ studyFormId:this.formData.id,
+ deptId: this.formData.studySubjectId,
bh:val.rowData.bh+val.rowData.bhCode,
nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit,
- kc: val.rowData.sjjzxql+val.rowData.sjryxql,//todo 单位不一致-计算
- kcdw: val.headerSelectFields.sjryxqlUnit || val.headerSelectFields.sjjzxqlUnit,//todo 单位不一致-计算-按最小算
+ kc: amount.total,
+ kcdw: amount.unit
}
console.log("完成配置提交数据："+JSON.stringify(postData))
sj_configurationCompleted(postData).then(() => {
diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XSKKX.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XSKKX.vue
index 6a61988..ee52c28 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XSKKX.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XSKKX.vue
@@ -19,19 +19,19 @@
-
-
@@ -71,6 +71,7 @@ import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue';
import { EventBus } from "@/utils/eventBus";
import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
+import { addTj } from "@/utils/calUnitTools";
export default {
name: "XSKKX",
@@ -118,7 +119,7 @@ export default {
}
]
},
-
+
baseInfoFormConfig() {
return [
{
@@ -142,7 +143,7 @@ export default {
},
versionNum: {
label: 'template.common.versionNumber',
- type: "input",
+ type: "inputNumber",
fillType: "actFill",
prepend: "V",
maxlength: 50
@@ -244,7 +245,7 @@ export default {
{ label: 'template.common.reagentCode', prop: "bh" },//编号
{ label: 'template.common.reagentNo', prop: "ph" },//批号 试剂，供试品才有
{ label: 'template.common.concentration', prop: "nd" },//浓度
- { label: 'template.common.source', prop: "source" },//来源
+ { label: 'template.common.source', prop: "source" },//来源
{ label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期
],
yqsColumns: [
@@ -313,7 +314,7 @@ export default {
bhCode: result.data[i],
})
}
-
+
const params = {
type: "fieldChanged",
newRecord: null,
@@ -340,6 +341,9 @@ export default {
for(let i=0;i {
@@ -418,13 +426,17 @@ export default {
},
configComplete(val){
console.log("完成配置数据："+JSON.stringify(val))
+ const { total, unit } = addTj([val.rowData.sjjzxql, val.rowData.sjryxql], [val.headerSelectFields.sjryxqlUnit, val.headerSelectFields.sjjzxqlUnit])
let postData = {
mc:null,
+ studyId:this.formData.studyId,
+ studyFormId:this.formData.id,
+ deptId: this.formData.studySubjectId,
bh:val.rowData.bh+val.rowData.bhCode,
nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit,
- kc: val.rowData.sjjzxql+val.rowData.sjryxql,//todo 单位不一致-计算
- kcdw: val.headerSelectFields.sjryxqlUnit || val.headerSelectFields.sjjzxqlUnit,//todo 单位不一致-计算-按最小算
+ kc: total,
+ kcdw: unit,
}
console.log("完成配置提交数据："+JSON.stringify(postData))
sj_configurationCompleted(postData).then(() => {
@@ -433,7 +445,7 @@ export default {
.finally(() => {
})
},
-
+
}
};
diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XZXHTYX.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XZXHTYX.vue
index d875bc3..c1c9b68 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XZXHTYX.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XZXHTYX.vue
@@ -19,19 +19,19 @@
-
-
@@ -71,6 +71,7 @@ import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue';
import { EventBus } from "@/utils/eventBus";
import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
+import { addTj } from "@/utils/calUnitTools";
export default {
name: "XZXHTYX",
@@ -118,7 +119,7 @@ export default {
}
]
},
-
+
baseInfoFormConfig() {
return [
{
@@ -142,7 +143,7 @@ export default {
},
versionNum: {
label: 'template.common.versionNumber',
- type: "input",
+ type: "inputNumber",
fillType: "actFill",
prepend: "V",
maxlength: 50
@@ -244,7 +245,7 @@ export default {
{ label: 'template.common.reagentCode', prop: "bh" },//编号
{ label: 'template.common.reagentNo', prop: "ph" },//批号 试剂，供试品才有
{ label: 'template.common.concentration', prop: "nd" },//浓度
- { label: 'template.common.source', prop: "source" },//来源
+ { label: 'template.common.source', prop: "source" },//来源
{ label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期
],
yqsColumns: [
@@ -340,6 +341,9 @@ export default {
for(let i=0;i {
@@ -417,13 +425,17 @@ export default {
},
configComplete(val){
console.log("完成配置数据："+JSON.stringify(val))
+ const { total, unit } = addTj([val.rowData.sjjzxql, val.rowData.sjryxql], [val.headerSelectFields.sjryxqlUnit, val.headerSelectFields.sjjzxqlUnit])
let postData = {
mc:null,
+ studyId:this.formData.studyId,
+ studyFormId:this.formData.id,
+ deptId: this.formData.studySubjectId,
bh:val.rowData.bh+val.rowData.bhCode,
nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit,
- kc: val.rowData.sjjzxql+val.rowData.sjryxql,//todo 单位不一致-计算
- kcdw: val.headerSelectFields.sjryxqlUnit || val.headerSelectFields.sjjzxqlUnit,//todo 单位不一致-计算-按最小算
+ kc: total,
+ kcdw: unit,
}
console.log("完成配置提交数据："+JSON.stringify(postData))
sj_configurationCompleted(postData).then(() => {
@@ -432,7 +444,7 @@ export default {
.finally(() => {
})
},
-
+
}
};
diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZDYBS.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZDYBS.vue
index eb18992..2c67d6f 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZDYBS.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZDYBS.vue
@@ -19,19 +19,19 @@
-
-
@@ -71,6 +71,7 @@ import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue';
import { EventBus } from "@/utils/eventBus";
import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
+import { addTj } from "@/utils/calUnitTools";
export default {
name: "ZDYBS",
@@ -118,7 +119,7 @@ export default {
}
]
},
-
+
baseInfoFormConfig() {
return [
{
@@ -142,7 +143,7 @@ export default {
},
versionNum: {
label: 'template.common.versionNumber',
- type: "input",
+ type: "inputNumber",
fillType: "actFill",
prepend: "V",
maxlength: 50
@@ -244,7 +245,7 @@ export default {
{ label: 'template.common.reagentCode', prop: "bh" },//编号
{ label: 'template.common.reagentNo', prop: "ph" },//批号 试剂，供试品才有
{ label: 'template.common.concentration', prop: "nd" },//浓度
- { label: 'template.common.source', prop: "source" },//来源
+ { label: 'template.common.source', prop: "source" },//来源
{ label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期
],
yqsColumns: [
@@ -340,6 +341,9 @@ export default {
for(let i=0;i {
@@ -417,13 +425,17 @@ export default {
},
configComplete(val){
console.log("完成配置数据："+JSON.stringify(val))
+ const { total, unit } = addTj([val.rowData.sjjzxql, val.rowData.sjryxql], [val.headerSelectFields.sjryxqlUnit, val.headerSelectFields.sjjzxqlUnit])
let postData = {
mc:null,
+ studyId:this.formData.studyId,
+ studyFormId:this.formData.id,
+ deptId: this.formData.studySubjectId,
bh:val.rowData.bh+val.rowData.bhCode,
nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit,
- kc: val.rowData.sjjzxql+val.rowData.sjryxql,//todo 单位不一致-计算
- kcdw: val.headerSelectFields.sjryxqlUnit || val.headerSelectFields.sjjzxqlUnit,//todo 单位不一致-计算-按最小算
+ kc: total,
+ kcdw: unit,
}
console.log("完成配置提交数据："+JSON.stringify(postData))
sj_configurationCompleted(postData).then(() => {
@@ -432,7 +444,7 @@ export default {
.finally(() => {
})
},
-
+
}
};
diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZQDYJMD.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZQDYJMD.vue
index 57ac242..e647de5 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZQDYJMD.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZQDYJMD.vue
@@ -19,19 +19,19 @@
-
-
@@ -71,6 +71,7 @@ import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue';
import { EventBus } from "@/utils/eventBus";
import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
+import { addTj } from "@/utils/calUnitTools";
export default {
name: "ZQDYJMD",
@@ -118,7 +119,7 @@ export default {
}
]
},
-
+
baseInfoFormConfig() {
return [
{
@@ -142,7 +143,7 @@ export default {
},
versionNum: {
label: 'template.common.versionNumber',
- type: "input",
+ type: "inputNumber",
fillType: "actFill",
prepend: "V",
maxlength: 50
@@ -244,7 +245,7 @@ export default {
{ label: 'template.common.reagentCode', prop: "bh" },//编号
{ label: 'template.common.reagentNo', prop: "ph" },//批号 试剂，供试品才有
{ label: 'template.common.concentration', prop: "nd" },//浓度
- { label: 'template.common.source', prop: "source" },//来源
+ { label: 'template.common.source', prop: "source" },//来源
{ label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期
],
yqsColumns: [
@@ -340,6 +341,9 @@ export default {
for(let i=0;i {
@@ -417,13 +425,17 @@ export default {
},
configComplete(val){
console.log("完成配置数据："+JSON.stringify(val))
+ const { total, unit } = addTj([val.rowData.sjjzxql, val.rowData.sjryxql], [val.headerSelectFields.sjryxqlUnit, val.headerSelectFields.sjjzxqlUnit])
let postData = {
mc:null,
+ studyId:this.formData.studyId,
+ studyFormId:this.formData.id,
+ deptId: this.formData.studySubjectId,
bh:val.rowData.bh+val.rowData.bhCode,
nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit,
- kc: val.rowData.sjjzxql+val.rowData.sjryxql,//todo 单位不一致-计算
- kcdw: val.headerSelectFields.sjryxqlUnit || val.headerSelectFields.sjjzxqlUnit,//todo 单位不一致-计算-按最小算
+ kc: total,
+ kcdw: unit,
}
console.log("完成配置提交数据："+JSON.stringify(postData))
sj_configurationCompleted(postData).then(() => {
@@ -432,7 +444,7 @@ export default {
.finally(() => {
})
},
-
+
}
};
diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue
index 1dacb67..59b68c6 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue
@@ -19,19 +19,19 @@
-
-
@@ -118,7 +118,7 @@ export default {
}
]
},
-
+
baseInfoFormConfig() {
return [
{
@@ -245,7 +245,7 @@ export default {
{ label: 'template.common.reagentCode', prop: "bh" },//编号
{ label: 'template.common.reagentNo', prop: "ph" },//批号 试剂，供试品才有
{ label: 'template.common.concentration', prop: "nd" },//浓度
- { label: 'template.common.source', prop: "source" },//来源
+ { label: 'template.common.source', prop: "source" },//来源
{ label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期
],
yqsColumns: [
@@ -359,9 +359,9 @@ export default {
})
}
}
-
+
//使用的试剂
- this.resource=tmpResource
+ this.resourceTmp=tmpResource
return content;
},
async onSave() {
@@ -391,6 +391,7 @@ export default {
let postData = {
studyId:this.formData.studyId,
studyFormId:this.formData.id,
+ deptId: this.formData.studySubjectId,
bh:val.fzsj.mybh,
nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit,
@@ -408,6 +409,9 @@ export default {
console.log("开始配置数据："+JSON.stringify(val))
let postData = {
bh:val.rowData.bh+val.rowData.bhCode,
+ studyId:this.formData.studyId,
+ studyFormId:this.formData.id,
+ deptId: this.formData.studySubjectId,
}
console.log("开始配置提交数据："+JSON.stringify(postData))
sj_startConfiguration(postData).then(() => {
@@ -420,6 +424,9 @@ export default {
console.log("完成配置数据："+JSON.stringify(val))
let postData = {
mc:null,
+ studyId:this.formData.studyId,
+ studyFormId:this.formData.id,
+ deptId: this.formData.studySubjectId,
bh:val.rowData.bh+val.rowData.bhCode,
nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit,
@@ -433,7 +440,7 @@ export default {
.finally(() => {
})
},
-
+
}
};
diff --git a/src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue b/src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue
index 63cc694..c7a5208 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue
@@ -303,7 +303,7 @@ export default {
yxzqdw:content.effectivePeriodUnit,
})
//使用的试剂
- this.resource=tmpResource
+ this.resourceTmp=tmpResource
return content;
},
diff --git a/src/views/business/comps/template/comps/sp/SWYPNBGZYZBB.vue b/src/views/business/comps/template/comps/sp/SWYPNBGZYZBB.vue
index f3f3d53..cd5e1ef 100644
--- a/src/views/business/comps/template/comps/sp/SWYPNBGZYZBB.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPNBGZYZBB.vue
@@ -2,17 +2,17 @@
- {{ getTemplateName() }}
+ {{ formData.bdmc || getTemplateName()
+ }}
@@ -378,7 +378,7 @@ export default {
// 表格失去焦点事件
onHandleTableBlur(type, configIndex, e) {
- const { colKey = "", item,rowIndex } = e;
+ const { colKey = "", item, rowIndex } = e;
if (colKey === "targetStartSolutionConcentration" || colKey === "targetSolutionVolume" || colKey === "targetSolutionConcentration" || colKey === "targetStartSolutionVolumePrecision" || colKey === "targetDiluentVolumePrecision") {
if (type === "ladder") {
const volume = this.$refs[`ladderStepFormPackageRef_${configIndex}`][0]?.getFormDataByKey("targetStartSolution") || 0;
@@ -395,17 +395,21 @@ export default {
if (type === "ladder") {
const targetAcSolution = this.$refs[`ladderStepFormPackageRef_${configIndex}`][0]?.getFormDataByKey("targetAcSolution") || 0;//获取实际起始溶液浓度
if (targetAcSolution) {
- const {actVol, actNd} = this.updateSjmbrynd(item, targetAcSolution);
- this.$refs[`ladderStepTableRef_${configIndex}`][0]?.updateDataSourceByRowIndex(rowIndex,{actSolutionVolume: actVol,
- actSolutionConcentration: actNd,});
+ const { actVol, actNd } = this.updateSjmbrynd(item, targetAcSolution);
+ this.$refs[`ladderStepTableRef_${configIndex}`][0]?.updateDataSourceByRowIndex(rowIndex, {
+ actSolutionVolume: actVol,
+ actSolutionConcentration: actNd,
+ });
}
} else if (type === "paralle") {
const targetAcSolution = item.targetAcSolution || 0;//获取实际起始溶液浓度
if (targetAcSolution) {
this.updateSjmbrynd(item, targetAcSolution);
- const {actVol, actNd} = this.updateSjmbrynd(item, targetAcSolution);
- this.$refs[`paralleStepTableRef_${configIndex}`][0]?.updateDataSourceByRowIndex(rowIndex,{actSolutionVolume: actVol,
- targetAcSolution: actNd,});
+ const { actVol, actNd } = this.updateSjmbrynd(item, targetAcSolution);
+ this.$refs[`paralleStepTableRef_${configIndex}`][0]?.updateDataSourceByRowIndex(rowIndex, {
+ actSolutionVolume: actVol,
+ targetAcSolution: actNd,
+ });
}
}
@@ -564,7 +568,106 @@ export default {
if (!validFlag) {
return false;
}
- return this.getFilledFormData();
+ let content = this.getFilledFormData();
+ //生成resource
+ let tmpResource = []
+ //平行配置
+ if (content.ladderConfigs && content.ladderConfigs.length > 0) {
+ for (let i = 0; i < content.ladderConfigs.length; i++) {
+ let ladderConfigs = content.ladderConfigs[i]
+ let stepTableFormData = ladderConfigs.stepTableFormData
+ for (let j = 0; j < stepTableFormData.length; j++) {
+ //计算实际目标溶液体积(实际起始溶液体积+实际稀释液体积)
+ const { total, unit } = addTj([stepTableFormData[j].actStartSolutionVolume, stepTableFormData[j].actDiluentVolume], [ladderConfigs.headerSelectFields.actStartSolutionVolumeUnit, ladderConfigs.headerSelectFields.actDiluentVolumeUnit])
+ tmpResource.push({
+ mc: null,
+ bh: stepTableFormData[j].targetSolutionCode + stepTableFormData[j].subTargetSolutionCode,
+ ph: null,
+ nd: stepTableFormData[j].actSolutionConcentration + ladderConfigs.headerSelectFields.actSolutionConcentrationUnit,
+ source: 'ELN配制',
+ sxrq: ladderConfigs.expireDate,
+ ndz: stepTableFormData[j].actSolutionConcentration,
+ nddw: ladderConfigs.headerSelectFields.actSolutionConcentrationUnit,
+ kc: total,
+ kcdw: unit,
+ syl: null,
+ syldw: unit,
+ yxzq: ladderConfigs.effectivePeriod,
+ yxzqdw: ladderConfigs.effectivePeriodUnit,
+ })
+ let fzsj = stepTableFormData[j].fzsj
+ if (fzsj && fzsj.fzList) {
+ for (let k = 0; k < fzsj.fzList.length; k++) {
+ tmpResource.push({
+ mc: null,
+ bh: fzsj.mybh + '-' + fzsj.fzList[k].subCode,
+ ph: null,
+ nd: stepTableFormData[j].actSolutionConcentration + ladderConfigs.headerSelectFields.actSolutionConcentrationUnit,
+ source: 'ELN配制',
+ sxrq: ladderConfigs.expireDate,
+ ndz: stepTableFormData[j].actSolutionConcentration,
+ nddw: ladderConfigs.headerSelectFields.actSolutionConcentrationUnit,
+ kc: fzsj.fzList[k].num,
+ kcdw: fzsj.dw,
+ syl: null,
+ syldw: ladderConfigs.headerSelectFields.actSolutionVolumeUnit,
+ yxzq: ladderConfigs.effectivePeriod,
+ yxzqdw: ladderConfigs.effectivePeriodUnit,
+ })
+ }
+ }
+ }
+ }
+ }
+ //阶梯配置
+ if (content.paralleConfigs && content.paralleConfigs.length > 0) {
+ for (let i = 0; i < content.paralleConfigs.length; i++) {
+ let paralleConfigs = content.paralleConfigs[i]
+ let stepTableFormData = paralleConfigs.stepTableFormData
+ for (let j = 0; j < stepTableFormData.length; j++) {
+ const { total, unit } = addTj([stepTableFormData[j].actSolutionVolume, stepTableFormData[j].actDiluentVolume], [paralleConfigs.headerSelectFields.actSolutionVolumeUnit, paralleConfigs.headerSelectFields.actDiluentVolumeUnit])
+ tmpResource.push({
+ mc: null,
+ bh: stepTableFormData[j].targetSolutionCode + stepTableFormData[j].subTargetSolutionCode,
+ ph: null,
+ nd: stepTableFormData[j].actSolutionConcentration + paralleConfigs.headerSelectFields.actSolutionConcentrationUnit,
+ source: 'ELN配制',
+ sxrq: stepTableFormData[j].targetSolutionExpirationDate,
+ ndz: stepTableFormData[j].actSolutionConcentration,
+ nddw: paralleConfigs.headerSelectFields.actSolutionConcentrationUnit,
+ kc: total,
+ kcdw: unit,
+ syl: null,
+ syldw: unit,
+ yxzq: stepTableFormData[j].targetSolutionCycle,
+ yxzqdw: stepTableFormData[j].targetSolutionCyclePrecision,
+ })
+ let fzsj = stepTableFormData[j].fzsj
+ if (fzsj && fzsj.fzList) {
+ for (let k = 0; k < fzsj.fzList.length; k++) {
+ tmpResource.push({
+ mc: null,
+ bh: fzsj.mybh + '-' + fzsj.fzList[k].subCode,
+ ph: null,
+ nd: stepTableFormData[j].actSolutionConcentration + paralleConfigs.headerSelectFields.actSolutionConcentrationUnit,
+ source: 'ELN配制',
+ sxrq: paralleConfigs.expireDate,
+ ndz: stepTableFormData[j].actSolutionConcentration,
+ nddw: paralleConfigs.headerSelectFields.actSolutionConcentrationUnit,
+ kc: fzsj.fzList[k].num,
+ kcdw: fzsj.dw,
+ syl: null,
+ syldw: paralleConfigs.headerSelectFields.actSolutionVolumeUnit,
+ yxzq: paralleConfigs.effectivePeriod,
+ yxzqdw: paralleConfigs.effectivePeriodUnit,
+ })
+ }
+ }
+ }
+ }
+ }
+ this.resourceTmp = tmpResource
+ return content;
},
async onSave() {
const formData = await this.getFormData();
diff --git a/src/views/business/comps/template/formConfig/SWYPFXFFXYPZBBTableConfig.js b/src/views/business/comps/template/formConfig/SWYPFXFFXYPZBBTableConfig.js
index 20e145e..41c453c 100644
--- a/src/views/business/comps/template/formConfig/SWYPFXFFXYPZBBTableConfig.js
+++ b/src/views/business/comps/template/formConfig/SWYPFXFFXYPZBBTableConfig.js
@@ -21,8 +21,8 @@ export const getSWYPFXFFXYPZBBTableConfig = (
bodyFillType: 'preFill',
width: 280,
myCodeFields: ['bh', 'bhOther', 'bhCode'],
- maxVolumeField: 'sjryxql', //分装的最大量字段
- maxVolumeFieldUnit: 'sjryxqlUnit' //分装的最大量单位字段
+ maxVolumeField: 'sjryxql,sjjzxql', //分装的最大量字段
+ maxVolumeFieldUnit: 'sjryxqlUnit,sjjzxqlUnit' //分装的最大量单位字段
},
{
label: 'template.sp.sp008.ysry',
@@ -123,8 +123,8 @@ export const getSWYPFXFFXYPZBBTQHSLTableConfig = ($this, selectKey) => {
bodyFillType: 'preFill',
width: 280,
myCodeFields: ['bh', 'bhCode'],
- maxVolumeField: 'sjryxql', //分装的最大量字段
- maxVolumeFieldUnit: 'sjryxqlUnit' //分装的最大量单位字段
+ maxVolumeField: 'sjryxql,sjgzyxql,sjxsyxql', //分装的最大量字段
+ maxVolumeFieldUnit: 'sjryxqlUnit,sjgzyxqlUnit,sjxsyxqlUnit' //分装的最大量单位字段
},
{
label: 'template.sp.sp008.ysry',
diff --git a/src/views/business/comps/template/formConfig/paralleAndLadderConfig.js b/src/views/business/comps/template/formConfig/paralleAndLadderConfig.js
index 7b4ba27..00e60e0 100644
--- a/src/views/business/comps/template/formConfig/paralleAndLadderConfig.js
+++ b/src/views/business/comps/template/formConfig/paralleAndLadderConfig.js
@@ -2,7 +2,7 @@
export const getLadderColumnsConfig = ($this) => {
return [
{
- label: '目标溶液编号',
+ label: 'template.sp.sp00456.mbrybh',
prop: 'targetSolutionCode',
bodyType: 'input',
bodySubType: 'span',
@@ -14,7 +14,7 @@ export const getLadderColumnsConfig = ($this) => {
maxVolumeFieldUnit: "actSolutionVolumeUnit",//分装的最大量单位字段
},
{
- label: '起始溶液编号',
+ label: 'template.sp.sp00456.qsrybh',
prop: 'startSolutionCode',
width: 280,
bodyType: 'input',
@@ -22,7 +22,7 @@ export const getLadderColumnsConfig = ($this) => {
bodyMaxlength: 10
},
{
- label: '预设起始溶液体积',
+ label: 'template.sp.sp00456.ysqsrytj',
prop: 'targetStartSolutionVolume',
width: 280,
headerSelectKey: 'targetStartSolutionVolumeUnit',
@@ -40,7 +40,7 @@ export const getLadderColumnsConfig = ($this) => {
bodySubPlaceholder: '请输入保留小数位数'
},
{
- label: '实际起始溶液体积',
+ label: 'template.sp.sp00456.sjqsrytj',
prop: 'actStartSolutionVolume',
width: 280,
headerSelectKey: 'actStartSolutionVolumeUnit',
@@ -53,7 +53,7 @@ export const getLadderColumnsConfig = ($this) => {
compareTo: 'targetStartSolutionVolume' //比较哪个字段
},
{
- label: '预设稀释液体积',
+ label: 'template.sp.sp00456.ysxsytj',
prop: 'targetDiluentVolume',
width: 280,
headerSelectKey: 'targetDiluentVolumeUnit',
@@ -72,7 +72,7 @@ export const getLadderColumnsConfig = ($this) => {
bodySubPlaceholder: '请输入保留小数位数'
},
{
- label: '实际稀释液体积',
+ label: 'template.sp.sp00456.sjxsytj',
prop: 'actDiluentVolume',
width: 280,
headerSelectKey: 'actDiluentVolumeUnit',
@@ -85,7 +85,7 @@ export const getLadderColumnsConfig = ($this) => {
compareTo: 'targetDiluentVolume', //比较哪个字段
},
{
- label: '预设目标溶液浓度',
+ label: 'template.sp.sp00456.ysmbrynd',
prop: 'targetSolutionConcentration',
width: 280,
headerSelectKey: 'targetSolutionConcentrationUnit',
@@ -96,7 +96,7 @@ export const getLadderColumnsConfig = ($this) => {
bodyMaxlength: 10
},
{
- label: '实际目标溶液浓度',
+ label: 'template.sp.sp00456.sjmbrynd',
prop: 'actSolutionConcentration',
width: 280,
headerSelectKey: 'actSolutionConcentrationUnit',
@@ -116,7 +116,7 @@ export const getLadderColumnsConfig = ($this) => {
compareTo: 'targetSolutionConcentration', //比较哪个字段
},
{
- label: '预设目标溶液体积',
+ label: 'template.sp.sp00456.ysmbrytj',
prop: 'targetSolutionVolume',
width: 280,
headerSelectKey: 'targetSolutionVolumeUnit',
@@ -127,7 +127,7 @@ export const getLadderColumnsConfig = ($this) => {
bodyMaxlength: 10
},
{
- label: '实际目标溶液体积',
+ label: 'template.sp.sp00456.sjmbrytj',
prop: 'actSolutionVolume',
width: 280,
headerSelectKey: 'actSolutionVolumeUnit',
@@ -159,7 +159,7 @@ export const getParallelColumnsConfig = ($this) => {
}
return [
{
- label: '目标溶液编号',
+ label: 'template.sp.sp00456.mbrybh',
prop: 'targetSolutionCode',
bodyType: 'select',
bodyOptions: $this.getDictOptions(o[sn]),
@@ -172,7 +172,7 @@ export const getParallelColumnsConfig = ($this) => {
width: 280
},
{
- label: '预设目标溶液浓度',
+ label: 'template.sp.sp00456.ysmbrynd',
prop: 'targetSolutionConcentration',
width: 280,
headerSelectKey: 'targetSolutionConcentrationUnit',
@@ -183,7 +183,7 @@ export const getParallelColumnsConfig = ($this) => {
bodyMaxlength: 10
},
{
- label: '实际目标溶液浓度',
+ label: 'template.sp.sp00456.sjmbrynd',
prop: 'actSolutionConcentration',
width: 280,
headerSelectKey: 'actSolutionConcentrationUnit',
@@ -202,7 +202,7 @@ export const getParallelColumnsConfig = ($this) => {
compareTo: 'targetSolutionConcentration', //比较哪个字段
},
{
- label: '预设目标溶液体积',
+ label: 'template.sp.sp00456.ysmbrytj',
prop: 'targetSolutionVolume',
width: 280,
headerSelectKey: 'targetSolutionVolumeUnit',
@@ -213,7 +213,7 @@ export const getParallelColumnsConfig = ($this) => {
bodyMaxlength: 10
},
{
- label: '实际目标溶液体积',
+ label: 'template.sp.sp00456.sjmbrytj',
prop: 'actSolutionVolume',
width: 280,
headerSelectKey: 'actSolutionVolumeUnit',
@@ -232,7 +232,7 @@ export const getParallelColumnsConfig = ($this) => {
compareTo: 'targetSolutionVolume', //比较哪个字段
},
{
- label: '目标溶液有效周期',
+ label: 'template.sp.sp00456.mbryyxzq',
prop: 'targetSolutionCycle',
width: 280,
fillType: 'preFill',
@@ -246,20 +246,20 @@ export const getParallelColumnsConfig = ($this) => {
bodyMaxlength: 10
},
{
- label: '目标溶液失效日',
+ label: 'template.sp.sp00456.mbrysxr',
prop: 'targetSolutionExpirationDate',
width: 180,
bodyType: 'span'
},
{
- label: '预设原始溶液编号',
+ label: 'template.sp.sp00456.ysysrybh',
prop: 'startSolutionCode',
width: 280,
bodyType: 'input',
bodyFillType: 'preFill'
},
{
- label: '实际原始溶液编号',
+ label: 'template.sp.sp00456.sjysrybh',
prop: 'actStartSolutionCode',
width: 280,
bodyType: 'clickable',
@@ -267,7 +267,7 @@ export const getParallelColumnsConfig = ($this) => {
compareTo: 'startSolutionCode', //比较哪个字段
},
{
- label: '预设原始溶液浓度',
+ label: 'template.sp.sp00456.ysysrynd',
prop: 'targetStartSolutionConcentration',
width: 280,
bodyType: 'inputNumber',
@@ -280,7 +280,7 @@ export const getParallelColumnsConfig = ($this) => {
showBodySub: true
},
{
- label: '实际原始溶液浓度',
+ label: 'template.sp.sp00456.sjysrynd',
prop: 'targetAcSolution',
width: 280,
bodyType: 'inputNumber',
@@ -289,7 +289,7 @@ export const getParallelColumnsConfig = ($this) => {
compareTo: 'targetStartSolutionConcentration', //比较哪个字段
},
{
- label: '预设原始溶液体积',
+ label: 'template.sp.sp00456.ysysrytj',
prop: 'targetStartSolutionVolume',
headerSelectKey: 'targetStartSolutionVolumeUnit',
fillType: 'preFill',
@@ -310,7 +310,7 @@ export const getParallelColumnsConfig = ($this) => {
},
{
- label: '实际原始溶液体积',
+ label: 'template.sp.sp00456.sjysrytj',
prop: 'actStartSolutionVolume',
headerSelectKey: 'actStartSolutionVolumeUnit',
fillType: 'preFill',
@@ -324,7 +324,7 @@ export const getParallelColumnsConfig = ($this) => {
},
{
- label: '预计稀释液体积',
+ label: 'template.sp.sp00456.yjxsytj',
prop: 'targetDiluentVolume',
headerSelectKey: 'preDiluentVolumeUnit',
fillType: 'preFill',
@@ -342,7 +342,7 @@ export const getParallelColumnsConfig = ($this) => {
showBodySub: $this.fillType === 'preFill'
},
{
- label: '实际稀释液体积',
+ label: 'template.sp.sp00456.sjxsytj',
prop: 'actDiluentVolume',
headerSelectKey: 'actDiluentVolumeUnit',
fillType: 'preFill',
@@ -363,7 +363,7 @@ export const getLadderFormConfig = ($this) => {
type: 'step',
config: {
startSolution: {
- label: '起始源溶液',
+ label: 'template.sp.sp00456.qsyry',
type: 'input',
fillType: 'preFill',
subType: 'clickable',
@@ -372,7 +372,7 @@ export const getLadderFormConfig = ($this) => {
maxlength: 20
},
targetStartSolution: {
- label: '预设起始源溶液浓度',
+ label: 'template.sp.sp00456.ysqsyrynd',
type: 'inputNumber',
subType: 'select',
fillType: 'preFill',
@@ -381,7 +381,7 @@ export const getLadderFormConfig = ($this) => {
maxlength: 10
},
targetAcSolution: {
- label: '实际起始源溶液浓度',
+ label: 'template.sp.sp00456.sjqsyrynd',
type: 'input',
fillType: 'actFill',
disabled: true,
@@ -389,7 +389,7 @@ export const getLadderFormConfig = ($this) => {
compareTo: 'targetStartSolution', //比较哪个字段
},
solution: {
- label: '稀释液',
+ label: 'template.sp.sp00456.xsy',
type: 'input',
fillType: 'preFill',
subType: 'clickable',
@@ -398,7 +398,7 @@ export const getLadderFormConfig = ($this) => {
maxlength: 20
},
stepStorageCondition: {
- label: '存储条件',
+ label: 'template.sp.sp00456.cctj',
type: 'select',
fillType: 'preFill',
options: $this.getDictOptions('business_cctj'),
@@ -406,7 +406,7 @@ export const getLadderFormConfig = ($this) => {
},
effectivePeriod: {
- label: '目标溶液有效周期',
+ label: 'template.sp.sp00456.mbryyxzq',
type: 'input',
subType: 'select',
subKey: 'effectivePeriodUnit',
@@ -414,7 +414,7 @@ export const getLadderFormConfig = ($this) => {
subOptions: $this.getDictOptions('business_yxqdw')
},
expireDate: {
- label: '目标溶液失效日',
+ label: 'template.sp.sp00456.mbrysxr',
type: 'input'
}
}
@@ -429,23 +429,23 @@ export const getBaseInfoFormConfig = ($this) => {
type: 'cardItem',
config: {
studyMc: {
- label: '试验名称',
+ label: 'template.common.testName',
type: 'input',
disabled: true
},
studySn: {
- label: '试验编号',
+ label: 'template.common.testNumber',
type: 'input',
disabled: true
},
methodCode: {
- label: '方法编号',
+ label: 'template.common.methodCode',
type: 'input',
fillType: 'preFill',
maxlength: 50
},
versionNum: {
- label: '版本号',
+ label: 'template.common.versionNumber',
type: 'inputNumber',
fillType: 'actFill',
prepend: 'V',
@@ -455,10 +455,10 @@ export const getBaseInfoFormConfig = ($this) => {
},
{
type: 'conditionItem',
- label: '试验配制条件',
+ label: 'template.common.testConfigurationConditions',
config: {
pre: {
- label: '预填',
+ label: 'template.common.preFill',
type: 'select',
multiple: true,
fillType: 'preFill',
@@ -466,7 +466,7 @@ export const getBaseInfoFormConfig = ($this) => {
otherCode: 'preOther'
},
act: {
- label: '实际',
+ label: 'template.common.actualFill',
type: 'select',
fillType: 'actFill',
otherCode: 'actOther',
@@ -477,10 +477,10 @@ export const getBaseInfoFormConfig = ($this) => {
},
{
type: 'conditionItem',
- label: '容器材质',
+ label: 'template.sp.sp00456.rqcz',
config: {
containerMaterial: {
- label: '容器材质',
+ label: 'template.sp.sp00456.rqcz',
type: 'select',
options: $this.getDictOptions('business_rqcz'),
fillType: 'actFill',
@@ -491,14 +491,14 @@ export const getBaseInfoFormConfig = ($this) => {
},
{
type: 'cellItem',
- label: '处理时间',
+ label: 'template.common.configurationTime',
config: {
startDate: {
- label: '开始时间',
+ label: 'template.common.startTime',
type: 'input'
},
endDate: {
- label: '结束时间',
+ label: 'template.common.endTime',
type: 'input'
}
}
@@ -533,7 +533,7 @@ export const getStorageConditionFormConfig = ($this) => {
type: 'conditionItem',
config: {
storageCondition: {
- label: '存储条件',
+ label: 'template.sp.sp00456.cctj',
type: 'select',
fillType: 'preFill',
options: $this.getDictOptions('business_cctj'),
diff --git a/src/views/business/comps/template/mixins/templateMixin.js b/src/views/business/comps/template/mixins/templateMixin.js
index 53ecdc5..9a5ec13 100644
--- a/src/views/business/comps/template/mixins/templateMixin.js
+++ b/src/views/business/comps/template/mixins/templateMixin.js
@@ -38,6 +38,7 @@ export default {
handler(v) {
if (v) {
const {
+ studySubjectId,
studyId,
studyMc,
studySn,
@@ -56,6 +57,7 @@ export default {
if (v.bdnr) {
this.formData = {
...JSON.parse(v.bdnr),
+ studySubjectId,
studyId,
studyMc,
studySn,
@@ -69,6 +71,7 @@ export default {
}
} else {
this.formData = {
+ studySubjectId,
studyId,
studyMc,
studySn,
@@ -109,6 +112,7 @@ export default {
formData: {},
templateDetail: {},
resource: [], //试验试剂信息
+ resourceTmp:[],//试验试剂信息提交用
sysjColumns: [
{ label: '试剂名称', prop: 'reagentName' },
{ label: '编号', prop: 'reagentCode' },
@@ -184,7 +188,7 @@ export default {
return null
},
getResource() {
- return this.resource
+ return this.resourceTmp
},
//根据ref数组获取直接formData
getFilledFormDataByRefs(refArr = []) {
diff --git a/src/views/business/resource/gsp/comps/gsp/Xq.vue b/src/views/business/resource/gsp/comps/gsp/Xq.vue
index 5745b48..94e267a 100644
--- a/src/views/business/resource/gsp/comps/gsp/Xq.vue
+++ b/src/views/business/resource/gsp/comps/gsp/Xq.vue
@@ -129,7 +129,7 @@
{{ getTemplateName() }}{{ formData.bdmc || getTemplateName()
+ }}
- 新增平行配制
新增阶梯配制
@@ -86,7 +86,7 @@
:prefixKey="'paralle' + paralleIndex">
-