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

src/lang/zh/business/study/drug.js

@@ -36,7 +36,7 @@ export default {
   jd: '解档',
   js: '解锁',
 
-  create: '创建',
+  create: '创建精药文件夹',
   inputName: '请输入名称',
   inputSn: '请输入编号',
   inputLeader: '请选择负责人',

src/lang/zh/business/study/nonTrial.js

@@ -36,7 +36,7 @@ export default {
   jd: '解档',
   js: '解锁',
 
-  create: '创建',
+  create: '创建非试验',
   inputName: '请输入名称',
   inputSn: '请输入编号',
   inputLeader: '请选择负责人',

src/views/business/comps/template/TemplateTable.vue

@@ -28,17 +28,17 @@ import SP002 from "./comps/sp/SP002.vue";
 import SP003 from "./comps/sp/SP003.vue";
 import SP00456 from "./comps/sp/SP00456.vue";
 //色谱生物样品分析方法学样品制备表-10个类似
-import ZQDYJMD from "./comps/sp/SWYPFXFFXYPZBB/ZQDYJMD.vue";
-import QXWDX from "./comps/sp/SWYPFXFFXYPZBB/QXWDX.vue";
-import CBYHGZYWDX from "./comps/sp/SWYPFXFFXYPZBB/CBYHGZYWDX.vue";
-import Recovery from "./comps/sp/SWYPFXFFXYPZBB/Recovery.vue";
-import RXJZXY from "./comps/sp/SWYPFXFFXYPZBB/RXJZXY.vue";
-import JZXY from "./comps/sp/SWYPFXFFXYPZBB/JZXY.vue";
-import XZXHTYX from "./comps/sp/SWYPFXFFXYPZBB/XZXHTYX.vue";
-import ZDYBS from "./comps/sp/SWYPFXFFXYPZBB/ZDYBS.vue";
-import XSKKX from "./comps/sp/SWYPFXFFXYPZBB/XSKKX.vue";
-import CBYDB from "./comps/sp/SWYPFXFFXYPZBB/CBYDB.vue";
-import SWYPFXFFXZKPZB from "./comps/sp/SWYPFXFFXZKPZB.vue";
+import SP008 from "./comps/sp/SWYPFXFFXYPZBB/SP008.vue";
+import SP009 from "./comps/sp/SWYPFXFFXYPZBB/SP009.vue";
+import SP010 from "./comps/sp/SWYPFXFFXYPZBB/SP010.vue";
+import SP011 from "./comps/sp/SWYPFXFFXYPZBB/SP011.vue";
+import SP012 from "./comps/sp/SWYPFXFFXYPZBB/SP012.vue";
+import SP013 from "./comps/sp/SWYPFXFFXYPZBB/SP013.vue";
+import SP014 from "./comps/sp/SWYPFXFFXYPZBB/SP014.vue";
+import SP015 from "./comps/sp/SWYPFXFFXYPZBB/SP015.vue";
+import SP016 from "./comps/sp/SWYPFXFFXYPZBB/SP016.vue";
+import SP017 from "./comps/sp/SWYPFXFFXYPZBB/SP017.vue";
+import SP018 from "./comps/sp/SWYPFXFFXYPZBB/SP018.vue";
 import Demo from "./comps/sp/Demo.vue";
 //供试品
 import SYWZPZJHB from "./comps/gsp/SYWZPZJHB.vue";
@@ -54,7 +54,7 @@ export default {
     //供试品
     MJYLQSQD, SYWZPZJHB,
     //色谱
-    SP001, SP002, SP003, SP00456, ZQDYJMD, QXWDX, CBYHGZYWDX, Recovery, RXJZXY, JZXY, XZXHTYX, ZDYBS, XSKKX, CBYDB, SWYPFXFFXZKPZB
+    SP001, SP002, SP003, SP00456, SP008, SP009, SP010, SP011, SP012, SP013, SP014, SP015, SP016, SP017, SP018
   },
   props: {
     sn: {
@@ -86,17 +86,17 @@ export default {
           'SP004': 'SP00456',
           'SP005': 'SP00456',
           'SP006': 'SP00456',
-          'SP008': 'ZQDYJMD',
-          'SP009': 'Recovery',
-          'SP010': 'QXWDX',
-          'SP011': 'CBYHGZYWDX',
-          'SP012': 'RXJZXY',
-          'SP013': 'JZXY',
-          'SP014': 'XZXHTYX',
-          'SP015': 'ZDYBS',
-          'SP016': 'XSKKX',
-          'SP017': 'CBYDB',
-          'SP018': 'SWYPFXFFXZKPZB',
+          'SP008': 'SP008',
+          'SP009': 'SP009',
+          'SP010': 'SP010',
+          'SP011': 'SP011',
+          'SP012': 'SP012',
+          'SP013': 'SP013',
+          'SP014': 'SP014',
+          'SP015': 'SP015',
+          'SP016': 'SP016',
+          'SP017': 'SP017',
+          'SP018': 'SP018',
           //供试品
           'SYWZPZJHB': 'SYWZPZJHB',
           'MJYLQSQD': 'MJYLQSQD',

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

@@ -54,7 +54,7 @@ import CustomTable from '@/components/Template/CustomTable.vue';
 import SelectReagentDialog from '../../dialog/SelectReagentDialog.vue';
 import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue";
 import { EventBus } from "@/utils/eventBus";
-import { addTj ,uniqeResource} from "@/utils/calUnitTools";
+import { addTj ,uniqeResource,uniqeResourceOne} from "@/utils/calUnitTools";
 export default {
 	name: "SP003",
 	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable, SelectReagentDialog, TableOpertaion },
@@ -622,6 +622,9 @@ export default {
 				//使用
 				
 			}
+			if(tmpResource.length>0){
+				tmpResource = uniqeResourceOne(tmpResource)
+			}
             //使用的试剂、仪器
 			const stepResource = this.$refs.stepRef.getStepResource()
 			this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[])

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

@@ -110,7 +110,7 @@ import SelectReagentDialog from '../../dialog/SelectReagentDialog.vue';
 import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue";
 import { getExpireDate, duplicateResource } from "@/utils/index.js";
 import moment from "moment";
-import { addTj, uniqeResource } from "@/utils/calUnitTools";
+import { addTj, uniqeResource,uniqeResourceOne } from "@/utils/calUnitTools";
 import { getLadderColumnsConfig, getParallelColumnsConfig, getLadderFormConfig, getBaseInfoFormConfig, getRemarkFormConfig, getStorageConditionFormConfig, getParalleStepFormConfig } from "../../formConfig/paralleAndLadderConfig.js";
 export default {
 	name: "SP00456",
@@ -696,10 +696,13 @@ export default {
 					}
 				}
 			}
+			if(tmpResource.length>0){
+				tmpResource = uniqeResourceOne(tmpResource)
+			}
 			//使用的试剂、仪器
-			// const stepResource = this.$refs.stepRef.getStepResource()
-			// this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[])
-			// this.yqResourceTmp = stepResource.yqResource||[]
+			const stepResource = this.getStepResource()
+			this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[])
+			this.yqResourceTmp = stepResource.yqResource||[]
 
 			this.resourceTmp = tmpResource
 			return content;

src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZQDYJMD.vue → src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/SP008.vue

@@ -11,7 +11,7 @@
 					<TableList label="template.common.reagentInfo" :columns="sysjColumns"
 						:dataSource="resource" />
 					<TableList label="template.common.instrumentInfo" :columns="yqColumns"
-						:dataSource="resource" />
+						:dataSource="yqResource" />
 					<BaseInfoFormPackage fieldItemLabel="template.common.storageCondition" label="template.common.storageCondition" ref="storageConditionRef"
 						:formConfig="storageFormConfig" :formData="formData" />
 					<LineLabel label="template.common.operationSteps" />
@@ -240,7 +240,6 @@ export default {
 			currentSubKey: "",//当前点击的子项key
 			rowIndex:0,//当前表格点击的行数
 
-			resource: [],
 			formData: {}
 		};
 	},
@@ -378,7 +377,7 @@ export default {
 								let fzItem = item.fzsj.fzList[j]
 								tmpResource.push({
 									mc: null,
-									bh: item.fzsj.mybh+fzItem.subCode,
+									bh: item.fzsj.mybh+fzItem.preCode+fzItem.subCode,
 									ph: null,
 									ndz: item.hhwznd + content.headerSelectFields.hhwzndUnit,
 									nd: item.hhwznd,

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

@@ -9,7 +9,7 @@
 					<BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" label="template.common.baseInfo"
 						ref="baseInfoRef" :formConfig="baseInfoFormConfig" :formData="formData" />
 					<TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resource" />
-					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="resource" />
+					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
 					<BaseInfoFormPackage fieldItemLabel="template.common.storageCondition"
 						label="template.common.storageCondition" ref="storageConditionRef"
 						:formConfig="storageFormConfig" :formData="formData" />
@@ -278,7 +278,6 @@ export default {
 	data() {
 		return {
 			reagentType: '',
-			resource: [],
 			resourceData1: [],
 			formData: {}
 		};

src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/QXWDX.vue → src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/SP010.vue

@@ -11,7 +11,7 @@
 					<TableList label="template.common.reagentInfo" :columns="sysjColumns"
 						:dataSource="resource" />
 					<TableList label="template.common.instrumentInfo" :columns="yqColumns"
-						:dataSource="resource" />
+						:dataSource="yqResource" />
 					<BaseInfoFormPackage fieldItemLabel="template.common.storageCondition" label="template.common.storageCondition" ref="storageConditionRef"
 						:formConfig="storageFormConfig" :formData="formData" />
 					<LineLabel label="template.common.operationSteps" />
@@ -71,7 +71,7 @@ import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
 import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue';
 import { EventBus } from "@/utils/eventBus";
 import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
-import { addTj,uniqeResource } from "@/utils/calUnitTools";
+import { addTj,uniqeResource,uniqeResourceOne,addDecimals } from "@/utils/calUnitTools";
 
 export default {
 	name: "QXWDX",
@@ -240,8 +240,6 @@ export default {
 			currentSubKey: "",//当前点击的子项key
 			rowIndex:0,//当前表格点击的行数
 
-			resource: [],
-
 			formData: {}
 		};
 	},
@@ -335,6 +333,70 @@ export default {
 						//配置的试剂
 						let item = tableList[i]
 
+						//使用的
+						tmpResource.push({
+							mc: null,
+							bh: item.sjry,
+							ph: null,
+							ndz: null,
+							nd: null,
+							nddw: null,
+							ly: 'ELN配制',
+							sxrq: null,
+							kc: null,
+							kcdw: null,
+							syl: item.sjryxql,
+							type: null,
+							elnType: this.product,
+							syldw:content.headerSelectFields.sjryxqlUnit,
+							yxzq:null,
+							yxzqdw:null,
+						})
+						tmpResource.push({
+							mc: null,
+							bh: content.subJz,
+							ph: null,
+							ndz: null,
+							nd: null,
+							nddw: null,
+							ly: 'ELN配制',
+							sxrq: null,
+							kc: null,
+							kcdw: null,
+							syl: item.sjjzxql,
+							type: null,
+							elnType: this.product,
+							syldw:content.headerSelectFields.sjjzxqlUnit,
+							yxzq:null,
+							yxzqdw:null,
+						})
+						//分装的
+						let fzTotal = 0//分装总量
+						if(item.fzsj && item.fzsj.fzList && item.fzsj.fzList.length>0){
+							for(let j=0;j<item.fzsj.fzList.length;j++){
+								let fzItem = item.fzsj.fzList[j]
+								tmpResource.push({
+									mc: null,
+									bh: item.fzsj.mybh+fzItem.preCode+fzItem.subCode,
+									ph: null,
+									ndz: item.hhwznd + content.headerSelectFields.hhwzndUnit,
+									nd: item.hhwznd,
+									nddw: content.headerSelectFields.hhwzndUnit,
+									ly: 'ELN配制',
+									sxrq: null,
+									kc: fzItem.num,
+									kcdw: item.fzsj.dw,
+									syl: null,
+									type: null,
+									elnType: this.product,
+									syldw:item.fzsj.dw,
+									yxzq:null,
+									yxzqdw:null,
+								})
+								fzTotal=addDecimals(fzTotal,fzItem.num)
+							}
+						}
+						//生成的
 						const { total, unit } = addTj([item.sjjzxql, item.sjryxql], [content.headerSelectFields.sjjzxqlUnit, content.headerSelectFields.sjryxqlUnit])
 
 						tmpResource.push({
@@ -348,16 +410,20 @@ export default {
 							sxrq: null,
 							kc: total,
 							kcdw: unit,
-							syl: null,
+							syl: fzTotal>0?fzTotal:null,
 							type: null,
 							elnType: this.product,
-							syldw:unit,
+							syldw:fzTotal>0?item.fzsj.dw:unit,
 							yxzq:null,
 							yxzqdw:null,
 						})
 					}
 				}
 			}
+			debugger
+			if(tmpResource.length>0){
+				tmpResource = uniqeResourceOne(tmpResource)
+			}
 			//使用的试剂、仪器
 			const stepResource = this.$refs.stepRef.getStepResource()
 			this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[])

src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYHGZYWDX.vue → src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/SP011.vue

@@ -11,7 +11,7 @@
 					<TableList label="template.common.reagentInfo" :columns="sysjColumns"
 						:dataSource="resource" />
 					<TableList label="template.common.instrumentInfo" :columns="yqColumns"
-						:dataSource="resource" />
+						:dataSource="yqResource" />
 					<BaseInfoFormPackage fieldItemLabel="template.common.storageCondition" label="template.common.storageCondition" ref="storageConditionRef"
 						:formConfig="storageFormConfig" :formData="formData" />
 					<LineLabel label="template.common.operationSteps" />
@@ -71,7 +71,7 @@ import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
 import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue';
 import { EventBus } from "@/utils/eventBus";
 import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
-import { addTj,uniqeResource } from "@/utils/calUnitTools";
+import { addTj,uniqeResource,uniqeResourceOne,addDecimals } from "@/utils/calUnitTools";
 
 export default {
 	name: "CBYHGZYWDX",
@@ -240,7 +240,6 @@ export default {
 			currentSubKey: "",//当前点击的子项key
 			rowIndex:0,//当前表格点击的行数
 
-			resource: [],
 			formData: {}
 		};
 	},
@@ -334,6 +333,70 @@ export default {
 						//配置的试剂
 						let item = tableList[i]
 
+						//使用的
+						tmpResource.push({
+							mc: null,
+							bh: item.sjry,
+							ph: null,
+							ndz: null,
+							nd: null,
+							nddw: null,
+							ly: 'ELN配制',
+							sxrq: null,
+							kc: null,
+							kcdw: null,
+							syl: item.sjryxql,
+							type: null,
+							elnType: this.product,
+							syldw:content.headerSelectFields.sjryxqlUnit,
+							yxzq:null,
+							yxzqdw:null,
+						})
+						tmpResource.push({
+							mc: null,
+							bh: content.subJz,
+							ph: null,
+							ndz: null,
+							nd: null,
+							nddw: null,
+							ly: 'ELN配制',
+							sxrq: null,
+							kc: null,
+							kcdw: null,
+							syl: item.sjjzxql,
+							type: null,
+							elnType: this.product,
+							syldw:content.headerSelectFields.sjjzxqlUnit,
+							yxzq:null,
+							yxzqdw:null,
+						})
+						//分装的
+						let fzTotal = 0//分装总量
+						if(item.fzsj && item.fzsj.fzList && item.fzsj.fzList.length>0){
+							for(let j=0;j<item.fzsj.fzList.length;j++){
+								let fzItem = item.fzsj.fzList[j]
+								tmpResource.push({
+									mc: null,
+									bh: item.fzsj.mybh+fzItem.preCode+fzItem.subCode,
+									ph: null,
+									ndz: item.hhwznd + content.headerSelectFields.hhwzndUnit,
+									nd: item.hhwznd,
+									nddw: content.headerSelectFields.hhwzndUnit,
+									ly: 'ELN配制',
+									sxrq: null,
+									kc: fzItem.num,
+									kcdw: item.fzsj.dw,
+									syl: null,
+									type: null,
+									elnType: this.product,
+									syldw:item.fzsj.dw,
+									yxzq:null,
+									yxzqdw:null,
+								})
+								fzTotal=addDecimals(fzTotal,fzItem.num)
+							}
+						}
+						//生成的
 						const { total, unit } = addTj([item.sjjzxql, item.sjryxql], [content.headerSelectFields.sjjzxqlUnit, content.headerSelectFields.sjryxqlUnit])
 
 						tmpResource.push({
@@ -347,16 +410,20 @@ export default {
 							sxrq: null,
 							kc: total,
 							kcdw: unit,
-							syl: null,
+							syl: fzTotal>0?fzTotal:null,
 							type: null,
 							elnType: this.product,
-							syldw:unit,
+							syldw:fzTotal>0?item.fzsj.dw:unit,
 							yxzq:null,
 							yxzqdw:null,
 						})
 					}
 				}
 			}
+			debugger
+			if(tmpResource.length>0){
+				tmpResource = uniqeResourceOne(tmpResource)
+			}
 			//使用的试剂、仪器
 			const stepResource = this.$refs.stepRef.getStepResource()
 			this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[])

src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/RXJZXY.vue → src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/SP012.vue

@@ -11,7 +11,7 @@
 					<TableList label="template.common.reagentInfo" :columns="sysjColumns"
 						:dataSource="resource" />
 					<TableList label="template.common.instrumentInfo" :columns="yqColumns"
-						:dataSource="resource" />
+						:dataSource="yqResource" />
 					<BaseInfoFormPackage fieldItemLabel="template.common.storageCondition" label="template.common.storageCondition" ref="storageConditionRef"
 						:formConfig="storageFormConfig" :formData="formData" />
 					<LineLabel label="template.common.operationSteps" />
@@ -71,7 +71,7 @@ import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
 import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue';
 import { EventBus } from "@/utils/eventBus";
 import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
-import { addTj,uniqeResource } from "@/utils/calUnitTools";
+import { addTj,uniqeResource,uniqeResourceOne,addDecimals } from "@/utils/calUnitTools";
 
 export default {
 	name: "RXJZXY",
@@ -240,7 +240,6 @@ export default {
 			currentSubKey: "",//当前点击的子项key
 			rowIndex:0,//当前表格点击的行数
 
-			resource: [],
 			formData: {}
 		};
 	},
@@ -334,6 +333,70 @@ export default {
 						//配置的试剂
 						let item = tableList[i]
 
+						//使用的
+						tmpResource.push({
+							mc: null,
+							bh: item.sjry,
+							ph: null,
+							ndz: null,
+							nd: null,
+							nddw: null,
+							ly: 'ELN配制',
+							sxrq: null,
+							kc: null,
+							kcdw: null,
+							syl: item.sjryxql,
+							type: null,
+							elnType: this.product,
+							syldw:content.headerSelectFields.sjryxqlUnit,
+							yxzq:null,
+							yxzqdw:null,
+						})
+						tmpResource.push({
+							mc: null,
+							bh: content.subJz,
+							ph: null,
+							ndz: null,
+							nd: null,
+							nddw: null,
+							ly: 'ELN配制',
+							sxrq: null,
+							kc: null,
+							kcdw: null,
+							syl: item.sjjzxql,
+							type: null,
+							elnType: this.product,
+							syldw:content.headerSelectFields.sjjzxqlUnit,
+							yxzq:null,
+							yxzqdw:null,
+						})
+						//分装的
+						let fzTotal = 0//分装总量
+						if(item.fzsj && item.fzsj.fzList && item.fzsj.fzList.length>0){
+							for(let j=0;j<item.fzsj.fzList.length;j++){
+								let fzItem = item.fzsj.fzList[j]
+								tmpResource.push({
+									mc: null,
+									bh: item.fzsj.mybh+fzItem.preCode+fzItem.subCode,
+									ph: null,
+									ndz: item.hhwznd + content.headerSelectFields.hhwzndUnit,
+									nd: item.hhwznd,
+									nddw: content.headerSelectFields.hhwzndUnit,
+									ly: 'ELN配制',
+									sxrq: null,
+									kc: fzItem.num,
+									kcdw: item.fzsj.dw,
+									syl: null,
+									type: null,
+									elnType: this.product,
+									syldw:item.fzsj.dw,
+									yxzq:null,
+									yxzqdw:null,
+								})
+								fzTotal=addDecimals(fzTotal,fzItem.num)
+							}
+						}
+						//生成的
 						const { total, unit } = addTj([item.sjjzxql, item.sjryxql], [content.headerSelectFields.sjjzxqlUnit, content.headerSelectFields.sjryxqlUnit])
 
 						tmpResource.push({
@@ -347,16 +410,20 @@ export default {
 							sxrq: null,
 							kc: total,
 							kcdw: unit,
-							syl: null,
+							syl: fzTotal>0?fzTotal:null,
 							type: null,
 							elnType: this.product,
-							syldw:unit,
+							syldw:fzTotal>0?item.fzsj.dw:unit,
 							yxzq:null,
 							yxzqdw:null,
 						})
 					}
 				}
 			}
+			debugger
+			if(tmpResource.length>0){
+				tmpResource = uniqeResourceOne(tmpResource)
+			}
 			//使用的试剂、仪器
 			const stepResource = this.$refs.stepRef.getStepResource()
 			this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[])

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

