diff --git a/src/api/business/public/public.js b/src/api/business/public/public.js index 96d3658..f8d8b6a 100644 --- a/src/api/business/public/public.js +++ b/src/api/business/public/public.js @@ -131,3 +131,11 @@ export function public_saveSimpleLog(query) { params: query }) } +// 检测板 +export function public_jcbList(query) { + return request({ + url: '/system/business/public/jcbList', + method: 'get', + params: query + }) +} diff --git a/src/components/Template/HandleFormItem.vue b/src/components/Template/HandleFormItem.vue index 6dbfdcf..5c9e901 100644 --- a/src/components/Template/HandleFormItem.vue +++ b/src/components/Template/HandleFormItem.vue @@ -202,7 +202,7 @@ export default { visible: false,//是否显示弹窗 checkboxValue: this.getChecked(),//是否选中 uuid: getuuid(), // 唯一标识符,用于EventBus事件匹配 - regentType: ['sj', 'gsp', 'mix', 'xj', 'xb', 'gyzj', 'mjy', 'yq'], //试剂/仪器/供试品等类型 + regentType: ['sj', 'gsp', 'mix', 'xj', 'xb', 'gyzj', 'mjy', 'yq','jcb'], //试剂/仪器/供试品等类型 selectRegentInfo: {},//选择的试剂/仪器/供试品等信息 fileList: [],//上传的文件列表 uploadFileUrl: process.env.VUE_APP_BASE_API + "/file/upload", @@ -348,6 +348,7 @@ export default { mjy: "5",//麻精药 xj: "9",//细菌 xb: "11",//细胞 + jcb: "13",//检测板 } params = { ...params, diff --git a/src/lang/en/template/lba.js b/src/lang/en/template/lba.js index 5e0824f..69ae582 100644 --- a/src/lang/en/template/lba.js +++ b/src/lang/en/template/lba.js @@ -4,7 +4,9 @@ export default { lba002: { cztj: 'Work Condition', czsj: 'Work Time', - jcbmc: 'Analysis Plate Name' + jcbmc: 'Analysis Plate Name', + cjr: 'Creator', + cjsj: 'Creation Date' }, lba003: { jclc: 'Testing Process', diff --git a/src/lang/zh/template/lba.js b/src/lang/zh/template/lba.js index a6de2d6..ef20ee2 100644 --- a/src/lang/zh/template/lba.js +++ b/src/lang/zh/template/lba.js @@ -4,7 +4,9 @@ export default { lba002: { cztj: '操作条件', czsj: '操作时间', - jcbmc: '检测板名称' + jcbmc: '检测板名称', + cjr: '创建人', + cjsj: '创建时间' }, lba003: { jclc: '检测流程', diff --git a/src/views/business/comps/template/comps/lba/LBA002.vue b/src/views/business/comps/template/comps/lba/LBA002.vue index 95c515b..267750e 100644 --- a/src/views/business/comps/template/comps/lba/LBA002.vue +++ b/src/views/business/comps/template/comps/lba/LBA002.vue @@ -21,8 +21,9 @@ :formData="formData" :prefixKey = "`table`" fieldItemLabel = "template.common.operationSteps" + :showOperation="fillType === 'preFill'" > -