From 36157bfaab8429859075ac2621cf6a614611f598 Mon Sep 17 00:00:00 2001 From: memorylkf <312904636@qq.com> Date: Tue, 7 Apr 2026 10:04:21 +0800 Subject: [PATCH 1/7] =?UTF-8?q?fix:=20[=E6=A8=A1=E6=9D=BF=E7=AE=A1?= =?UTF-8?q?=E7=90=86]=20dl022?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Template/StepComponents/ry/ym.vue | 2 +- src/views/business/comps/template/comps/dl/DL022.vue | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/Template/StepComponents/ry/ym.vue b/src/components/Template/StepComponents/ry/ym.vue index a29a8a5..9000e24 100644 --- a/src/components/Template/StepComponents/ry/ym.vue +++ b/src/components/Template/StepComponents/ry/ym.vue @@ -37,7 +37,7 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js'; fillType:"actFill", }, text3:{ - label:"仪器，吸取", + label:"仪器，加入", type:"text", }, ry1:{ diff --git a/src/views/business/comps/template/comps/dl/DL022.vue b/src/views/business/comps/template/comps/dl/DL022.vue index ac8240a..556f978 100644 --- a/src/views/business/comps/template/comps/dl/DL022.vue +++ b/src/views/business/comps/template/comps/dl/DL022.vue @@ -304,6 +304,7 @@ export default { onAddRow() { this.$refs.tableRef.addRow({ jblx: [{ value: undefined }], + id: getuuid(), }) }, onFormSelect(fields) { From c406abea70e8e137378f49489618e2fc1cd01d07 Mon Sep 17 00:00:00 2001 From: memorylkf <312904636@qq.com> Date: Tue, 7 Apr 2026 10:29:49 +0800 Subject: [PATCH 2/7] =?UTF-8?q?feat:=20[=E6=A8=A1=E6=9D=BF=E7=AE=A1?= =?UTF-8?q?=E7=90=86]=20=E8=AF=95=E5=89=82/=E4=BE=9B=E8=AF=95=E5=93=81/?= =?UTF-8?q?=E7=BB=99=E8=8D=AF=E5=88=B6=E5=89=82=20->=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E5=99=A8=E5=8A=A0=E4=B8=80=E5=88=97=E5=BA=93=E5=AD=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../comps/template/formConfig/formConfig.js | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/views/business/comps/template/formConfig/formConfig.js b/src/views/business/comps/template/formConfig/formConfig.js index 7029d17..4190c0a 100644 --- a/src/views/business/comps/template/formConfig/formConfig.js +++ b/src/views/business/comps/template/formConfig/formConfig.js @@ -67,6 +67,13 @@ export const getSjColumns = () => { label: 'page.business.resource.sj.sjbh' }, { + prop: 'kcl', + label: 'page.business.resource.sj.kcl', + formatter: (row) => { + return row.kc + row.kcdw + } + }, + { prop: 'nd', label: 'page.business.resource.sj.sjnd' }, @@ -96,6 +103,13 @@ export const getGspColumns = () => { label: 'page.business.resource.sj.sjbh' }, { + prop: 'kcl', + label: 'page.business.resource.sj.kcl', + formatter: (row) => { + return row.kc + row.kcdw + } + }, + { prop: 'yxq', label: '有效期' }, @@ -117,6 +131,13 @@ export const getGyzjColumns = () => { label: 'page.business.resource.sj.sjbh' }, { + prop: 'kcl', + label: 'page.business.resource.sj.kcl', + formatter: (row) => { + return row.kc + row.kcdw + } + }, + { prop: 'nd', label: 'page.business.resource.sj.sjnd' }, From bf1b239fb833102fb54b6ec178eaab934ff4d4ad Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Tue, 7 Apr 2026 13:30:59 +0800 Subject: [PATCH 3/7] =?UTF-8?q?fix:[=E9=A2=84=E5=A1=AB=E8=A1=A8=E5=8D=95]?= =?UTF-8?q?=E5=A1=AB=E6=8A=A5=E6=B8=85=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/business/study/comp/ytbd/Xq.vue | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/views/business/study/comp/ytbd/Xq.vue b/src/views/business/study/comp/ytbd/Xq.vue index 196b9fb..5a84478 100644 --- a/src/views/business/study/comp/ytbd/Xq.vue +++ b/src/views/business/study/comp/ytbd/Xq.vue @@ -56,7 +56,7 @@ -
+
@@ -88,8 +88,8 @@ - + @@ -177,12 +177,15 @@ export default { }, methods: { showTianbao() { + if (this.searchForm.studySubjectId && this.searchForm.studySubjectId !== '') { this.$modal.loading() studyMethod_getReadAllMethodStatus({ userId: this.id, studyId: this.searchForm.studyId, studySubjectId: this.searchForm.studySubjectId }).then(response => { if (response.data.toUrl) { this.toRead(response.data) } else { + this.formApprove.remark = null + this.formApprove.qmrmm = null this.openApprove = true } }).finally(() => { From 4b5ce3d8cbc0467d5c86094fed883c4d7411e95c Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Tue, 7 Apr 2026 14:13:49 +0800 Subject: [PATCH 4/7] =?UTF-8?q?fix:[=E8=A1=A8=E5=8D=95=E7=AE=A1=E7=90=86]?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 1 + .env.production | 1 + src/views/business/comps/template/comps/gsp/GSP015.vue | 1 + src/views/business/resource/gsp/comps/gsp/Xq.vue | 3 ++- src/views/business/resource/gyzj/comps/gyzj/Xq.vue | 3 ++- src/views/business/resource/mjy/comps/mjy/Xq.vue | 3 ++- src/views/business/resource/sj/comps/Xq.vue | 2 +- src/views/business/study/comp/tbbd/Xq.vue | 3 ++- 8 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.env.development b/.env.development index 4391aff..439cdac 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,6 @@ # 页面标题 VUE_APP_TITLE = 华西海圻实验室电子记录系统 +VUE_APP_TITLE_EN = WCFP Electronic Laboratory Notebook # 开发环境配置 ENV = 'development' diff --git a/.env.production b/.env.production index 1e483e5..c2612ac 100644 --- a/.env.production +++ b/.env.production @@ -1,5 +1,6 @@ # 页面标题 VUE_APP_TITLE = 华西海圻实验室电子记录系统 +VUE_APP_TITLE_EN = WCFP Electronic Laboratory Notebook # 生产环境配置 ENV = 'production' diff --git a/src/views/business/comps/template/comps/gsp/GSP015.vue b/src/views/business/comps/template/comps/gsp/GSP015.vue index 2478c32..43dcb8f 100644 --- a/src/views/business/comps/template/comps/gsp/GSP015.vue +++ b/src/views/business/comps/template/comps/gsp/GSP015.vue @@ -216,6 +216,7 @@ export default { refConfig, currentIndex: -1, appTitle: process.env.VUE_APP_TITLE, + appTitleEn: process.env.VUE_APP_TITLE_EN, baseUrl: process.env.VUE_APP_FILE_DOMAIN, uploadFileUrl: process.env.VUE_APP_BASE_API + '/file/upload', // 上传文件服务器地址 }; diff --git a/src/views/business/resource/gsp/comps/gsp/Xq.vue b/src/views/business/resource/gsp/comps/gsp/Xq.vue index 6f2045a..dc7b271 100644 --- a/src/views/business/resource/gsp/comps/gsp/Xq.vue +++ b/src/views/business/resource/gsp/comps/gsp/Xq.vue @@ -136,6 +136,7 @@ export default { data() { return { appTitle: process.env.VUE_APP_TITLE, + appTitleEn: process.env.VUE_APP_TITLE_EN, form: {}, tzList: [], totalTz: 0, @@ -160,7 +161,7 @@ export default { methods: { exportPDF() { this.$modal.loading() - exportDetail({ id: this.form.id,lang:this.$store.getters.language.split("_")[0],version:this.appTitle }).then(response => { + exportDetail({ id: this.form.id,lang:this.$store.getters.language.split("_")[0],version:this.$store.getters.language.split("_")[0]=='zh'?this.appTitle:this.appTitleEn }).then(response => { window.open(process.env.VUE_APP_FILE_DOMAIN +response.msg) this.saveSimpleLog({name:this.form.bh,nameEn:this.form.bh,jcmc:'供试品导出',jcmcEn:'Test Item Export'}) this.$modal.closeLoading() diff --git a/src/views/business/resource/gyzj/comps/gyzj/Xq.vue b/src/views/business/resource/gyzj/comps/gyzj/Xq.vue index 3bb2f68..b9cd79a 100644 --- a/src/views/business/resource/gyzj/comps/gyzj/Xq.vue +++ b/src/views/business/resource/gyzj/comps/gyzj/Xq.vue @@ -163,6 +163,7 @@ export default { return { form: {}, appTitle: process.env.VUE_APP_TITLE, + appTitleEn: process.env.VUE_APP_TITLE_EN, tzList: [], totalTz: 0, loadingTz: true, @@ -186,7 +187,7 @@ export default { methods: { exportExcel() { this.$modal.loading() - exportDetail({ id: this.form.id,lang:this.$store.getters.language.split("_")[0],version:this.appTitle }).then(response => { + exportDetail({ id: this.form.id,lang:this.$store.getters.language.split("_")[0],version:this.$store.getters.language.split("_")[0]=='zh'?this.appTitle:this.appTitleEn }).then(response => { window.open(process.env.VUE_APP_FILE_DOMAIN +response.msg) this.$modal.closeLoading() }).finally(() => { diff --git a/src/views/business/resource/mjy/comps/mjy/Xq.vue b/src/views/business/resource/mjy/comps/mjy/Xq.vue index bde5a58..a78f7cc 100644 --- a/src/views/business/resource/mjy/comps/mjy/Xq.vue +++ b/src/views/business/resource/mjy/comps/mjy/Xq.vue @@ -161,6 +161,7 @@ export default { return { form: {}, appTitle: process.env.VUE_APP_TITLE, + appTitleEn: process.env.VUE_APP_TITLE_EN, tzList: [], totalTz: 0, loadingTz: true, @@ -184,7 +185,7 @@ export default { methods: { exportExcel() { this.$modal.loading() - exportDetail({ id: this.form.id,lang:this.$store.getters.language.split("_")[0],version:this.appTitle }).then(response => { + exportDetail({ id: this.form.id,lang:this.$store.getters.language.split("_")[0],version:this.$store.getters.language.split("_")[0]=='zh'?this.appTitle:this.appTitleEn }).then(response => { window.open(process.env.VUE_APP_FILE_DOMAIN +response.msg) this.$modal.closeLoading() }).finally(() => { diff --git a/src/views/business/resource/sj/comps/Xq.vue b/src/views/business/resource/sj/comps/Xq.vue index 7256d25..09e825a 100644 --- a/src/views/business/resource/sj/comps/Xq.vue +++ b/src/views/business/resource/sj/comps/Xq.vue @@ -190,7 +190,7 @@ export default { methods: { exportPDF() { this.$modal.loading() - exportDetail({ id: this.form.id,lang:this.$store.getters.language.split("_")[0],version:this.appTitle }).then(response => { + exportDetail({ id: this.form.id,lang:this.$store.getters.language.split("_")[0],version:this.$store.getters.language.split("_")[0]=='zh'?this.appTitle:this.appTitleEn }).then(response => { window.open(process.env.VUE_APP_FILE_DOMAIN +response.msg) this.saveSimpleLog({name:this.form.bh,nameEn:this.form.bh,jcmc:'试剂导出',jcmcEn:'Reagent Export'}) this.$modal.closeLoading() diff --git a/src/views/business/study/comp/tbbd/Xq.vue b/src/views/business/study/comp/tbbd/Xq.vue index 3f6ce25..102972c 100644 --- a/src/views/business/study/comp/tbbd/Xq.vue +++ b/src/views/business/study/comp/tbbd/Xq.vue @@ -183,6 +183,7 @@ export default { return { watermarkText: '', appTitle: process.env.VUE_APP_TITLE, + appTitleEn: process.env.VUE_APP_TITLE_EN, baseUrl: process.env.VUE_APP_FILE_DOMAIN, uploadFileUrl: process.env.VUE_APP_BASE_API + '/file/upload', // 上传文件服务器地址 opacity: 0.8, @@ -403,7 +404,7 @@ export default { url: data.data.url, studyFormFillId: this.form.id, jcgjlx: this.jcgjlxExport, - version:this.appTitle, + version:this.$store.getters.language.split("_")[0]=='zh'?this.appTitle:this.appTitleEn, lang: this.$store.getters.language.split("_")[0] } ).then(response => { From ca3ee99565043133b3ee9b65193c8fd69fa5b467 Mon Sep 17 00:00:00 2001 From: memorylkf <312904636@qq.com> Date: Tue, 7 Apr 2026 14:58:17 +0800 Subject: [PATCH 5/7] =?UTF-8?q?fix:=20[=E7=B3=BB=E7=BB=9F=E7=AE=A1?= =?UTF-8?q?=E7=90=86]=20=E7=BD=91=E7=BB=9C=E5=BC=82=E5=B8=B8=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/request.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/request.js b/src/utils/request.js index 748c514..69a8f45 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -245,7 +245,7 @@ service.interceptors.response.use( console.log('err' + error) let { message } = error if (message == 'Network Error') { - message = '后端接口连接异常' + message = '网络异常，请检查网络' } else if (message.includes('timeout')) { message = '系统接口请求超时' } else if (message.includes('Request failed with status code')) { From b552a8219911a20f26cf7b0d28f08d6e6c430766 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Tue, 7 Apr 2026 15:35:17 +0800 Subject: [PATCH 6/7] =?UTF-8?q?FIX:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86]?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- .env.production | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.env.development b/.env.development index 439cdac..947d501 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,5 @@ # 页面标题 -VUE_APP_TITLE = 华西海圻实验室电子记录系统 +VUE_APP_TITLE = 华西海圻实验室电子记录系统V1.0 VUE_APP_TITLE_EN = WCFP Electronic Laboratory Notebook # 开发环境配置 diff --git a/.env.production b/.env.production index c2612ac..5d50a5d 100644 --- a/.env.production +++ b/.env.production @@ -1,5 +1,5 @@ # 页面标题 -VUE_APP_TITLE = 华西海圻实验室电子记录系统 +VUE_APP_TITLE = 华西海圻实验室电子记录系统V1.0 VUE_APP_TITLE_EN = WCFP Electronic Laboratory Notebook # 生产环境配置 From 45b6c870dd8c43031a270bc721188a40a7d7fe77 Mon Sep 17 00:00:00 2001 From: memorylkf <312904636@qq.com> Date: Tue, 7 Apr 2026 16:05:21 +0800 Subject: [PATCH 7/7] =?UTF-8?q?feat:=20[=E6=A8=A1=E6=9D=BF=E7=AE=A1?= =?UTF-8?q?=E7=90=86]=20=E9=9D=9E=E8=AF=95=E9=AA=8C=E4=B8=8B=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E4=B8=8D=E9=9C=80=E8=A6=81=E6=96=B9=E6=B3=95=E7=BC=96?= =?UTF-8?q?=E5=8F=B7=E5=92=8C=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lang/en/template/dj.js | 10 +-- src/lang/en/template/xb.js | 5 +- src/lang/zh/template/dj.js | 10 +-- src/lang/zh/template/xb.js | 5 +- .../comps/template/comps/gsp/DMYPPZJLB.vue | 13 ---- .../business/comps/template/comps/gsp/GSP001.vue | 60 +++++++++++++++++- .../business/comps/template/comps/gsp/GSP002.vue | 71 +++++++++++++++++++++- .../business/comps/template/comps/sp/SP001.vue | 4 +- 8 files changed, 144 insertions(+), 34 deletions(-) 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',