diff --git a/src/lang/en/template/dj.js b/src/lang/en/template/dj.js index ae74580..bab65c4 100644 --- a/src/lang/en/template/dj.js +++ b/src/lang/en/template/dj.js @@ -3,8 +3,8 @@ export default { dj001: { syts: '试验天数', fhfw: '复核范围', - fhlr: '复核内容', - }, + fhlr: '复核内容' + }, //dj002复用dj003 dj003: { yplx: '样品类型', @@ -13,7 +13,7 @@ export default { cyd: '采样点', ypmc: '样品名称', dwbh: '动物编号', - cysj: '采样时间', + cysj: '采样开始时间', sjbd: '时间比对', sjbd: '时间比对', yps: '样品数', @@ -21,6 +21,6 @@ export default { yjczxx: '移交处置信息', yjsj: '移交时间', hqsj: '获取时间', - dsfs: '递送方式', - }, + dsfs: '递送方式' + } } diff --git a/src/lang/en/template/xb.js b/src/lang/en/template/xb.js index d4fe6b6..d14c73a 100644 --- a/src/lang/en/template/xb.js +++ b/src/lang/en/template/xb.js @@ -1,7 +1,7 @@ //细胞 export default { xb001: { - jcsj: '检测时间', + jcsj: '操作时间', czbz: 'Operation Workflow', qtbz: '其他步骤', fj: 'Attachment', @@ -11,6 +11,5 @@ export default { ks: 'Start', js: 'End', fysc: '孵育时长(hr: min)' - }, - + } } diff --git a/src/lang/zh/template/dj.js b/src/lang/zh/template/dj.js index ae74580..bab65c4 100644 --- a/src/lang/zh/template/dj.js +++ b/src/lang/zh/template/dj.js @@ -3,8 +3,8 @@ export default { dj001: { syts: '试验天数', fhfw: '复核范围', - fhlr: '复核内容', - }, + fhlr: '复核内容' + }, //dj002复用dj003 dj003: { yplx: '样品类型', @@ -13,7 +13,7 @@ export default { cyd: '采样点', ypmc: '样品名称', dwbh: '动物编号', - cysj: '采样时间', + cysj: '采样开始时间', sjbd: '时间比对', sjbd: '时间比对', yps: '样品数', @@ -21,6 +21,6 @@ export default { yjczxx: '移交处置信息', yjsj: '移交时间', hqsj: '获取时间', - dsfs: '递送方式', - }, + dsfs: '递送方式' + } } diff --git a/src/lang/zh/template/xb.js b/src/lang/zh/template/xb.js index 4fd7225..efe629f 100644 --- a/src/lang/zh/template/xb.js +++ b/src/lang/zh/template/xb.js @@ -1,7 +1,7 @@ //细胞 export default { xb001: { - jcsj: '检测时间', + jcsj: '操作时间', czbz: '操作步骤', qtbz: '其他步骤', fj: '附件', @@ -11,6 +11,5 @@ export default { ks: '开始', js: '结束', fysc: '孵育时长(hr: min)' - }, - + } } diff --git a/src/views/business/comps/template/comps/gsp/DMYPPZJLB.vue b/src/views/business/comps/template/comps/gsp/DMYPPZJLB.vue index 092b1ca..5cd3401 100644 --- a/src/views/business/comps/template/comps/gsp/DMYPPZJLB.vue +++ b/src/views/business/comps/template/comps/gsp/DMYPPZJLB.vue @@ -134,19 +134,6 @@ export default { type: "input", disabled: true, }, - methodCode: { - label: 'template.common.methodCode', - type: "input", - fillType: "preFill", - maxlength: 50 - }, - versionNum: { - label: 'template.common.versionNumber', - type: "inputNumber", - fillType: "preFill", - prepend: "V", - maxlength: 50 - }, } }, diff --git a/src/views/business/comps/template/comps/gsp/GSP001.vue b/src/views/business/comps/template/comps/gsp/GSP001.vue index 7a0b367..eb1f255 100644 --- a/src/views/business/comps/template/comps/gsp/GSP001.vue +++ b/src/views/business/comps/template/comps/gsp/GSP001.vue @@ -70,6 +70,10 @@ export default { type: String, default: 'preFill', }, + sn: { + type: String, + default: '', + }, }, provide() { return { @@ -119,7 +123,61 @@ export default { }, // 试验基本信息表单配制 baseInfoFormConfig() { - return [ + return this.sn==='GG005'?[ + { + type: "cardItem", + config: { + studyMc: { + label: 'template.common.testName', + type: "input", + disabled: true, + }, + studySn: { + label: 'template.common.testNumber', + type: "input", + disabled: true, + }, + + } + }, + { + type: "conditionItem", + label: 'template.common.testConfigurationConditions', + config: { + pre: { + label: 'template.common.preFill', + type: "select", + multiple: true, + fillType: "preFill", + options: this.getDictOptions('business_pztj'), + otherCode: "preOther", + }, + act: { + label: 'template.common.actualFill', + type: "select", + fillType: "actFill", + otherCode: "actOther", otherCodeCompareTo: "preOther", + multiple: true, + compareTo: "pre", + options: this.getDictOptions('business_pztj') + } + } + }, + { + type: "cellItem", + label: 'template.common.configurationTime', + config: { + startDate: { + label: 'template.common.startTime', + type: "input", + }, + endDate: { + label: 'template.common.endTime', + type: "input", + }, + } + } + ]:[ { type: "cardItem", config: { diff --git a/src/views/business/comps/template/comps/gsp/GSP002.vue b/src/views/business/comps/template/comps/gsp/GSP002.vue index 203c908..b596423 100644 --- a/src/views/business/comps/template/comps/gsp/GSP002.vue +++ b/src/views/business/comps/template/comps/gsp/GSP002.vue @@ -126,7 +126,74 @@ export default { }, // 试验基本信息表单配制 baseInfoFormConfig() { - return [ + return this.sn==='GG006'?[ + { + type: 'cardItem', + config: { + studyMc: { + label: 'template.common.testName', + type: 'input', + disabled: true + }, + studySn: { + label: 'template.common.testNumber', + type: 'input', + disabled: true + }, + } + }, + { + type: 'conditionItem', + label: 'template.common.testConfigurationConditions', + config: { + pre: { + label: 'template.common.preFill', + type: 'select', + multiple: true, + fillType: 'preFill', + options: this.getDictOptions('business_pztj'), + otherCode: 'preOther' + }, + act: { + label: 'template.common.actualFill', + type: 'select', + fillType: 'actFill', + otherCode: 'actOther', + multiple: true, + options: this.getDictOptions('business_pztj'), + compareTo: 'pre' + } + } + }, + { + type: 'conditionItem', + label: 'template.sp.sp00456.rqcz', + config: { + containerMaterial: { + label: 'template.sp.sp00456.rqcz', + type: 'select', + options: this.getDictOptions('business_rqcz'), + fillType: 'actFill', + multiple: true, + otherCode: 'containerMaterialOther' + } + } + }, + { + type: 'cellItem', + label: 'template.common.configurationTime', + config: { + startDate: { + label: 'template.common.startTime', + type: 'input' + }, + endDate: { + label: 'template.common.endTime', + type: 'input' + } + } + } + ]:[ { type: 'cardItem', config: { @@ -206,7 +273,7 @@ export default { } } } - ]; + ] }, paralleStepFormConfig() { return [ diff --git a/src/views/business/comps/template/comps/sp/SP001.vue b/src/views/business/comps/template/comps/sp/SP001.vue index a72c085..1a0a798 100644 --- a/src/views/business/comps/template/comps/sp/SP001.vue +++ b/src/views/business/comps/template/comps/sp/SP001.vue @@ -104,8 +104,8 @@ export default { }, // 试验基本信息表单配制 baseInfoFormConfig() { - //毒理002没得方法编号和版本号 - let baseConfig = this.sn=='DL002'? + //毒理002+GG003+GG004没得方法编号和版本号 + let baseConfig = this.sn=='DL002' || this.sn=='GG003' || this.sn=='GG004'? { studyMc: { label: 'template.common.testName',