diff --git a/src/views/business/comps/template/comps/gsp/DMYPPZJLB.vue b/src/views/business/comps/template/comps/gsp/DMYPPZJLB.vue
index 2559921..b107012 100644
--- a/src/views/business/comps/template/comps/gsp/DMYPPZJLB.vue
+++ b/src/views/business/comps/template/comps/gsp/DMYPPZJLB.vue
@@ -83,6 +83,7 @@ export default {
type: "select",
fillType: "preFill",
options: this.getDictOptions("business_cctj"),
+ multiple: true,
otherCode: "storageConditionOther",
},
}
diff --git a/src/views/business/comps/template/comps/gsp/GSP001.vue b/src/views/business/comps/template/comps/gsp/GSP001.vue
index b057791..09b5d01 100644
--- a/src/views/business/comps/template/comps/gsp/GSP001.vue
+++ b/src/views/business/comps/template/comps/gsp/GSP001.vue
@@ -82,6 +82,7 @@ export default {
type: "select",
fillType: "preFill",
options: this.getDictOptions("business_cctj"),
+ multiple: true,
otherCode: "storageConditionOther",
},
}
diff --git a/src/views/business/comps/template/comps/gsp/GSP002.vue b/src/views/business/comps/template/comps/gsp/GSP002.vue
index fdc3c71..90ae84f 100644
--- a/src/views/business/comps/template/comps/gsp/GSP002.vue
+++ b/src/views/business/comps/template/comps/gsp/GSP002.vue
@@ -227,6 +227,7 @@ export default {
type: 'select',
fillType: 'preFill',
options: this.getDictOptions('business_cctj'),
+ multiple: true,
otherCode: 'paralleStepStorageConditionOther'
}
}
diff --git a/src/views/business/comps/template/comps/gsp/GSP003.vue b/src/views/business/comps/template/comps/gsp/GSP003.vue
index fc511f7..b8f4e8e 100644
--- a/src/views/business/comps/template/comps/gsp/GSP003.vue
+++ b/src/views/business/comps/template/comps/gsp/GSP003.vue
@@ -105,6 +105,7 @@ export default {
type: "select",
fillType: "preFill",
options: this.getDictOptions("business_cctj"),
+ multiple: true,
otherCode: "storageConditionOther",
},
}
diff --git a/src/views/business/comps/template/comps/gsp/GSP004.vue b/src/views/business/comps/template/comps/gsp/GSP004.vue
index 4b52eb1..099aa0e 100644
--- a/src/views/business/comps/template/comps/gsp/GSP004.vue
+++ b/src/views/business/comps/template/comps/gsp/GSP004.vue
@@ -249,6 +249,7 @@ export default {
type: 'select',
fillType: 'preFill',
options: this.getDictOptions('business_cctj'),
+ multiple: true,
otherCode: 'paralleStepStorageConditionOther'
}
}
diff --git a/src/views/business/comps/template/comps/gsp/GSP005.vue b/src/views/business/comps/template/comps/gsp/GSP005.vue
index 8316e62..17c9d55 100644
--- a/src/views/business/comps/template/comps/gsp/GSP005.vue
+++ b/src/views/business/comps/template/comps/gsp/GSP005.vue
@@ -300,6 +300,7 @@ export default {
type: "select",
fillType: "preFill",
options: this.getDictOptions("business_cctj"),
+ multiple: true,
otherCode: "storageConditionOther",
},
sywzbhph: {
@@ -493,6 +494,7 @@ export default {
type: "select",
fillType: "preFill",
options: this.getDictOptions("business_cctj"),
+ multiple: true,
otherCode: "storageConditionOther",
},
yrybhph: {
diff --git a/src/views/business/comps/template/comps/gsp/GSP010.vue b/src/views/business/comps/template/comps/gsp/GSP010.vue
index 8f008a1..2b87e66 100644
--- a/src/views/business/comps/template/comps/gsp/GSP010.vue
+++ b/src/views/business/comps/template/comps/gsp/GSP010.vue
@@ -240,6 +240,7 @@ export default {
type: "select",
fillType: "preFill",
options: this.getDictOptions("business_cctj"),
+ multiple: true,
otherCode: "storageConditionOther",
},
}
diff --git a/src/views/business/comps/template/comps/lba/LBA008.vue b/src/views/business/comps/template/comps/lba/LBA008.vue
index e6f3c83..bedcc8a 100644
--- a/src/views/business/comps/template/comps/lba/LBA008.vue
+++ b/src/views/business/comps/template/comps/lba/LBA008.vue
@@ -102,6 +102,7 @@ export default {
type: "select",
fillType: "preFill",
options: this.getDictOptions("business_cctj"),
+ multiple: true,
otherCode: "storageConditionOther",
},
}
diff --git a/src/views/business/comps/template/comps/pcr/PCR002.vue b/src/views/business/comps/template/comps/pcr/PCR002.vue
index 641d43f..e113814 100644
--- a/src/views/business/comps/template/comps/pcr/PCR002.vue
+++ b/src/views/business/comps/template/comps/pcr/PCR002.vue
@@ -91,6 +91,7 @@ export default {
type: "select",
fillType: "preFill",
options: this.getDictOptions("business_cctj"),
+ multiple: true,
otherCode: "storageConditionOther",
},
}
@@ -219,6 +220,7 @@ export default {
type: 'select',
fillType: 'preFill',
options: this.getDictOptions('business_cctj'),
+ multiple: true,
otherCode: 'stepStorageConditionOther'
},
diff --git a/src/views/business/comps/template/comps/pcr/PCR003.vue b/src/views/business/comps/template/comps/pcr/PCR003.vue
index 9956ed5..f06318a 100644
--- a/src/views/business/comps/template/comps/pcr/PCR003.vue
+++ b/src/views/business/comps/template/comps/pcr/PCR003.vue
@@ -92,6 +92,7 @@ export default {
type: "select",
fillType: "preFill",
options: this.getDictOptions("business_cctj"),
+ multiple: true,
otherCode: "storageConditionOther",
},
}
@@ -220,6 +221,7 @@ export default {
type: 'select',
fillType: 'preFill',
options: this.getDictOptions('business_cctj'),
+ multiple: true,
otherCode: 'stepStorageConditionOther'
},
diff --git a/src/views/business/comps/template/comps/pcr/PCR004.vue b/src/views/business/comps/template/comps/pcr/PCR004.vue
index 7303186..3ffe9cd 100644
--- a/src/views/business/comps/template/comps/pcr/PCR004.vue
+++ b/src/views/business/comps/template/comps/pcr/PCR004.vue
@@ -92,6 +92,7 @@ export default {
type: "select",
fillType: "preFill",
options: this.getDictOptions("business_cctj"),
+ multiple: true,
otherCode: "storageConditionOther",
},
}
@@ -220,6 +221,7 @@ export default {
type: 'select',
fillType: 'preFill',
options: this.getDictOptions('business_cctj'),
+ multiple: true,
otherCode: 'stepStorageConditionOther'
},
diff --git a/src/views/business/comps/template/comps/pcr/PCR005.vue b/src/views/business/comps/template/comps/pcr/PCR005.vue
index a06f2d5..ff2de9c 100644
--- a/src/views/business/comps/template/comps/pcr/PCR005.vue
+++ b/src/views/business/comps/template/comps/pcr/PCR005.vue
@@ -106,6 +106,7 @@ export default {
type: "select",
fillType: "preFill",
options: this.getDictOptions("business_cctj"),
+ multiple: true,
otherCode: "storageConditionOther",
},
}
diff --git a/src/views/business/comps/template/comps/pcr/PCR007.vue b/src/views/business/comps/template/comps/pcr/PCR007.vue
index 19bb5ab..cbc1aba 100644
--- a/src/views/business/comps/template/comps/pcr/PCR007.vue
+++ b/src/views/business/comps/template/comps/pcr/PCR007.vue
@@ -103,6 +103,7 @@ export default {
type: "select",
fillType: "preFill",
options: this.getDictOptions("business_cctj"),
+ multiple: true,
otherCode: "storageConditionOther",
},
}
diff --git a/src/views/business/comps/template/comps/pcr/PCR008.vue b/src/views/business/comps/template/comps/pcr/PCR008.vue
index 1983f58..6c62908 100644
--- a/src/views/business/comps/template/comps/pcr/PCR008.vue
+++ b/src/views/business/comps/template/comps/pcr/PCR008.vue
@@ -85,6 +85,7 @@ export default {
type: "select",
fillType: "preFill",
options: this.getDictOptions("business_cctj"),
+ multiple: true,
otherCode: "storageConditionOther",
},
}
diff --git a/src/views/business/comps/template/comps/pcr/PCR009.vue b/src/views/business/comps/template/comps/pcr/PCR009.vue
index bafd71e..d491959 100644
--- a/src/views/business/comps/template/comps/pcr/PCR009.vue
+++ b/src/views/business/comps/template/comps/pcr/PCR009.vue
@@ -102,6 +102,7 @@ export default {
type: "select",
fillType: "preFill",
options: this.getDictOptions("business_cctj"),
+ multiple: true,
otherCode: "storageConditionOther",
},
}
diff --git a/src/views/business/comps/template/comps/pcr/PCR010.vue b/src/views/business/comps/template/comps/pcr/PCR010.vue
index 99b71c9..8ac872a 100644
--- a/src/views/business/comps/template/comps/pcr/PCR010.vue
+++ b/src/views/business/comps/template/comps/pcr/PCR010.vue
@@ -87,6 +87,7 @@ export default {
type: "select",
fillType: "preFill",
options: this.getDictOptions("business_cctj"),
+ multiple: true,
otherCode: "storageConditionOther",
},
}
diff --git a/src/views/business/comps/template/comps/pcr/PCR011.vue b/src/views/business/comps/template/comps/pcr/PCR011.vue
index b82209a..ef9f80b 100644
--- a/src/views/business/comps/template/comps/pcr/PCR011.vue
+++ b/src/views/business/comps/template/comps/pcr/PCR011.vue
@@ -87,6 +87,7 @@ export default {
type: "select",
fillType: "preFill",
options: this.getDictOptions("business_cctj"),
+ multiple: true,
otherCode: "storageConditionOther",
},
}
diff --git a/src/views/business/comps/template/comps/pcr/PCR012.vue b/src/views/business/comps/template/comps/pcr/PCR012.vue
index 9efecae..ccefd9e 100644
--- a/src/views/business/comps/template/comps/pcr/PCR012.vue
+++ b/src/views/business/comps/template/comps/pcr/PCR012.vue
@@ -73,6 +73,7 @@ export default {
type: "select",
fillType: "preFill",
options: this.getDictOptions("business_cctj"),
+ multiple: true,
otherCode: "storageConditionOther",
},
}
diff --git a/src/views/business/comps/template/comps/sp/SP001.vue b/src/views/business/comps/template/comps/sp/SP001.vue
index 31d669e..a4def6b 100644
--- a/src/views/business/comps/template/comps/sp/SP001.vue
+++ b/src/views/business/comps/template/comps/sp/SP001.vue
@@ -68,6 +68,7 @@ export default {
type: "select",
fillType: "preFill",
options: this.getDictOptions("business_cctj"),
+ multiple: true,
otherCode: "storageConditionOther",
},
}
diff --git a/src/views/business/comps/template/comps/sp/SP003.vue b/src/views/business/comps/template/comps/sp/SP003.vue
index 825aacf..70b7a29 100644
--- a/src/views/business/comps/template/comps/sp/SP003.vue
+++ b/src/views/business/comps/template/comps/sp/SP003.vue
@@ -80,6 +80,7 @@ export default {
type: "select",
fillType: "preFill",
options: this.getDictOptions('business_cctj'),
+ multiple: true,
otherCode: "storageConditionOther",
},
@@ -245,6 +246,7 @@ export default {
type: "select",
fillType: "preFill",
options: this.getDictOptions('business_cctj'),
+ multiple: true,
otherCode: "stepStorageConditionOther",
},
diff --git a/src/views/business/comps/template/comps/sp/SP008.vue b/src/views/business/comps/template/comps/sp/SP008.vue
index 4ab8cbf..296d5ac 100644
--- a/src/views/business/comps/template/comps/sp/SP008.vue
+++ b/src/views/business/comps/template/comps/sp/SP008.vue
@@ -90,6 +90,7 @@ export default {
type: "select",
fillType: "preFill",
options: this.getDictOptions("business_cctj"),
+ multiple: true,
otherCode: "storageConditionOther",
},
diff --git a/src/views/business/comps/template/comps/sp/SP009.vue b/src/views/business/comps/template/comps/sp/SP009.vue
index bcb6f8e..786cd05 100644
--- a/src/views/business/comps/template/comps/sp/SP009.vue
+++ b/src/views/business/comps/template/comps/sp/SP009.vue
@@ -95,6 +95,7 @@ export default {
type: "select",
fillType: "preFill",
options: this.getDictOptions("business_cctj"),
+ multiple: true,
otherCode: "storageConditionOther",
},
}
diff --git a/src/views/business/comps/template/formConfig/PCRTableConfig.js b/src/views/business/comps/template/formConfig/PCRTableConfig.js
index c7f49f7..a47bc98 100644
--- a/src/views/business/comps/template/formConfig/PCRTableConfig.js
+++ b/src/views/business/comps/template/formConfig/PCRTableConfig.js
@@ -11,9 +11,9 @@ export const getLadderColumnsConfig = ($this, selectKey) => {
bodySubKey: 'subTargetSolutionCode',
bodyFillType: 'preFill',
width: 280,
- myCodeFields: ["targetSolutionCode", "bhOther", "subTargetSolutionCode"],//分装的母液编号字段
- maxVolumeField: "actSolutionVolume",//分装的最大量字段
- maxVolumeFieldUnit: "actSolutionVolumeUnit",//分装的最大量单位字段
+ myCodeFields: ['targetSolutionCode', 'bhOther', 'subTargetSolutionCode'], //分装的母液编号字段
+ maxVolumeField: 'actSolutionVolume', //分装的最大量字段
+ maxVolumeFieldUnit: 'actSolutionVolumeUnit' //分装的最大量单位字段
},
{
label: 'template.pcr.pcr002.qsrybh',
@@ -42,7 +42,7 @@ export const getLadderColumnsConfig = ($this, selectKey) => {
bodyMaxlength: 10,
bodyDisabled: true,
bodySubPlaceholder: 'template.common.xswsPlaceholder',
- headerSelectTo:"actStartSolutionVolumeUnit",
+ headerSelectTo: 'actStartSolutionVolumeUnit'
},
{
label: 'template.pcr.pcr002.sjqsrytj',
@@ -74,7 +74,7 @@ export const getLadderColumnsConfig = ($this, selectKey) => {
bodyPrecisionKey: 'targetDiluentVolumePrecision',
bodyMaxlength: 10,
bodySubPlaceholder: 'template.common.xswsPlaceholder',
- headerSelectTo:"actDiluentVolumeUnit",
+ headerSelectTo: 'actDiluentVolumeUnit'
},
{
label: 'template.pcr.pcr002.sjxsytj',
@@ -87,7 +87,7 @@ export const getLadderColumnsConfig = ($this, selectKey) => {
bodyFillType: 'actFill',
bodyMaxlength: 10,
copyFrom: 'targetDiluentVolume', //复制哪个字段
- compareTo: 'targetDiluentVolume', //比较哪个字段
+ compareTo: 'targetDiluentVolume' //比较哪个字段
},
{
label: 'template.pcr.pcr002.ysmbrynd',
@@ -99,7 +99,7 @@ export const getLadderColumnsConfig = ($this, selectKey) => {
bodyType: 'inputNumber',
bodyFillType: 'preFill',
bodyMaxlength: 10,
- headerSelectTo:"actSolutionConcentrationUnit",
+ headerSelectTo: 'actSolutionConcentrationUnit'
},
{
label: 'template.pcr.pcr002.sjmbrynd',
@@ -118,7 +118,7 @@ export const getLadderColumnsConfig = ($this, selectKey) => {
bodyPrecisionKey: 'actSolutionConcentrationPrecision',
bodyMaxlength: 10,
bodySubPlaceholder: 'template.common.xswsPlaceholder',
- compareTo: 'targetSolutionConcentration', //比较哪个字段
+ compareTo: 'targetSolutionConcentration' //比较哪个字段
},
{
label: 'template.pcr.pcr002.ysmbrytj',
@@ -149,17 +149,17 @@ export const getLadderColumnsConfig = ($this, selectKey) => {
bodyMaxlength: 10,
// copyFrom: 'targetSolutionVolume', //复制哪个字段
bodySubPlaceholder: 'template.common.xswsPlaceholder',
- compareTo: 'targetSolutionVolume', //比较哪个字段
+ compareTo: 'targetSolutionVolume' //比较哪个字段
}
]
}
// 平行配置表格列配置
export const getParallelColumnsConfig = ($this) => {
- const sn = $this.sn;
+ const sn = $this.sn
let o = {
- "SP004":"business_sp_nbgzy",
- "SP005":"business_sp_zkgzy",
- "SP006":"business_sp_bzqxzkypzbb",
+ SP004: 'business_sp_nbgzy',
+ SP005: 'business_sp_zkgzy',
+ SP006: 'business_sp_bzqxzkypzbb'
}
return [
{
@@ -170,9 +170,9 @@ export const getParallelColumnsConfig = ($this) => {
bodySubType: 'span',
bodySubKey: 'subTargetSolutionCode',
bodyFillType: 'preFill',
- myCodeFields: ["targetSolutionCode", "subTargetSolutionCode"],//分装的母液编号字段
- maxVolumeField: "actSolutionVolume",//分装的最大量字段
- maxVolumeFieldUnit: "actSolutionVolumeUnit",//分装的最大量单位字段
+ myCodeFields: ['targetSolutionCode', 'subTargetSolutionCode'], //分装的母液编号字段
+ maxVolumeField: 'actSolutionVolume', //分装的最大量字段
+ maxVolumeFieldUnit: 'actSolutionVolumeUnit', //分装的最大量单位字段
width: 280
},
{
@@ -203,7 +203,7 @@ export const getParallelColumnsConfig = ($this) => {
bodyPrecisionKey: 'actSolutionConcentrationPrecision',
bodyMaxlength: 10,
bodySubPlaceholder: 'template.common.xswsPlaceholder',
- compareTo: 'targetSolutionConcentration', //比较哪个字段
+ compareTo: 'targetSolutionConcentration' //比较哪个字段
},
{
label: 'template.sp.sp00456.ysmbrytj',
@@ -215,7 +215,7 @@ export const getParallelColumnsConfig = ($this) => {
bodyType: 'inputNumber',
bodyFillType: 'preFill',
bodyMaxlength: 10,
- headerSelectTo:"actSolutionVolumeUnit",
+ headerSelectTo: 'actSolutionVolumeUnit'
},
{
label: 'template.sp.sp00456.sjmbrytj',
@@ -234,7 +234,7 @@ export const getParallelColumnsConfig = ($this) => {
bodyPrecisionKey: 'actSolutionVolumePrecision',
bodyMaxlength: 10,
bodySubPlaceholder: 'template.common.xswsPlaceholder',
- compareTo: 'targetSolutionVolume', //比较哪个字段
+ compareTo: 'targetSolutionVolume' //比较哪个字段
},
{
label: 'template.sp.sp00456.mbryyxzq',
@@ -269,7 +269,7 @@ export const getParallelColumnsConfig = ($this) => {
width: 280,
bodyType: 'clickable',
bodyFillType: 'actFill',
- compareTo: 'startSolutionCode', //比较哪个字段
+ compareTo: 'startSolutionCode' //比较哪个字段
},
{
label: 'template.sp.sp00456.ysysrynd',
@@ -291,7 +291,7 @@ export const getParallelColumnsConfig = ($this) => {
bodyType: 'inputNumber',
bodyFillType: 'actFill',
bodyDisabled: true,
- compareTo: 'targetStartSolutionConcentration', //比较哪个字段
+ compareTo: 'targetStartSolutionConcentration' //比较哪个字段
},
{
label: 'template.sp.sp00456.ysysrytj',
@@ -356,7 +356,7 @@ export const getParallelColumnsConfig = ($this) => {
bodyType: 'inputNumber',
bodyFillType: 'actFill',
bodyMaxlength: 10,
- copyFrom:"targetDiluentVolume",
+ copyFrom: 'targetDiluentVolume',
compareTo: 'targetDiluentVolume' //比较哪个字段
}
]
@@ -392,7 +392,7 @@ export const getLadderFormConfig = ($this) => {
fillType: 'actFill',
disabled: true,
maxlength: 10,
- compareTo: 'targetStartSolution', //比较哪个字段
+ compareTo: 'targetStartSolution' //比较哪个字段
},
solution: {
label: 'template.sp.sp00456.xsy',
@@ -408,6 +408,7 @@ export const getLadderFormConfig = ($this) => {
type: 'select',
fillType: 'preFill',
options: $this.getDictOptions('business_cctj'),
+ multiple: true,
otherCode: 'stepStorageConditionOther'
},
@@ -544,6 +545,7 @@ export const getStorageConditionFormConfig = ($this) => {
type: 'select',
fillType: 'preFill',
options: $this.getDictOptions('business_cctj'),
+ multiple: true,
otherCode: 'othersSorageCondition'
}
}
@@ -571,6 +573,7 @@ export const getParalleStepFormConfig = ($this) => {
type: 'select',
fillType: 'preFill',
options: $this.getDictOptions('business_cctj'),
+ multiple: true,
otherCode: 'paralleStepStorageConditionOther'
}
}
@@ -588,7 +591,7 @@ export const getPCR005Config = ($this) => {
bodyType: 'input',
fillType: 'preFill',
otherCode: 'bhOther',
- bodyFillType: 'preFill',
+ bodyFillType: 'preFill'
},
{
label: 'template.pcr.pcr005.ypcsnd',
@@ -600,7 +603,7 @@ export const getPCR005Config = ($this) => {
headerOptions: $this.getDictOptions('business_nddw'),
bodyType: 'inputNumber',
bodyFillType: 'preFill',
- bodyMaxlength: 10,
+ bodyMaxlength: 10
},
{
label: 'template.pcr.pcr005.sxbs',
@@ -610,7 +613,7 @@ export const getPCR005Config = ($this) => {
fillType: 'preFill',
bodyType: 'inputNumber',
bodyFillType: 'preFill',
- bodyMaxlength: 10,
+ bodyMaxlength: 10
},
{
label: 'template.pcr.pcr005.ysypxytj',
@@ -622,7 +625,7 @@ export const getPCR005Config = ($this) => {
headerOptions: $this.getDictOptions('business_tjdw'),
bodyType: 'inputNumber',
bodyFillType: 'preFill',
- bodyMaxlength: 10,
+ bodyMaxlength: 10
},
{
label: 'template.pcr.pcr005.sjypxytj',
@@ -635,7 +638,7 @@ export const getPCR005Config = ($this) => {
copyFrom: 'ysypxytj', //复制哪个字段
bodyType: 'inputNumber',
bodyFillType: 'actFill',
- bodyMaxlength: 10,
+ bodyMaxlength: 10
},
{
label: 'template.pcr.pcr005.ysxsyxytj',
@@ -657,7 +660,7 @@ export const getPCR005Config = ($this) => {
showBodySub: $this.fillType === 'preFill',
bodyPrecisionKey: 0,
bodyMaxlength: 10,
- bodySubPlaceholder: 'template.common.xswsPlaceholder',
+ bodySubPlaceholder: 'template.common.xswsPlaceholder'
},
{
label: 'template.pcr.pcr005.sjxsyxytj',
@@ -670,7 +673,7 @@ export const getPCR005Config = ($this) => {
copyFrom: 'ysxsyxytj', //复制哪个字段
bodyType: 'inputNumber',
bodyFillType: 'actFill',
- bodyMaxlength: 10,
+ bodyMaxlength: 10
},
{
label: 'template.pcr.pcr005.ypznd',
@@ -691,12 +694,11 @@ export const getPCR005Config = ($this) => {
subPrecision: 0,
showBodySub: $this.fillType === 'preFill',
bodyMaxlength: 10,
- bodySubPlaceholder: 'template.common.xswsPlaceholder',
- },
+ bodySubPlaceholder: 'template.common.xswsPlaceholder'
+ }
]
}
-
// PCR007
export const getPCR007Config = ($this) => {
return [
@@ -707,7 +709,7 @@ export const getPCR007Config = ($this) => {
bodyType: 'input',
fillType: 'preFill',
otherCode: 'bhOther',
- bodyFillType: 'preFill',
+ bodyFillType: 'preFill'
},
{
label: 'template.pcr.pcr007.cyqypgsjyjtjtj',
@@ -719,7 +721,7 @@ export const getPCR007Config = ($this) => {
headerOptions: $this.getDictOptions('business_tjdw'),
bodyType: 'inputNumber',
bodyFillType: 'preFill',
- bodyMaxlength: 10,
+ bodyMaxlength: 10
},
{
label: 'template.pcr.pcr007.cyqypgsjsjtjtj',
@@ -732,7 +734,7 @@ export const getPCR007Config = ($this) => {
bodyType: 'inputNumber',
bodyFillType: 'actFill',
copyFrom: 'cyqypgsjyjtjtj', //复制哪个字段
- bodyMaxlength: 10,
+ bodyMaxlength: 10
},
{
label: 'template.pcr.pcr007.cjgzl',
@@ -753,12 +755,11 @@ export const getPCR007Config = ($this) => {
subPrecision: 0,
showBodySub: $this.fillType === 'actFill',
bodyMaxlength: 10,
- bodySubPlaceholder: 'template.common.xswsPlaceholder',
+ bodySubPlaceholder: 'template.common.xswsPlaceholder'
}
]
}
-
// PCR008
export const getPCR008Config = ($this) => {
return [
@@ -769,7 +770,7 @@ export const getPCR008Config = ($this) => {
bodyType: 'input',
fillType: 'preFill',
otherCode: 'bhOther',
- bodyFillType: 'preFill',
+ bodyFillType: 'preFill'
},
{
label: 'template.pcr.pcr008.cjgz',
@@ -781,7 +782,7 @@ export const getPCR008Config = ($this) => {
headerOptions: $this.getDictOptions('business_tjdw'),
bodyType: 'inputNumber',
bodyFillType: 'preFill',
- bodyMaxlength: 10,
+ bodyMaxlength: 10
},
{
label: 'template.pcr.pcr008.lzzcz',
@@ -798,7 +799,7 @@ export const getPCR008Config = ($this) => {
bodySubType: 'button',
bodySubButtonName: 'form.hqz',
bodySubFillType: 'actFill',
- showBodySub: $this.fillType === 'actFill',
+ showBodySub: $this.fillType === 'actFill'
},
{
label: 'template.pcr.pcr008.zzzl',
@@ -819,7 +820,7 @@ export const getPCR008Config = ($this) => {
bodyMaxlength: 10,
bodyDisabled: $this.fillType === 'preFill',
bodySubPlaceholder: 'template.common.xswsPlaceholder',
- headerSelectTo:"actStartSolutionVolumeUnit",
+ headerSelectTo: 'actStartSolutionVolumeUnit'
},
{
label: 'template.pcr.pcr008.ysyjrybjrl',
@@ -840,7 +841,7 @@ export const getPCR008Config = ($this) => {
bodyMaxlength: 10,
bodyDisabled: $this.fillType === 'preFill',
bodySubPlaceholder: 'template.common.xswsPlaceholder',
- headerSelectTo:"actStartSolutionVolumeUnit",
+ headerSelectTo: 'actStartSolutionVolumeUnit'
},
{
label: 'template.pcr.pcr008.sjyjrybjrl',
@@ -853,13 +854,11 @@ export const getPCR008Config = ($this) => {
bodyType: 'inputNumber',
bodyFillType: 'actFill',
copyFrom: 'ysyjrybjrl', //复制哪个字段
- bodyMaxlength: 10,
+ bodyMaxlength: 10
}
]
}
-
-
// PCR009
export const getPCR009Config = ($this) => {
return [
@@ -870,7 +869,7 @@ export const getPCR009Config = ($this) => {
bodyType: 'input',
fillType: 'preFill',
otherCode: 'bhOther',
- bodyFillType: 'preFill',
+ bodyFillType: 'preFill'
},
{
label: 'template.pcr.pcr009.zzz',
@@ -882,7 +881,7 @@ export const getPCR009Config = ($this) => {
headerOptions: $this.getDictOptions('business_tjdw'),
bodyType: 'inputNumber',
bodyFillType: 'preFill',
- bodyMaxlength: 10,
+ bodyMaxlength: 10
},
{
label: 'template.pcr.pcr009.ysyjrybjrl',
@@ -903,7 +902,7 @@ export const getPCR009Config = ($this) => {
bodyMaxlength: 10,
bodyDisabled: $this.fillType === 'preFill',
bodySubPlaceholder: 'template.common.xswsPlaceholder',
- headerSelectTo:"actStartSolutionVolumeUnit",
+ headerSelectTo: 'actStartSolutionVolumeUnit'
},
{
label: 'template.pcr.pcr009.sjyjrybjrl',
@@ -916,12 +915,11 @@ export const getPCR009Config = ($this) => {
bodyType: 'inputNumber',
bodyFillType: 'actFill',
copyFrom: 'ysyjrybjrl', //复制哪个字段
- bodyMaxlength: 10,
+ bodyMaxlength: 10
}
]
}
-
// PCR010
export const getPCR010Config = ($this) => {
return [
@@ -932,7 +930,7 @@ export const getPCR010Config = ($this) => {
bodyType: 'input',
fillType: 'preFill',
otherCode: 'bhOther',
- bodyFillType: 'preFill',
+ bodyFillType: 'preFill'
},
{
label: 'template.pcr.pcr010.cqzl',
@@ -953,7 +951,7 @@ export const getPCR010Config = ($this) => {
subPrecision: 0,
showBodySub: $this.fillType === 'actFill',
bodyMaxlength: 10,
- bodySubPlaceholder: 'template.common.xswsPlaceholder',
+ bodySubPlaceholder: 'template.common.xswsPlaceholder'
},
{
label: 'template.pcr.pcr009.ysyjrybjrl',
@@ -974,7 +972,7 @@ export const getPCR010Config = ($this) => {
bodyMaxlength: 10,
bodyDisabled: $this.fillType === 'preFill',
bodySubPlaceholder: 'template.common.xswsPlaceholder',
- headerSelectTo:"actStartSolutionVolumeUnit",
+ headerSelectTo: 'actStartSolutionVolumeUnit'
},
{
label: 'template.pcr.pcr009.sjyjrybjrl',
@@ -987,7 +985,7 @@ export const getPCR010Config = ($this) => {
bodyType: 'inputNumber',
bodyFillType: 'actFill',
copyFrom: 'ysyjrybjrl', //复制哪个字段
- bodyMaxlength: 10,
+ bodyMaxlength: 10
}
]
-}
\ No newline at end of file
+}
diff --git a/src/views/business/comps/template/formConfig/paralleAndLadderConfig.js b/src/views/business/comps/template/formConfig/paralleAndLadderConfig.js
index eca1ca3..d148e22 100644
--- a/src/views/business/comps/template/formConfig/paralleAndLadderConfig.js
+++ b/src/views/business/comps/template/formConfig/paralleAndLadderConfig.js
@@ -1,40 +1,39 @@
const explainConfig = {
- type: 'explainItem',
- config: {
- text1: {
- label: '配制说明：配制',
- type: 'span',
- },
- yb: {
- type: "input",
- fillType: 'preFill',
- maxlength: 100,
- formWidth: 280
- },
- text2:{
- label:"样本，分别配制",
- type: 'span',
- },
- ybs: {
- type: "inputNumber",
- fillType: 'preFill',
- precision: 0,
-
- },
- text3:{
- label:"套， 序列号为：",
- type: 'span',
- },
- ybh: {
- type: "input",
- fillType: 'preFill',
- },
- text4:{
- label:"，单套配制过程如下：",
- type: 'span',
- },
- }
+ type: 'explainItem',
+ config: {
+ text1: {
+ label: '配制说明：配制',
+ type: 'span'
+ },
+ yb: {
+ type: 'input',
+ fillType: 'preFill',
+ maxlength: 100,
+ formWidth: 280
+ },
+ text2: {
+ label: '样本，分别配制',
+ type: 'span'
+ },
+ ybs: {
+ type: 'inputNumber',
+ fillType: 'preFill',
+ precision: 0
+ },
+ text3: {
+ label: '套， 序列号为：',
+ type: 'span'
+ },
+ ybh: {
+ type: 'input',
+ fillType: 'preFill'
+ },
+ text4: {
+ label: '，单套配制过程如下：',
+ type: 'span'
}
+ }
+}
// 阶梯配置表格列配置
export const getLadderColumnsConfig = ($this) => {
return [
@@ -47,9 +46,9 @@ export const getLadderColumnsConfig = ($this) => {
bodyFillType: 'preFill',
width: 280,
showWidth: 180,
- myCodeFields: ["targetSolutionCode", "subTargetSolutionCode"],//分装的母液编号字段
- maxVolumeField: "actSolutionVolume",//分装的最大量字段
- maxVolumeFieldUnit: "actSolutionVolumeUnit",//分装的最大量单位字段
+ myCodeFields: ['targetSolutionCode', 'subTargetSolutionCode'], //分装的母液编号字段
+ maxVolumeField: 'actSolutionVolume', //分装的最大量字段
+ maxVolumeFieldUnit: 'actSolutionVolumeUnit' //分装的最大量单位字段
},
{
label: 'template.sp.sp00456.qsrybh',
@@ -58,7 +57,7 @@ export const getLadderColumnsConfig = ($this) => {
showWidth: 180,
bodyType: 'input',
bodyFillType: 'actFill',
- bodyDisabled: true,
+ bodyDisabled: true
},
{
label: 'template.sp.sp00456.ysqsrytj',
@@ -79,7 +78,7 @@ export const getLadderColumnsConfig = ($this) => {
bodyMaxlength: 10,
bodyDisabled: true,
bodySubPlaceholder: 'template.common.xswsPlaceholder',
- headerSelectTo: "actStartSolutionVolumeUnit",
+ headerSelectTo: 'actStartSolutionVolumeUnit'
},
{
label: 'template.sp.sp00456.sjqsrytj',
@@ -115,7 +114,7 @@ export const getLadderColumnsConfig = ($this) => {
subPrecision: 0,
bodyMaxlength: 10,
bodySubPlaceholder: 'template.common.xswsPlaceholder',
- headerSelectTo: "actDiluentVolumeUnit",
+ headerSelectTo: 'actDiluentVolumeUnit'
},
{
label: 'template.sp.sp00456.sjxsytj',
@@ -129,7 +128,7 @@ export const getLadderColumnsConfig = ($this) => {
bodyFillType: 'actFill',
bodyMaxlength: 10,
copyFrom: 'targetDiluentVolume', //复制哪个字段
- compareTo: 'targetDiluentVolume', //比较哪个字段
+ compareTo: 'targetDiluentVolume' //比较哪个字段
},
{
label: 'template.sp.sp00456.ysmbrynd',
@@ -142,7 +141,7 @@ export const getLadderColumnsConfig = ($this) => {
bodyType: 'inputNumber',
bodyFillType: 'preFill',
bodyMaxlength: 10,
- headerSelectTo: "actSolutionConcentrationUnit",
+ headerSelectTo: 'actSolutionConcentrationUnit'
},
{
label: 'template.sp.sp00456.sjmbrynd',
@@ -164,7 +163,7 @@ export const getLadderColumnsConfig = ($this) => {
subPrecision: 0,
bodyMaxlength: 10,
bodySubPlaceholder: 'template.common.xswsPlaceholder',
- compareTo: 'targetSolutionConcentration', //比较哪个字段
+ compareTo: 'targetSolutionConcentration' //比较哪个字段
},
{
label: 'template.sp.sp00456.ysmbrytj',
@@ -177,7 +176,7 @@ export const getLadderColumnsConfig = ($this) => {
bodyType: 'inputNumber',
bodyFillType: 'preFill',
bodyMaxlength: 10,
- headerSelectTo: "actSolutionVolumeUnit",
+ headerSelectTo: 'actSolutionVolumeUnit'
},
{
label: 'template.sp.sp00456.sjmbrytj',
@@ -200,19 +199,19 @@ export const getLadderColumnsConfig = ($this) => {
bodyMaxlength: 10,
// copyFrom: 'targetSolutionVolume', //复制哪个字段
bodySubPlaceholder: 'template.common.xswsPlaceholder',
- compareTo: 'targetSolutionVolume', //比较哪个字段
+ compareTo: 'targetSolutionVolume' //比较哪个字段
}
]
}
// 平行配置表格列配置
export const getParallelColumnsConfig = ($this) => {
- const sn = $this.sn;
+ const sn = $this.sn
let o = {
- "SP004": "business_sp_nbgzy",
- "SP005": "business_sp_zkgzy",
- "SP006": "business_sp_bzqxzkypzbb",
+ SP004: 'business_sp_nbgzy',
+ SP005: 'business_sp_zkgzy',
+ SP006: 'business_sp_bzqxzkypzbb'
}
- const dic = o[sn] || 'business_sp_nbgzy';
+ const dic = o[sn] || 'business_sp_nbgzy'
return [
{
label: 'template.sp.sp00456.mbrybh',
@@ -222,9 +221,9 @@ export const getParallelColumnsConfig = ($this) => {
bodySubType: 'span',
bodySubKey: 'subTargetSolutionCode',
bodyFillType: 'preFill',
- myCodeFields: ["targetSolutionCode", "subTargetSolutionCode"],//分装的母液编号字段
- maxVolumeField: "actSolutionVolume",//分装的最大量字段
- maxVolumeFieldUnit: "actSolutionVolumeUnit",//分装的最大量单位字段
+ myCodeFields: ['targetSolutionCode', 'subTargetSolutionCode'], //分装的母液编号字段
+ maxVolumeField: 'actSolutionVolume', //分装的最大量字段
+ maxVolumeFieldUnit: 'actSolutionVolumeUnit', //分装的最大量单位字段
showWidth: 180,
width: 280
},
@@ -239,7 +238,7 @@ export const getParallelColumnsConfig = ($this) => {
bodyType: 'inputNumber',
bodyFillType: 'preFill',
bodyMaxlength: 10,
- headerSelectTo: "actSolutionConcentrationUnit",
+ headerSelectTo: 'actSolutionConcentrationUnit'
},
{
label: 'template.sp.sp00456.sjmbrynd',
@@ -260,7 +259,7 @@ export const getParallelColumnsConfig = ($this) => {
subPrecision: 0,
bodyMaxlength: 10,
bodySubPlaceholder: 'template.common.xswsPlaceholder',
- compareTo: 'targetSolutionConcentration', //比较哪个字段
+ compareTo: 'targetSolutionConcentration' //比较哪个字段
},
{
label: 'template.sp.sp00456.ysmbrytj',
@@ -273,7 +272,7 @@ export const getParallelColumnsConfig = ($this) => {
bodyType: 'inputNumber',
bodyFillType: 'preFill',
bodyMaxlength: 10,
- headerSelectTo: "actSolutionVolumeUnit",
+ headerSelectTo: 'actSolutionVolumeUnit'
},
{
label: 'template.sp.sp00456.sjmbrytj',
@@ -294,7 +293,7 @@ export const getParallelColumnsConfig = ($this) => {
subPrecision: 0,
bodyMaxlength: 10,
bodySubPlaceholder: 'template.common.xswsPlaceholder',
- compareTo: 'targetSolutionVolume', //比较哪个字段
+ compareTo: 'targetSolutionVolume' //比较哪个字段
},
{
label: 'template.sp.sp00456.mbryyxzq',
@@ -333,7 +332,7 @@ export const getParallelColumnsConfig = ($this) => {
showWidth: 180,
bodyType: 'sj',
bodyFillType: 'actFill',
- compareTo: 'startSolutionCode', //比较哪个字段
+ compareTo: 'startSolutionCode' //比较哪个字段
},
{
label: 'template.sp.sp00456.ysysrynd',
@@ -347,7 +346,7 @@ export const getParallelColumnsConfig = ($this) => {
bodySubOptions: $this.getDictOptions('business_nddw'),
bodySubFillType: 'preFill',
bodyMaxlength: 10,
- showBodySub: true,
+ showBodySub: true
},
{
label: 'template.sp.sp00456.sjysrynd',
@@ -357,12 +356,12 @@ export const getParallelColumnsConfig = ($this) => {
bodyType: 'inputNumber',
bodyFillType: 'actFill',
bodyDisabled: true,
- compareTo: 'targetStartSolutionConcentration', //比较哪个字段
+ compareTo: 'targetStartSolutionConcentration', //比较哪个字段
bodySubKey: 'subTargetAcSolutionUnit',
- bodySubType: "input",
- bodySubCompareTo: "targetStartSolutionConcentrationPrecision",
- bodySubFillType: "actFill",
- bodySubDisabled: true,
+ bodySubType: 'input',
+ bodySubCompareTo: 'targetStartSolutionConcentrationPrecision',
+ bodySubFillType: 'actFill',
+ bodySubDisabled: true
},
{
label: 'template.sp.sp00456.ysysrytj',
@@ -385,7 +384,7 @@ export const getParallelColumnsConfig = ($this) => {
bodyDisabled: true,
showBodySub: true,
showBodySub: $this.fillType === 'preFill',
- headerSelectTo: "actStartSolutionVolumeUnit",
+ headerSelectTo: 'actStartSolutionVolumeUnit'
},
{
@@ -422,7 +421,7 @@ export const getParallelColumnsConfig = ($this) => {
bodySubPlaceholder: 'template.common.xswsPlaceholder',
bodyDisabled: true,
showBodySub: $this.fillType === 'preFill',
- headerSelectTo: "actDiluentVolumeUnit",
+ headerSelectTo: 'actDiluentVolumeUnit'
},
{
label: 'template.sp.sp00456.sjxsytj',
@@ -435,7 +434,7 @@ export const getParallelColumnsConfig = ($this) => {
bodyType: 'inputNumber',
bodyFillType: 'actFill',
bodyMaxlength: 10,
- copyFrom: "targetDiluentVolume",
+ copyFrom: 'targetDiluentVolume',
compareTo: 'targetDiluentVolume' //比较哪个字段
}
]
@@ -443,7 +442,7 @@ export const getParallelColumnsConfig = ($this) => {
//阶梯配置
export const getLadderFormConfig = ($this) => {
- const sn = $this.sn;
+ const sn = $this.sn
const defaultConfig = [
{
type: 'step',
@@ -473,10 +472,10 @@ export const getLadderFormConfig = ($this) => {
disabled: true,
maxlength: 10,
compareTo: 'targetStartSolution', //比较哪个字段
- subKey: "subTargetAcSolutionUnit",
- subType: "input",
+ subKey: 'subTargetAcSolutionUnit',
+ subType: 'input',
subDisabled: true,
- subCompareTo: "subTargetStartSolution",
+ subCompareTo: 'subTargetStartSolution'
},
solution: {
label: 'template.sp.sp00456.xsy',
@@ -492,6 +491,7 @@ export const getLadderFormConfig = ($this) => {
type: 'select',
fillType: 'preFill',
options: $this.getDictOptions('business_cctj'),
+ multiple: true,
otherCode: 'stepStorageConditionOther'
},
@@ -510,7 +510,7 @@ export const getLadderFormConfig = ($this) => {
}
}
]
- if (sn === "LBA007") {
+ if (sn === 'LBA007') {
defaultConfig.unshift(explainConfig)
}
return defaultConfig
@@ -518,9 +518,9 @@ export const getLadderFormConfig = ($this) => {
//试验基本信息
export const getBaseInfoFormConfig = ($this) => {
- const sn = $this.sn;
- const labArr = ["LBA005", "LBA007"]
- const isLba = labArr.includes(sn);
+ const sn = $this.sn
+ const labArr = ['LBA005', 'LBA007']
+ const isLba = labArr.includes(sn)
return [
{
type: 'cardItem',
@@ -552,7 +552,9 @@ export const getBaseInfoFormConfig = ($this) => {
},
{
type: 'conditionItem',
- label: isLba ? 'template.lba.lba002.cztj' : 'template.common.testConfigurationConditions',
+ label: isLba
+ ? 'template.lba.lba002.cztj'
+ : 'template.common.testConfigurationConditions',
config: {
pre: {
label: 'template.common.preFill',
@@ -573,23 +575,27 @@ export const getBaseInfoFormConfig = ($this) => {
}
}
},
- isLba ? {} : {
- type: 'conditionItem',
- label: 'template.sp.sp00456.rqcz',
- config: {
- containerMaterial: {
+ isLba
+ ? {}
+ : {
+ type: 'conditionItem',
label: 'template.sp.sp00456.rqcz',
- type: 'select',
- options: $this.getDictOptions('business_rqcz'),
- fillType: 'actFill',
- multiple: true,
- otherCode: 'containerMaterialOther'
- }
- }
- },
+ config: {
+ containerMaterial: {
+ label: 'template.sp.sp00456.rqcz',
+ type: 'select',
+ options: $this.getDictOptions('business_rqcz'),
+ fillType: 'actFill',
+ multiple: true,
+ otherCode: 'containerMaterialOther'
+ }
+ }
+ },
{
type: 'cellItem',
- label: isLba ? 'template.lba.lba002.czsj' : 'template.common.configurationTime',
+ label: isLba
+ ? 'template.lba.lba002.czsj'
+ : 'template.common.configurationTime',
config: {
startDate: {
label: 'template.common.startTime',
@@ -635,6 +641,7 @@ export const getStorageConditionFormConfig = ($this) => {
type: 'select',
fillType: 'preFill',
options: $this.getDictOptions('business_cctj'),
+ multiple: true,
otherCode: 'othersSorageCondition'
}
}
@@ -650,7 +657,7 @@ export const getParalleStepFormConfig = ($this) => {
config: {
solution: {
label: 'template.sp.sp00456.xsy',
- labelWidth:80,
+ labelWidth: 80,
type: 'input',
fillType: 'preFill',
subType: 'sj',
@@ -660,17 +667,18 @@ export const getParalleStepFormConfig = ($this) => {
},
paralleStepStorageCondition: {
label: 'template.sp.sp00456.cctj',
- labelWidth:80,
+ labelWidth: 80,
type: 'select',
fillType: 'preFill',
options: $this.getDictOptions('business_cctj'),
+ multiple: true,
otherCode: 'paralleStepStorageConditionOther'
}
}
}
]
- const sn = $this.sn;
- if(sn === "LBA007"){
+ const sn = $this.sn
+ if (sn === 'LBA007') {
defaultConfig.unshift(explainConfig)
}
return defaultConfig
@@ -678,18 +686,21 @@ export const getParalleStepFormConfig = ($this) => {
//选板信息；
export const getJcbColumnsConfig = ($this) => {
- return [{
- label: 'template.lba.lba002.jcbmc',
- prop: 'jcb',
- bodyType: 'input',
- bodyFillType: 'preFill',
- width: 280,
- bodyMaxlength: 20
- }, {
- label: '',
- prop: 'jcbBh',
- bodyType: 'jcb',
- bodyFillType: 'actFill',
- width: 280
- }]
-}
\ No newline at end of file
+ return [
+ {
+ label: 'template.lba.lba002.jcbmc',
+ prop: 'jcb',
+ bodyType: 'input',
+ bodyFillType: 'preFill',
+ width: 280,
+ bodyMaxlength: 20
+ },
+ {
+ label: '',
+ prop: 'jcbBh',
+ bodyType: 'jcb',
+ bodyFillType: 'actFill',
+ width: 280
+ }
+ ]
+}
diff --git a/src/views/business/comps/template/formConfig/sp/SP007.js b/src/views/business/comps/template/formConfig/sp/SP007.js
index 520bac4..080c684 100644
--- a/src/views/business/comps/template/formConfig/sp/SP007.js
+++ b/src/views/business/comps/template/formConfig/sp/SP007.js
@@ -135,6 +135,7 @@ export const getStorageFormConfig = ($this) => {
type: 'select',
fillType: 'preFill',
options: $this.getDictOptions('business_cctj'),
+ multiple: true,
otherCode: 'storageConditionOther'
}
}
diff --git a/src/views/business/resource/gsp/comps/gsp/Bj.vue b/src/views/business/resource/gsp/comps/gsp/Bj.vue
index 56b7d74..6a1af9a 100644
--- a/src/views/business/resource/gsp/comps/gsp/Bj.vue
+++ b/src/views/business/resource/gsp/comps/gsp/Bj.vue
@@ -49,7 +49,7 @@
-
+
diff --git a/src/views/business/resource/gsp/comps/gsp/Xz.vue b/src/views/business/resource/gsp/comps/gsp/Xz.vue
index a579509..74f4520 100644
--- a/src/views/business/resource/gsp/comps/gsp/Xz.vue
+++ b/src/views/business/resource/gsp/comps/gsp/Xz.vue
@@ -61,7 +61,7 @@
-
+
diff --git a/src/views/business/resource/gsp/comps/rkjl/Bj.vue b/src/views/business/resource/gsp/comps/rkjl/Bj.vue
index 9a9f254..0e1d22e 100644
--- a/src/views/business/resource/gsp/comps/rkjl/Bj.vue
+++ b/src/views/business/resource/gsp/comps/rkjl/Bj.vue
@@ -63,7 +63,7 @@
-
+
diff --git a/src/views/business/resource/gsp/comps/rkjl/Xz.vue b/src/views/business/resource/gsp/comps/rkjl/Xz.vue
index fbca554..75f39f1 100644
--- a/src/views/business/resource/gsp/comps/rkjl/Xz.vue
+++ b/src/views/business/resource/gsp/comps/rkjl/Xz.vue
@@ -64,7 +64,7 @@
-
+
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Bj.vue b/src/views/business/resource/gyzj/comps/gyzj/Bj.vue
index b7ace92..e5e83d0 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Bj.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Bj.vue
@@ -46,7 +46,7 @@
-
+
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Cc.vue b/src/views/business/resource/gyzj/comps/gyzj/Cc.vue
index 9047777..b33a621 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Cc.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Cc.vue
@@ -25,7 +25,7 @@
-
+
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Gh.vue b/src/views/business/resource/gyzj/comps/gyzj/Gh.vue
index a7e54f2..e016ad2 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Gh.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Gh.vue
@@ -80,7 +80,7 @@
-
+
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Rk.vue b/src/views/business/resource/gyzj/comps/gyzj/Rk.vue
index 9c29bb7..893b491 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Rk.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Rk.vue
@@ -46,7 +46,7 @@
-
+
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Sqgh.vue b/src/views/business/resource/gyzj/comps/gyzj/Sqgh.vue
index 55fd3a0..b60d529 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Sqgh.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Sqgh.vue
@@ -80,7 +80,7 @@
-
+
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Sqrk.vue b/src/views/business/resource/gyzj/comps/gyzj/Sqrk.vue
index 35da436..b078244 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Sqrk.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Sqrk.vue
@@ -47,7 +47,7 @@
-
+
diff --git a/src/views/business/resource/mjy/comps/mjy/Bj.vue b/src/views/business/resource/mjy/comps/mjy/Bj.vue
index 4414fa4..db8ab5f 100644
--- a/src/views/business/resource/mjy/comps/mjy/Bj.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Bj.vue
@@ -46,7 +46,7 @@
-
+
diff --git a/src/views/business/resource/mjy/comps/mjy/Cc.vue b/src/views/business/resource/mjy/comps/mjy/Cc.vue
index 7cf1aae..b4bdaa6 100644
--- a/src/views/business/resource/mjy/comps/mjy/Cc.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Cc.vue
@@ -25,7 +25,7 @@
-
+
diff --git a/src/views/business/resource/mjy/comps/mjy/Gh.vue b/src/views/business/resource/mjy/comps/mjy/Gh.vue
index 36bcfe7..4c4b0d1 100644
--- a/src/views/business/resource/mjy/comps/mjy/Gh.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Gh.vue
@@ -83,7 +83,7 @@
-
+
diff --git a/src/views/business/resource/mjy/comps/mjy/Rk.vue b/src/views/business/resource/mjy/comps/mjy/Rk.vue
index edd1505..721e108 100644
--- a/src/views/business/resource/mjy/comps/mjy/Rk.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Rk.vue
@@ -52,7 +52,7 @@
-
+
diff --git a/src/views/business/resource/sj/comps/Bj.vue b/src/views/business/resource/sj/comps/Bj.vue
index 0572020..89233fe 100644
--- a/src/views/business/resource/sj/comps/Bj.vue
+++ b/src/views/business/resource/sj/comps/Bj.vue
@@ -49,7 +49,7 @@
-
+
diff --git a/src/views/business/resource/yq/list.vue b/src/views/business/resource/yq/list.vue
index 63ebfa3..79866ba 100644
--- a/src/views/business/resource/yq/list.vue
+++ b/src/views/business/resource/yq/list.vue
@@ -115,7 +115,7 @@
-
+
diff --git a/src/views/business/storageLocation/list.vue b/src/views/business/storageLocation/list.vue
index f16b36a..672f62f 100644
--- a/src/views/business/storageLocation/list.vue
+++ b/src/views/business/storageLocation/list.vue
@@ -79,7 +79,7 @@
-
+
diff --git a/src/views/business/study/comp/tbbd/Bj.vue b/src/views/business/study/comp/tbbd/Bj.vue
index 192da25..b73cf4b 100644
--- a/src/views/business/study/comp/tbbd/Bj.vue
+++ b/src/views/business/study/comp/tbbd/Bj.vue
@@ -150,7 +150,7 @@
@@ -263,7 +263,7 @@