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 + }) +} diff --git a/src/lang/en/template/commonTemplate.js b/src/lang/en/template/commonTemplate.js index 3a6dc05..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', @@ -50,6 +51,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..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: '操作步骤', @@ -50,6 +51,13 @@ export default { concentration: '浓度/含量/纯度', source: '来源', reagentExpireDate: '失效日', + + // 物资信息列 + wzName: '名称', + wzCode: '编号', + wzConcentration: '浓度', + wzSource: '物资来源', + wzExpireDate: '失效日', // 仪器使用信息列 instrumentName: '仪器名称', 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