diff --git a/src/views/basic/product/drug/drugInfoManageSp.vue b/src/views/basic/product/drug/drugInfoManageSp.vue
index b419da2c..45394f37 100644
--- a/src/views/basic/product/drug/drugInfoManageSp.vue
+++ b/src/views/basic/product/drug/drugInfoManageSp.vue
@@ -162,7 +162,7 @@
           <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
           <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
           <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
-          <el-button type="primary" icon="el-icon-bottom-right" @click="selectProduct()">选入产品</el-button>
+          <el-button type="primary" icon="el-icon-bottom-right" @click="selectProduct()">选入药品</el-button>
           <el-button type="primary" icon="search" @click="lockProducts('3')" v-if="isSpCombine">锁定</el-button>
           <el-button type="primary" icon="search" @click="lockProducts('1')" v-if="isSpCombine">退回</el-button>
         </el-button-group>
diff --git a/src/views/drugInventory/supInoutSearchOrder.vue b/src/views/drugInventory/supInoutSearchOrder.vue
index 5af23e36..c32df309 100644
--- a/src/views/drugInventory/supInoutSearchOrder.vue
+++ b/src/views/drugInventory/supInoutSearchOrder.vue
@@ -415,7 +415,6 @@
       ></addInvRemindSetDialog>
     </el-dialog>
 
-
   </div>
 </template>
 