@@ -11,7 +11,7 @@
 					<TableList label="template.common.reagentInfo" :columns="sysjColumns"
 						:dataSource="resource" />
 					<TableList label="template.common.instrumentInfo" :columns="yqColumns"
-						:dataSource="resource" />
+						:dataSource="yqResource" />
 					<BaseInfoFormPackage fieldItemLabel="template.common.storageCondition" label="template.common.storageCondition" ref="storageConditionRef"
 						:formConfig="storageFormConfig" :formData="formData" />
 					<LineLabel label="template.common.operationSteps" />
@@ -69,7 +69,7 @@ import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
 import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue';
 import { EventBus } from "@/utils/eventBus";
 import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
-import { addTj,uniqeResource } from "@/utils/calUnitTools";
+import { addTj,uniqeResource,uniqeResourceOne,addDecimals } from "@/utils/calUnitTools";
 
 export default {
 	name: "JZXY",
@@ -238,7 +238,6 @@ export default {
 			currentSubKey: "",//当前点击的子项key
 			rowIndex:0,//当前表格点击的行数
 
-			resource: [],
 			formData: {}
 		};
 	},
@@ -322,6 +321,70 @@ export default {
 						//配置的试剂
 						let item = tableList[i]
 
+						//使用的
+						tmpResource.push({
+							mc: null,
+							bh: item.sjry,
+							ph: null,
+							ndz: null,
+							nd: null,
+							nddw: null,
+							ly: 'ELN配制',
+							sxrq: null,
+							kc: null,
+							kcdw: null,
+							syl: item.sjryxql,
+							type: null,
+							elnType: this.product,
+							syldw:content.headerSelectFields.sjryxqlUnit,
+							yxzq:null,
+							yxzqdw:null,
+						})
+						tmpResource.push({
+							mc: null,
+							bh: item.kbjzbh,
+							ph: null,
+							ndz: null,
+							nd: null,
+							nddw: null,
+							ly: 'ELN配制',
+							sxrq: null,
+							kc: null,
+							kcdw: null,
+							syl: item.sjjzxql,
+							type: null,
+							elnType: this.product,
+							syldw:content.headerSelectFields.sjjzxqlUnit,
+							yxzq:null,
+							yxzqdw:null,
+						})
+						//分装的
+						let fzTotal = 0//分装总量
+						if(item.fzsj && item.fzsj.fzList && item.fzsj.fzList.length>0){
+							for(let j=0;j<item.fzsj.fzList.length;j++){
+								let fzItem = item.fzsj.fzList[j]
+								tmpResource.push({
+									mc: null,
+									bh: item.fzsj.mybh+fzItem.preCode+fzItem.subCode,
+									ph: null,
+									ndz: item.hhwznd + content.headerSelectFields.hhwzndUnit,
+									nd: item.hhwznd,
+									nddw: content.headerSelectFields.hhwzndUnit,
+									ly: 'ELN配制',
+									sxrq: null,
+									kc: fzItem.num,
+									kcdw: item.fzsj.dw,
+									syl: null,
+									type: null,
+									elnType: this.product,
+									syldw:item.fzsj.dw,
+									yxzq:null,
+									yxzqdw:null,
+								})
+								fzTotal=addDecimals(fzTotal,fzItem.num)
+							}
+						}
+						//生成的
 						const { total, unit } = addTj([item.sjjzxql, item.sjryxql], [content.headerSelectFields.sjjzxqlUnit, content.headerSelectFields.sjryxqlUnit])
 
 						tmpResource.push({
@@ -335,16 +398,20 @@ export default {
 							sxrq: null,
 							kc: total,
 							kcdw: unit,
-							syl: null,
+							syl: fzTotal>0?fzTotal:null,
 							type: null,
 							elnType: this.product,
-							syldw:unit,
+							syldw:fzTotal>0?item.fzsj.dw:unit,
 							yxzq:null,
 							yxzqdw:null,
 						})
 					}
 				}
 			}
