diff --git a/.env.production b/.env.production
index a702bf97..c7a22f1e 100644
--- a/.env.production
+++ b/.env.production
@@ -3,8 +3,8 @@ VUE_APP_TITLE = UDI管理系统
 
 # 生产环境配置
 ENV = 'production'
-VUE_APP_BASE_API = 'http://116.204.71.86:9150/UDI_WMS_MC/'
-# VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_WMS_MC/'
+# VUE_APP_BASE_API = 'http://116.204.71.86:9150/UDI_WMS_MC/'
+VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_WMS_MC/'
 # 应用访问路径 例如使用前缀 /admin/
 VUE_APP_CONTEXT_PATH = '/UDI_WMS_NEW/'
 
diff --git a/public/config.json b/public/config.json
index 70cf7727..68967846 100644
--- a/public/config.json
+++ b/public/config.json
@@ -1,4 +1,4 @@
 {
-  "BASE_URL": "http://192.168.0.166:9991",
+  "BASE_URL": "http://127.0.0.1:9991",
   "hosp_name": "平和县医院"
 }
diff --git a/src/api/basic/busType.js b/src/api/basic/busType.js
index 0d18c7e9..b156622d 100644
--- a/src/api/basic/busType.js
+++ b/src/api/basic/busType.js
@@ -8,6 +8,15 @@ export function getBusTypeList(params) {
   });
 }
 
+export function getLocalJoinByUser(params) {
+  return axios({
+    url: "/udiwms/localBusType/filterJoinByUser",
+    method: "get",
+    params: params
+  });
+}
+
+
 export function insertBusType(data) {
   return axios({
     url: "/udiwms/bussinessType/insert",
@@ -65,3 +74,11 @@ export function filterForThirdSys() {
     params: null
   })
 }
+
+export function getBusTypeListByUser(params) {
+  return axios({
+    url: "/udiwms/localBusType/filterByUser",
+    method: "get",
+    params: params
+  });
+}
diff --git a/src/api/basic/busTypePre.js b/src/api/basic/busTypePre.js
index 990e874a..8d5dfe96 100644
--- a/src/api/basic/busTypePre.js
+++ b/src/api/basic/busTypePre.js
@@ -8,6 +8,14 @@ export function getBusTypePreResList(params) {
   });
 }
 