@@ -459,6 +458,7 @@ export default {
         confirmStarTime:null,  //发票确认起始日期
         confirmEndTime:null,
         corpName:null,
+        productType: 2
       },
 
       printMap: {
@@ -541,6 +541,7 @@ export default {
         startAduditTime: null,
         endAduditTime: null,
         actionType: null,
+        productType: 2
       };
       this.actDateRange = []
       this.getList();
diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index 8eafdb77..42dda43c 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -1544,6 +1544,7 @@ export default {
         JSON.parse(JSON.stringify(this.orderFormData))
       );
       tQuery.orderId = this.orderFormData.billNo;
+      tQuery.productType = 1
       console.log(tQuery.orderId);
       if (val == 1) {
         //校验btn
diff --git a/src/views/inoutDrug/DialogCreateDrugOrder.vue b/src/views/inoutDrug/DialogCreateDrugOrder.vue
index ca6e60a6..6e685bf4 100644
--- a/src/views/inoutDrug/DialogCreateDrugOrder.vue
+++ b/src/views/inoutDrug/DialogCreateDrugOrder.vue
@@ -540,7 +540,7 @@
     </el-dialog>
 
     <el-dialog
-      title="库存物资录入"
+      title="库存药品录入"
       :visible.sync="selectInvProductVisible"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
@@ -1503,6 +1503,7 @@ export default {
         JSON.parse(JSON.stringify(this.orderFormData))
       );
       tQuery.orderId = this.orderFormData.billNo;
+      tQuery.productType = 2
       console.log(tQuery.orderId);
       if (val == 1) {
         //校验btn
@@ -1620,6 +1621,7 @@ export default {
         JSON.parse(JSON.stringify(this.orderFormData))
       );
       tQuery.billNo = this.orderFormData.billNo;
+      tQuery.productType = 2
       console.log("tQuery:");
       console.log(tQuery);
       if (this.orderFormData.billNo == null) {
diff --git a/src/views/inoutDrug/DialogCreateOrderSelect.vue b/src/views/inoutDrug/DialogCreateOrderSelect.vue
index 76cd38ac..6c0a23d0 100644
--- a/src/views/inoutDrug/DialogCreateOrderSelect.vue
+++ b/src/views/inoutDrug/DialogCreateOrderSelect.vue
@@ -221,10 +221,10 @@
       <el-tab-pane>
         <span slot="label">单据 {{ currentRow.billNo }}-单据详情</span>
         <el-form :inline="true" :model="bizQuery" class="query-form" size="mini">
-          <el-form-item label="物资名称:">
+          <el-form-item label="药品名称:">
             <el-input
               v-model="bizQuery.productName"
-              placeholder="请输入物资名称"
+              placeholder="请输入药品名称"
               clearable
             >
             </el-input>
@@ -251,7 +251,7 @@
         >
           <el-table-column label="序号" type="index"></el-table-column>
           <el-table-column
-            label="物资名称"
+            label="药品名称"
             prop="coName" width="160"
             show-overflow-tooltip
           ></el-table-column>
@@ -289,7 +289,7 @@
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            label="注册/备案号"
+            label="批准文号"
             prop="certCode" width="180"
             show-overflow-tooltip
           ></el-table-column>
diff --git a/src/views/inoutDrug/DialogSelectInv.vue b/src/views/inoutDrug/DialogSelectInv.vue
new file mode 100644
index 00000000..e747c9a9
--- /dev/null
+++ b/src/views/inoutDrug/DialogSelectInv.vue
@@ -0,0 +1,152 @@
+<template>
+    <el-form :model="userInfo">
+        <el-row :gutter="20">
+
+            <el-col :span="6">
+                <div class="ao-text">
+                    <span>当前仓库：</span>
+                </div>
+            </el-col>
+
+            <el-col :span="16">
+                <el-form-item prop="locStorageCode">
+                    <el-select v-model="userInfo.locInvCode" placeholder="当前仓库信息" clearable
+                               @change="locCHange"
+                    >
+                        <el-option
+
+                            v-for="item in storageList"
+                            :key="item.name"
+                            :label="item.name"
+                            :value="item.code">
+                            <span style="float: left">{{ item.name }}</span>
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+            </el-col>
+        </el-row>
+        <el-row :gutter="20">
+            <el-col :span="6">
+                <div class="ao-text">
+                    <span>当前分库：</span>
+                </div>
+            </el-col>
+            <el-col :span="16">
+                <el-form-item prop="locInvCode">
+                    <el-select v-model="userInfo.locSubInvCode" placeholder="当前分库信息" clearable
+                    >
+                        <el-option
+
+                            v-for="item in subInvList"
+                            :key="item.name"
+                            :label="item.name"
+                            :value="item.code">
+                            <span style="float: left">{{ item.name }}</span>
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+            </el-col>
+        </el-row>
+        <div style='text-align: center; margin-bottom: 10px;margin-top: 18px ;'>
+            <el-button type="primary" @click="submitInv">提交</el-button>
+            <el-button type="primary" @click="closeDG">取消</el-button>
+        </div>
+    </el-form>
+
+</template>
+
+<script>
+import {filterAllByUser} from "@/api/system/invWarehouse";
+import {filterSubByInv} from "@/api/system/invSubWarehouse";
+import {updateInv} from "@/api/auth/authAdmin";
+
+export default {
+    name: "DialogSelectInv",
+    props: {
+        billData: {
+            type: Object,
+            required: true,
+        },
+        closeInvDialog: {
+            type: Function,
+            required: true,
+        },
+
+        closeSubmitDialog:{
+            type: Function,
+            required: true,
+        }
+    },
+
+    data() {
+        return {
+            userInfo: {
+                locInvCode: this.$store.getters.locInvCode,
+                locSubInvCode: this.$store.getters.locSubInvCode,
+            },
+            storageList: [],
+            subInvList: [],
+        }
+    },
+    methods: {
+        getStorage() {
+            this.storageList = [];
+            filterAllByUser()
+                .then((response) => {
+                    this.storageList = response.data || [];
+                    this.findSubInvByInv();
+                })
+                .catch(() => {
+                });
+        },
+        findSubInvByInv() {
+            this.subInvList = [];
+            let query = {
+                pcode: this.userInfo.locInvCode,
+                filter:3
+            };
+            filterSubByInv(query)
+                .then((response) => {
+                    this.subInvList = response.data || [];
+                    if (this.subInvList != null && this.subInvList.length == 1) {
+                        this.userInfo.locSubInvCode = this.subInvList[0].code;
+                    }
+                })
+                .catch(() => {
+                });
+        },
+        locCHange() {
+
+            if (this.$isNotBlank(this.userInfo.locSubInvCode)) {
+                this.userInfo.locSubInvCode = "";
+            }
+            this.findSubInvByInv();
+        },
+
+        submitInv() {
+            if (this.$isBlank(this.userInfo.locInvCode)) {
+                this.$message.error("当前仓库不能为空！");
+                return;
+            }
+            if (this.$isBlank(this.userInfo.locSubInvCode)) {
+                this.$message.error("当前分库不能为空！");
+                return;
+            }
+
+            this.billData.locStorageCode = this.userInfo.locInvCode;
+            this.billData.invWarehouseCode = this.userInfo.locSubInvCode;
+            this.closeSubmitDialog();
+        },
+        closeDG() {
+            this.closeInvDialog();
+        },
+    },
+    created() {
+        this.getStorage();
+    },
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/inoutDrug/DialogSelectInvProduct.vue b/src/views/inoutDrug/DialogSelectInvProduct.vue
index 8c0be52c..989d8c90 100644
--- a/src/views/inoutDrug/DialogSelectInvProduct.vue
+++ b/src/views/inoutDrug/DialogSelectInvProduct.vue
@@ -4,13 +4,13 @@
       <el-form :model="filterQuery" size="mini" label-width="100px" v-if="showSearch">
         <el-row>
           <el-col :span="6">
-            <el-form-item label="DI/物资编码:">
-              <el-input v-model="filterQuery.nameCode" style="width: 90%" placeholder="请输入DI/物资编码"></el-input>
+            <el-form-item label="药品编码:">
+              <el-input v-model="filterQuery.nameCode" style="width: 90%" placeholder="药品编码"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="物资名称:">
-              <el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="请输入物资名称"></el-input>
+            <el-form-item label="药品名称:">
+              <el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="请输入药品名称"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -29,12 +29,12 @@
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="物资分类:" class="query-form-item">
-              <el-input v-model="filterQuery.category" style="width: 100%" placeholder="请输入物资分类名称"
-                        clearable="true"></el-input>
-            </el-form-item>
-          </el-col>
+          <!--<el-col :span="6">-->
+          <!--  <el-form-item label="物资分类:" class="query-form-item">-->
+          <!--    <el-input v-model="filterQuery.category" style="width: 100%" placeholder="请输入物资分类名称"-->
+          <!--              clearable="true"></el-input>-->
+          <!--  </el-form-item>-->
+          <!--</el-col>-->
 
           <el-col :span="6" v-if="productRemarkSet.remarkEnable1">
             <el-form-item :label="productRemarkSet.remarkTitle1+':'" class="query-form-item">
@@ -75,8 +75,8 @@
         </el-table-column>
         <el-table-column type="selection" width="55" v-if="type!=3"></el-table-column>
         <el-table-column label="序号" type="index" width="55"></el-table-column>
-        <el-table-column label="DI/物资编码" prop="nameCode" width="120" show-overflow-tooltip></el-table-column>
-        <el-table-column label="物资名称" prop="cpmctymc" width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column label="药品编码" prop="nameCode" width="120" show-overflow-tooltip></el-table-column>
+        <el-table-column label="药品名称" prop="cpmctymc" width="160" show-overflow-tooltip></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" width="160"></el-table-column>
         <el-table-column label="包装规格" prop="bzgg" width="100"></el-table-column>
         <el-table-column label="计量单位" prop="measname" width="90"></el-table-column>
@@ -88,7 +88,7 @@
         <el-table-column label="出库数量" prop="outCount" width="90"></el-table-column>
         <el-table-column label="结余数量" prop="reCount" width="90"></el-table-column>
         <el-table-column label="生产企业" prop="ylqxzcrbarmc" width="180"></el-table-column>
-        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="180"></el-table-column>
+        <el-table-column label="批准文号" prop="zczbhhzbapzbh" width="180"></el-table-column>
         <el-table-column label="供应商" prop="supName" width="180"></el-table-column>
       </el-table>
     </el-card>
diff --git a/src/views/inoutDrug/DialogSelectProduct.vue b/src/views/inoutDrug/DialogSelectProduct.vue
index 99cab8e7..be48a540 100644
--- a/src/views/inoutDrug/DialogSelectProduct.vue
+++ b/src/views/inoutDrug/DialogSelectProduct.vue
@@ -2,28 +2,28 @@
   <div>
     <el-card class="el-card">
       <el-form :model="listQuery" size="mini" label-width="100px" v-if="showSearch">
-        <el-row>
-          <el-col :span="18">
-            <el-form-item class="query-form-item" label="UDI码:">
-              <el-input v-model="listQuery.udiCode"
-                        style="width: 97%"
-                        placeholder="请扫描或输入UDI码"
-                        clearable="true"
-                        @keyup.enter.native="keyup_submit($event)"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
+        <!--<el-row>-->
+        <!--  <el-col :span="18">-->
+        <!--    <el-form-item class="query-form-item" label="UDI码:">-->
+        <!--      <el-input v-model="listQuery.udiCode"-->
+        <!--                style="width: 97%"-->
+        <!--                placeholder="请扫描或输入UDI码"-->
+        <!--                clearable="true"-->
+        <!--                @keyup.enter.native="keyup_submit($event)"></el-input>-->
+        <!--    </el-form-item>-->
+        <!--  </el-col>-->
+        <!--</el-row>-->
         <el-row>
           <el-col :span="6">
-            <el-form-item class="query-form-item" label="产品编码:">
-              <el-input v-model="listQuery.unionCode" placeholder="DI/医保编码/商品条码"
+            <el-form-item class="query-form-item" label="药品编码:">
+              <el-input v-model="listQuery.unionCode" placeholder="药品编码"
                         style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item class="query-form-item" label="产品通用名:">
-              <el-input v-model="listQuery.cpmctymc" placeholder="产品通用名" clearable="true"
+            <el-form-item class="query-form-item" label="药品名称:">
+              <el-input v-model="listQuery.cpmctymc" placeholder="药品名称" clearable="true"
                         style="width: 90%"></el-input>
             </el-form-item>
           </el-col>
@@ -36,19 +36,19 @@
         </el-row>
         <el-row>
           <el-col :span="6">
-            <el-form-item class="query-form-item" label="注册备案人:">
-              <el-input v-model="listQuery.ylqxzcrbarmc" placeholder="生产企业/注册备案人"
-                        style="width: 90%"
-                        clearable="true"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item class="query-form-item" label="外部产品编码:">
-              <el-input v-model="listQuery.thrPiId" placeholder="第三方产品编码"
+            <el-form-item class="query-form-item" label="生产企业:">
+              <el-input v-model="listQuery.ylqxzcrbarmc" placeholder="生产企业"
                         style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
+          <!--<el-col :span="6">-->
+          <!--  <el-form-item class="query-form-item" label="外部产品编码:">-->
+          <!--    <el-input v-model="listQuery.thrPiId" placeholder="第三方产品编码"-->
+          <!--              style="width: 90%"-->
+          <!--              clearable="true"></el-input>-->
+          <!--  </el-form-item>-->
+          <!--</el-col>-->
         </el-row>
       </el-form>
       <div class="top-right-btn">
@@ -75,23 +75,23 @@
         </el-table-column>
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column
-          label="最小销售产品标识"
+          label="药品编码"
           prop="nameCode"
           width="140"
           show-overflow-tooltip
         ></el-table-column>
+        <!--<el-table-column-->
+        <!--  label="产品编码"-->
+        <!--  prop="thirdId"-->
+        <!--  show-overflow-tooltip-->
+        <!--&gt;</el-table-column>-->
+        <!--<el-table-column-->
+        <!--  label="医疗器械注册人"-->
+        <!--  prop="ylqxzcrbarmc"-->
+        <!--  show-overflow-tooltip-->
+        <!--&gt;</el-table-column>-->
         <el-table-column
-          label="产品编码"
-          prop="thirdId"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          label="医疗器械注册人"
-          prop="ylqxzcrbarmc"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          label="产品通用名"
+          label="药品名称"
           prop="cpmctymc"
           show-overflow-tooltip
         ></el-table-column>
@@ -101,7 +101,7 @@
           show-overflow-tooltip
         ></el-table-column>
         <el-table-column
-          label="注册/备案凭证"
+          label="批准文号"
           prop="zczbhhzbapzbh"
           show-overflow-tooltip
         ></el-table-column>
@@ -110,11 +110,11 @@
           prop="price"
           show-overflow-tooltip
         ></el-table-column>
-        <el-table-column
-          label="器械类别"
-          prop="qxlb"
-          show-overflow-tooltip
-        ></el-table-column>
+        <!--<el-table-column-->
+        <!--  label="器械类别"-->
+        <!--  prop="qxlb"-->
+        <!--  show-overflow-tooltip-->
+        <!--&gt;</el-table-column>-->
         <el-table-column
           label="配送企业"
           prop="companyName"
@@ -141,7 +141,7 @@
       />
 
     </el-card>
-    <el-dialog title="请选择对应的注册/备案证" :visible.sync="dialogFormVisible" append-to-body width="40%">
+    <el-dialog title="请选择对应的批准文号" :visible.sync="dialogFormVisible" append-to-body width="40%">
       <el-form :model="form">
         <el-form-item label="" prop="isGive">
           <el-radio-group v-model="currentCert">
@@ -160,7 +160,7 @@
 
 
     <el-dialog
-      title="耗材字典详情"
+      title="药品字典详情"
       :visible.sync="udiRlDetailVisible"
       width="85%"
       :close-on-click-modal="false"
@@ -211,6 +211,7 @@ export default {
         unitFk: null,
         page: 1,
         limit: 10,
+        productsType: 2
       },
       dataList: [],
       pageTotal: 1,
diff --git a/src/views/inoutDrug/DialogSelectReceiveOrder.vue b/src/views/inoutDrug/DialogSelectReceiveOrder.vue
new file mode 100644
index 00000000..0e408be1
--- /dev/null
+++ b/src/views/inoutDrug/DialogSelectReceiveOrder.vue
@@ -0,0 +1,417 @@
+<template>
+  <div>
+    <el-card class="el-card" style="margin-top: -15px">
+      <div>
+        <el-form :model="listQuery" size="mini"
+                 v-if="showSearch"
+                 label-width="100px">
+          <el-row>
+            <el-col :span="8">
+              <el-form-item class="query-form-item" label="单据号:">
+                <el-input
+                  v-model="listQuery.billNo"
+                  placeholder="单据号" style="width: 100%"
+                  clearable
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="query-form-item" label="往来单位:">
+                <el-input
+                  v-model="listQuery.corpName"
+                  placeholder="往来单位" style="width: 100%"
+                  clearable
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <!--            <el-col :span="6">-->
+            <!--              <el-form-item class="query-form-item" label="领用类型">-->
+            <!--                <el-select v-model="listQuery.billType" placeholder="请选择领用类型" clearable="true">-->
+            <!--                  <el-option-->
+            <!--                    v-for="item in originTypes"-->
+            <!--                    :key="item.originAction"-->
+            <!--                    :label="item.originName"-->
+            <!--                    :value="item.originAction">-->
+            <!--                    <span style="float: left;font-size: 13px">{{ item.originAction }}</span>-->
+            <!--                    <span style="float: right; color: #8492a6; font-size: 13px;margin-left: 10px">{{-->
+            <!--                        item.originName-->
+            <!--                      }}</span>-->
+            <!--                  </el-option>-->
+            <!--                </el-select>-->
+            <!--              </el-form-item>-->
+            <!--            </el-col>-->
+            <!--          </el-row>-->
+            <el-col :span="8">
+              <el-form-item class="query-form-item" label="单据日期:">
+                <el-date-picker
+                  :picker-options="pickerOptions"
+                  v-model="actDateRange"
+                  type="daterange"
+                  style="width: 100%"
+                  format="yyyy 年 MM 月 dd 日"
+                  value-format="yyyy-MM-dd"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+
+        <div class="top-right-btn">
+          <el-button-group>
+            <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+            <el-button
+              type="primary"
+              icon="el-icon-refresh"
+              @click="onReset"
+            >重置
+            </el-button>
+            <el-button type="primary" icon="el-icon-search" @click="submitFind">查询</el-button>
+            <el-button type="primary" icon="el-icon-check" @click="combine"
+            >确定
+            </el-button
+            >
+          </el-button-group>
+
+        </div>
+        <el-table
+          :data="dataList"
+          style="width: 100%"
+          border
+          highlight-current-row="true"
+          v-loading="loading"
+          @current-change="handleDetail"
+        >
+          <el-table-column label="序号" type="index" width="60"></el-table-column>
+          <el-table-column label="领用单号" prop="billNo"></el-table-column>
+          <el-table-column label="领用仓库" prop="invName"></el-table-column>
+          <el-table-column label="往来信息" prop="targetInvName" show-overflow-tooltip="true"></el-table-column>
+          <el-table-column label="单据日期" prop="createTime"></el-table-column>
+          <el-table-column label="状态" prop="status">
+            <template slot-scope="scope">
+              <el-tag :type="(scope.row.status) | statusFilterType">
+                {{ statusMap[scope.row.status] }}
+              </el-tag>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-pagination
+          :page-size="listQuery.limit"
+          @current-change="handleErpPageChange"
+          layout="prev, pager, next"
+          :total="pageTotal"
+          :current-page="listQuery.page"
+        ></el-pagination>
+      </div>
+    </el-card>
+
+    <el-card class="el-card">
+      <el-table v-loading="loading" :data="detailList" style="width: 100%">
+        <el-table-column label="序号" type="index" width="120"></el-table-column>
+        <el-table-column label="药品编码" prop="nameCode"></el-table-column>
+        <el-table-column label="药品名称" prop="cpmctymc" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="批次号" prop="batchNo"></el-table-column>
+        <el-table-column label="生产日期" prop="productDate"></el-table-column>
+        <el-table-column label="失效日期" prop="expireDate"></el-table-column>
+        <el-table-column label="领用数量" prop="count"></el-table-column>
+      </el-table>
+    </el-card>
+
+
+    <el-dialog
+      v-if="storageVisible"
+      title="请选择单据所属仓库信息"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      append-to-body
+      :visible.sync="storageVisible">
+
+      <selectInvDialog
+        :closeInvDialog="closeInvDialog"
+        :billData="currentRow"
+        :closeSubmitDialog="closeSubmitDialog"
+      ></selectInvDialog>
+
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {addReceiveOrder, addStockOrder, getCloudErp} from "../../api/inout/erpOrder";
+import store from "@/store";
+import {filterAllByUser} from "@/api/system/invWarehouse";
+
+import selectInvDialog from "./DialogSelectInv";
+import {getOrderDetail, getReceiveOrder} from "@/api/inout/receiveOrder";
+import {getBusChange} from "@/api/basic/busTypeChange";
+
+export default {
+  name: "closeDialog",
+  props: {
+    data: {
+      type: Object,
+      required: true,
+    },
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+  },
+
+  data() {
+    return {
+      listQuery: {
+        billNo: "",
+        corpName: null,
+        billAction: null,
+        originType: null,
+        page: 1,
+        limit: 10,
+        status: 3,
+        customerId: null,
+      },
+      showSearch: true,
+      detailList: [],
+      storageVisible: false,
+      dataList: [],
+      pageTotal: 1,
+      total: 1,
+      currentRow: null,
+      curLocInv: null,
+      loading: false,
+      multipleUdiSelection: [],
+      thirdSys: [],
+      thirdSysFk: null,
+      originTypes: [],
+      storageList: [],
+      actDateRange: [],
+      statusMap: {
+        1: "草稿",
+        2: "未审核",
+        3: "已审核",
+        4: "已拒绝"
+      },
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
+      },
+    };
+  },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.listQuery = {
+        billNo: "",
+        billAction: null,
+        originType: null,
+        page: 1,
+        limit: 10,
+        status: 3,
+        customerId: null,
+      };
+      this.actDateRange = [];
+      this.getList();
+    },
+
+    tableRowClassName({row}) {
+      if (row.checked) return "warning-row";
+      return "";
+    },
+    checkSelectable(row) {
+      return !row.check;
+    },
+    handleCurrentChange(val) {
+      this.unionQuery.page = val;
+      this.getList();
+    },
+
+    handleDetail(row) {
+
+      this.currentRow = row;
+      var query = {};
+      query.orderIdFk = row.billNo;
+      getOrderDetail(query) //查找该单号下的所有条码
+        .then((response) => {
+          this.detailList = response.data.list || [];
+        })
+        .catch(() => {
+          this.detailList = [];
+        });
+    },
+
+    handleErpPageChange(val) {
+      this.listQuery.page = val;
+      this.getList();
+    },
+    keyup_submit(event) {
+      this.getList();
+      event.target.select();
+    },
+    getList() {
+      this.loading = true;
+      if (this.actDateRange !== null) {
+        this.listQuery.startTime = this.actDateRange[0];
+        this.listQuery.endTime = this.actDateRange[1];
+      } else {
+        this.listQuery.startTime = null;
+        this.listQuery.endTime = null;
+      }
+      this.listQuery.customerId = store.getters.customerId;
+      getReceiveOrder(this.listQuery)
+        .then((response) => {
+          console.log(response)
+          this.loading = false;
+          if (response.code === 20000) {
+            this.dataList = response.data.list || [];
+            this.pageTotal = response.data.total || 0;
+          } else {
+            this.$message.error(response.message);
+            this.dataList = [];
+            this.pageTotal = 0;
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+          this.dataList = [];
+          this.pageTotal = 0;
+        });
+    },
+    intentBack() {
+      this.closeDialog();
+    },
+    combine() {
+      if (this.$isBlank(this.currentRow.id)) {
+        return;
+      }
+      let tQuery = {
+        id: this.currentRow.id,
+      }
+      addReceiveOrder(tQuery)
+        .then((response) => {
+          if (response.code === 20000) {
+            this.closeDialog();
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+        });
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+
+    submitFind() {
+      this.listQuery.page = 1;
+      this.getList();
+    },
+    selectStorage(row) {
+      this.curLocInv = row.code;
+      let tQuery = {
+        id: this.currentRow.id,
+        locStorageCode: this.curLocInv,
+      }
+      addStockOrder(tQuery)
+        .then((response) => {
+          if (response.code === 20000) {
+            this.storageVisible = false;
+            this.closeDialog();
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+        });
+    },
+
+    handleSelectionUdiChange(val) {
+      console.log("----" + val);
+      this.multipleUdiSelection = val;
+    },
+    getBusType() {
+      let query = {
+        enable: true,
+      };
+      getBusChange(query)
+        .then((response) => {
+          this.originTypes = response.data.list || [];
+        })
+        .catch(() => {
+        });
+    },
+    getStorage(event) {
+      this.storageList = [];
+      filterAllByUser()
+        .then((response) => {
+          this.storageList = response.data || [];
+          if (this.storageList.length == 1) {
+            this.curLocInv = this.storageList[0].code;
+          }
+        })
+        .catch(() => {
+        });
+    },
+
+
+    closeInvDialog() {
+      this.storageVisible = false;
+    },
+
+    closeSubmitDialog() {
+      this.storageVisible = false;
+      this.combine();
+    },
+  },
+  created() {
+    this.getBusType();
+    this.getStorage();
+    this.getList();
+  },
+  components: {selectInvDialog}
+
+};
+</script>
+
+<style scoped>
+
+div /deep/ .el-table .warning-row {
+  background: #bebebe;
+}
+
+div /deep/ .el-table .success-row {
+  background: #ffffff;
+}
+</style>
diff --git a/src/views/inoutDrug/DialogSelectRl.vue b/src/views/inoutDrug/DialogSelectRl.vue
index 26de8545..31211bd7 100644
--- a/src/views/inoutDrug/DialogSelectRl.vue
+++ b/src/views/inoutDrug/DialogSelectRl.vue
@@ -9,23 +9,23 @@
     >
       <el-table-column label="序号" type="index"></el-table-column>
       <el-table-column
-        label="最小销售产品标识"
+        label="药品编码"
         prop="nameCode"
         width="140"
         show-overflow-tooltip
       ></el-table-column>
-      <el-table-column
-        label="产品编码"
-        prop="thirdId"
-        show-overflow-tooltip
-      ></el-table-column>
+      <!--<el-table-column-->
+      <!--  label="产品编码"-->
+      <!--  prop="thirdId"-->
+      <!--  show-overflow-tooltip-->
+      <!--&gt;</el-table-column>-->
       <el-table-column
         label="生产企业"
         prop="ylqxzcrbarmc"
         show-overflow-tooltip
       ></el-table-column>
       <el-table-column
-        label="产品通用名"
+        label="药品名称"
         prop="cpmctymc"
         show-overflow-tooltip
       ></el-table-column>
@@ -35,15 +35,15 @@
         show-overflow-tooltip
       ></el-table-column>
       <el-table-column
-        label="注册/备案凭证"
+        label="批准文号"
         prop="zczbhhzbapzbh"
         show-overflow-tooltip
       ></el-table-column>
-      <el-table-column
-        label="器械类别"
-        prop="qxlb"
-        show-overflow-tooltip
-      ></el-table-column>
+      <!--<el-table-column-->
+      <!--  label="器械类别"-->
+      <!--  prop="qxlb"-->
+      <!--  show-overflow-tooltip-->
+      <!--&gt;</el-table-column>-->
       <el-table-column label="配送企业" prop="companyName" show-overflow-tooltip></el-table-column>
       <el-table-column width="120" label="操作">
         <template slot-scope="scope">
@@ -64,7 +64,7 @@
       </el-table-column>
     </el-table>
     <el-dialog
-      title="产品信息详情"
+      title="药品信息详情"
       :visible.sync="editDialogVisible"
       :close-on-click-modal="false"
       append-to-body
@@ -103,13 +103,13 @@
         @current-change="handleDetail"
       >
         <el-table-column
-          label="产品标识"
+          label="药品编码"
           prop="nameCode"
           show-overflow-tooltip
         ></el-table-column>
 
         <el-table-column
-          label="产品通用名"
+          label="药品名称"
           prop="cpmctymc"
           show-overflow-tooltip
         ></el-table-column>
@@ -136,7 +136,7 @@
           <el-col :span="12" class="el-col">
             <div class="text item">
               <div class="itemTag">
-                <span>产品名称:&nbsp;</span>
+                <span>药品名称:&nbsp;</span>
               </div>
               <el-input
                 style="width: 65%"
@@ -150,7 +150,7 @@
           <el-col :span="12" class="el-col">
             <div class="text item">
               <div class="itemTag">
-                <span>产品标识:&nbsp;</span>
+                <span>药品编码:&nbsp;</span>
               </div>
               <el-input
                 style="width: 65%"
@@ -181,67 +181,67 @@
             </div>
           </el-col>
 
-          <el-col :span="12" class="el-col">
-            <div class="text item">
-              <div class="itemTag">
-                <span>器械类别:&nbsp;</span>
-              </div>
-              <el-input
-                style="width: 65%"
-                :disabled="true"
-                size="small"
-                splaceholder="请输入内容"
-                v-model="editQuery.qxlb"
-              ></el-input>
-            </div>
-          </el-col>
+          <!--<el-col :span="12" class="el-col">-->
+          <!--  <div class="text item">-->
+          <!--    <div class="itemTag">-->
+          <!--      <span>器械类别:&nbsp;</span>-->
+          <!--    </div>-->
+          <!--    <el-input-->
+          <!--      style="width: 65%"-->
+          <!--      :disabled="true"-->
+          <!--      size="small"-->
+          <!--      splaceholder="请输入内容"-->
+          <!--      v-model="editQuery.qxlb"-->
+          <!--    ></el-input>-->
+          <!--  </div>-->
+          <!--</el-col>-->
         </el-row>
         <el-row :gutter="20" class="el-row" type="flex">
-          <el-col :span="12" class="el-col">
-            <div class="text item">
-              <div class="itemTag">
-                <span>产品类别:&nbsp;</span>
-              </div>
-              <el-input
-                style="width: 65%"
-                :disabled="true"
-                size="small"
-                splaceholder="请输入内容"
-                v-model="editQuery.cplb"
-              ></el-input>
-            </div>
-          </el-col>
-          <el-col :span="12" class="el-col">
-            <div class="text item">
-              <div class="itemTag">
-                <span>分类编码:&nbsp;</span>
-              </div>
-              <el-input
-                style="width: 65%"
-                :disabled="true"
-                size="small"
-                splaceholder="请输入内容"
-                v-model="editQuery.flbm"
-              ></el-input>
-            </div>
-          </el-col>
+          <!--<el-col :span="12" class="el-col">-->
+          <!--  <div class="text item">-->
+          <!--    <div class="itemTag">-->
+          <!--      <span>产品类别:&nbsp;</span>-->
+          <!--    </div>-->
+          <!--    <el-input-->
+          <!--      style="width: 65%"-->
+          <!--      :disabled="true"-->
+          <!--      size="small"-->
+          <!--      splaceholder="请输入内容"-->
+          <!--      v-model="editQuery.cplb"-->
+          <!--    ></el-input>-->
+          <!--  </div>-->
+          <!--</el-col>-->
+          <!--<el-col :span="12" class="el-col">-->
+          <!--  <div class="text item">-->
+          <!--    <div class="itemTag">-->
+          <!--      <span>分类编码:&nbsp;</span>-->
+          <!--    </div>-->
+          <!--    <el-input-->
+          <!--      style="width: 65%"-->
+          <!--      :disabled="true"-->
+          <!--      size="small"-->
+          <!--      splaceholder="请输入内容"-->
+          <!--      v-model="editQuery.flbm"-->
+          <!--    ></el-input>-->
+          <!--  </div>-->
+          <!--</el-col>-->
 
         </el-row>
         <el-row :gutter="20" class="el-row" type="flex">
 
-          <el-col :span="12" class="el-col">
-            <div class="text item">
-              <div class="itemTag">
-                <span>商品条码:&nbsp;</span>
-              </div>
-              <el-input
-                style="width: 65%"
-                size="small"
-                splaceholder="请输入内容"
-                v-model="editQuery.sptm"
-              ></el-input>
-            </div>
-          </el-col>
+          <!--<el-col :span="12" class="el-col">-->
+          <!--  <div class="text item">-->
+          <!--    <div class="itemTag">-->
+          <!--      <span>商品条码:&nbsp;</span>-->
+          <!--    </div>-->
+          <!--    <el-input-->
+          <!--      style="width: 65%"-->
+          <!--      size="small"-->
+          <!--      splaceholder="请输入内容"-->
+          <!--      v-model="editQuery.sptm"-->
+          <!--    ></el-input>-->
+          <!--  </div>-->
+          <!--</el-col>-->
           <el-col :span="12" class="el-col">
             <div class="text item">
               <div class="itemTag">
@@ -258,34 +258,34 @@
         </el-row>
         <el-row :gutter="20" class="el-row" type="flex">
 
-          <el-col :span="12" class="el-col">
-            <div class="text item">
-              <div class="itemTag">
-                <span>医疗器械注册人:&nbsp;</span>
-              </div>
-              <el-input
-                style="width: 65%"
-                :disabled="true"
-                size="small"
-                splaceholder="ylqxzcrbarmc"
-                v-model="editQuery.ylqxzcrbarmc"
-              ></el-input>
-            </div>
-          </el-col>
-          <el-col :span="12" class="el-col">
-            <div class="text item">
-              <div class="itemTag">
-                <span>注册人英文名称:&nbsp;</span>
-              </div>
-              <el-input
-                style="width: 65%"
-                :disabled="true"
-                size="small"
-                splaceholder="请输入内容"
-                v-model="editQuery.ylqxzcrbarywmc"
-              ></el-input>
-            </div>
-          </el-col>
+          <!--<el-col :span="12" class="el-col">-->
+          <!--  <div class="text item">-->
+          <!--    <div class="itemTag">-->
+          <!--      <span>医疗器械注册人:&nbsp;</span>-->
+          <!--    </div>-->
+          <!--    <el-input-->
+          <!--      style="width: 65%"-->
+          <!--      :disabled="true"-->
+          <!--      size="small"-->
+          <!--      splaceholder="ylqxzcrbarmc"-->
+          <!--      v-model="editQuery.ylqxzcrbarmc"-->
+          <!--    ></el-input>-->
+          <!--  </div>-->
+          <!--</el-col>-->
+          <!--<el-col :span="12" class="el-col">-->
+          <!--  <div class="text item">-->
+          <!--    <div class="itemTag">-->
+          <!--      <span>注册人英文名称:&nbsp;</span>-->
+          <!--    </div>-->
+          <!--    <el-input-->
+          <!--      style="width: 65%"-->
+          <!--      :disabled="true"-->
+          <!--      size="small"-->
+          <!--      splaceholder="请输入内容"-->
+          <!--      v-model="editQuery.ylqxzcrbarywmc"-->
+          <!--    ></el-input>-->
+          <!--  </div>-->
+          <!--</el-col>-->
 
         </el-row>
         <el-row :gutter="20" class="el-row" type="flex">
@@ -307,7 +307,7 @@
           <el-col :span="12" class="el-col">
             <div class="text item">
               <div class="itemTag">
-                <span>注册证/备案号:&nbsp;</span>
+                <span>批准文号:&nbsp;</span>
               </div>
               <el-input
                 style="width: 65%"
@@ -319,119 +319,119 @@
             </div>
           </el-col>
         </el-row>
-        <el-row :gutter="20" class="el-row" type="flex">
-          <el-col :span="12" class="el-col">
-            <div class="text item">
-              <div class="itemTag">
-                <span>上级产品编码:&nbsp;</span>
-              </div>
-              <el-input
-                style="width: 65%"
-                :disabled="true"
-                size="small"
-                splaceholder="请输入内容"
-                v-model="editQuery.sjcpbm"
-              ></el-input>
-            </div>
-          </el-col>
-
-          <el-col :span="12" class="el-col">
-            <div class="text item">
-              <div class="itemTag">
-                <span>包装级别:&nbsp;</span>
-              </div>
-              <el-input
-                style="width: 65%"
-                size="small"
-                splaceholder="请输入内容"
-                :disabled="true"
-                v-model="editQuery.packLevel"
-              ></el-input>
-            </div>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20" class="el-row" type="flex">
-          <el-col :span="12" class="el-col">
-            <div class="text item">
-              <div class="itemTag">
-                <span>包装层级:&nbsp;</span>
-              </div>
+        <!--<el-row :gutter="20" class="el-row" type="flex">-->
+        <!--  <el-col :span="12" class="el-col">-->
+        <!--    <div class="text item">-->
+        <!--      <div class="itemTag">-->
+        <!--        <span>上级产品编码:&nbsp;</span>-->
+        <!--      </div>-->
+        <!--      <el-input-->
+        <!--        style="width: 65%"-->
+        <!--        :disabled="true"-->
+        <!--        size="small"-->
+        <!--        splaceholder="请输入内容"-->
+        <!--        v-model="editQuery.sjcpbm"-->
+        <!--      ></el-input>-->
+        <!--    </div>-->
+        <!--  </el-col>-->
+
+        <!--  <el-col :span="12" class="el-col">-->
+        <!--    <div class="text item">-->
+        <!--      <div class="itemTag">-->
+        <!--        <span>包装级别:&nbsp;</span>-->
+        <!--      </div>-->
+        <!--      <el-input-->
+        <!--        style="width: 65%"-->
+        <!--        size="small"-->
+        <!--        splaceholder="请输入内容"-->
+        <!--        :disabled="true"-->
+        <!--        v-model="editQuery.packLevel"-->
+        <!--      ></el-input>-->
+        <!--    </div>-->
+        <!--  </el-col>-->
+        <!--</el-row>-->
+        <!--<el-row :gutter="20" class="el-row" type="flex">-->
+        <!--  <el-col :span="12" class="el-col">-->
+        <!--    <div class="text item">-->
+        <!--      <div class="itemTag">-->
+        <!--        <span>包装层级:&nbsp;</span>-->
+        <!--      </div>-->
+
+        <!--      <el-input-->
+        <!--        style="width: 65%"-->
+        <!--        size="small"-->
+        <!--        splaceholder="请输入内容"-->
+        <!--        v-model="editQuery.bzcj"-->
+        <!--        :disabled="true"-->
+
+        <!--      ></el-input>-->
+        <!--    </div>-->
+        <!--  </el-col>-->
+
+        <!--  <el-col :span="12" class="el-col">-->
+        <!--    <div class="text item">-->
+        <!--      <div class="itemTag">-->
+        <!--        <span>包含下级包装数量:&nbsp;</span>-->
+        <!--      </div>-->
+        <!--      <el-input-->
+        <!--        style="width: 65%"-->
+        <!--        size="small"-->
+        <!--        splaceholder="请输入内容"-->
+        <!--        :disabled="true"-->
+        <!--        v-model="editQuery.bhxjsl"-->
+        <!--      ></el-input>-->
+        <!--    </div>-->
+        <!--  </el-col>-->
+        <!--</el-row>-->
+        <!--<el-row :gutter="20" class="el-row" type="flex">-->
+        <!--  <el-col :span="12" class="el-col">-->
+        <!--    <div class="text item">-->
+        <!--      <div class="itemTag">-->
+        <!--        <span>包含下级产品编码:&nbsp;</span>-->
+        <!--      </div>-->
+
+        <!--      <el-input-->
+        <!--        style="width: 65%"-->
+        <!--        size="small"-->
+        <!--        :disabled="true"-->
+        <!--        splaceholder="请输入内容"-->
+        <!--        v-model="editQuery.bhxjcpbm"-->
+
+        <!--      ></el-input>-->
+        <!--    </div>-->
+        <!--  </el-col>-->
+
+        <!--  <el-col :span="12" class="el-col">-->
+        <!--    <div class="text item">-->
+        <!--      <div class="itemTag">-->
+        <!--        <span>包含最小销售包装数量:&nbsp;</span>-->
+        <!--      </div>-->
+        <!--      <el-input-->
+        <!--        style="width: 65%"-->
+        <!--        size="small"-->
+        <!--        :disabled="true"-->
+        <!--        splaceholder="请输入内容"-->
+        <!--        v-model="editQuery.bhzxxsbzsl"-->
+        <!--      ></el-input>-->
+        <!--    </div>-->
+        <!--  </el-col>-->
+        <!--</el-row>-->
 
-              <el-input
-                style="width: 65%"
-                size="small"
-                splaceholder="请输入内容"
-                v-model="editQuery.bzcj"
-                :disabled="true"
-
-              ></el-input>
-            </div>
-          </el-col>
-
-          <el-col :span="12" class="el-col">
-            <div class="text item">
-              <div class="itemTag">
-                <span>包含下级包装数量:&nbsp;</span>
-              </div>
-              <el-input
-                style="width: 65%"
-                size="small"
-                splaceholder="请输入内容"
-                :disabled="true"
-                v-model="editQuery.bhxjsl"
-              ></el-input>
-            </div>
-          </el-col>
-        </el-row>
         <el-row :gutter="20" class="el-row" type="flex">
-          <el-col :span="12" class="el-col">
-            <div class="text item">
-              <div class="itemTag">
-                <span>包含下级产品编码:&nbsp;</span>
-              </div>
-
-              <el-input
-                style="width: 65%"
-                size="small"
-                :disabled="true"
-                splaceholder="请输入内容"
-                v-model="editQuery.bhxjcpbm"
-
-              ></el-input>
-            </div>
-          </el-col>
-
-          <el-col :span="12" class="el-col">
-            <div class="text item">
-              <div class="itemTag">
-                <span>包含最小销售包装数量:&nbsp;</span>
-              </div>
-              <el-input
-                style="width: 65%"
-                size="small"
-                :disabled="true"
-                splaceholder="请输入内容"
-                v-model="editQuery.bhzxxsbzsl"
-              ></el-input>
-            </div>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="20" class="el-row" type="flex">
-          <el-col :span="12" class="el-col">
-            <div class="text item">
-              <div class="itemTag">
-                <span>最小包装单元内包含使用单元数量:&nbsp;</span>
-              </div>
-              <el-input
-                style="width: 65%"
-                :disabled="!checked"
-                size="small"
-                splaceholder="请输入内容"
-                v-model="editQuery.zxxsbzbhsydysl"
-              ></el-input>
-            </div>
-          </el-col>
+          <!--<el-col :span="12" class="el-col">-->
+          <!--  <div class="text item">-->
+          <!--    <div class="itemTag">-->
+          <!--      <span>最小包装单元内包含使用单元数量:&nbsp;</span>-->
+          <!--    </div>-->
+          <!--    <el-input-->
+          <!--      style="width: 65%"-->
+          <!--      :disabled="!checked"-->
+          <!--      size="small"-->
+          <!--      splaceholder="请输入内容"-->
+          <!--      v-model="editQuery.zxxsbzbhsydysl"-->
+          <!--    ></el-input>-->
+          <!--  </div>-->
+          <!--</el-col>-->
           <el-col :span="12" class="el-col">
             <div class="text item">
               <div class="itemTag">
@@ -448,31 +448,31 @@
         </el-row>
 
 
-        <el-row :gutter="20" class="el-row" type="flex">
-          <el-col :span="24" class="el-col">
-            <div style="margin-top: 18px;margin-bottom: 18px">
-              <el-checkbox v-model="checked" disabled
-              >以使用单元数量入库
-              </el-checkbox>
-              <el-checkbox v-model="editQuery.isDisable" disabled
-              >是否禁用
-              </el-checkbox>
-              <el-checkbox v-model="editQuery.isAdavence" disabled
-              >是否寄售
-              </el-checkbox>
-              <el-checkbox v-model="editQuery.allowNoBatch" disabled
-              >允许无批次号
-              </el-checkbox>
-              <el-checkbox v-model="editQuery.allowNoExpire" disabled
-              >允许无失效日期
-              </el-checkbox>
-              <el-checkbox v-model="editQuery.allowNoProduct" disabled
-              >允许无生产日期
-              </el-checkbox>
-            </div>
-          </el-col>
-
-        </el-row>
+        <!--<el-row :gutter="20" class="el-row" type="flex">-->
+        <!--  <el-col :span="24" class="el-col">-->
+        <!--    <div style="margin-top: 18px;margin-bottom: 18px">-->
+        <!--      <el-checkbox v-model="checked" disabled-->
+        <!--      >以使用单元数量入库-->
+        <!--      </el-checkbox>-->
+        <!--      <el-checkbox v-model="editQuery.isDisable" disabled-->
+        <!--      >是否禁用-->
+        <!--      </el-checkbox>-->
+        <!--      <el-checkbox v-model="editQuery.isAdavence" disabled-->
+        <!--      >是否寄售-->
+        <!--      </el-checkbox>-->
+        <!--      <el-checkbox v-model="editQuery.allowNoBatch" disabled-->
+        <!--      >允许无批次号-->
+        <!--      </el-checkbox>-->
+        <!--      <el-checkbox v-model="editQuery.allowNoExpire" disabled-->
+        <!--      >允许无失效日期-->
+        <!--      </el-checkbox>-->
+        <!--      <el-checkbox v-model="editQuery.allowNoProduct" disabled-->
+        <!--      >允许无生产日期-->
+        <!--      </el-checkbox>-->
+        <!--    </div>-->
+        <!--  </el-col>-->
+
+        <!--</el-row>-->
       </el-form>
 
       <div style="text-align: center">
diff --git a/src/views/inoutDrug/DialogSelectSpace.vue b/src/views/inoutDrug/DialogSelectSpace.vue
index 71d26834..88494261 100644
--- a/src/views/inoutDrug/DialogSelectSpace.vue
+++ b/src/views/inoutDrug/DialogSelectSpace.vue
@@ -19,14 +19,14 @@
       ></el-table-column>
       <el-table-column label="仓库" prop="invName" width="120"></el-table-column>
       <el-table-column label="货位" prop="invSpaceName" width="120"></el-table-column>
-      <el-table-column label="DI/物资编码" prop="nameCode" width="150"></el-table-column>
-      <el-table-column label="物资名称" prop="productName" width="200" show-overflow-tooltip></el-table-column>
+      <el-table-column label="药品编码" prop="nameCode" width="150"></el-table-column>
+      <el-table-column label="药品名称" prop="productName" width="200" show-overflow-tooltip></el-table-column>
       <el-table-column label="规格型号" prop="ggxh" width="150" show-overflow-tooltip></el-table-column>
       <el-table-column label="批次号" prop="batchNo" width="120"></el-table-column>
       <el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column>
       <el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
       <el-table-column label="计量单位" prop="expireDate" width="120"></el-table-column>
-      <el-table-column label="注册备案号" prop="zczbhhzbapzbh" show-overflow-tooltip
+      <el-table-column label="批准文号" prop="zczbhhzbapzbh" show-overflow-tooltip
                        width="200"></el-table-column>
       <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip
                        width="200"></el-table-column>
diff --git a/src/views/inoutDrug/DialogSelectThrDrugOrder.vue b/src/views/inoutDrug/DialogSelectThrDrugOrder.vue
new file mode 100644
index 00000000..a8478922
--- /dev/null
+++ b/src/views/inoutDrug/DialogSelectThrDrugOrder.vue
@@ -0,0 +1,461 @@
+<template>
+  <div>
+    <el-card class="el-card" style="margin-top: -15px">
+      <div>
+        <el-form :model="listQuery" size="mini"
+                 v-if="showSearch"
+                 label-width="100px">
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="外部系统:">
+                <el-select v-model="listQuery.thirdSysFk" style="width: 90%" placeholder="请选择第三方系统"
+                           clearable="true" @change="thirdSysChange">
+                  <el-option
+                    v-for="item in thirdSys"
+                    :key="item.thirdId"
+                    :label="item.thirdName"
+                    :value="item.thirdId">
+                    <span style="float: left;font-size: 13px">{{ item.thirdName }}</span>
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+              <el-form-item class="query-form-item" label="单据号:">
+                <el-input
+                  style="width: 90%"
+                  v-model="listQuery.billNo"
+                  placeholder="单据号"
+                  clearable
+                ></el-input>
+              </el-form-item>
+            </el-col>
+
+
+            <el-col :span="8">
+              <el-form-item class="query-form-item" label="单据类型:">
+                <el-select v-model="listQuery.billAction" placeholder="请选择第三方系统单据类型" filterable clearable="true"
+                           style="width: 90%">
+                  <el-option
+                    v-for="item in originTypes"
+                    :key="item.name"
+                    :label="item.name"
+                    :value="item.action">
+                    <span style="float: left;font-size: 13px">{{ item.name }}</span>
+                    <span style="float: right; color: #8492a6; font-size: 13px;margin-left: 10px">{{
+                        item.thirdSysName
+                      }}</span>
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="往来单位:">
+                <el-input v-model="listQuery.corpName" style="width: 90%" placeholder="请输入往来单位" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="query-form-item" label="单据日期:">
+                <el-date-picker
+                  :picker-options="pickerOptions"
+                  v-model="actDateRange"
+                  type="daterange"
+                  format="yyyy 年 MM 月 dd 日"
+                  value-format="yyyy-MM-dd"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期" style="width: 90%"
+
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <div class="top-right-btn">
+          <el-button-group>
+            <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+
+            <el-button
+              type="primary"
+              icon="el-icon-refresh"
+              @click="onReset"
+            >重置
+            </el-button>
+            <el-button type="primary" icon="el-icon-search" @click="submitFind">查询</el-button>
+            <el-button type="primary" icon="el-icon-check" @click="combine" :loading="determineLoading"
+            >确定
+            </el-button
+            >
+          </el-button-group>
+        </div>
+        <el-divider style="margin: 15px"></el-divider>
+        <el-table
+          :data="dataList"
+          style="width: 100%"
+          highlight-current-row="true"
+          v-loading="loading"
+          border
+          :row-class-name="tableRowClassName"
+          @current-change="handleChange"
+        >
+          <el-table-column label="序号" type="index"></el-table-column>
+          <el-table-column label="单据号" prop="billNo"></el-table-column>
+          <el-table-column label="往来单位" prop="corpName" width="300"
+                           show-overflow-tooltip="true"></el-table-column>
+          <el-table-column label="单据类型" prop="billType"></el-table-column>
+          <el-table-column label="单据状态" prop="billFlag" width="80"></el-table-column>
+          <el-table-column label="单据日期" prop="billdate"></el-table-column>
+        </el-table>
+        <el-pagination
+          :page-size="listQuery.limit"
+          @current-change="handleErpPageChange"
+          layout="prev, pager, next"
+          :total="pageTotal"
+          :current-page="listQuery.page"
+        ></el-pagination>
+      </div>
+    </el-card>
+
+    <el-card class="el-card">
+      <el-table v-loading="loading" :data="detailList" style="width: 100%" border>
+        <el-table-column label="序号" type="index" width="120"></el-table-column>
+        <el-table-column label="药品编码" prop="productId"></el-table-column>
+        <el-table-column label="药品名称" prop="productName" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="批次号" prop="batchNo"></el-table-column>
+        <el-table-column label="生产日期" prop="productDate"></el-table-column>
+        <el-table-column label="失效日期" prop="expireDate"></el-table-column>
+        <el-table-column label="单据数量" prop="count"></el-table-column>
+      </el-table>
+    </el-card>
+
+
+    <el-dialog
+      v-if="storageVisible"
+      title="请选择单据所属仓库信息"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      append-to-body
+      :visible.sync="storageVisible">
+
+      <selectInvDialog
+        :closeInvDialog="closeInvDialog"
+        :billData="currentRow"
+        :closeSubmitDialog="closeSubmitDialog"
+      ></selectInvDialog>
+
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {addStockOrder, addThrOrder, getCloudErp} from "@/api/inout/erpOrder";
+import store from "@/store";
+import {getOriginBusType} from "@/api/basic/busOriginType";
+import {filterAllByUser} from "@/api/system/invWarehouse";
+import selectInvDialog from "./DialogSelectInv";
+import {getBasicThirdSys} from "@/api/basic/basicThirdSys";
+import {getThrOrderDetails, getThrOrders} from "@/api/thrsys/thrOrder";
+
+export default {
+  name: "closeDialog",
+  props: {
+    data: {
+      type: Object,
+      required: true,
+    },
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+  },
+
+  data() {
+    return {
+      listQuery: {
+        billNo: "",
+        thirdSysFk: "",
+        billAction: null,
+        originType: null,
+        page: 1,
+        limit: 10,
+        allocateStatus: 0,
+        type: 0,
+        corpName:null,
+        customerId: null,
+      },
+      showSearch: true,
+      detailList: [],
+      storageVisible: false,
+      dataList: [],
+      pageTotal: 1,
+      total: 1,
+      currentRow: null,
+      curLocInv: null,
+      loading: false,
+      multipleUdiSelection: [],
+      thirdSys: [],
+      thirdSysFk: null,
+      busTypes: [],
+      originTypes: [],
+      storageList: [],
+      actDateRange: [],
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
+      },
+      determineLoading: false,
+    };
+  },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.listQuery = {
+        billNo: "",
+        corpName: null,
+        billAction: null,
+        page: 1,
+        limit: 10,
+        allocateStatus: 0,
+      };
+      this.actDateRange = [];
+      this.getList();
+    },
+
+    tableRowClassName({row}) {
+      if (row.checked) return "warning-row";
+      return "";
+    },
+    checkSelectable(row) {
+      return !row.check;
+    },
+    handleCurrentChange(val) {
+      this.unionQuery.page = val;
+      this.getList();
+    },
+    handleChange(row) {
+      this.currentRow = row;
+      let query = {orderIdFk: row.billNo};
+      getThrOrderDetails(query)
+        .then((response) => {
+          if (response.code == 20000) {
+            this.detailList = response.data.list || [];
+          } else {
+            this.$message.error(response.message);
+          }
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
+    handleErpPageChange(val) {
+      this.listQuery.page = val;
+      this.getList();
+    },
+    keyup_submit(event) {
+      this.getList();
+      event.target.select();
+    },
+    getList() {
+      this.loading = true;
+      if (this.actDateRange !== null) {
+        this.listQuery.startDate = this.actDateRange[0];
+        this.listQuery.endDate = this.actDateRange[1];
+      } else {
+        this.listQuery.startDate = null;
+        this.listQuery.endDate = null;
+      }
+      this.listQuery.customerId = store.getters.customerId;
+      getThrOrders(this.listQuery)
+        .then((response) => {
+          console.log(response)
+          this.loading = false;
+          if (response.code === 20000) {
+            this.dataList = response.data.list || [];
+            this.pageTotal = response.data.total || 0;
+          } else {
+            this.$message.error(response.message);
+            this.dataList = [];
+            this.pageTotal = 0;
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+          this.dataList = [];
+          this.pageTotal = 0;
+        });
+    },
+    intentBack() {
+      this.closeDialog();
+    },
+    combine() {
+      if (this.$isBlank(this.currentRow.id)) {
+        return;
+      }
+      let tQuery = {
+        id: this.currentRow.id,
+        locStorageCode: this.curLocInv,
+        invWarehouseCode: this.currentRow.invWarehouseCode,
+      }
+      this.determineLoading = true
+      addThrOrder(tQuery)
+        .then((response) => {
+          this.determineLoading = false
+          if (response.code === 20000) {
+            this.closeDialog();
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+          this.determineLoading = false
+        });
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    submitFind() {
+      this.listQuery.page = 1;
+      this.getList();
+    },
+    selectStorage(row) {
+      this.curLocInv = row.code;
+      let tQuery = {
+        id: this.currentRow.id,
+        locStorageCode: this.curLocInv,
+      }
+      addStockOrder(tQuery)
+        .then((response) => {
+          if (response.code === 20000) {
+            this.storageVisible = false;
+            this.closeDialog();
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+        });
+    },
+
+    handleSelectionUdiChange(val) {
+      console.log("----" + val);
+      this.multipleUdiSelection = val;
+    },
+    getBusType() {
+      let query = {
+        enabled: true,
+        thirdSys: this.listQuery.thirdSysFk,
+      };
+      getOriginBusType(query)
+        .then((response) => {
+          this.originTypes = response.data.list || [];
+        })
+        .catch(() => {
+        });
+    },
+    getStorage(event) {
+      this.storageList = [];
+      filterAllByUser()
+        .then((response) => {
+          this.storageList = response.data || [];
+          if (this.storageList.length == 1) {
+            this.curLocInv = this.storageList[0].code;
+          }
+        })
+        .catch(() => {
+        });
+    },
+
+
+    closeInvDialog() {
+      this.storageVisible = false;
+    },
+
+    thirdSysChange() {
+      this.listQuery.billAction = "";
+      this.getBusType();
+    },
+
+    closeSubmitDialog() {
+      this.storageVisible = false;
+      this.combine();
+    },
+
+
+    getBasicThirdSys() {
+      let query = {
+        enabled: true,
+      };
+      getBasicThirdSys(query)
+        .then((response) => {
+          this.thirdSys = response.data.list || [];
+          this.listQuery.thirdSysFk = this.thirdSys[0].thirdId;
+          this.getBusType();
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+        });
+    },
+
+
+  }
+  ,
+  created() {
+
+    this.getBasicThirdSys();
+    this.getStorage();
+  }
+  ,
+  components: {
+    selectInvDialog
+  }
+
+}
+;
+</script>
+
+<style scoped>
+
+div /deep/ .el-table .warning-row {
+  background: #bebebe;
+}
+
+div /deep/ .el-table .success-row {
+  background: #ffffff;
+}
+</style>
diff --git a/src/views/inoutDrug/IoAuditedOrder.vue b/src/views/inoutDrug/IoAuditedOrder.vue
index 6d70625c..bac6673e 100644
--- a/src/views/inoutDrug/IoAuditedOrder.vue
+++ b/src/views/inoutDrug/IoAuditedOrder.vue
@@ -997,6 +997,7 @@ export default {
         fromCorp: null,
         keyWords: null,
         invCode: this.$store.getters.locInvCode,
+        productType: 2
       },
       fromOptions: [],
       checkStatus: {
@@ -1139,6 +1140,7 @@ export default {
         startTime: null,
         endTime: null,
         invCode: this.$store.getters.locInvCode,
+        productType: 2
       };
       this.actDateRange = [];
       this.auditDateRange = [];
diff --git a/src/views/inoutDrug/IoCheckAuditOrder.vue b/src/views/inoutDrug/IoCheckAuditOrder.vue
index db7b72b3..b1bfaa22 100644
--- a/src/views/inoutDrug/IoCheckAuditOrder.vue
+++ b/src/views/inoutDrug/IoCheckAuditOrder.vue
@@ -1226,6 +1226,7 @@ export default {
         fromCorp: null,
         keyWords: null,
         invCode: this.$store.getters.locInvCode,
+        productType: 2
       },
       customerId: this.$store.getters.customerId,
       checkStatus: {
@@ -1378,6 +1379,7 @@ export default {
         startTime: null,
         endTime: null,
         invCode: this.$store.getters.locInvCode,
+        productType: 2
       };
       this.actDateRange = [];
       this.getList();
diff --git a/src/views/inoutDrug/IoCheckErrorOrder.vue b/src/views/inoutDrug/IoCheckErrorOrder.vue
index 07023c22..f7fe2461 100644
--- a/src/views/inoutDrug/IoCheckErrorOrder.vue
+++ b/src/views/inoutDrug/IoCheckErrorOrder.vue
@@ -1148,7 +1148,7 @@ import {getBizDetailList} from "@/api/inout/orderDetailBiz";
 import {getCodeDetailList} from "@/api/inout/orderDetailCode";
 import {errorCodeList} from "../../api/inout/order";
 
-import addOrder from "@/views/inout/DialogCreateOrder";
+import addOrder from "./DialogCreateDrugOrder";
 import {getCorrespondence} from "@/api/basic/basicUnitMaintain";
 import {
   getHead, executeFuc
@@ -1180,6 +1180,7 @@ export default {
         endTime: null,
         fromCorp: null,
         invCode: this.$store.getters.locInvCode,
+        productType: 2
       },
       fromOptions: [],
       checkStatus: {
@@ -1326,6 +1327,7 @@ export default {
         startTime: null,
         endTime: null,
         invCode: this.$store.getters.locInvCode,
+        productType: 2
       };
       this.actDateRange = [];
       this.getList();
diff --git a/src/views/inoutDrug/IoCheckSuccessOrder.vue b/src/views/inoutDrug/IoCheckSuccessOrder.vue
index 1a6ab6dd..8a050de6 100644
--- a/src/views/inoutDrug/IoCheckSuccessOrder.vue
+++ b/src/views/inoutDrug/IoCheckSuccessOrder.vue
@@ -943,6 +943,7 @@ export default {
         fromCorp: null,
         keyWords: null,
         invCode: this.$store.getters.locInvCode,
+        productType: 2
       },
       fromOptions: [],
       reviewType: 2,
@@ -1089,6 +1090,7 @@ export default {
         startTime: null,
         endTime: null,
         invCode: this.$store.getters.locInvCode,
+        productType: 2
       };
       this.actDateRange = [];
       this.getList();
diff --git a/src/views/inoutDrug/IoCreateBusOrder.vue b/src/views/inoutDrug/IoCreateBusOrder.vue
index c9c09841..7cbf7a97 100644
--- a/src/views/inoutDrug/IoCreateBusOrder.vue
+++ b/src/views/inoutDrug/IoCreateBusOrder.vue
@@ -398,13 +398,13 @@ import {
   submitOrderWeb,
   getOrderList, submitBiz
 } from "../../api/inout/order";
-import addOrder from "@/views/inout/DialogCreateOrder";
+import addOrder from "@/views/inoutDrug/DialogCreateDrugOrder";
 import {getInvListByUser, getInvListByUserOptimize} from "@/api/system/invWarehouse";
 import {getLocalJoinByUser,getLocalJoinByUserOptimize} from "@/api/basic/busType";
 import {selectSysParamByKey} from "@/api/param/systemParamConfig";
 
-import selectThrOrder from "@/views/inout/DialogSelectThrOrder";
-import selectReceiveOrderDialog from "@/views/inout/DialogSelectReceiveOrder";
+import selectThrOrder from "@/views/inoutDrug/DialogSelectThrDrugOrder";
+import selectReceiveOrderDialog from "@/views/inoutDrug/DialogSelectReceiveOrder";
 import {getCorrespondence} from "@/api/basic/basicUnitMaintain";
 import {
   getHead,executeFuc
@@ -436,6 +436,7 @@ export default {
         fromCorp: null,
         keyWords: null,
         invCode: this.$store.getters.locInvCode,
+        productType: 2
       },
       checkStatus: {
         1: "草稿",
@@ -551,6 +552,7 @@ export default {
         startTime: null,
         endTime: null,
         invCode: this.$store.getters.locInvCode,
+        productType: 2
       };
       this.actDateRange = [];
       this.getList();
diff --git a/src/views/inoutDrug/IoCreateErrorDrugOrder.vue b/src/views/inoutDrug/IoCreateErrorDrugOrder.vue
new file mode 100644
index 00000000..4c8e38cf
--- /dev/null
+++ b/src/views/inoutDrug/IoCreateErrorDrugOrder.vue
@@ -0,0 +1,692 @@
+<template>
+  <div>
+    <el-card class="el-card">
+      <el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form" size="mini" label-width="100px">
+<!--        <el-row>-->
+<!--          <el-col :span="8">-->
+<!--            <el-form-item class="query-form-item" label="单号:">-->
+<!--              <el-input v-model="filterQuery.billNo" placeholder="单号"-->
+<!--                        style="width: 90%"-->
+<!--                        clearable="true"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="8">-->
+<!--            <el-form-item class="query-form-item" label="出入库类型:">-->
+<!--              <el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%">-->
+<!--                <el-option label="全部" value=""></el-option>-->
+<!--                <el-option label="入库" value="WareHouseIn"></el-option>-->
+<!--                <el-option label="出库" value="WareHouseOut"></el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="8">-->
+<!--            <el-form-item class="query-form-item" label="单据类型:">-->
+<!--              <el-select v-model="filterQuery.action" placeholder="请选择单据类型"-->
+<!--                         style="width: 90%"-->
+<!--                         clearable>-->
+<!--                <el-option-->
+<!--                  v-for="item in busTypes"-->
+<!--                  :key="item.name"-->
+<!--                  :label="item.name"-->
+<!--                  :value="item.action">-->
+<!--                  <span style="float: left">{{ item.name }}</span>-->
+<!--                </el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+
+<!--        </el-row>-->
+<!--        <el-row>-->
+<!--          <el-col :span="8">-->
+<!--            <el-form-item class="query-form-item" label="所属仓库:">-->
+<!--              <el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"-->
+<!--                         style="width: 90%"-->
+<!--                         @change="invChange"-->
+<!--              >-->
+<!--                <el-option-->
+<!--                  v-for="item in invList"-->
+<!--                  :key="item.name"-->
+<!--                  :label="item.name"-->
+<!--                  :value="item.code">-->
+<!--                  <span style="float: left">{{ item.name }}</span>-->
+<!--                </el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="8">-->
+<!--            <el-form-item class="query-form-item" label="创建时间:">-->
+<!--              <el-date-picker-->
+<!--                :picker-options="pickerOptions"-->
+<!--                v-model="actDateRange"-->
+<!--                type="daterange"-->
+<!--                format="yyyy 年 MM 月 dd 日"-->
+<!--                value-format="yyyy-MM-dd"-->
+<!--                range-separator="至"-->
+<!--                start-placeholder="开始日期"-->
+<!--                end-placeholder="结束日期"-->
+<!--                style="width: 90%"-->
+<!--              >-->
+<!--              </el-date-picker>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+
+<!--          &lt;!&ndash;          <el-col :span="8">&ndash;&gt;-->
+<!--          &lt;!&ndash;            <el-form-item class="query-form-item" label="审核时间:">&ndash;&gt;-->
+<!--          &lt;!&ndash;              <el-date-picker&ndash;&gt;-->
+<!--          &lt;!&ndash;                :picker-options="pickerOptions"&ndash;&gt;-->
+<!--          &lt;!&ndash;                v-model="auditDateRange"&ndash;&gt;-->
+<!--          &lt;!&ndash;                type="daterange"&ndash;&gt;-->
+<!--          &lt;!&ndash;                format="yyyy 年 MM 月 dd 日"&ndash;&gt;-->
+<!--          &lt;!&ndash;                value-format="yyyy-MM-dd"&ndash;&gt;-->
+<!--          &lt;!&ndash;                range-separator="至"&ndash;&gt;-->
+<!--          &lt;!&ndash;                start-placeholder="开始日期"&ndash;&gt;-->
+<!--          &lt;!&ndash;                end-placeholder="结束日期"&ndash;&gt;-->
+<!--          &lt;!&ndash;                style="width: 90%"&ndash;&gt;-->
+<!--          &lt;!&ndash;              >&ndash;&gt;-->
+<!--          &lt;!&ndash;              </el-date-picker>&ndash;&gt;-->
+<!--          &lt;!&ndash;            </el-form-item>&ndash;&gt;-->
+<!--          &lt;!&ndash;          </el-col>&ndash;&gt;-->
+<!--        </el-row>-->
+        <el-row style=" display:flex;  flex-wrap: wrap; ">
+          <template v-for="(item, index) in queryList" >
+            <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
+              <el-input
+                v-model="filterQuery[item.columnName]"
+                :placeholder="item.columnDesc"
+                :disabled="executeEval(null,item.disabledFuc,false)"
+                @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
+                clearable
+              ></el-input>
+            </el-form-item>
+            <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <el-select v-model="filterQuery[item.columnName]"
+                         :placeholder="item.columnDesc"
+                         :disabled="executeEval(null,item.disabledFuc,false)"
+                         clearable>
+                <el-option
+                  v-for="dict in item.lableRuleObj"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <el-select
+                v-model="filterQuery[item.columnName]"
+                :placeholder="item.columnDesc"
+                @change="executeFuc($event,'5',item.checkRules)"
+                :disabled="executeEval(null,item.disabledFuc,false)"
+                filterable
+                remote
+                :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
+                clearable>
+                <el-option
+                  v-for="item in options[item.clickFuc]"
+                  :key="item.code"
+                  :label="item.label"
+                  :value="item.code"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <el-date-picker
+                :picker-options="pickerOptions"
+                v-model="actDateRange"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              ></el-date-picker>
+            </el-form-item>
+            <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <el-date-picker
+                v-model="filterQuery[item.columnName]"
+                :style="`width:${item.width+'px'}`"
+                value-format="yyyy-MM-dd"
+                :disabled="executeEval(null,item.disabledFuc,false)"
+                type="date"
+                :placeholder="item.columnDesc"
+              ></el-date-picker>
+            </el-form-item>
+          </template>
+        </el-row>
+      </el-form>
+      <div class="top-right-btn">
+        <el-button-group>
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh"
+            @click="onReset"
+          >重置
+          </el-button>
+          <el-button type="primary" icon="el-icon-search" @click="onSubmit"
+          >查询
+          </el-button
+          >
+        </el-button-group>
+      </div>
+      <el-divider style="margin: 15px"></el-divider>
+      <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
+                border :default-sort="defaultSort"
+                @sort-change="handleSortChange"
+      >
+<!--        <el-table-column label="序号" type="index"></el-table-column>-->
+<!--        <el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="140"></el-table-column>-->
+<!--        <el-table-column label="单据类型" prop="billTypeName" width="160"></el-table-column>-->
+<!--        <el-table-column label="创建时间" prop="createTime" width="140" show-overflow-tooltip-->
+<!--                         sortable="custom"-->
+<!--                         :sort-orders="['ascending', 'descending']">-->
+<!--        </el-table-column>-->
+<!--        <el-table-column label="往来单位" prop="fromName" width="220">-->
+<!--        </el-table-column>-->
+<!--        <el-table-column label="所属部门" prop="deptName" width="120">-->
+<!--        </el-table-column>-->
+<!--        <el-table-column label=所属仓库 prop="invName" width="120">-->
+<!--        </el-table-column>-->
+<!--        <el-table-column label="来源单据号" prop="corpOrderId" show-overflow-tooltip width="140"></el-table-column>-->
+<!--        <el-table-column label="来源" prop="fromType" width="140">-->
+<!--          <template slot-scope="scope">-->
+<!--            <span>{{ fromTypeMap[scope.row.fromType] }}</span>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--        <el-table-column label="校验状态" prop="status" width="100">-->
+<!--          <template slot-scope="scope">-->
+<!--            <el-tag :type="statusFilterType(scope.row.status)">{{-->
+<!--                checkStatus[scope.row.status]-->
+<!--              }}-->
+<!--            </el-tag>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>-->
+<!--        </el-table-column>-->
+<!--        <el-table-column label="操作" width="150" fixed="right">-->
+<!--          <template slot-scope="scope">-->
+<!--            <el-button-->
+<!--              type="text"-->
+<!--              size="small"-->
+<!--              @click.native.stop="editOrder(scope.row)"-->
+<!--            >编辑-->
+<!--            </el-button-->
+<!--            >-->
+<!--            <el-button-->
+<!--              type="text"-->
+<!--              size="small"-->
+<!--              @click.native.stop="deleteDialog(scope.row.billNo)"-->
+<!--            >删除-->
+<!--            </el-button-->
+<!--            >-->
+<!--&lt;!&ndash;            <el-button&ndash;&gt;-->
+<!--&lt;!&ndash;              type="text"&ndash;&gt;-->
+<!--&lt;!&ndash;              size="small"&ndash;&gt;-->
+<!--&lt;!&ndash;              v-if="scope.row.status == 1"&ndash;&gt;-->
+<!--&lt;!&ndash;              @click.native.stop="onUpload(scope.row.billNo)"&ndash;&gt;-->
+<!--&lt;!&ndash;            >校验提交&ndash;&gt;-->
+<!--&lt;!&ndash;            </el-button&ndash;&gt;-->
+<!--&lt;!&ndash;            >&ndash;&gt;-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+        <template v-for="(item, index) in tableHeader">
+          <el-table-column
+            v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
+            type="index" :label="item.columnDesc"></el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'selection'"
+            type="selection"
+            :width="item.width"
+            :selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
+          ></el-table-column>
+
+          <el-table-column
+            v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template  slot-scope="scope">
+              <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template   slot-scope="scope">
+              <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template   slot-scope="scope">
+              <el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
+                <span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span>
+              </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :width="item.width"
+            :key="item.columnName"
+            fixed="right"
+          >
+            <template slot-scope="scope">
+              <el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
+                         :type="buttonItem.type"
+                         :size="buttonItem.size"
+                         :style="buttonItem.style"
+                         :key="buttonItem"
+                         v-if="executeEval(scope.row,buttonItem.hasPermi,true)"
+                         :disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"
+                         @click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"
+              >{{ buttonItem.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template slot-scope="scope">
+              <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
+            </template>
+          </el-table-column>
+        </template>
+      </el-table>
+      <el-dialog
+        :title="titleMap[title]"
+        :visible.sync="addOrderVisible"
+        width="85%"
+        append-to-body
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        v-if="addOrderVisible"
+        @close='closeDialog'
+      >
+        <addOrder
+          :closeDialog="closeDialog"
+          :orderQuery="idQuery"
+          :viewType="viewType"
+          :errView="1"
+        ></addOrder>
+      </el-dialog>
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="filterQuery.page"
+        :limit.sync="filterQuery.limit"
+        @pagination="getList"
+      />
+    </el-card>
+  </div>
+</template>
+
+<script>
+import {
+  deleteByOrderId,
+  getOrderList, submitCodes
+} from "@/api/inout/order";
+import addOrder from "./DialogCreateDrugOrder";
+import {getInvListByUser, getInvListByUserOptimize} from "@/api/system/invWarehouse";
+import {getLocalJoinByUser,getLocalJoinByUserOptimize} from "@/api/basic/busType";
+import {selectSysParamByKey} from "@/api/param/systemParamConfig";
+import {
+  getHead,executeFuc
+} from "@/utils/customConfig";
+
+
+export default {
+  name: "IoCreateErrorDrugOrder",
+  data() {
+    return {
+      defaultSort: {prop: 'createTime', order: 'desc'},
+      showSearch: true,
+      titleMap: {
+        add: "新增单据",
+        edit: "编辑单据",
+      },
+      title: "add",
+
+      filterQuery: {
+        id: "",
+        billNo: null,
+        mainAction: null,
+        action: null,
+        statusType: "processedError",
+        page: 1,
+        limit: 10,
+        startTime: null,
+        endTime: null,
+        invCode: this.$store.getters.locInvCode,
+      },
+      checkStatus: {
+        1: "草稿",
+        2: "等待处理",
+        3: "等待校验",
+        4: "处理异常",
+        5: "校验成功",
+        6: "校验异常",
+        7: "已审核",
+        8: "审核拒绝",
+        9: "正在处理", 10: "待审核", 11: "待配货",
+      },
+      curIndex: "",
+      idQuery: {},
+      storageList: [],
+      invList: [],
+      list: [],
+      addOrderVisible: false,
+      total: 0,
+      tableHeader:[],
+      queryList:[],
+      fromList:[],
+      options: {
+        getInvList:[],
+        getDeptList:[],
+      },
+      loading: false,
+      index: null,
+      formName: null,
+      errorDetail: "",
+      formMap: {
+        add: "新增",
+        edit: "编辑",
+      },
+      enableDept: false,
+      fromTypeMap: {
+        "1": "UDIMS平台",
+        "2": "网页新增",
+        "3": "pda即时校验",
+        "4": "pda未校验",
+        "5": "pc端扫码精灵",
+        "6": "流转自动补单",
+        "7": "UDI供应商平台",
+        "8": "平衡补录单据",
+        "10": "手动补单",
+        "11": "仓库盘点",
+        "12": "采购计划",
+        "13": "领用单据",
+        "14": "第三方系统单据",
+      },
+      deleteData: {
+        billNo: "",
+        status: 10,
+      },
+      dialogTableVisible: false,
+      formLoading: false,
+      deleteLoading: false,
+      busTypes: [],
+      actDateRange: [],
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
+      },
+      viewType: 2,
+    };
+  },
+
+  components: {
+    addOrder,
+  },
+  methods: {
+    onReset() {
+      this.filterQuery = {
+        id: "",
+        billNo: null,
+        mainAction: null,
+        action: null,
+        statusType: "processedError",
+        page: 1,
+        limit: 10,
+        startTime: null,
+        endTime: null,
+        invCode: this.$store.getters.locInvCode,
+      };
+      this.actDateRange = [];
+      this.getList();
+    },
+    onSubmit() {
+      if (this.actDateRange !== null) {
+        this.filterQuery.startTime = this.actDateRange[0];
+        this.filterQuery.endTime = this.actDateRange[1];
+      } else {
+        this.filterQuery.startTime = null;
+        this.filterQuery.endTime = null;
+      }
+      this.filterQuery.page = 1;
+      this.getList();
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    getBusType(_this) {
+      let query = {
+        code: this.filterQuery.invCode,
+        enabled: true,
+      };
+      getLocalJoinByUserOptimize(query)
+        .then((response) => {
+          _this.options.getBusType = response.data || [];
+          _this.getList();
+        })
+        .catch(() => {
+        });
+    },
+    addOrders() {
+      this.idQuery = {};
+      this.title = "add";
+      this.addOrderVisible = true;
+    },
+
+    editOrder(_this,row) {
+      _this.idQuery = row;
+      _this.title = "edit";
+      _this.addOrderVisible = true;
+    },
+
+    closeDialog() {
+      this.addOrderVisible = false;
+      this.addHosOrderVisible = false;
+      this.getList();
+    },
+
+
+    handleSortChange(column, prop, order) {
+      if (column.order === 'descending') {
+        this.filterQuery.sort = 'desc'
+      } else {
+        this.filterQuery.sort = 'asc'
+      }
+      this.filterQuery.orderBy = column.prop;
+      this.getList();
+    },
+
+    //获取订单列表
+    getList() {
+      this.loading = true;
+      getOrderList(this.filterQuery)
+        .then((response) => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch((error) => {
+          this.$message.error(error.message)
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+    deleteOrders(data) {
+      this.loading = true;
+      this.deleteData.billNo = data;
+      deleteByOrderId(this.deleteData)
+        .then((response) => {
+
+          if (response.code == 20000) {
+            this.getList();
+            this.$message({
+              type: "success",
+              message: "删除成功！",
+            });
+          } else if (response.code == 520) {
+            this.$message.error("新增扫码单据列表已不存在该扫码单据！");
+            this.getList();
+          } else {
+            this.$message.error(response.message);
+            this.getList();
+          }
+
+        })
+        .catch(() => {
+        });
+    },
+    deleteDialog(_this,rowId) {
+      _this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          _this.deleteOrders(rowId.billNo);
+        })
+        .catch(() => {
+        });
+    },
+    onUpload(data) {
+      this.loading = true;
+      var idQuery = {
+        billNo: "",
+      };
+      idQuery.billNo = data;
+      submitCodes(idQuery)
+        .then((response) => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.$message.success("提交成功");
+          } else {
+            this.$message.error(response.message);
+          }
+          this.loading = false;
+        });
+    },
+    getInvList(_this) {
+      getInvListByUserOptimize()
+        .then((response) => {
+          _this.options.getInvList = response.data || [];
+          _this.getList();
+        })
+        .catch(() => {
+        });
+    },
+    invChange(_this) {
+      _this.filterQuery.action = null;
+      _this.getBusType(_this);
+    },
+
+    statusFilterType(status) {
+      const statusMap = {
+        2: "warning",
+        1: "warning",
+        4: "danger",
+        3: "success",
+      };
+      return statusMap[status];
+    },
+    executeFuc(row,type,clickFuc,value){
+      return executeFuc(this,row,type,clickFuc,value);
+    },
+    executeEval(row,expression,defaultRet){
+      if(expression){
+        return eval(expression);
+      }
+      return defaultRet;
+    }
+  },
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+    this.getInvList(this);
+    this.getBusType(this);
+    getHead("IoCreateErrorOrder","1").then((re) => {
+      // 处理返回的数据
+      this.tableObj = re.data;
+      this.tableHeader = re.data.tableList;
+      this.queryList = re.data.queryList;
+      this.fromList = re.data.fromList;
+      this.getList();
+    });
+    selectSysParamByKey({paramKey: "muti_inv_mode"}).then((res) => {
+      if (res.code === 20000) {
+        if (res.data.paramValue === "0") {
+          this.enableDept = true;
+        }
+      }
+    })
+
+  },
+};
+</script>
+
+<style type="text/scss" lang="scss">
+</style>
+
diff --git a/src/views/inoutDrug/IoCreateOrder.vue b/src/views/inoutDrug/IoCreateOrder.vue
index 24d13f5d..96476e34 100644
--- a/src/views/inoutDrug/IoCreateOrder.vue
+++ b/src/views/inoutDrug/IoCreateOrder.vue
@@ -267,6 +267,7 @@ export default {
         fromCorp: null,
         // deptCode: this.$store.getters.locDeptCode,
         invCode: this.$store.getters.locInvCode,
+        productType: 2
 
       },
       viewType: 3,
diff --git a/src/views/inoutDrug/IoCreateScanOrder.vue b/src/views/inoutDrug/IoCreateScanOrder.vue
index edbdc0d4..9d29d58d 100644
--- a/src/views/inoutDrug/IoCreateScanOrder.vue
+++ b/src/views/inoutDrug/IoCreateScanOrder.vue
@@ -414,7 +414,7 @@ import {
   getOrderList, submitCodes
 } from "../../api/inout/order";
 import addOrder from "@/views/inoutDrug/DialogCreateDrugOrder";
-import errOrder from "@/views/inout/IoCreateErrorOrder";
+import errOrder from "@/views/inoutDrug/IoCreateErrorDrugOrder";
 import {getInvListByUser, getInvListByUserOptimize} from "@/api/system/invWarehouse";
 import {getLocalJoinByUser, getLocalJoinByUserOptimize} from "@/api/basic/busType";
 import {selectSysParamByKey} from "@/api/param/systemParamConfig";
@@ -447,6 +447,7 @@ export default {
         endTime: null,
         keyWords: null,
         invCode: this.$store.getters.locInvCode,
+        productType: 2
       },
       fromOptions: [],
       checkStatus: {
@@ -560,6 +561,7 @@ export default {
         startTime: null,
         endTime: null,
         invCode: this.$store.getters.locInvCode,
+        productType: 2
       };
       this.actDateRange = [];
       this.getList();
diff --git a/src/views/inoutDrug/IoDealCheckOrder.vue b/src/views/inoutDrug/IoDealCheckOrder.vue
index cf7fab83..aab01647 100644
--- a/src/views/inoutDrug/IoDealCheckOrder.vue
+++ b/src/views/inoutDrug/IoDealCheckOrder.vue
@@ -351,6 +351,7 @@ export default {
         keyWords: null,
         invCode: this.$store.getters.locInvCode,
         vueType: "waitCheck",
+        productType: 2
       },
       viewType: 7,
       checkStatus: {
@@ -472,6 +473,7 @@ export default {
         endTime: null,
         vueType: "waitCheck",
         invCode: this.$store.getters.locInvCode,
+        productType: 2
       };
       this.actDateRange = [];
       this.getList();
diff --git a/src/views/inoutDrug/IoDealOrder.vue b/src/views/inoutDrug/IoDealOrder.vue
index 6672719c..5789b62b 100644
--- a/src/views/inoutDrug/IoDealOrder.vue
+++ b/src/views/inoutDrug/IoDealOrder.vue
@@ -547,6 +547,7 @@ export default {
         keyWords: null,
         invCode: this.$store.getters.locInvCode,
         vueType: "waitDeal",
+        productType: 2
       },
       viewType: 3,
       checkStatus: {
@@ -677,6 +678,7 @@ export default {
         endTime: null,
         vueType: "waitDeal",
         invCode: this.$store.getters.locInvCode,
+        productType: 2
       };
       this.actDateRange = [];
       this.getList();
diff --git a/src/views/inoutDrug/IoEditOrder.vue b/src/views/inoutDrug/IoEditOrder.vue
index db3b03be..0ab11955 100644
--- a/src/views/inoutDrug/IoEditOrder.vue
+++ b/src/views/inoutDrug/IoEditOrder.vue
@@ -1010,7 +1010,8 @@ export default {
   data() {
     return {
       filterQuery: {
-        billNo: null
+        billNo: null,
+        productType: 2
       },
       checkStatus: {
         1: "草稿",
@@ -1121,7 +1122,8 @@ export default {
         path: "",
       });
       this.filterQuery = {
-        billNo: null
+        billNo: null,
+        productType: 2
       };
       this.currentRow.billNo = null;
       this.list = [];
diff --git a/src/views/inoutDrug/PanelCreateOrderBizDrug.vue b/src/views/inoutDrug/PanelCreateOrderBizDrug.vue
index 4a4f5f83..719a8b21 100644
--- a/src/views/inoutDrug/PanelCreateOrderBizDrug.vue
+++ b/src/views/inoutDrug/PanelCreateOrderBizDrug.vue
@@ -8,7 +8,7 @@
             ref="mainTable"
             @click.native.stop="selectProductFunction()"
             :loading="loading"
-          >物资录入
+          >药品录入
           </el-button>
         </el-button-group>
       </div>
@@ -130,7 +130,7 @@
     </el-dialog>
 
     <el-dialog
-      title="业务详情-物资录入"
+      title="业务详情-药品录入"
       :visible.sync="selectProductVisible"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
@@ -203,12 +203,12 @@
 </template>
 
 <script>
-import stockOrderNewSelectProduct from "../inout/DialogSelectProduct";
-import dialogInvProduct from "../inout/DialogSelectInvProduct";
+import stockOrderNewSelectProduct from "./DialogSelectProduct.vue";
+import dialogInvProduct from "./DialogSelectInvProduct";
 import {addBizProduct, getDetailBizs, updateBizProduct, delBizProduct} from "@/api/inout/orderDetailCode";
 import {updateBizBind} from "@/api/inout/order";
-import selectRlDialog from "@/views/inout/DialogSelectRl";
-import DialogSelectUnit from "@/views/inout/DialogSelectUnit";
+import selectRlDialog from "./DialogSelectRl";
+import DialogSelectUnit from "./DialogSelectUnit";
 import selectWarlockBag from "@/views/basic/destiny/warlockBagModel";
 
 export default {
diff --git a/src/views/inoutDrug/PanelCreateOrderCodes.vue b/src/views/inoutDrug/PanelCreateOrderCodes.vue
index e0868b7b..4071cd69 100644
--- a/src/views/inoutDrug/PanelCreateOrderCodes.vue
+++ b/src/views/inoutDrug/PanelCreateOrderCodes.vue
@@ -16,7 +16,7 @@
         show-overflow-tooltip
       ></el-table-column>
       <el-table-column
-        label="物资名称"
+        label="药品名称"
         prop="productName"
         width="160"
         show-overflow-tooltip