+			debugger
+			if(tmpResource.length>0){
+				tmpResource = uniqeResourceOne(tmpResource)
+			}
 			//使用的试剂、仪器
 			const stepResource = this.$refs.stepRef.getStepResource()
 			this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[])

src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XZXHTYX.vue → src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/SP014.vue

@@ -11,7 +11,7 @@
 					<TableList label="template.common.reagentInfo" :columns="sysjColumns"
 						:dataSource="resource" />
 					<TableList label="template.common.instrumentInfo" :columns="yqColumns"
-						:dataSource="resource" />
+						:dataSource="yqResource" />
 					<BaseInfoFormPackage fieldItemLabel="template.common.storageCondition" label="template.common.storageCondition" ref="storageConditionRef"
 						:formConfig="storageFormConfig" :formData="formData" />
 					<LineLabel label="template.common.operationSteps" />
@@ -71,7 +71,7 @@ import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
 import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue';
 import { EventBus } from "@/utils/eventBus";
 import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
-import { addTj,uniqeResource } from "@/utils/calUnitTools";
+import { addTj,uniqeResource,uniqeResourceOne,addDecimals } from "@/utils/calUnitTools";
 
 export default {
 	name: "XZXHTYX",
@@ -240,7 +240,6 @@ export default {
 			currentSubKey: "",//当前点击的子项key
 			rowIndex:0,//当前表格点击的行数
 
-			resource: [],
 			formData: {}
 		};
 	},
