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

src/lang/en/template/dl.js

@@ -128,7 +128,7 @@ export default {
     qxbd: '前序表单',
     dlbz: '备注',
     czbz: '操作步骤',
-    qcxjjyqk:'秋水仙碱加液情况',
+    xbczqk:'细胞操作情况',
     bltj:'暴露条件',
 
     jlzb:'剂量组别',

src/lang/zh/template/dl.js

@@ -128,7 +128,7 @@ export default {
     qxbd: '前序表单',
     dlbz: '备注',
     czbz: '操作步骤',
-    qcxjjyqk:'秋水仙碱加液情况',
+    xbczqk:'细胞操作情况',
     bltj:'暴露条件',
 
     jlzb:'剂量组别',

src/views/business/comps/template/comps/dl/DL016.vue

@@ -19,15 +19,9 @@
 					<CustomTable
 							@headerSelectChange="onHeaderSelectChange"
 							fieldItemLabel="template.common.operationSteps" @blur="onHandleTableBlur"
-							@beforeSaveRecord = "beforeSaveRecord"
-							:showAddRow="false" :showOperation="fillType === 'actFill'"
+							@beforeSaveRecord = "beforeSaveRecord" @onRegentSubmit="(e) => onRegentSubmit"
+							:showAddRow="false" :showOperation="false"
 							ref="stepTableRef" :columns="stepColumns" :formData="formData">
-							<template slot="operation" slot-scope="{ row, rowIndex, columns }">
-								<TableOpertaion @startConfig="startConfig" @configComplete="configComplete"
-									@printTag="printTag" @subPackageSubmit="subPackageSubmit" :fillType="fillType"
-									:row="row" :rowIndex="rowIndex" :columns="columns" @deleteRow="deleteRow">
-								</TableOpertaion>
-							</template>
 						</CustomTable>
 
 					<LineLabel label="template.dl.dl016.czbz" />
@@ -142,6 +136,7 @@ export default {
 							label: 'template.dl.dl016.qxbd',
 							type: 'qxbd',
 							fillType: 'actFill',
+              qxbdType:'DL017',
 							filledCodes:['bdmc','bdbh'],
 						},
             bltj: {
@@ -161,35 +156,28 @@ export default {
 			return [
 				{
 					label: "template.dl.dl016.jlzb",
-					prop: "targetSolutionCode",
+					prop: "jlzb",
 					bodyType: "input",
-					bodySubType: "span",
-					bodySubKey: "subTargetSolutionCode",
-					bodyFillType: "preFill",
-					width: 140,
-					myCodeFields: ["targetSolutionCode", "subTargetSolutionCode"],//分装的母液编号字段
-					maxVolumeField: "actSolutionVolume",//分装的最大量字段
-					maxVolumeFieldUnit: "actSolutionVolumeUnit",//分装的最大量单位字段
-					// maxVolumeField: "targetSolutionVolume,targetDiluentVolume",//分装的最大量字段
-					// maxVolumeFieldUnit: "targetSolutionVolumeUnit,targetDiluentVolumeUnit",//分装的最大量单位字段
+					bodyFillType: "actFill",
+					width: 180,
 				},
 				{
 					label: "template.dl.dl016.xybh",
-					prop: "startSolutionCode",
+					prop: "xybh",
 					width: 180,
 					bodyType: "input",
 					bodyFillType: "actFill",
 					bodyMaxlength: 10,
-					bodyDisabled: true,
+					// bodyDisabled: true,
 				},
 				{
 					label: "template.dl.dl016.qsxjjrl",
-					prop: "startSolutionCode",
+					prop: "qsxjjrl",
 					width: 180,
 					bodyType: "input",
 					bodyFillType: "actFill",
 					bodyMaxlength: 10,
-					bodyDisabled: true,
+					// bodyDisabled: true,
 				}
 			]
 		},
@@ -202,6 +190,19 @@ export default {
 	mounted() {
 	},
 	methods: {
+    onRegentSubmit(e) {
+      const { selectInfo, key, rowIndex } = e
+      const { row } = selectInfo
+
+      if (key === 'yqbh') {
+        const params = {
+          yqmc: row.mc,
+          yqxh: row.xh,
+          xccsjzjdrq: row.jzrq
+        }
+        // this.$refs.yqsyTableRef.updateDataSourceByRowIndex(rowIndex, params)
+      }
+    },
     //选择table header下拉框也要更新体积
 		onHeaderSelectChange(data){
 			const {key, headerSelectFields,dataSource=[]} = data;

src/views/business/comps/template/comps/dl/DL017.vue

@@ -15,19 +15,19 @@
 						ref="swypyjInfoRef" :formConfig="swypyjInfoFormConfig" :formData="formData"
 						/>
 
-          <LineLabel label="template.dl.dl017.qcxjjyqk" />
+          <LineLabel label="template.dl.dl017.xbczqk" />
 					<CustomTable
 							@headerSelectChange="onHeaderSelectChange"
 							fieldItemLabel="template.common.operationSteps" @blur="onHandleTableBlur"
-							@beforeSaveRecord = "beforeSaveRecord"
-							:showAddRow="false" :showOperation="fillType === 'actFill'"
+							@beforeSaveRecord = "beforeSaveRecord" @onRegentSubmit="(e) => onRegentSubmit"
+							:showAddRow="false" :showOperation="false"
 							ref="stepTableRef" :columns="stepColumns" :formData="formData">
-							<template slot="operation" slot-scope="{ row, rowIndex, columns }">
+							<!-- <template slot="operation" slot-scope="{ row, rowIndex, columns }">
 								<TableOpertaion @startConfig="startConfig" @configComplete="configComplete"
 									@printTag="printTag" @subPackageSubmit="subPackageSubmit" :fillType="fillType"
 									:row="row" :rowIndex="rowIndex" :columns="columns" @deleteRow="deleteRow">
 								</TableOpertaion>
-							</template>
+							</template> -->
 						</CustomTable>
 
 					<LineLabel label="template.dl.dl017.czbz" />
@@ -143,6 +143,7 @@ export default {
 							label: 'template.dl.dl017.qxbd',
 							type: 'qxbd',
 							fillType: 'actFill',
+              qxbdType:'DL017',
 							filledCodes:['bdmc','bdbh'],
 						},
             bltj: {
@@ -162,7 +163,7 @@ export default {
 			return [
 				{
 					label: "template.dl.dl017.jlzb",
-					prop: "startSolutionCode",
+					prop: "jlzb",
 					width: 180,
 					bodyType: "input",
 					bodyFillType: "actFill",
@@ -171,7 +172,7 @@ export default {
 				},
         {
 					label: "template.dl.dl017.xybh",
-					prop: "startSolutionCode",
+					prop: "xybh",
 					width: 180,
 					bodyType: "input",
 					bodyFillType: "actFill",
@@ -179,7 +180,7 @@ export default {
 					bodyDisabled: true,
 				},{
 					label: "template.dl.dl017.sjqszqk",
-					prop: "startSolutionCode",
+					prop: "sjqszqk",
 					width: 180,
 					bodyType: "input",
 					bodyFillType: "actFill",
@@ -187,7 +188,7 @@ export default {
 					bodyDisabled: true,
 				},{
 					label: "template.dl.dl017.sjqcdqk",
-					prop: "startSolutionCode",
+					prop: "sjqcdqk",
 					width: 180,
 					bodyType: "input",
 					bodyFillType: "actFill",
@@ -195,7 +196,7 @@ export default {
 					bodyDisabled: true,
 				},{
 					label: "template.dl.dl017.saqqtqk",
-					prop: "startSolutionCode",
+					prop: "saqqtqk",
 					width: 180,
 					bodyType: "input",
 					bodyFillType: "actFill",
@@ -203,65 +204,65 @@ export default {
 					bodyDisabled: true,
 				},{
 					label: "template.dl.dl017.ddpyy",
-					prop: "startSolutionCode",
+					prop: "ddpyy",
 					width: 180,
-					bodyType: "input",
+					bodyType: "checkbox",
 					bodyFillType: "actFill",
 					bodyMaxlength: 10,
 					bodyDisabled: true,
 				},{
 					label: "template.dl.dl017.xd",
-					prop: "startSolutionCode",
+					prop: "xd",
 					width: 180,
-					bodyType: "input",
+					bodyType: "checkbox",
 					bodyFillType: "actFill",
 					bodyMaxlength: 10,
 					bodyDisabled: true,
 				},{
 					label: "template.dl.dl017.sj",
-					prop: "startSolutionCode",
+					prop: "sj",
 					width: 180,
-					bodyType: "input",
+					bodyType: "checkbox",
 					bodyFillType: "actFill",
 					bodyMaxlength: 10,
 					bodyDisabled: true,
 				},{
 					label: "template.dl.dl017.ds",
-					prop: "startSolutionCode",
+					prop: "ds",
 					width: 180,
-					bodyType: "input",
+					bodyType: "checkbox",
 					bodyFillType: "actFill",
 					bodyMaxlength: 10,
 					bodyDisabled: true,
 				},{
 					label: "template.dl.dl017.dy1gd",
-					prop: "startSolutionCode",
+					prop: "dy1gd",
 					width: 180,
-					bodyType: "input",
+					bodyType: "checkbox",
 					bodyFillType: "actFill",
 					bodyMaxlength: 10,
 					bodyDisabled: true,
 				},{
 					label: "template.dl.dl017.dy2gd",
-					prop: "startSolutionCode",
+					prop: "dy2gd",
 					width: 180,
-					bodyType: "input",
+					bodyType: "checkbox",
 					bodyFillType: "actFill",
 					bodyMaxlength: 10,
 					bodyDisabled: true,
 				},{
 					label: "template.dl.dl017.dy3gd",
-					prop: "startSolutionCode",
+					prop: "dy3gd",
 					width: 180,
-					bodyType: "input",
+					bodyType: "checkbox",
 					bodyFillType: "actFill",
 					bodyMaxlength: 10,
 					bodyDisabled: true,
 				},{
 					label: "template.dl.dl017.dy4gd",
-					prop: "startSolutionCode",
+					prop: "dy4gd",
 					width: 180,
-					bodyType: "input",
+					bodyType: "checkbox",
 					bodyFillType: "actFill",
 					bodyMaxlength: 10,
 					bodyDisabled: true,
@@ -277,6 +278,19 @@ export default {
 	mounted() {
 	},
 	methods: {
+    onRegentSubmit(e) {
+      const { selectInfo, key, rowIndex } = e
+      const { row } = selectInfo
+
+      if (key === 'yqbh') {
+        const params = {
+          yqmc: row.mc,
+          yqxh: row.xh,
+          xccsjzjdrq: row.jzrq
+        }
+        // this.$refs.yqsyTableRef.updateDataSourceByRowIndex(rowIndex, params)
+      }
+    },
     //选择table header下拉框也要更新体积
 		onHeaderSelectChange(data){
 			const {key, headerSelectFields,dataSource=[]} = data;

src/views/business/comps/template/comps/dl/DL018.vue

@@ -20,14 +20,14 @@
 							@headerSelectChange="onHeaderSelectChange"
 							fieldItemLabel="template.common.operationSteps" @blur="onHandleTableBlur"
 							@beforeSaveRecord = "beforeSaveRecord"
-							:showAddRow="false" :showOperation="fillType === 'actFill'"
+							:showAddRow="false" :showOperation="false"
 							ref="stepTableRef" :columns="stepColumns" :formData="formData">
-							<template slot="operation" slot-scope="{ row, rowIndex, columns }">
+							<!-- <template slot="operation" slot-scope="{ row, rowIndex, columns }">
 								<TableOpertaion @startConfig="startConfig" @configComplete="configComplete"
 									@printTag="printTag" @subPackageSubmit="subPackageSubmit" :fillType="fillType"
 									:row="row" :rowIndex="rowIndex" :columns="columns" @deleteRow="deleteRow">
 								</TableOpertaion>
-							</template>
+							</template> -->
 						</CustomTable>
 
 					<LineLabel label="template.dl.dl018.czbz" />
@@ -143,6 +143,7 @@ export default {
 							label: 'template.dl.dl018.qxbd',
 							type: 'qxbd',
 							fillType: 'actFill',
+              qxbdType:'DL014',
 							filledCodes:['bdmc','bdbh'],
 						},
             bltj: {
@@ -162,21 +163,16 @@ export default {
 			return [
 				{
 					label: "template.dl.dl018.jlzb",
-					prop: "targetSolutionCode",
+					prop: "jlzb",
+					width: 180,
 					bodyType: "input",
-					bodySubType: "span",
-					bodySubKey: "subTargetSolutionCode",
-					bodyFillType: "preFill",
-					width: 140,
-					myCodeFields: ["targetSolutionCode", "subTargetSolutionCode"],//分装的母液编号字段
-					maxVolumeField: "actSolutionVolume",//分装的最大量字段
-					maxVolumeFieldUnit: "actSolutionVolumeUnit",//分装的最大量单位字段
-					// maxVolumeField: "targetSolutionVolume,targetDiluentVolume",//分装的最大量字段
-					// maxVolumeFieldUnit: "targetSolutionVolumeUnit,targetDiluentVolumeUnit",//分装的最大量单位字段
+					bodyFillType: "actFill",
+					bodyMaxlength: 10,
+					bodyDisabled: true,
 				},
 				{
 					label: "template.dl.dl018.xybh",
-					prop: "startSolutionCode",
+					prop: "xybh",
 					width: 180,
 					bodyType: "input",
 					bodyFillType: "actFill",
@@ -185,7 +181,7 @@ export default {
 				},
 				{
 					label: "template.dl.dl018.rsks",
-					prop: "startSolutionCode",
+					prop: "rsks",
 					width: 180,
 					bodyType: "input",
 					bodyFillType: "actFill",
@@ -194,7 +190,7 @@ export default {
 				},
 				{
 					label: "template.dl.dl018.rsjs",
-					prop: "startSolutionCode",
+					prop: "rsjs",
 					width: 180,
 					bodyType: "input",
 					bodyFillType: "actFill",
@@ -203,7 +199,7 @@ export default {
 				},
 				{
 					label: "template.dl.dl018.zs",
-					prop: "startSolutionCode",
+					prop: "zs",
 					width: 180,
 					bodyType: "input",
 					bodyFillType: "actFill",
@@ -212,7 +208,7 @@ export default {
 				},
 				{
 					label: "template.dl.dl018.ys",
-					prop: "startSolutionCode",
+					prop: "ys",
 					width: 180,
 					bodyType: "input",
 					bodyFillType: "actFill",
@@ -221,7 +217,7 @@ export default {
 				},
 				{
 					label: "template.dl.dl018.zy",
-					prop: "startSolutionCode",
+					prop: "zy",
 					width: 180,
 					bodyType: "input",
 					bodyFillType: "actFill",
@@ -230,7 +226,7 @@ export default {
 				},
 				{
 					label: "template.dl.dl018.yx",
-					prop: "startSolutionCode",
+					prop: "yx",
 					width: 180,
 					bodyType: "input",
 					bodyFillType: "actFill",
@@ -239,7 +235,7 @@ export default {
 				},
 				{
 					label: "template.dl.dl018.tj",
-					prop: "startSolutionCode",
+					prop: "tj",
 					width: 180,
 					bodyType: "input",
 					bodyFillType: "actFill",

src/views/business/comps/template/comps/dl/DL019.vue

@@ -20,14 +20,14 @@
 							@headerSelectChange="onHeaderSelectChange"
 							fieldItemLabel="template.common.operationSteps" @blur="onHandleTableBlur"
 							@beforeSaveRecord = "beforeSaveRecord"
-							:showAddRow="false" :showOperation="fillType === 'actFill'"
+							:showAddRow="false" :showOperation="false"
 							ref="stepTableRef" :columns="stepColumns" :formData="formData">
-							<template slot="operation" slot-scope="{ row, rowIndex, columns }">
+							<!-- <template slot="operation" slot-scope="{ row, rowIndex, columns }">
 								<TableOpertaion @startConfig="startConfig" @configComplete="configComplete"
 									@printTag="printTag" @subPackageSubmit="subPackageSubmit" :fillType="fillType"
 									:row="row" :rowIndex="rowIndex" :columns="columns" @deleteRow="deleteRow">
 								</TableOpertaion>
-							</template>
+							</template> -->
 						</CustomTable>
 
 					<LineLabel label="template.dl.dl019.czbz" />
@@ -143,6 +143,7 @@ export default {
 							label: 'template.dl.dl019.qxbd',
 							type: 'qxbd',
 							fillType: 'actFill',
+              qxbdType:'DL014',
 							filledCodes:['bdmc','bdbh'],
 						},
             bltj: {
@@ -162,21 +163,16 @@ export default {
 			return [
 				{
 					label: "template.dl.dl019.jlzb",
-					prop: "targetSolutionCode",
+					prop: "jlzb",
+					width: 180,
 					bodyType: "input",
-					bodySubType: "span",
-					bodySubKey: "subTargetSolutionCode",
-					bodyFillType: "preFill",
-					width: 140,
-					myCodeFields: ["targetSolutionCode", "subTargetSolutionCode"],//分装的母液编号字段
-					maxVolumeField: "actSolutionVolume",//分装的最大量字段
-					maxVolumeFieldUnit: "actSolutionVolumeUnit",//分装的最大量单位字段
-					// maxVolumeField: "targetSolutionVolume,targetDiluentVolume",//分装的最大量字段
-					// maxVolumeFieldUnit: "targetSolutionVolumeUnit,targetDiluentVolumeUnit",//分装的最大量单位字段
+					bodyFillType: "actFill",
+					bodyMaxlength: 10,
+					bodyDisabled: true,
 				},
 				{
 					label: "template.dl.dl019.xybh",
-					prop: "startSolutionCode",
+					prop: "xybh",
 					width: 180,
 					bodyType: "input",
 					bodyFillType: "actFill",
@@ -185,7 +181,7 @@ export default {
 				},
 				{
 					label: "template.dl.dl019.bplsh1",
-					prop: "startSolutionCode",
+					prop: "bplsh1",
 					width: 180,
 					bodyType: "input",
 					bodyFillType: "actFill",
@@ -194,7 +190,7 @@ export default {
 				},
 				{
 					label: "template.dl.dl019.bplsh2",
-					prop: "startSolutionCode",
+					prop: "bplsh2",
 					width: 180,
 					bodyType: "input",
 					bodyFillType: "actFill",