From 508eba2a61ae2138087db8a81bcccafb0af47cd4 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Sun, 28 Jul 2024 19:37:11 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B5=8B=E7=A0=81=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/inout/splitCode.js                    |  12 +
 src/assets/styles/ruoyi.scss                  |  13 +-
 src/views/inout/DialogCreateOrder.vue         | 163 ++--
 src/views/inout/IoSplitScanCode.vue           | 743 ++++++++++++++++++
 src/views/inout/split/PrescribeTagCode.vue    |  36 +
 src/views/inout/split/codePanel.vue           |  17 +
 src/views/inout/split/prescribePanel.vue      | 682 ++++++++++++++++
 .../system/customConfig/configDetail.vue      |   2 +-
 .../system/customConfig/configFromDetail.vue  |   2 +-
 .../system/customConfig/configQueryDetail.vue |  32 +-
 src/views/system/customConfig/index.vue       | 392 ++++-----
 11 files changed, 1786 insertions(+), 308 deletions(-)
 create mode 100644 src/api/inout/splitCode.js
 create mode 100644 src/views/inout/IoSplitScanCode.vue
 create mode 100644 src/views/inout/split/PrescribeTagCode.vue
 create mode 100644 src/views/inout/split/codePanel.vue
 create mode 100644 src/views/inout/split/prescribePanel.vue