@@ -334,6 +333,70 @@ export default {
 						//配置的试剂
 						let item = tableList[i]
 
+						//使用的
+						tmpResource.push({
+							mc: null,
+							bh: item.sjry,
+							ph: null,
+							ndz: null,
+							nd: null,
+							nddw: null,
+							ly: 'ELN配制',
+							sxrq: null,
+							kc: null,
+							kcdw: null,
+							syl: item.sjryxql,
+							type: null,
+							elnType: this.product,
+							syldw:content.headerSelectFields.sjryxqlUnit,
+							yxzq:null,
+							yxzqdw:null,
+						})
+						tmpResource.push({
+							mc: null,
+							bh: content.subJz,
+							ph: null,
+							ndz: null,
+							nd: null,
+							nddw: null,
+							ly: 'ELN配制',
+							sxrq: null,
+							kc: null,
+							kcdw: null,
+							syl: item.sjjzxql,
+							type: null,
+							elnType: this.product,
+							syldw:content.headerSelectFields.sjjzxqlUnit,
+							yxzq:null,
+							yxzqdw:null,
+						})
+						//分装的
+						let fzTotal = 0//分装总量
+						if(item.fzsj && item.fzsj.fzList && item.fzsj.fzList.length>0){
+							for(let j=0;j<item.fzsj.fzList.length;j++){
+								let fzItem = item.fzsj.fzList[j]
+								tmpResource.push({
+									mc: null,
+									bh: item.fzsj.mybh+fzItem.preCode+fzItem.subCode,
+									ph: null,
+									ndz: item.hhwznd + content.headerSelectFields.hhwzndUnit,
+									nd: item.hhwznd,
+									nddw: content.headerSelectFields.hhwzndUnit,
+									ly: 'ELN配制',
+									sxrq: null,
+									kc: fzItem.num,
+									kcdw: item.fzsj.dw,
+									syl: null,
+									type: null,
+									elnType: this.product,
+									syldw:item.fzsj.dw,
+									yxzq:null,
+									yxzqdw:null,
+								})
+								fzTotal=addDecimals(fzTotal,fzItem.num)
+							}
+						}
+						//生成的
 						const { total, unit } = addTj([item.sjjzxql, item.sjryxql], [content.headerSelectFields.sjjzxqlUnit, content.headerSelectFields.sjryxqlUnit])
 
 						tmpResource.push({
@@ -347,16 +410,20 @@ export default {
 							sxrq: null,
 							kc: total,
 							kcdw: unit,
-							syl: null,
+							syl: fzTotal>0?fzTotal:null,
 							type: null,
 							elnType: this.product,
-							syldw:unit,
+							syldw:fzTotal>0?item.fzsj.dw:unit,
 							yxzq:null,
 							yxzqdw:null,
 						})
 					}
 				}
 			}
