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

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

@@ -16,7 +16,7 @@
 					<LineLabel label="template.common.operationSteps" />
 					<div class="template-form-item">
 						<BaseInfoFormPackage fieldItemLabel="template.common.operationSteps" ref="stepFormPackageRef" :formConfig="stepFormConfig"
-							:formData="formData" @clickable="handleJzClickable" />
+							:formData="formData" />
 
 						<CustomTable
 							@blur="onHandleTableBlur"
@@ -24,7 +24,6 @@
 							:columns="tableStepColumns"
 							:formData="formData"
 							:prefixKey = "`table`"
-							@clickable="handleClickable"
 							fieldItemLabel = "template.common.operationSteps"
 						>
 							<template slot="operation" slot-scope="{ row, rowIndex, columns }">
@@ -49,11 +48,6 @@
 			</div>
 		</div>
 		<!-- <button @click = "onSave">保存</button> -->
-
-		<SelectReagentDialog
-		@submit="onSelectReagentSubmit"
-		ref="selectReagentDialogRef" >
-		</SelectReagentDialog>
 	</div>
 </template>
 
@@ -67,14 +61,13 @@ import CustomTable from '@/components/Template/CustomTable.vue';
 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';
 import { EventBus } from "@/utils/eventBus";
 import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
 import { addTj,uniqeResource,uniqeResourceOne,addDecimals } from "@/utils/calUnitTools";
 
 export default {
 	name: "ZQDYJMD",
-	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable,TableOpertaion,SelectReagentDialog },
+	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable,TableOpertaion },
 	mixins: [templateMixin],
 	props: {
 		fillType: {
@@ -218,7 +211,7 @@ export default {
 							label: 'template.sp.sp008.xzjz',
 							type: "input",
 							fillType: "preFill",
-							subType: "clickable",
+							subType: "sj",
 							subKey: "subJz",
 							subFillType: "actFill",
 							maxlength: 20,
@@ -250,36 +243,6 @@ export default {
 	},
 
 	methods: {
-		//点击基质选择
-		handleJzClickable(obj){
-			this.reagentType = 1//本表单特殊字段
-			this.currentSubKey = obj.subKey;
-			this.$refs.selectReagentDialogRef.show(this.formData.id)
-		},
-		//选择试剂提交事件
-		onSelectReagentSubmit(code,row){
-			if(this.reagentType===1){
-				this.$refs.stepFormPackageRef.updateFormData(this.currentSubKey, code);
-			}else{
-				this.$refs.tableRef.updateDataSourceByRowIndex(this.rowIndex,{
-					[this.currentSubKey]: code,
-				})
-			}
-			this.$refs.selectReagentDialogRef.onCancel()
-		},
-		//点击表格单元格
-		handleClickable(col, rowIndex) {
-			//本表单特殊字段
-			this.reagentType = 2
-
-			this.rowIndex = rowIndex
-			this.currentSubKey = col.prop;
-			console.log("clickable",rowIndex, col)
-			if(col.prop === "sjry"){
-				//调用对应弹窗的方法-多个点击的需要判断是哪个字段点击
-				this.$refs.selectReagentDialogRef.show(this.formData.id)
-			}
-		},
 		//获取目标溶液编号
 		async getCode(v){
 			const {stepTableFormData = []} = v;

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

@@ -16,11 +16,10 @@
 					<div class="template-form-item">
 						<span>基质</span>
 						<BaseInfoFormPackage fieldItemLabel="template.common.operationSteps" ref="stepFormPackageRef"
-							:formConfig="stepFormConfig" @blur="onHandleBlur" :formData="formData"
-							@clickable="handleJzClickable" />
+							:formConfig="stepFormConfig" @blur="onHandleBlur" :formData="formData" />
 
 						<CustomTable @blur="onHandleTableBlur" :ref="`tableRef`" :columns="tableStepColumns"
-							:formData="formData" :prefixKey="`table`" @clickable="handleClickable"
+							:formData="formData" :prefixKey="`table`"
 							fieldItemLabel="template.common.operationSteps">
 							<template slot="operation" slot-scope="{ row, rowIndex, columns }">
 								<TableOpertaion :fillType="fillType" :row="row" :rowIndex="rowIndex" :columns="columns"
@@ -37,9 +36,9 @@
 
 						<BaseInfoFormPackage fieldItemLabel="template.common.operationSteps"
 							ref="rongyeStepFormPackageRef" :formConfig="rongyeStepFormConfig" @blur="onHandleBlur"
-							:formData="formData" @clickable="handleRongyeClickable" />
+							:formData="formData" />
 						<CustomTable @blur="onHandleTableBlur" :ref="`rongyeTableRef`" :columns="rongyeTableStepColumns"
-							:formData="{stepTableFormData:formData.stepTableFormData_1,headerSelectFields:formData.headerSelectFields_1}" :prefixKey="`rongyeTable`" @clickable="handleRongyeTableClickable"
+							:formData="{stepTableFormData:formData.stepTableFormData_1,headerSelectFields:formData.headerSelectFields_1}" :prefixKey="`rongyeTable`"
 							fieldItemLabel="template.common.operationSteps">
 							<template slot="operation" slot-scope="{ row, rowIndex, columns }">
 								<TableOpertaion :fillType="fillType" :row="row" :rowIndex="rowIndex" :columns="columns"
@@ -59,8 +58,6 @@
 			</div>
 		</div>
 		<!-- <button @click = "onSave">保存</button> -->
-		<SelectReagentDialog @submit="onSelectReagentSubmit" ref="selectReagentDialogRef">
-		</SelectReagentDialog>
 	</div>
 </template>
 
@@ -74,14 +71,13 @@ import CustomTable from '@/components/Template/CustomTable.vue';
 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';
 import { EventBus } from "@/utils/eventBus";
 import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
 import { addTj,uniqeResource,uniqeResourceOne,addDecimals } from "@/utils/calUnitTools";
 
 export default {
 	name: "SWYPFXRYPZB",
-	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable, TableOpertaion, SelectReagentDialog },
+	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable, TableOpertaion },
 	mixins: [templateMixin],
 	props: {
 		fillType: {
@@ -224,7 +220,7 @@ export default {
 							label: 'template.sp.sp008.xzjz',
 							type: "input",
 							fillType: "preFill",
-							subType: "clickable",
+							subType: "sj",
 							subKey: "subJz",
 							subFillType: "actFill",
 							maxlength: 20,
@@ -243,7 +239,7 @@ export default {
 							label: 'template.sp.sp009.xzgzy',
 							type: "input",
 							fillType: "preFill",
-							subType: "clickable",
+							subType: "sj",
 							subKey: "subGzy",
 							subFillType: "actFill",
 							maxlength: 20,
@@ -258,7 +254,7 @@ export default {
 							label: 'template.sp.sp009.xzxsy',
 							type: "input",
 							fillType: "preFill",
-							subType: "clickable",
+							subType: "sj",
 							subKey: "subXsy",
 							subFillType: "actFill",
 							maxlength: 20,
@@ -289,56 +285,6 @@ export default {
 		}
 	},
 	methods: {
-		//点击基质选择
-		handleJzClickable(obj) {
-			this.reagentType = 1//本表单特殊字段
-			this.currentSubKey = obj.subKey;
-			this.$refs.selectReagentDialogRef.show(this.formData.id)
-		},
-		handleRongyeClickable(obj) {
-			this.reagentType = 2//本表单特殊字段
-			this.currentSubKey = obj.subKey;
-			this.$refs.selectReagentDialogRef.show(this.formData.id)
-		},
-		//选择试剂提交事件
-		onSelectReagentSubmit(code, row) {
-			if (this.reagentType == 1) {
-				this.$refs.stepFormPackageRef.updateFormData(this.currentSubKey, code);
-			} else if(this.reagentType == 2){
-				this.$refs.rongyeStepFormPackageRef.updateFormData(this.currentSubKey, code);
-			} else if(this.reagentType == 3) {
-				this.$refs.tableRef.updateDataSourceByRowIndex(this.rowIndex,{
-					[this.currentSubKey]: code,
-				})
-			} else if(this.reagentType == 4) {
-				this.$refs.rongyeTableRef.updateDataSourceByRowIndex(this.rowIndex,{
-					[this.currentSubKey]: code,
-				})
-			}
-
-			this.$refs.selectReagentDialogRef.onCancel()
-		},
-		//点击表格单元格
-		handleClickable(col, rowIndex) {
-			this.reagentType = 3
-			this.rowIndex = rowIndex
-			this.currentSubKey = col.prop;
-			console.log("clickable",rowIndex, col)
-			if(col.prop === "sjry"){
-				//调用对应弹窗的方法-多个点击的需要判断是哪个字段点击
-				this.$refs.selectReagentDialogRef.show(this.formData.id)
-			}
-		},
-		handleRongyeTableClickable(col, rowIndex) {
-			this.reagentType = 4
-			this.rowIndex = rowIndex
-			this.currentSubKey = col.prop;
-			console.log("clickable",rowIndex, col)
-			if(col.prop === "sjry"){
-				//调用对应弹窗的方法-多个点击的需要判断是哪个字段点击
-				this.$refs.selectReagentDialogRef.show(this.formData.id)
-			}
-		},
 		//获取目标溶液编号
 		async getCode(v) {
 			// 基质表格

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

@@ -16,7 +16,7 @@
 					<LineLabel label="template.common.operationSteps" />
 					<div class="template-form-item">
 						<BaseInfoFormPackage fieldItemLabel="template.common.operationSteps" ref="stepFormPackageRef" :formConfig="stepFormConfig"
-							:formData="formData" @clickable="handleJzClickable" />
+							:formData="formData" />
 
 						<CustomTable
 							@blur="onHandleTableBlur"
@@ -24,7 +24,6 @@
 							:columns="tableStepColumns"
 							:formData="formData"
 							:prefixKey = "`table`"
-							@clickable="handleClickable"
 							fieldItemLabel = "template.common.operationSteps"
 						>
 							<template slot="operation" slot-scope="{ row, rowIndex, columns }">
@@ -49,11 +48,6 @@
 			</div>
 		</div>
 		<!-- <button @click = "onSave">保存</button> -->
-
-		<SelectReagentDialog
-		@submit="onSelectReagentSubmit"
-		ref="selectReagentDialogRef" >
-		</SelectReagentDialog>
 	</div>
 </template>
 
@@ -67,14 +61,13 @@ import CustomTable from '@/components/Template/CustomTable.vue';
 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';
 import { EventBus } from "@/utils/eventBus";
 import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
 import { addTj,uniqeResource,uniqeResourceOne,addDecimals } from "@/utils/calUnitTools";
 
 export default {
 	name: "QXWDX",
-	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable,TableOpertaion,SelectReagentDialog },
+	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable,TableOpertaion },
 	mixins: [templateMixin],
 	props: {
 		fillType: {
@@ -218,7 +211,7 @@ export default {
 							label: 'template.sp.sp008.xzjz',
 							type: "input",
 							fillType: "preFill",
-							subType: "clickable",
+							subType: "sj",
 							subKey: "subJz",
 							subFillType: "actFill",
 							maxlength: 20,
@@ -249,36 +242,6 @@ export default {
 		}
 	},
 	methods: {
-		//点击基质选择
-		handleJzClickable(obj){
-			this.reagentType = 1//本表单特殊字段
-			this.currentSubKey = obj.subKey;
-			this.$refs.selectReagentDialogRef.show(this.formData.id)
-		},
-		//选择试剂提交事件
-		onSelectReagentSubmit(code,row){
-			if(this.reagentType===1){
-				this.$refs.stepFormPackageRef.updateFormData(this.currentSubKey, code);
-			}else{
-				this.$refs.tableRef.updateDataSourceByRowIndex(this.rowIndex,{
-					[this.currentSubKey]: code,
-				})
-			}
-			this.$refs.selectReagentDialogRef.onCancel()
-		},
-		//点击表格单元格
-		handleClickable(col, rowIndex) {
-			//本表单特殊字段
-			this.reagentType = 2
-
-			this.rowIndex = rowIndex
-			this.currentSubKey = col.prop;
-			console.log("clickable",rowIndex, col)
-			if(col.prop === "sjry"){
-				//调用对应弹窗的方法-多个点击的需要判断是哪个字段点击
-				this.$refs.selectReagentDialogRef.show(this.formData.id)
-			}
-		},
 		//获取目标溶液编号
 		async getCode(v){
 			const {stepTableFormData = []} = v;

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

@@ -16,7 +16,7 @@
 					<LineLabel label="template.common.operationSteps" />
 					<div class="template-form-item">
 						<BaseInfoFormPackage fieldItemLabel="template.common.operationSteps" ref="stepFormPackageRef" :formConfig="stepFormConfig"
-							:formData="formData" @clickable="handleJzClickable" />
+							:formData="formData" />
 
 						<CustomTable
 							@blur="onHandleTableBlur"
@@ -24,7 +24,6 @@
 							:columns="tableStepColumns"
 							:formData="formData"
 							:prefixKey = "`table`"
-							@clickable="handleClickable"
 							fieldItemLabel = "template.common.operationSteps"
 						>
 							<template slot="operation" slot-scope="{ row, rowIndex, columns }">
@@ -49,11 +48,6 @@
 			</div>
 		</div>
 		<!-- <button @click = "onSave">保存</button> -->
-
-		<SelectReagentDialog
-		@submit="onSelectReagentSubmit"
-		ref="selectReagentDialogRef" >
-		</SelectReagentDialog>
 	</div>
 </template>
 
@@ -67,14 +61,13 @@ import CustomTable from '@/components/Template/CustomTable.vue';
 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';
 import { EventBus } from "@/utils/eventBus";
 import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
 import { addTj,uniqeResource,uniqeResourceOne,addDecimals } from "@/utils/calUnitTools";
 
 export default {
 	name: "CBYHGZYWDX",
-	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable,TableOpertaion,SelectReagentDialog },
+	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable,TableOpertaion },
 	mixins: [templateMixin],
 	props: {
 		fillType: {
@@ -218,7 +211,7 @@ export default {
 							label: 'template.sp.sp011.xzxsy',
 							type: "input",
 							fillType: "preFill",
-							subType: "clickable",
+							subType: "sj",
 							subKey: "subJz",
 							subFillType: "actFill",
 							maxlength: 20,
@@ -249,36 +242,6 @@ export default {
 		}
 	},
 	methods: {
-		//点击基质选择
-		handleJzClickable(obj){
-			this.reagentType = 1//本表单特殊字段
-			this.currentSubKey = obj.subKey;
-			this.$refs.selectReagentDialogRef.show(this.formData.id)
-		},
-		//选择试剂提交事件
-		onSelectReagentSubmit(code,row){
-			if(this.reagentType===1){
-				this.$refs.stepFormPackageRef.updateFormData(this.currentSubKey, code);
-			}else{
-				this.$refs.tableRef.updateDataSourceByRowIndex(this.rowIndex,{
-					[this.currentSubKey]: code,
-				})
-			}
-			this.$refs.selectReagentDialogRef.onCancel()
-		},
-		//点击表格单元格
-		handleClickable(col, rowIndex) {
-			//本表单特殊字段
-			this.reagentType = 2
-
-			this.rowIndex = rowIndex
-			this.currentSubKey = col.prop;
-			console.log("clickable",rowIndex, col)
-			if(col.prop === "sjry"){
-				//调用对应弹窗的方法-多个点击的需要判断是哪个字段点击
-				this.$refs.selectReagentDialogRef.show(this.formData.id)
-			}
-		},
 		//获取目标溶液编号
 		async getCode(v){
 			const {stepTableFormData = []} = v;

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

@@ -16,7 +16,7 @@
 					<LineLabel label="template.common.operationSteps" />
 					<div class="template-form-item">
 						<BaseInfoFormPackage fieldItemLabel="template.common.operationSteps" ref="stepFormPackageRef" :formConfig="stepFormConfig"
-							:formData="formData" @clickable="handleJzClickable" />
+							:formData="formData" />
 
 						<CustomTable
 							@blur="onHandleTableBlur"
@@ -24,7 +24,6 @@
 							:columns="tableStepColumns"
 							:formData="formData"
 							:prefixKey = "`table`"
-							@clickable="handleClickable"
 							fieldItemLabel = "template.common.operationSteps"
 						>
 							<template slot="operation" slot-scope="{ row, rowIndex, columns }">
@@ -49,11 +48,6 @@
 			</div>
 		</div>
 		<!-- <button @click = "onSave">保存</button> -->
-
-		<SelectReagentDialog
-		@submit="onSelectReagentSubmit"
-		ref="selectReagentDialogRef" >
-		</SelectReagentDialog>
 	</div>
 </template>
 
@@ -67,14 +61,13 @@ import CustomTable from '@/components/Template/CustomTable.vue';
 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';
 import { EventBus } from "@/utils/eventBus";
 import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
 import { addTj,uniqeResource,uniqeResourceOne,addDecimals } from "@/utils/calUnitTools";
 
 export default {
 	name: "RXJZXY",
-	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable,TableOpertaion,SelectReagentDialog },
+	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable,TableOpertaion },
 	mixins: [templateMixin],
 	props: {
 		fillType: {
@@ -218,7 +211,7 @@ export default {
 							label: 'template.sp.sp011.xzxsy',
 							type: "input",
 							fillType: "preFill",
-							subType: "clickable",
+							subType: "sj",
 							subKey: "subJz",
 							subFillType: "actFill",
 							maxlength: 20,
@@ -249,36 +242,6 @@ export default {
 		}
 	},
 	methods: {
-		//点击基质选择
-		handleJzClickable(obj){
-			this.reagentType = 1//本表单特殊字段
-			this.currentSubKey = obj.subKey;
-			this.$refs.selectReagentDialogRef.show(this.formData.id)
-		},
-		//选择试剂提交事件
-		onSelectReagentSubmit(code,row){
-			if(this.reagentType===1){
-				this.$refs.stepFormPackageRef.updateFormData(this.currentSubKey, code);
-			}else{
-				this.$refs.tableRef.updateDataSourceByRowIndex(this.rowIndex,{
-					[this.currentSubKey]: code,
-				})
-			}
-			this.$refs.selectReagentDialogRef.onCancel()
-		},
-		//点击表格单元格
-		handleClickable(col, rowIndex) {
-			//本表单特殊字段
-			this.reagentType = 2
-
-			this.rowIndex = rowIndex
-			this.currentSubKey = col.prop;
-			console.log("clickable",rowIndex, col)
-			if(col.prop === "sjry"){
-				//调用对应弹窗的方法-多个点击的需要判断是哪个字段点击
-				this.$refs.selectReagentDialogRef.show(this.formData.id)
-			}
-		},
 		//获取目标溶液编号
 		async getCode(v){
 			const {stepTableFormData = []} = v;

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

@@ -22,7 +22,6 @@
 							:columns="tableStepColumns"
 							:formData="formData"
 							:prefixKey = "`table`"
-							@clickable="handleClickable"
 							fieldItemLabel = "template.common.operationSteps"
 						>
 							<template slot="operation" slot-scope="{ row, rowIndex, columns }">
@@ -47,11 +46,6 @@
 			</div>
 		</div>
 		<!-- <button @click = "onSave">保存</button> -->
-
-		<SelectReagentDialog
-		@submit="onSelectReagentSubmit"
-		ref="selectReagentDialogRef" >
-		</SelectReagentDialog>
 	</div>
 </template>
 
@@ -65,14 +59,13 @@ import CustomTable from '@/components/Template/CustomTable.vue';
 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';
 import { EventBus } from "@/utils/eventBus";
 import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
 import { addTj,uniqeResource,uniqeResourceOne,addDecimals } from "@/utils/calUnitTools";
 
 export default {
 	name: "JZXY",
-	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable,TableOpertaion,SelectReagentDialog },
+	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable,TableOpertaion },
 	mixins: [templateMixin],
 	props: {
 		fillType: {
@@ -216,7 +209,7 @@ export default {
 							label: 'template.sp.sp011.xzxsy',
 							type: "input",
 							fillType: "preFill",
-							subType: "clickable",
+							subType: "sj",
 							subKey: "subJz",
 							subFillType: "actFill",
 							maxlength: 20,
@@ -247,26 +240,6 @@ export default {
 		}
 	},
 	methods: {
-		//选择试剂提交事件
-		onSelectReagentSubmit(code,row){
-			this.$refs.tableRef.updateDataSourceByRowIndex(this.rowIndex,{
-				[this.currentSubKey]: code,
-			})
-			this.$refs.selectReagentDialogRef.onCancel()
-		},
-		//点击表格单元格
-		handleClickable(col, rowIndex) {
-			//本表单特殊字段
-			this.reagentType = 2
-
-			this.rowIndex = rowIndex
-			this.currentSubKey = col.prop;
-			console.log("clickable",rowIndex, col)
-			if(col.prop === "sjry" || col.prop === "kbjzbh"){
-				//调用对应弹窗的方法-多个点击的需要判断是哪个字段点击
-				this.$refs.selectReagentDialogRef.show(this.formData.id)
-			}
-		},
 		//获取目标溶液编号
 		async getCode(v){
 			const {stepTableFormData = []} = v;

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

@@ -16,7 +16,7 @@
 					<LineLabel label="template.common.operationSteps" />
 					<div class="template-form-item">
 						<BaseInfoFormPackage fieldItemLabel="template.common.operationSteps" ref="stepFormPackageRef" :formConfig="stepFormConfig"
-							:formData="formData" @clickable="handleJzClickable" />
+							:formData="formData" />
 
 						<CustomTable
 							@blur="onHandleTableBlur"
@@ -24,7 +24,6 @@
 							:columns="tableStepColumns"
 							:formData="formData"
 							:prefixKey = "`table`"
-							@clickable="handleClickable"
 							fieldItemLabel = "template.common.operationSteps"
 						>
 							<template slot="operation" slot-scope="{ row, rowIndex, columns }">
@@ -49,11 +48,6 @@
 			</div>
 		</div>
 		<!-- <button @click = "onSave">保存</button> -->
-
-		<SelectReagentDialog
-		@submit="onSelectReagentSubmit"
-		ref="selectReagentDialogRef" >
-		</SelectReagentDialog>
 	</div>
 </template>
 
@@ -67,14 +61,13 @@ import CustomTable from '@/components/Template/CustomTable.vue';
 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';
 import { EventBus } from "@/utils/eventBus";
 import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
 import { addTj,uniqeResource,uniqeResourceOne,addDecimals } from "@/utils/calUnitTools";
 
 export default {
 	name: "XZXHTYX",
-	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable,TableOpertaion,SelectReagentDialog },
+	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable,TableOpertaion },
 	mixins: [templateMixin],
 	props: {
 		fillType: {
@@ -218,7 +211,7 @@ export default {
 							label: 'template.sp.sp011.xzxsy',
 							type: "input",
 							fillType: "preFill",
-							subType: "clickable",
+							subType: "sj",
 							subKey: "subJz",
 							subFillType: "actFill",
 							maxlength: 20,
@@ -249,36 +242,6 @@ export default {
 		}
 	},
 	methods: {
-		//点击基质选择
-		handleJzClickable(obj){
-			this.reagentType = 1//本表单特殊字段
-			this.currentSubKey = obj.subKey;
-			this.$refs.selectReagentDialogRef.show(this.formData.id)
-		},
-		//选择试剂提交事件
-		onSelectReagentSubmit(code,row){
-			if(this.reagentType===1){
-				this.$refs.stepFormPackageRef.updateFormData(this.currentSubKey, code);
-			}else{
-				this.$refs.tableRef.updateDataSourceByRowIndex(this.rowIndex,{
-					[this.currentSubKey]: code,
-				})
-			}
-			this.$refs.selectReagentDialogRef.onCancel()
-		},
-		//点击表格单元格
-		handleClickable(col, rowIndex) {
-			//本表单特殊字段
-			this.reagentType = 2
-
-			this.rowIndex = rowIndex
-			this.currentSubKey = col.prop;
-			console.log("clickable",rowIndex, col)
-			if(col.prop === "sjry"){
-				//调用对应弹窗的方法-多个点击的需要判断是哪个字段点击
-				this.$refs.selectReagentDialogRef.show(this.formData.id)
-			}
-		},
 		//获取目标溶液编号
 		async getCode(v){
 			const {stepTableFormData = []} = v;

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

@@ -16,7 +16,7 @@
 					<LineLabel label="template.common.operationSteps" />
 					<div class="template-form-item">
 						<BaseInfoFormPackage fieldItemLabel="template.common.operationSteps" ref="stepFormPackageRef" :formConfig="stepFormConfig"
-							:formData="formData" @clickable="handleJzClickable" />
+							:formData="formData" />
 
 						<CustomTable
 							@blur="onHandleTableBlur"
@@ -24,7 +24,6 @@
 							:columns="tableStepColumns"
 							:formData="formData"
 							:prefixKey = "`table`"
-							@clickable="handleClickable"
 							fieldItemLabel = "template.common.operationSteps"
 						>
 							<template slot="operation" slot-scope="{ row, rowIndex, columns }">
@@ -49,11 +48,6 @@
 			</div>
 		</div>
 		<!-- <button @click = "onSave">保存</button> -->
-
-		<SelectReagentDialog
-		@submit="onSelectReagentSubmit"
-		ref="selectReagentDialogRef" >
-		</SelectReagentDialog>
 	</div>
 </template>
 
@@ -67,14 +61,13 @@ import CustomTable from '@/components/Template/CustomTable.vue';
 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';
 import { EventBus } from "@/utils/eventBus";
 import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
 import { addTj,uniqeResource,uniqeResourceOne,addDecimals } from "@/utils/calUnitTools";
 
 export default {
 	name: "ZDYBS",
-	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable,TableOpertaion,SelectReagentDialog },
+	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable,TableOpertaion },
 	mixins: [templateMixin],
 	props: {
 		fillType: {
@@ -218,7 +211,7 @@ export default {
 							label: 'template.sp.sp008.xzjz',
 							type: "input",
 							fillType: "preFill",
-							subType: "clickable",
+							subType: "sj",
 							subKey: "subJz",
 							subFillType: "actFill",
 							maxlength: 20,
@@ -249,36 +242,6 @@ export default {
 		}
 	},
 	methods: {
-		//点击基质选择
-		handleJzClickable(obj){
-			this.reagentType = 1//本表单特殊字段
-			this.currentSubKey = obj.subKey;
-			this.$refs.selectReagentDialogRef.show(this.formData.id)
-		},
-		//选择试剂提交事件
-		onSelectReagentSubmit(code,row){
-			if(this.reagentType===1){
-				this.$refs.stepFormPackageRef.updateFormData(this.currentSubKey, code);
-			}else{
-				this.$refs.tableRef.updateDataSourceByRowIndex(this.rowIndex,{
-					[this.currentSubKey]: code,
-				})
-			}
-			this.$refs.selectReagentDialogRef.onCancel()
-		},
-		//点击表格单元格
-		handleClickable(col, rowIndex) {
-			//本表单特殊字段
-			this.reagentType = 2
-
-			this.rowIndex = rowIndex
-			this.currentSubKey = col.prop;
-			console.log("clickable",rowIndex, col)
-			if(col.prop === "sjry"){
-				//调用对应弹窗的方法-多个点击的需要判断是哪个字段点击
-				this.$refs.selectReagentDialogRef.show(this.formData.id)
-			}
-		},
 		//获取目标溶液编号
 		async getCode(v){
 			const {stepTableFormData = []} = v;

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

@@ -16,7 +16,7 @@
 					<LineLabel label="template.common.operationSteps" />
 					<div class="template-form-item">
 						<BaseInfoFormPackage fieldItemLabel="template.common.operationSteps" ref="stepFormPackageRef" :formConfig="stepFormConfig"
-							:formData="formData" @clickable="handleJzClickable" />
+							:formData="formData" />
 
 						<CustomTable
 							@blur="onHandleTableBlur"
@@ -24,7 +24,6 @@
 							:columns="tableStepColumns"
 							:formData="formData"
 							:prefixKey = "`table`"
-							@clickable="handleClickable"
 							fieldItemLabel = "template.common.operationSteps"
 						>
 							<template slot="operation" slot-scope="{ row, rowIndex, columns }">
@@ -49,11 +48,6 @@
 			</div>
 		</div>
 		<!-- <button @click = "onSave">保存</button> -->
-
-		<SelectReagentDialog
-		@submit="onSelectReagentSubmit"
-		ref="selectReagentDialogRef" >
-		</SelectReagentDialog>
 	</div>
 </template>
 
@@ -67,14 +61,13 @@ import CustomTable from '@/components/Template/CustomTable.vue';
 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';
 import { EventBus } from "@/utils/eventBus";
 import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
 import { addTj,uniqeResource,uniqeResourceOne,addDecimals } from "@/utils/calUnitTools";
 
 export default {
 	name: "XSKKX",
-	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable,TableOpertaion,SelectReagentDialog },
+	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable,TableOpertaion },
 	mixins: [templateMixin],
 	props: {
 		fillType: {
@@ -218,7 +211,7 @@ export default {
 							label: 'template.sp.sp008.xzjz',
 							type: "input",
 							fillType: "preFill",
-							subType: "clickable",
+							subType: "sj",
 							subKey: "subJz",
 							subFillType: "actFill",
 							maxlength: 20,
@@ -249,36 +242,6 @@ export default {
 		}
 	},
 	methods: {
-		//点击基质选择
-		handleJzClickable(obj){
-			this.reagentType = 1//本表单特殊字段
-			this.currentSubKey = obj.subKey;
-			this.$refs.selectReagentDialogRef.show(this.formData.id)
-		},
-		//选择试剂提交事件
-		onSelectReagentSubmit(code,row){
-			if(this.reagentType===1){
-				this.$refs.stepFormPackageRef.updateFormData(this.currentSubKey, code);
-			}else{
-				this.$refs.tableRef.updateDataSourceByRowIndex(this.rowIndex,{
-					[this.currentSubKey]: code,
-				})
-			}
-			this.$refs.selectReagentDialogRef.onCancel()
-		},
-		//点击表格单元格
-		handleClickable(col, rowIndex) {
-			//本表单特殊字段
-			this.reagentType = 2
-
-			this.rowIndex = rowIndex
-			this.currentSubKey = col.prop;
-			console.log("clickable",rowIndex, col)
-			if(col.prop === "sjry"){
-				//调用对应弹窗的方法-多个点击的需要判断是哪个字段点击
-				this.$refs.selectReagentDialogRef.show(this.formData.id)
-			}
-		},
 		//获取目标溶液编号
 		async getCode(v){
 			const {stepTableFormData = []} = v;

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

@@ -16,7 +16,7 @@
 					<LineLabel label="template.common.operationSteps" />
 					<div class="template-form-item">
 						<BaseInfoFormPackage fieldItemLabel="template.common.operationSteps" ref="stepFormPackageRef" :formConfig="stepFormConfig"
-							:formData="formData" @clickable="handleJzClickable" />
+							:formData="formData" />
 
 						<CustomTable
 							@blur="onHandleTableBlur"
@@ -24,7 +24,6 @@
 							:columns="tableStepColumns"
 							:formData="formData"
 							:prefixKey = "`table`"
-							@clickable="handleClickable"
 							fieldItemLabel = "template.common.operationSteps"
 						>
 							<template slot="operation" slot-scope="{ row, rowIndex, columns }">
@@ -49,11 +48,6 @@
 			</div>
 		</div>
 		<!-- <button @click = "onSave">保存</button> -->
-
-		<SelectReagentDialog
-		@submit="onSelectReagentSubmit"
-		ref="selectReagentDialogRef" >
-		</SelectReagentDialog>
 	</div>
 </template>
 
@@ -67,14 +61,13 @@ import CustomTable from '@/components/Template/CustomTable.vue';
 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';
 import { EventBus } from "@/utils/eventBus";
 import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
 import { addTj,uniqeResource,uniqeResourceOne,addDecimals } from "@/utils/calUnitTools";
 
 export default {
 	name: "CBYDB",
-	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable,TableOpertaion,SelectReagentDialog },
+	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable,TableOpertaion },
 	mixins: [templateMixin],
 	props: {
 		fillType: {
@@ -218,7 +211,7 @@ export default {
 							label: 'template.sp.sp008.xzjz',
 							type: "input",
 							fillType: "preFill",
-							subType: "clickable",
+							subType: "sj",
 							subKey: "subJz",
 							subFillType: "actFill",
 							maxlength: 20,
@@ -249,36 +242,6 @@ export default {
 		}
 	},
 	methods: {
-		//点击基质选择
-		handleJzClickable(obj){
-			this.reagentType = 1//本表单特殊字段
-			this.currentSubKey = obj.subKey;
-			this.$refs.selectReagentDialogRef.show(this.formData.id)
-		},
-		//选择试剂提交事件
-		onSelectReagentSubmit(code,row){
-			if(this.reagentType===1){
-				this.$refs.stepFormPackageRef.updateFormData(this.currentSubKey, code);
-			}else{
-				this.$refs.tableRef.updateDataSourceByRowIndex(this.rowIndex,{
-					[this.currentSubKey]: code,
-				})
-			}
-			this.$refs.selectReagentDialogRef.onCancel()
-		},
-		//点击表格单元格
-		handleClickable(col, rowIndex) {
-			//本表单特殊字段
-			this.reagentType = 2
-
-			this.rowIndex = rowIndex
-			this.currentSubKey = col.prop;
-			console.log("clickable",rowIndex, col)
-			if(col.prop === "sjry"){
-				//调用对应弹窗的方法-多个点击的需要判断是哪个字段点击
-				this.$refs.selectReagentDialogRef.show(this.formData.id)
-			}
-		},
 		//获取目标溶液编号
 		async getCode(v){
 			const {stepTableFormData = []} = v;

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

@@ -16,7 +16,7 @@
 					<LineLabel label="template.common.operationSteps" />
 					<div class="template-form-item">
 						<BaseInfoFormPackage fieldItemLabel="template.common.operationSteps" ref="stepFormPackageRef" :formConfig="stepFormConfig"
-							:formData="formData" @clickable="handleJzClickable" />
+							:formData="formData" />
 
 						<CustomTable
 							@blur="onHandleTableBlur"
@@ -24,7 +24,6 @@
 							:columns="tableStepColumns"
 							:formData="formData"
 							:prefixKey = "`table`"
-							@clickable="handleClickable"
 							fieldItemLabel = "template.common.operationSteps"
 						>
 							<template slot="operation" slot-scope="{ row, rowIndex, columns }">
@@ -49,11 +48,6 @@
 			</div>
 		</div>
 		<!-- <button @click = "onSave">保存</button> -->
-
-		<SelectReagentDialog
-		@submit="onSelectReagentSubmit"
-		ref="selectReagentDialogRef" >
-		</SelectReagentDialog>
 	</div>
 </template>
 
@@ -67,14 +61,13 @@ import CustomTable from '@/components/Template/CustomTable.vue';
 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';
 import { EventBus } from "@/utils/eventBus";
 import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
 import { addTj,uniqeResource,uniqeResourceOne,addDecimals } from "@/utils/calUnitTools";
 
 export default {
 	name: "CBYDB",
-	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable,TableOpertaion,SelectReagentDialog },
+	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable,TableOpertaion },
 	mixins: [templateMixin],
 	props: {
 		fillType: {
@@ -218,7 +211,7 @@ export default {
 							label: 'template.sp.sp018.xzxsy',
 							type: "input",
 							fillType: "preFill",
-							subType: "clickable",
+							subType: "sj",
 							subKey: "subJz",
 							subFillType: "actFill",
 							maxlength: 20,
@@ -247,36 +240,6 @@ export default {
 		}
 	},
 	methods: {
-		//点击基质选择
-		handleJzClickable(obj){
-			this.reagentType = 1//本表单特殊字段
-			this.currentSubKey = obj.subKey;
-			this.$refs.selectReagentDialogRef.show(this.formData.id)
-		},
-		//选择试剂提交事件
-		onSelectReagentSubmit(code,row){
-			if(this.reagentType===1){
-				this.$refs.stepFormPackageRef.updateFormData(this.currentSubKey, code);
-			}else{
-				this.$refs.tableRef.updateDataSourceByRowIndex(this.rowIndex,{
-					[this.currentSubKey]: code,
-				})
-			}
-			this.$refs.selectReagentDialogRef.onCancel()
-		},
-		//点击表格单元格
-		handleClickable(col, rowIndex) {
-			//本表单特殊字段
-			this.reagentType = 2
-
-			this.rowIndex = rowIndex
-			this.currentSubKey = col.prop;
-			console.log("clickable",rowIndex, col)
-			if(col.prop === "sjry"){
-				//调用对应弹窗的方法-多个点击的需要判断是哪个字段点击
-				this.$refs.selectReagentDialogRef.show(this.formData.id)
-			}
-		},
 		//获取目标溶液编号
 		async getCode(v){
 			const {stepTableFormData = []} = v;

src/views/business/comps/template/formConfig/SWYPFXFFXYPZBBTableConfig.js

@@ -34,7 +34,7 @@ export const getSWYPFXFFXYPZBBTableConfig = (
     {
       label: 'template.sp.sp008.sjry',
       prop: 'sjry',
-      bodyType: 'clickable',
+      bodyType: 'sj',
       bodyFillType: 'actFill',
       width: 280
     },
@@ -104,7 +104,7 @@ export const getSWYPFXFFXYPZBBTableConfig = (
     arr.splice(5, 0, {
       label: 'template.sp.sp013.kbjzbh',
       prop: 'kbjzbh',
-      bodyType: 'clickable',
+      bodyType: 'sj',
       bodyFillType: 'actFill',
       width: 280
     })
@@ -140,7 +140,7 @@ export const getSWYPFXFFXYPZBBTQHSLTableConfig = ($this, selectKey) => {
     {
       label: 'template.sp.sp008.sjry',
       prop: 'sjry',
-      bodyType: 'clickable',
+      bodyType: 'sj',
       bodyFillType: 'actFill',
       width: 280
     },

src/views/business/study/comp/tbbd/Bj.vue

@@ -246,16 +246,16 @@
                       <div style="display: flex;justify-content: space-between;">
                         <div style="display: flex;">
                           <div style="display: flex;">
-                            <div> 存储条件：</div>
+                            <div> 存储位置：</div>
                             <div>
-                              <BusinessSelect v-model="citem.cctj" dictType="business_cctj" style="width: 200px;">
+                              <BusinessSelect v-model="citem.ccwz"  dictType="business_ccwz" style="width: 200px;">
                               </BusinessSelect>
                             </div>
                           </div>
                           <div style="display: flex; margin-left: 10px;">
-                            <div> 存储位置：</div>
+                            <div> 存储条件：</div>
                             <div>
-                              <BusinessSelect v-model="citem.ccwz" dictType="business_ccwz" style="width: 200px;">
+                              <BusinessSelect v-model="citem.cctj" dictType="business_cctj" style="width: 200px;">
                               </BusinessSelect>
                             </div>
                           </div>
@@ -481,6 +481,10 @@ export default {
     this.getInfo()
   },
   methods: {
+    yjccCcwzChange(cindex,val){
+      debugger
+      this.cclistYj[cindex].cctj=val.wc
+    },
     onFillCallback(data) {
       console.log("data:" + JSON.stringify(data))
       console.log("formdata:" + JSON.stringify(this.$refs.templateTable.getFilledFormData()))