Merge branch 'master' of http://182.151.8.209:9010/eln_TD/eln_web

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({

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
   })
-}
+}
+//获取最新的sn号-table里面不同前缀获取所有
+export const getLatestSnArr = (data) => {
+  return request({
+    url: '/system/business/public/getSnArr',
+    method: 'post',
+    data
+  })
+}

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',

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: '仪器名称',

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;i<stepTableFormData.length;i++){
+					postSn.push({
+						pre:stepTableFormData[i].bh,
+						type:1
+					})
+				}
+				const result = await getLatestSnArr(postSn)
 				if(result.code == 200){
 					for(let i=0;i<stepTableFormData.length;i++){
 						this.$refs.tableRef.updateDataSourceByRowIndex(i,{

src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYHGZYWDX.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;i<stepTableFormData.length;i++){
+					postSn.push({
+						pre:stepTableFormData[i].bh,
+						type:1
+					})
+				}
+				const result = await getLatestSnArr(postSn)
 				if(result.code == 200){
 					for(let i=0;i<stepTableFormData.length;i++){
 						this.$refs.tableRef.updateDataSourceByRowIndex(i,{

src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/JZXY.vue

@@ -63,7 +63,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';
@@ -294,9 +294,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;i<stepTableFormData.length;i++){
+					postSn.push({
+						pre:stepTableFormData[i].bh,
+						type:1
+					})
+				}
+				const result = await getLatestSnArr(postSn)
 				if(result.code == 200){
 					for(let i=0;i<stepTableFormData.length;i++){
 						this.$refs.tableRef.updateDataSourceByRowIndex(i,{

src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/QXWDX.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;i<stepTableFormData.length;i++){
+					postSn.push({
+						pre:stepTableFormData[i].bh,
+						type:1
+					})
+				}
+				const result = await getLatestSnArr(postSn)
 				if(result.code == 200){
 					for(let i=0;i<stepTableFormData.length;i++){
 						this.$refs.tableRef.updateDataSourceByRowIndex(i,{

src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/RXJZXY.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;i<stepTableFormData.length;i++){
+					postSn.push({
+						pre:stepTableFormData[i].bh,
+						type:1
+					})
+				}
+				const result = await getLatestSnArr(postSn)
 				if(result.code == 200){
 					for(let i=0;i<stepTableFormData.length;i++){
 						this.$refs.tableRef.updateDataSourceByRowIndex(i,{

src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/Recovery.vue

@@ -72,7 +72,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, getSWYPFXFFXYPZBBTQHSLTableConfig } from "../../../formConfig/SWYPFXFFXYPZBBTableConfig.js";
 import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
 import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue';
@@ -366,9 +366,14 @@ export default {
 			// 基质表格
 			const {stepTableFormData = []} = v;
 			if(stepTableFormData && stepTableFormData.length>0 && !stepTableFormData[0].bhCode){
-				const result = await getLatestSn({
-					count: stepTableFormData.length,
-				})
+				let postSn = []
+				for(let i=0;i<stepTableFormData.length;i++){
+					postSn.push({
+						pre:stepTableFormData[i].bh,
+						type:1
+					})
+				}
+				const result = await getLatestSnArr(postSn)
 				if(result.code == 200){
 					for(let i=0;i<stepTableFormData.length;i++){
 						this.$refs.tableRef.updateDataSourceByRowIndex(i,{
@@ -389,9 +394,13 @@ export default {
 			// 溶液表格
 			const {stepTableFormData_1 = []} = v;
 			if(stepTableFormData_1 && stepTableFormData_1.length>0 && !stepTableFormData_1[0].bhCode){
-				const result = await getLatestSn({
-					count: stepTableFormData_1.length,
-				})
+				let postSn = []
+				for(let i=0;i<stepTableFormData_1.length;i++){
+					postSn.push({
+						pre:stepTableFormData_1[i].bh,
+						type:1
+					})
+				}
 				if(result.code == 200){
 					for(let i=0;i<stepTableFormData_1.length;i++){
 						this.$refs.rongyeTableRef.updateDataSourceByRowIndex(i,{

src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XSKKX.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;i<stepTableFormData.length;i++){
+					postSn.push({
+						pre:stepTableFormData[i].bh,
+						type:1
+					})
+				}
+				const result = await getLatestSnArr(postSn)
 				if(result.code == 200){
 					for(let i=0;i<stepTableFormData.length;i++){
 						this.$refs.tableRef.updateDataSourceByRowIndex(i,{

src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XZXHTYX.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;i<stepTableFormData.length;i++){
+					postSn.push({
+						pre:stepTableFormData[i].bh,
+						type:1
+					})
+				}
+				const result = await getLatestSnArr(postSn)
 				if(result.code == 200){
 					for(let i=0;i<stepTableFormData.length;i++){
 						this.$refs.tableRef.updateDataSourceByRowIndex(i,{

src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZDYBS.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;i<stepTableFormData.length;i++){
+					postSn.push({
+						pre:stepTableFormData[i].bh,
+						type:1
+					})
+				}
+				const result = await getLatestSnArr(postSn)
 				if(result.code == 200){
 					for(let i=0;i<stepTableFormData.length;i++){
 						this.$refs.tableRef.updateDataSourceByRowIndex(i,{

src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZQDYJMD.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;i<stepTableFormData.length;i++){
+					postSn.push({
+						pre:stepTableFormData[i].bh,
+						type:1
+					})
+				}
+				const result = await getLatestSnArr(postSn)
 				if(result.code == 200){
 					for(let i=0;i<stepTableFormData.length;i++){
 						this.$refs.tableRef.updateDataSourceByRowIndex(i,{

src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue

@@ -65,7 +65,7 @@ import TableList from "@/components/Template/Table";
 import Step from "@/components/Template/Step";
 import templateMixin from "../../mixins/templateMixin.js";
 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';
@@ -289,9 +289,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;i<stepTableFormData.length;i++){
+					postSn.push({
+						pre:stepTableFormData[i].bh,
+						type:1
+					})
+				}
+				const result = await getLatestSnArr(postSn)
 				if(result.code == 200){
 					for(let i=0;i<stepTableFormData.length;i++){
 						this.$refs.tableRef.updateDataSourceByRowIndex(i,{

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,11 +123,11 @@ export default {
 			formData: {},
 			templateDetail: {},
 			resource: [], //试验试剂信息
+			wzResource: [], //物资信息
 			yqResource: [], //仪器信息
+
 			resourceTmp:[],//试验试剂信息提交用
 			yqResourceTmp: [], //仪器信息提交用
-			yqResourceTmpStep:[],//步骤仪器信息
-			resourceTmpStep:[],//步骤试验试剂信息
 			sysjColumns: [
 				{ label: 'template.common.reagentName', prop: "mc" },//名称
 				{ label: 'template.common.reagentCode', prop: "bh" },//编号
@@ -129,6 +136,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" },//仪器型号

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,