+			debugger
+			if(tmpResource.length>0){
+				tmpResource = uniqeResourceOne(tmpResource)
+			}
 			//使用的试剂、仪器
 			const stepResource = this.$refs.stepRef.getStepResource()
 			this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[])

src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZDYBS.vue → src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/SP015.vue

@@ -11,7 +11,7 @@
 					<TableList label="template.common.reagentInfo" :columns="sysjColumns"
 						:dataSource="resource" />
 					<TableList label="template.common.instrumentInfo" :columns="yqColumns"
-						:dataSource="resource" />
+						:dataSource="yqResource" />
 					<BaseInfoFormPackage fieldItemLabel="template.common.storageCondition" label="template.common.storageCondition" ref="storageConditionRef"
 						:formConfig="storageFormConfig" :formData="formData" />
 					<LineLabel label="template.common.operationSteps" />
@@ -71,7 +71,7 @@ import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
 import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue';
 import { EventBus } from "@/utils/eventBus";
 import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
-import { addTj,uniqeResource } from "@/utils/calUnitTools";
+import { addTj,uniqeResource,uniqeResourceOne,addDecimals } from "@/utils/calUnitTools";
 
 export default {
 	name: "ZDYBS",
@@ -240,7 +240,6 @@ export default {
 			currentSubKey: "",//当前点击的子项key
 			rowIndex:0,//当前表格点击的行数
 
-			resource: [],
 			formData: {}
 		};
 	},
