diff --git a/src/api/business/public/public.js b/src/api/business/public/public.js
index 044a53f..18c6d69 100644
--- a/src/api/business/public/public.js
+++ b/src/api/business/public/public.js
@@ -83,3 +83,19 @@ export function public_yqList(query) {
     params: query
   })
 }
+// 给药制剂列表
+export function public_gyzjList(query) {
+  return request({
+    url: '/system/business/public/gyzjList',
+    method: 'get',
+    params: query
+  })
+}
+// 供试品列表
+export function public_gspList(query) {
+  return request({
+    url: '/system/business/public/gspList',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/components/Template/StepComponents/ry/czdd.vue b/src/components/Template/StepComponents/ry/czdd.vue
index 03025f6..92a190f 100644
--- a/src/components/Template/StepComponents/ry/czdd.vue
+++ b/src/components/Template/StepComponents/ry/czdd.vue
@@ -1,3 +1,4 @@
+<!-- 操作地点 -->
 <template>
     <StepFormPackage ref = "stepFormPackageRef" :form-config="formConfig" :formData = "formData" />
 </template>
@@ -11,7 +12,6 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
         components: {
             StepFormPackage
         },
-        
         computed: {
             formConfig() {
                 return [{
diff --git a/src/components/Template/StepComponents/ry/czhj.vue b/src/components/Template/StepComponents/ry/czhj.vue
new file mode 100644
index 0000000..c52d6ce
--- /dev/null
+++ b/src/components/Template/StepComponents/ry/czhj.vue
@@ -0,0 +1,48 @@
+<!-- 操作环境 -->
+<template>
+    <StepFormPackage ref = "stepFormPackageRef" :form-config="formConfig" :formData = "formData" />
+</template>
+
+<script>
+import StepFormPackage from '@/components/Template/StepFormPackage.vue';
+import stepMixins from '@/components/Template/mixins/stepMixins.js';    
+
+    export default {
+        mixins: [stepMixins],
+        components: {
+            StepFormPackage
+        },
+        computed: {
+            formConfig() {
+                return [{
+                    config:{
+                        text1:{
+                            label:"选择在",
+                            type:"text",
+                        },
+                        ddsys:{
+                            type:"input",
+                            fillType:"preFill",
+                        },
+                        yq:{
+                            type:"instrument",
+                            fillType:"actFill",
+                        },
+                        text2:{
+                            label:"环境下，操作下预计在",
+                            type:"text",
+                        },
+                        ytczhj:{
+
+                            type:"input",
+                        }
+                    }
+                }]
+            }
+        },
+    }
+</script>
+
+<style lang="scss" scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/components/Template/StepFormPackage.vue b/src/components/Template/StepFormPackage.vue
index ce8cf5b..4db7d5a 100644
--- a/src/components/Template/StepFormPackage.vue
+++ b/src/components/Template/StepFormPackage.vue
@@ -79,9 +79,11 @@ export default {
     },
     mounted() {
         EventBus.$on("onReagentSubmit",this.onReagentSubmit)
+        EventBus.$on("onInstrumentSubmit",this.onInstrumentSubmit)
     },
     unmounted() {
         EventBus.$off("onReagentSubmit",this.onReagentSubmit)
+        EventBus.$off("onInstrumentSubmit",this.onInstrumentSubmit)
     },
     data() {
         return {
@@ -100,6 +102,11 @@ export default {
             if(data.uuid !== this.uuid) return;
             this.formFields[this.currentClickKey] = data.selectedId;
         },
+        // 处理选择仪器提交,不确定后续还会不会有其他操作，所以和选择试剂提交区分开。
+        onInstrumentSubmit(data){
+            if(data.uuid !== this.uuid) return;
+            this.formFields[this.currentClickKey] = data.selectedId;
+        },
         getClickableItem(sItem) {
             return {
                 ...sItem,
@@ -120,9 +127,8 @@ export default {
                 })  
             }
         },
-        onSelectReagentSubmit(reagent){
-            this.formFields[this.currentClickKey] = reagent
-        },
+    
+   
     }
 }
 </script>
diff --git a/src/views/business/comps/template/dialog/SelectInstrumentDialog.vue b/src/views/business/comps/template/dialog/SelectInstrumentDialog.vue
index 55d0112..700039c 100644
--- a/src/views/business/comps/template/dialog/SelectInstrumentDialog.vue
+++ b/src/views/business/comps/template/dialog/SelectInstrumentDialog.vue
@@ -73,7 +73,7 @@ export default {
                     label: '来源(厂家)',
                 },
                 {
-                    prop: 'nddw',
+                    prop: 'jzrq',
                     label: '下次校准时间',
                 },
             ],
@@ -112,7 +112,7 @@ export default {
             let row = this.currentRow;
             this.$emit('submit', this.selectedId,row);
             // 触发eventBus事件
-            EventBus.$emit("onReagentSubmit",{uuid:this.uuid,selectedId:this.selectedId,row});
+            EventBus.$emit("onInstrumentSubmit",{uuid:this.uuid,selectedId:this.selectedId,row});
             this.visible = false;
         },
         handleSelect(code,row) {
diff --git a/src/views/business/comps/template/dialog/SelectMixReagentDialog.vue b/src/views/business/comps/template/dialog/SelectMixReagentDialog.vue
new file mode 100644
index 0000000..05fc35e
--- /dev/null
+++ b/src/views/business/comps/template/dialog/SelectMixReagentDialog.vue
@@ -0,0 +1,129 @@
+<!-- 试剂/供试品/给药制剂弹窗 -->
+<template>
+    <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" :title="$t(title)" @close="onCancel"
+        :visible.sync="visible" append-to-body width="80%">
+        <el-radio-group v-model="selectType" @change="handleRadioChange" style="margin-bottom: 30px;">
+            <el-radio-button label="sj">试剂列表</el-radio-button>
+            <el-radio-button label="gsp">供试品列表</el-radio-button>
+            <el-radio-button label="gyzj">给药制剂列表</el-radio-button>
+        </el-radio-group>
+        <SelectTable ref="selectSjRef" :columns="columns" :selectedId="selectedId" :searchForm="searchForm"
+            :studyFormId="studyFormId" :listApi="listApi" :selectedCode="selectedCode" @radioSelect="handleSelect" />
+        <template slot="footer" class="dialog-footer">
+            <el-button @click="onCancel">{{ $t('form.cancel') }}</el-button>
+            <el-button :disabled="isDisabled" type="primary" @click="onSubmit">{{ $t('form.saveConfirm') }}</el-button>
+        </template>
+    </el-dialog>
+</template>
+
+<script>
+import SelectTable from '@/components/Template/SelectTable.vue';
+import SelectDept from "@/views/business/comps/select/SelectDept";
+import { public_sjList,public_gyzjList } from '@/api/business/public/public';
+import { getSjSearchForm, getSjColumns,getGyzjSearchForm,getGyzjColumns,getGspSearchForm,getGspColumns } from '@/views/business/comps/template/formConfig/formConfig.js';
+import { EventBus } from "@/utils/eventBus";
+const typeMap ={
+    sj: {
+        searchForm: getSjSearchForm(),
+        columns: getSjColumns(),
+        listApi: public_sjList,
+    },
+    gsp: {
+        searchForm: getGspSearchForm(),
+        columns: getGspColumns(),
+        listApi: public_gspList,
+    },
+    gyzj: {
+        searchForm: getGyzjSearchForm(),
+        columns: getGyzjColumns(),
+        listApi: public_gyzjList,
+    },
+    }
+export default {
+    components: {
+        SelectTable,
+        SelectDept
+    },
+    props: {
+        type: {
+            type: String,
+            default: "",
+        },
+        title: {
+            type: String,
+            default: "page.business.resource.sj.xzsj",
+        },
+        selectedCode: {
+            type: String,
+            default: "bh",
+        },
+    },
+    data() {
+        return {
+            visible: false,
+            selectedId: "",
+            currentRow: {},
+            radio: 1,
+            bzList: [],
+            depart: "",
+            studyFormId: '',//有个studyFormId需要从外面动态传过来
+            uuid: '',//为了标识eventBus的事件id,
+            selectType: 'sj',//默认选择试剂列表
+            listApi: public_sjList,
+            searchForm: getSjSearchForm(),
+            columns: getSjColumns(),
+            sourceFrom:"step",//来源
+        }
+    },
+    computed: {
+        isDisabled() {
+            return !this.selectedId;
+        }
+    },
+    methods: {
+        show(studyFormId, data) {
+            if (data && data.uuid) {//为了标识eventBus的事件id
+                this.uuid = data.uuid
+            }
+            //type:sj(试剂列表)gsp(供试品列表)gyzj(给药制剂列表)
+            const {type = "sj"} = data;
+            this.selectType = type;
+            this.searchForm = typeMap[type].searchForm;
+            this.columns = typeMap[type].columns;
+            this.listApi = typeMap[type].listApi;
+            this.listApi = typeMap[type].listApi || this.listApi;
+            
+          
+            this.studyFormId = studyFormId
+        },
+        onCancel() {
+            this.visible = false
+            this.$emit('cancel');
+        },
+        onSubmit() {
+            let row = this.currentRow;
+            this.$emit('submit', this.selectedId, row);
+            // 触发eventBus事件
+            EventBus.$emit("onReagentSubmit", { uuid: this.uuid, selectedId: this.selectedId, row });
+            this.visible = false;
+        },
+        //Radio改变时处理
+        handleRadioChange(val){
+            
+        },
+        // 选择试剂时处理
+        handleSelect(code, row) {
+            this.selectedId = code;
+            this.currentRow = row;
+        },
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.header-row {
+    display: flex;
+    align-items: center;
+    padding: 20px 0;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/business/comps/template/formConfig/formConfig.js b/src/views/business/comps/template/formConfig/formConfig.js
new file mode 100644
index 0000000..d0e6a53
--- /dev/null
+++ b/src/views/business/comps/template/formConfig/formConfig.js
@@ -0,0 +1,122 @@
+// 试剂列表查询表单
+export const getSjSearchForm = () => {
+    return {
+        mc: {
+            label: 'page.business.resource.sj.sjmc',
+        },
+        bh: {
+            label: 'page.business.resource.sj.sjbh',
+        },
+        studyName: {
+            label: 'page.business.resource.sj.sssy',
+        },
+    }
+}
+// 供试品列表查询表单
+export const getGspSearchForm = () => {
+    return {
+        mc: {
+            label: '名称/代号',
+        },
+        bh: {
+            label: 'page.business.resource.sj.sjbh',
+        },
+        ph: {
+            label: '物质批号',
+        },
+    }
+}
+// 给药制剂列表查询表单
+export const getGyzjSearchForm = () => {
+    return {
+         mc: {
+            label: 'page.business.resource.sj.sjmc',
+        },
+        bh: {
+            label: 'page.business.resource.sj.sjbh',
+        },
+        studyMc: {
+            label: 'page.business.resource.sj.sssy',
+        },
+    }
+}
+
+// 试剂列表表格列
+export const getSjColumns = () => {
+    return [
+        {
+            prop: 'mc',
+            label: 'page.business.resource.sj.sjmc',
+        },
+        {
+            prop: 'bh',
+            label: 'page.business.resource.sj.sjbh',
+        },
+        {
+            prop: 'nd',
+            label: 'page.business.resource.sj.sjnd',
+        },
+        {
+            prop: 'nddw',
+            label: 'page.business.resource.gsp.nddw',
+        },
+        {
+            prop: 'sxr',
+            label: 'page.business.resource.sj.sxr',
+        },
+        {
+            prop: 'studyName',
+            label: 'page.business.resource.sj.sssy',
+        },
+    ]
+}
+// 供试品列表表格列
+export const getGspColumns = () => {
+    return [
+        {
+            prop: 'mc',
+            label: '名称/代号',
+        },
+        {
+            prop: 'bh',
+            label: 'page.business.resource.sj.sjbh',
+        },
+        {
+            prop: 'yxq',
+            label: '有效期',
+        },
+        {
+            prop: 'ph',
+            label: '物质批号',
+        },
+    ]
+}
+// 给药制剂列表表格列
+export const getGyzjColumns = () => {
+    return [
+         {
+            prop: 'mc',
+            label: 'page.business.resource.sj.sjmc',
+        },
+        {
+            prop: 'bh',
+            label: 'page.business.resource.sj.sjbh',
+        },
+        {
+            prop: 'nd',
+            label: 'page.business.resource.sj.sjnd',
+        },
+        {
+            prop: 'nddw',
+            label: 'page.business.resource.gsp.nddw',
+        },
+        {
+            prop: 'sxr',
+            label: 'page.business.resource.sj.sxr',
+        },
+        {
+            prop: 'studyName',
+            label: 'page.business.resource.sj.sssy',
+        },
+    ]
+}
\ No newline at end of file