diff --git a/src/api/inout/splitCode.js b/src/api/inout/splitCode.js
new file mode 100644
index 00000000..b373787b
--- /dev/null
+++ b/src/api/inout/splitCode.js
@@ -0,0 +1,12 @@
+
+import axios from "@/utils/request"
+
+
+export function materialPrescribePage(query) {
+  return axios({
+    url: "/udiwms/ioSplit/material/prescribe/filter",
+    method: "get",
+    params: query
+  });
+}
+
diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss
index 42c78b96..7c2d0d60 100644
--- a/src/assets/styles/ruoyi.scss
+++ b/src/assets/styles/ruoyi.scss
@@ -90,7 +90,8 @@
   .el-dialog {
     .el-dialog__header {
     }
-    .el-dialog__body{
+
+    .el-dialog__body {
       //padding: 0;
     }
 
@@ -356,12 +357,12 @@
   /*transition: all .5s;*/
 }
 
-.dialog-footer{
+.dialog-footer {
   text-align: right;
 }
 
 .el-table--mini .el-table__cell {
-  padding:0px!important;
+  padding: 0px !important;
 }
 
 .order-el-row {
@@ -382,10 +383,4 @@
 //  margin-top: -10px;
 //}
 
-.query-form-item {
-  margin-right: 5px;
-  margin-bottom: 51px;
-}
-
-
 
diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index ae8988f6..476a6289 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -36,23 +36,6 @@
             <el-button size="mini" type="primary" @click.native="revokeBill()" :loading="retractLoading"
                        v-if="viewType == 7">撤回单据
             </el-button>
-
-            <!--                     v-if="(viewType != 5 && viewType != 6)&&(curAction.checkWebNew != 2  || viewType !=1)"-->
-            <!--          <el-button size="mini" type="primary" @click.native="submit(1)"-->
-            <!--                     v-if="curAction.checkWebNew > 1  && viewType == 1"-->
-            <!--          >待配货提交-->
-            <!--          </el-button>-->
-
-            <!--          <el-button size="mini" type="primary" @click.native="submit(1)"-->
-            <!--                     v-if="viewType == 5"-->
-            <!--          >完成验收-->
-            <!--          </el-button>-->
-
-            <!--          <el-button size="mini" type="primary" @click.native="submit(1)"-->
-            <!--                     v-if=" viewType == 6"-->
-            <!--          >完成验收-->
-            <!--          </el-button>-->
-
           </el-button-group>
         </el-row>
         <el-row>
@@ -81,8 +64,6 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="11">
             <el-form-item prop="invCode" label="当前仓库:">
               <el-select
@@ -108,7 +89,31 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="11">
+          <el-col :span="11" v-if="splitBusType!=null">
+            <el-form-item prop="invCode" label="当前工位:">
+              <el-select
+                v-model="orderFormData.workPlaceCode"
+                placeholder="当前工位"
+                style="width: 90%"
+                :disabled="corpOrderIdDisabled"
+                filterable
+              >
+                <el-option
+                  v-for="item in curWorkPlaces"
+                  :key="item.workplaceId"
+                  :label="item.workplaceName"
+                  :value="item.workplaceId"
+                >
+                  <span style="float: left">{{ item.workplaceName }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{
+                      item.workplaceId
+                    }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="11" v-if="!splitBusType">
             <el-form-item prop="action" label="单据类型:">
               <el-select
                 v-model="orderFormData.action"
@@ -129,9 +134,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="11">
+          <el-col :span="11" v-if="!splitBusType">
             <el-form-item
               prop="fromCorp"
               label="往来信息:"
@@ -233,25 +236,9 @@
               </el-select>
 
             </el-form-item>
-
-
-            <!--            <el-form-item-->
-            <!--              prop="fromCorp"-->
-            <!--              label="往来信息:"-->
-            <!--              v-if="curAction.corpType == 1 && curAction.genUnit && orderQuery.billNo != ''"-->
-            <!--            >-->
-            <!--              <el-input-->
-            <!--                v-model="orderFormData.fromCorpName"-->
-            <!--                auto-complete="off"-->
-            <!--                clearable-->
-            <!--                style="width: 90%"-->
-            <!--                :disabled="corpOrderIdDisabled"-->
-            <!--                placeholder="请输入病人住院号"-->
-            <!--              ></el-input>-->
-            <!--            </el-form-item>-->
           </el-col>
           <el-col :span="11">
-            <el-form-item prop="remark" label="备注:">
+            <el-form-item prop="remark" label="单据备注:">
               <el-input
                 v-model="orderFormData.remark"
                 auto-complete="off"
@@ -262,7 +249,9 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="documentShow">
+
+
+        <el-row v-if="curSpaceShow">
           <el-col :span="11">
             <el-form-item prop="acceptance" label="预验收单据:">
               <el-select
@@ -284,8 +273,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row v-if="curSpaceShow">
           <el-col :span="11">
             <el-form-item prop="curSpaceCode" label="当前货位:">
               <el-select
@@ -311,30 +298,6 @@
           </el-col>
         </el-row>
         <el-row v-if="preInSpaceShow">
-          <!--          <el-col :span="11">-->
-          <!--            <el-form-item prop="checkPreInInvCode" label="预验收出库仓库:">-->
-          <!--              <el-select-->
-          <!--                v-model="orderFormData.checkPreInInvCode"-->
-          <!--                placeholder="预验收仓库"-->
-          <!--                style="width: 90%"-->
-          <!--                :disabled="corpOrderIdDisabled"-->
-          <!--                @change="changePreInInv"-->
-          <!--                filterable-->
-          <!--              >-->
-          <!--                <el-option-->
-          <!--                  v-for="item in curPreInInvOptions"-->
-          <!--                  :key="item.name"-->
-          <!--                  :label="item.name"-->
-          <!--                  :value="item.code"-->
-          <!--                >-->
-          <!--                  <span style="float: left">{{ item.name }}</span>-->
-          <!--                  <span style="float: right; color: #8492a6; font-size: 13px">{{-->
-          <!--                      item.code-->
-          <!--                    }}</span>-->
-          <!--                </el-option>-->
-          <!--              </el-select>-->
-          <!--            </el-form-item>-->
-          <!--          </el-col>-->
           <el-col :span="11">
             <el-form-item prop="checkPreInSpaceCode" label="预验收出库货位:">
               <el-select
@@ -409,11 +372,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-
-
         </el-row>
-
-
         <el-row v-if="errView == 1">
           <el-col :span="20">
             <el-form-item prop="errMsg" label="异常信息:">
@@ -660,6 +619,7 @@ import {getDetailBizs} from "@/api/inout/orderDetailCode";
 import {filterNoPage, page, remoteFilter} from "@/api/basic/sicker/skPersonApi";
 import {selectSysParamByKey} from "@/api/param/systemParamConfig";
 import dialogInvProduct from "@/views/inout/DialogSelectInvProduct";
+import {listPage} from "@/api/basic/sysWorkplaceManage";
 
 export default {
   name: "ioCreateOrder",
@@ -693,6 +653,12 @@ export default {
       type: Object,
       required: true,
     },
+    splitBusType: {//科室拆零单据类型
+      type: Object,
+      default: null,
+      required: true,
+    },
+
   },
   data() {
     return {
@@ -716,6 +682,7 @@ export default {
         preSpaceCode: null,
         preCurSpaceCode: null,  //单据
         sickerAdNum: null,
+        workPlaceCode: null,
       },
 
       detailList: [],
@@ -744,6 +711,8 @@ export default {
       curPreSpaceOptions: [],    //寄售货位
       curSpaceOptions: [], //当前货位
 
+      curWorkPlaces: [],
+
       curAction: {
         corpType: 0,
         genUnit: false,
@@ -858,6 +827,7 @@ export default {
             //this.orderFormData.invCode = this.curInvOptions[0].code;
             this.getBusTypeByInv();
             this.findCurSpaceList(this.orderFormData.invCode);
+            this.findCurWorkPlaces();
           }
         })
         .catch(() => {
@@ -908,7 +878,9 @@ export default {
       findByInvUser(query)
         .then((response) => {
           this.busTypeOptions = response.data || [];
-          if (this.busTypeOptions.length == 1) {
+          if (this.splitBusType != null)
+            this.orderFormData.action = this.splitBusType;
+          else if (this.busTypeOptions.length == 1) {
             this.orderFormData.action = this.busTypeOptions[0].action;
             this.actionChange(this.orderFormData.action)
           }
@@ -1204,6 +1176,21 @@ export default {
       })
     },
 
+    //获取当前货位
+    findCurWorkPlaces(val) {
+      let query = {
+        key: val,
+        status: 1,
+        invCode: this.orderFormData.invCode,
+        page: 1,
+        limit: 100,
+      }
+      listPage(query).then((res) => {
+        this.curWorkPlaces = res.data.list || [];
+      })
+    },
+
+
     addInvProduct() {
       this.invQueryData.invCode = this.orderFormData.invCode;
       this.selectInvProductVisible = true;
@@ -1238,6 +1225,9 @@ export default {
         this.$message.warning("请选择单据类型！");
         return;
       }
+      if (this.splitBusType != null) {
+        this.orderFormData.fromCorp = "72198012799726";
+      }
       if (this.curAction.corpType === 0 || this.curAction.corpType === 2 || (this.curAction.corpType === 1 && !this.curAction.genUnit)) {
         if (this.$isBlank(this.orderFormData.fromCorp) && this.$isBlank(this.orderFormData.sickerAdNum)) {
           this.$message.warning("请选择往来单位！");
@@ -1246,13 +1236,13 @@ export default {
       }
       if (this.curAction.corpType == 3) {
         if (this.$isBlank(this.orderFormData.fromInvCode)) {
-          this.$message.warning("请选择往来单位！");
+          this.$message.warning("请选择往来仓库！");
           return;
         }
       }
       if (this.curAction.corpType === 1 && this.curAction.genUnit) {
         if (this.$isBlank(this.orderFormData.fromCorp) && this.$isBlank(this.orderFormData.sickerAdNum)) {
-          this.$message.warning("请选择往来单位！");
+          this.$message.warning("请输入患者信息！");
           return;
         }
       }
@@ -1556,24 +1546,24 @@ export default {
       );
       tQuery.orderId = this.orderFormData.billNo;
       console.log(tQuery.orderId);
-      if (val == 1){
+      if (val == 1) {
         //校验btn
         this.checkLoading = true
-      }else if (val == 2){
+      } else if (val == 2) {
         //扫码btn
         this.codeLoading = true
-      }else {
+      } else {
         this.submitLoading = true
       }
       if (this.viewType == 2) {   //扫码单据立即提交
         submitCodes(tQuery).then((response) => {
-          if (val == 1){
+          if (val == 1) {
             //校验btn
             this.checkLoading = false
-          }else if (val == 2){
+          } else if (val == 2) {
             //扫码btn
             this.codeLoading = false
-          }else {
+          } else {
             this.submitLoading = false
           }
 
@@ -1590,13 +1580,13 @@ export default {
         else
           tQuery.fromVailPi = 1;
         submitBiz(tQuery).then((response) => {
-          if (val == 1){
+          if (val == 1) {
             //校验btn
             this.checkLoading = false
-          }else if (val == 2){
+          } else if (val == 2) {
             //扫码btn
             this.codeLoading = false
-          }else {
+          } else {
             this.submitLoading = false
           }
           if (response.code === 20000) {
@@ -1608,13 +1598,13 @@ export default {
         });
       } else if (this.viewType == 4) {
         submitAllocateBiz(tQuery).then((response) => {
-          if (val == 1){
+          if (val == 1) {
             //校验btn
             this.checkLoading = false
-          }else if (val == 2){
+          } else if (val == 2) {
             //扫码btn
             this.codeLoading = false
-          }else {
+          } else {
             this.submitLoading = false
           }
 
@@ -1912,7 +1902,6 @@ export default {
         this.findSickMethod(this.orderFormData.sickerAdNum)
         this.orderFormData.fromCorp = this.sickerAdNum
       }
-
     }
     if (this.viewTypeKsck) {
       this.curAction.corpType = 1
diff --git a/src/views/inout/IoSplitScanCode.vue b/src/views/inout/IoSplitScanCode.vue
new file mode 100644
index 00000000..431e2455
--- /dev/null
+++ b/src/views/inout/IoSplitScanCode.vue
@@ -0,0 +1,743 @@
+<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>-->
+
+        <!--          &lt;!&ndash;          <el-col :span="8">&ndash;&gt;-->
+        <!--          &lt;!&ndash;            <el-form-item class="query-form-item" label="采购仓库:">&ndash;&gt;-->
+        <!--          &lt;!&ndash;              <el-select v-model="filterQuery.deptCode" placeholder="请选择采购仓库" clearable="true"&ndash;&gt;-->
+        <!--          &lt;!&ndash;                         style="width: 90%"&ndash;&gt;-->
+        <!--          &lt;!&ndash;              >&ndash;&gt;-->
+        <!--          &lt;!&ndash;                <el-option&ndash;&gt;-->
+        <!--          &lt;!&ndash;                  v-for="item in deptList"&ndash;&gt;-->
+        <!--          &lt;!&ndash;                  :key="item.name"&ndash;&gt;-->
+        <!--          &lt;!&ndash;                  :label="item.name"&ndash;&gt;-->
+        <!--          &lt;!&ndash;                  :value="item.code">&ndash;&gt;-->
+        <!--          &lt;!&ndash;                  <span style="float: left">{{ item.name }}</span>&ndash;&gt;-->
+        <!--          &lt;!&ndash;                </el-option>&ndash;&gt;-->
+        <!--          &lt;!&ndash;              </el-select>&ndash;&gt;-->
+        <!--          &lt;!&ndash;            </el-form-item>&ndash;&gt;-->
+        <!--          &lt;!&ndash;          </el-col>&ndash;&gt;-->
+
+        <!--        </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">-->
+        <!--&lt;!&ndash;            <el-form-item label="往来单位:">&ndash;&gt;-->
+        <!--&lt;!&ndash;              <el-select&ndash;&gt;-->
+        <!--&lt;!&ndash;                v-model="filterQuery.keyWords"&ndash;&gt;-->
+        <!--&lt;!&ndash;                style="width: 90%"&ndash;&gt;-->
+        <!--&lt;!&ndash;                filterable&ndash;&gt;-->
+        <!--&lt;!&ndash;                remote&ndash;&gt;-->
+        <!--&lt;!&ndash;                clearable="true"&ndash;&gt;-->
+        <!--&lt;!&ndash;                reserve-keyword&ndash;&gt;-->
+        <!--&lt;!&ndash;                placeholder="请选择往来单位"&ndash;&gt;-->
+        <!--&lt;!&ndash;                :remote-method="findMethod"&ndash;&gt;-->
+        <!--&lt;!&ndash;                :loading="loading"&ndash;&gt;-->
+        <!--&lt;!&ndash;              >&ndash;&gt;-->
+        <!--&lt;!&ndash;                <el-option&ndash;&gt;-->
+        <!--&lt;!&ndash;                  v-for="item in fromOptions"&ndash;&gt;-->
+        <!--&lt;!&ndash;                  :key="item.name"&ndash;&gt;-->
+        <!--&lt;!&ndash;                  :label="item.name"&ndash;&gt;-->
+        <!--&lt;!&ndash;                  :value="item.erpId"&ndash;&gt;-->
+        <!--&lt;!&ndash;                >&ndash;&gt;-->
+        <!--&lt;!&ndash;                  <span style="float: left">{{ item.name }}</span>&ndash;&gt;-->
+        <!--&lt;!&ndash;                </el-option>&ndash;&gt;-->
+        <!--&lt;!&ndash;              </el-select>&ndash;&gt;-->
+        <!--&lt;!&ndash;            </el-form-item>&ndash;&gt;-->
+        <!--            <el-form-item class="query-form-item" label="往来单位:">-->
+        <!--              <el-input v-model="filterQuery.keyWords" 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-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-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)"
+                          class="query-form-item"
+                          :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)"   class="query-form-item"
+                          :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)"   class="query-form-item"
+                          :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)"   class="query-form-item"
+                          :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)"   class="query-form-item"
+                          :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 type="primary" icon="el-icon-plus" @click="addOrders">新增单据</el-button>
+          <el-button type="danger" icon="el-icon-error" @click="errOrderDialog">异常扫码单</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"
+      >
+        <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"
+          :splitBusType="splitBusType"
+          :viewType="viewType"
+        ></addOrder>
+      </el-dialog>
+      <el-dialog
+        title="异常扫码单"
+        :visible.sync="errOrderVisible"
+        width="85%"
+        append-to-body
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        v-if="errOrderVisible"
+        @close='closeDialog'
+      >
+        <err-order
+        ></err-order>
+      </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 "./DialogCreateOrder";
+import errOrder from "./IoCreateErrorOrder";
+import {getInvListByUser, getInvListByUserOptimize} from "@/api/system/invWarehouse";
+import {getLocalJoinByUser, getLocalJoinByUserOptimize} from "@/api/basic/busType";
+import {selectSysParamByKey} from "@/api/param/systemParamConfig";
+import {getCorrespondence} from "@/api/basic/basicUnitMaintain";
+import {
+  getHead, executeFuc
+} from "@/utils/customConfig";
+import {getDeptListByUserOptimize} from "@/api/auth/authDept";
+
+export default {
+  name: "IoCreateScanOrder",
+  data() {
+    return {
+      defaultSort: {prop: 'createTime', order: 'desc'},
+      showSearch: true,
+      titleMap: {
+        add: "新增单据",
+        edit: "编辑单据",
+      },
+      title: "add",
+
+      filterQuery: {
+        id: "",
+        billNo: null,
+        mainAction: null,
+        action: null,
+        statusType: "scan_code",
+        page: 1,
+        limit: 10,
+        startTime: null,
+        endTime: null,
+        keyWords: null,
+        invCode: this.$store.getters.locInvCode,
+      },
+      fromOptions: [],
+      checkStatus: {
+        1: "草稿",
+        2: "等待处理",
+        3: "等待校验",
+        4: "处理异常",
+        5: "校验成功",
+        6: "校验异常",
+        7: "已审核",
+        8: "审核拒绝",
+        9: "正在处理", 10: "待审核", 11: "待配货",
+      },
+      curIndex: "",
+      idQuery: {},
+      storageList: [],
+      invList: [],
+      list: [],
+      addOrderVisible: false,
+      errOrderVisible: false,
+      total: 0,
+      tableHeader: [],
+      queryList: [],
+      fromList: [],
+      options: {
+        getInvList: [],
+        getDeptList: [],
+        getBusType: [],
+      },
+      loading: false,
+      index: null,
+      formName: null,
+      errorDetail: "",
+      formMap: {
+        add: "新增",
+        edit: "编辑",
+      },
+      enableDept: false,
+      splitBusType:"SC72197936495755",
+      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, errOrder
+  },
+  methods: {
+    onReset() {
+      this.filterQuery = {
+        id: "",
+        billNo: null,
+        mainAction: null,
+        action: null,
+        statusType: "scan_code",
+        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("提交成功");
+            this.getList();
+          } 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);
+    },
+
+    findMethod(query) {
+      this.fromOptions = [];
+      let cQuery = {
+        key: query,
+        corpType: 2,
+        page: 1,
+        limit: 10,
+      };
+      getCorrespondence(cQuery)
+        .then((response) => {
+          this.loading = false;
+          this.fromOptions = response.data.list || [];
+        })
+        .catch(() => {
+          this.loading = false;
+          this.fromOptions = [];
+        });
+    },
+    statusFilterType(status) {
+      const statusMap = {
+        2: "warning",
+        1: "warning",
+        4: "danger",
+        3: "success",
+      };
+      return statusMap[status];
+    },
+
+    errOrderDialog() {
+      this.errOrderVisible = true;
+    },
+    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("IoSplitCodeOrder", "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 scoped>
+.query-form {
+  display: flex;
+  flex-wrap: wrap;
+  width: 100%;
+}
+.query-form-item {
+  margin-right: 5px;
+  margin-bottom: 6px;
+}
+
+</style>
+
diff --git a/src/views/inout/split/PrescribeTagCode.vue b/src/views/inout/split/PrescribeTagCode.vue
new file mode 100644
index 00000000..3b99ba8c
--- /dev/null
+++ b/src/views/inout/split/PrescribeTagCode.vue
@@ -0,0 +1,36 @@
+<template>
+  <div>
+    <el-tabs type="border-card" style="margin: 15px">
+
+      <el-tab-pane label="按患者处方查询">
+        <prescribePanel
+        ></prescribePanel>
+      </el-tab-pane>
+
+      <el-tab-pane label="扫码查询">
+        <codePanel
+        ></codePanel>
+      </el-tab-pane>
+
+    </el-tabs>
+
+
+  </div>
+</template>
+
+<script>
+
+import prescribePanel from "./prescribePanel";
+import codePanel from "./codePanel";
+
+export default {
+  name: "PrescribeTagCode",
+  components: {
+    prescribePanel, codePanel
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/inout/split/codePanel.vue b/src/views/inout/split/codePanel.vue
new file mode 100644
index 00000000..14aeffbc
--- /dev/null
+++ b/src/views/inout/split/codePanel.vue
@@ -0,0 +1,17 @@
+<template>
+  <div>
+
+
+
+  </div>
+</template>
+
+<script>
+export default {
+  name: "codePanel"
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/inout/split/prescribePanel.vue b/src/views/inout/split/prescribePanel.vue
new file mode 100644
index 00000000..fd089512
--- /dev/null
+++ b/src/views/inout/split/prescribePanel.vue
@@ -0,0 +1,682 @@
+<template>
+  <div>
+
+    <el-card>
+      <el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form"
+               size="mini" label-width="100px">
+        <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)"
+                          class="query-form-item"
+                          :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)"
+                          class="query-form-item"
+                          :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)"
+                          class="query-form-item"
+                          :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)"
+                          class="query-form-item"
+                          :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)"
+                          class="query-form-item"
+                          :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%;" border highlight-current-row
+                @row-click="(row) => executeFuc(row,'0',tableObj.handleChangeFuc)" ref="multipleTable"
+                :default-sort="defaultSort"
+                :row-style="{ height: '32px' }"
+                @sort-change="handleSortChange">
+        <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>
+
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :limit.sync="filterQuery.limit"
+        :page.sync="filterQuery.page"
+        @pagination="handleCurrentChange"
+      ></pagination>
+    </el-card>
+    <el-tabs type="border-card" style="margin: 15px">
+
+      <el-tab-pane label="处方明细">
+
+        <el-table v-loading="preLoading" :data="preDetailList" style="width: 100%" border>
+          <template v-for="(item, index) in tableHeader1">
+            <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'  && !(item.columnName == 'productDate' || item.columnName == 'expireDate') && 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>
+            <el-table-column
+              v-if="item.columnType == 'text' && (item.columnName == 'productDate' || item.columnName == 'expireDate') && 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])}">{{
+                    convertDateFun(scope.row[item.columnName])
+                  }}</span>
+              </template>
+            </el-table-column>
+          </template>
+        </el-table>
+
+        <pagination
+          v-show="preTotal>0"
+          :total="preTotal"
+          :limit.sync="preQuery.limit"
+          :page.sync="preQuery.page"
+          @pagination="preHandleCurrentChange"
+        ></pagination>
+
+      </el-tab-pane>
+
+      <el-tab-pane label="赋码明细">
+
+        <el-table v-loading="codeLoading" :data="codeDetailList" style="width: 100%" border>
+          <template v-for="(item, index) in tableHeader2">
+            <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'  && !(item.columnName == 'productDate' || item.columnName == 'expireDate') && 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>
+            <el-table-column
+              v-if="item.columnType == 'text' && (item.columnName == 'productDate' || item.columnName == 'expireDate') && 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])}">{{
+                    convertDateFun(scope.row[item.columnName])
+                  }}</span>
+              </template>
+            </el-table-column>
+          </template>
+        </el-table>
+
+        <pagination
+          v-show="codeTotal>0"
+          :total="codeTotal"
+          :limit.sync="codeQuery.limit"
+          :page.sync="codeQuery.page"
+          @pagination="codeHandleCurrentChange"
+        ></pagination>
+
+      </el-tab-pane>
+
+    </el-tabs>
+
+
+  </div>
+</template>
+
+<script>
+import addOrder from "@/views/inout/DialogCreateOrder";
+import errOrder from "@/views/inout/IoCreateErrorOrder";
+import {executeFuc, getHead} from "@/utils/customConfig";
+import store from "@/store";
+import {filterOrder} from "@/api/inout/order";
+import {convertDate} from "@/utils/date";
+import {detail, page as prescribePage} from "@/api/basic/sicker/prescribeApi";
+import {materialPrescribePage} from "@/api/inout/splitCode";
+
+export default {
+  name: "prescribePanel",
+  data() {
+    return {
+
+      //界面配置相关
+      //患者处方
+      tableHeader: [],
+      queryList: [],
+      tableObj: [],
+      fromList: [],
+      //处方明细
+      tableHeader1: [],
+      queryList1: [],
+      tableObj1: [],
+      fromList1: [],
+      //赋码明细
+      tableHeader2: [],
+      queryList2: [],
+      tableObj2: [],
+      fromList2: [],
+      convertDateFun: convertDate,
+      //界面配置-------------end
+
+      showSearch: true,
+      filterQuery: {
+        billNo: null,
+        page: 1,
+        limit: 10,
+      },
+      defaultSort: {prop: 'createTime', order: 'desc'},
+      loading: false,
+      list: [],
+      total: 0,
+
+
+      preLoading: false,
+      preDetailList: [],
+      preTotal: 0,
+      preQuery: {
+        prescribeCode: null,
+        page: 1,
+        limit: 10,
+      },
+      codeLoading: false,
+      codeDetailList: [],
+      codeTotal: 0,
+      codeQuery: {
+        page: 1,
+        limit: 10,
+      },
+    }
+  },
+
+  components: {
+    addOrder, errOrder
+  },
+  methods: {
+
+    //界面配置相关------------
+    executeFuc(row, type, clickFuc, value) {
+      return executeFuc(this, row, type, clickFuc, value);
+    },
+    executeEval(row, expression, defaultRet) {
+      if (expression) {
+        return eval(expression);
+      }
+      return defaultRet;
+    },
+    handleSortChange(column, prop, order) {
+      if (column.order === 'descending') {
+        this.query.sort = 'desc'
+      } else {
+        this.query.sort = 'asc'
+      }
+      this.query.orderBy = column.prop;
+      this.getList();
+    },
+    ///界面配置相关------------end
+
+
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    onReset() {
+      this.filterQuery = {};
+      this.actDateRange = [];
+      this.getList();
+    },
+    onSubmit() {
+      this.filterQuery.page = 1;
+      this.getList();
+    },
+
+    getList() {
+      this.loading = true;
+      prescribePage(this.filterQuery).then(res => {
+        this.loading = false
+        this.list = res.data.list || []
+        this.total = res.data.total || 0
+      }).catch(() => {
+        this.loading = false
+        this.list = []
+        this.total = 0
+      })
+    },
+    handleCurrentChange(val) {
+      this.filterQuery.page = val.page;
+      this.getList();
+    },
+
+    prescribeClick(_this, row) {
+      this.getPrescribeDetail(_this, row)
+      this.getCodeDetail(_this, row)
+    },
+
+    getPrescribeDetail(_this, row) {
+      if (row != null) {
+        _this.preQuery.page = 1
+        _this.preQuery.prescribeCode = row.code
+      }
+      _this.preLoading = true;
+      detail(_this.preQuery).then(res => {
+        _this.preLoading = false
+        if (res.code != 20000) {
+          _this.$message.error(res.message)
+          return
+        }
+        _this.preDetailList = res.data.items
+        _this.preLoading = false
+      }).catch(() => {
+        _this.preLoading = false
+        _this.$message.error("数据加载失败")
+      })
+    },
+
+    getCodeDetail(_this, row) {
+
+      if (row != null) {
+        _this.codeQuery.page = 1
+        _this.codeQuery.prescribeNum = row.code
+      }
+      _this.codeLoading = true;
+      materialPrescribePage(_this.codeQuery).then(res => {
+        _this.codeLoading = false
+        if (res.code != 20000) {
+          _this.$message.error(res.message)
+          return
+        }
+        _this.codeDetailList = res.data.list
+        _this.codeLoading = false
+      }).catch(() => {
+        _this.codeLoading = false
+        _this.$message.error("数据加载失败")
+      })
+
+    },
+
+
+    preHandleCurrentChange(val) {
+      this.filterQuery.page = val.page;
+      this.getPrescribeDetail(this, null);
+    },
+
+
+    codeHandleCurrentChange(val) {
+      this.filterQuery.page = val.page;
+      this.getCodeDetail(this, null);
+    },
+
+
+  },
+  created() {
+    getHead("prescribePanel", "1").then((re) => {
+      // 处理返回的数据
+      this.tableObj = re.data;
+      this.tableHeader = re.data.tableList;
+      this.queryList = re.data.queryList;
+      this.fromList = re.data.fromList;
+      this.getList();
+    });
+
+    getHead("prescribePanel-1", "1").then((re) => {
+      // 处理返回的数据
+      this.tableObj1 = re.data;
+      this.tableHeader1 = re.data.tableList;
+      this.queryList1 = re.data.queryList;
+      this.fromList1 = re.data.fromList;
+      this.getList();
+    });
+
+    getHead("prescribePanel-2", "1").then((re) => {
+      // 处理返回的数据
+      this.tableObj2 = re.data;
+      this.tableHeader2 = re.data.tableList;
+      this.queryList2 = re.data.queryList;
+      this.fromList2 = re.data.fromList;
+      this.getList();
+    });
+  }
+
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/system/customConfig/configDetail.vue b/src/views/system/customConfig/configDetail.vue
index 072f3322..d04cdba7 100644
--- a/src/views/system/customConfig/configDetail.vue
+++ b/src/views/system/customConfig/configDetail.vue
@@ -46,7 +46,7 @@
         <el-table-column prop="buttonRule" show-overflow-tooltip="true" label="按钮规则"></el-table-column>
         <el-table-column prop="clickFuc" label="点击事件"></el-table-column>
         <el-table-column prop="hasPermi" label="是否展示eval表达式"></el-table-column>
-        <el-table-column label="操作">
+        <el-table-column label="操作" fixed="right" width="100">
           <template slot-scope="scope">
            <el-button
              type="text"
diff --git a/src/views/system/customConfig/configFromDetail.vue b/src/views/system/customConfig/configFromDetail.vue
index 9d23b721..6db2b5ac 100644
--- a/src/views/system/customConfig/configFromDetail.vue
+++ b/src/views/system/customConfig/configFromDetail.vue
@@ -49,7 +49,7 @@
              <span>{{ isShowXxMap[scope.row.isShowXx] }}</span>
            </template>
          </el-table-column>
-        <el-table-column label="操作">
+        <el-table-column label="操作" fixed="right" width="100">
           <template slot-scope="scope">
            <el-button
              type="text"
diff --git a/src/views/system/customConfig/configQueryDetail.vue b/src/views/system/customConfig/configQueryDetail.vue
index 8483b4c6..b590ca12 100644
--- a/src/views/system/customConfig/configQueryDetail.vue
+++ b/src/views/system/customConfig/configQueryDetail.vue
@@ -3,7 +3,7 @@
   <div>
     <el-card>
       <el-form :inline="true" :model="query" class="query-form" size="mini">
-        <el-form-item class="query-form-item" label="列名:">
+        <el-form-item class="query-form-item" label="字段:">
           <el-input v-model="query.columnName" clearable placeholder="列名"></el-input>
         </el-form-item>
         <el-form-item>
@@ -17,14 +17,15 @@
       <el-table :data="list" border highlight-current-row  row-key="id"
         style="width: 100%">
         <el-table-column label="序号" type="index" ref="dataForm"></el-table-column>
-        <el-table-column prop="columnName" label="列名"> </el-table-column>
+        <el-table-column prop="columnDesc" label="标题"></el-table-column>
+        <el-table-column prop="columnName" label="字段"> </el-table-column>
         <el-table-column prop="isShow" label="是否展示">
           <template slot-scope="scope">
             <span>{{ isShowMap[scope.row.isShow] }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="columnDesc" label="列描述"></el-table-column>
-        <el-table-column prop="columnType" label="列类型">
+
+        <el-table-column prop="columnType" label="表单类型">
           <template slot-scope="scope">
             <span>{{ columnTypeMap[scope.row.columnType] }}</span>
           </template>
@@ -41,7 +42,7 @@
             <span>{{ isShowXxMap[scope.row.isShowXx] }}</span>
           </template>
         </el-table-column>sss
-        <el-table-column label="操作">
+        <el-table-column label="操作" fixed="right" width="100">
           <template slot-scope="scope">
            <el-button
              type="text"
@@ -61,12 +62,20 @@
       <el-form :model="subData" ref="dataForm" :rules="formRules" label-width="130px">
         <el-row :gutter="20" class="el-row" type="flex">
           <el-col :span="12" class="el-col">
-            <el-form-item label="列名" prop="columnName" class="query-form-item">
-              <el-input v-model="subData.columnName" style="width: 80%" placeholder="请输入业列名"
+            <el-form-item label="字段" prop="columnName" class="query-form-item">
+              <el-input v-model="subData.columnName" style="width: 80%" placeholder="请输入字段"
                 auto-complete="off"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="20" class="el-row" type="flex">
+          <el-col :span="12" class="el-col">
+            <el-form-item label="标题" prop="columnDesc" class="query-form-item">
+              <el-input v-model="subData.columnDesc" style="width: 80%" placeholder="请输入标题"
+                        auto-complete="off"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row :gutter="20" class="el-row" type="flex">
           <el-col :span="12" class="el-col">
             <el-form-item label="是否展示" prop="columnType">
@@ -77,14 +86,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-       <el-row :gutter="20" class="el-row" type="flex">
-         <el-col :span="12" class="el-col">
-           <el-form-item label="列描述" prop="columnDesc" class="query-form-item">
-             <el-input v-model="subData.columnDesc" style="width: 80%" placeholder="请输入列描述"
-               auto-complete="off"></el-input>
-           </el-form-item>
-         </el-col>
-       </el-row>
+
         <el-row :gutter="20" class="el-row" type="flex">
           <el-col :span="12" class="el-col">
             <el-form-item label="列类型" prop="columnType">
diff --git a/src/views/system/customConfig/index.vue b/src/views/system/customConfig/index.vue
index 1f0ef6b7..ab9133bd 100644
--- a/src/views/system/customConfig/index.vue
+++ b/src/views/system/customConfig/index.vue
@@ -3,16 +3,16 @@
   <div>
     <el-card>
       <el-form :inline="true" :model="query" class="query-form" size="mini">
-        <el-form-item class="query-form-item" label="业务标识:">
-          <el-input v-model="query.businessType" clearable placeholder="业务标识"></el-input>
+        <el-form-item class="query-form-item" label="页面名称:">
+          <el-input v-model="query.remark" clearable placeholder="请输入页面名称"></el-input>
         </el-form-item>
-        <el-form-item class="query-form-item" label="备注:">
-          <el-input v-model="query.remark" clearable placeholder="备注"></el-input>
+        <el-form-item class="query-form-item" label="页面标识:">
+          <el-input v-model="query.businessType" clearable placeholder="页面标识"></el-input>
         </el-form-item>
         <el-form-item label="表单类型:" prop="type">
           <el-select v-model="query.type" placeholder="请选择类型" style="width: 90%">
-            <el-option label="列表" :value="1" />
-            <el-option label="表单" :value="2" />
+            <el-option label="列表" :value="1"/>
+            <el-option label="表单" :value="2"/>
           </el-select>
         </el-form-item>
         <el-form-item>
@@ -24,27 +24,27 @@
         </el-form-item>
       </el-form>
       <el-table :data="list" border highlight-current-row
-          @current-change="handSubCurrentChange"
-       row-key="id"
-        style="width: 100%">
+                @current-change="handSubCurrentChange"
+                row-key="id"
+                style="width: 100%">
         <el-table-column label="序号" type="index" ref="dataForm"></el-table-column>
-        <el-table-column prop="businessType" label="业务标识"> </el-table-column>
-        <el-table-column prop="remark" label="备注"> </el-table-column>
+        <el-table-column prop="remark" label="菜单名称"></el-table-column>
+        <el-table-column prop="businessType" label="业务标识"></el-table-column>
         <el-table-column prop="type" label="类型">
           <template slot-scope="scope">
             <span>{{ typeMap[scope.row.type] }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="handleChangeFuc" label="列表点击方法"> </el-table-column>
+        <el-table-column prop="handleChangeFuc" label="列表点击方法"></el-table-column>
         <el-table-column label="操作" width="220">
           <template slot-scope="scope">
-           <el-button
-             type="text"
+            <el-button
+              type="text"
               @click.native="handleSubForm(scope.row, 'edit')"
-              >编辑
-              </el-button>
-              <el-button type="text" @click.native="handleDel(scope.row)">删除
-              </el-button>
+            >编辑
+            </el-button>
+            <el-button type="text" @click.native="handleDel(scope.row)">删除
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -59,13 +59,14 @@
 
     <!--仓库编辑对话框-->
     <el-dialog :title="formMap[formName]" :close-on-click-modal="false"
-      :close-on-press-escape="false" :visible.sync="formVisible" :before-close="hideForm" width="60%" top="5vh">
+               :close-on-press-escape="false" :visible.sync="formVisible" :before-close="hideForm" width="60%"
+               top="5vh">
       <el-form :model="subData" ref="dataForm" :rules="formRules" label-width="130px">
         <el-row :gutter="20" class="el-row" type="flex">
           <el-col :span="12" class="el-col">
             <el-form-item label="业务标识" prop="businessType" class="query-form-item">
               <el-input v-model="subData.businessType" style="width: 80%" placeholder="请输入业务标识"
-                auto-complete="off"></el-input>
+                        auto-complete="off"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -81,8 +82,8 @@
           <el-col :span="12" class="el-col">
             <el-form-item label="类型" prop="type">
               <el-select v-model="subData.type" placeholder="请选择类型" style="width: 80%">
-                <el-option label="列表" value="1" />
-                <el-option label="表单" value="2" />
+                <el-option label="列表" value="1"/>
+                <el-option label="表单" value="2"/>
               </el-select>
             </el-form-item>
           </el-col>
@@ -110,14 +111,14 @@
 
         <config-detail
           :info="configParms"
-          :type ="1"
+          :type="1"
         ></config-detail>
       </el-tab-pane>
       <el-tab-pane>
         <span slot="label">自定义查询框-详细配置</span>
         <config-query-detail
           :info="configParms"
-          :type ="2"
+          :type="2"
         ></config-query-detail>
       </el-tab-pane>
 
@@ -125,7 +126,7 @@
         <span slot="label">自定义表单-详细配置</span>
         <config-from-detail
           :info="configParms"
-          :type ="3">
+          :type="3">
         </config-from-detail>
       </el-tab-pane>
     </el-tabs>
@@ -133,192 +134,193 @@
 </template>
 
 <script>
-  import {
-    list,
-    saveCustomConfig,
-    devCustomConfig
-  } from "@/api/system/sysCustomConfig";
-  import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-  import configDetail from "@/views/system/customConfig/configDetail";
-  import configFromDetail from "@/views/system/customConfig/configFromDetail";
-  import configQueryDetail from "@/views/system/customConfig/configQueryDetail";
-  import {
-    isBlank
-  } from "@/utils/strUtil";
+import {
+  list,
+  saveCustomConfig,
+  devCustomConfig
+} from "@/api/system/sysCustomConfig";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import configDetail from "@/views/system/customConfig/configDetail";
+import configFromDetail from "@/views/system/customConfig/configFromDetail";
+import configQueryDetail from "@/views/system/customConfig/configQueryDetail";
+import {
+  isBlank
+} from "@/utils/strUtil";
 
-  export default {
-    data() {
-      return {
-        //---------------仓库相关-------------------
-        query: {
-          name: null,
-          remark: null,
-          type: null,
-          page: 1,
-          limit: 10,
-        },
-        loading: true,
-        list: [],
-        formName: null,
-        formMap: {
-          add: "配置界面信息-新增",
-          edit: "配置界面信息-编辑",
-        },
-        configParms: {
-          configId:null,
-        },
-        formVisible: false,
-        subData: {},
-        formRules: {
-          businessType: [{ required: true, message: "请输入业务标识", trigger: "blur" }],
-          type: [
-            { required: true, message: "请选择类型", trigger: "blur" },
-          ],
-        },
-        isExpandAll: true,
-        total: 0,
-        typeMap: {
-          1: "列表",
-          2: "表单",
-        },
-      };
-    },
-    methods: {
-      //----------------仓库相关-----------------
-      /* 重置按钮  点击事件 */
-      onReset() {
-        this.$router.push({
-          path: "",
-        });
-        this.query = {
-          name: "",
-          type: "",
-          remark: "",
-          page: 1,
-          limit: 10,
-        };
-        this.getList();
-
-        this.configParms = {
-          configId:null
-        };
+export default {
+  data() {
+    return {
+      //---------------仓库相关-------------------
+      query: {
+        name: null,
+        remark: null,
+        type: null,
+        page: 1,
+        limit: 10,
       },
-      /* 查询按钮点击事件 */
-      onSubmit() {
-        this.getList();
+      loading: true,
+      list: [],
+      formName: null,
+      formMap: {
+        add: "配置界面信息-新增",
+        edit: "配置界面信息-编辑",
       },
-
-      handSubCurrentChange(row) {
-        //加载货位信息
-        this.configDetail(row);
-
+      configParms: {
+        configId: null,
       },
-      configDetail(row) {
-        this.configParms = {
-          configId: row.id,
-          page:1
-        };
+      formVisible: false,
+      subData: {},
+      formRules: {
+        businessType: [{required: true, message: "请输入业务标识", trigger: "blur"}],
+        type: [
+          {required: true, message: "请选择类型", trigger: "blur"},
+        ],
       },
-      getList() {
-        //获取仓库信息
-        this.loading = true;
-        this.list = [];
-        list(this.query)
-          .then((response) => {
-            this.loading = false;
-            this.list = response.data.list || [];
-            this.total = response.data.total || 0;
-          })
-          .catch(() => {
-            this.loading = false;
-            this.total = 0;
-            this.list = [];
-          });
+      isExpandAll: true,
+      total: 0,
+      typeMap: {
+        1: "列表",
+        2: "表单",
       },
-      /* 新增 编辑点击事件 */
-      handleSubForm(data, formName) {
-        this.formName = formName;
-        this.subData = JSON.parse(JSON.stringify(data));
-        this.formVisible = true;
+    };
+  },
+  methods: {
+    //----------------仓库相关-----------------
+    /* 重置按钮  点击事件 */
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.query = {
+        name: "",
+        type: "",
+        remark: "",
+        page: 1,
+        limit: 10,
+      };
+      this.getList();
 
-      },
+      this.configParms = {
+        configId: null
+      };
+    },
+    /* 查询按钮点击事件 */
+    onSubmit() {
+      this.getList();
+    },
 
-      /* 删除按钮点击事件 */
-      handleDel(row) {
-        if (row.id) {
-          this.$confirm("确认删除该配置吗?", "提示", {
-              type: "warning",
-            })
-            .then(() => {
-              this.deleteLoading = true;
-              let para = {
-                id: row.id
-              };
-              devCustomConfig(para)
-                .then((response) => {
-                  this.deleteLoading = false;
-                  if (response.code !== 20000) {
-                    this.$message.error(response.message);
-                    return false;
-                  }
-                  this.getList();
-                  this.$message.success("删除成功");
-                })
-                .catch(() => {
-                  this.deleteLoading = false;
-                });
-            })
-            .catch(() => {
-              this.$message.info("取消删除");
-            });
-        }
-      },
+    handSubCurrentChange(row) {
+      //加载货位信息
+      this.configDetail(row);
 
-      hideForm() {
-        // 新增，编辑---取消
-        this.formVisible = false;
-        this.resetForm();
-        return true;
-      },
-      // 刷新表单
-      resetForm() {
-        if (this.$refs["dataForm"]) {
-          // 清空验证信息表单
-          this.$refs["dataForm"].clearValidate();
-          // 刷新表单
-          this.$refs["dataForm"].resetFields();
-          this.getList();
-        }
-      },
-      forSubmit() {
-        this.query.page = 1;
-        // 新增，编辑---提交
-        this.$refs["dataForm"].validate((valid) => {
-          if (valid) {
-            saveCustomConfig(this.subData, this.formName)
+    },
+    configDetail(row) {
+      this.configParms = {
+        configId: row.id,
+        page: 1
+      };
+    },
+    getList() {
+      //获取仓库信息
+      this.loading = true;
+      this.list = [];
+      list(this.query)
+        .then((response) => {
+          this.loading = false;
+          this.list = response.data.list || [];
+          this.total = response.data.total || 0;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.total = 0;
+          this.list = [];
+        });
+    },
+    /* 新增 编辑点击事件 */
+    handleSubForm(data, formName) {
+      this.formName = formName;
+      this.subData = JSON.parse(JSON.stringify(data));
+      this.formVisible = true;
+
+    },
+
+    /* 删除按钮点击事件 */
+    handleDel(row) {
+      if (row.id) {
+        this.$confirm("确认删除该配置吗?", "提示", {
+          type: "warning",
+        })
+          .then(() => {
+            this.deleteLoading = true;
+            let para = {
+              id: row.id
+            };
+            devCustomConfig(para)
               .then((response) => {
-                this.formVisible = false;
-                if (response.code == 20000) {
-                  this.getList();
-                } else {
+                this.deleteLoading = false;
+                if (response.code !== 20000) {
                   this.$message.error(response.message);
+                  return false;
                 }
+                this.getList();
+                this.$message.success("删除成功");
               })
               .catch(() => {
-                this.formVisible = false;
+                this.deleteLoading = false;
               });
-          }
-        });
-      },
+          })
+          .catch(() => {
+            this.$message.info("取消删除");
+          });
+      }
     },
-    mounted() {},
-    components: {
-      configDetail,
-      configFromDetail,
-      configQueryDetail,
+
+    hideForm() {
+      // 新增，编辑---取消
+      this.formVisible = false;
+      this.resetForm();
+      return true;
     },
-    created() {
-      this.getList();
+    // 刷新表单
+    resetForm() {
+      if (this.$refs["dataForm"]) {
+        // 清空验证信息表单
+        this.$refs["dataForm"].clearValidate();
+        // 刷新表单
+        this.$refs["dataForm"].resetFields();
+        this.getList();
+      }
+    },
+    forSubmit() {
+      this.query.page = 1;
+      // 新增，编辑---提交
+      this.$refs["dataForm"].validate((valid) => {
+        if (valid) {
+          saveCustomConfig(this.subData, this.formName)
+            .then((response) => {
+              this.formVisible = false;
+              if (response.code == 20000) {
+                this.getList();
+              } else {
+                this.$message.error(response.message);
+              }
+            })
+            .catch(() => {
+              this.formVisible = false;
+            });
+        }
+      });
     },
-  };
+  },
+  mounted() {
+  },
+  components: {
+    configDetail,
+    configFromDetail,
+    configQueryDetail,
+  },
+  created() {
+    this.getList();
+  },
+};
 </script>

From ae0057f02ab968bddefbfb12c7854991968d6f46 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Mon, 29 Jul 2024 17:24:10 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E8=8D=AF=E5=93=81=E5=87=BA?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=98=8E=E7=BB=86=E3=80=81=E6=B1=87=E6=80=BB?=
 =?UTF-8?q?=E3=80=81=E5=85=A5=E8=B4=A6=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../drugInout/stat/DialogCreateCustom.vue     | 207 ++++
 .../drugInout/stat/IoStatCustomSearch.vue     | 434 +++++++++
 src/views/drugInout/stat/IoStatDaySearch.vue  | 381 ++++++++
 .../drugInout/stat/IoStatMonthSearch.vue      | 376 ++++++++
 .../drugInout/stat/IoStatQuarterSearch.vue    | 375 ++++++++
 src/views/drugInout/stat/IoStatYearSearch.vue | 375 ++++++++
 src/views/drugInventory/InvProducts.vue       | 707 ++++++++++++++
 src/views/drugInventory/InvProductsDetail.vue | 317 +++++++
 .../drugInventory/addInvRemindSetDialog.vue   | 225 +++++
 .../drugInventory/supInoutSearchOrder.vue     | 891 ++++++++++++++++++
 10 files changed, 4288 insertions(+)
 create mode 100644 src/views/drugInout/stat/DialogCreateCustom.vue
 create mode 100644 src/views/drugInout/stat/IoStatCustomSearch.vue
 create mode 100644 src/views/drugInout/stat/IoStatDaySearch.vue
 create mode 100644 src/views/drugInout/stat/IoStatMonthSearch.vue
 create mode 100644 src/views/drugInout/stat/IoStatQuarterSearch.vue
 create mode 100644 src/views/drugInout/stat/IoStatYearSearch.vue
 create mode 100644 src/views/drugInventory/InvProducts.vue
 create mode 100644 src/views/drugInventory/InvProductsDetail.vue
 create mode 100644 src/views/drugInventory/addInvRemindSetDialog.vue
 create mode 100644 src/views/drugInventory/supInoutSearchOrder.vue

diff --git a/src/views/drugInout/stat/DialogCreateCustom.vue b/src/views/drugInout/stat/DialogCreateCustom.vue
new file mode 100644
index 00000000..e64416ae
--- /dev/null
+++ b/src/views/drugInout/stat/DialogCreateCustom.vue
@@ -0,0 +1,207 @@
+<template>
+  <div>
+    <el-card style="margin-top: -15px">
+      <el-form :model="formData" :rules="formRules" ref="dataForm" label-width="100px">
+        <el-row>
+          <el-col :span="20">
+            <el-form-item label="记录号:" prop="name">
+              <el-input
+                v-model="formData.name"
+                auto-complete="off"
+                :disabled="true"
+                style="width: 90%"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="20">
+            <el-form-item label="汇总仓库:" prop="invCode">
+              <el-select v-model="formData.invCode" style="width: 90%" clearable
+                         placeholder="请选择所属仓库">
+                <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="20">
+            <el-form-item label="汇总方式:" prop="statType">
+              <el-select
+                v-model="formData.statType"
+                style="width: 90%"
+              >
+                <el-option label="按产品汇总" :value="1"></el-option>
+                <el-option label="按批次号汇总" :value="2"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+
+          <el-col :span="20">
+            <el-form-item label="汇总区间:" prop="actDateRange">
+              <el-date-picker
+                :picker-options="pickerOptions"
+                v-model="formData.actDateRange"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                style="width: 90%"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="20">
+            <el-form-item label="备注:" prop="name">
+              <el-input
+                v-model="formData.remark"
+                auto-complete="off"
+                type="textarea"
+                style="width: 90%"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+      </el-form>
+      <div style="display: flex;float: right;padding-bottom: 15px">
+        <el-button type="primary" @click.native="formSubmit()" :loading="formLoading"
+        >提交
+        </el-button>
+        <el-button @click.native="hideForm">取消</el-button>
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import {filterAll, getInvListByUser} from "@/api/system/invWarehouse";
+import {systemParamConfigSave} from "@/api/system/param/systemParamConfig";
+import {createCustom} from "@/api/inout/statData";
+
+export default {
+  name: "DialogCreateCustom",
+  props: {
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+
+  },
+  data() {
+    return {
+      formData: {
+        name: null,
+        invCode: null,
+        statType: null,
+        actDateRange: [],
+        startDate: null,
+        endDate: null,
+      },
+      formRules: {
+        invCode: [{required: true, message: "请选择仓库", trigger: "change"}]
+        ,
+        actDateRange: [
+          {type: 'array', required: true, message: "请选择汇总区间", trigger: "change"}
+        ],
+        statType: [
+          {required: true, message: "请选择汇总方式", trigger: "change"}
+        ],
+
+      },
+      deptList: [],
+      invList: [],
+      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]);
+            },
+          },
+        ],
+      },
+
+      formLoading: false,
+    }
+  },
+  methods: {
+    getInvList() {
+      getInvListByUser().then((res) => {
+        this.invList = res.data || [];
+      })
+    },
+    getDeptList() {
+      filterAll().then((res) => {
+        this.deptList = res.data || [];
+        this.getInvList();
+      });
+    },
+    hideForm() {
+      this.closeDialog();
+      return true;
+    },
+    formSubmit() {
+      this.$refs["dataForm"].validate((valid) => {
+        if (valid) {
+          this.formLoading = true;
+          this.formData.startDate = this.formData.actDateRange[0];
+          this.formData.endDate = this.formData.actDateRange[1];
+          let data = Object.assign({}, this.formData);
+          createCustom(data)
+            .then((response) => {
+              this.formLoading = false;
+              if (response.code != 20000) {
+                this.$message.error(response.message);
+                return false;
+              }
+              this.$message.success("操作成功");
+              this.closeDialog();
+            })
+            .catch(() => {
+              this.formLoading = false;
+            });
+        }
+      });
+    },
+  },
+
+  created() {
+
+    this.getInvList();
+    this.getDeptList();
+  },
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/drugInout/stat/IoStatCustomSearch.vue b/src/views/drugInout/stat/IoStatCustomSearch.vue
new file mode 100644
index 00000000..42bd3d16
--- /dev/null
+++ b/src/views/drugInout/stat/IoStatCustomSearch.vue
@@ -0,0 +1,434 @@
+<template>
+  <div>
+    <el-card class="el-card">
+      <el-form :model="filterQuery" class="query-form" size="mini" :inline="true">
+        <el-form-item class="query-form-item" label="汇总记录号:">
+          <el-input v-model="filterQuery.recordKey" placeholder="请输入汇总记录号"
+                    clearable="true"></el-input>
+        </el-form-item>
+
+        <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="结束日期"
+          >
+          </el-date-picker>
+        </el-form-item>
+
+        <el-form-item>
+          <el-button-group>
+            <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 type="primary" icon="el-icon-plus" @click="createStat"
+            >创建汇总
+            </el-button
+            >
+          </el-button-group>
+        </el-form-item>
+      </el-form>
+
+      <el-table v-loading="loading" :data="list" style="width: 100%;" highlight-current-row class="table-fixed"
+                border
+                @current-change="handleSelectionChange">
+        <el-table-column type="selection" width="55"></el-table-column>
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="仓库" prop="invName"></el-table-column>
+        <el-table-column label="记录号" prop="recordKey"></el-table-column>
+        <!--        <el-table-column label="名称" prop="title"></el-table-column>-->
+        <el-table-column label="起始时间" prop="startDate"></el-table-column>
+        <el-table-column label="结束时间" prop="endDate"></el-table-column>
+        <el-table-column label="汇总方式" prop="statType">
+          <template slot-scope="scope">
+            <el-tag>{{ statusType[scope.row.statType] }}
+            </el-tag>
+          </template>
+
+        </el-table-column>
+
+        <el-table-column label="汇总状态" prop="status">
+          <template slot-scope="scope">
+            <el-tag :type="statusFilterType(scope.row.status)">{{ status[scope.row.status] }}</el-tag>
+          </template>
+
+        </el-table-column>
+
+        <el-table-column label="备注" prop="remark"></el-table-column>
+      </el-table>
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :limit.sync="filterQuery.limit"
+        :page.sync="filterQuery.page"
+        @pagination="getList"
+      ></pagination>
+    </el-card>
+
+    <el-tabs type="border-card" style="margin: 15px">
+      <!--单据业务详情-->
+      <el-tab-pane>
+        <span slot="label">{{ currentRow.title }}-详情</span>
+        <el-form :inline="true" :model="detailQuery" class="query-form" size="mini">
+          <el-form-item class="query-form-item" label="产品名称:">
+            <el-input
+              v-model="detailQuery.productName"
+              placeholder="请输入产品名称"
+              clearable
+            >
+            </el-input>
+          </el-form-item>
+
+          <el-form-item class="query-form-item" label="批次号:">
+            <el-input
+              v-model="detailQuery.batchNo"
+              placeholder="请输入批次号"
+              clearable
+            >
+            </el-input>
+          </el-form-item>
+
+          <el-form-item class="query-form-item" label="规格型号:">
+            <el-input
+              v-model="detailQuery.ggxh"
+              placeholder="请输入规格型号"
+              clearable
+            >
+            </el-input>
+          </el-form-item>
+
+          <el-form-item>
+            <el-button-group>
+              <el-button
+                type="primary"
+                icon="el-icon-refresh"
+                @click="resetDetailQuery"
+              >重置
+              </el-button>
+              <el-button type="primary" @click="searchDetail"
+                         icon="el-icon-search"
+              >查询
+              </el-button>
+              <el-button type="primary" @click="excel"
+                         icon="el-icon-upload2"
+              >导出
+              </el-button>
+            </el-button-group>
+          </el-form-item>
+        </el-form>
+
+        <el-table v-loading="detailLoading" :data="detailList" style="width: 100%" border
+                  row-key="id"
+        >
+          <el-table-column label="序号" type="index"></el-table-column>
+          <el-table-column label="产品名称" prop="productName" width="150" show-overflow-tooltip></el-table-column>
+          <el-table-column label="批次号" prop="batchNo" width="120" show-overflow-tooltip></el-table-column>
+          <el-table-column label="规格型号" prop="ggxh" width="160" show-overflow-tooltip></el-table-column>
+          <!--          <el-table-column label="仓库" prop="invName" width="160" show-overflow-tooltip></el-table-column>-->
+          <el-table-column label="入库" header-align="center">
+            <el-table-column label="数量" prop="inCount" width="80"></el-table-column>
+            <el-table-column label="价格" prop="inPrice" width="100"></el-table-column>
+            <el-table-column label="金额" prop="inAmount" width="100"></el-table-column>
+          </el-table-column>
+          <el-table-column label="出库" header-align="center">
+            <el-table-column label="数量" prop="outCount" width="80"></el-table-column>
+            <el-table-column label="价格" prop="outPrice" width="100"></el-table-column>
+            <el-table-column label="金额" prop="outAmount" width="100"></el-table-column>
+          </el-table-column>
+
+          <el-table-column label="结余" header-align="center">
+            <el-table-column label="数量" prop="balanceCount" width="80"></el-table-column>
+            <el-table-column label="价格" prop="balancePrice" width="100"></el-table-column>
+            <el-table-column label="金额" prop="balanceAmount" width="100"></el-table-column>
+          </el-table-column>
+
+        </el-table>
+        <pagination
+          v-show="detailTotal>0"
+          :total="detailTotal"
+          :page.sync="detailQuery.page"
+          :limit.sync="detailQuery.limit"
+          @pagination="getDetailList"
+        />
+      </el-tab-pane>
+
+    </el-tabs>
+
+
+    <el-dialog
+      title="创建出入库汇总"
+      :visible.sync="dialogTableVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      v-if="dialogTableVisible"
+      width="45%"
+      append-to-body
+    >
+      <DialogCreateCustom
+        :closeDialog="cancelDialog"
+      ></DialogCreateCustom>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import {getStatOrderList, filterDayList, excelImport, filterCusDetailList} from "@/api/inout/statData";
+import {isBlank} from "@/utils/strUtil";
+import DialogCreateCustom from "./DialogCreateCustom";
+
+export default {
+  name: "IoStatCustomSearch",
+  data() {
+    return {
+      showSearch: true,
+      filterQuery: {
+        recordKey: null,
+        type: 5,
+        startTime: null,
+        endTime: null,
+        page: 1,
+        limit: 10,
+      },
+      loading: false,
+      list: [],
+      total: 0,
+      detailQuery: {
+        recordKey: null,
+        productName: null,
+        batchNo: null,
+        ggxh: null,
+        page: 1,
+        limit: 10
+      },
+      key: null,
+      detailLoading: false,
+      detailList: [],
+      detailTotal: 0,
+      currentRow: {
+        title: "日汇总记录",
+        recordKey: null
+      },
+      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]);
+            },
+          },
+        ],
+      },
+
+      status: {
+        1: "生成中",
+        2: "已完成",
+        3: "汇总失败",
+      },
+
+
+      statusType: {
+        1: "产品",
+        2: "批次号"
+      },
+      dialogTableVisible: false,
+    };
+  },
+  components: {
+    DialogCreateCustom
+  },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        recordKey: null,
+        type: 4,
+        startTime: null,
+        endTime: null,
+        page: 1,
+        limit: 10,
+      };
+      this.actDateRange = [];
+      this.getList();
+    },
+    onSubmit() {
+      this.loading = true;
+      if (this.actDateRange !== null && this.actDateRange.length > 0) {
+        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();
+    },
+
+    createStat() {
+      this.dialogTableVisible = true;
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    handleSelectionChange(row) {
+      this.currentRow = row;
+      this.getDetailList();
+    },
+    // 清空单据详情数据列表
+    clearDetailList() {
+      this.detailQuery = {
+        recordKey: null,
+        productName: null,
+        batchNo: null,
+        ggxh: null,
+        page: 1,
+        limit: 10
+      }
+      this.detailLoading = false;
+      this.detailList = [];
+      this.detailTotal = 0;
+    },
+
+    excel() {
+      if (isBlank(this.currentRow.recordKey)) {
+        return this.$message.error("请选择要导出的数据！");
+      }
+      let params = {billNo: this.currentRow.recordKey, key: "custom"};
+      excelImport(params).then(res => {
+        let blob = new Blob([res], {type: "application/vnd.ms-excel"});
+        let url = window.URL.createObjectURL(blob); // 创建一个临时的url指向blob对象
+        let a = document.createElement("a");
+        a.href = url;
+        a.click();
+        this.$message("成功")
+      })
+
+    },
+    //获取订单列表
+    getList() {
+      this.loading = true;
+      this.clearDetailList();
+      this.currentRow = {
+        title: "日汇总记录",
+        recordKey: null
+      };
+      getStatOrderList(this.filterQuery).then((res) => {
+        this.loading = false;
+        if (res.code === 20000) {
+          this.list = res.data.list || [];
+          this.total = res.data.total || 0;
+        }
+      }).catch((error) => {
+        this.$message.error(error.message);
+        this.list = [];
+        this.total = 0;
+      })
+    },
+    resetDetailQuery() {
+      this.detailQuery = {
+        recordKey: null,
+        productName: null,
+        batchNo: null,
+        ggxh: null,
+        page: 1,
+        limit: 10
+      }
+      this.getDetailList();
+    },
+    searchDetail() {
+      this.detailQuery.page = 1;
+      this.getDetailList();
+    },
+    getDetailList() {
+      this.detailLoading = true;
+      this.detailQuery.recordKey = this.currentRow.recordKey;
+      filterCusDetailList(this.detailQuery).then((res) => {
+        if (res.code === 20000) {
+          this.detailLoading = false;
+          this.detailList = res.data.list || [];
+          this.detailTotal = res.data.total || 0;
+        } else {
+          this.detailList = [];
+          this.detailTotal = 0;
+        }
+      }).catch((error) => {
+        this.$message.error(error.message);
+        this.detailList = [];
+        this.detailTotal = 0;
+      })
+    },
+    cancelDialog() {
+      this.dialogTableVisible = false;
+    },
+
+    statusFilterType(status) {
+      const statusMap = {
+        1: "warning",
+        3: "danger",
+        2: "success",
+      };
+      return statusMap[status];
+    },
+  },
+  filters: {
+    statusFilterType(status) {
+      const statusMap = {
+        false: "success",
+        true: "warning",
+      };
+      return statusMap[status];
+    },
+  },
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+
+
+  created() {
+    this.getList();
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+
+</style>
diff --git a/src/views/drugInout/stat/IoStatDaySearch.vue b/src/views/drugInout/stat/IoStatDaySearch.vue
new file mode 100644
index 00000000..01b05d97
--- /dev/null
+++ b/src/views/drugInout/stat/IoStatDaySearch.vue
@@ -0,0 +1,381 @@
+<template>
+  <div>
+    <el-card class="el-card">
+      <el-form :model="filterQuery" class="query-form" size="mini" :inline="true">
+        <el-form-item class="query-form-item" label="汇总记录号:">
+          <el-input v-model="filterQuery.recordKey" placeholder="请输入汇总记录号"
+                    clearable="true"></el-input>
+        </el-form-item>
+
+        <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="结束日期"
+          >
+          </el-date-picker>
+        </el-form-item>
+
+        <el-form-item>
+          <el-button-group>
+            <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 type="primary" icon="el-icon-search" @click="onSubmit"
+              >汇总
+              </el-button
+              >-->
+          </el-button-group>
+        </el-form-item>
+      </el-form>
+
+      <el-table v-loading="loading" :data="list" style="width: 100%;" highlight-current-row class="table-fixed"
+                border
+                @current-change="handleSelectionChange">
+        <el-table-column type="selection" width="55"></el-table-column>
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="仓库" prop="invName"></el-table-column>
+        <el-table-column label="记录号" prop="recordKey"></el-table-column>
+        <el-table-column label="名称" prop="title"></el-table-column>
+        <el-table-column label="汇总日期" prop="date"></el-table-column>
+        <el-table-column label="备注" prop="remark"></el-table-column>
+      </el-table>
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :limit.sync="filterQuery.limit"
+        :page.sync="filterQuery.page"
+        @pagination="getList"
+      ></pagination>
+    </el-card>
+
+    <el-tabs type="border-card" style="margin: 15px">
+      <!--单据业务详情-->
+      <el-tab-pane>
+        <span slot="label">{{ currentRow.title }}-详情</span>
+        <el-form :inline="true" :model="detailQuery" class="query-form" size="mini">
+          <el-form-item class="query-form-item" label="产品名称:">
+            <el-input
+              v-model="detailQuery.productName"
+              placeholder="请输入产品名称"
+              clearable
+            >
+            </el-input>
+          </el-form-item>
+
+          <el-form-item class="query-form-item" label="批次号:">
+            <el-input
+              v-model="detailQuery.batchNo"
+              placeholder="请输入批次号"
+              clearable
+            >
+            </el-input>
+          </el-form-item>
+
+          <el-form-item class="query-form-item" label="规格型号:">
+            <el-input
+              v-model="detailQuery.ggxh"
+              placeholder="请输入规格型号"
+              clearable
+            >
+            </el-input>
+          </el-form-item>
+
+          <el-form-item>
+            <el-button-group>
+              <el-button
+                type="primary"
+                icon="el-icon-refresh"
+                @click="resetDetailQuery"
+              >重置
+              </el-button>
+              <el-button type="primary" @click="searchDetail"
+                         icon="el-icon-search"
+              >查询
+              </el-button>
+              <el-button type="primary" @click="excel"
+                         icon="el-icon-upload2"
+              >导出
+              </el-button>
+            </el-button-group>
+          </el-form-item>
+        </el-form>
+
+        <el-table v-loading="detailLoading" :data="detailList" style="width: 100%" border
+                  row-key="id"
+        >
+          <el-table-column label="序号" type="index"></el-table-column>
+          <el-table-column label="产品名称" prop="productName" width="150" show-overflow-tooltip></el-table-column>
+          <el-table-column label="批次号" prop="batchNo" width="120" show-overflow-tooltip></el-table-column>
+          <el-table-column label="规格型号" prop="ggxh" width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column label="仓库" prop="deptName" width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column label="期初" header-align="center">
+            <el-table-column label="数量" prop="beginCount" width="80"></el-table-column>
+            <el-table-column label="价格" prop="beginPrice" width="100"></el-table-column>
+            <el-table-column label="金额" prop="beginAmount" width="100"></el-table-column>
+          </el-table-column>
+          <el-table-column label="入库" header-align="center">
+            <el-table-column label="数量" prop="inCount" width="80"></el-table-column>
+            <el-table-column label="价格" prop="inPrice" width="100"></el-table-column>
+            <el-table-column label="金额" prop="inAmount" width="100"></el-table-column>
+          </el-table-column>
+          <el-table-column label="出库" header-align="center">
+            <el-table-column label="数量" prop="outCount" width="80"></el-table-column>
+            <el-table-column label="价格" prop="outPrice" width="100"></el-table-column>
+            <el-table-column label="金额" prop="outAmount" width="100"></el-table-column>
+          </el-table-column>
+
+          <el-table-column label="结余" header-align="center">
+            <el-table-column label="数量" prop="balanceCount" width="80"></el-table-column>
+            <el-table-column label="价格" prop="balancePrice" width="100"></el-table-column>
+            <el-table-column label="金额" prop="balanceAmount" width="100"></el-table-column>
+          </el-table-column>
+
+        </el-table>
+        <pagination
+          v-show="detailTotal>0"
+          :total="detailTotal"
+          :page.sync="detailQuery.page"
+          :limit.sync="detailQuery.limit"
+          @pagination="getDetailList"
+        />
+      </el-tab-pane>
+
+    </el-tabs>
+
+  </div>
+</template>
+
+<script>
+import {getStatOrderList, filterDayList, excelImport} from "@/api/inout/statData";
+import {isBlank} from "@/utils/strUtil";
+
+const formJson = {
+  site_id: "",
+  site_name: "",
+  describe: "",
+  ads: [],
+};
+
+export default {
+  name: "IoStatDaySearch",
+  data() {
+    return {
+      showSearch: true,
+      filterQuery: {
+        recordKey: null,
+        type: 4,
+        startTime: null,
+        endTime: null,
+        page: 1,
+        limit: 10,
+      },
+      loading: false,
+      list: [],
+      total: 0,
+      detailQuery: {
+        recordKey: null,
+        productName: null,
+        batchNo: null,
+        ggxh: null,
+        page: 1,
+        limit: 10
+      },
+      key: null,
+      detailLoading: false,
+      detailList: [],
+      detailTotal: 0,
+      currentRow: {
+        title: "日汇总记录",
+        recordKey: null
+      },
+      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]);
+            },
+          },
+        ],
+      },
+    };
+  },
+  components: {},
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        recordKey: null,
+        type: 4,
+        startTime: null,
+        endTime: null,
+        page: 1,
+        limit: 10,
+      };
+      this.actDateRange = [];
+      this.getList();
+    },
+    onSubmit() {
+      this.loading = true;
+      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;
+    },
+    handleSelectionChange(row) {
+      this.currentRow = row;
+      this.getDetailList();
+    },
+    // 清空单据详情数据列表
+    clearDetailList() {
+      this.detailQuery = {
+        recordKey: null,
+        productName: null,
+        batchNo: null,
+        ggxh: null,
+        page: 1,
+        limit: 10
+      }
+      this.detailLoading = false;
+      this.detailList = [];
+      this.detailTotal = 0;
+    },
+
+    excel() {
+      if (isBlank(this.currentRow.recordKey)) {
+        return this.$message.error("请选择要导出的数据！");
+      }
+      let params = {billNo: this.currentRow.recordKey, key: "day"};
+      excelImport(params).then(res => {
+        let blob = new Blob([res], {type: "application/vnd.ms-excel"});
+        let url = window.URL.createObjectURL(blob); // 创建一个临时的url指向blob对象
+        let a = document.createElement("a");
+        a.href = url;
+        a.click();
+        this.$message("成功")
+      })
+
+    },
+    //获取订单列表
+    getList() {
+      this.loading = true;
+      this.clearDetailList();
+      this.currentRow = {
+        title: "日汇总记录",
+        recordKey: null
+      };
+      getStatOrderList(this.filterQuery).then((res) => {
+        this.loading = false;
+        if (res.code === 20000) {
+          this.list = res.data.list || [];
+          this.total = res.data.total || 0;
+        }
+      }).catch((error) => {
+        this.$message.error(error.message);
+        this.list = [];
+        this.total = 0;
+      })
+    },
+    resetDetailQuery() {
+      this.detailQuery = {
+        recordKey: null,
+        productName: null,
+        batchNo: null,
+        ggxh: null,
+        page: 1,
+        limit: 10
+      }
+      this.getDetailList();
+    },
+    searchDetail() {
+      this.detailQuery.page = 1;
+      this.getDetailList();
+    },
+    getDetailList() {
+      this.detailLoading = true;
+      this.detailQuery.recordKey = this.currentRow.recordKey;
+      filterDayList(this.detailQuery).then((res) => {
+        if (res.code === 20000) {
+          this.detailLoading = false;
+          this.detailList = res.data.list || [];
+          this.detailTotal = res.data.total || 0;
+        } else {
+          this.detailList = [];
+          this.detailTotal = 0;
+        }
+      }).catch((error) => {
+        this.$message.error(error.message);
+        this.detailList = [];
+        this.detailTotal = 0;
+      })
+    },
+  },
+  filters: {
+    statusFilterType(status) {
+      const statusMap = {
+        false: "success",
+        true: "warning",
+      };
+      return statusMap[status];
+    },
+  },
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+    this.getList();
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+
+</style>
diff --git a/src/views/drugInout/stat/IoStatMonthSearch.vue b/src/views/drugInout/stat/IoStatMonthSearch.vue
new file mode 100644
index 00000000..b52f526f
--- /dev/null
+++ b/src/views/drugInout/stat/IoStatMonthSearch.vue
@@ -0,0 +1,376 @@
+<template>
+  <div>
+    <el-card class="el-card">
+      <el-form :model="filterQuery" class="query-form" size="mini" :inline="true">
+        <el-form-item class="query-form-item" label="汇总记录号:">
+          <el-input v-model="filterQuery.recordKey" placeholder="请输入汇总记录号"
+                    clearable="true"></el-input>
+        </el-form-item>
+
+        <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="结束日期"
+          >
+          </el-date-picker>
+        </el-form-item>
+
+        <el-form-item>
+          <el-button-group>
+            <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>
+        </el-form-item>
+      </el-form>
+
+      <el-table v-loading="loading" :data="list" style="width: 100%;" highlight-current-row class="table-fixed"
+                border
+                @current-change="handleSelectionChange">
+        <el-table-column type="selection" width="55"></el-table-column>
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="仓库" prop="invName"></el-table-column>
+        <el-table-column label="名称" prop="title"></el-table-column>
+        <el-table-column label="记录号" prop="recordKey"></el-table-column>
+        <el-table-column label="汇总日期" prop="date"></el-table-column>
+        <el-table-column label="备注" prop="remark"></el-table-column>
+      </el-table>
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :limit.sync="filterQuery.limit"
+        :page.sync="filterQuery.page"
+        @pagination="getList"
+      ></pagination>
+    </el-card>
+
+    <el-tabs type="border-card" style="margin: 15px">
+      <!--单据业务详情-->
+      <el-tab-pane>
+        <span slot="label">{{ currentRow.title }}-详情</span>
+        <el-form :inline="true" :model="detailQuery" class="query-form" size="mini">
+          <el-form-item class="query-form-item" label="产品名称:">
+            <el-input
+              v-model="detailQuery.productName"
+              placeholder="请输入产品名称"
+              clearable
+            >
+            </el-input>
+          </el-form-item>
+
+          <el-form-item class="query-form-item" label="批次号:">
+            <el-input
+              v-model="detailQuery.batchNo"
+              placeholder="请输入批次号"
+              clearable
+            >
+            </el-input>
+          </el-form-item>
+
+          <el-form-item class="query-form-item" label="规格型号:">
+            <el-input
+              v-model="detailQuery.ggxh"
+              placeholder="请输入规格型号"
+              clearable
+            >
+            </el-input>
+          </el-form-item>
+
+          <el-form-item>
+            <el-button-group>
+              <el-button
+                type="primary"
+                icon="el-icon-refresh"
+                @click="resetDetailQuery"
+              >重置
+              </el-button>
+              <el-button type="primary" @click="searchDetail"
+                         icon="el-icon-search"
+              >查询
+              </el-button>
+              <el-button type="primary" @click="excel"
+                         icon="el-icon-upload2"
+              >导出
+              </el-button>
+            </el-button-group>
+          </el-form-item>
+        </el-form>
+
+        <el-table v-loading="detailLoading" :data="detailList" style="width: 100%" border
+                  row-key="id"
+        >
+          <el-table-column label="序号" type="index"></el-table-column>
+          <el-table-column label="产品名称" prop="productName" width="150" show-overflow-tooltip></el-table-column>
+          <el-table-column label="批次号" prop="batchNo" width="120" show-overflow-tooltip></el-table-column>
+          <el-table-column label="规格型号" prop="ggxh" width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column label="仓库" prop="deptName" width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column label="期初" header-align="center">
+            <el-table-column label="数量" prop="beginCount" width="80"></el-table-column>
+            <el-table-column label="价格" prop="beginPrice" width="100"></el-table-column>
+            <el-table-column label="金额" prop="beginAmount" width="100"></el-table-column>
+          </el-table-column>
+          <el-table-column label="入库" header-align="center">
+            <el-table-column label="数量" prop="inCount" width="80"></el-table-column>
+            <el-table-column label="价格" prop="inPrice" width="100"></el-table-column>
+            <el-table-column label="金额" prop="inAmount" width="100"></el-table-column>
+          </el-table-column>
+          <el-table-column label="出库" header-align="center">
+            <el-table-column label="数量" prop="outCount" width="80"></el-table-column>
+            <el-table-column label="价格" prop="outPrice" width="100"></el-table-column>
+            <el-table-column label="金额" prop="outAmount" width="100"></el-table-column>
+          </el-table-column>
+
+          <el-table-column label="结余" header-align="center">
+            <el-table-column label="数量" prop="balanceCount" width="80"></el-table-column>
+            <el-table-column label="价格" prop="balancePrice" width="100"></el-table-column>
+            <el-table-column label="金额" prop="balanceAmount" width="100"></el-table-column>
+          </el-table-column>
+        </el-table>
+        <pagination
+          v-show="detailTotal>0"
+          :total="detailTotal"
+          :page.sync="detailQuery.page"
+          :limit.sync="detailQuery.limit"
+          @pagination="getDetailList"
+        />
+      </el-tab-pane>
+
+    </el-tabs>
+
+  </div>
+</template>
+
+<script>
+import {getStatOrderList, filterMonthList, excelImport} from "@/api/inout/statData";
+import {isBlank} from "@/utils/strUtil";
+
+const formJson = {
+  site_id: "",
+  site_name: "",
+  describe: "",
+  ads: [],
+};
+
+export default {
+  name: "IoStatMonthSearch",
+  data() {
+    return {
+      showSearch: true,
+      filterQuery: {
+        recordKey: null,
+        type: 3,
+        startTime: null,
+        endTime: null,
+        page: 1,
+        limit: 10,
+      },
+      loading: false,
+      list: [],
+      total: 0,
+      detailQuery: {
+        recordKey: null,
+        productName: null,
+        batchNo: null,
+        ggxh: null,
+        page: 1,
+        limit: 10
+      },
+      detailLoading: false,
+      detailList: [],
+      detailTotal: 0,
+      currentRow: {
+        title: "月汇总记录",
+        recordKey: null
+      },
+      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]);
+            },
+          },
+        ],
+      },
+    };
+  },
+  components: {},
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        recordKey: null,
+        type: 3,
+        startTime: null,
+        endTime: null,
+        page: 1,
+        limit: 10,
+      };
+      this.actDateRange = [];
+      this.getList();
+    },
+    onSubmit() {
+      this.loading = true;
+      this.clearDetailList()
+      this.currentRow = {
+        title: "月汇总记录",
+        recordKey: null
+      };
+      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();
+    },
+
+    excel() {
+      if (isBlank(this.currentRow.recordKey)) {
+        return this.$message.error("请选择要导出的数据！");
+      }
+      let params = {billNo: this.currentRow.recordKey, key: "month"};
+      excelImport(params).then(res => {
+        let blob = new Blob([res], {type: "application/vnd.ms-excel"});
+        let url = window.URL.createObjectURL(blob); // 创建一个临时的url指向blob对象
+        let a = document.createElement("a");
+        a.href = url;
+        a.click();
+        this.$message("成功")
+      })
+
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    handleSelectionChange(row) {
+      this.currentRow = row;
+      this.getDetailList();
+    },
+    // 清空单据详情数据列表
+    clearDetailList() {
+      this.detailQuery = {
+        recordKey: null,
+        productName: null,
+        batchNo: null,
+        ggxh: null,
+        page: 1,
+        limit: 10
+      }
+      this.detailLoading = false;
+      this.detailList = [];
+      this.detailTotal = 0;
+    },
+    //获取订单列表
+    getList() {
+      this.loading = true;
+      this.clearDetailList();
+      getStatOrderList(this.filterQuery).then((res) => {
+        this.loading = false;
+        if (res.code === 20000) {
+          this.list = res.data.list || [];
+          this.total = res.data.total || 0;
+        }
+      }).catch((error) => {
+        this.$message.error(error.message);
+        this.list = [];
+        this.total = 0;
+      })
+    },
+    resetDetailQuery() {
+      this.detailQuery = {
+        recordKey: null,
+        productName: null,
+        batchNo: null,
+        ggxh: null,
+        page: 1,
+        limit: 10
+      }
+      this.getDetailList();
+    },
+    searchDetail() {
+      this.detailQuery.page = 1;
+      this.getDetailList();
+    },
+    getDetailList() {
+      this.detailLoading = true;
+      this.detailQuery.recordKey = this.currentRow.recordKey;
+      filterMonthList(this.detailQuery).then((res) => {
+        if (res.code === 20000) {
+          this.detailLoading = false;
+          this.detailList = res.data.list || [];
+          this.detailTotal = res.data.total || 0;
+        } else {
+          this.detailList = [];
+          this.detailTotal = 0;
+        }
+      }).catch((error) => {
+        this.$message.error(error.message);
+        this.detailList = [];
+        this.detailTotal = 0;
+      })
+    },
+  },
+  filters: {
+    statusFilterType(status) {
+      const statusMap = {
+        false: "success",
+        true: "warning",
+      };
+      return statusMap[status];
+    },
+  },
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+    this.getList();
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+
+</style>
diff --git a/src/views/drugInout/stat/IoStatQuarterSearch.vue b/src/views/drugInout/stat/IoStatQuarterSearch.vue
new file mode 100644
index 00000000..4fb88bfb
--- /dev/null
+++ b/src/views/drugInout/stat/IoStatQuarterSearch.vue
@@ -0,0 +1,375 @@
+<template>
+  <div>
+    <el-card class="el-card">
+      <el-form :model="filterQuery" class="query-form" size="mini" :inline="true">
+        <el-form-item class="query-form-item" label="汇总记录号:">
+          <el-input v-model="filterQuery.recordKey" placeholder="请输入汇总记录号"
+                    clearable="true"></el-input>
+        </el-form-item>
+
+        <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="结束日期"
+          >
+          </el-date-picker>
+        </el-form-item>
+
+        <el-form-item>
+          <el-button-group>
+            <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>
+        </el-form-item>
+      </el-form>
+
+      <el-table v-loading="loading" :data="list" style="width: 100%;" highlight-current-row class="table-fixed"
+                border
+                @current-change="handleSelectionChange">
+        <el-table-column type="selection" width="55"></el-table-column>
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="仓库" prop="invName"></el-table-column>
+        <el-table-column label="名称" prop="title"></el-table-column>
+        <el-table-column label="记录号" prop="recordKey"></el-table-column>
+        <el-table-column label="汇总日期" prop="date"></el-table-column>
+        <el-table-column label="备注" prop="remark"></el-table-column>
+      </el-table>
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :limit.sync="filterQuery.limit"
+        :page.sync="filterQuery.page"
+        @pagination="getList"
+      ></pagination>
+    </el-card>
+
+    <el-tabs type="border-card" style="margin: 15px">
+      <!--单据业务详情-->
+      <el-tab-pane>
+        <span slot="label">{{ currentRow.title }}-详情</span>
+        <el-form :inline="true" :model="detailQuery" class="query-form" size="mini">
+          <el-form-item class="query-form-item" label="产品名称:">
+            <el-input
+              v-model="detailQuery.productName"
+              placeholder="请输入产品名称"
+              clearable
+            >
+            </el-input>
+          </el-form-item>
+
+          <el-form-item class="query-form-item" label="批次号:">
+            <el-input
+              v-model="detailQuery.batchNo"
+              placeholder="请输入批次号"
+              clearable
+            >
+            </el-input>
+          </el-form-item>
+
+          <el-form-item class="query-form-item" label="规格型号:">
+            <el-input
+              v-model="detailQuery.ggxh"
+              placeholder="请输入规格型号"
+              clearable
+            >
+            </el-input>
+          </el-form-item>
+
+          <el-form-item>
+            <el-button-group>
+              <el-button
+                type="primary"
+                icon="el-icon-refresh"
+                @click="resetDetailQuery"
+              >重置
+              </el-button>
+              <el-button type="primary" @click="searchDetail"
+                         icon="el-icon-search"
+              >查询
+              </el-button>
+              <el-button type="primary" @click="excel"
+                         icon="el-icon-upload2"
+              >导出
+              </el-button>
+            </el-button-group>
+          </el-form-item>
+        </el-form>
+
+        <el-table v-loading="detailLoading" :data="detailList" style="width: 100%" border
+                  row-key="id"
+        >
+          <el-table-column label="序号" type="index"></el-table-column>
+          <el-table-column label="产品名称" prop="productName" width="150" show-overflow-tooltip></el-table-column>
+          <el-table-column label="批次号" prop="batchNo" width="120" show-overflow-tooltip></el-table-column>
+          <el-table-column label="规格型号" prop="ggxh" width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column label="仓库" prop="deptName" width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column label="期初" header-align="center">
+            <el-table-column label="数量" prop="beginCount" width="80"></el-table-column>
+            <el-table-column label="价格" prop="beginPrice" width="100"></el-table-column>
+            <el-table-column label="金额" prop="beginAmount" width="100"></el-table-column>
+          </el-table-column>
+          <el-table-column label="入库" header-align="center">
+            <el-table-column label="数量" prop="inCount" width="80"></el-table-column>
+            <el-table-column label="价格" prop="inPrice" width="100"></el-table-column>
+            <el-table-column label="金额" prop="inAmount" width="100"></el-table-column>
+          </el-table-column>
+          <el-table-column label="出库" header-align="center">
+            <el-table-column label="数量" prop="outCount" width="80"></el-table-column>
+            <el-table-column label="价格" prop="outPrice" width="100"></el-table-column>
+            <el-table-column label="金额" prop="outAmount" width="100"></el-table-column>
+          </el-table-column>
+
+          <el-table-column label="结余" header-align="center">
+            <el-table-column label="数量" prop="balanceCount" width="80"></el-table-column>
+            <el-table-column label="价格" prop="balancePrice" width="100"></el-table-column>
+            <el-table-column label="金额" prop="balanceAmount" width="100"></el-table-column>
+          </el-table-column>
+        </el-table>
+        <pagination
+          v-show="detailTotal>0"
+          :total="detailTotal"
+          :page.sync="detailQuery.page"
+          :limit.sync="detailQuery.limit"
+          @pagination="getDetailList"
+        />
+      </el-tab-pane>
+
+    </el-tabs>
+
+  </div>
+</template>
+
+<script>
+import {getStatOrderList, filterQuarterList, excelImport} from "@/api/inout/statData";
+import {isBlank} from "@/utils/strUtil";
+
+const formJson = {
+  site_id: "",
+  site_name: "",
+  describe: "",
+  ads: [],
+};
+
+export default {
+  name: "IoStatQuarterSearch",
+  data() {
+    return {
+      showSearch: true,
+      filterQuery: {
+        recordKey: null,
+        type: 2,
+        startTime: null,
+        endTime: null,
+        page: 1,
+        limit: 10,
+      },
+      loading: false,
+      list: [],
+      total: 0,
+      detailQuery: {
+        recordKey: null,
+        productName: null,
+        batchNo: null,
+        ggxh: null,
+        page: 1,
+        limit: 10
+      },
+      detailLoading: false,
+      detailList: [],
+      detailTotal: 0,
+      currentRow: {
+        title: "季度汇总记录",
+        recordKey: null
+      },
+      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]);
+            },
+          },
+        ],
+      },
+    };
+  },
+  components: {},
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        recordKey: null,
+        type: 2,
+        startTime: null,
+        endTime: null,
+        page: 1,
+        limit: 10,
+      };
+      this.actDateRange = [];
+      this.getList();
+    },
+    onSubmit() {
+      this.loading = true;
+      this.clearDetailList();
+      this.currentRow = {
+        title: "季度汇总记录",
+        recordKey: null
+      };
+      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;
+    },
+    handleSelectionChange(row) {
+      this.currentRow = row;
+      this.getDetailList();
+    },
+    // 清空单据详情数据列表
+    clearDetailList() {
+      this.detailQuery = {
+        recordKey: null,
+        productName: null,
+        batchNo: null,
+        ggxh: null,
+        page: 1,
+        limit: 10
+      }
+      this.detailLoading = false;
+      this.detailList = [];
+      this.detailTotal = 0;
+    },
+    excel() {
+      if (isBlank(this.currentRow.recordKey)) {
+        return this.$message.error("请选择要导出的数据！");
+      }
+      let params = {billNo: this.currentRow.recordKey, key: "quarter"};
+      excelImport(params).then(res => {
+        let blob = new Blob([res], {type: "application/vnd.ms-excel"});
+        let url = window.URL.createObjectURL(blob); // 创建一个临时的url指向blob对象
+        let a = document.createElement("a");
+        a.href = url;
+        a.click();
+        this.$message("成功")
+      })
+
+    },
+    //获取订单列表
+    getList() {
+      this.loading = true;
+      this.clearDetailList();
+      getStatOrderList(this.filterQuery).then((res) => {
+        this.loading = false;
+        if (res.code === 20000) {
+          this.list = res.data.list || [];
+          this.total = res.data.total || 0;
+        }
+      }).catch((error) => {
+        this.$message.error(error.message);
+        this.list = [];
+        this.total = 0;
+      })
+    },
+    resetDetailQuery() {
+      this.detailQuery = {
+        recordKey: null,
+        productName: null,
+        batchNo: null,
+        ggxh: null,
+        page: 1,
+        limit: 10
+      }
+      this.getDetailList();
+    },
+    searchDetail() {
+      this.detailQuery.page = 1;
+      this.getDetailList();
+    },
+    getDetailList() {
+      this.detailLoading = true;
+      this.detailQuery.recordKey = this.currentRow.recordKey;
+      filterQuarterList(this.detailQuery).then((res) => {
+        if (res.code === 20000) {
+          this.detailLoading = false;
+          this.detailList = res.data.list || [];
+          this.detailTotal = res.data.total || 0;
+        } else {
+          this.detailList = [];
+          this.detailTotal = 0;
+        }
+      }).catch((error) => {
+        this.$message.error(error.message);
+        this.detailList = [];
+        this.detailTotal = 0;
+      })
+    },
+  },
+  filters: {
+    statusFilterType(status) {
+      const statusMap = {
+        false: "success",
+        true: "warning",
+      };
+      return statusMap[status];
+    },
+  },
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+    this.getList();
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+
+</style>
diff --git a/src/views/drugInout/stat/IoStatYearSearch.vue b/src/views/drugInout/stat/IoStatYearSearch.vue
new file mode 100644
index 00000000..219e4676
--- /dev/null
+++ b/src/views/drugInout/stat/IoStatYearSearch.vue
@@ -0,0 +1,375 @@
+<template>
+  <div>
+    <el-card class="el-card">
+      <el-form :model="filterQuery" class="query-form" size="mini" :inline="true">
+        <el-form-item class="query-form-item" label="汇总记录号:">
+          <el-input v-model="filterQuery.recordKey" placeholder="请输入汇总记录号"
+                    clearable="true"></el-input>
+        </el-form-item>
+
+        <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="结束日期"
+          >
+          </el-date-picker>
+        </el-form-item>
+
+        <el-form-item>
+          <el-button-group>
+            <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>
+        </el-form-item>
+      </el-form>
+
+      <el-table v-loading="loading" :data="list" style="width: 100%;" highlight-current-row class="table-fixed"
+                border
+                @current-change="handleSelectionChange">
+        <el-table-column type="selection" width="55"></el-table-column>
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="仓库" prop="invName"></el-table-column>
+        <el-table-column label="名称" prop="title"></el-table-column>
+        <el-table-column label="记录号" prop="recordKey"></el-table-column>
+        <el-table-column label="汇总日期" prop="date"></el-table-column>
+        <el-table-column label="备注" prop="remark"></el-table-column>
+      </el-table>
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :limit.sync="filterQuery.limit"
+        :page.sync="filterQuery.page"
+        @pagination="getList"
+      ></pagination>
+    </el-card>
+
+    <el-tabs type="border-card" style="margin: 15px">
+      <!--单据业务详情-->
+      <el-tab-pane>
+        <span slot="label">{{ currentRow.title }}-详情</span>
+        <el-form :inline="true" :model="detailQuery" class="query-form" size="mini">
+          <el-form-item class="query-form-item" label="产品名称:">
+            <el-input
+              v-model="detailQuery.productName"
+              placeholder="请输入产品名称"
+              clearable
+            >
+            </el-input>
+          </el-form-item>
+
+          <el-form-item class="query-form-item" label="批次号:">
+            <el-input
+              v-model="detailQuery.batchNo"
+              placeholder="请输入批次号"
+              clearable
+            >
+            </el-input>
+          </el-form-item>
+
+          <el-form-item class="query-form-item" label="规格型号:">
+            <el-input
+              v-model="detailQuery.ggxh"
+              placeholder="请输入规格型号"
+              clearable
+            >
+            </el-input>
+          </el-form-item>
+
+          <el-form-item>
+            <el-button-group>
+              <el-button
+                type="primary"
+                icon="el-icon-refresh"
+                @click="resetDetailQuery"
+              >重置
+              </el-button>
+              <el-button type="primary" @click="searchDetail"
+                         icon="el-icon-search"
+              >查询
+              </el-button>
+              <el-button type="primary" @click="excel"
+                         icon="el-icon-upload2"
+              >导出
+              </el-button>
+            </el-button-group>
+          </el-form-item>
+        </el-form>
+
+        <el-table v-loading="detailLoading" :data="detailList" style="width: 100%" border
+                  row-key="id"
+        >
+          <el-table-column label="序号" type="index"></el-table-column>
+          <el-table-column label="产品名称" prop="productName" width="150" show-overflow-tooltip></el-table-column>
+          <el-table-column label="批次号" prop="batchNo" width="120" show-overflow-tooltip></el-table-column>
+          <el-table-column label="规格型号" prop="ggxh" width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column label="仓库" prop="deptName" width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column label="期初" header-align="center">
+            <el-table-column label="数量" prop="beginCount" width="80"></el-table-column>
+            <el-table-column label="价格" prop="beginPrice" width="100"></el-table-column>
+            <el-table-column label="金额" prop="beginAmount" width="100"></el-table-column>
+          </el-table-column>
+          <el-table-column label="入库" header-align="center">
+            <el-table-column label="数量" prop="inCount" width="80"></el-table-column>
+            <el-table-column label="价格" prop="inPrice" width="100"></el-table-column>
+            <el-table-column label="金额" prop="inAmount" width="100"></el-table-column>
+          </el-table-column>
+          <el-table-column label="出库" header-align="center">
+            <el-table-column label="数量" prop="outCount" width="80"></el-table-column>
+            <el-table-column label="价格" prop="outPrice" width="100"></el-table-column>
+            <el-table-column label="金额" prop="outAmount" width="100"></el-table-column>
+          </el-table-column>
+
+          <el-table-column label="结余" header-align="center">
+            <el-table-column label="数量" prop="balanceCount" width="80"></el-table-column>
+            <el-table-column label="价格" prop="balancePrice" width="100"></el-table-column>
+            <el-table-column label="金额" prop="balanceAmount" width="100"></el-table-column>
+          </el-table-column>
+        </el-table>
+        <pagination
+          v-show="detailTotal>0"
+          :total="detailTotal"
+          :page.sync="detailQuery.page"
+          :limit.sync="detailQuery.limit"
+          @pagination="getDetailList"
+        />
+      </el-tab-pane>
+
+    </el-tabs>
+
+  </div>
+</template>
+
+<script>
+import {getStatOrderList, filterYearList, excelImport} from "@/api/inout/statData";
+import {isBlank} from "@/utils/strUtil";
+
+const formJson = {
+  site_id: "",
+  site_name: "",
+  describe: "",
+  ads: [],
+};
+
+export default {
+  name: "IoStatYearSearch",
+  data() {
+    return {
+      showSearch: true,
+      filterQuery: {
+        recordKey: null,
+        type: 1,
+        startTime: null,
+        endTime: null,
+        page: 1,
+        limit: 10,
+      },
+      loading: false,
+      list: [],
+      total: 0,
+      detailQuery: {
+        recordKey: null,
+        productName: null,
+        batchNo: null,
+        ggxh: null,
+        page: 1,
+        limit: 10
+      },
+      detailLoading: false,
+      detailList: [],
+      detailTotal: 0,
+      currentRow: {
+        title: "年汇总记录",
+        recordKey: null
+      },
+      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]);
+            },
+          },
+        ],
+      },
+    };
+  },
+  components: {},
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        recordKey: null,
+        type: 1,
+        startTime: null,
+        endTime: null,
+        page: 1,
+        limit: 10,
+      };
+      this.actDateRange = [];
+      this.getList();
+    },
+    onSubmit() {
+      this.loading = true;
+      this.clearDetailList();
+      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();
+    },
+    excel() {
+      if (isBlank(this.currentRow.recordKey)) {
+        return this.$message.error("请选择要导出的数据！");
+      }
+      let params = {billNo: this.currentRow.recordKey, key: "year"};
+      excelImport(params).then(res => {
+        let blob = new Blob([res], {type: "application/vnd.ms-excel"});
+        let url = window.URL.createObjectURL(blob); // 创建一个临时的url指向blob对象
+        let a = document.createElement("a");
+        a.href = url;
+        a.click();
+        this.$message("成功")
+      })
+
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    handleSelectionChange(row) {
+      this.currentRow = row;
+      this.getDetailList();
+    },
+    // 清空单据详情数据列表
+    clearDetailList() {
+      this.detailQuery = {
+        recordKey: null,
+        productName: null,
+        batchNo: null,
+        ggxh: null,
+        page: 1,
+        limit: 10
+      }
+      this.detailLoading = false;
+      this.detailList = [];
+      this.detailTotal = 0;
+    },
+    //获取订单列表
+    getList() {
+      this.loading = true;
+      this.clearDetailList();
+      this.currentRow = {
+        title: "年汇总记录",
+        recordKey: null
+      };
+      getStatOrderList(this.filterQuery).then((res) => {
+        this.loading = false;
+        if (res.code === 20000) {
+          this.list = res.data.list || [];
+          this.total = res.data.total || 0;
+        }
+      }).catch((error) => {
+        this.$message.error(error.message);
+        this.list = [];
+        this.total = 0;
+      })
+    },
+    resetDetailQuery() {
+      this.detailQuery = {
+        recordKey: null,
+        productName: null,
+        batchNo: null,
+        ggxh: null,
+        page: 1,
+        limit: 10
+      }
+      this.getDetailList();
+    },
+    searchDetail() {
+      this.detailQuery.page = 1;
+      this.getDetailList();
+    },
+    getDetailList() {
+      this.detailLoading = true;
+      this.detailQuery.recordKey = this.currentRow.recordKey;
+      filterYearList(this.detailQuery).then((res) => {
+        if (res.code === 20000) {
+          this.detailLoading = false;
+          this.detailList = res.data.list || [];
+          this.detailTotal = res.data.total || 0;
+        } else {
+          this.detailList = [];
+          this.detailTotal = 0;
+        }
+      }).catch((error) => {
+        this.$message.error(error.message);
+        this.detailList = [];
+        this.detailTotal = 0;
+      })
+    },
+  },
+  filters: {
+    statusFilterType(status) {
+      const statusMap = {
+        false: "success",
+        true: "warning",
+      };
+      return statusMap[status];
+    },
+  },
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+    this.getList();
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+
+</style>
diff --git a/src/views/drugInventory/InvProducts.vue b/src/views/drugInventory/InvProducts.vue
new file mode 100644
index 00000000..56091acd
--- /dev/null
+++ b/src/views/drugInventory/InvProducts.vue
@@ -0,0 +1,707 @@
+<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="18">
+            <el-form-item label="扫码查询:">
+              <el-input v-model="filterQuery.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 label="DI/物资编码:">
+              <el-input v-model="filterQuery.nameCode" placeholder="请输入DI/物资编码"
+                        style="width: 90%"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="物资名称:">
+              <el-input v-model="filterQuery.cpmctymc" placeholder="请输入物资名称"
+                        style="width: 90%"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="规格型号:">
+              <el-input v-model="filterQuery.ggxh" placeholder="请输入规格型号"
+                        style="width: 90%"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="批次号:">
+              <el-input v-model="filterQuery.batchNo" placeholder="请输入批次号"
+                        style="width: 90%"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="注册/备案号:">
+              <el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="请输入注册/备案号"
+                        style="width: 90%"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="生产企业:">
+              <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="请输入生产企业"
+                        style="width: 90%"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-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="6">
+            <el-form-item label="所属货位:">
+              <el-select
+                v-model="filterQuery.invSpaceCode"
+                filterable
+                remote
+                clearable="true"
+                reserve-keyword
+                placeholder="请选择所属货位"
+                :remote-method="getSpaceList"
+                size="mini"
+                :loading="corpLoading"
+                style="width: 90%"
+              >
+                <el-option
+                  v-for="item in spaceList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.code"
+                >
+                  <span style="float: left">{{ item.name }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
+
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="过滤方式:">
+              <el-select
+                v-model="filterQuery.filterNoInv"
+                style="width: 90%"
+                clearable>
+                <el-option label="有库存" :value="1"></el-option>
+                <el-option label="零库存" :value="2"></el-option>
+                <el-option label="负库存" :value="3"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="供应商名称:">
+              <el-select
+                v-model="filterQuery.supId"
+                filterable
+                remote
+                clearable="true"
+                reserve-keyword
+                placeholder="请选择供应商名称"
+                :remote-method="findMethod"
+                size="mini"
+                :loading="corpLoading"
+                @change="corpChange"
+                style="width: 90%"
+                @clear="getcorp"
+              >
+                <el-option
+                  v-for="item in fromOptions"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.erpId"
+                >
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+        </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"
+                />
+                <span style="float: left">{{ item.name }}</span>
+                <span v-if="item.isShowXx == '1'" style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
+              </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"
+                :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"
+                />
+                <span style="float: left">{{ item.name }}</span>
+                <span v-if="item.isShowXx == '1'" style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
+              </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>
+       <!-- <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="供应商" prop="supName" v-if="showSup" show-overflow-tooltip
+                         width="120"></el-table-column>
+        <el-table-column label="货架" prop="spaceName"
+                         v-if="filterQuery.invSpaceCode!='' && filterQuery.invSpaceCode!=null" show-overflow-tooltip
+                         width="120"></el-table-column>
+        <el-table-column label="DI/物资编码" prop="nameCode" width="150"></el-table-column>
+        <el-table-column label="物资名称" prop="cpmctymc" width="180" show-overflow-tooltip></el-table-column>
+        <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip width="180"></el-table-column>
+        <el-table-column label="批次号" prop="batchNo" width="120"></el-table-column>
+        <el-table-column label="价格" prop="price" width="120"></el-table-column>
+        <el-table-column label="入库数量" prop="inCount" width="120"></el-table-column>
+        <el-table-column label="出库数量" prop="outCount" width="120">
+        </el-table-column>
+        <el-table-column label="结余数量" prop="reCount" width="120">
+        </el-table-column>
+        <el-table-column label="部门" prop="deptName" v-if="showSup"
+                         show-overflow-tooltip width="120"></el-table-column>
+        <el-table-column label="仓库" prop="invName" v-if="showSup"
+                         show-overflow-tooltip width="120"></el-table-column>
+        <el-table-column label="计量单位" prop="measname" 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="ylqxzcrbarmc" show-overflow-tooltip
+                         width="120"></el-table-column>
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column label="操作" width="180" fixed="right">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click.native.stop="invRemindSet(scope.row)"
+            >添加预警设置
+            </el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              @click.native.stop="detailDialog(scope.row)"
+            >详情
+            </el-button
+            >
+          </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>
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :limit.sync="filterQuery.limit"
+        :page.sync="filterQuery.page"
+        @pagination="getList"
+      ></pagination>
+    </el-card>
+
+    <el-dialog
+      title="库存详情"
+      :visible.sync="detailDialogVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="85%"
+      v-if="detailDialogVisible"
+    >
+      <invProductsDetail
+        :inputQuery="inputQuery"
+        v-on:closeDetailDialog="closeDetailDialog"
+      ></invProductsDetail>
+    </el-dialog>
+
+    <el-dialog
+      title="添加库存预警设置"
+      :visible.sync="addInvRemindSetDialogVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="60%"
+      v-if="addInvRemindSetDialogVisible"
+    >
+      <addInvRemindSetDialog
+        :invId="invId"
+        :closeDialog="closeRemindSetDialog"
+      ></addInvRemindSetDialog>
+    </el-dialog>
+
+
+  </div>
+</template>
+
+<script>
+import {getInvListByUserOptimize} from "@/api/system/invWarehouse";
+import {getInvProduct, deleteInvProduct, getProduct} from "@/api/inventory/invPorduct";
+import {getBasicUnitMaintainsOptimize} from "@/api/basic/basicUnitMaintain";
+import {isBlank} from "@/utils/strUtil";
+import invProductsDetail from "@/views/drugInventory/InvProductsDetail.vue";
+import addInvRemindSetDialog from "@/views/drugInventory/addInvRemindSetDialog.vue";
+import {getInvSpaceListOptimize} from "@/api/inventory/invSpace";
+import {selectUser} from "@/api/auth/authAdmin";
+import {
+  getHead,executeFuc
+} from "@/utils/customConfig";
+
+export default {
+  name: "InvProducts",
+  data() {
+    return {
+      showSearch: true,
+      filterQuery: {
+        nameCode: null,
+        cpmctymc: null,
+        ggxh: null,
+        batchNo: null,
+        supId: null,
+        zczbhhzbapzbh: null,
+        ylqxzcrbarmc: null,
+        invCode: this.$store.getters.locInvCode,
+        invSpaceCode: null,
+        productsType: 2,
+        page: 1,
+        limit: 10,
+        udiCode: null,
+        filterNoInv: '1',
+      },
+      list: [],
+     total: 0,
+     tableHeader:[],
+     queryList:[],
+     fromList:[],
+     options: {
+       getInvList:[],
+       findMethod:[],
+       getSpaceList:[],
+     },
+      invList: [],
+      loading: false,
+      deleteData: {
+        id: "",
+        status: 10,
+      },
+      dialogVisible: false,
+      corpLoading: false,
+      fromOptions: [],
+      showSup: false,
+      detailDialogVisible: false,
+      inputQuery: {
+        cpmctymc: null,
+        nameCode: null,
+        batchNo: null,
+        ggxh: null,
+        productionDate: null,
+        expireDate: null,
+        supId: null,
+        deptCode: null,
+        invCode: null,
+        price: null,
+      },
+      addInvRemindSetDialogVisible: false,
+      invId: null,
+      spaceList: [],
+    };
+  },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        nameCode: null,
+        cpmctymc: null,
+        ggxh: null,
+        batchNo: null,
+        supId: null,
+        zczbhhzbapzbh: null,
+        ylqxzcrbarmc: null,
+        invCode: null,
+        productsType: 2,
+        page: 1,
+        limit: 10,
+      };
+      this.getList();
+      this.findMethod(this);
+    },
+
+    keyup_submit(_this,event) {
+      _this.filterQuery.page = 1;
+      _this.getList();
+      event.target.select();
+    },
+
+
+    onSubmit() {
+      this.filterQuery.page = 1;
+      this.getList();
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    handleSizeChange(val) {
+      this.filterQuery.limit = val;
+      this.getList();
+    },
+    handleCurrentChange(val) {
+      this.filterQuery.page = val;
+      this.getList();
+    },
+    getList() {
+      this.loading = true;
+      getProduct(this.filterQuery).then((res) => {
+        this.loading = false;
+        if (res.code === 20000) {
+          this.list = res.data.list || [];
+          this.total = res.data.total || 0;
+        } else {
+          this.$message.error(res.message);
+          this.list = [];
+          this.total = 0;
+        }
+      }).catch((error) => {
+        this.loading = false;
+        this.$message.error(error.message);
+        this.list = [];
+        this.total = 0;
+      })
+    },
+    getInvList(_this) {
+      let query = {
+        advanceType: 1,
+      };
+      getInvListByUserOptimize(query)
+        .then((response) => {
+           _this.options.getInvList = response.data || [];
+          _this.getList();
+          _this.getSpaceList(_this);
+        })
+        .catch(() => {
+        });
+    },
+    findMethod(_this,key) {
+      _this.corpLoading = true;
+      _this.fromOptions = [];
+      let params = {
+        key: key,
+        corpType: 2,
+        page: 1,
+        limit: 20
+      };
+      getBasicUnitMaintainsOptimize(params).then((res) => {
+        _this.corpLoading = false;
+         _this.options.findMethod = res.data.list || [];
+      }).catch(() => {
+        _this.corpLoading = false;
+      });
+    },
+    corpChange(_this,value) {
+      if (!isBlank(value)) {
+        _this.findMethod(_this,value);
+      }
+    },
+    getcorp() {
+      this.findMethod(this);
+    },
+    detailDialog(_this,row) {
+      _this.inputQuery = {
+        code: row.code,
+        relId: row.relIdFk,
+        cpmctymc: row.cpmctymc,
+        nameCode: row.nameCode,
+        batchNo: row.batchNo,
+        ggxh: row.ggxh,
+        productionDate: row.productionDate,
+        expireDate: row.expireDate,
+        supId: row.supId,
+        deptCode: row.deptCode,
+        invCode: row.invCode,
+        invSpaceCode: row.invSpaceCode,
+        price: row.price
+      }
+      if (_this.$isBlank(_this.filterQuery.invCode)) {
+        _this.inputQuery.deptCode = '';
+        _this.inputQuery.invCode = '';
+      }
+      _this.detailDialogVisible = true;
+    },
+    closeDetailDialog() {
+      this.detailDialogVisible = false;
+    },
+    deleteDialog(id) {
+      this.$confirm("此操作将永久删除此库存信息，是否继续？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        thisdeleteInvProduct(id);
+      }).catch(() => {
+      });
+    },
+    deleteInvProduct(id) {
+      let params = {id: id};
+      deleteInvProduct(params).then((res) => {
+        if (res.code === 20000) {
+          this.$message.success("删除成功！");
+          this.getList();
+        } else {
+          this.$message.error(res.message);
+        }
+      }).catch((error) => {
+        this.$message.error(error.message);
+      });
+    },
+    invRemindSet(_this,row) {
+      _this.invId = row.id;
+      _this.addInvRemindSetDialogVisible = true;
+    },
+    closeRemindSetDialog() {
+      this.invId = null;
+      this.addInvRemindSetDialogVisible = false;
+    },
+    getSpaceList(_this) {
+
+      if (isBlank(_this.filterQuery.invCode)) {
+        return;
+      }
+      let params = {
+        invWarehouseCode: _this.filterQuery.invCode,
+        status: 1
+      };
+      getInvSpaceListOptimize(params).then((res) => {
+         _this.options.getSpaceList = res.data.list || [];
+      })
+    },
+    querySearchAsync(queryString, cb) {
+      let restaurants = this.spaceList;
+      restaurants.forEach((item) => {
+        item.value = item.name;
+      })
+
+      let results = queryString ? restaurants.filter(this.createStateFilter(queryString)) : restaurants;
+      if (!isBlank(queryString)) {
+        this.spaceSearchResult = results;
+      }
+      cb(results);
+    },
+    invChange(_this) {
+      _this.getSpaceList(_this);
+    },
+    executeFuc(row,type,clickFuc,value){
+      return executeFuc(this,row,type,clickFuc,value);
+    },
+    executeEval(row,expression,defaultRet){
+      if(expression){
+        return eval(expression);
+      }
+      return defaultRet;
+    }
+  },
+  components: {
+    invProductsDetail,
+    addInvRemindSetDialog
+  },
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+    this.filterQuery.invCode = this.$store.getters.locInvCode
+    selectUser().then((res) => {
+      let supId = res.data.customerId
+      if (supId == "110") {
+        this.showSup = true;
+      }
+    }).catch(() => {
+      this.corpLoading = false;
+    });
+    this.findMethod(this);
+    this.getInvList(this);
+    getHead("InvDrugProducts","1").then((re) => {
+      // 处理返回的数据
+      this.tableObj = re.data;
+      this.tableHeader = re.data.tableList;
+      this.queryList = re.data.queryList;
+      this.fromList = re.data.fromList;
+      this.getList();
+    });
+  },
+};
+</script>
+
+<style type="text/scss" lang="scss">
+</style>
+
diff --git a/src/views/drugInventory/InvProductsDetail.vue b/src/views/drugInventory/InvProductsDetail.vue
new file mode 100644
index 00000000..66e9c888
--- /dev/null
+++ b/src/views/drugInventory/InvProductsDetail.vue
@@ -0,0 +1,317 @@
+<template>
+  <div>
+    <el-descriptions class="margin-top" title="产品信息" :column="3" :size="size" border>
+      <el-descriptions-item>
+        <template slot="label">
+          物资名称
+        </template>
+        {{ inputQuery.cpmctymc }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          DI/物资编码
+        </template>
+        {{ inputQuery.nameCode }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          批次号
+        </template>
+        {{ inputQuery.batchNo }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          规格型号
+        </template>
+        {{ inputQuery.ggxh }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          生产日期
+        </template>
+        {{ inputQuery.productionDate }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          失效日期
+        </template>
+        {{ inputQuery.expireDate }}
+      </el-descriptions-item>
+    </el-descriptions>
+
+    <el-form :inline="true" :model="invProductDetailQuery" style="margin-top: 10px;" size="mini">
+      <el-form-item class="query-form-item" label="UDI码:">
+        <el-input v-model="invProductDetailQuery.code"
+                  placeholder="请输入UDI码查询"
+                  clearable
+                  style="width: 100%"
+        ></el-input>
+      </el-form-item>
+      <el-form-item class="query-form-item" label="出入库类型:">
+        <el-select v-model="invProductDetailQuery.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-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-form-item>
+        <el-button-group>
+          <el-button type="primary" icon="search" @click="onSubmit"
+          >查询
+          </el-button
+          >
+        </el-button-group>
+      </el-form-item>
+    </el-form>
+    <el-table v-loading="loading" :data="list" style="width: 100%"
+              :default-sort="defaultSort"
+              @sort-change="handleSortChange"
+              border>
+      <el-table-column label="序号" type="index"></el-table-column>
+      <el-table-column
+          label="UDI码"
+          prop="code"
+          width="350"
+          show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+          label="出入库单号"
+          prop="orderId"
+          width="180"
+          show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+          label="单据类型"
+          prop="actionName"
+          width="150"
+      ></el-table-column>
+      <el-table-column
+          label="出入库类型"
+          prop="mainActionStr"
+          width="120"
+          show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+          label="货位"
+          prop="invSpaceName"
+          width="120"
+          show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+          label="价格"
+          prop="price"
+          width="120"
+          show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+          label="入库数量"
+          prop="inCount"
+          width="120"
+          show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+          label="出库数量"
+          prop="outCount"
+          width="120"
+          show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+          label="单据日期"
+          prop="orderTime"
+          :sort-orders="['ascending', 'descending']"
+          sortable="custom"
+          width="150"
+          show-overflow-tooltip
+      ></el-table-column>
+    </el-table>
+    <pagination
+        v-show="total>0"
+        :total="total"
+        :limit.sync="invProductDetailQuery.limit"
+        :page.sync="invProductDetailQuery.page"
+        @pagination="getList"
+    ></pagination>
+
+  </div>
+</template>
+
+<script>
+import {getInvProductDetail} from "@/api/inventory/invPorduct";
+import {isBlank} from "@/utils/strUtil";
+
+export default {
+  name: "InvProductsDetail",
+  props: {
+    inputQuery: {
+      type: Object,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      invProductDetailQuery: {
+        mainAction: null,
+        code: null,
+        relId: null,
+        supId: null,
+        batchNo: null,
+        deptCode: null,
+        invCode: null,
+        price: null,
+        page: 1,
+        limit: 10
+      },
+      list: [],
+      total: 0,
+      loading: false,
+      defaultSort: {prop: 'orderTime', order: 'desc'},
+      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]);
+            },
+          },
+        ],
+      },
+    };
+  },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.invProductDetailQuery = {
+        mainAction: null,
+        code: null,
+        relId: null,
+        supId: null,
+        batchNo: null,
+        deptCode: null,
+        invCode: null,
+        price: null,
+        page: 1,
+        limit: 10
+      };
+      this.getList();
+      this.actDateRange = [];
+    },
+    onSubmit() {
+      this.invProductDetailQuery.page = 1;
+      this.getList();
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    handleSizeChange(val) {
+      this.invProductDetailQuery.limit = val;
+      this.getList();
+    },
+    handleCurrentChange(val) {
+      this.invProductDetailQuery.page = val;
+      this.getList();
+    },
+
+    handleSortChange(column, prop, order) {
+      if (column.order === 'descending') {
+        this.invProductDetailQuery.sort = 'desc'
+      } else {
+        this.invProductDetailQuery.sort = 'asc'
+      }
+      this.invProductDetailQuery.orderBy = column.prop;
+
+
+      this.getList();
+    },
+
+    getList() {
+      this.loading = true;
+      if (this.actDateRange !== null) {
+        this.invProductDetailQuery.startTime = this.actDateRange[0];
+        this.invProductDetailQuery.endTime = this.actDateRange[1];
+      } else {
+        this.invProductDetailQuery.startTime = null;
+        this.invProductDetailQuery.endTime = null;
+      }
+      this.invProductDetailQuery.relId = this.inputQuery.relId;
+      this.invProductDetailQuery.supId = this.inputQuery.supId;
+      this.invProductDetailQuery.invSpaceCode = this.inputQuery.invSpaceCode;
+      this.invProductDetailQuery.batchNo = this.inputQuery.batchNo;
+      this.invProductDetailQuery.deptCode = this.inputQuery.deptCode;
+      this.invProductDetailQuery.invCode = this.inputQuery.invCode;
+      this.invProductDetailQuery.price = this.inputQuery.price;
+      /*if(!isBlank(this.invProductDetailQuery.invSpaceCode)){
+        this.invProductDetailQuery.code=this.inputQuery.code
+      }*/
+      getInvProductDetail(this.invProductDetailQuery).then((res) => {
+        this.loading = false;
+        if (res.code === 20000) {
+          this.list = res.data.list || [];
+          this.total = res.data.total || 0;
+        } else {
+          this.$message.error(res.message);
+          this.list = [];
+          this.total = 0;
+        }
+      }).catch((error) => {
+        this.loading = false;
+        this.$message.error(error.message);
+        this.list = [];
+        this.total = 0;
+      })
+    },
+  },
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+    this.getList();
+  },
+};
+</script>
+
+<style type="text/scss" lang="scss">
+</style>
+
diff --git a/src/views/drugInventory/addInvRemindSetDialog.vue b/src/views/drugInventory/addInvRemindSetDialog.vue
new file mode 100644
index 00000000..f4f4a631
--- /dev/null
+++ b/src/views/drugInventory/addInvRemindSetDialog.vue
@@ -0,0 +1,225 @@
+<template>
+  <div>
+    <el-form :model="formData" label-width="200px">
+      <el-row>
+        <el-col :span="10">
+          <el-form-item class="query-form-item" label="仓库：">
+            <el-input v-model="formData.invName" disabled></el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="10">
+          <el-form-item class="query-form-item" label="货位：">
+            <el-input v-model="formData.invSpaceName" disabled></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="10">
+          <el-form-item class="query-form-item" label="产品名称：">
+            <el-input v-model="formData.productName" disabled></el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="10">
+          <el-form-item class="query-form-item" label="规格型号：">
+            <el-input v-model="formData.ggxh" disabled></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+
+      <el-row>
+        <el-col :span="10">
+          <el-form-item class="query-form-item" label="低库存预警数量：">
+            <el-input v-model="formData.lowStockNum" disabled></el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="10">
+          <el-form-item class="query-form-item" label="库存积压预警数量：">
+            <el-input v-model="formData.overStockNum" disabled></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="10">
+          <el-form-item class="query-form-item" label="近效期预警时间：">
+            <el-input v-model="formData.recentDateTime" disabled></el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="10">
+          <el-form-item class="query-form-item" label="近效期预警时间单位：">
+            <el-input v-show="formData.isDateBy == 1" value="天" disabled></el-input>
+            <el-input v-show="formData.isDateBy == 2" value="小时" disabled></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-divider></el-divider>
+
+      <el-row>
+        <el-col :span="10">
+          <el-form-item class="query-form-item" label="是否开启低库存预警">
+            <el-select v-model="formData.lowStock">
+              <el-option :value="true" label="开启"></el-option>
+              <el-option :value="false" label="关闭"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="10">
+          <el-form-item class="query-form-item" label="是否开启负库存预警">
+            <el-select v-model="formData.lackStock">
+              <el-option :value="true" label="开启"></el-option>
+              <el-option :value="false" label="关闭"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="10">
+          <el-form-item class="query-form-item" label="是否开启库存积压预警">
+            <el-select v-model="formData.overStock">
+              <el-option :value="true" label="开启"></el-option>
+              <el-option :value="false" label="关闭"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="10">
+          <el-form-item class="query-form-item" label="是否开启产品过期预警">
+            <el-select v-model="formData.expireDate">
+              <el-option :value="true" label="开启"></el-option>
+              <el-option :value="false" label="关闭"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="10">
+          <el-form-item class="query-form-item" label="是否开启近效期预警">
+            <el-select v-model="formData.recentDate">
+              <el-option :value="true" label="开启"></el-option>
+              <el-option :value="false" label="关闭"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+
+    <div slot="footer" class="dialog-footer">
+      <el-button @click.native="closeDialog">取消</el-button>
+      <el-button type="primary" @click.native="addInvRemindSet()" :loading="formLoading"
+      >提交
+      </el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import {getInfoByInvId, saveInvRemindSet} from "@/api/system/invRemindSet";
+
+export default {
+  name: "addInvRemindSetDialog",
+  props: {
+    invId: {
+      type: String,
+      required: true
+    },
+    closeDialog: {
+      type: Function,
+      required: true
+    }
+  },
+  data() {
+    return {
+      formData: {
+        relId: null,
+        ggxh: null,
+        deptCode: null,
+        invCode: null,
+        invSpaceCode: null,
+        lowStock: null,
+        lackStock: false,
+        overStock: false,
+        expireDate: false,
+        recentDate: false,
+        lowStockNum: null,
+        overStockNum: null,
+        recentDateTime: null,
+        isDateBy: null,
+        invName: null,
+        invSpaceName: null,
+        productName: null
+      },
+      formLoading: false
+    };
+  },
+  methods: {
+    getRemindSetInfo() {
+      getInfoByInvId({invId: this.invId}).then((res) => {
+        if (res.code === 20000) {
+          this.formData = res.data;
+          if (res.data.lowStock == null) {
+            this.formData.lowStock = false;
+          }
+          if (res.data.lackStock == null) {
+            this.formData.lackStock = false;
+          }
+          if (res.data.overStock == null) {
+            this.formData.overStock = false;
+          }
+          if (res.data.expireDate == null) {
+            this.formData.expireDate = false;
+          }
+          if (res.data.recentDate == null) {
+            this.formData.recentDate = false;
+          }
+        } else {
+          this.$message.error(res.meesage);
+        }
+      }).catch((error) => {
+        this.$message.error(error.message);
+      })
+    },
+    addInvRemindSet() {
+      if (!this.formData.lowStock && !this.formData.lackStock && !this.formData.overStock && !this.formData.expireDate && !this.formData.recentDate) {
+        this.$message.warning("至少开启一项预警！");
+        return;
+      }
+      this.formLoading = true
+      saveInvRemindSet(this.formData, "add").then((res) => {
+        this.formLoading = false
+        if (res.code === 20000) {
+          this.closeDialog();
+        } else {
+          this.$message.error(res.message);
+        }
+      }).catch((error) => {
+        this.formLoading = false
+        this.$message.error(error.message);
+        this.closeDialog();
+      })
+    },
+  },
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+    this.getRemindSetInfo();
+  },
+};
+</script>
+
+<style type="text/scss" lang="scss">
+</style>
+
diff --git a/src/views/drugInventory/supInoutSearchOrder.vue b/src/views/drugInventory/supInoutSearchOrder.vue
new file mode 100644
index 00000000..5af23e36
--- /dev/null
+++ b/src/views/drugInventory/supInoutSearchOrder.vue
@@ -0,0 +1,891 @@
+<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="18">
+             <el-form-item label="扫码查询:">
+               <el-input v-model="filterQuery.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 label="DI/物资编码:">
+               <el-input v-model="filterQuery.nameCode" placeholder="请输入DI/物资编码"
+                         style="width: 90%"
+                         clearable="true"></el-input>
+             </el-form-item>
+           </el-col>
+           <el-col :span="6">
+             <el-form-item label="物资名称:">
+               <el-input v-model="filterQuery.cpmctymc" placeholder="请输入物资名称"
+                         style="width: 90%"
+                         clearable="true"></el-input>
+             </el-form-item>
+           </el-col>
+           <el-col :span="6">
+             <el-form-item label="规格型号:">
+               <el-input v-model="filterQuery.ggxh" placeholder="请输入规格型号"
+                         style="width: 90%"
+                         clearable="true"></el-input>
+             </el-form-item>
+           </el-col>
+           <el-col :span="6">
+             <el-form-item label="批次号:">
+               <el-input v-model="filterQuery.batchNo" placeholder="请输入批次号"
+                         style="width: 90%"
+                         clearable="true"></el-input>
+             </el-form-item>
+           </el-col>
+           <el-col :span="6">
+             <el-form-item label="注册/备案号:">
+               <el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="请输入注册/备案号"
+                         style="width: 90%"
+                         clearable="true"></el-input>
+             </el-form-item>
+           </el-col>
+           <el-col :span="6">
+             <el-form-item label="生产企业:">
+               <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="请输入生产企业"
+                         style="width: 90%"
+                         clearable="true"></el-input>
+             </el-form-item>
+           </el-col>
+           <el-col :span="6">
+             <el-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="6">
+             <el-form-item label="所属货位:">
+               <el-select
+                 v-model="filterQuery.invSpaceCode"
+                 filterable
+                 remote
+                 clearable="true"
+                 reserve-keyword
+                 placeholder="请选择所属货位"
+                 :remote-method="getSpaceList"
+                 size="mini"
+                 :loading="corpLoading"
+                 style="width: 90%"
+               >
+                 <el-option
+                   v-for="item in spaceList"
+                   :key="item.name"
+                   :label="item.name"
+                   :value="item.code"
+                 >
+                   <span style="float: left">{{ item.name }}</span>
+                   <span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
+
+                 </el-option>
+               </el-select>
+             </el-form-item>
+           </el-col>
+           <el-col :span="6">
+             <el-form-item label="过滤方式:">
+               <el-select
+                 v-model="filterQuery.filterNoInv"
+                 style="width: 90%"
+                 clearable>
+                 <el-option label="有库存" :value="1"></el-option>
+                 <el-option label="零库存" :value="2"></el-option>
+                 <el-option label="负库存" :value="3"></el-option>
+               </el-select>
+             </el-form-item>
+           </el-col>
+
+           <el-col :span="6">
+             <el-form-item label="供应商名称:">
+               <el-select
+                 v-model="filterQuery.supId"
+                 filterable
+                 remote
+                 clearable="true"
+                 reserve-keyword
+                 placeholder="请选择供应商名称"
+                 :remote-method="findMethod"
+                 size="mini"
+                 :loading="corpLoading"
+                 @change="corpChange"
+                 style="width: 90%"
+                 @clear="getcorp"
+               >
+                 <el-option
+                   v-for="item in fromOptions"
+                   :key="item.name"
+                   :label="item.name"
+                   :value="item.erpId"
+                 >
+                   <span style="float: left">{{ item.name }}</span>
+                 </el-option>
+               </el-select>
+             </el-form-item>
+           </el-col>
+
+         </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"
+                />
+                <span style="float: left">{{ item.name }}</span>
+                <span v-if="item.isShowXx == '1'" style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
+              </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="map[item.columnName]"
+                :placeholder="item.columnDesc"
+                :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"
+                />
+                <span style="float: left">{{ item.name }}</span>
+                <span v-if="item.isShowXx == '1'" style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
+              </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>
+            <el-form-item v-if="item.columnType == 'datePickera' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <el-date-picker
+                :picker-options="pickerOptions"
+                v-model="confirmDateRange"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              ></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 type="primary" icon="el-icon-document" @click="selectExport" :loading="selectExportLoading">选中导出Excel</el-button>
+          <el-button type="primary" icon="el-icon-document" @click="searchExport" :loading="searchExportLoading">结果导出Excel</el-button>
+          <el-button type="primary" icon="el-icon-printer" @click="optinPrint" :loading="optinPrintLoading">选中打印</el-button>
+          <el-button type="primary" icon="el-icon-printer" @click="selectPrint" :loading="selectPrinttLoading">查询结果打印</el-button>
+        </el-button-group>
+      </div>
+      <el-divider style="margin: 15px"></el-divider>
+      <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row borderv
+                @selection-change="handleCheckedChange">
+        <!-- <el-table-column label="序号" type="index"></el-table-column>
+         <el-table-column label="供应商" prop="supName" v-if="showSup" show-overflow-tooltip
+                          width="120"></el-table-column>
+         <el-table-column label="货架" prop="spaceName"
+                          v-if="filterQuery.invSpaceCode!='' && filterQuery.invSpaceCode!=null" show-overflow-tooltip
+                          width="120"></el-table-column>
+         <el-table-column label="DI/物资编码" prop="nameCode" width="150"></el-table-column>
+         <el-table-column label="物资名称" prop="cpmctymc" width="180" show-overflow-tooltip></el-table-column>
+         <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip width="180"></el-table-column>
+         <el-table-column label="批次号" prop="batchNo" width="120"></el-table-column>
+         <el-table-column label="价格" prop="price" width="120"></el-table-column>
+         <el-table-column label="入库数量" prop="inCount" width="120"></el-table-column>
+         <el-table-column label="出库数量" prop="outCount" width="120">
+         </el-table-column>
+         <el-table-column label="结余数量" prop="reCount" width="120">
+         </el-table-column>
+         <el-table-column label="部门" prop="deptName" v-if="showSup"
+                          show-overflow-tooltip width="120"></el-table-column>
+         <el-table-column label="仓库" prop="invName" v-if="showSup"
+                          show-overflow-tooltip width="120"></el-table-column>
+         <el-table-column label="计量单位" prop="measname" 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="ylqxzcrbarmc" show-overflow-tooltip
+                          width="120"></el-table-column>
+         <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="160" show-overflow-tooltip></el-table-column>
+         <el-table-column label="操作" width="180" fixed="right">
+           <template slot-scope="scope">
+             <el-button
+               type="text"
+               size="small"
+               @click.native.stop="invRemindSet(scope.row)"
+             >添加预警设置
+             </el-button
+             >
+             <el-button
+               type="text"
+               size="small"
+               @click.native.stop="detailDialog(scope.row)"
+             >详情
+             </el-button
+             >
+           </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>
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :limit.sync="filterQuery.limit"
+        :page.sync="filterQuery.page"
+        @pagination="getList"
+      ></pagination>
+    </el-card>
+
+    <el-dialog
+      title="库存详情"
+      :visible.sync="detailDialogVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="85%"
+      v-if="detailDialogVisible"
+    >
+      <invProductsDetail
+        :inputQuery="inputQuery"
+        v-on:closeDetailDialog="closeDetailDialog"
+      ></invProductsDetail>
+    </el-dialog>
+
+    <el-dialog
+      title="添加库存预警设置"
+      :visible.sync="addInvRemindSetDialogVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="60%"
+      v-if="addInvRemindSetDialogVisible"
+    >
+      <addInvRemindSetDialog
+        :invId="invId"
+        :closeDialog="closeRemindSetDialog"
+      ></addInvRemindSetDialog>
+    </el-dialog>
+
+
+  </div>
+</template>
+
+<script>
+import {
+  getResultDetailList,
+  getResultOrderList,
+  verifyTemplateFile,
+  printOrder,
+  excelInoutImport, postExcelInoutImport
+} from '@/api/inout/orderDetailResult'
+import {findByInvUser, getLocalJoinByUser, getOrderDetailBus, getOrderDetailBusOptimize} from "@/api/basic/busType";
+import {getCorrespondence} from "@/api/basic/basicUnitMaintain";
+import {excelImport} from "@/api/inout/statData";
+import {
+  getHead,executeFuc
+} from "@/utils/customConfig";
+
+export default {
+  name: "supInoutSearchOrder",
+  data() {
+    return {
+      showSearch: true,
+      list: [],
+      busTypeOptions: [],
+      filterQuery: {
+        id: "",
+        orderIdFk: null,
+        fromCorpName: null,
+        coName: null,
+        spec: null,
+        batchNo: null,
+        page: 1,
+        limit: 10,
+        startAduditTime: null,
+        endAduditTime: null,
+        actionType: null,
+        fromCorp: null,
+        keyWords: null,
+        inoutPrintStatus: null,
+        confirmStarTime:null,  //发票确认起始日期
+        confirmEndTime:null,
+        corpName:null,
+      },
+
+      printMap: {
+        0: "未打印",
+        1: "已打印",
+        null: "未打印",
+      },
+
+      fromOptions: [],
+      loading: false,
+      selectExportLoading: false,
+      searchExportLoading: false,
+      optinPrintLoading: false,
+      selectPrinttLoading: false,
+      total: 0,
+      tableHeader:[],
+      queryList:[],
+      fromList:[],
+      options: {
+        getBusTypeByInv:[],
+      },
+      orderSelection: [],
+      showSup: false,
+      customerId: this.$store.getters.customerId,
+      map:{
+        "actDateRange" : this.actDateRange,
+        "confirmDateRange" : this.confirmDateRange,
+      },
+      actDateRange: [],
+      confirmDateRange:[],
+      actionType: null,
+      auditDateRange: [],
+      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.filterQuery = {
+        id: "",
+        orderIdFk: null,
+        fromCorpName: null,
+        coName: null,
+        spec: null,
+        batchNo: null,
+        page: 1,
+        limit: 10,
+        startAduditTime: null,
+        endAduditTime: null,
+        actionType: null,
+      };
+      this.actDateRange = []
+      this.getList();
+    },
+    handleCheckedChange(val) {
+      this.orderSelection = val;
+    },
+
+    onSubmit() {
+      this.loading = true;
+      if (this.actDateRange !== null) {
+        this.filterQuery.startAduditTime = this.actDateRange[0];
+        this.filterQuery.endAduditTime = this.actDateRange[1];
+      } else {
+        this.filterQuery.startAduditTime = null;
+        this.filterQuery.endAduditTime = null;
+      }
+      if (this.confirmDateRange!== null) {
+        this.filterQuery.confirmStarTime = this.confirmDateRange[0];
+        this.filterQuery.confirmEndTime = this.confirmDateRange[1];
+      } else {
+        this.filterQuery.confirmStarTime = null;
+        this.filterQuery.confirmEndTime = null;
+      }
+      this.filterQuery.page = 1;
+
+      this.getList();
+    },
+
+    statusFilterType(status) {
+      const statusMap = {
+        null: "",
+        1: "success",
+        0: "warning",
+      };
+      return statusMap[status];
+    },
+
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+
+    //根据仓库,用户获取单据类型
+    getBusTypeByInv(_this) {
+      let query = {
+        code: _this.$store.getters.locInvCode,
+        enabled: true,
+        detailType: _this.actionType
+      };
+      getOrderDetailBusOptimize(query)
+        .then((response) => {
+          _this.options.getBusTypeByInv = response.data.list || [];
+        })
+        .catch(() => {
+        });
+    },
+
+    getList() {
+      this.loading = true;
+      this.filterQuery.actionType = this.actionType;
+      // if (this.filterQuery.actionType == 'preInDetail') {
+      //   this.filterQuery.invCode = '1000001'
+      // } else if (this.filterQuery.actionType == 'preDetail') {
+      //   this.filterQuery.invCode = '1000002'
+      // }
+      getResultOrderList(this.filterQuery)
+        .then((response) => {
+          if (response.code === 20000) {
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+          } else {
+            this.$message.error(response.message);
+          }
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+    findMethod(query) {
+      this.fromOptions = [];
+      let cQuery = {
+        key: query,
+        corpType: 2,
+        page: 1,
+        limit: 10,
+      };
+      getCorrespondence(cQuery)
+        .then((response) => {
+          this.loading = false;
+          this.fromOptions = response.data.list || [];
+        })
+        .catch(() => {
+          this.loading = false;
+          this.fromOptions = [];
+        });
+    },
+    optinPrint() {
+      this.$confirm("是否确定打印选中出入库明细, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          if (this.orderSelection == null || this.orderSelection.length <= 0) {
+            return this.$message.error("请选择打印的明细！");
+          }
+          let query = {id: 4};
+          this.optinPrintLoading = true
+          verifyTemplateFile(query).then((res) => {
+            this.optinPrintLoading = false
+            if (res.code === 20000) {
+              let printParams = {
+                startAduditTime :this.filterQuery.startAduditTime,
+                endAduditTime: this.filterQuery.endAduditTime,
+                confirmStarTime : this.filterQuery.confirmStarTime ,
+                confirmEndTime : this.filterQuery.confirmEndTime ,
+                corpName : this.filterQuery.corpName ,
+                employeeName: this.$store.getters.user.employeeName,
+                locInvName:this.$store.getters.locInvName,
+                templateId: res.data,
+                list: this.orderSelection
+              };
+              printOrder(printParams).then((response) => {
+                //将pdf文件转换为url。
+                const binaryData = [];
+                binaryData.push(response);
+                //获取blob链接。
+                let url = window.URL.createObjectURL(
+                  new Blob(binaryData, {type: "application/pdf"})
+                );
+                this.loading = false;
+                window.open(url);//打开新标签页，预览pdf。
+              })
+            } else {
+              this.optinPrintLoading = false
+              return this.$message.error(res.message);
+            }
+          }).catch((error) => {
+            this.optinPrintLoading = false
+            this.loading = false;
+            this.$message.error(error.message);
+          })
+        })
+        .catch(() => {
+        });
+
+
+    },
+    selectPrint() {
+      this.$confirm("是否确定打印所有查询结果数据", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+
+          let query = {id: 4};
+          this.selectPrinttLoading = true
+          verifyTemplateFile(query).then((res) => {
+            this.selectPrinttLoading = false
+            if (res.code === 20000) {
+              let printParams = {
+                templateId: res.data,
+                orderIdFk: this.filterQuery.orderIdFk,
+                nameCode: this.filterQuery.nameCode,
+                coName: this.filterQuery.coName,
+                spec: this.filterQuery.spec,
+                batchNo: this.filterQuery.batchNo,
+                zczbhhzbapzbh: this.filterQuery.zczbhhzbapzbh,
+                manufacturer: this.filterQuery.manufacturer,
+                actionType: this.filterQuery.actionType,
+                keyWords: this.filterQuery.keyWords,
+                mainAction: this.filterQuery.mainAction,
+                action: this.filterQuery.action,
+                locInvName:this.$store.getters.locInvName,
+                employeeName: this.$store.getters.user.employeeName,
+              };
+              if (this.actDateRange !== null) {
+                printParams.startAduditTime = this.actDateRange[0];
+                printParams.endAduditTime = this.actDateRange[1];
+              } else {
+                printParams.startAduditTime = null;
+                printParams.endAduditTime = null;
+              }
+              if (this.confirmDateRange!== null) {
+                printParams.confirmStarTime = this.confirmDateRange[0];
+                printParams.confirmEndTime = this.confirmDateRange[1];
+              } else {
+                printParams.confirmStarTime = null;
+                printParams.confirmEndTime = null;
+              }
+              printOrder(printParams).then((response) => {
+                //将pdf文件转换为url。
+                const binaryData = [];
+                binaryData.push(response);
+                //获取blob链接。
+                let url = window.URL.createObjectURL(
+                  new Blob(binaryData, {type: "application/pdf"})
+                );
+                this.loading = false;
+                window.open(url);//打开新标签页，预览pdf。
+              })
+            } else {
+              this.$message.error(res.message);
+              return
+            }
+          }).catch((error) => {
+            this.selectPrinttLoading = false
+            this.loading = false;
+            this.$message.error(error.message);
+          })
+
+        })
+        .catch(() => {
+        });
+      return;
+
+
+    },
+
+    selectExport() {
+      this.$confirm("是否确定导出选中出入库明细, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          if (this.orderSelection == null || this.orderSelection.length <= 0) {
+            return this.$message.error("请选择需要导出的明细！");
+          }
+          let printParams = {
+            list: this.orderSelection
+          };
+          this.selectExportLoading = true
+          postExcelInoutImport(printParams).then((response) => {
+            this.selectExportLoading = false
+            let blob = new Blob([response], {type: "application/vnd.ms-excel"});
+            let url = window.URL.createObjectURL(blob); // 创建一个临时的url指向blob对象
+            let a = document.createElement("a");
+            a.href = url;
+            a.click();
+            this.$message("成功")
+          }).catch(() => {
+            this.selectExportLoading = false
+          })
+        });
+
+
+    },
+    searchExport() {
+      this.$confirm("是否确定导出所有查询结果数据", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+
+          let printParams = {
+            orderIdFk: this.filterQuery.orderIdFk,
+            nameCode: this.filterQuery.nameCode,
+            coName: this.filterQuery.coName,
+            spec: this.filterQuery.spec,
+            batchNo: this.filterQuery.batchNo,
+            zczbhhzbapzbh: this.filterQuery.zczbhhzbapzbh,
+            manufacturer: this.filterQuery.manufacturer,
+            actionType: this.filterQuery.actionType,
+            keyWords: this.filterQuery.keyWords,
+            mainAction: this.filterQuery.mainAction,
+            action: this.filterQuery.action
+          };
+
+          if (this.filterQuery.actionType == 'preInDetail') {
+            printParams.invCode = '1000001'
+          } else if (this.filterQuery.actionType == 'preDetail') {
+            printParams.invCode = '1000002'
+          }
+
+          if (this.actDateRange !== null) {
+            printParams.startAduditTime = this.actDateRange[0];
+            printParams.endAduditTime = this.actDateRange[1];
+          } else {
+            printParams.startAduditTime = null;
+            printParams.endAduditTime = null;
+          }
+          if (this.confirmDateRange!== null) {
+            printParams.confirmStarTime = this.confirmDateRange[0];
+            printParams.confirmEndTime = this.confirmDateRange[1];
+          } else {
+            printParams.confirmStarTime = null;
+            printParams.confirmEndTime = null;
+          }
+          this.searchExportLoading = true
+          excelInoutImport(printParams).then((response) => {
+            this.searchExportLoading = false
+            let blob = new Blob([response], {type: "application/vnd.ms-excel"});
+            let url = window.URL.createObjectURL(blob); // 创建一个临时的url指向blob对象
+            let a = document.createElement("a");
+            a.href = url;
+            a.click();
+            this.$message("成功")
+          })
+
+        });
+    },
+    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() {
+    let supId = this.$store.getters.customerId;
+    if (supId == "110") {
+      this.showSup = true;
+    }
+    this.actionType = this.$route.query.name;
+    getHead("supDrugInoutSearchOrder","1").then((re) => {
+      // 处理返回的数据
+      this.tableObj = re.data;
+      this.tableHeader = re.data.tableList;
+      this.queryList = re.data.queryList;
+      this.fromList = re.data.fromList;
+      this.getList();
+    });
+    this.getBusTypeByInv(this);
+  }
+  ,
+}
+;
+</script>
+
+<style type="text/scss" lang="scss">
+</style>
+