@@ -334,6 +333,70 @@ export default {
 						//配置的试剂
 						let item = tableList[i]
 
+						//使用的
+						tmpResource.push({
+							mc: null,
+							bh: item.sjry,
+							ph: null,
+							ndz: null,
+							nd: null,
+							nddw: null,
+							ly: 'ELN配制',
+							sxrq: null,
+							kc: null,
+							kcdw: null,
+							syl: item.sjryxql,
+							type: null,
+							elnType: this.product,
+							syldw:content.headerSelectFields.sjryxqlUnit,
+							yxzq:null,
+							yxzqdw:null,
+						})
+						tmpResource.push({
+							mc: null,
+							bh: content.subJz,
+							ph: null,
+							ndz: null,
+							nd: null,
+							nddw: null,
+							ly: 'ELN配制',
+							sxrq: null,
+							kc: null,
+							kcdw: null,
+							syl: item.sjjzxql,
+							type: null,
+							elnType: this.product,
+							syldw:content.headerSelectFields.sjjzxqlUnit,
+							yxzq:null,
+							yxzqdw:null,
+						})
+						//分装的
+						let fzTotal = 0//分装总量
+						if(item.fzsj && item.fzsj.fzList && item.fzsj.fzList.length>0){
+							for(let j=0;j<item.fzsj.fzList.length;j++){
+								let fzItem = item.fzsj.fzList[j]
+								tmpResource.push({
+									mc: null,
+									bh: item.fzsj.mybh+fzItem.preCode+fzItem.subCode,
+									ph: null,
+									ndz: item.hhwznd + content.headerSelectFields.hhwzndUnit,
+									nd: item.hhwznd,
+									nddw: content.headerSelectFields.hhwzndUnit,
+									ly: 'ELN配制',
+									sxrq: null,
+									kc: fzItem.num,
+									kcdw: item.fzsj.dw,
+									syl: null,
+									type: null,
+									elnType: this.product,
+									syldw:item.fzsj.dw,
+									yxzq:null,
+									yxzqdw:null,
+								})
+								fzTotal=addDecimals(fzTotal,fzItem.num)
+							}
+						}
+						//生成的
 						const { total, unit } = addTj([item.sjjzxql, item.sjryxql], [content.headerSelectFields.sjjzxqlUnit, content.headerSelectFields.sjryxqlUnit])
 
 						tmpResource.push({
@@ -347,16 +410,20 @@ export default {
 							sxrq: null,
 							kc: total,
 							kcdw: unit,
-							syl: null,
+							syl: fzTotal>0?fzTotal:null,
 							type: null,
 							elnType: this.product,
-							syldw:unit,
+							syldw:fzTotal>0?item.fzsj.dw:unit,
 							yxzq:null,
 							yxzqdw:null,
 						})
 					}
 				}
 			}
+			debugger
+			if(tmpResource.length>0){
+				tmpResource = uniqeResourceOne(tmpResource)
+			}
 			//使用的试剂、仪器
 			const stepResource = this.$refs.stepRef.getStepResource()
 			this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[])

src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XSKKX.vue → src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/SP016.vue

@@ -11,7 +11,7 @@
 					<TableList label="template.common.reagentInfo" :columns="sysjColumns"
 						:dataSource="resource" />
 					<TableList label="template.common.instrumentInfo" :columns="yqColumns"
-						:dataSource="resource" />
+						:dataSource="yqResource" />
 					<BaseInfoFormPackage fieldItemLabel="template.common.storageCondition" label="template.common.storageCondition" ref="storageConditionRef"
 						:formConfig="storageFormConfig" :formData="formData" />
 					<LineLabel label="template.common.operationSteps" />
@@ -71,7 +71,7 @@ import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
 import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue';
 import { EventBus } from "@/utils/eventBus";
 import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
-import { addTj,uniqeResource } from "@/utils/calUnitTools";
+import { addTj,uniqeResource,uniqeResourceOne,addDecimals } from "@/utils/calUnitTools";
 
 export default {
 	name: "XSKKX",
@@ -240,7 +240,6 @@ export default {
 			currentSubKey: "",//当前点击的子项key
 			rowIndex:0,//当前表格点击的行数
 
-			resource: [],
 			formData: {}
 		};
 	},
@@ -334,6 +333,70 @@ export default {
 						//配置的试剂
 						let item = tableList[i]
 
+						//使用的
+						tmpResource.push({
+							mc: null,
+							bh: item.sjry,
+							ph: null,
+							ndz: null,
+							nd: null,
+							nddw: null,
+							ly: 'ELN配制',
+							sxrq: null,
+							kc: null,
+							kcdw: null,
+							syl: item.sjryxql,
+							type: null,
+							elnType: this.product,
+							syldw:content.headerSelectFields.sjryxqlUnit,
+							yxzq:null,
+							yxzqdw:null,
+						})
+						tmpResource.push({
+							mc: null,
+							bh: content.subJz,
+							ph: null,
+							ndz: null,
+							nd: null,
+							nddw: null,
+							ly: 'ELN配制',
+							sxrq: null,
+							kc: null,
+							kcdw: null,
+							syl: item.sjjzxql,
+							type: null,
+							elnType: this.product,
+							syldw:content.headerSelectFields.sjjzxqlUnit,
+							yxzq:null,
+							yxzqdw:null,
+						})
+						//分装的
+						let fzTotal = 0//分装总量
+						if(item.fzsj && item.fzsj.fzList && item.fzsj.fzList.length>0){
+							for(let j=0;j<item.fzsj.fzList.length;j++){
+								let fzItem = item.fzsj.fzList[j]
+								tmpResource.push({
+									mc: null,
+									bh: item.fzsj.mybh+fzItem.preCode+fzItem.subCode,
+									ph: null,
+									ndz: item.hhwznd + content.headerSelectFields.hhwzndUnit,
+									nd: item.hhwznd,
+									nddw: content.headerSelectFields.hhwzndUnit,
+									ly: 'ELN配制',
+									sxrq: null,
+									kc: fzItem.num,
+									kcdw: item.fzsj.dw,
+									syl: null,
+									type: null,
+									elnType: this.product,
+									syldw:item.fzsj.dw,
+									yxzq:null,
+									yxzqdw:null,
+								})
+								fzTotal=addDecimals(fzTotal,fzItem.num)
+							}
+						}
+						//生成的
 						const { total, unit } = addTj([item.sjjzxql, item.sjryxql], [content.headerSelectFields.sjjzxqlUnit, content.headerSelectFields.sjryxqlUnit])
 
 						tmpResource.push({
@@ -347,16 +410,20 @@ export default {
 							sxrq: null,
 							kc: total,
 							kcdw: unit,
-							syl: null,
+							syl: fzTotal>0?fzTotal:null,
 							type: null,
 							elnType: this.product,
-							syldw:unit,
+							syldw:fzTotal>0?item.fzsj.dw:unit,
 							yxzq:null,
 							yxzqdw:null,
 						})
 					}
 				}
 			}
