diff --git a/.env.production b/.env.production
index d27b795d..15d4fd21 100644
--- a/.env.production
+++ b/.env.production
@@ -40,10 +40,10 @@ ENV = 'production'
 # VUE_APP_BASE_API = 'http://192.168.6.189:9150/UDI_WMS_MC/'
 
 # 三明大田医院
-# VUE_APP_BASE_API = 'http://170.20.124.4:9150/UDI_WMS_MC/'
+VUE_APP_BASE_API = 'http://172.20.124.4:9150/UDI_WMS_MC/'
 
 
-VUE_APP_BASE_API = 'http://192.168.0.207:9150/UDI_WMS_MC/'
+# VUE_APP_BASE_API = 'http://192.168.0.207:9150/UDI_WMS_MC/'
 
 
 
diff --git a/src/api/basic/sicker/skPersonApi.js b/src/api/basic/sicker/skPersonApi.js
index 8a6d7346..eb5c5d8b 100644
--- a/src/api/basic/sicker/skPersonApi.js
+++ b/src/api/basic/sicker/skPersonApi.js
@@ -21,7 +21,6 @@ export function downloadSick(query) {
 /**
  * 处方使用耗材明细
  */
-
 export function skPrescribeDi(query) {
   return axios({
     url: "/udiwms/basic/sk/prescribe/di/filter",
@@ -31,4 +30,18 @@ export function skPrescribeDi(query) {
 }
 
 
+/**
+ * 下载并查询处方信息
+ */
+
+export function dlOrFilter(query) {
+  return axios({
+    url: "/udiwms/basic/sk/prescribe/di/dlOrFilter",
+    method: "get",
+    params: query
+  });
+}
+
+
+
 
diff --git a/src/views/basic/busType/bussinessType.vue b/src/views/basic/busType/bussinessType.vue
index 808c3f21..3489b4da 100644
--- a/src/views/basic/busType/bussinessType.vue
+++ b/src/views/basic/busType/bussinessType.vue
@@ -269,6 +269,7 @@ export default {
         thrCheckReview: null,
         inPreInBack: 1,
         deptNoInvType: 0,
+        vailPrescribe:false,
       },
       enableMap: {
         true: '是',
@@ -557,6 +558,7 @@ export default {
         sortNum: 999,
         inPreInBack: 1,
         deptNoInvType: 0,
+        vailPrescribe: false,
       }
       this.addDialogVisible = true
     },
diff --git a/src/views/basic/busType/bussinessTypeModify.vue b/src/views/basic/busType/bussinessTypeModify.vue
index 5ff191e3..b11e446f 100644
--- a/src/views/basic/busType/bussinessTypeModify.vue
+++ b/src/views/basic/busType/bussinessTypeModify.vue
@@ -518,7 +518,6 @@
               <span class="sptext">预验收剩余库存退库方式</span>
             </el-col>
           </el-row>
-
           <el-divider></el-divider>
           <el-row v-if="inputQuery.preInBack==true ">
             <el-col span="5">
@@ -542,8 +541,25 @@
               <span class="sptext">预验收退库单据类型</span>
             </el-col>
           </el-row>
-
-
+          <el-divider></el-divider>
+          <el-row>
+            <el-col span="5">
+              <span class="sptext">出库是否校验处方</span>
+            </el-col>
+            <el-divider direction="vertical"></el-divider>
+            <el-col span="5">
+              <el-select v-model="inputQuery.vailPrescribe" style="width: 65%"
+                         :disabled="inputQuery.mainAction!= 'WareHouseOut'  || inputQuery.corpType != 1"
+                         placeholder="是否启用">
+                <el-option label="是" :value="true"></el-option>
+                <el-option label="否" :value="false"></el-option>
+              </el-select>
+            </el-col>
+            <el-divider direction="vertical"></el-divider>
+            <el-col span="13">
+              <span class="sptext">出库是否校验处方</span>
+            </el-col>
+          </el-row>
         </el-collapse-item>
 
         <el-collapse-item title="是否校验业务单设置">
diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index f5e6f89a..935e276c 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -196,6 +196,7 @@
               v-if="curAction.corpType == 1 && curAction.genUnit "
             >
               <el-input
+                v-if="!enableSick"
                 v-model="orderFormData.fromCorp"
                 auto-complete="off"
                 clearable
@@ -203,7 +204,37 @@
                 :disabled="corpOrderIdDisabled"
                 placeholder="请输入病人住院号"
               ></el-input>
+
+              <el-select
+                v-if="enableSick"
+                v-model="orderFormData.sickerAdNum"
+                filterable
+                remote
+                clearable
+                reserve-keyword
+                style="width: 90%"
+                placeholder="请输入往来信息"
+                :remote-method="findSickMethod"
+                :loading="loading"
+                @change="sickChange"
+                :disabled="corpOrderIdDisabled"
+              >
+                <el-option
+                  v-for="item in fromSickOptions"
+                  :key="item.adNum"
+                  :label="item.name  +' '+item.adNum"
+                  :value="item.adNum"
+                >
+                  <span style="float: left">{{ item.name }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{
+                      item.adNum
+                    }}</span>
+                </el-option>
+              </el-select>
+
             </el-form-item>
+
+
             <!--            <el-form-item-->
             <!--              prop="fromCorp"-->
             <!--              label="往来信息:"-->
@@ -415,6 +446,18 @@
       </el-form>
     </el-card>
     <el-tabs type="border-card" style="margin: 5px">
+
+
+      <el-tab-pane label="处方使用耗材" v-if="viewSickVisible">
+        <diSkPrescribePanel
+          :perscribeData="orderFormData"
+          :curAction="curAction"
+          :refreshPanel="refreshCodesPanel"
+          :sickerAdNum="orderFormData.sickerAdNum"
+          :viewType="viewType"
+          v-if="viewSickVisible"
+        ></diSkPrescribePanel>
+      </el-tab-pane>
       <el-tab-pane label="校验详情" v-if="viewCheckVisible || viewType == 7">
         <checkResultPanel
           :idQuery="orderFormData"
@@ -490,7 +533,6 @@
       >
       </dialog-create-order-select>
     </el-dialog>
-
     <!--    绑定供应商-->
     <el-dialog
       :title="selectUnitTitle"
@@ -506,7 +548,6 @@
         v-on:selectSupUnit="selectSupUnit"
       ></DialogSelectUnit>
     </el-dialog>
-
     <!--    绑定产品-->
     <el-dialog
       :title="selectRlTitle"
@@ -540,7 +581,6 @@
       ></DialogSelectSpace>
     </el-dialog>
 
-
     <el-dialog
       title="提示"
       :visible.sync="checkTipDialogVisible"
@@ -581,6 +621,8 @@ import checkResultPanel from "./PanelCreateOrderCheckDetail";
 import codesPanel from "./PanelCreateOrderCodes";
 import codeDetailPanel from "./PanelCreateOrderCodeDetail";
 import bizDetailPanel from "./PanelCreateOrderBizDetail";
+import diSkPrescribePanel from "./PanelSkPrescribeDi";
+
 import A from "../../plugins/KeyScaner";
 import {findByInvUser, getBusTypeList} from "@/api/basic/busType";
 import {getInvSpaceList} from "@/api/inventory/invSpace";
@@ -589,6 +631,8 @@ import selectRlDialog from "./DialogSelectRl";
 import DialogSelectSpace from "./DialogSelectSpace";
 import {isBlank} from "@/utils/strUtil";
 import {getDetailBizs} from "@/api/inout/orderDetailCode";
+import {page} from "@/api/basic/sicker/skPersonApi";
+import {selectSysParamByKey} from "@/api/param/systemParamConfig";
 
 export default {
   name: "ioCreateOrder",
@@ -632,7 +676,7 @@ export default {
         curSpaceCode: null,
         preSpaceCode: null,
         preCurSpaceCode: null,  //单据
-
+        sickerAdNum: null,
       },
 
       detailList: [],
@@ -668,6 +712,7 @@ export default {
         mainAction: null,
       },
       fromOptions: [],
+      fromSickOptions: [],
       isCodeAlive: true,
       bizShow: true,
       isCheckResultAlive: true,
@@ -725,6 +770,7 @@ export default {
       viewBizVisible: false,
       viewCodeVisible: false,
       viewCodeDetailVisible: false,
+      viewSickVisible: false,    //是否显示处方使用耗材
       documentShow: false,      //控制预验收选入单据界面
       curSpaceShow: false,     //正常出入库选入出库界面
       preInSpaceShow: false,   //是否显示选择预验收界面
@@ -733,6 +779,8 @@ export default {
       spaceCodeList: [],
       checkTipDialogVisible: false,
       checkTip: null,
+
+      enableSick: false
     };
   },
   components: {
@@ -742,7 +790,7 @@ export default {
     bizDetailPanel,
     editCodeDialog,
     DialogCreateOrderSelect,
-    DialogSelectUnit, DialogSelectSpace, selectRlDialog
+    DialogSelectUnit, DialogSelectSpace, selectRlDialog, diSkPrescribePanel
   },
   methods: {
 
@@ -902,6 +950,19 @@ export default {
           this.loading = false;
         });
     },
+
+
+    findSickMethod(key) {
+      let sickQuery = {
+        page: 1,
+        limit: 10,
+        key: key,
+      };
+      page(sickQuery).then(res => {
+        this.fromSickOptions = res.data.list || []
+      }).catch(() => {
+      });
+    },
     //单据类型改变
     actionChange(item) {
       this.orderFormData.checkPreInOption = null;
@@ -914,7 +975,6 @@ export default {
       } else {
         this.bizShow = false;
       }
-
       if (
         this.curAction.corpType == 0 ||
         this.curAction.corpType == 2 ||
@@ -942,6 +1002,12 @@ export default {
         this.preInSpaceShow = false;
       }
 
+      if (this.curAction.vailPrescribe != null && this.curAction.vailPrescribe) {
+        this.viewSickVisible = true;
+      } else {
+        this.viewSickVisible = false;
+      }
+
       if (this.curAction.scanPreIn && this.curAction.spaceOut == 1) {
         this.preInSpaceShow = true;
         this.curSpaceShow = false;
@@ -1592,6 +1658,23 @@ export default {
     OptionalDocument() {
       this.selectorder = true;
     },
+
+    sickChange(value) {
+      this.orderFormData.sickerAdNum = value;
+    },
+
+
+    getConfig() {
+      selectSysParamByKey({"paramKey": "his_sicker"}).then((response) => {
+        if (response.code == 20000) {
+          if (response.data.paramValue == "1") {
+            this.enableSick = true;
+          }
+        }
+      });
+    }
+
+
   },
   filters: {},
   mounted() {
@@ -1640,6 +1723,7 @@ export default {
       this.viewBizVisible = true;
     }
     this.orderFormData.orderType = this.viewType;
+    this.getConfig();
     if (this.$isNotBlank(this.orderQuery.billNo)) {
       //编辑页面
       this.corpOrderIdDisabled = true;
@@ -1656,6 +1740,7 @@ export default {
       this.initBusType();
       // this.findMethod(this.orderFormData.fromCorp);
       this.findFromInvList();
+      this.findSickMethod(this.orderFormData.sickerAdNum)
     } else {
       //新增页面
       this.corpOrderIdDisabled = false;
@@ -1670,6 +1755,7 @@ export default {
       this.orderFormData.deptCode = this.$store.getters.deptCode;
       this.orderFormData.invCode = this.$store.getters.locInvCode;
       this.findInvListByUser();
+
     }
   },
 };
diff --git a/src/views/inout/PanelSkPrescribeDi.vue b/src/views/inout/PanelSkPrescribeDi.vue
new file mode 100644
index 00000000..11f807bd
--- /dev/null
+++ b/src/views/inout/PanelSkPrescribeDi.vue
@@ -0,0 +1,150 @@
+<template>
+  <div>
+    <el-form :model="filterQuery" label-width="90px">
+      <el-row>
+        <el-col :span="6">
+          <el-form-item label="产品编码:">
+            <el-input v-model="filterQuery.unionCode" style="width: 100%" placeholder="请输入DI/医保编码/商品条码"
+                      clearable="true"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="产品通用名:">
+            <el-input v-model="filterQuery.cpmctymc" style="width: 100%" placeholder="请输入产品通用名"
+                      clearable="true"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="规格型号:">
+            <el-input v-model="filterQuery.ggxh" style="width: 100%" placeholder="请输入规格型号"
+                      clearable="true"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-button-group>
+            <el-button type="primary" icon="el-icon-search" @click="getList">查询</el-button>
+            <el-button type="primary" icon="el-icon-refresh" @click="getList">更新处方信息</el-button>
+          </el-button-group>
+
+        </el-col>
+      </el-row>
+    </el-form>
+
+
+    <el-table :data="list" style="width: 100%" border
+              highlight-current-row>
+      <el-table-column type="selection" width="55"></el-table-column>
+      <el-table-column label="序号" type="index"></el-table-column>
+      <el-table-column label="处方编码" prop="prescribeCode" width="140" show-overflow-tooltip></el-table-column>
+      <el-table-column label="DI标识" prop="nameCode" show-overflow-tooltip></el-table-column>
+      <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
+      <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
+      <el-table-column label="计量单位" prop="measureUnit" show-overflow-tooltip></el-table-column>
+      <el-table-column label="数量" prop="count" show-overflow-tooltip></el-table-column>
+      <el-table-column label="价格" prop="price" show-overflow-tooltip></el-table-column>
+      <el-table-column label="注册/备案凭证" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
+      <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
+      <el-table-column width="60" label="操作">
+        <template slot-scope="scope">
+          <el-button type="text" @click.native.stop="handleModifyClick(scope.row)">详情</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+
+  </div>
+</template>
+
+<script>
+import {dlOrFilter, skPrescribeDi} from "@/api/basic/sicker/skPersonApi";
+
+export default {
+  name: "skPrescribeDi",
+  props: {
+    perscribeData: {
+      type: Object,
+      required: true,
+    },
+    sickerAdNum: {
+      type: Object,
+      required: true,
+    },
+
+  },
+
+  data() {
+    return {
+      filterQuery: {
+        adNum: null,
+        page: 1,
+        limit: 10,
+      },
+      total: 0,
+      loading: false,
+      list: [],
+      showSearch: true,
+    }
+  },
+  methods: {
+    getList() {
+      this.loading = true;
+      this.filterQuery.adNum = this.sickerAdNum;
+      skPrescribeDi(this.filterQuery)
+        .then((response) => {
+          this.loading = false;
+          this.list = response.data.list || [];
+          this.total = response.data.total || 0;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+
+    dlList(sickerAdNum) {
+      this.loading = true;
+      this.filterQuery.adNum = sickerAdNum;
+      dlOrFilter(this.filterQuery)
+        .then((response) => {
+          this.loading = false;
+          this.list = response.data.list || [];
+          this.total = response.data.total || 0;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        page: 1,
+        limit: 10,
+      };
+      this.getList();
+    },
+  },
+  created() {
+    this.getList();
+  },
+  watch: {
+    sickerAdNum: function (val) {
+      this.dlList(val);
+    }
+  },
+
+}
+</script>
+
+<style scoped>
+
+</style>