+export function getBusTypePreResList2(params) {
+  return axios({
+    url: "/spms/busTypePre/filterBusTypePreRes",
+    method: "get",
+    params: params
+  });
+}
+
 export function getBusTypePreList(params) {
   return axios({
     url: "/spms/busTypePre/filter",
diff --git a/src/api/inout/order.js b/src/api/inout/order.js
new file mode 100644
index 00000000..415dbfa6
--- /dev/null
+++ b/src/api/inout/order.js
@@ -0,0 +1,387 @@
+import axios from '@/utils/request'
+
+
+export function getDraft(query) {
+  return axios({
+    url: "/udiwms/inout/order/draft",
+    method: "get",
+    params: query
+  });
+}
+
+
+export function orderList(query) {
+    return axios({
+        url: "/admin/warehouse/inout/order/list",
+        method: "get",
+        params: query
+    });
+}
+
+export function orderGetUdi(query) {
+    return axios({
+        url: "/udiwms/inout/order/getUdi",
+        method: "get",
+        params: query
+    });
+}
+
+export function deleteCodesTempById(query) {
+    return axios({
+        url: "/warehouse/inout/deleteCodesTempById",
+        method: "get",
+        params: query
+    });
+}
+
+export function submitOrderWeb(query) {
+    return axios({
+        url: "/warehouse/inout/submitOrderWeb",
+        method: "get",
+        params: query
+    });
+}
+
+
+export function saveOrderWeb(query) {
+    return axios({
+        url: "/warehouse/inout/saveOrderWeb",
+        method: "post",
+        data: query
+    });
+}
+
+
+export function orderListError(query) {
+    return axios({
+        url: "/udiwms/inout/order/error",
+        method: "get",
+        params: query
+    });
+}
+
+export function orderListRepeat(query) {
+    return axios({
+        url: "/admin/warehouse/inout/order/listRepeat",
+        method: "get",
+        params: query
+    });
+}
+
+export function codeList(query) {
+    return axios({
+        url: "/admin/warehouse/inout/findByOrderId",
+        method: "get",
+        params: query
+    });
+}
+
+export function addOrderWeb(query) {
+    return axios({
+        url: "/warehouse/inout/addOrderWeb",
+        method: "post",
+        data: query
+    });
+}
+
+export function enterCodeWeb(query) {
+    return axios({
+        url: "/warehouse/inout/enterCode",
+        method: "post",
+        data: query
+    });
+}
+
+
+export function postOrdersWeb(query) {
+    return axios({
+        url: "/warehouse/inout/postOrdersWeb",
+        method: "post",
+        data: query
+    });
+}
+
+export function mergeOrder(query) {
+    return axios({
+        url: "/warehouse/inout/order/mergeOrder",
+        method: "post",
+        data: query
+    });
+}
+
+export function updateUnit(query) {
+    return axios({
+        url: "/udiwms/inout/order/updateUnit",
+        method: "post",
+        data: query
+    });
+}
+
+export function filterOrder(query) {
+    return axios({
+        url: "/udiwms/inout/order/filter",
+        method: "get",
+        params: query
+    });
+}
+
+export function selectNew(query) {
+    return axios({
+        url: "/admin/warehouse/inout/order/selectNew",
+        method: "get",
+        params: query
+    });
+}
+
+export function selectWait(query) {
+    return axios({
+        url: "/sale/inout/order/selectWait",
+        method: "get",
+        params: query
+    });
+}
+
+export function selectStatus(query) {
+    return axios({
+        url: "/sale/inout/order/selectStatus",
+        method: "get",
+        params: query
+    });
+}
+
+export function selectDownload(query) {
+    return axios({
+        url: "/sale/inout/order/selectDownload",
+        method: "get",
+        params: query
+    });
+}
+
+export function selectFinish(query) {
+    return axios({
+        url: "/sale/inout/order/selectFinish",
+        method: "get",
+        params: query
+    });
+}
+
+export function selectSubOrders(query) {
+    return axios({
+        url: "/sale/inout/order/selectSubOrders",
+        method: "get",
+        params: query
+    });
+}
+
+
+export function errorCodeList(query) {
+    return axios({
+        url: "/admin/warehouse/inout/findErrorByOrderId",
+        method: "get",
+        params: query
+    });
+}
+
+export function deleteByOrderId(query) {
+    return axios({
+        url: "/udiwms/inout/order/delete",
+        method: "post",
+        data: query
+    });
+}
+
+export function deleteCodes(query) {
+    return axios({
+        url: "/warehouse/inout/code/deleteCodes",
+        method: "post",
+        data: query
+    });
+}
+
+export function commitOrder(query) {
+    return axios({
+        url: "/warehouse/inout/commit",
+        method: "post",
+        data: query
+    });
+}
+
+export function addCommitOrder(query) {
+    return axios({
+        url: "/warehouse/inout/addCommit",
+        method: "post",
+        data: query
+    });
+}
+
+
+export function updateExportStatus(query) {
+    return axios(
+        {
+            url: "/warehouse/inout/order/updateExportStatus",
+            method: "post",
+            data: query
+        }
+    )
+}
+
+export function orderDetail(query) {
+    return axios(
+        {
+            url: "/warehouse/inout/order/detail",
+            method: "get",
+            params: query
+        }
+    )
+}
+
+export function updateBind(query) {
+    return axios(
+        {
+            url: "/udiwms/erpOrder/updateBind",
+            method: "post",
+            data: query
+        }
+    )
+}
+
+export function updateBindSup(query) {
+    return axios(
+        {
+            url: "/udiwms/erpOrder/updateBindSup",
+            method: "post",
+            data: query
+        }
+    )
+}
+
+export function updateCodeBindSup(query) {
+    return axios(
+        {
+            url: "/udiwms/addCode/updateBindSup",
+            method: "post",
+            data: query
+        }
+    )
+}
+
+export function backStock(query) {
+    return axios(
+        {
+            url: "/sale/inout/order/backStock",
+            method: "get",
+            params: query
+        }
+    )
+}
+
+export function uploadOrder(query) {
+    return axios(
+        {
+            url: "/warehouse/inout/order/uploadOrder",
+            method: "post",
+            data: query
+        }
+    )
+}
+
+export function moveStock(query) {
+    return axios(
+        {
+            url: "/sale/inout/order/moveStock",
+            method: "post",
+            data: query
+        }
+    )
+}
+
+
+export function findAllByOrderId(query) {
+    return axios({
+        url: "/admin/warehouse/inout/findAllByOrderId",
+        method: "get",
+        params: query
+    });
+}
+
+export function revokeOredr(query) {
+    return axios({
+        url: "/spms/inout/order/revoke",
+        method: "get",
+        params: query
+    });
+}
+
+export function exportJson(query) {
+    return axios({
+        url: "/warehouse/inout/order/exportXml",
+        method: "post",
+        data: query,
+        headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'},
+        responseType: 'arraybuffer',   //一定要设置响应类型，否则页面会是空白pdf
+    });
+}
+
+
+export function expireTimeCheck(query) {
+    return axios(
+        {
+            url: "/warehouse/inout/expireTimeCheck",
+            method: "post",
+            data: query
+        }
+    )
+}
+
+export function filterOrderForDelete(params) {
+    return axios({
+        url: "/udiwms/inout/order/filterOrderForDelete",
+        method: "get",
+        params: params
+    });
+}
+
+export function updateOrderInfo(data) {
+    return axios({
+        url: "/udiwms/inout/order/updateOrderInfo",
+        method: "post",
+        data: data
+    })
+}
+
+
+export function getOrderById(params) {
+    return axios({
+        url: "/udiwms/inout/order/getOrderById",
+        method: "get",
+        params: params
+    })
+}
+
+
+export function updateOrder(data) {
+    return axios({
+        url: "/udiwms/inout/order/updateOrder",
+        method: "post",
+        data: data
+    })
+}
+
+
+export function uploadSpms(query) {
+    return axios(
+        {
+            url: "/warehouse/inout/order/uploadSpms",
+            method: "post",
+            data: query
+        }
+    );
+}
+
+export function updateOrderPrintRemark(data) {
+    return axios({
+        url: "/udiwms/inout/order/updateOrderPrintRemark",
+        method: "post",
+        data: data
+    });
+}
diff --git a/src/api/inout/orderDetailCode.js b/src/api/inout/orderDetailCode.js
new file mode 100644
index 00000000..69abeaa9
--- /dev/null
+++ b/src/api/inout/orderDetailCode.js
@@ -0,0 +1,48 @@
+import axios from '@/utils/request'
+
+
+export function getDetailCodes(query) {
+  return axios({
+    url: "/udiwms/inout/order/draft/detailCode",
+    method: "get",
+    params: query
+  });
+}
+
+//获取业务明细
+export function getDetailBizs(query) {
+  return axios({
+    url: "/udiwms/inout/order/draft/biz",
+    method: "get",
+    params: query
+  });
+}
+
+
+//业务明细添加产品
+export function addBizProduct(query) {
+  return axios({
+    url: "/udiwms/inout/order/addBizProduct",
+    method: "post",
+    data: query
+  });
+}
+
+export function updateBizProduct(query) {
+  return axios({
+    url: "/udiwms/inout/order/updateBizProduct",
+    method: "post",
+    data: query
+  });
+}
+
+export function delBizProduct(query) {
+  return axios({
+    url: "/udiwms/inout/order/delBizProduct",
+    method: "post",
+    data: query
+  });
+}
+
+
+
diff --git a/src/api/system/invSubWarehouse.js b/src/api/system/invSubWarehouse.js
index 9415aac6..e6c4f20b 100644
--- a/src/api/system/invSubWarehouse.js
+++ b/src/api/system/invSubWarehouse.js
@@ -9,6 +9,33 @@ export function filterSubAll(query) {
     });
 }
 
+export function findByInvUser(query) {
+  return axios({
+    url: "/udiwms/busType/findByInvUser",
+    method: "get",
+    params: query
+  });
+}
+
+//获取用户所有关联仓库
+export function findInvByUser(query) {
+  return axios({
+    url: "/spms/inv/warehouse/findByUser",
+    method: "get",
+    params: query
+  });
+}
+
+//获取除了自己所有其他仓库
+export function findByFrom(query) {
+  return axios({
+    url: "/spms/inv/warehouse/findByFrom",
+    method: "get",
+    params: query
+  });
+}
+
+
 export function filterSubByInv(query) {
     return axios({
         url: "/spms/sub/inv/warehouse/findByInv",
@@ -17,6 +44,16 @@ export function filterSubByInv(query) {
     });
 }
 
+
+export function findByDeptUser(query) {
+  return axios({
+    url: "/spms/inv/warehouse/findByDeptUser",
+    method: "get",
+    params: query
+  });
+}
+
+
 export function filterSub(query) {
     return axios({
         url: "/spms/sub/inv/warehouse/filterSub",
diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss
index 221d983b..d7877fdf 100644
--- a/src/assets/styles/ruoyi.scss
+++ b/src/assets/styles/ruoyi.scss
@@ -123,9 +123,11 @@
     .el-button [class*="el-icon-"] + span {
       margin-left: 1px;
     }
+
     td {
       padding: 0px;
     }
+
     tr.current-row > td,
     .el-table__body tr:hover > td {
       background: #ecd1cf;
@@ -330,7 +332,7 @@
   width: 100%;
 }
 
-.el-divider{
+.el-divider {
   margin: 0px 0px 15px 0px;
   background: 0 0;
   border-top: 1px solid #E6EBF5;
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 6f5aa109..f99e5cdc 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -1,50 +1,106 @@
 <template>
   <div class="navbar">
-    <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
+    <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container"
+               @toggleClick="toggleSideBar"/>
 
     <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav"/>
     <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/>
     <div class="right-menu">
       <template v-if="device!=='mobile'">
-        <search id="header-search" class="right-menu-item" />
-
-<!--        <el-tooltip content="源码地址" effect="dark" placement="bottom">-->
-<!--          <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />-->
-<!--        </el-tooltip>-->
-
-<!--        <el-tooltip content="文档地址" effect="dark" placement="bottom">-->
-<!--          <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />-->
-<!--        </el-tooltip>-->
-
-        <screenfull id="screenfull" class="right-menu-item hover-effect" />
 
+        <div class="inv-hos-title">
+          <span style="font-weight: bold;color: #303133;">平和县医院</span>
+          <span
+            style="margin-right: 18px;margin-left:8px;color: #2d8cf0;font-size: 14px;">({{ inv }})</span>
+        </div>
+        <search id="header-search" class="right-menu-item"/>
+        <screenfull id="screenfull" class="right-menu-item hover-effect"/>
         <el-tooltip content="布局大小" effect="dark" placement="bottom">
-          <size-select id="size-select" class="right-menu-item hover-effect" />
+          <size-select id="size-select" class="right-menu-item hover-effect"/>
         </el-tooltip>
       </template>
       <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
         <div class="avatar-wrapper">
           <img :src="avatar" class="user-avatar">
-          <i class="el-icon-caret-bottom" />
+          <i class="el-icon-caret-bottom"/>
         </div>
         <el-dropdown-menu slot="dropdown">
-<!--          <router-link to="/user/profile">-->
-<!--            <el-dropdown-item>个人中心</el-dropdown-item>-->
-<!--          </router-link>-->
+          <!--          <router-link to="/user/profile">-->
+          <!--            <el-dropdown-item>个人中心</el-dropdown-item>-->
+          <!--          </router-link>-->
           <el-dropdown-item @click.native="setting = true">
             <span>布局设置</span>
           </el-dropdown-item>
+          <el-dropdown-item divided @click.native="changeInv">
+            <span>切换仓库</span>
+          </el-dropdown-item>
           <el-dropdown-item divided @click.native="logout">
             <span>退出登录</span>
           </el-dropdown-item>
         </el-dropdown-menu>
       </el-dropdown>
     </div>
+
+
+    <el-dialog
+      title="请选择当前部门与仓库"
+      :visible.sync="selInvVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="35%"
+      v-if="selInvVisible"
+    >
+      <el-form :model="userInfo" label-width="100px" :rules="formRules" ref="dataForm">
+        <el-row :gutter="20">
+          <el-col :span="20">
+            <el-form-item prop="locDeptCode" label="当前部门:">
+              <el-select v-model="userInfo.locDeptCode" placeholder="请选择当前部门" clearable
+                         style="width: 90%"
+                         @change="deptChange">
+                <el-option
+                  v-for="item in deptList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.code">
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="20">
+            <el-form-item prop="locInvCode" label="当前仓库:">
+              <el-select v-model="userInfo.locInvCode" placeholder="请选择当前仓库" clearable
+                         style="width: 90%"
+              >
+                <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-row>
+
+        <div style="margin-top: 8px ;  color: #F71616; font-size: 12px">
+          <span>提示：进入系统请先选择您当前所在部门与仓库&nbsp;</span>
+        </div>
+        <div style='text-align: center; margin-bottom: 10px;margin-top: 18px ;'>
+          <el-button type="primary" @click="submitInv">提交</el-button>
+          <el-button type="primary" @click="closeDialog">取消</el-button>
+        </div>
+      </el-form>
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
+import {mapGetters} from 'vuex'
 import Breadcrumb from '@/components/Breadcrumb'
 import TopNav from '@/components/TopNav'
 import Hamburger from '@/components/Hamburger'
@@ -53,8 +109,32 @@ import SizeSelect from '@/components/SizeSelect'
 import Search from '@/components/HeaderSearch'
 import RuoYiGit from '@/components/RuoYi/Git'
 import RuoYiDoc from '@/components/RuoYi/Doc'
+import store from "@/store";
+import {filterAllByUser} from "@/api/system/invWarehouse";
+import {filterSubByInv, findByDeptUser} from "@/api/system/invSubWarehouse";
+import {updateInv} from "@/api/auth/authAdmin";
+import {isRelogin} from "@/utils/request";
+import router from "@/router";
 
 export default {
+  data() {
+    return {
+      inv: store.getters.locInvName,
+      selInvVisible: false,
+      userInfo: {},
+      deptList: [],
+      invList: [],
+      formRules: {
+        locDeptCode: [
+          {required: true, message: "请选择当前部门", trigger: "blur"}
+        ],
+        locInvCode: [
+          {required: true, message: "请选择当前仓库", trigger: "blur"}
+        ],
+
+      },
+    };
+  },
   components: {
     Breadcrumb,
     TopNav,
@@ -101,8 +181,91 @@ export default {
         this.$store.dispatch('LogOut').then(() => {
           location.href = process.env.VUE_APP_CONTEXT_PATH + "index";
         })
-      }).catch(() => {});
-    }
+      }).catch(() => {
+      });
+    },
+
+    changeInv() {
+      this.selInvVisible = true;
+    },
+
+    getDeptList() {
+      this.deptList = [];
+      filterAllByUser()
+        .then((response) => {
+          this.deptList = response.data || [];
+          this.getInvList();
+        })
+        .catch(() => {
+        });
+    },
+
+    deptChange() {
+      this.getInvList();
+    },
+
+    getInvList() {
+      this.invList = [];
+      let query = {
+        deptCode: this.userInfo.locDeptCode
+      };
+      findByDeptUser(query)
+        .then((response) => {
+          this.invList = response.data || [];
+          if (this.invList != null && this.invList.length == 1) {
+            this.userInfo.locInvCode = this.invList[0].code;
+          }
+        })
+        .catch(() => {
+        });
+    },
+
+    submitInv() {
+      this.$refs["dataForm"].validate(valid => {
+        if (valid) {
+          if (this.$isBlank(this.userInfo.locInvCode)) {
+            this.$message.error("当前仓库不能为空！");
+            return;
+          }
+          if (this.userInfo.customerId == 110) {
+            if (this.$isBlank(this.userInfo.locSubInvCode)) {
+              this.$message.error("当前分库不能为空！");
+              return;
+            }
+          }
+          updateInv(this.userInfo).then((res) => {
+            if (res.code == 20000) {
+              this.$message.success("设置成功!");
+              this.selInvVisible = false;
+              store.dispatch('GetInfo').then(() => {
+                this.inv = store.getters.locInvName
+              });
+            } else {
+              this.$message.error(res.message);
+            }
+          }).catch(() => {
+            this.selInvVisible = false;
+          });
+        }
+      });
+    },
+
+    closeDialog() {
+      this.selInvVisible = false;
+    },
+
+
+  },
+  created() {
+    this.userInfo = {
+      id: store.getters.adminId,
+      locInvCode: store.getters.locInvCode,
+      locDeptCode: store.getters.locDeptCode,
+    };
+
+    this.getDeptList();
+    this.getInvList()
+
   }
 }
 </script>
@@ -113,7 +276,7 @@ export default {
   overflow: hidden;
   position: relative;
   background: #fff;
-  box-shadow: 0 1px 4px rgba(0,21,41,.08);
+  box-shadow: 0 1px 4px rgba(0, 21, 41, .08);
 
   .hamburger-container {
     line-height: 46px;
@@ -121,7 +284,7 @@ export default {
     float: left;
     cursor: pointer;
     transition: background .3s;
-    -webkit-tap-highlight-color:transparent;
+    -webkit-tap-highlight-color: transparent;
 
     &:hover {
       background: rgba(0, 0, 0, .025)
@@ -169,6 +332,14 @@ export default {
       }
     }
 
+    .inv-hos-title {
+      display: inline-block;
+      height: 100%;
+      font-size: 18px;
+      color: #5a5e66;
+      vertical-align: text-bottom;
+    }
+
     .avatar-container {
       margin-right: 30px;
 
diff --git a/src/plugins/KeyScaner.js b/src/plugins/KeyScaner.js
new file mode 100644
index 00000000..ee57b6c7
--- /dev/null
+++ b/src/plugins/KeyScaner.js
@@ -0,0 +1,115 @@
+"use strict";
+/**
+ * 浏览器按键处理
+ * howay
+ * 20200421
+ * 1.0
+ */
+const KeyScaner = /** @class */ (function () {
+    function KeyScaner(_dom) {
+        this.keybufs = [];
+        this.altBuf = [];
+        this.isShift = false;
+        this.lastTime = 0;
+        /**
+         * 在收集到文本输入时触发
+         * @param text 收集到的连续文本
+         */
+        this.onInput = function (text) {
+        };
+        this.dom = _dom;
+        _dom.addEventListener('keydown', this.onKeyDown.bind(this));
+        _dom.addEventListener('keyup', this.onKeyUp.bind(this));
+        this.interval = setInterval(this.onTick.bind(this), 100);
+    }
+
+    KeyScaner.prototype.appendChar = function (c) {
+        this.keybufs.push(c);
+    };
+    KeyScaner.prototype.onKeyDown = function (ev) {
+        this.lastTime = new Date().getTime();
+        if (ev.key == "Alt") {
+            if (ev.shiftKey || ev.ctrlKey || ev.metaKey) {
+                return;
+            }
+        } else if (ev.key == "Shift") {
+            if (ev.altKey || ev.ctrlKey || ev.metaKey) {
+                return;
+            }
+            this.isShift = true;
+        } else if (ev.key == "Enter") {
+            if (ev.shiftKey || ev.altKey || ev.ctrlKey || ev.metaKey) {
+                return;
+            }
+            this.appendChar("\r");
+            this.completeInput(); //立即完成输入
+        } else if (ev.key == "Delete" || ev.key == "Backspace") {
+            this.dom.innerTex = "";
+            this.appendChar("delete");
+            this.completeInput(); //立即完成输入
+        } else {
+            if (ev.key.length == 1) {
+                var charCode = ev.key.charCodeAt(0);
+                console.log("key="+charCode);
+                if (charCode >= 48 && charCode <= 57) {
+                    if (ev.altKey) {
+                        this.altBuf.push(ev.key);
+                    } else {
+                        this.appendChar(ev.key);
+                    }
+                } else if ((charCode >= 65 && charCode <= 90) || (charCode >= 97 && charCode <= 122)) {
+                    //忽略大小写锁定键，直接通过SHIFT键判断大小写
+                    if (ev.shiftKey) {
+                        this.appendChar(ev.key.toUpperCase());
+                    } else {
+                        this.appendChar(ev.key.toLowerCase());
+                    }
+                } else {
+                    this.appendChar(ev.key);
+                }
+            }
+            //忽略其他控制键
+        }
+    };
+    KeyScaner.prototype.onKeyUp = function (ev) {
+        this.lastTime = new Date().getTime();
+        if (ev.key == "Alt") {
+            if (this.altBuf && this.altBuf.length > 0) {
+                var str = this.altBuf.join("");
+                var num = parseInt(str);
+                var c = String.fromCharCode(num);
+                this.appendChar(c);
+                this.altBuf = [];
+            }
+        } else if (ev.key == "Shift") {
+            this.isShift = false;
+        }
+    };
+    KeyScaner.prototype.completeInput = function () {
+        var text = this.keybufs.join("");
+        this.keybufs = [];
+        if (this.onInput) {
+            this.onInput.bind(this)(text);
+        }
+    };
+    KeyScaner.prototype.onTick = function () {
+        if (this.keybufs && this.keybufs.length > 0 && (!this.altBuf || this.altBuf.length == 0) && new Date().getTime() - this.lastTime > 500) {
+            //有缓存的字符，且没有缓存的alt字符 且 与上次按键时间超过500毫秒。 收集输入
+            // this.completeInput();
+        }
+    };
+    /**
+     * 释放资源
+     */
+    KeyScaner.prototype.dispose = function () {
+        this.dom.removeEventListener('keydown', this.onKeyDown);
+        this.dom.removeEventListener('keyup', this.onKeyUp);
+        clearInterval(this.interval);
+    };
+    return KeyScaner;
+}());
+
+export default {
+    KeyScaner
+}
+
diff --git a/src/store/getters.js b/src/store/getters.js
index b921d03e..b3dedfe4 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -16,5 +16,11 @@ const getters = {
   defaultRoutes: state => state.permission.defaultRoutes,
   sidebarRouters: state => state.permission.sidebarRouters,
   customerId: state => state.user.customerId,
+  companyName: state => state.user.companyName,
+  locDeptCode: state => state.user.locDeptCode,
+  locInvCode: state => state.user.locInvCode,
+  locDeptName: state => state.user.locDeptName,
+  locInvName: state => state.user.locInvName,
+  adminId: state => state.user.adminId,
 }
 export default getters
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 1665f010..97d886be 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -3,15 +3,19 @@ import {getToken, setToken, removeToken, removeAdminId, setAdminId} from '@/util
 
 const user = {
   state: {
-    adminId:"",
+    adminId: "",
     token: getToken(),
     name: '',
     avatar: '',
     roles: [],
     permissions: [],
-    employeeName:"",
-    customerId:"",
-    companyName:"",
+    employeeName: "",
+    customerId: "",
+    companyName: "",
+    locDeptCode: "",
+    locInvCode: "",
+    locDeptName: "",
+    locInvName: "",
   },
 
   mutations: {
@@ -19,7 +23,6 @@ const user = {
     SET_ADMINID: (state, adminId) => {
       state.adminId = adminId
     },
-
     SET_TOKEN: (state, token) => {
       state.token = token
     },
@@ -45,6 +48,18 @@ const user = {
     SET_COMPANYNAME: (state, companyName) => {
       state.companyName = companyName
     },
+    SET_LOCDEPTCODE: (state, locDeptCode) => {
+      state.locDeptCode = locDeptCode
+    },
+    SET_LOCIVNCODE: (state, locInvCode) => {
+      state.locInvCode = locInvCode
+    },
+    SET_LOCDEPTNAME: (state, locDeptName) => {
+      state.locDeptName = locDeptName
+    },
+    SET_LOCIVNNAME: (state, locInvName) => {
+      state.locInvName = locInvName
+    },
   },
 
   actions: {
@@ -84,7 +99,12 @@ const user = {
           commit('SET_EMPLOYEENAME', user.employeeName)
           commit('SET_CUSTOMERID', user.customerId)
           commit('SET_COMPANYNAME', user.companyName)
+          commit('SET_LOCDEPTCODE', user.locDeptCode)
+          commit('SET_LOCIVNCODE', user.locInvCode)
+          commit('SET_LOCDEPTNAME', user.locDeptName)
+          commit('SET_LOCIVNNAME', user.locInvName)
           resolve(res)
+          console.log("获取用户数据成功-=----");
         }).catch(error => {
           reject(error)
         })
@@ -102,6 +122,10 @@ const user = {
           commit('SET_EMPLOYEENAME', "")
           commit('SET_CUSTOMERID', "")
           commit('SET_COMPANYNAME', "")
+          commit('SET_LOCDEPTCODE', "")
+          commit('SET_LOCIVNCODE', "")
+          commit('SET_LOCDEPTNAME', "")
+          commit('SET_LOCIVNNAME', "")
           removeToken()
           removeAdminId()
           resolve()
@@ -111,16 +135,6 @@ const user = {
       })
     },
 
-    // 前端 登出
-    FedLogOut({commit}) {
-      return new Promise(resolve => {
-        commit('SET_TOKEN', '')
-        commit('SET_ADMINID', '')
-        removeToken()
-        removeAdminId()
-        resolve()
-      })
-    }
   }
 }
 
diff --git a/src/utils/coTools.js b/src/utils/coTools.js
new file mode 100644
index 00000000..03dd60b6
--- /dev/null
+++ b/src/utils/coTools.js
@@ -0,0 +1,144 @@
+function pluralize(time, label) {
+  if (time === 1) {
+    return time + label;
+  }
+  return time + label + "s";
+}
+export function timeAgo(time) {
+  const between = Date.now() / 1000 - Number(time);
+  if (between < 3600) {
+    return pluralize(~~(between / 60), " minute");
+  } else if (between < 86400) {
+    return pluralize(~~(between / 3600), " hour");
+  } else {
+    return pluralize(~~(between / 86400), " day");
+  }
+}
+
+export function parseTime(time, cFormat) {
+  if (arguments.length === 0) {
+    return null;
+  }
+
+  if ((time + "").length === 10) {
+    time = +time * 1000;
+  }
+
+  const format = cFormat || "{y}-{m}-{d} {h}:{i}:{s}";
+  let date;
+  if (typeof time === "object") {
+    date = time;
+  } else {
+    date = new Date(parseInt(time));
+  }
+  const formatObj = {
+    y: date.getFullYear(),
+    m: date.getMonth() + 1,
+    d: date.getDate(),
+    h: date.getHours(),
+    i: date.getMinutes(),
+    s: date.getSeconds(),
+    a: date.getDay()
+  };
+  const timeStr = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
+    let value = formatObj[key];
+    if (key === "a")
+      return ["一", "二", "三", "四", "五", "六", "日"][value - 1];
+    if (result.length > 0 && value < 10) {
+      value = "0" + value;
+    }
+    return value || 0;
+  });
+  return timeStr;
+}
+export function rTime(date) {
+  var json_date = new Date(date).toJSON();
+  return new Date(new Date(json_date) + 8 * 3600 * 1000)
+    .toISOString()
+    .replace(/T/g, " ")
+    .replace(/\.[\d]{3}Z/, "");
+}
+export function formatTime(time, option) {
+  time = +time * 1000;
+  const d = new Date(time);
+  const now = Date.now();
+
+  const diff = (now - d) / 1000;
+
+  if (diff < 30) {
+    return "刚刚";
+  } else if (diff < 3600) {
+    // less 1 hour
+    return Math.ceil(diff / 60) + "分钟前";
+  } else if (diff < 3600 * 24) {
+    return Math.ceil(diff / 3600) + "小时前";
+  } else if (diff < 3600 * 24 * 2) {
+    return "1天前";
+  }
+  if (option) {
+    return parseTime(time, option);
+  } else {
+    return (
+      d.getMonth() +
+      1 +
+      "月" +
+      d.getDate() +
+      "日" +
+      d.getHours() +
+      "时" +
+      d.getMinutes() +
+      "分"
+    );
+  }
+}
+
+/*  数字 格式化 */
+export function nFormatter(num, digits) {
+  const si = [
+    { value: 1e18, symbol: "E" },
+    { value: 1e15, symbol: "P" },
+    { value: 1e12, symbol: "T" },
+    { value: 1e9, symbol: "G" },
+    { value: 1e6, symbol: "M" },
+    { value: 1e3, symbol: "k" }
+  ];
+  for (let i = 0; i < si.length; i++) {
+    if (num >= si[i].value) {
+      return (
+        (num / si[i].value + 0.1)
+          .toFixed(digits)
+          .replace(/\.0+$|(\.[0-9]*[1-9])0+$/, "$1") + si[i].symbol
+      );
+    }
+  }
+  return num.toString();
+}
+
+export function html2Text(val) {
+  const div = document.createElement("div");
+  div.innerHTML = val;
+  return div.textContent || div.innerText;
+}
+
+export function toThousandslsFilter(num) {
+  return (+num || 0)
+    .toString()
+    .replace(/^-?\d+/g, m => m.replace(/(?=(?!\b)(\d{3})+$)/g, ","));
+}
+
+/**
+ * 格式化文件大小
+ * @param value
+ * @returns {*}
+ */
+export function renderSize(value) {
+  if (!value || value === null || value === "") {
+    return "";
+  }
+  let unitArr = ["B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"];
+  let srcsize = parseFloat(value);
+  let index = Math.floor(Math.log(srcsize) / Math.log(1024));
+  let size = srcsize / Math.pow(1024, index);
+  size = size.toFixed(0); // 保留的小数位数
+  return size + unitArr[index];
+}
diff --git a/src/views/basic/busType/busTypeAdvancedSettings.vue b/src/views/basic/busType/busTypeAdvancedSettings.vue
index cfd32aa7..6a23d8d8 100644
--- a/src/views/basic/busType/busTypeAdvancedSettings.vue
+++ b/src/views/basic/busType/busTypeAdvancedSettings.vue
@@ -10,15 +10,15 @@
                          border>启用单据类型
             </el-checkbox>
 
-            <el-checkbox v-model="inputQuery.genUnit" :disabled="inputQuery.corpType !=2" style="width: 200px" border>
+            <el-checkbox v-model="inputQuery.genUnit" :disabled="inputQuery.corpType !=1" style="width: 200px" border>
               允许手动输入客户信息
             </el-checkbox>
 
-            <el-checkbox v-model="inputQuery.useDyCount" :disabled="inputQuery.corpType !=2" style="width: 200px"
+            <el-checkbox v-model="inputQuery.useDyCount" :disabled="inputQuery.corpType !=1" style="width: 200px"
                          border>允许科室多次使用出库
             </el-checkbox>
 
-            <el-checkbox v-model="inputQuery.outTospms" style="width: 200px" border>手持终端提交单据至自助平台
+            <el-checkbox v-model="inputQuery.outToSpms" style="width: 200px" border>手持终端提交单据至自助平台
             </el-checkbox>
 
           </div>
@@ -116,7 +116,7 @@
                          border>自动补单
             </el-checkbox>
 
-            <el-checkbox v-model="inputQuery.checkBalacne" :disabled="!inputQuery.checkEnable" style="width: 200px"
+            <el-checkbox v-model="inputQuery.checkBalance" :disabled="!inputQuery.checkEnable" style="width: 200px"
                          border>平衡补单
             </el-checkbox>
 
@@ -183,7 +183,7 @@
                          border>自动补单
             </el-checkbox>
 
-            <el-checkbox v-model="inputQuery.secCheckBalacne" :disabled="!inputQuery.secCheckEnable"
+            <el-checkbox v-model="inputQuery.secCheckBalance" :disabled="!inputQuery.secCheckEnable"
                          style="width: 200px" border>平衡补单
             </el-checkbox>
           </div>
diff --git a/src/views/basic/busType/bussinessType.vue b/src/views/basic/busType/bussinessType.vue
index 3c718a78..becd9588 100644
--- a/src/views/basic/busType/bussinessType.vue
+++ b/src/views/basic/busType/bussinessType.vue
@@ -196,8 +196,6 @@ export default {
         thirdAction: null,
         secCheckSp: null,
         checkSp: null,
-        checkBalacne: null,
-        secCheckBalacne: null,
         secCheckCopy: null,
         corpType: null,
         storageCode: null,
@@ -206,7 +204,7 @@ export default {
         useDyCount: null,
         expireTip: true,
         prefix: null,
-        outTospms: null,
+        outToSpms: null,
         ullageFill: null,
         scanPreIn: null,
         vailInv: null,
@@ -218,7 +216,8 @@ export default {
         advanceType: null,
         preIn: null,
         originAction: null,
-        comments: null,
+        checkBalance: null,
+        secCheckBalance: null
       },
       enableMap: {
         true: "是",
@@ -256,6 +255,7 @@ export default {
     cancelDialog() {
       this.modifyDialogVisible = false;
       this.addDialogVisible = false;
+      this.getList();
     },
     search() {
       this.filterQuery.page = 1;
@@ -309,7 +309,6 @@ export default {
         })
         .catch(() => {
           this.loading = false;
-          this.cancelDialog();
         });
     },
 
@@ -384,8 +383,8 @@ export default {
         thirdAction: null,
         secCheckSp: null,
         checkSp: null,
-        checkBalacne: null,
-        secCheckBalacne: null,
+        checkBalance: null,
+        secCheckBalance: null,
         secCheckCopy: null,
         corpType: null,
         storageCode: null,
@@ -394,7 +393,7 @@ export default {
         useDyCount: null,
         expireTip: true,
         prefix: null,
-        outTospms: null,
+        outToSpms: null,
         ullageFill: null,
         scanPreIn: null,
         vailInv: null,
@@ -405,8 +404,7 @@ export default {
         orderVisibleType: null,
         advanceType: null,
         preIn: null,
-        originAction: null,
-        comments: null
+        originAction: null
       }
       this.addDialogVisible = true;
     },
diff --git a/src/views/basic/busType/bussinessTypeModify.vue b/src/views/basic/busType/bussinessTypeModify.vue
index 79b4aad3..19f0a8f2 100644
--- a/src/views/basic/busType/bussinessTypeModify.vue
+++ b/src/views/basic/busType/bussinessTypeModify.vue
@@ -136,9 +136,9 @@
 
       <el-row type="flex">
         <el-col :span="23" type="flex">
-          <el-form-item prop="comments">
+          <el-form-item prop="remark">
             <label slot="label">备&emsp;&emsp;注</label>
-            <el-input v-model="inputQuery.comments" size="small" style="width: 90%" type="textarea"
+            <el-input v-model="inputQuery.remark" size="small" style="width: 90%" type="textarea"
                       row="3"></el-input>
           </el-form-item>
         </el-col>
@@ -227,7 +227,8 @@ export default {
           label: '特殊往来'
         }],
       twoCheck: false,
-      settingDialogVisible: false
+      settingDialogVisible: false,
+      oldData: {}
     }
   },
   methods: {
@@ -258,6 +259,16 @@ export default {
       }
       if (this.inputQuery.corpType === 4) {
         this.findSpecialMethod();
+      } else {
+        this.inputQuery.defaultUnit = null;
+      }
+
+      if (this.inputQuery.corpType !== 1) {
+        this.inputQuery.genUnit = false;
+        this.inputQuery.useDyCount = false;
+      } else {
+        this.inputQuery.genUnit = this.oldData.genUnit;
+        this.inputQuery.useDyCount = this.oldData.useDyCount;
       }
     },
 
@@ -319,6 +330,7 @@ export default {
     }
     this.getList();
     this.findSpecialMethod();
+    this.oldData = Object.assign({}, this.inputQuery);
   },
 };
 </script>
diff --git a/src/views/basic/corpMaintain/corpExport.vue b/src/views/basic/corpMaintain/corpExport.vue
index 0f70477e..891fb559 100644
--- a/src/views/basic/corpMaintain/corpExport.vue
+++ b/src/views/basic/corpMaintain/corpExport.vue
@@ -119,7 +119,7 @@
                     genKey: null,
                     status: null,
                     page: 1,
-                    type: 1,
+                    type: 3,
                     limit: 20,
                     thirdSysFk: null,
                 };
diff --git a/src/views/basic/corpMaintain/corpImport.vue b/src/views/basic/corpMaintain/corpImport.vue
index c0d5e916..2b0eb902 100644
--- a/src/views/basic/corpMaintain/corpImport.vue
+++ b/src/views/basic/corpMaintain/corpImport.vue
@@ -53,12 +53,12 @@
                    <el-tag :type="statusFilterType(scope.row.status)">{{ status[scope.row.status] }}</el-tag>
                 </template>
             </el-table-column>
-            <el-table-column label="操作" width="120">
-                <template slot-scope="scope">
-                    <el-button type="text" @click.native.stop="handleDetailClick(scope.row)">详情</el-button>
-                    <el-button type="text" @click.native.stop="deleteDialog(scope.row.id)"></el-button>
-                </template>
-            </el-table-column>
+            <!--<el-table-column label="操作" width="120">-->
+            <!--    <template slot-scope="scope">-->
+            <!--        <el-button type="text" @click.native.stop="handleDetailClick(scope.row)">详情</el-button>-->
+            <!--        <el-button type="text" @click.native.stop="deleteDialog(scope.row.id)"></el-button>-->
+            <!--    </template>-->
+            <!--</el-table-column>-->
         </el-table>
 
 
diff --git a/src/views/basic/corpMaintain/corpMaintain.vue b/src/views/basic/corpMaintain/corpMaintain.vue
index 76c73596..a99cacf0 100644
--- a/src/views/basic/corpMaintain/corpMaintain.vue
+++ b/src/views/basic/corpMaintain/corpMaintain.vue
@@ -358,7 +358,6 @@ export default {
             this.getThirdSysDetail();
         },
         formSubmit() {
-
             if (this.$isBlank(this.editQuery.corpType)) {
                 this.$message.error("往来单位类型不能为空！");
                 return;
diff --git a/src/views/basic/corpMaintain/corpSingleRelevance.vue b/src/views/basic/corpMaintain/corpSingleRelevance.vue
index b17004da..e96b4d2c 100644
--- a/src/views/basic/corpMaintain/corpSingleRelevance.vue
+++ b/src/views/basic/corpMaintain/corpSingleRelevance.vue
@@ -137,7 +137,7 @@ export default {
     },
     methods: {
         handlepageChange(val) {
-            this.unitQuery.page = val;
+            this.unitQuery.page = val.page;
             this.getList();
         },
         handleErppageChange(val) {
diff --git a/src/views/inout/IoCreateOrder.vue b/src/views/inout/IoCreateOrder.vue
new file mode 100644
index 00000000..3a974b45
--- /dev/null
+++ b/src/views/inout/IoCreateOrder.vue
@@ -0,0 +1,914 @@
+<template>
+  <div>
+    <el-card style="margin: 5px;margin-top: -20px">
+      <el-form :model="formData" :rules="formRules" ref="dataForm" label-width="100px"
+               style="margin-bottom: -15px">
+        <el-button-group style="display: flex;margin: 0px 0 10px 80%; height: 35px">
+          <el-button
+            size="mini"
+            type="primary"
+            @click.native="saveOrder()"
+          >草稿保存
+          </el-button
+          >
+          <el-button
+            size="mini"
+            type="primary"
+            @click.native="submit('0')"
+          >提交订单
+          </el-button
+          >
+        </el-button-group>
+        <el-row>
+          <el-col :span="11">
+            <el-form-item prop="corpOrderId" label="单据号:">
+              <el-input v-model="formData.corpOrderId" auto-complete="off" style="width: 90%"
+                        clearable
+                        :disabled="corpOrderIdDisabled"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item prop="createTime" label="单据时间:">
+              <el-date-picker
+                v-model="formData.createTime"
+                type="datetime"
+                placeholder="日期"
+                clearable
+                :disabled="true"
+                style="width: 90%"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="11">
+            <el-form-item prop="invCode" label="当前仓库:">
+              <el-select v-model="formData.invCode" placeholder="当前仓库信息"
+                         style="width: 90%"
+                         clearable
+                         :disabled="corpOrderIdDisabled" @change="changeInv" filterable>
+                <el-option
+                  v-for="item in curInvOptions"
+                  :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="action" label="单据类型:">
+              <el-select v-model="formData.action" placeholder="请选择单据类型"
+                         :disabled="corpOrderIdDisabled"
+                         clearable
+                         style="width: 90%"
+                         @change="actionChange">
+                <el-option
+                  v-for="item in busTypeOptions"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.action">
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="11">
+            <el-form-item prop="fromCorp"
+                          label="往来信息:"
+                          v-if="curAction.corpType ==0 || curAction.corpType == 2 || (curAction.corpType == 1 && !curAction.genUnit)"
+            >
+              <el-select
+                v-model="formData.fromCorp"
+                filterable
+                remote
+                clearable
+                reserve-keyword
+                style="width: 90%"
+                placeholder="请输入往来单位"
+                :remote-method="findMethod"
+                :loading="loading"
+                :disabled="corpOrderIdDisabled"
+              >
+                <el-option
+                  v-for="item in fromOptions"
+                  :key="item.erpId"
+                  :label="item.name"
+                  :value="item.erpId"
+                >
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item prop="fromCorp"
+                          v-if="curAction.corpType ==3"
+                          label="往来信息:"
+            >
+              <el-select v-model="formData.fromInvCode" placeholder="请选择往来仓库"
+                         :disabled="corpOrderIdDisabled" filterable
+                         clearable
+                         style="width: 90%"
+              >
+                <el-option
+                  v-for="item in fromInvOptions"
+                  :key="item.code"
+                  :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-form-item prop="fromCorp"
+                          v-if="curAction.corpType ==1 && curAction.genUnit">
+              <el-input v-model="formData.fromCorp" 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-input v-model="formData.remark" auto-complete="off"
+                        clearable
+                        style="width: 90%"
+                        placeholder="请输入备注信息"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="20">
+            <el-form-item prop="code" label="扫码录入:">
+              <el-input
+                id="inputer"
+                @focus="getInputFocus($event)"
+                @keypress.enter.native="enterKey($event)"
+                ref='inputRef'
+                style="ime-mode:disabled"
+                type="tel"
+                v-model="formData.code"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="2">
+            <el-button
+              type="primary"
+              size="mini"
+              @click.native.stop="addCode()"
+              style=" margin-left: 15px"
+            >添加
+            </el-button
+            >
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-card>
+    <el-tabs type="border-card" style="margin: 5px">
+      <el-tab-pane label="业务详情">
+        <biz-detail-panel :idQuery="idQuery" v-if="isCodeAlive"></biz-detail-panel>
+      </el-tab-pane>
+      <el-tab-pane label="扫码详情">
+        <codeDetailPanel :idQuery="idQuery" v-if="isCodeAlive"></codeDetailPanel>
+      </el-tab-pane>
+      <el-tab-pane label="扫码明细">
+        <codesPanel :idQuery="idQuery" v-if="isCodeAlive"></codesPanel>
+      </el-tab-pane>
+
+    </el-tabs>
+
+
+    <!--        <el-dialog-->
+    <!--            :title="selectUnitTitle"-->
+    <!--            :visible.sync="dialogTableVisible"-->
+    <!--            :close-on-click-modal="false"-->
+    <!--            :close-on-press-escape="false"-->
+    <!--            v-if="dialogTableVisible"-->
+    <!--            width="70%"-->
+    <!--            append-to-body-->
+    <!--        >-->
+    <!--            <DialogSelectUnit-->
+    <!--                :codeId="curRow"-->
+    <!--                v-on:selectSupUnit="selectSupUnit"-->
+    <!--                v-on:closeBindDialog="closeBindDialog"-->
+    <!--            ></DialogSelectUnit>-->
+    <!--        </el-dialog>-->
+    <!--        <el-dialog-->
+    <!--            :title="selectRlTitle"-->
+    <!--            :visible.sync="selectRlVisible"-->
+    <!--            width="80%"-->
+    <!--            :close-on-click-modal="false"-->
+    <!--            :close-on-press-escape="false"-->
+    <!--            v-if="selectRlVisible"-->
+    <!--            append-to-body-->
+    <!--        >-->
+    <!--            <selectRlDialog-->
+    <!--                :curRow="curRow"-->
+    <!--                :curAction="curAction"-->
+    <!--                v-on:selectBindRl="selectBindRl"-->
+    <!--                v-on:closeBindDialog="closeBindDialog"-->
+    <!--            ></selectRlDialog>-->
+    <!--        </el-dialog>-->
+
+    <!--        <el-dialog-->
+    <!--            :title="editTitle"-->
+    <!--            :visible.sync="editCodeVisible"-->
+    <!--            append-to-body width="70%"-->
+    <!--            :close-on-click-modal="false"-->
+    <!--            :close-on-press-escape="false"-->
+    <!--            v-if="editCodeVisible"-->
+    <!--        >-->
+    <!--            <editCodeDialog-->
+    <!--                editTye="2"-->
+    <!--                :closeCodeDialog="closeCodeDialog"-->
+    <!--                :codeDetail="codeDetail">-->
+    <!--            </editCodeDialog>-->
+    <!--        </el-dialog>-->
+
+    <!--        <el-dialog-->
+    <!--            :title="editTitle"-->
+    <!--            :visible.sync="editOriginCodeVisible"-->
+    <!--            append-to-body width="70%"-->
+    <!--            :close-on-click-modal="false"-->
+    <!--            :close-on-press-escape="false"-->
+    <!--            v-if="editOriginCodeVisible">-->
+    <!--            <editCodeDialog-->
+    <!--                :closeCodeDialog="closeCodeDialog"-->
+    <!--                :repeatAddCode="repeatAddCode"-->
+    <!--                :codeDetail="formData"-->
+    <!--                editTye="1">-->
+    <!--            </editCodeDialog>-->
+    <!--        </el-dialog>-->
+
+
+  </div>
+
+
+</template>
+
+<script>
+import {
+  errorCodeList, addOrderWeb, deleteCodesTempById, submitOrderWeb, saveOrderWeb,
+  updateCodeBindSup, enterCodeWeb
+} from "../../api/inout/order";
+import {filterSubByInv, findByFrom, findByInvUser, findInvByUser} from "../../api/system/invSubWarehouse";
+import draggable from "vuedraggable";
+import {parseTime} from "../../utils/coTools";
+import {getBasicUnitMaintains} from "../../api/basic/basicUnitMaintain"
+import {filterAllByLoc, filterAllByUser} from "@/api/system/invWarehouse";
+import {getLocalJoinByUser} from "../../api/basic/busType";
+// import DialogSelectUnit from "./DialogSelectUnit";
+// import selectRlDialog from "./DialogSelectRl";
+// import editCodeDialog from "./editCode";
+
+
+import codesPanel from "./IoCreateOrderCodes"
+import codeDetailPanel from "./IoCreateOrderCodeDetail"
+import bizDetailPanel from "./IoCreateOrderBizDetail"
+import A from "../../plugins/KeyScaner"
+import {isBlank} from "@/utils/strUtil";
+import {filterDepts} from "@/api/auth/authDept";
+import {selectSysParamByKey} from "@/api/param/systemParamConfig";
+import store from "@/store";
+
+
+export default {
+  name: "idQuery",
+  props: {
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+    idQuery: {
+      type: Object,
+      required: true,
+    },
+  },
+  data() {
+    return {
+
+      formData: {
+        billNo: null,
+        corpOrderId: null,
+        action: null,
+        createTime: new Date(),
+        invCode: null,
+        fromCorp: null,
+        fromInvCode: null,
+        remark: null,
+        code: "",
+        fromType: 2,
+        batchNo: null,
+        produceDate: null,
+        expireDate: null,
+        serialNo: null,
+      },
+      curInvOptions: [],
+      busTypeOptions: [],
+      fromInvOptions: [],
+      curAction: {
+        corpType: 0,
+        genUnit: false,
+      },
+      fromOptions: [],
+      isCodeAlive: true,
+
+      editCodeVisible: false,
+      actionEnable: false,
+      editOriginCodeVisible: false,
+      curId: null,
+      storageList: [],
+
+      formRules: {
+        temp: [
+          {required: true, message: "请输入条码", trigger: "blur"}
+        ],
+      },
+      isScan: true,
+      scanText: "扫码录入：",
+      corpOrderIdDisabled: false,
+
+      loading: false,
+      index: null,
+      formLoading: false,
+      formVisible: false,
+      deleteLoading: false,
+      orderNo: null,
+
+      fromStorageOptions: [],
+
+
+      curRow: null,
+
+      dialogTableVisible: false,
+      sitcomScan: false,
+      selectRlTitle: "绑定产品",
+      selectUnitTitle: "绑定供应商",
+      sictomText: "",
+      originCode: "",
+      checkSuccess: false,
+      codeDetail: null,
+      editTitle: "编辑条码",
+      fromDeptOptions: [],
+      enableDept: false
+    };
+  },
+  components: {
+    draggable,
+    // DialogSelectUnit, selectRlDialog, editCodeDialog
+    codesPanel, codeDetailPanel, bizDetailPanel
+  },
+  methods: {
+
+
+    //获取用户仓库列表
+    findInvByUser() {
+      this.curInvOptions = [];
+      findInvByUser()
+        .then((response) => {
+          this.curInvOptions = response.data || [];
+          if (this.curInvOptions != null && this.curInvOptions.length == 1) {
+            this.formData.invWarehouseCode = this.curInvOptions[0].code;
+            this.getBusTypeByInv()
+          }
+        })
+        .catch(() => {
+        });
+    },
+
+    //仓库改变
+    changeInv() {
+      this.formData.action = null;
+      this.getBusTypeByInv();
+    },
+
+    //根据仓库,用户获取单据类型
+    getBusTypeByInv() {
+      let query = {
+        code: this.formData.invCode,
+      };
+      findByInvUser(query)
+        .then((response) => {
+          this.busTypeOptions = response.data || [];
+        })
+        .catch(() => {
+        });
+    },
+
+    //获取往来单位候选列表
+    findMethod(query) {
+      this.fromOptions = [];
+      let cQuery = {
+        key: query,
+        corpType: null,
+        outType: null,
+        page: 1,
+        limit: 20
+      };
+      if (this.curAction.corpType == 3) {//内部科室
+        cQuery.corpType = 3;
+      } else if (this.curAction.corpType == 2)//供应商信息
+      {
+        cQuery.corpType = 2;
+      } else if (this.curAction.corpType == 0) {
+        cQuery.corpType = 2;
+      } else return;
+      getBasicUnitMaintains(cQuery)
+        .then((response) => {
+          this.loading = false;
+          this.fromOptions = response.data.list || [];
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
+
+    //单据类型改变
+    actionChange(item) {
+      this.curAction = this.getActionItem(item);
+      if (this.curAction.corpType == 0 || this.curAction.corpType == 2 || (this.curAction.corpType == 1 && !this.curAction.genUnit)) {
+        //1.切换往来单位
+        this.formData.fromCorp = null;
+        this.findMethod();
+      } else if (this.curAction.corpType == 3) {
+        //2. 切换往来仓库
+        this.formData.fromInvCode = null;
+        this.findFromInvList();
+      }
+    },
+
+    //获取往来仓库列表
+    findFromInvList(val) {
+      let cQuery = {
+        locInvCode: this.formData.invCode,
+      };
+      findByFrom(cQuery)
+        .then((response) => {
+          this.fromInvOptions = response.data || [];
+          if (val == 1) {
+            this.formData.fromInvCode = this.fromInvOptions[0].code;
+          }
+        })
+        .catch(() => {
+        });
+    },
+
+    //获取当前单据类型
+    getActionItem(action) {
+      for (let i = 0; i < this.busTypeOptions.length; i++) {
+        if (this.busTypeOptions[i].action == action) {
+          return this.busTypeOptions[i];
+        }
+      }
+    },
+
+    //添加条码
+    addCode(event) {
+      this.originCode = "";
+      this.sictomText = "";
+      this.formData.corpOrderId = this.formData.corpOrderId.trim();
+      this.formData.batchNo = "";
+      this.formData.produceDate = "";
+      this.formData.expireDate = "";
+      this.formData.serialNo = "";
+      this.actionEnable = true;
+      if (event == null) {
+      } else event.target.select();
+      this.$refs.inputRef.select();
+      if (this.$isBlank(this.formData.action)) {
+        this.$message.warning("请选择单据类型！");
+        return;
+      }
+      if (this.$isBlank(this.formData.corpOrderId)) {
+        let date = new Date();
+        this.formData.corpOrderId = parseTime(date, '{y}{m}{d}{h}{i}{s}') + Math.ceil(Math.random() * 89 + 10);
+      }
+      this.formData.code = this.formData.code.trim();
+      if (this.$isBlank(this.formData.code)) return;
+      this.loading = true;
+      let tQuery = Object.assign(JSON.parse(JSON.stringify(this.formData)));
+      tQuery.orderId = this.idQuery.id;
+      tQuery.actDate = parseTime(this.formData.actDate, '{y}-{m}-{d} {h}:{i}:{s}');
+      tQuery.action = this.formData.action;
+      this.addCodeSubmit(tQuery);
+      this.$refs.inputRef.select();
+    },
+
+    //添加条码后提交
+    addCodeSubmit(tQuery) {
+      addOrderWeb(tQuery).then((response) => {
+        if (response.code === 20000) {
+          this.idQuery.billNo = response.data.orderId;
+          if (response.data.errMsg != null) {
+            this.$alert(response.data.errMsg, '提示', {
+              confirmButtonText: '确定',
+              type: 'warning',
+              closeOnClickModal: true,
+              callback: action => {
+              }
+            });
+          }
+          this.corpOrderIdDisabled = true;
+          this.refreshCodesPanel();
+          this.$refs.inputRef.focus();
+          this.$refs.inputRef.select();
+        } else {
+          if (response.code == 502) {
+            this.curRow = response.data;
+            this.idQuery.billNo = this.curRow.orderId;
+            this.refreshCodesPanel();
+            this.selectRlTitle = response.message;
+            this.bindRl(response.data);
+          } else if (response.code == 503) {
+            this.curRow = response.data;
+            this.idQuery.billNo = this.curRow.orderId;
+            this.refreshCodesPanel();
+            this.selectUnitTitle = response.message;
+            this.handleUnitClick(response.data);
+          } else if (response.code == 504) {
+
+            this.$confirm(response.message, "提示", {
+              confirmButtonText: "确定",
+              cancelButtonText: "忽略",
+              type: "error",
+            }).then(() => {
+              tQuery.ignoreExpire = true;
+              this.addCodeSubmit(tQuery)
+            }).catch(() => {
+
+            });
+          } else if (response.code == 505) {
+            this.$confirm(response.message, "提示", {
+              confirmButtonText: "确定",
+              cancelButtonText: "忽略",
+              type: "warning",
+            }).then(() => {
+              tQuery.ignoreRecentExpire = true;
+              this.addCodeSubmit(tQuery)
+            }).catch(() => {
+
+            });
+          } else if (response.code == 507) {
+            this.editOriginCodeVisible = true;
+            this.editTitle = response.message;
+            this.formData.produceDate = response.data.produceDate;
+            this.formData.expireDate = response.data.expireDate;
+            this.formData.batchNo = response.data.batchNo;
+            this.formData.serialNo = response.data.serialNo;
+            this.$message({
+              type: 'error',
+              message: "提交失败！" + this.editTitle,
+              customClass: 'messageIndex'
+            });
+          } else {
+            this.$alert(response.message, '提示', {
+              confirmButtonText: '确定',
+              type: 'warning',
+              closeOnClickModal: true,
+              callback: action => {
+                this.$refs.inputRef.focus();
+                this.$refs.inputRef.select();
+              }
+            });
+          }
+        }
+        this.loading = false;
+      });
+    },
+
+    refreshCodesPanel() {
+      this.isCodeAlive = false;
+      this.idQuery =
+      this.$nextTick(() => {  //重新加载组件
+        this.isCodeAlive = true
+      })
+    },
+
+
+    submit(formName) {
+      if (this.total < 1) {
+        this.$message.error('未添加条码');
+        return;
+      }
+      let tQuery = {
+        orderId: this.idQuery.id,
+        locStorageCode: this.formData.locStorageCode,
+        invStorageCode: this.formData.invStorageCode,
+        invWarehouseCode: this.formData.invWarehouseCode,
+        fromInvCode: this.formData.fromInvCode,
+        subInvCode: this.formData.subInvCode,
+        action: this.formData.action,
+        fromCorp: this.formData.fromCorp,
+        fromCorpId: this.formData.fromCorpId,
+        outChangeEnable: this.formData.outChangeEnable,
+        preCheck: this.formData.preCheck,
+        deptCode: this.formData.deptCode,
+      }
+      submitOrderWeb(tQuery)
+        .then((response) => {
+          if (response.code === 20000) {
+            this.$message.success("提交成功");
+            this.closeDialog();
+          } else {
+            this.$message.error(response.message);
+          }
+          this.loading = false;
+        });
+    },
+    saveOrder() {
+      if (this.total < 1) {
+        this.$message.error('未添加条码');
+        return;
+      }
+      if (this.formData.action == null || this.formData.action == '') {
+        this.$message.error('未选择扫码单据类型');
+        return
+      }
+
+
+      if (this.formData.invWarehouseCode == null || this.formData.invWarehouseCode == '') {
+        this.$message.error('当前分库不能为空');
+        return;
+      }
+      let tQuery = Object.assign(JSON.parse(JSON.stringify(this.formData)));
+      tQuery.orderId = this.idQuery.billNo;
+      tQuery.actDate = parseTime(this.formData.actDate, '{y}-{m}-{d} {h}:{i}:{s}');
+      saveOrderWeb(tQuery).then((response) => {
+        if (response.code === 20000) {
+          this.closeDialog();
+        } else {
+          this.$message.error(response.message);
+        }
+        this.loading = false;
+      });
+    },
+    closeCodeDialog() {
+      this.editCodeVisible = false;
+      this.editOriginCodeVisible = false;
+      this.getCodeList();
+    },
+
+    // 刷新表单
+    resetForm() {
+      if (this.$refs["dataForm"]) {
+        // 清空验证信息表单
+        this.$refs["dataForm"].clearValidate();
+        // 刷新表单
+        this.$refs["dataForm"].resetFields();
+        this.getList();
+      }
+    },
+    enterKey(event) {
+      this.checkSuccess = true;
+      let tQuery = {
+        originCode: this.originCode,
+        code: this.formData.code.trim(),
+      }
+      enterCodeWeb(tQuery).then((response) => {
+        if (response.code === 20000) {
+          this.$refs.inputRef.focus();
+          this.$refs.inputRef.select();
+          this.formData.code = response.data;
+          this.addCode();
+        } else {
+          if (response.code == 502) {
+            this.checkSuccess = false;
+            this.formData.code = response.data;
+            this.originCode = this.formData.code;
+          } else if (response.code == 501) {
+            this.checkSuccess = false;
+            // this.formData.code = response.data;
+            // this.originCode = this.formData.code;
+            this.$message.error(response.message);
+          } else if (response.code == 503) {
+            this.checkSuccess = false;
+            this.formData.code = response.data;
+            this.$confirm(response.message, "提示", {
+              type: "warning",
+            })
+              .then(() => {
+                this.formData.code = response.data;
+                this.addCode();
+              })
+              .catch(() => {
+                this.formData.code = this.originCode;
+              });
+
+          } else if (response.code == 508) {
+            this.originCode = "";
+            this.formData.code = "01" + response.data.nameCode;
+            this.originCode = this.formData.code;
+          } else {
+            this.$alert(response.message, '提示', {
+              confirmButtonText: '确定',
+              type: 'warning',
+              closeOnClickModal: true,
+              callback: action => {
+                this.$refs.inputRef.focus();
+                this.$refs.inputRef.select();
+              }
+            });
+          }
+        }
+        this.loading = false;
+      });
+    },
+
+
+    repeatAddCode(editData) {
+      let tQuery = editData;
+      tQuery.orderId = this.idQuery.id;
+      tQuery.actDate = parseTime(this.formData.actDate, '{y}-{m}-{d} {h}:{i}:{s}');
+      tQuery.action = this.formData.action;
+      this.closeCodeDialog();
+      this.addCodeSubmit(tQuery);
+
+    },
+
+
+    getInputFocus(event) {
+      event.currentTarget.select();
+    },
+    tableSelection() {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleAllSelection();
+    },
+    handleSizeChange(val) {
+      this.query.limit = val;
+      this.getCodeList();
+    },
+    handleCurrentChange(val) {
+      this.query.page = val;
+      this.getCodeList();
+    },
+
+    intentBack() {
+      this.$router.go(-1);
+    },
+
+
+    selectSupUnit(row) {
+      let query = {
+        id: this.curRow.id,
+        supId: row.erpId,
+      };
+      updateCodeBindSup(query).then((response) => {
+        if (response.code == 20000) {
+          this.$message.success("绑定成功");
+          this.idQuery.id = this.curRow.orderId;
+          this.getCodeList();
+        } else {
+          this.$message.error(response.message);
+        }
+      }).catch(() => {
+
+      });
+    },
+
+
+    selectBindRl(row) {
+      let query = {
+        id: this.curRow.id,
+        relId: row.id,
+        mySupId: row.unitFk,
+      };
+      updateCodeBindSup(query).then((response) => {
+        if (response.code == 20000) {
+          this.$message.success("绑定成功");
+          this.idQuery.id = this.curRow.orderId;
+          this.getCodeList();
+        } else {
+          if (response.code == 503) {
+            this.curRow = response.data;
+            this.idQuery.id = this.curRow.orderId;
+            this.getCodeList();
+            this.selectUnitTitle = response.message;
+            this.handleUnitClick(response.data);
+          } else
+            this.$message.error(response.message);
+        }
+      }).catch(() => {
+
+      });
+    },
+    closeBindDialog(val) {
+      this.selectRlVisible = false;
+      this.dialogTableVisible = false;
+    },
+
+  },
+  filters: {},
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+    var that = this;
+    var inputer = document.getElementById("inputer");
+    window.sc = new A.KeyScaner(inputer);//传入要监听的DOM节点
+    sc.onInput = function (text) {
+      if (text.includes("delete")) {
+        that.formData.code = "";
+        that.sictomText = "";
+        that.originCode = "";
+        return;
+      }
+      if (that.sitcomScan) {
+        let tempTxt = text;
+        let str = tempTxt.replace(/[\r]/g, "");
+        that.sictomText = that.sictomText + str;
+        that.formData.code = that.sictomText;
+      } else {
+
+        that.formData.code = text;
+        // setTimeout(function(){  that.formData.code = text; }, 3000);
+
+
+      }
+    };
+    inputer.focus();
+  },
+  created() {
+    this.formData.code = '';
+    this.codeArray = [];
+    if (this.$isNotBlank(this.idQuery.billNo)) {
+      this.formData.actDate = new Date(this.idQuery.actDate);
+      this.formData.corpOrderId = this.idQuery.corpOrderId;
+      this.corpOrderIdDisabled = true;
+      this.formData.action = this.idQuery.action;
+      this.formData.fromCorp = this.idQuery.fromCorp;
+      this.formData.deptCode = this.idQuery.deptCode
+      this.formData.invCode = this.idQuery.invCode;
+      this.formData.fromInvCode = this.idQuery.fromInvCode;
+      this.formData.preCheck = this.idQuery.preCheck;
+      this.formData.remark = this.idQuery.remark;
+      this.actionEnable = true;
+      this.refreshCodesPanel();
+      //选择框候选数据
+      this.findInvByUser();
+      this.getBusTypeByInv();
+      this.findMethod(this.formData.fromCorp);
+      this.findFromInvList();
+    } else {
+      this.corpOrderIdDisabled = false;
+      this.formData.actDate = new Date();
+      let date = new Date();
+      this.formData.corpOrderId = parseTime(date, '{y}{m}{d}{h}{i}{s}') + Math.ceil(Math.random() * 89 + 10);
+      this.formData.invCode = this.$store.getters.locInvCode;
+      this.findInvByUser();
+    }
+
+
+  }
+  ,
+}
+;
+</script>
+
+
+<style>
+
+
+#inputer {
+  width: 100%;
+  min-height: 30px;
+  background-color: white;
+  border: #d0d0d0;
+  border-style: solid;
+  border-width: 0.1px;
+  color: #4a4a4a;
+
+}
+
+#inputer:focus {
+  width: 100%;
+  min-height: 30px;
+  background-color: white;
+  border: #0080FF;
+  border-style: solid;
+  border-width: 0.1px;
+  color: #4a4a4a;
+
+}
+
+.ime-disabled {
+  ime-mode: disabled;
+}
+</style>
+
+
+
diff --git a/src/views/inout/IoCreateOrderBizDetail.vue b/src/views/inout/IoCreateOrderBizDetail.vue
new file mode 100644
index 00000000..143669d6
--- /dev/null
+++ b/src/views/inout/IoCreateOrderBizDetail.vue
@@ -0,0 +1,365 @@
+<template>
+  <div>
+    <el-button-group style="display: flex">
+      <el-button
+        type="primary"
+        size="mini"
+        ref="mainTable"
+        @click.native.stop="selectProductFunction()"
+        style="margin: 0px 60px 10px auto; height: 35px"
+        :loading="loading"
+      >产品录入
+      </el-button
+      >
+    </el-button-group>
+    <el-table v-loading="loading" :data="detailList" style="width: 100%;"
+              :row-class-name="tableRowClassName"
+              border
+              max-height="350" height="350" ref="multipleTable">
+      <el-table-column label="序号" type="index" width="50"></el-table-column>
+      <el-table-column width="150"
+                       label="产品通用名"
+                       prop="coName"
+                       show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column width="150"
+                       label="规格型号"
+                       prop="spec"
+                       show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column width="150" label="批次号">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.batchNo"
+                    :disabled="scope.row.index !== selectedIndex"
+                    @input="scope.row.batchNo =scope.row.batchNo.replace(/[\W]/g, '')"
+                    ref='inputBatchNoRef'
+                    placeholder="请输入批次号"></el-input>
+        </template>
+      </el-table-column>
+      <el-table-column width="180" label="生产日期(yyMMdd)">
+        <template slot-scope="scope">
+
+          <el-input v-model="scope.row.productDate" auto-complete="off"
+                    oninput="if(value.length>6)value=value.slice(0,6)"
+                    :disabled="scope.row.index !== selectedIndex"
+                    type="number"
+          ></el-input>
+        </template>
+      </el-table-column>
+      <el-table-column width="180" label="失效日期(yyMMdd)">
+        <template slot-scope="scope">
+
+          <el-input v-model="scope.row.expireDate" auto-complete="off"
+                    oninput="if(value.length>6)value=value.slice(0,6)"
+                    :disabled="scope.row.index !== selectedIndex"
+                    type="number"
+          ></el-input>
+        </template>
+      </el-table-column>
+      <el-table-column width="120" label="单据数量">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.count"
+                    type='number'
+                    :disabled="scope.row.index !== selectedIndex"
+                    oninput="value=value.replace(/[^\d]/g,'')"></el-input>
+        </template>
+      </el-table-column>
+
+      <el-table-column width="80"
+                       label="扫码数量"
+                       prop="reCount"
+                       show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column width="150" label="价格">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.price"
+                    type='number'
+                    :disabled="scope.row.index !== selectedIndex"
+                    placeholder="请输入价格"
+          ></el-input>
+        </template>
+      </el-table-column>
+
+      <el-table-column width="160"
+                       label="注册/备案凭证号"
+                       prop="certCode"
+                       show-overflow-tooltip
+      >
+        <!--        <template slot-scope="scope">-->
+        <!--          <el-input size="small" v-model="scope.row.certCode"-->
+        <!--                    :disabled="scope.row.index !== selectedIndex"-->
+        <!--                    placeholder="请输入注册/备案凭证号" style="width: 100%"-->
+        <!--          ></el-input>-->
+        <!--        </template>-->
+      </el-table-column>
+      <el-table-column width="150"
+                       label="生产厂家"
+                       prop="manufacturer"
+                       show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column label="操作" width="150" fixed="right">
+        <template slot-scope="scope">
+
+          <el-button
+            type="text"
+            size="small"
+            v-if="scope.row.index == selectedIndex"
+            @click.stop="true"
+            @click.native="saveChange(scope.row)"
+          >保存
+          </el-button
+          >
+
+          <el-button
+            type="text"
+            size="small"
+            v-if="scope.row.index != selectedIndex"
+            @click.stop="true"
+            @click.native="rowChange(scope.row)"
+          >编辑
+          </el-button
+          >
+          <el-button
+            type="text"
+            size="small"
+            @click.stop="true"
+            @click.native="copyDetail(scope.row)"
+          >复制
+          </el-button
+          >
+          <el-button
+            type="text"
+            size="small"
+            @click.stop="true"
+            @click.native="deleteDetail(scope.row)"
+          >删除
+          </el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <el-dialog
+      title="业务详情-产品录入"
+      :visible.sync="selectProductVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="85%"
+      v-if="selectProductVisible"
+      :append-to-body='true'
+    >
+      <stockOrderNewSelectProduct
+        :closeDialog="closeDialog"
+        :data="thisData"
+      ></stockOrderNewSelectProduct>
+    </el-dialog>
+
+    <!--    <el-dialog-->
+    <!--      title="库存产品录入"-->
+    <!--      :visible.sync="selectInvProductVisible"-->
+    <!--      :close-on-click-modal="false"-->
+    <!--      :close-on-press-escape="false"-->
+    <!--      width="85%"-->
+    <!--      v-if="selectInvProductVisible"-->
+    <!--      :append-to-body='true'-->
+    <!--    >-->
+    <!--      <dialogInvProduct-->
+    <!--        :closeDialog="closeDialogC2"-->
+    <!--        :data="thisData"-->
+    <!--        :invQueryData="invQueryData"-->
+    <!--      ></dialogInvProduct>-->
+    <!--    </el-dialog>-->
+  </div>
+</template>
+
+<script>
+import stockOrderNewSelectProduct from "./stockOrderNewSelectProduct";
+// import dialogInvProduct from "../inventory/DialogInvProduct"
+import {addBizProduct, getDetailBizs, updateBizProduct, delBizProduct} from "@/api/inout/orderDetailCode";
+
+export default {
+  name: "IoCreateOrderBizDetail",
+  props: {
+    idQuery: {
+      type: Object,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      loading: false,
+      query: {
+        orderId: null,
+        code: "",
+        corpOrderId: "",
+        page: 1,
+        limit: 10,
+      },
+      detailList: [],
+      total: 0,
+      iCount: 0,
+      selectProductVisible: false,
+      thisData: {},
+      selectedIndex: null,
+    };
+  },
+  components: {
+    stockOrderNewSelectProduct,
+    // dialogInvProduct,
+  },
+  methods: {
+    getOrderDetails() {
+      this.loading = true;
+      this.query.orderId = this.idQuery.billNo;
+      getDetailBizs(this.query) //查找该单号下的所有条码
+        .then((response) => {
+          this.detailList = response.data.list || [];
+
+          this.total = response.data.total || 0;
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.detailList = [];
+          this.total = 0;
+        });
+    },
+
+    rowChange(val) {
+      this.currentRow = val;
+      this.selectedIndex = val.index;
+    },
+
+    closeDialog(rData) {
+      this.selectProductVisible = false;
+      this.selectInvProductVisible = false;
+      this.idQuery = rData;
+      this.getOrderDetails();
+    },
+
+    rowStyle({row, rowIndex}) {
+      let rowBackground = {};
+      if (!this.$isNotBlank(row.supId) || !this.$isNotBlank(row.relId)) {
+        rowBackground.color = '#f60303';
+      }
+      return rowBackground;
+    },
+
+    tableRowClassName({row, rowIndex}) {
+      row.index = rowIndex;
+    },
+
+    selectProductFunction() {
+      this.selectProductVisible = true;
+      this.thisData = this.idQuery;
+    },
+
+    saveChange(row) {
+      updateBizProduct(row)
+        .then((response) => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.$message.success("保存成功！");
+            this.selectedIndex = null;
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+          this.dataList = [];
+          this.pageTotal = 0;
+        });
+    },
+
+    copyDetail(row) {
+      let data = {
+        relId: row.bindRlFk,
+        zczbhhzbapzbh: row.zczbhhzbapzbh,
+        orderEntity: this.idQuery,
+      }
+      this.loading = true;
+      addBizProduct(data)
+        .then((response) => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.getOrderDetails();
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+          this.dataList = [];
+          this.pageTotal = 0;
+        });
+    },
+
+    deleteDetail(row) {
+      let data = {
+        id: row.id,
+      }
+      this.loading = true;
+      delBizProduct(data)
+        .then((response) => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.getOrderDetails();
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+          this.dataList = [];
+          this.pageTotal = 0;
+        });
+    }
+  }
+  ,
+  filters: {}
+  ,
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  }
+  ,
+  created() {
+    this.getOrderDetails();
+  }
+  ,
+}
+;
+</script>
+<style scoped>
+.el-table_fixed, el-table__fixed-right {
+  height: 80% !important;
+}
+
+.el-table__fixed-body-wrapper {
+  height: 80% !important;
+}
+
+
+.ao-text {
+  width: 100%;
+  font-size: 13px;
+  font-family: "Microsoft YaHei";
+  float: right;
+  text-align: right;
+  margin-top: 10px;
+}
+
+/**
+解决el-input输入框 type=number时，输入中文光标上移问题
+ */
+.el-input__inner {
+  line-height: 1px !important;
+}
+
+</style>
+
+
+
diff --git a/src/views/inout/IoCreateOrderCodeDetail.vue b/src/views/inout/IoCreateOrderCodeDetail.vue
new file mode 100644
index 00000000..819b6314
--- /dev/null
+++ b/src/views/inout/IoCreateOrderCodeDetail.vue
@@ -0,0 +1,101 @@
+<template>
+  <div>
+    <el-table v-loading="loading" :data="detailList" style="width: 100%;" max-height="350" height="350"
+              border
+              ref="multipleTable">
+      <el-table-column type="index" label="序号" width="50"></el-table-column>
+      <el-table-column label="产品通用名" width="150" prop="coName" show-overflow-tooltip></el-table-column>
+      <el-table-column label="规格型号" width="150" prop="spec" show-overflow-tooltip></el-table-column>
+      <el-table-column label="批次号" width="150" prop="batchNo" show-overflow-tooltip></el-table-column>
+      <el-table-column label="生产日期" width="120" prop="productDate" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <span>{{ convertDateFun(scope.row.productDate) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="失效日期" width="120" prop="expireDate" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <span>{{ convertDateFun(scope.row.expireDate) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="扫码数量" width="80" prop="count" show-overflow-tooltip></el-table-column>
+      <el-table-column label="实际数量" width="80" prop="reCount" show-overflow-tooltip></el-table-column>
+      <el-table-column label="价格" width="150" prop="price" show-overflow-tooltip></el-table-column>
+      <el-table-column label="生产厂家" width="150" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
+      <el-table-column label="注册/备案凭证号" width="150" prop="certCode" show-overflow-tooltip></el-table-column>
+    </el-table>
+    <div class="block">
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="query.page"
+        :limit.sync="query.limit"
+        @pagination="getList"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import {convertDate} from "@/utils/date";
+import {getDetailCodes} from "@/api/inout/orderDetailCode";
+
+export default {
+  name: "IoCreateOrderCodeDetail",
+  props: {
+    idQuery: {
+      type: Object,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      convertDateFun: convertDate,
+      loading: false,
+      query: {
+        orderId: null,
+        code: "",
+        corpOrderId: "",
+        page: 1,
+        limit: 10,
+      },
+      detailList: [],
+      total: 0,
+      selectRlVisible: false,
+      dialogTableVisible: false,
+      editCodeVisible: false,
+    }
+  },
+  methods: {
+    getOrderDetails() {
+      this.loading = true;
+      this.query.orderId = this.idQuery.billNo;
+      getDetailCodes(this.query) //查找该单号下的所有条码
+        .then((response) => {
+          this.detailList = response.data.list || [];
+          this.total = response.data.total || 0;
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.detailList = [];
+          this.total = 0;
+        });
+    },
+
+    rowStyle({row, rowIndex}) {
+      let rowBackground = {};
+      if (!this.$isNotBlank(row.supId) || !this.$isNotBlank(row.relId)) {
+        rowBackground.color = '#f60303';
+      }
+      return rowBackground;
+    },
+  },
+  created() {
+    this.getOrderDetails();
+  },
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/inout/IoCreateOrderCodes.vue b/src/views/inout/IoCreateOrderCodes.vue
new file mode 100644
index 00000000..5b68e513
--- /dev/null
+++ b/src/views/inout/IoCreateOrderCodes.vue
@@ -0,0 +1,210 @@
+<template>
+  <div>
+    <el-table v-loading="loading" :data="codeArray" style="width: 100%;" max-height="350" height="350"
+              :row-style="rowStyle"
+              border
+              ref="multipleTable">
+      <el-table-column
+        type="selection"
+        width="55">
+      </el-table-column>
+      <el-table-column label="序号" type="index" width="55"></el-table-column>
+      <el-table-column
+        label="UDI码"
+        prop="code"
+        width="280"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        label="生产日期"
+        prop="produceDate"
+        width="120"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        label="失效日期"
+        prop="expireDate"
+        width="120"
+        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="serialNo"
+        width="120"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        label="供应商"
+        prop="supName"
+        width="180"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        label="扫码数量"
+        prop="count"
+        width="80"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        label="实际数量"
+        prop="reCount"
+        width="80"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column label="操作" width="240">
+        <template slot-scope="scope">
+          <el-button
+            type="text"
+            size="small"
+            @click.native.stop="deleteCode(scope.$index, scope.row)"
+          >减一
+          </el-button
+          >
+          <el-button
+            type="text"
+            size="small"
+            @click.native.stop="bindRl(scope.row)"
+          >选择产品
+          </el-button
+          >
+          <el-button
+            type="text"
+            size="small"
+            @click.native.stop="handleUnitClick(scope.row)"
+          >选择供应商
+          </el-button
+          >
+          <el-button
+            type="text"
+            size="small"
+            @click.native.stop="editCode(scope.row)"
+          >编辑
+          </el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="block">
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="query.page"
+        :limit.sync="query.limit"
+        @pagination="getList"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import {deleteCodesTempById, errorCodeList} from "@/api/inout/order";
+
+export default {
+  name: "IoAddCodeDetail",
+  props: {
+    idQuery: {
+      type: Object,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      loading: false,
+      query: {
+        code: "",
+        corpOrderId: "",
+        page: 1,
+        limit: 10,
+      },
+      codeArray: [],
+      total: 0,
+      curRow: null,
+      selectRlVisible: false,
+      dialogTableVisible: false,
+      editCodeVisible: false,
+    }
+  },
+  methods: {
+    getCodeList() {
+      this.loading = true;
+      this.query.orderId = this.idQuery.billNo;
+      errorCodeList(this.query) //查找该单号下的所有条码
+        .then((response) => {
+          this.codeArray = response.data.list || [];
+          this.total = response.data.total || 0;
+          for (let i = 0; i < this.codeArray.length; i++) {
+            this.codeArray[i].fromType = this.formData.fromType;
+            this.codeArray[i].billType = this.formData.billType;
+          }
+          this.tableSelection();
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+
+    deleteCode(index, row) {
+      this.$confirm("是否确定移除一个条码?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        this.loading = true;
+        let tQuery = {
+          id: row.id
+        }
+        deleteCodesTempById(tQuery)
+          .then((response) => {
+            if (response.code === 20000) {
+              this.getCodeList();
+            } else {
+              this.$message.error(response.message);
+            }
+            this.loading = false;
+          });
+      }).catch(() => {
+      });
+    },
+
+    bindRl(val) {
+      this.curRow = val;
+      this.selectRlVisible = true;
+    },
+
+    handleUnitClick(row) {
+      this.curRow = row;
+      this.dialogTableVisible = true;
+    },
+
+    editCode(row) {
+      this.editTitle = "编辑条码";
+      this.codeDetail = row;
+      this.editCodeVisible = true;
+    },
+
+    rowStyle({row, rowIndex}) {
+      let rowBackground = {};
+      if (!this.$isNotBlank(row.supId) || !this.$isNotBlank(row.relId)) {
+        rowBackground.color = '#f60303';
+      }
+      return rowBackground;
+    },
+  },
+  created() {
+    this.getCodeList();
+  },
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/inout/IoNewOrder.vue b/src/views/inout/IoNewOrder.vue
new file mode 100644
index 00000000..4e46707b
--- /dev/null
+++ b/src/views/inout/IoNewOrder.vue
@@ -0,0 +1,701 @@
+<template>
+  <div>
+    <el-card class="el-card">
+      <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
+        <el-row>
+          <el-col :span="6">
+            <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="6">
+            <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="6">
+            <el-form-item class="query-form-item" label="单据类型:">
+              <el-select v-model="filterQuery.action" placeholder="请选择单据类型"
+                         style="width: 90%">
+                <el-option
+                  v-for="item in busTypes"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.action">
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="所属仓库:">
+              <el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择所属仓库" clearable="true"
+                         style="width: 90%"
+                         @change="subInvChange"
+              >
+                <el-option
+                  v-for="item in subInvList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.code">
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </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-s-unfold" @click="mergesOrders">合并单据</el-button>
+          <el-button type="primary" icon="el-icon-plus" @click="addOrders">新增单据</el-button>
+          <el-button type="primary" icon="el-icon-error" @click="errOrders">异常单据</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
+                @selection-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="billTypeName">
+        </el-table-column>
+        <el-table-column label="订单号" prop="id" show-overflow-tooltip></el-table-column>
+        <el-table-column label="来源订单号" prop="corpOrderId" show-overflow-tooltip></el-table-column>
+        <el-table-column label="来源" prop="fromType">
+          <template slot-scope="scope">
+            <span>{{ fromTypeMap[scope.row.fromType] }}</span>
+          </template>
+
+        </el-table-column>
+        <el-table-column label="往来单位" prop="fromCorp" width="220">
+
+        </el-table-column>
+        <el-table-column label="当前仓库" prop="invName" width="120">
+        </el-table-column>
+        <el-table-column label="当前分库" prop="subInvName" width="120">
+        </el-table-column>
+        <el-table-column label="所属科室" prop="deptName" width="120" v-if="enableDept">>
+        </el-table-column>
+
+
+        <el-table-column label="创建时间" prop="actDate" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <i class="el-icon-time"></i>
+            <span>{{ scope.row.actDate }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="校验状态" prop="status" width="100">
+          <template slot-scope="scope">
+            <el-tag :type="(scope.row.status ===-1 ) | statusFilterType">{{
+                checkStatus[scope.row.status]
+              }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="150">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click.native.stop="addOrders(scope.row)"
+            >编辑
+            </el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              @click.native.stop="deleteDialog(scope.row.id)"
+            >删除
+            </el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              v-if="scope.row.status !== -1"
+              @click.native.stop="onUpload(scope.row.id)"
+            >立即处理
+            </el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-dialog title="错误信息" :visible.sync="dialogVisible" width="30%">
+        <span>{{ errorDetail }}</span>
+        <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="dialogVisible = false"
+        >关 闭</el-button
+        >
+      </span>
+      </el-dialog>
+      <el-dialog
+        title="选择往来单位"
+        :visible.sync="dialogTableVisible"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        width="70%"
+      >
+        <el-form :inline="true" :model="unitquery" class="query-form" size="mini">
+          <el-form-item class="query-form-item">
+            <el-input v-model="unitquery.key" placeholder="搜索"></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button
+              type="primary"
+              icon="search"
+              @click.native.stop="getUnitList()"
+            >查询
+            </el-button
+            >
+          </el-form-item>
+        </el-form>
+
+        <el-table
+          v-loading="loading"
+          :data="unitlist"
+          style="width: 100%"
+          @row-click="selectUnit"
+        >
+          <el-table-column
+            label="往来单位ID"
+            prop="erpId"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="往来单位名称"
+            prop="name"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="往来单位简写"
+            prop="spell"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="地址"
+            prop="addr"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column label="状态" prop="status"></el-table-column>
+          <el-table-column label="类型" prop="type"></el-table-column>
+        </el-table>
+      </el-dialog>
+      <el-dialog
+        title="异常订单"
+        :visible.sync="errOrderVisible"
+        width="80%"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+      >
+        <ioErrorOrder
+        ></ioErrorOrder>
+      </el-dialog>
+      <el-dialog
+        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"
+          :idQuery="idQuery"
+        ></addOrder>
+      </el-dialog>
+      <el-dialog
+        title="单号详情"
+        :visible.sync="codeDetailVisible"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        width="80%"
+        v-if="codeDetailVisible"
+      >
+        <codeDetail
+          :idQuery="idQuery"
+          v-on:closeDetailDialog="closeDetailDialog"
+        ></codeDetail>
+      </el-dialog>
+      <el-pagination
+        :page-size="filterQuery.limit"
+        @current-change="handleCurrentChange"
+        layout="prev, pager, next"
+        :total="total"
+        :current-page="filterQuery.page"
+      ></el-pagination>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import {
+  getDraft,
+  filterOrder,
+  deleteByOrderId,
+  commitOrder,
+  updateUnit, mergeOrder,
+} from "../../api/inout/order";
+import {getBasicUnitMaintains} from "../../api/basic/basicUnitMaintain"
+import draggable from "vuedraggable";
+// import codeDetail from "./errorCode";
+// import ioErrorOrder from "./IOErrorOrder";todo
+import addOrder from "./IoCreateOrder";
+import store from "../../store";
+import {filterAllByUser} from "@/api/system/invWarehouse";
+import {getLocalJoinByUser} from "@/api/basic/busType";
+import {filterSubByInv} from "@/api/system/invSubWarehouse";
+import {isBlank} from "@/utils/strUtil";
+import {selectSysParamByKey} from "@/api/param/systemParamConfig";
+
+const formJson = {
+  site_id: "",
+  site_name: "",
+  describe: "",
+  ads: [],
+};
+
+export default {
+  name: "IoNewOrder",
+  data() {
+    return {
+
+      showSearch: true,
+      filterQuery: {
+        id: "",
+        mainAction: null,
+        action: null,
+        page: 1,
+        status: 10,
+        limit: 10,
+        locStorageCode: this.$store.getters.locInvCode,
+        invWarehouseCode: this.$store.getters.locSubInvCode,
+      },
+      checkStatus: {
+        '-1': "草稿",
+        // 1: "等待处理",
+        1: "等待处理",
+        2: "等待校验",
+        3: "校验异常",
+        4: "校验成功",
+      },
+      curIndex: "",
+      unitquery: {key: "", page: 1, limit: 20},
+      unitlist: [],
+      multipleSelection: [],
+      unitUpdateQuery: {
+        id: "",
+        fromCorpId: "",
+        fromCorp: "",
+      },
+      idQuery: {
+      },
+      storageList: [],
+      subInvList: [],
+      errOrderVisible: false,
+      list: [],
+      adId: [],
+      adSelectList: [],
+      adList: {},
+      adListNoDataText: "无数据",
+      queryAdIdAsyncLoading: false,
+      codeDetailVisible: false,
+      addOrderVisible: false,
+      total: 0,
+      loading: false,
+      index: null,
+      formName: null,
+      errorDetail: "1111111111111",
+      formMap: {
+        add: "新增",
+        edit: "编辑",
+      },
+      enableDept: false,
+      fromTypeMap: {
+        "1": "UDIMS平台",
+        "2": "网页新增",
+        "3": "pda即时校验",
+        "4": "pda未校验",
+        "5": "pc端扫码精灵",
+        "6": "缺量补录单据",
+        "7": "UDI供应商平台",
+        "8": "平衡补录单据",
+        "10": "手动补单",
+        "11": "仓库盘点"
+      },
+      deleteData: {
+        id: "",
+        status: 10,
+      },
+      dialogTableVisible: false,
+      formLoading: false,
+      dialogVisible: false,
+      formData: formJson,
+      deleteLoading: false,
+      busTypes: [],
+    };
+  },
+  components: {
+    draggable,
+    // codeDetail,
+    addOrder,
+    // ioErrorOrder
+  },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        status: 10,
+        page: 1,
+        limit: 10,
+      };
+      this.getList();
+    },
+    onSubmit() {
+      this.loading = true;
+      this.getList();
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+
+    handleSizeChange(val) {
+      this.filterQuery.limit = val;
+      this.getList();
+    },
+    handleCurrentChange(val) {
+      this.filterQuery.page = val;
+      this.getList();
+    },
+    handleUnitClick(row) {
+      this.curIndex = row.id;
+      this.dialogTableVisible = true;
+    },
+    closeDetailDialog(val) {
+      this.codeDetailVisible = false;
+    },
+    getActionName(action) {
+      for (let i = 0; i < this.busTypes.length; i++) {
+        if (this.busTypes[i].action === action) {
+          return this.busTypes[i].name;
+        }
+      }
+    },
+    getBusType() {
+      if (this.subInvList.length > 0) {
+        this.filterQuery.locStorageCode = this.subInvList.find(item => item.code == this.filterQuery.invWarehouseCode).parentId
+      }
+      let query = {
+        code: this.filterQuery.invWarehouseCode,
+        enabled: true,
+      };
+      getLocalJoinByUser(query)
+        .then((response) => {
+          this.busTypes = response.data.list || [];
+          this.filterQuery.billAction = this.busTypes[0].action;
+          // this.getList();
+        })
+        .catch(() => {
+        });
+    },
+    getStorage() {
+      this.storageList = [];
+      filterAllByUser()
+        .then((response) => {
+          this.storageList = response.data || [];
+          if (this.storageList.length > 0) {
+            this.getSubInvList();
+            this.getList();
+          }
+        })
+        .catch(() => {
+        });
+    },
+    getStorageName(code) {
+      for (let i = 0; i < this.storageList.length; i++) {
+        if (this.storageList[i].code === code) {
+          return this.storageList[i].name;
+        }
+      }
+    },
+    getSubStorageName(code) {
+      for (let i = 0; i < this.subInvList.length; i++) {
+        if (this.subInvList[i].code === code) {
+          return this.subInvList[i].name;
+        }
+      }
+    },
+    addOrders(row) {
+      this.idQuery = {};
+      this.idQuery = row;
+      this.addOrderVisible = true;
+    },
+    errOrders() {
+      this.errOrderVisible = true;
+    },
+    closeDialog() {
+      this.addOrderVisible = false;
+      this.addHosOrderVisible = false;
+      this.getList();
+    },
+    getUnitList() {
+      this.loading = true;
+      getBasicUnitMaintains(this.unitquery)
+        .then((response) => {
+          this.loading = false;
+          this.unitlist = response.data.list || [];
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    selectUnit(row) {
+      this.unitUpdateQuery.id = this.curIndex;
+      this.unitUpdateQuery.fromCorp = row.name;
+      this.unitUpdateQuery.fromCorpId = row.unitid;
+      updateUnit(this.unitUpdateQuery)
+        .then((response) => {
+          this.dialogTableVisible = false;
+          this.getList();
+        })
+        .catch(() => {
+          this.dialogTableVisible = false;
+        });
+    },
+    //获取订单列表
+    getList() {
+      this.loading = true;
+      getDraft(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;
+        });
+    },
+    mergesOrders() {
+      let repeatData = this.multipleSelection;
+      if (repeatData.length <= 1) {
+        this.$message.warning("未选择单据！");
+        return;
+      }
+      let orderid = repeatData[0].id;
+      let unit = repeatData[0].fromCorp;
+      let action = repeatData[0].action;
+      let orderList = [];
+      for (let index in repeatData) {
+        if (action !== repeatData[index].action) {
+          this.$message.warning("业务类型不一致！");
+          return;
+        }
+        if (unit !== repeatData[index].fromCorp) {
+          this.$message.warning("往来单位不一致！");
+          return;
+        }
+        orderList.push(repeatData[index].id);
+      }
+      let tquery = {
+        orderList: orderList,
+        type: 2,
+      };
+
+      this.$confirm(
+        "所选择的订单将会合并到订单号为" + orderid + "的订单下",
+        "提示",
+        {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }
+      )
+        .then(() => {
+          mergeOrder(tquery).then((response) => {
+            if (response.code === 20000) {
+              this.getList();
+              this.$message({
+                type: "success",
+                message: "合并成功",
+              });
+            } else {
+              this.$message.error(response.message);
+            }
+          });
+        })
+        .catch(() => {
+        });
+    },
+    deleteOrders(data) {
+      this.loading = true;
+      this.deleteData.id = 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();
+          }
+
+        })
+        .catch(() => {
+        });
+    },
+    deleteDialog(rowId) {
+      this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.deleteOrders(rowId);
+        })
+        .catch(() => {
+        });
+    },
+    onUpload(data) {
+      this.loading = true;
+      var idQuery = {
+        orderId: "",
+      };
+      idQuery.orderId = data;
+      commitOrder(idQuery)
+        .then((response) => {
+          if (response.code == 20000) {
+            this.$message.success(response.data);
+            for (let i = 0; i < this.list.length; i++) {
+              if (this.list[i].id === idQuery.orderId) {
+                this.list.splice(i, 1);
+                break;
+              }
+            }
+            this.loading = false;
+          } else {
+            this.loading = false
+            this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+        });
+    },
+    handleErrorDetail(poistion) {
+      var mOrder = this.list[poistion];
+      var corpOrderId = mOrder.remark;
+
+      this.errorDetail = mOrder.remark;
+      this.dialogVisible = true;
+    },
+    intentDetail(row) {
+      this.codeDetailVisible = true;
+      this.idQuery.id = row.id;
+
+    },
+    invChange() {
+      this.subInvList = [];
+      this.filterQuery.invWarehouseCode = "";
+      let query = {
+        pcode: this.filterQuery.locStorageCode
+      };
+      filterSubByInv(query)
+        .then((response) => {
+          this.subInvList = response.data || [];
+        })
+        .catch(() => {
+        });
+    },
+    getSubInvList() {
+      let query = {
+        // pcode: this.filterQuery.locStorageCode
+        filter: 3,
+      };
+      filterSubByInv(query)
+        .then((response) => {
+          this.subInvList = response.data || [];
+          this.getList();
+        })
+        .catch(() => {
+        });
+    },
+    subInvChange() {
+      this.getBusType();
+    },
+    init() {
+      axios.get("./config.json").then(res => {
+        // 基础地址
+        let response = res.data.BASE_URL;
+        this.uploadFileUrl = response + "/udiwms/orders/file/upload";
+      });
+    },
+  },
+  filters: {
+    statusFilterType(status) {
+      const statusMap = {
+        false: "success",
+        true: "warning",
+      };
+      return statusMap[status];
+    },
+  },
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+    this.getSubInvList();
+    this.getBusType();
+    let query = this.$route.query;
+    this.filterQuery = Object.assign(this.filterQuery, query);
+    this.filterQuery.limit = parseInt(this.filterQuery.limit);
+    selectSysParamByKey({paramKey: "muti_inv_mode"}).then((res) => {
+      if (res.code === 20000) {
+        if (res.data.paramValue === "0") {
+          this.enableDept = true;
+        }
+      }
+    })
+
+  },
+};
+</script>
+
+<style type="text/scss" lang="scss">
+</style>
+
diff --git a/src/views/inout/stockOrderNewSelectProduct.vue b/src/views/inout/stockOrderNewSelectProduct.vue
new file mode 100644
index 00000000..2b409c27
--- /dev/null
+++ b/src/views/inout/stockOrderNewSelectProduct.vue
@@ -0,0 +1,315 @@
+<template>
+  <div>
+    <el-card class="el-card">
+      <div>
+        <el-form :model="listQuery" size="mini">
+          <el-row style="margin-top: 15px;width: 1000px">
+            <el-form-item class="query-form-item">
+              <el-input v-model="listQuery.udiCode"
+                        style="width: 600px"
+                        placeholder="请扫描或输入UDI码"
+                        clearable="true"
+                        @keyup.enter.native="keyup_submit($event)"></el-input>
+            </el-form-item>
+          </el-row>
+          <el-row>
+            <el-form-item class="query-form-item">
+              <el-input v-model="listQuery.unionCode" placeholder="DI/医保编码/商品条码"
+                        clearable="true"></el-input>
+            </el-form-item>
+            <el-form-item class="query-form-item">
+              <el-input v-model="listQuery.cpmctymc" placeholder="产品通用名" clearable="true"></el-input>
+            </el-form-item>
+            <el-form-item class="query-form-item">
+              <el-input v-model="listQuery.ggxh" placeholder="规格型号" clearable="true"></el-input>
+            </el-form-item>
+          </el-row>
+          <el-row>
+            <el-form-item class="query-form-item">
+              <el-input v-model="listQuery.ylqxzcrbarmc" placeholder="生产企业/注册备案人"
+                        clearable="true"></el-input>
+            </el-form-item>
+            <el-form-item class="query-form-item">
+              <el-input v-model="listQuery.thrPiId" placeholder="第三方产品编码" clearable="true"></el-input>
+            </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="search" @click="search">查询</el-button>
+                <el-button type="primary" icon="search" @click="confirmSelect">确定</el-button>
+              </el-button-group>
+            </el-form-item>
+          </el-row>
+        </el-form>
+
+        <el-table
+          :data="dataList"
+          style="width: 100%"
+          highlight-current-row="false"
+          v-loading="loading"
+          border
+          @current-change="handleChange"
+          ref="multipleTable"
+        >
+          <el-table-column label width="45">
+            <template slot-scope="scope">
+              <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
+            </template>
+          </el-table-column>
+          <el-table-column label="序号" type="index"></el-table-column>
+          <el-table-column
+            label="最小销售产品标识"
+            prop="nameCode"
+            width="140"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="产品编码"
+            prop="thirdId"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="医疗器械注册人"
+            prop="ylqxzcrbarmc"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="产品通用名"
+            prop="cpmctymc"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="规格型号"
+            prop="ggxh"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="注册/备案凭证"
+            prop="zczbhhzbapzbh"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="器械类别"
+            prop="qxlb"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="配送企业"
+            prop="companyName"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column label="操作" width="160">
+            <template slot-scope="scope">
+              <el-button
+                type="text"
+                size="small"
+                @click.native.stop="handleDetailClick(scope.row)"
+              >详情
+              </el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-pagination
+          :page-size="listQuery.limit"
+          @current-change="handleErpPageChange"
+          layout="prev, pager, next"
+          :total="pageTotal"
+          :current-page="listQuery.page"
+        ></el-pagination>
+      </div>
+    </el-card>
+
+    <el-dialog title="请选择对应的资质证书" :visible.sync="dialogFormVisible" append-to-body width="40%">
+      <el-form :model="form">
+        <el-form-item label="" prop="isGive">
+          <el-radio-group v-model="currentCert">
+            <el-radio :label="item" :key="item" v-for="item in certList">{{ item }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="selectCert">确 定</el-button>
+        <el-button @click="dialogFormVisible = false">取 消</el-button>
+      </div>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+
+import {getUdiInfos} from "@/api/basic/product/udiRelevance";
+import {addBizProduct} from "@/api/inout/orderDetailCode";
+
+export default {
+  name: "stockOrderNewSelectProduct",
+  props: {
+    data: {
+      type: Object,
+      required: true,
+    },
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+    filterType: {
+      type: Function,
+      required: true,
+    },
+  },
+
+  data() {
+    return {
+      loading: false,
+      listQuery: {
+        udiCode: null,
+        cpmctymc: null,
+        ggxh: null,
+        ylqxzcrbarmc: null,
+        thrPiId: null,
+        page: 1,
+        limit: 10,
+      },
+      dataList: [],
+      pageTotal: 1,
+      total: 1,
+      radioCheck: null,
+      currentRow: null,
+
+      //选择资质证书
+      dialogFormVisible: false,
+      currentCert: null,
+      certList: [],
+    };
+  },
+  methods: {
+
+    onReset() {
+      this.listQuery = {
+        udiCode: null,
+        cpmctymc: null,
+        ggxh: null,
+        ylqxzcrbarmc: null,
+        thrPiId: null,
+        page: 1,
+        limit: 10,
+      }
+      this.radioCheck = null;
+      this.currentRow = null;
+      this.getList();
+    },
+
+    search() {
+      this.listQuery.page = 1;
+      this.getList();
+    },
+
+    getList() {
+      this.loading = true;
+      getUdiInfos(this.listQuery)
+        .then((response) => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.dataList = response.data.list || [];
+            this.pageTotal = response.data.total || 0;
+          } else {
+            this.$message.error(response.message);
+            this.dataList = [];
+            this.pageTotal = 0;
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+          this.dataList = [];
+          this.pageTotal = 0;
+        });
+    },
+
+    keyup_submit(event) {
+      this.listQuery.page = 1;
+      this.getList();
+      event.target.select();
+    },
+
+    handleChange(val) {
+      this.radioCheck = val.id;
+      this.currentRow = val;
+    },
+
+    confirmSelect() {
+      if (this.radioCheck == null) {
+        this.$message.error('未选择产品');
+        return;
+      }
+      let str = this.currentRow.zczbhhzbapzbh;
+      if (str.search(",") != -1) {
+        this.currentCert = null;
+        this.certList = str.split(',');
+        this.dialogFormVisible = true;
+      } else {
+        this.combine();
+      }
+    },
+
+    selectCert() {
+      if (this.currentCert == null) {
+        this.$message.error("请先选择对应的注册证！");
+      } else {
+        this.multipleSelection.zczbhhzbapzbh = this.currentCert;
+        this.combine();
+      }
+    },
+
+    combine() {
+      let data = {
+        relId: this.currentRow.id,
+        supId: this.currentRow.customerId,
+        zczbhhzbapzbh: this.currentRow.zczbhhzbapzbh,
+        orderEntity: this.data,
+      }
+      this.loading = true;
+      addBizProduct(data)
+        .then((response) => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.closeDialog(response.data);
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+          this.dataList = [];
+          this.pageTotal = 0;
+        });
+    },
+
+  },
+  components: {}
+  ,
+
+  created() {
+    this.getList();
+  }
+  ,
+}
+;
+</script>
+
+<style scoped>
+.query-form-item {
+  display: block !important;
+  margin-right: 10px;
+  margin-bottom: 5px;
+}
+
+div /deep/ .el-table .warning-row {
+  background: #bebebe;
+}
+
+div /deep/ .el-table .success-row {
+  background: #ffffff;
+}
+</style>
diff --git a/src/views/login.vue b/src/views/login.vue
index 4bceb026..916a8a73 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -56,7 +56,7 @@
     </el-form>
     <!--  底部  -->
     <div class="el-login-footer">
-      <span>Copyright © 2018-2022 ruoyi.vip All Rights Reserved.</span>
+      <span>Copyright © 2018-2022 glxp All Rights Reserved.</span>
     </div>
   </div>
 </template>
diff --git a/src/views/system/dept/authDept.vue b/src/views/system/dept/authDept.vue
index 43300e0f..30bdf7e4 100644
--- a/src/views/system/dept/authDept.vue
+++ b/src/views/system/dept/authDept.vue
@@ -99,11 +99,12 @@
           </template>
         </el-table-column>
       </el-table>
-      <el-dialog :title="formMap[formName]" :visible.sync="formVisible" width="45%">
+      <el-dialog :title="formMap[formName]" :visible.sync="formVisible"  width="45%">
         <el-form :model="formData" ref="dataForm" :rules="rules">
           <el-row>
             <el-form-item label="上级部门:" label-width="100px" v-if="formData.pid != 0">
               <treeselect v-model="formData.pcode" :options="deptOptions" :normalizer="normalizer"
+                          :disabled="isShow"
                           style="width: 90%"
                           placeholder="选择上级部门"/>
             </el-form-item>
@@ -164,20 +165,11 @@
           <el-button @click.native="cancelDialog" size="small">取消</el-button>
         </div>
       </el-dialog>
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="filterQuery.page"
-        :limit.sync="filterQuery.limit"
-        @pagination="getList"
-      />
     </el-card>
     <el-tabs type="border-card" style="margin: 15px">
-
       <!--      部门绑定用户列表-->
       <el-tab-pane>
         <span slot="label">{{ currentRow.name }}-用户列表</span>
-
         <el-form :inline="true" :model="userQuery" class="query-form" size="mini">
           <el-form-item class="query-form-item" label="用户名称/账号:">
             <el-input
@@ -195,18 +187,18 @@
                 @click="onUserReset"
               >重置
               </el-button>
-              <el-button type="primary" @click="onUserReset"
+              <el-button type="primary" @click="onUserSubmit"
                          icon="el-icon-search"
               >查询
               </el-button
               >
-              <el-tooltip content="请移步至权限管理-用户管理-编辑界面选择所属部门信息" placement="top" style="margin-left: 20px">
+              <el-tooltip content="请移步至权限管理-用户管理-编辑界面选择所属部门信息" placement="top"
+                          style="margin-left: 20px">
                 <i class="el-icon-question">帮助</i>
               </el-tooltip>
             </el-button-group>
           </el-form-item>
         </el-form>
-
         <el-table v-loading="userloading" :data="userlist" style="width: 100%" border
                   row-key="id"
         >
@@ -219,7 +211,7 @@
             label="用户账号"
             prop="userName"
           ></el-table-column>
-          <el-table-column label="备注" prop="remark">
+          <el-table-column label="备注" prop="comments">
           </el-table-column>
           <el-table-column label="操作">
             <template slot-scope="scope">
@@ -232,7 +224,6 @@
             </template>
           </el-table-column>
         </el-table>
-
         <pagination
           v-show="userTotal>0"
           :total="userTotal"
@@ -249,7 +240,7 @@
         <el-form :inline="true" :model="invQuery" class="query-form" size="mini">
           <el-form-item class="query-form-item" label="仓库名称/编码:">
             <el-input
-              v-model="userQuery.key"
+              v-model="invQuery.key"
               placeholder="请输入仓库名称或仓库编码"
               clearable
             ></el-input>
@@ -260,7 +251,7 @@
               <el-button
                 type="primary"
                 icon="el-icon-refresh"
-                @click="onUserReset"
+                @click="onInvReset"
               >重置
               </el-button>
               <el-button type="primary" @click="onInvSubmit"
@@ -268,7 +259,8 @@
               >查询
               </el-button
               >
-              <el-tooltip content="请移步至系统管理-组织管理-仓库信息管理界面绑定仓库信息" placement="top" style="margin-left: 20px">
+              <el-tooltip content="请移步至系统管理-组织管理-仓库信息管理界面绑定仓库信息" placement="top"
+                          style="margin-left: 20px">
                 <i class="el-icon-question">帮助</i>
               </el-tooltip>
             </el-button-group>
@@ -332,13 +324,11 @@ export default {
         status: 1,
         companyName: "",
         checkType: "",
-        page: 1,
-        limit: 10,
       },
-      total: 0,
+      isShow:null,
       loading: false,
       formVisible: false,
-      isExpandAll: true,
+      isExpandAll: false,
       refreshTable: true,
       userflag: {
         0: "禁用",
@@ -375,6 +365,7 @@ export default {
       //部门用户
       userQuery: {
         key: null,
+        deptId: null,
         page: 1,
         limit: 10,
       },
@@ -426,9 +417,7 @@ export default {
         path: "",
       });
       this.filterQuery = {
-        name: "",
-        page: 1,
-        limit: 10,
+        name: ""
       };
       this.getList();
     },
@@ -488,6 +477,7 @@ export default {
       this.getList();
     },
     addDeptDialog() {
+      this.resetForm();
       this.formName = "add";
       this.formVisible = true;
       this.formData = {
@@ -502,6 +492,7 @@ export default {
     subAddDeptDialog(row) {
       this.formName = "add";
       this.formVisible = true;
+      this.isShow=false;
       this.formData = {
         pid: row.id,
         pcode: row.code,
@@ -513,9 +504,20 @@ export default {
         this.deptOptions = this.handleTree(depList, "code", "pcode");
       });
     },
+    // 刷新表单
+    resetForm() {
+      if (this.$refs["dataForm"]) {
+        // 清空验证信息表单
+        this.$refs["dataForm"].clearValidate();
+        // 刷新表单
+        this.$refs["dataForm"].resetFields();
+      }
+    },
     updateDeptDialog(row) {
+      this.resetForm();
       this.formName = "edit";
       this.formVisible = true;
+      this.isShow=true;
       this.formData = row;
       // const roleMenu = this.getDeptStatusMenuTreeselect(this.formData.id);
       filterList().then(response => {
@@ -530,24 +532,16 @@ export default {
           this.loading = false;
           let depList = response.data.list || [];
           this.list = this.handleTree(depList, "code", "pcode");
-          this.total = response.data.total || 0;
         })
         .catch(() => {
           this.loading = false;
           this.list = [];
-          this.total = 0;
         });
     },
     cancelDialog() {
       this.formVisible = false;
-    },
-    handleSizeChange(val) {
-      this.filterQuery.limit = val;
-      this.getList();
-    },
-    handleCurrentChange(val) {
-      this.filterQuery.page = val;
-      this.getList();
+      // 刷新表单
+      this.$refs["dataForm"].resetFields();
     },
     deleteDialog(row) {
       this.$confirm("是否删除该部门?", "提示", {
@@ -635,19 +629,18 @@ export default {
     onUserReset() {
       this.userQuery = {
         key: null,
+        deptId: this.currentRow.id,
         page: 1,
         limit: 10,
       };
       this.getUerList();
     },
     onUserSubmit() {
+      this.userQuery.deptId = this.currentRow.id;
       this.getUerList();
     },
     getUerList() {
-      let query = {
-        deptId: this.currentRow.id,
-      };
-      listDeptUser(query)
+      listDeptUser(this.userQuery)
         .then((response) => {
           this.loading = false;
           this.userlist = response.data.list || [];
@@ -659,6 +652,15 @@ export default {
           this.userTotal = 0;
         });
     },
+    onInvReset() {
+      this.invQuery = {
+        key: "",
+        parentId: this.currentRow.code,
+        page: 1,
+        limit: 20
+      };
+      this.onInvSubmit();
+    },
     removeUserDialog(row) {
       this.$confirm("是否确定移除该用户?", "提示", {
         confirmButtonText: "确定",
@@ -685,10 +687,7 @@ export default {
 
     //仓库相关
     getInvList() {
-      let query = {
-        parentId: this.currentRow.code,
-      };
-      filterSubAll(query)
+      filterSubAll(this.invQuery)
         .then((response) => {
           this.loading = false;
           this.invlist = response.data.list || [];
@@ -700,6 +699,7 @@ export default {
         });
     },
     onInvSubmit() {
+      this.invQuery.parentId = this.currentRow.code;
       this.getInvList();
     },
   },
diff --git a/src/views/system/dept/invWarehouse.vue b/src/views/system/dept/invWarehouse.vue
index e649e57c..52e2f210 100644
--- a/src/views/system/dept/invWarehouse.vue
+++ b/src/views/system/dept/invWarehouse.vue
@@ -85,7 +85,7 @@
             <el-button
               type="text"
               :disabled="!configParms.basicInv"
-              @click.native.stop="handleSubDel(scope.row)"
+              @click.native.stop="handleDelInv(scope.row)"
             >删除
             </el-button
             >
@@ -132,6 +132,7 @@
             <el-col :span="12" class="el-col">
               <el-form-item label="上级仓库" prop="parentCode">
                 <treeselect v-model="subData.parentCode" :options="invOptions" :normalizer="normalizer"
+                            :disabled="isShow"
                             style="width: 80%"
                             placeholder="选择上级仓库"/>
               </el-form-item>
@@ -151,6 +152,7 @@
               <el-form-item label="仓库名称" prop="name" class="query-form-item">
                 <el-input
                   v-model="subData.name" style="width: 80%"
+                  placeholder="请输入仓库名称"
                   auto-complete="off"
                 ></el-input>
               </el-form-item>
@@ -159,7 +161,7 @@
 
           <el-row class="el-row" type="flex">
             <el-col class="el-col">
-              <el-form-item label="备注" prop="name" class="query-form-item">
+              <el-form-item label="备注" prop="remark" class="query-form-item">
                 <el-input
                   v-model="subData.remark"
                   type="textarea"
@@ -341,6 +343,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import Treeselect from "@riophae/vue-treeselect";
 import InvRelBusType from "@/views/system/dept/invRelBusType";
 import InvRelUsers from "@/views/system/dept/invRelUsers";
+import {isBlank} from "@/utils/strUtil";
 
 export default {
   data() {
@@ -353,6 +356,7 @@ export default {
         page: 1,
         limit: 10,
       },
+      isShow: null,
       loading: true,
       list: [],
       isExpandAll: true,
@@ -372,7 +376,7 @@ export default {
           {required: true, message: "请选择所属部门", trigger: "blur"}
         ],
         name: [
-          {required: true, message: "请选择仓库名称", trigger: "blur"}
+          {required: true, message: "请输入仓库名称", trigger: "blur"}
         ]
       },
       subData: {},
@@ -440,8 +444,10 @@ export default {
       this.formName = formName;
       if (formName === "edit") {
         this.subData = JSON.parse(JSON.stringify(data));
+        this.isShow = true;
       } else if (formName === "add") {
         this.subData = {};
+        this.isShow = false;
       }
       this.subFormVisible = true;
       this.getSubThrsysDetailData();
@@ -475,6 +481,7 @@ export default {
           });
         }
       });
+      this.getList();
     },
     findDeptMethod() {      //新增，编辑---获取部门信息
       let query = {
@@ -624,7 +631,6 @@ export default {
     },
 
 
-
     getBussinessType(val, obj) {
       if (val != null) {
         this.bussinessTypeQuery.page = val;
@@ -662,18 +668,49 @@ export default {
 
 
     getSubThrsysDetailData() {
-      let params = {
-        id: this.subData.code,
-      };
-      getSubThrsysDetail(params)
-        .then((response) => {
-          this.loading = false;
-          this.sysSubList = response.data.list || [];
+      if (!isBlank(this.subData.code)) {
+        let params = {
+          id: this.subData.code,
+        };
+        getSubThrsysDetail(params)
+          .then((response) => {
+            this.loading = false;
+            this.sysSubList = response.data.list || [];
+          })
+          .catch(() => {
+            this.loading = false;
+            this.sysSubList = [];
+          });
+      }
+    },
+
+
+    handleDelInv(row) {
+      if (row.id) {
+        this.$confirm("确认删除该仓库吗?", "提示", {
+          type: "warning",
         })
-        .catch(() => {
-          this.loading = false;
-          this.sysSubList = [];
-        });
+          .then(() => {
+            this.deleteLoading = true;
+            let para = {id: row.id};
+            deleteSubWarehouse(para)
+              .then((response) => {
+                this.deleteLoading = false;
+                if (response.code !== 20000) {
+                  this.$message.error(response.message);
+                  return false;
+                }
+                this.$message.success("删除成功");
+                this.loadSubData(row.parentId);
+              })
+              .catch(() => {
+                this.deleteLoading = false;
+              });
+          })
+          .catch(() => {
+            this.$message.info("取消删除");
+          });
+      }
     },
 
 
diff --git a/src/views/system/param/busTypeChange.vue b/src/views/system/param/busTypeChange.vue
index 8d151524..9de27d98 100644
--- a/src/views/system/param/busTypeChange.vue
+++ b/src/views/system/param/busTypeChange.vue
@@ -120,15 +120,7 @@ export default {
         false: "禁用",
         true: "启用",
       },
-      mainActionMap: {
-        WareHouseIn: "入库",
-        WareHouseOut: "出库"
-      },
-      fileList: [],
       total: 0,
-      multipleSelection: [],
-      headers: {},
-      configParams: {},
       loading: false,
       typeMap: {
         1: "耗材领用",
diff --git a/src/views/system/param/busTypePre.vue b/src/views/system/param/busTypePre.vue
index 6a7e860c..964f7c60 100644
--- a/src/views/system/param/busTypePre.vue
+++ b/src/views/system/param/busTypePre.vue
@@ -25,25 +25,17 @@
 
       <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row>
         <el-table-column label="序号" type="index" width="60"></el-table-column>
-        <el-table-column label="单据类型名称" prop="originName"></el-table-column>
-        <el-table-column label="单据类型代码" prop="originAction"></el-table-column>
-        <el-table-column label="目标单据类型" prop="targetBusName"></el-table-column>
-        <el-table-column label="类型" prop="type">
+        <el-table-column label="原单据类型" prop="originName"></el-table-column>
+        <el-table-column label="目标单据类型" prop="targetName"></el-table-column>
+        <el-table-column label="目标当前仓库" prop="invName"></el-table-column>
+        <el-table-column label="目标往来仓库" prop="defaultInvName"></el-table-column>
+        <el-table-column label="时间推移（小时）" prop="beforeTime"></el-table-column>
+        <el-table-column label="补单方式" prop="supplementAll">
           <template slot-scope="scope">
-            <span>{{ typeMap[scope.row.type] }}</span>
+            <span>{{ enableMap[scope.row.supplementAll] }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="状态" prop="enable">
-          <template slot-scope="scope">
-            <span>{{ enableMap[scope.row.enable] }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="是否启用" prop="enable">
-          <template slot-scope="scope">
-            <span>{{ enableMap[scope.row.enable] }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="备注" prop="remark"></el-table-column>
+        <el-table-column label="说明" prop="intro"></el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">
             <el-button
@@ -54,7 +46,7 @@
             >
             <el-button
               type="text"
-              @click.native.stop="deleteDialog(scope.row)"
+              @click.native.stop="deleteDialog(scope.row.id)"
             >删除
             </el-button
             >
@@ -65,10 +57,10 @@
 
       <el-dialog
         :title="formMap[formName]"
-        :visible.sync="addDialogVisible"
+        :visible.sync="modifyDialogVisible"
         :close-on-click-modal="false"
         :close-on-press-escape="false"
-        v-if="addDialogVisible"
+        v-if="modifyDialogVisible"
         class="dialog-two"
         width="60%"
         top="5vh"
@@ -100,11 +92,10 @@
 import {isBlank} from "@/utils/strUtil";
 import modifyDialog from "@/views/system/param/busTypePreModify.vue";
 import {
-  getBusTypePreResList,
+  getBusTypePreResList2,
   addBusTypePre,
   updateBusTypePre,
-  deleteBusTypePre,
-  removeBusTypePre
+  deleteBusTypePre, getBusTypePreList
 } from "@/api/basic/busTypePre";
 
 export default {
@@ -116,40 +107,28 @@ export default {
         page: 1,
         limit: 20,
       },
-      addDialogVisible: false,
       modifyDialogVisible: false,
       list: [],
       inputQuery: {
         id: null,
-        originName: null,
         originAction: null,
         action: null,
-        name: null,
-        enable: null,
+        invCode: null,
+        defaultInvCode: null,
+        beforeTime: null,
+        supplementAll: null,
+        intro: null,
         remark: null
       },
       enableMap: {
-        true: "禁用",
-        false: "启用",
-      },
-      mainActionMap: {
-        WareHouseIn: "入库",
-        WareHouseOut: "出库"
+        true: "全量补单",
+        false: "自动补单",
       },
-      fileList: [],
       total: 0,
-      multipleSelection: [],
-      headers: {},
-      configParams: {},
       loading: false,
-      typeMap: {
-        1: "耗材领用",
-        2: "产品申购",
-        3: "采购计划",
-      },
       formMap: {
-        add: "新增补单设置",
-        edit: "编辑补单设置",
+        add: "新增单据流转设置",
+        update: "编辑单据流转设置",
       },
       formName: null,
 
@@ -171,7 +150,6 @@ export default {
     },
     cancelDialog() {
       this.modifyDialogVisible = false;
-      this.addDialogVisible = false;
     },
     search() {
       this.filterQuery.page = 1;
@@ -179,7 +157,7 @@ export default {
     },
     getList() {
       this.loading = true;
-      getBusTypePreResList(this.filterQuery)
+      getBusTypePreResList2(this.filterQuery)
         .then((response) => {
           if (response.code === 20000) {
             this.list = response.data.list || [];
@@ -201,21 +179,20 @@ export default {
     },
 
     onAddSubmit() {
-      this.inputQuery.enable = 1;
-      if (isBlank(this.inputQuery.originName)) {
-        this.$message.error("补单类型名称不能为空！")
-        return;
-      }
       if (isBlank(this.inputQuery.originAction)) {
-        this.$message.error("补单类型代码不能为空！");
+        this.$message.error("原单据类型不能为空！");
         return;
       }
       if (isBlank(this.inputQuery.action)) {
         this.$message.error("目标单据类型不能为空！")
         return;
       }
-      if (isBlank(this.inputQuery.enable)) {
-        this.$message.error("请选择启用状态！")
+      if (isBlank(this.inputQuery.invCode)) {
+        this.$message.error("目标所在仓库不能为空！")
+        return;
+      }
+      if (isBlank(this.inputQuery.defaultInvCode)) {
+        this.$message.error("目标往来仓库不能为空");
         return;
       }
 
@@ -226,7 +203,6 @@ export default {
           this.$message.error("单据类型名称不得为纯数字类型！");
           return;
         }
-        this.inputQuery.type = 1;           //默认类型为耗材领用
 
         addBusTypePre(this.inputQuery).then((res) => {
           if (res.code === 20000) {
@@ -260,8 +236,18 @@ export default {
 
     handleAddClick() {
       this.formName = 'add';
-      this.inputQuery = {enable: false, expireTip: true};
-      this.addDialogVisible = true;
+      this.inputQuery = {
+        id: null,
+        originAction: null,
+        action: null,
+        invCode: null,
+        defaultInvCode: null,
+        beforeTime: null,
+        supplementAll: null,
+        intro: null,
+        remark: null
+      };
+      this.modifyDialogVisible = true;
     },
 
     handleModifyClick(row) {
@@ -276,7 +262,7 @@ export default {
         type: "warning",
       })
         .then(() => {
-          let params = {};
+          let params = {id: rowId};
           deleteBusTypePre(params).then((res) => {
             if (res.code === 20000) {
               this.$message.success("删除成功！");
diff --git a/src/views/system/param/busTypePreModify.vue b/src/views/system/param/busTypePreModify.vue
index 33379406..371bbcb5 100644
--- a/src/views/system/param/busTypePreModify.vue
+++ b/src/views/system/param/busTypePreModify.vue
@@ -3,46 +3,88 @@
     <el-form :model="inputQuery" :rules="formRules" ref="dataForm" label-width="120px" border>
       <el-row type="flex">
         <el-col :span="11">
-          <el-form-item label="补单类型名称" prop="originName">
-            <el-input v-model="inputQuery.originName" :disabled="!isAdd" size="small" placeholder="请输入内容" style="width: 90%"></el-input>
+          <el-form-item label="原单据类型" prop="originAction">
+            <el-select v-model="inputQuery.originAction" placeholder="原单据类型" clearable size="small"
+                       style="width: 90%">
+              <el-option
+                v-for="item in originBusTypes"
+                :key="item.action"
+                :label="item.name"
+                :value="item.action">
+                <span style="float: left"> {{ item.name }}</span>
+                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.action }}</span>
+              </el-option>
+            </el-select>
           </el-form-item>
         </el-col>
 
         <el-col :span="11">
-          <el-form-item label="补单类型代码" prop="originAction">
-            <el-input v-model="inputQuery.originAction" :disabled="!isAdd" size="small" placeholder="请输入内容" style="width: 90%"></el-input>
+          <el-form-item label="目标单据类型" prop="action">
+            <el-select v-model="inputQuery.action" placeholder="目标单据类型" clearable size="small" style="width: 90%">
+              <el-option
+                v-for="item in targetBusTypes"
+                :key="item.action"
+                :label="item.name"
+                :value="item.action">
+                <span style="float: left"> {{ item.name }}</span>
+                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.action }}</span>
+              </el-option>
+
+            </el-select>
           </el-form-item>
         </el-col>
       </el-row>
 
-
       <el-row type="flex">
         <el-col :span="11">
-          <el-form-item label="目标单据类型" prop="targetBusAction">
-            <el-select v-model="inputQuery.action" placeholder="请选择" clearable size="small" style="width: 90%">
+          <el-form-item label="目标所在仓库" prop="invCode">
+            <el-select v-model="inputQuery.invCode" placeholder="目标所在仓库" clearable size="small"
+                       @change="invChange"
+                       style="width: 90%">
               <el-option
-                v-for="item in busTypes"
-                :key="item.action"
+                v-for="item in locInvs"
+                :key="item.name"
                 :label="item.name"
-                :value="item.action">
-                <span style="float: left"> {{item.name}}</span>
-                <span style="float: right; color: #8492a6; font-size: 13px">{{item.action}}</span>
+                :value="item.code">
+                <span style="float: left"> {{ item.name }}</span>
               </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
 
+        <el-col :span="11">
+          <el-form-item label="目标往来仓库" prop="defaultInvCode">
+            <el-select v-model="inputQuery.defaultInvCode" placeholder="目标往来仓库" clearable size="small"
+                       @change="invChange"
+                       style="width: 90%">
+              <el-option
+                v-for="item in fromInvs"
+                :key="item.name"
+                :label="item.name"
+                :value="item.code">
+                <span style="float: left"> {{ item.name }}</span>
+              </el-option>
             </el-select>
           </el-form-item>
         </el-col>
+      </el-row>
 
+      <el-row type="flex">
         <el-col :span="11">
-          <el-form-item label="启用状态" prop="enable">
-            <el-select v-model="inputQuery.enable"
-                       size="small"
-                       placeholder="启用状态"
-                       style="width: 90%"
-                       clearable
-                       >
-              <el-option label="启用" :value="false"></el-option>
-              <el-option label="禁用" :value="true"></el-option>
+          <el-form-item label="推移时间（小时）" prop="beforeTime">
+            <el-input style="width: 90%"
+                      size="small"
+                      type="number" placeholder="请输入内容"
+                      v-model="inputQuery.beforeTime"></el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="11">
+          <el-form-item label="流转方式" prop="supplementAll">
+            <el-select v-model="inputQuery.supplementAll" placeholder="流转方式" clearable size="small"
+                       style="width: 90%">
+              <el-option label="全量补单" :value="true"></el-option>
+              <el-option label="自动补单" :value="false"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
@@ -50,9 +92,9 @@
 
       <el-row type="flex">
         <el-col :span="23" type="flex">
-          <el-form-item prop="comments">
-            <label slot="label">备&emsp;&emsp;注</label>
-            <el-input v-model="inputQuery.remark" size="small" style="width: 90%" type="textarea"
+          <el-form-item prop="intro">
+            <label slot="label">说&emsp;&emsp;明</label>
+            <el-input v-model="inputQuery.intro" size="small" style="width: 90%" type="textarea"
                       row="3"></el-input>
           </el-form-item>
         </el-col>
@@ -64,7 +106,8 @@
 
 <script>
 
-import {getBusTypeList} from "@/api/basic/busType";
+import {getBusTypeList, getBusTypeListByUser} from "@/api/basic/busType";
+import {filterSubByInv, filterSubAll} from "@/api/system/invSubWarehouse";
 
 export default {
   name: "BusTypePreModify",
@@ -81,34 +124,37 @@ export default {
         enabled: true,
         isBuType: true,
       },
-      busTypes: [],
+      originBusTypes: [],
+      targetBusTypes: [],
+      locInvs: [],
+      fromInvs: [],
       isAdd: false,
       formRules: {
-        originName: [
+        originAction: [
           {
             required: true,
-            message: "补单类型名称不能为空",
+            message: "原单据类型不能为空",
             trigger: "blur"
           }
         ],
-        originAction: [
+        action: [
           {
             required: true,
-            message: "补单类型代码不能为空",
+            message: "目标单据类型不能为空",
             trigger: "blur"
           }
         ],
-        targetBusAction: [
+        invCode: [
           {
             required: true,
-            message: "目标单据类型不能为空",
+            message: "目标所在仓库不能为空",
             trigger: "blur"
           }
         ],
-        enable: [
+        defaultInvCode: [
           {
             required: true,
-            message: "请选择启用状态",
+            message: "目标往来仓库不能为空",
             trigger: "blur"
           }
         ],
@@ -125,14 +171,65 @@ export default {
           this.busTypes = res.data.list || [];
         }
       })
-    }
+    },
+
+    getOriginBusType() {
+      let query = {
+        enable: true
+      };
+      getBusTypeList(query).then((res) => {
+        if (res.code === 20000) {
+          this.originBusTypes = res.data.list || [];
+        }
+      })
+    },
+
+    getTargetBusType() {
+      let query = {
+        enable: true
+      };
+      getBusTypeListByUser(query).then((res) => {
+        if (res.code === 20000) {
+          this.targetBusTypes = res.data.list || [];
+        }
+      })
+    },
+
+    getLocInv() {
+      let params = {};
+      filterSubAll(params).then((res) => {
+        if (res.code === 20000){
+          this.locInvs = res.data.list || [];
+        }
+      });
+    },
+
+    getFromInv() {
+      let params = {
+        code: this.inputQuery.invCode,
+        filter: 2
+      };
+      filterSubByInv(params).then((res) => {
+        if (res.code === 20000) {
+          this.fromInvs = res.data;
+        }
+      })
+    },
+
+    invChange() {
+      this.getFromInv();
+      this.getTargetBusType();
+    },
   },
 
   created() {
     if (this.inputQuery.originAction == null) {
       this.isAdd = true;
+    } else {
+      this.getTargetBusType();
     }
-    this.getBusType();
+    this.getOriginBusType();
+    this.getLocInv();
   }
 }
 </script>
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index f7ff9743..e609a7a6 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -16,12 +16,8 @@
             placeholder="请选择角色状态"
             clearable
           >
-            <el-option
-              v-for="dict in dict.type.sys_normal_disable"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
+            <el-option label="正常" :value="0"/>
+            <el-option label="禁用" :value="1"/>
           </el-select>
         </el-form-item>
         <el-form-item>
@@ -102,8 +98,8 @@
       <pagination
         v-show="total>0"
         :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
+        :page.sync="queryParams.page"
+        :limit.sync="queryParams.limit"
         @pagination="getList"
       />
 
@@ -279,8 +275,8 @@ export default {
       deptOptions: [],
       // 查询参数
       queryParams: {
-        pageNum: 1,
-        pageSize: 10,
+        page: 1,
+        limit: 10,
         roleName: undefined,
         roleKey: undefined,
         status: undefined
@@ -423,7 +419,7 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
+      this.queryParams.page = 1;
       this.getList();
     },
     /** 重置按钮操作 */
diff --git a/src/views/system/user/authUser.vue b/src/views/system/user/authUser.vue
index 8d64df2e..ca13d387 100644
--- a/src/views/system/user/authUser.vue
+++ b/src/views/system/user/authUser.vue
@@ -139,7 +139,7 @@
             <el-col :span="11" type="flex">
               <el-form-item label="所属部门" prop="depts">
                 <el-select
-                  v-model="selectDeptList"
+                  v-model="formData.depts"
                   filterable
                   remote
                   clearable="true"
@@ -417,9 +417,6 @@ export default {
           depts: row.depts,
           dept: row.dept,
         };
-        this.selectDeptList = row.depts;
-      }else {
-        this.selectDeptList = [];
       }
       this.formName = "add";
       this.formRules = this.addRules;
@@ -443,7 +440,6 @@ export default {
         this.$message.error("未指定角色！")
         return;
       }
-      this.formData.depts = this.selectDeptList;
       this.$refs["dataForm"].validate(valid => {
         if (valid) {
           this.formLoading = true;
diff --git a/src/views/thirdSys/busType/index.vue b/src/views/thirdSys/busType/index.vue
index 56a8439f..89284b23 100644
--- a/src/views/thirdSys/busType/index.vue
+++ b/src/views/thirdSys/busType/index.vue
@@ -142,6 +142,7 @@ export default {
         page: 1,
         limit: 20,
       },
+      mainThirdSys:'',
       addDialogVisible: false,
       modifyDialogVisible: false,
       list: [],
@@ -174,7 +175,7 @@ export default {
         path: "",
       });
       this.filterQuery = {
-        thirdSys: "thirdId",
+        thirdSys: this.mainThirdSys,
         name: null,
         enable: null,
         page: 1,
@@ -211,7 +212,12 @@ export default {
       getBasicThirdSys(query)
         .then((response) => {
           this.thirdSys = response.data.list || [];
-          this.filterQuery.thirdSys = this.thirdSys[0].thirdId;
+          for(var i=0;i<this.thirdSys.length;i++){
+            if(this.thirdSys[i].mainSys){
+              this.filterQuery.thirdSys = this.thirdSys[i].thirdId;
+              this.mainThirdSys = this.thirdSys[i].thirdId;
+            }
+          }
           this.getThirdSysDetail();
         })
         .catch(() => {
@@ -293,7 +299,7 @@ export default {
         return;
       }
       if (this.$isBlank(this.inputQuery.thirdSys)) {
-        this.$message.error("所属系统不不能为空！");
+        this.$message.error("所属系统不能为空！");
         return;
       }
       let numRegExp = '^[0-9]*$';
@@ -373,6 +379,7 @@ export default {
     },
 
     thirdSysChange() {
+      this.filterQuery.page = 1;
       this.getList();
     },
 
diff --git a/src/views/thirdSys/corps/thrCorpSelect.vue b/src/views/thirdSys/corps/thrCorpSelect.vue
index 2644d961..c6c8e471 100644
--- a/src/views/thirdSys/corps/thrCorpSelect.vue
+++ b/src/views/thirdSys/corps/thrCorpSelect.vue
@@ -105,6 +105,7 @@ export default {
         limit: 20,
         isDownThrSys: null,
       },
+      mainThirdSys:'',
       total: 0,
       list: [],
       thirdSys: [],
@@ -127,7 +128,7 @@ export default {
         thrCorpEntities: [],
         unitId: null,
         name: null,
-        thirdSys: null,
+        thirdSys: this.mainThirdSys,
         page: 1,
         limit: 20,
         isDownThrSys: null,
@@ -167,7 +168,12 @@ export default {
       getBasicThirdSys(query)
         .then((response) => {
           this.thirdSys = response.data.list || [];
-          this.filterQuery.thirdSys = this.thirdSys[0].thirdId;
+          for(var i=0;i<this.thirdSys.length;i++){
+            if(this.thirdSys[i].mainSys){
+              this.filterQuery.thirdSys = this.thirdSys[i].thirdId;
+              this.mainThirdSys = this.thirdSys[i].thirdId;
+            }
+          }
           this.uploadData.thirdSys = this.filterQuery.thirdSys;
           this.getThirdSysDetail();
           this.selectSysParam();
diff --git a/src/views/thirdSys/corps/thrCorps.vue b/src/views/thirdSys/corps/thrCorps.vue
index 4fee4f93..b47c0384 100644
--- a/src/views/thirdSys/corps/thrCorps.vue
+++ b/src/views/thirdSys/corps/thrCorps.vue
@@ -92,6 +92,7 @@ export default {
         page: 1,
         limit: 20,
       },
+      mainThirdSys:'',
       total: 0,
       list: [],
       thirdSys: [],
@@ -113,7 +114,7 @@ export default {
       this.filterQuery = {
         unitId: null,
         name: null,
-        thirdSys: null,
+        thirdSys: this.mainThirdSys,
         page: 1,
         limit: 20,
       };
@@ -210,7 +211,12 @@ export default {
       getBasicThirdSys(query)
         .then((response) => {
           this.thirdSys = response.data.list || [];
-          this.filterQuery.thirdSys = this.thirdSys[0].thirdId;
+          for(var i=0;i<this.thirdSys.length;i++){
+            if(this.thirdSys[i].mainSys){
+              this.filterQuery.thirdSys = this.thirdSys[i].thirdId;
+              this.mainThirdSys = this.thirdSys[i].thirdId;
+            }
+          }
           this.uploadData.thirdSys = this.filterQuery.thirdSys;
           this.getThirdSysDetail();
           this.selectSysParam();
diff --git a/src/views/thirdSys/corps/thrCorpsImport.vue b/src/views/thirdSys/corps/thrCorpsImport.vue
index b4e3276d..1b611327 100644
--- a/src/views/thirdSys/corps/thrCorpsImport.vue
+++ b/src/views/thirdSys/corps/thrCorpsImport.vue
@@ -138,6 +138,7 @@ export default {
         limit: 20,
         thirdSysFk: null,
       },
+      mainThirdSys:'',
       udiImportDetailVisible: false,
       thrCorpSelectVisible: false,
       checked: false,
@@ -179,7 +180,7 @@ export default {
         status: null,
         page: 1,
         limit: 20,
-        thirdSysFk: null,
+        thirdSysFk: this.mainThirdSys,
       };
       this.getList();
     },
@@ -265,7 +266,12 @@ export default {
       getBasicThirdSys(query)
         .then((response) => {
           this.thirdSys = response.data.list || [];
-          this.filterQuery.thirdSysFk = this.thirdSys[0].thirdId;
+          for(var i=0;i<this.thirdSys.length;i++){
+            if(this.thirdSys[i].mainSys){
+              this.filterQuery.thirdSysFk = this.thirdSys[i].thirdId;
+              this.mainThirdSys = this.thirdSys[i].thirdId;
+            }
+          }
           this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
           this.getList();
           this.getThirdSysDetail();
diff --git a/src/views/thirdSys/inv/index.vue b/src/views/thirdSys/inv/index.vue
index b8a062b8..7bc4d8fd 100644
--- a/src/views/thirdSys/inv/index.vue
+++ b/src/views/thirdSys/inv/index.vue
@@ -315,6 +315,7 @@ export default {
         parentId: null,
         thirdSysFk: null,
       },
+      mainThirdSys:'',
       mergeList: [],
       subList: [],
       subData: {},
@@ -407,7 +408,9 @@ export default {
       this.query = {
         name: "",
         status: "",
-        thirdSysFk: null
+        page:1,
+        limit:20,
+        thirdSysFk: this.mainThirdSys
       };
       this.getList();
     },
@@ -449,6 +452,9 @@ export default {
       // 更改值
       this.formVisible = false;
       this.subFormVisible = false;
+      let Item = JSON.parse(localStorage.getItem('obj'))
+      this.subData=Item;
+      this.getSubList();
       return true;
     },
     // 显示表单
@@ -482,6 +488,7 @@ export default {
       this.subFromName = formName;
       if (formName === "edit") {
         this.subData = data;
+        localStorage.setItem('obj', JSON.stringify(this.subData))
       } else if (formName === "add") {
         this.subData = {};
         this.subData.parentId = data.code;
@@ -524,7 +531,10 @@ export default {
 
     //添加分库
     forSubSubmit() {
-
+      if (this.$isBlank(this.subData.code)) {
+        this.$message.error("分库编码不能为空！");
+        return;
+      }
       if (this.$isBlank(this.subData.name)) {
         this.$message.error("分库名称不能为空！");
         return;
@@ -544,7 +554,7 @@ export default {
       }).catch(() => {
         this.subFormVisible = false;
       });
-
+      this.resetForm();
     },
 
 
@@ -588,12 +598,14 @@ export default {
                   }
                 }
               }
+
               // 刷新表单
               this.resetForm();
               this.getList();
             })
             .catch(() => {
               this.formLoading = false;
+              this.$refs["dataForm"].resetFields();
             });
         }
       });
@@ -643,7 +655,14 @@ export default {
       getBasicThirdSys(query)
         .then((response) => {
           this.thirdSys = response.data.list || [];
+          for(var i=0;i<this.thirdSys.length;i++){
+            if(this.thirdSys[i].mainSys){
+              this.query.thirdSysFk = this.thirdSys[i].thirdId;
+              this.mainThirdSys = this.thirdSys[i].thirdId;
+            }
+          }
           this.getThirdSysDetail();
+          this.getList();
         })
         .catch(() => {
           this.loading = false;
diff --git a/src/views/thirdSys/invProducts/thrInvProducts.vue b/src/views/thirdSys/invProducts/thrInvProducts.vue
index d5c2d3df..d75becf1 100644
--- a/src/views/thirdSys/invProducts/thrInvProducts.vue
+++ b/src/views/thirdSys/invProducts/thrInvProducts.vue
@@ -124,6 +124,7 @@ export default {
         limit: 100,
         filterCount: null,
       },
+      mainThirdSys:'',
       total: 0,
       list: [],
       thirdSys: [],
@@ -144,7 +145,7 @@ export default {
       this.filterQuery = {
         inventoryCode: null,
         inventoryName: null,
-        thirdSys: null,
+        thirdSys: this.mainThirdSys,
         spec: null,
         registerCertNo: null,
         manufactory: null,
@@ -250,7 +251,12 @@ export default {
       getBasicThirdSys(query)
         .then((response) => {
           this.thirdSys = response.data.list || [];
-          this.filterQuery.thirdSys = this.thirdSys[0].thirdId;
+          for(var i=0;i<this.thirdSys.length;i++){
+            if(this.thirdSys[i].mainSys){
+              this.filterQuery.thirdSys = this.thirdSys[i].thirdId;
+              this.mainThirdSys = this.thirdSys[i].thirdId;
+            }
+          }
           this.uploadData.thirdSys = this.filterQuery.thirdSys;
           this.getThirdSysDetail();
           this.selectSysParam();
diff --git a/src/views/thirdSys/invProducts/thrInvProductsImport.vue b/src/views/thirdSys/invProducts/thrInvProductsImport.vue
index ae7ca54e..cb2dcff9 100644
--- a/src/views/thirdSys/invProducts/thrInvProductsImport.vue
+++ b/src/views/thirdSys/invProducts/thrInvProductsImport.vue
@@ -185,6 +185,7 @@ export default {
         limit: 20,
         thirdSysFk: null,
       },
+      mainThirdSys:'',
       selectType: 0,
       udiImportDetailVisible: false,
       thrInvProductsSelectVisible: false,
@@ -227,7 +228,7 @@ export default {
         status: null,
         page: 1,
         limit: 20,
-        thirdSysFk: null,
+        thirdSysFk: this.mainThirdSys,
       };
       this.getList();
     },
@@ -311,7 +312,12 @@ export default {
       getBasicThirdSys(query)
         .then((response) => {
           this.thirdSys = response.data.list || [];
-          this.filterQuery.thirdSysFk = this.thirdSys[0].thirdId;
+          for(var i=0;i<this.thirdSys.length;i++){
+            if(this.thirdSys[i].mainSys){
+              this.filterQuery.thirdSysFk = this.thirdSys[i].thirdId;
+              this.mainThirdSys = this.thirdSys[i].thirdId;
+            }
+          }
           this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
           this.getList();
           this.getThirdSysDetail();
diff --git a/src/views/thirdSys/invProducts/thrInvProductsSelect.vue b/src/views/thirdSys/invProducts/thrInvProductsSelect.vue
index ae824911..94d895ab 100644
--- a/src/views/thirdSys/invProducts/thrInvProductsSelect.vue
+++ b/src/views/thirdSys/invProducts/thrInvProductsSelect.vue
@@ -136,6 +136,7 @@
                     limit: 100,
                     filterCount:null,
                 },
+              mainThirdSys:'',
                 total: 0,
                 list: [],
                 thirdSys: [],
@@ -157,7 +158,7 @@
                     thrInvProductsEntities:[],
                     inventoryCode: null,
                     inventoryName: null,
-                    thirdSys: null,
+                    thirdSys: this.mainThirdSys,
                     spec: null,
                     registerCertNo: null,
                     manufactory: null,
@@ -262,7 +263,12 @@
                 getBasicThirdSys(query)
                     .then((response) => {
                         this.thirdSys = response.data.list || [];
-                        this.filterQuery.thirdSys = this.thirdSys[0].thirdId;
+                      for(var i=0;i<this.thirdSys.length;i++){
+                        if(this.thirdSys[i].mainSys){
+                          this.filterQuery.thirdSys = this.thirdSys[i].thirdId;
+                          this.mainThirdSys = this.thirdSys[i].thirdId;
+                        }
+                      }
                         this.uploadData.thirdSys = this.filterQuery.thirdSys;
                         this.getThirdSysDetail();
                         this.selectSysParam();
diff --git a/src/views/thirdSys/order/thrOrderImport.vue b/src/views/thirdSys/order/thrOrderImport.vue
index c0b1918f..af1cd95d 100644
--- a/src/views/thirdSys/order/thrOrderImport.vue
+++ b/src/views/thirdSys/order/thrOrderImport.vue
@@ -138,6 +138,7 @@ export default {
         limit: 20,
         thirdSysFk: null,
       },
+      mainThirdSys:'',
       udiImportDetailVisible: false,
       checked: false,
       list: [],
@@ -180,7 +181,7 @@ export default {
         status: null,
         page: 1,
         limit: 20,
-        thirdSysFk: null,
+        thirdSysFk: this.mainThirdSys,
       };
       this.getList();
     },
@@ -262,7 +263,12 @@ export default {
       getBasicThirdSys(query)
         .then((response) => {
           this.thirdSys = response.data.list || [];
-          this.filterQuery.thirdSysFk = this.thirdSys[0].thirdId;
+          for(var i=0;i<this.thirdSys.length;i++){
+            if(this.thirdSys[i].mainSys){
+              this.filterQuery.thirdSysFk = this.thirdSys[i].thirdId;
+              this.mainThirdSys = this.thirdSys[i].thirdId;
+            }
+          }
           this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
           this.getList();
           this.getThirdSysDetail();
diff --git a/src/views/thirdSys/product/thrProducts.vue b/src/views/thirdSys/product/thrProducts.vue
index bb16ed72..75f41865 100644
--- a/src/views/thirdSys/product/thrProducts.vue
+++ b/src/views/thirdSys/product/thrProducts.vue
@@ -143,6 +143,7 @@ export default {
         page: 1,
         limit: 20,
       },
+      mainThirdSys:'',
       total: 0,
       thirdSys: [],
       thirdSysDetail: null,
@@ -190,11 +191,12 @@ export default {
         registerNo: null,
         manufactory: null,
         name: "",
-        thirdSys: null,
+        thirdSys: this.mainThirdSys,
         page: 1,
         limit: 20,
       };
       this.getList();
+
     },
     hideSearch() {
       this.showSearch = !this.showSearch;
@@ -204,7 +206,7 @@ export default {
       this.getList();
     },
     getList() {
-      if (this.filterQuery.thirdSys == null) {
+      if (this.filterQuery.thirdSys == null ) {
         this.$message.warning("请先选择第三方系统！")
         return;
       }
@@ -266,7 +268,12 @@ export default {
       getBasicThirdSys(query)
         .then((response) => {
           this.thirdSys = response.data.list || [];
-          this.filterQuery.thirdSys = this.thirdSys[0].thirdId;
+          for(var i=0;i<this.thirdSys.length;i++){
+            if(this.thirdSys[i].mainSys){
+              this.filterQuery.thirdSys = this.thirdSys[i].thirdId;
+              this.mainThirdSys = this.thirdSys[i].thirdId;
+            }
+          }
           this.uploadData.thirdSys = this.filterQuery.thirdSys;
           this.getThirdSysDetail();
           this.selectSysParam();
diff --git a/src/views/thirdSys/product/thrProductsImport.vue b/src/views/thirdSys/product/thrProductsImport.vue
index c1d7d5e4..dfdc0621 100644
--- a/src/views/thirdSys/product/thrProductsImport.vue
+++ b/src/views/thirdSys/product/thrProductsImport.vue
@@ -145,6 +145,7 @@ export default {
         limit: 20,
         thirdSysFk: null,
       },
+      mainThirdSys:'',
       udiImportDetailVisible: false,
       thrProductsSelectVisible: false,
       checked: false,
@@ -186,7 +187,7 @@ export default {
         status: null,
         page: 1,
         limit: 20,
-        thirdSysFk: null,
+        thirdSysFk: this.mainThirdSys,
       };
       this.getList();
     },
@@ -280,7 +281,13 @@ export default {
       getBasicThirdSys(query)
         .then((response) => {
           this.thirdSys = response.data.list || [];
-          this.filterQuery.thirdSysFk = this.thirdSys[0].thirdId;
+          for(var i=0;i<this.thirdSys.length;i++){
+            if(this.thirdSys[i].mainSys){
+              this.filterQuery.thirdSys = this.thirdSys[i].thirdId;
+              this.filterQuery.thirdSysFk = this.thirdSys[i].thirdId;
+              this.mainThirdSys = this.thirdSys[i].thirdId;
+            }
+          }
           this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
           this.getList();
           this.getThirdSysDetail();
diff --git a/src/views/thirdSys/product/thrProductsSelect.vue b/src/views/thirdSys/product/thrProductsSelect.vue
index 34ab6275..0704dd7f 100644
--- a/src/views/thirdSys/product/thrProductsSelect.vue
+++ b/src/views/thirdSys/product/thrProductsSelect.vue
@@ -143,6 +143,7 @@ export default {
         limit: 10,
         isDownThrSys: null,
       },
+      mainThirdSys:'',
       total: 0,
       thirdSys: [],
       thirdSysDetail: null,
@@ -166,7 +167,7 @@ export default {
         thrProductsEntities: [],
         code: null,
         name: "",
-        thirdSys: "",
+        thirdSys: this.mainThirdSys,
         page: 1,
         limit: 20,
       };
@@ -263,7 +264,12 @@ export default {
       getBasicThirdSys(query)
         .then((response) => {
           this.thirdSys = response.data.list || [];
-          this.filterQuery.thirdSys = this.thirdSys[0].thirdId;
+          for(var i=0;i<this.thirdSys.length;i++){
+            if(this.thirdSys[i].mainSys){
+              this.filterQuery.thirdSys = this.thirdSys[i].thirdId;
+              this.mainThirdSys = this.thirdSys[i].thirdId;
+            }
+          }
           this.uploadData.thirdSys = this.filterQuery.thirdSys;
           this.getThirdSysDetail();
           this.selectSysParam();