+			debugger
+			if(tmpResource.length>0){
+				tmpResource = uniqeResourceOne(tmpResource)
+			}
 			//使用的试剂、仪器
 			const stepResource = this.$refs.stepRef.getStepResource()
 			this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[])

src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYDB.vue → src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/SP017.vue

@@ -11,7 +11,7 @@
 					<TableList label="template.common.reagentInfo" :columns="sysjColumns"
 						:dataSource="resource" />
 					<TableList label="template.common.instrumentInfo" :columns="yqColumns"
-						:dataSource="resource" />
+						:dataSource="yqResource" />
 					<BaseInfoFormPackage fieldItemLabel="template.common.storageCondition" label="template.common.storageCondition" ref="storageConditionRef"
 						:formConfig="storageFormConfig" :formData="formData" />
 					<LineLabel label="template.common.operationSteps" />
@@ -71,7 +71,7 @@ import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
 import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue';
 import { EventBus } from "@/utils/eventBus";
 import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
-import { addTj,uniqeResource } from "@/utils/calUnitTools";
+import { addTj,uniqeResource,uniqeResourceOne,addDecimals } from "@/utils/calUnitTools";
 
 export default {
 	name: "CBYDB",
@@ -240,7 +240,6 @@ export default {
 			currentSubKey: "",//当前点击的子项key
 			rowIndex:0,//当前表格点击的行数
 
-			resource: [],
 			formData: {}
 		};
 	},
@@ -334,6 +333,70 @@ export default {
 						//配置的试剂
 						let item = tableList[i]
 
+						//使用的
+						tmpResource.push({
+							mc: null,
+							bh: item.sjry,
+							ph: null,
+							ndz: null,
+							nd: null,
+							nddw: null,
+							ly: 'ELN配制',
+							sxrq: null,
+							kc: null,
+							kcdw: null,
+							syl: item.sjryxql,
+							type: null,
+							elnType: this.product,
+							syldw:content.headerSelectFields.sjryxqlUnit,
+							yxzq:null,
+							yxzqdw:null,
+						})
+						tmpResource.push({
+							mc: null,
+							bh: content.subJz,
+							ph: null,
+							ndz: null,
+							nd: null,
+							nddw: null,
+							ly: 'ELN配制',
+							sxrq: null,
+							kc: null,
+							kcdw: null,
+							syl: item.sjjzxql,
+							type: null,
+							elnType: this.product,
+							syldw:content.headerSelectFields.sjjzxqlUnit,
+							yxzq:null,
+							yxzqdw:null,
+						})
+						//分装的
+						let fzTotal = 0//分装总量
+						if(item.fzsj && item.fzsj.fzList && item.fzsj.fzList.length>0){
+							for(let j=0;j<item.fzsj.fzList.length;j++){
+								let fzItem = item.fzsj.fzList[j]
+								tmpResource.push({
+									mc: null,
+									bh: item.fzsj.mybh+fzItem.preCode+fzItem.subCode,
+									ph: null,
+									ndz: item.hhwznd + content.headerSelectFields.hhwzndUnit,
+									nd: item.hhwznd,
+									nddw: content.headerSelectFields.hhwzndUnit,
+									ly: 'ELN配制',
+									sxrq: null,
+									kc: fzItem.num,
+									kcdw: item.fzsj.dw,
+									syl: null,
+									type: null,
+									elnType: this.product,
+									syldw:item.fzsj.dw,
+									yxzq:null,
+									yxzqdw:null,
+								})
+								fzTotal=addDecimals(fzTotal,fzItem.num)
+							}
+						}
+						//生成的
 						const { total, unit } = addTj([item.sjjzxql, item.sjryxql], [content.headerSelectFields.sjjzxqlUnit, content.headerSelectFields.sjryxqlUnit])
 
 						tmpResource.push({
@@ -347,16 +410,20 @@ export default {
 							sxrq: null,
 							kc: total,
 							kcdw: unit,
-							syl: null,
+							syl: fzTotal>0?fzTotal:null,
 							type: null,
 							elnType: this.product,
-							syldw:unit,
+							syldw:fzTotal>0?item.fzsj.dw:unit,
 							yxzq:null,
 							yxzqdw:null,
 						})
 					}
 				}
 			}
+			debugger
+			if(tmpResource.length>0){
+				tmpResource = uniqeResourceOne(tmpResource)
+			}
 			//使用的试剂、仪器
 			const stepResource = this.$refs.stepRef.getStepResource()
 			this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[])

src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue → src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/SP018.vue

@@ -63,15 +63,15 @@ import BaseInfoFormPackage from "@/components/Template/BaseInfoFormPackage";
 import LineLabel from "@/components/Template/LineLabel";
 import TableList from "@/components/Template/Table";
 import Step from "@/components/Template/Step";
-import templateMixin from "../../mixins/templateMixin.js";
+import templateMixin from "../../../mixins/templateMixin.js";
 import CustomTable from '@/components/Template/CustomTable.vue';
 import { getLatestSnArr } from '@/api/template';
-import {getSWYPFXFFXYPZBBTableConfig} from "../../formConfig/SWYPFXFFXYPZBBTableConfig.js";
+import {getSWYPFXFFXYPZBBTableConfig} from "../../../formConfig/SWYPFXFFXYPZBBTableConfig.js";
 import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
-import SelectReagentDialog from '../../dialog/SelectReagentDialog.vue';
+import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue';
 import { EventBus } from "@/utils/eventBus";
 import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
