From 94145c723ca9446da3e8ca4915c9b13352b141f0 Mon Sep 17 00:00:00 2001 From: memorylkf <312904636@qq.com> Date: Fri, 30 Jan 2026 20:26:40 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20[=E6=A8=A1=E6=9D=BF=E7=AE=A1?= =?UTF-8?q?=E7=90=86]=20=E8=8E=B7=E5=8F=96=E7=BC=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/business/public/public.js | 8 -------- src/api/template/index.js | 12 ++++++++++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/api/business/public/public.js b/src/api/business/public/public.js index 8055379..babc904 100644 --- a/src/api/business/public/public.js +++ b/src/api/business/public/public.js @@ -1,12 +1,4 @@ import request from '@/utils/request' -// 获取编号（参数count，没有参数或者count<=1返回1个string，>1就返回list） -export function public_getSn(query) { - return request({ - url: '/system/business/public/getSn', - method: 'get', - params: query - }) -} // 验证密码 export function public_checkPassword(data) { return request({ diff --git a/src/api/template/index.js b/src/api/template/index.js index 9320dc0..a9e4c79 100644 --- a/src/api/template/index.js +++ b/src/api/template/index.js @@ -9,11 +9,19 @@ export const getReagentList = (params) => { }) } -//获取最新的sn号 +//获取最新的sn号-同1个前缀一次获取多个 export const getLatestSn = (params) => { return request({ url: '/system/business/public/getSn', method: 'get', params }) -} \ No newline at end of file +} +//获取最新的sn号-table里面不同前缀获取所有 +export const getLatestSnArr = (data) => { + return request({ + url: '/system/business/public/getSnArr', + method: 'post', + data + }) +} From 26f39ce7b183045f7beeba6cbe168cb65b6ee9ff Mon Sep 17 00:00:00 2001 From: memorylkf <312904636@qq.com> Date: Fri, 30 Jan 2026 20:45:18 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:=20[=E6=A8=A1=E6=9D=BF=E7=AE=A1?= =?UTF-8?q?=E7=90=86]=20=E7=BC=96=E5=8F=B7=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../template/comps/sp/SWYPFXFFXYPZBB/CBYDB.vue | 13 ++++++++---- .../comps/sp/SWYPFXFFXYPZBB/CBYHGZYWDX.vue | 13 ++++++++---- .../template/comps/sp/SWYPFXFFXYPZBB/JZXY.vue | 13 ++++++++---- .../template/comps/sp/SWYPFXFFXYPZBB/QXWDX.vue | 13 ++++++++---- .../template/comps/sp/SWYPFXFFXYPZBB/RXJZXY.vue | 13 ++++++++---- .../template/comps/sp/SWYPFXFFXYPZBB/Recovery.vue | 23 +++++++++++++++------- .../template/comps/sp/SWYPFXFFXYPZBB/XSKKX.vue | 13 ++++++++---- .../template/comps/sp/SWYPFXFFXYPZBB/XZXHTYX.vue | 13 ++++++++---- .../template/comps/sp/SWYPFXFFXYPZBB/ZDYBS.vue | 13 ++++++++---- .../template/comps/sp/SWYPFXFFXYPZBB/ZQDYJMD.vue | 13 ++++++++---- .../comps/template/comps/sp/SWYPFXFFXZKPZB.vue | 13 ++++++++---- 11 files changed, 106 insertions(+), 47 deletions(-) diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYDB.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYDB.vue index b5c1a91..7f6fe93 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYDB.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYDB.vue @@ -65,7 +65,7 @@ import TableList from "@/components/Template/Table"; import Step from "@/components/Template/Step"; import templateMixin from "../../../mixins/templateMixin"; import CustomTable from '@/components/Template/CustomTable.vue'; -import { getLatestSn } from '@/api/template'; +import { getLatestSnArr } from '@/api/template'; import {getSWYPFXFFXYPZBBTableConfig} from "../../../formConfig/SWYPFXFFXYPZBBTableConfig.js"; import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue" import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue'; @@ -306,9 +306,14 @@ export default { async getCode(v){ const {stepTableFormData = []} = v; if(stepTableFormData && stepTableFormData.length>0 && !stepTableFormData[0].bhCode){ - const result = await getLatestSn({ - count: stepTableFormData.length, - }) + let postSn = [] + for(let i=0;i0 && !stepTableFormData[0].bhCode){ - const result = await getLatestSn({ - count: stepTableFormData.length, - }) + let postSn = [] + for(let i=0;i0 && !stepTableFormData[0].bhCode){ - const result = await getLatestSn({ - count: stepTableFormData.length, - }) + let postSn = [] + for(let i=0;i0 && !stepTableFormData[0].bhCode){ - const result = await getLatestSn({ - count: stepTableFormData.length, - }) + let postSn = [] + for(let i=0;i0 && !stepTableFormData[0].bhCode){ - const result = await getLatestSn({ - count: stepTableFormData.length, - }) + let postSn = [] + for(let i=0;i0 && !stepTableFormData[0].bhCode){ - const result = await getLatestSn({ - count: stepTableFormData.length, - }) + let postSn = [] + for(let i=0;i0 && !stepTableFormData_1[0].bhCode){ - const result = await getLatestSn({ - count: stepTableFormData_1.length, - }) + let postSn = [] + for(let i=0;i0 && !stepTableFormData[0].bhCode){ - const result = await getLatestSn({ - count: stepTableFormData.length, - }) + let postSn = [] + for(let i=0;i0 && !stepTableFormData[0].bhCode){ - const result = await getLatestSn({ - count: stepTableFormData.length, - }) + let postSn = [] + for(let i=0;i0 && !stepTableFormData[0].bhCode){ - const result = await getLatestSn({ - count: stepTableFormData.length, - }) + let postSn = [] + for(let i=0;i0 && !stepTableFormData[0].bhCode){ - const result = await getLatestSn({ - count: stepTableFormData.length, - }) + let postSn = [] + for(let i=0;i0 && !stepTableFormData[0].bhCode){ - const result = await getLatestSn({ - count: stepTableFormData.length, - }) + let postSn = [] + for(let i=0;i Date: Fri, 30 Jan 2026 20:54:50 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat=EF=BC=9A[=E6=A8=A1=E6=9D=BF=E7=AE=A1?= =?UTF-8?q?=E7=90=86]=E6=96=B0=E5=A2=9E=E8=AF=95=E9=AA=8C=E7=89=A9?= =?UTF-8?q?=E8=B5=84=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lang/en/template/commonTemplate.js | 7 +++++++ src/lang/zh/template/commonTemplate.js | 7 +++++++ .../business/comps/template/mixins/templateMixin.js | 19 +++++++++++++++++-- src/views/business/study/comp/sqbd/Bj.vue | 4 ++-- 4 files changed, 33 insertions(+), 4 deletions(-) diff --git a/src/lang/en/template/commonTemplate.js b/src/lang/en/template/commonTemplate.js index 3a6dc05..8194440 100644 --- a/src/lang/en/template/commonTemplate.js +++ b/src/lang/en/template/commonTemplate.js @@ -50,6 +50,13 @@ export default { source: 'Source', reagentExpireDate: 'Expiration Date', + // 物资信息列 + wzName: 'Name', + wzCode: 'Item Number', + wzConcentration: 'Concentration', + wzSource: 'Source', + wzExpireDate: 'Expiration Date', + // 仪器使用信息列 instrumentName: 'Instrument Name', instrumentModel: 'Instrument Model', diff --git a/src/lang/zh/template/commonTemplate.js b/src/lang/zh/template/commonTemplate.js index 53e19b5..b4dbddd 100644 --- a/src/lang/zh/template/commonTemplate.js +++ b/src/lang/zh/template/commonTemplate.js @@ -50,6 +50,13 @@ export default { concentration: '浓度/含量/纯度', source: '来源', reagentExpireDate: '失效日', + + // 物资信息列 + wzName: '名称', + wzCode: '编号', + wzConcentration: '浓度', + wzSource: '物资来源', + wzExpireDate: '失效日', // 仪器使用信息列 instrumentName: '仪器名称', diff --git a/src/views/business/comps/template/mixins/templateMixin.js b/src/views/business/comps/template/mixins/templateMixin.js index dee709e..d41b1ec 100644 --- a/src/views/business/comps/template/mixins/templateMixin.js +++ b/src/views/business/comps/template/mixins/templateMixin.js @@ -51,8 +51,15 @@ export default { id } = v if (v.resource) { - //试验试剂信息 - this.resource = JSON.parse(v.resource) + // 试验物质：供试品、给药制剂 + // 试验试剂：试剂 + //试验试剂信息 type 类型：1：试剂；3：给药制剂；5：麻精药；7：供试品 + this.resource = _.filter(JSON.parse(v.resource),function(o){ + return o.type==1 + }) + this.resourceWz =_.filter(JSON.parse(v.resource),function(o){ + return o.type==3||o.type==7 + }) } if (v.yqResource) { //仪器信息 @@ -116,6 +123,7 @@ export default { formData: {}, templateDetail: {}, resource: [], //试验试剂信息 + resourceWz: [], //物资信息 yqResource: [], //仪器信息 resourceTmp:[],//试验试剂信息提交用 yqResourceTmp: [], //仪器信息提交用 @@ -129,6 +137,13 @@ export default { { label: 'template.common.source', prop: "source" },//来源 { label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期 ], + sywzColumns: [ + { label: 'template.common.wzName', prop: "mc" },//名称 + { label: 'template.common.wzCode', prop: "bh" },//编号 + { label: 'template.common.wzSource', prop: "source" },//来源 + { label: 'template.common.wzConcentration', prop: "nd" },//浓度 + { label: 'template.common.wzExpireDate', prop: "sxrq" },//失效日期 + ], yqsColumns: [ { label: 'template.common.instrumentName', prop: "mc" },//仪器名称 { label: 'template.common.instrumentModel', prop: "xh" },//仪器型号 diff --git a/src/views/business/study/comp/sqbd/Bj.vue b/src/views/business/study/comp/sqbd/Bj.vue index 64c25e7..1fa4afe 100644 --- a/src/views/business/study/comp/sqbd/Bj.vue +++ b/src/views/business/study/comp/sqbd/Bj.vue @@ -249,10 +249,10 @@ export default { id: null, studyId: null, bdbh: null, - bdmc: '麻醉/精神药品配制/领取申请单', + bdmc: '麻精药领取申请单', bdsm: null, templateId: 2, - templateMc: '麻醉/精神药品配制/领取申请单', + templateMc: '麻精药领取申请单', templateSn: 'MJYLQSQD', bdnr: null, fzrsh: null, From 1c9236499cca02bd70a3d561d54d562a0619e195 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Fri, 30 Jan 2026 21:03:17 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix=EF=BC=9A[=E6=A8=A1=E6=9D=BF=E7=AE=A1?= =?UTF-8?q?=E7=90=86]bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lang/en/template/commonTemplate.js | 3 ++- src/lang/zh/template/commonTemplate.js | 1 + src/views/business/comps/template/mixins/templateMixin.js | 5 ++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/lang/en/template/commonTemplate.js b/src/lang/en/template/commonTemplate.js index 8194440..edff819 100644 --- a/src/lang/en/template/commonTemplate.js +++ b/src/lang/en/template/commonTemplate.js @@ -4,7 +4,8 @@ export default { // 标签 baseInfo: 'Study Basic Information', - reagentInfo: 'Test Reagent Information', + reagentInfo: 'Study Reagent Information', + wzInfo: 'Study Materials Information', instrumentInfo: 'Instrument Usage', storageCondition: 'Storage Conditions', operationSteps: 'Operation Workflow', diff --git a/src/lang/zh/template/commonTemplate.js b/src/lang/zh/template/commonTemplate.js index b4dbddd..6df59fb 100644 --- a/src/lang/zh/template/commonTemplate.js +++ b/src/lang/zh/template/commonTemplate.js @@ -5,6 +5,7 @@ export default { // 标签 baseInfo: '试验基本信息', reagentInfo: '试验试剂信息', + wzInfo: '试验物资信息', instrumentInfo: '仪器使用信息', storageCondition: '存储条件', operationSteps: '操作步骤', diff --git a/src/views/business/comps/template/mixins/templateMixin.js b/src/views/business/comps/template/mixins/templateMixin.js index d41b1ec..8153540 100644 --- a/src/views/business/comps/template/mixins/templateMixin.js +++ b/src/views/business/comps/template/mixins/templateMixin.js @@ -123,12 +123,11 @@ export default { formData: {}, templateDetail: {}, resource: [], //试验试剂信息 - resourceWz: [], //物资信息 + wzResource: [], //物资信息 yqResource: [], //仪器信息 + resourceTmp:[],//试验试剂信息提交用 yqResourceTmp: [], //仪器信息提交用 - yqResourceTmpStep:[],//步骤仪器信息 - resourceTmpStep:[],//步骤试验试剂信息 sysjColumns: [ { label: 'template.common.reagentName', prop: "mc" },//名称 { label: 'template.common.reagentCode', prop: "bh" },//编号