-import { addTj,uniqeResource } from "@/utils/calUnitTools";
+import { addTj,uniqeResource,uniqeResourceOne,addDecimals } from "@/utils/calUnitTools";
 
 export default {
 	name: "CBYDB",
@@ -334,6 +334,70 @@ export default {
 						//配置的试剂
 						let item = tableList[i]
 
+						//使用的
+						tmpResource.push({
+							mc: null,
+							bh: item.sjry,
+							ph: null,
+							ndz: null,
+							nd: null,
+							nddw: null,
+							ly: 'ELN配制',
+							sxrq: null,
+							kc: null,
+							kcdw: null,
+							syl: item.sjryxql,
+							type: null,
+							elnType: this.product,
+							syldw:content.headerSelectFields.sjryxqlUnit,
+							yxzq:null,
+							yxzqdw:null,
+						})
+						tmpResource.push({
+							mc: null,
+							bh: content.subJz,
+							ph: null,
+							ndz: null,
+							nd: null,
+							nddw: null,
+							ly: 'ELN配制',
+							sxrq: null,
+							kc: null,
+							kcdw: null,
+							syl: item.sjjzxql,
+							type: null,
+							elnType: this.product,
+							syldw:content.headerSelectFields.sjjzxqlUnit,
+							yxzq:null,
+							yxzqdw:null,
+						})
+						//分装的
+						let fzTotal = 0//分装总量
+						if(item.fzsj && item.fzsj.fzList && item.fzsj.fzList.length>0){
+							for(let j=0;j<item.fzsj.fzList.length;j++){
+								let fzItem = item.fzsj.fzList[j]
+								tmpResource.push({
+									mc: null,
+									bh: item.fzsj.mybh+fzItem.preCode+fzItem.subCode,
+									ph: null,
+									ndz: item.hhwznd + content.headerSelectFields.hhwzndUnit,
+									nd: item.hhwznd,
+									nddw: content.headerSelectFields.hhwzndUnit,
+									ly: 'ELN配制',
+									sxrq: null,
+									kc: fzItem.num,
+									kcdw: item.fzsj.dw,
+									syl: null,
+									type: null,
+									elnType: this.product,
+									syldw:item.fzsj.dw,
+									yxzq:null,
+									yxzqdw:null,
+								})
+								fzTotal=addDecimals(fzTotal,fzItem.num)
+							}
+						}
+						//生成的
 						const { total, unit } = addTj([item.sjjzxql, item.sjryxql], [content.headerSelectFields.sjjzxqlUnit, content.headerSelectFields.sjryxqlUnit])
 
 						tmpResource.push({
@@ -347,16 +411,20 @@ export default {
 							sxrq: null,
 							kc: total,
 							kcdw: unit,
-							syl: null,
+							syl: fzTotal>0?fzTotal:null,
 							type: null,
 							elnType: this.product,
-							syldw:unit,
+							syldw:fzTotal>0?item.fzsj.dw:unit,
 							yxzq:null,
 							yxzqdw:null,
 						})
 					}
 				}
 			}
+			debugger
+			if(tmpResource.length>0){
+				tmpResource = uniqeResourceOne(tmpResource)
+			}
 			//使用的试剂、仪器
 			const stepResource = this.$refs.stepRef.getStepResource()
 			this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[])

src/views/business/form/drug/comp/enter.vue

@@ -66,7 +66,7 @@ export default {
       this.$modal.loading()
       drug_info({id:this.$route.params.studyId}).then(({data}) => {
         this.study = data
-        const obj = Object.assign({}, this.$route, { title: '麻精药表单:'+this.study.sn }) 
+        const obj = Object.assign({}, this.$route, { title: this.study.name+'('+this.study.sn+')' }) 
         this.$tab.updatePage(obj);
       }).finally(() => {
         this.$modal.closeLoading()

src/views/business/form/nonTrial/comp/enter.vue

@@ -66,7 +66,7 @@ export default {
       this.$modal.loading()
       nonTrial_info({id:this.$route.params.studyId}).then(({data}) => {
         this.study = data
-        const obj = Object.assign({}, this.$route, { title: '非试验表单:'+this.study.sn }) 
+        const obj = Object.assign({}, this.$route, { title: this.study.name+'('+this.study.sn+')' }) 
         this.$tab.updatePage(obj);
       }).finally(() => {
         this.$modal.closeLoading()

src/views/business/study/comp/enter.vue

@@ -80,7 +80,7 @@ export default {
       this.$modal.loading()
       study_info({id:this.$route.params.studyId}).then(({data}) => {
         this.study = data
-        const obj = Object.assign({}, this.$route, { title: '试验管理:'+this.study.sn }) 
+        const obj = Object.assign({}, this.$route, { title: this.study.name+'('+this.study.sn+')' }) 
         this.$tab.updatePage(obj);
       }).finally(() => {
         this.$modal.closeLoading()

src/views/business/systemLog/comp/czrz.vue

@@ -46,7 +46,7 @@
     <el-table v-loading="loading" :data="list">
       <el-table-column :label="$t('page.system.systemLog.czr')" prop="qmrMc" width="200" />
       <el-table-column :label="$t('page.system.systemLog.czlx')" :prop="$i18n.locale === 'zh_CN'?'jcmc':'jcmcEn'" width="200" />
-      <el-table-column :label="$t('page.system.systemLog.czxq')" align="center">
+      <el-table-column :label="$t('page.system.systemLog.czxq')">
         <template slot-scope="scope">
           <span>{{initNr(scope.row)}}</span>
         </template>
@@ -122,9 +122,9 @@ export default {
           _.forEach(list,(o,index)=>{
             nr+=o.name+'：'+o.value+(index===list.length-1?'':'；')
           })
-          return nr
+          return (row.name || '')+nr+(row.remark?('；'+this.$t('form.remark')+":"+row.remark):'')
         }else{
-          return row.jcnr
+          return (row.name || '')+(row.jcnr || '')+(row.remark?('；'+this.$t('form.remark')+":"+row.remark):'')
         }
       }else{
         if(this.isJSON(row.jcnrEn)){
@@ -133,9 +133,9 @@ export default {
           _.forEach(list,(o,index)=>{
             nr+=o.name+'：'+o.value+(index===list.length-1?'':'；')
           })
-          return nr
+          return (row.name || '')+nr+(row.remark?('；'+this.$t('form.remark')+":"+row.remark):'')
         }else{
-          return row.jcnrEn
+          return (row.name || '')+(row.jcnrEn || '')+(row.remark?('；'+this.$t('form.remark')+":"+row.remark):'')
         }
       }
     },