diff --git a/.env.production b/.env.production
index 51a50f6..0fe478f 100644
--- a/.env.production
+++ b/.env.production
@@ -7,15 +7,23 @@ ENV = 'production'
 
 #林纪裕
 # VUE_APP_BASE_API = 'http://101.43.77.55:9150/UDI_SPMS_SERVER/'
-# VUE_APP_BASE_API =  'http://r.jiyuudims.cloud:5004/UDI_SPMS_SERVER/'
+VUE_APP_BASE_API =  'http://r.jiyuudims.cloud:5004/UDI_SPMS_SERVER/'
 # 吴总测试服务器
 # VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_SPMS_SERVER/'
 
 # 平潭
 # VUE_APP_BASE_API = 'http://121.204.169.96:9150/UDI_SPMS_SERVER/'
 
-# 文明点
-VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_SPMS_SERVER/'
+# 文明东
+# VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_SPMS_SERVER/'
+
+# 实施测试服务器 ljy
+# VUE_APP_BASE_API = 'http://192.168.0.66:8504/UDI_SPMS_SERVER/'
+
+# 实施测试服务器 wqq
+# VUE_APP_BASE_API = 'http://192.168.0.66:9160/UDI_SPMS_SERVER/'
+
+
 # 应用访问路径 例如使用前缀 /admin/
 VUE_APP_CONTEXT_PATH = '/UDI_SPMS_CLIENT/'
 
diff --git a/src/api/basic/basicHospType.js b/src/api/basic/basicHospType.js
index 766b347..b7a7d02 100644
--- a/src/api/basic/basicHospType.js
+++ b/src/api/basic/basicHospType.js
@@ -13,12 +13,21 @@ export function getBasicHospType(query) {
 export function getListMenu(query) {
   return axios({
     url: "/udiwms/basic/hosp/type/menuList",
+    method: "post",
+    data: query
+  });
+}
+
+export function getOneName(query) {
+  return axios({
+    url: "/udiwms/basic/hosp/type/getOneName",
     method: "get",
     params: query
   });
 }
 
 
+
 export function saveBasicHospType(query) {
   return axios({
     url: "/udiwms/basic/hosp/type/save",
diff --git a/src/api/inout/order.js b/src/api/inout/order.js
index a32fa73..031b8d6 100644
--- a/src/api/inout/order.js
+++ b/src/api/inout/order.js
@@ -505,3 +505,11 @@ export function updateOrderDetailBiz(params) {
   });
 }
 
+
+export function orderDetailAdd(params) {
+  return axios({
+    url: "/inv/inner/order/orderDetailAdd",
+    method: "post",
+    data: params
+  });
+}
diff --git a/src/views/basic/busType/bussinessType.vue b/src/views/basic/busType/bussinessType.vue
index 0799129..8223c74 100644
--- a/src/views/basic/busType/bussinessType.vue
+++ b/src/views/basic/busType/bussinessType.vue
@@ -1,52 +1,66 @@
 <template>
   <div>
     <el-card>
-      <el-form :inline="true" :model="filterQuery" class="query-form" size="mini">
-        <el-form-item class="query-form-item" label="单据类型:">
-          <el-input
-              v-model="filterQuery.name"
-              placeholder="请输入单据类型"
-              clearable
-          ></el-input>
-        </el-form-item>
-        <el-form-item class="query-form-item" label="出入库类型:">
-          <el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型">
-            <el-option label="全部" value=""></el-option>
-            <el-option label="入库" value="WareHouseIn"></el-option>
-            <el-option label="出库" value="WareHouseOut"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item class="query-form-item" label="是否启用:">
-          <el-select v-model="filterQuery.enable" placeholder="是否启用">
-            <el-option label="全部" value=""></el-option>
-            <el-option label="已启用" value=1></el-option>
-            <el-option label="未启用" value=0></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item>
-          <el-button-group style="margin-left: 10px;display:flex;">
-            <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
-            <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
-            <el-button type="primary" icon="el-icon-plus" @click="handleAddClick">新增
-            </el-button
-            >
-            <el-button type="primary" icon="el-icon-download" @click="exportJsonFile">导出单据类型</el-button>
-            <el-upload
-                :action="uploadFileUrl"
-                multiple
-                :limit="3"
-                :headers="headers"
-                :show-file-list="false"
-                :on-success="handleChange"
-                :file-list="fileList"
-            >
-              <el-button icon="el-icon-upload2" type="primary">导入单据类型</el-button>
-            </el-upload>
-          </el-button-group>
-
-        </el-form-item>
+      <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.name" placeholder="请输入单据类型" clearable style="width: 90%"></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" style="width: 90%" placeholder="请选择出入库类型">
+              <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.enable" style="width: 90%" placeholder="是否启用">
+              <el-option label="全部" value=""></el-option>
+              <el-option label="已启用" value="1"></el-option>
+              <el-option label="未启用" value="0"></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.actionType" style="width: 90%" placeholder="请选择仓库类型">
+              <el-option label="入账库" :value="1"></el-option>
+              <el-option label="预验收库" :value="2"></el-option>
+              <el-option label="寄售库" :value="3"></el-option>
+            </el-select>
+          </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
 
+
+      <div class="top-right-btn" >
+        <el-button-group style="width: 600px">
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
+          <el-button type="primary" icon="el-icon-plus" @click="handleAddClick">新增</el-button>
+          <el-button type="primary" icon="el-icon-download" @click="exportJsonFile">导出单据类型</el-button>
+          <el-upload
+            :action="uploadFileUrl"
+            multiple
+            :limit="3"
+            :headers="headers"
+            :show-file-list="false"
+            :on-success="handleChange"
+            :file-list="fileList"
+          >
+            <el-button icon="el-icon-upload2" type="primary">导入单据类型</el-button>
+          </el-upload>
+        </el-button-group>
+      </div>
+      <el-divider style="margin: 15px"></el-divider>
+
       <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row>
         <el-table-column label="序号" type="index" width="60"></el-table-column>
         <el-table-column label="单据类型" prop="name"></el-table-column>
@@ -79,15 +93,15 @@
         <el-table-column label="操作">
           <template slot-scope="scope">
             <el-button
-                type="text"
-                @click.native.stop="handleModifyClick(scope.row)"
+              type="text"
+              @click.native.stop="handleModifyClick(scope.row)"
             >编辑
             </el-button
             >
             <el-button
-                type="text"
-                :disabled="!configParams.typeScan"
-                @click.native.stop="deleteDialog(scope.row)"
+              type="text"
+              :disabled="!configParams.typeScan"
+              @click.native.stop="deleteDialog(scope.row)"
             >删除
             </el-button
             >
@@ -97,14 +111,14 @@
       </el-table>
 
       <el-dialog
-          title="新增扫码单据类型"
-          :visible.sync="addDialogVisible"
-          :close-on-click-modal="false"
-          :close-on-press-escape="false"
-          v-if="addDialogVisible"
-          class="dialog-two"
-          width="60%"
-          top="5vh"
+        title="新增扫码单据类型"
+        :visible.sync="addDialogVisible"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        v-if="addDialogVisible"
+        class="dialog-two"
+        width="60%"
+        top="5vh"
       >
         <modifyDialog :inputQuery="inputQuery"></modifyDialog>
         <div slot="footer" class="dialog-footer">
@@ -122,13 +136,13 @@
       </el-dialog>
 
       <el-dialog
-          title="编辑单据类型"
-          :visible.sync="modifyDialogVisible"
-          width="70%"
-          :close-on-click-modal="false"
-          :close-on-press-escape="false"
-          v-if="modifyDialogVisible"
-          :before-close="cancelDialog"
+        title="编辑单据类型"
+        :visible.sync="modifyDialogVisible"
+        width="70%"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        v-if="modifyDialogVisible"
+        :before-close="cancelDialog"
       >
         <modifyDialog :inputQuery="inputQuery" :modifySubmit="onModifySubmit"></modifyDialog>
         <div style="text-align: center;margin-top: 12px">
@@ -145,22 +159,22 @@
       </el-dialog>
 
       <pagination
-          v-show="total>0"
-          :total="total"
-          :limit.sync="filterQuery.limit"
-          :page.sync="filterQuery.page"
-          @pagination="getList"
+        v-show="total>0"
+        :total="total"
+        :limit.sync="filterQuery.limit"
+        :page.sync="filterQuery.page"
+        @pagination="getList"
       ></pagination>
     </el-card>
   </div>
 </template>
 <script>
-import {getBusTypeList, deleteBusType, updateBusType, insertBusType, exportFile} from "@/api/basic/busType";
-import modifyDialog from "./bussinessTypeModify";
-import axios from "axios";
-import store from "@/store";
-import {findConfig} from "@/api/sync/spsSyncStatus";
-import {isBlank} from "@/utils/strUtil";
+import { getBusTypeList, deleteBusType, updateBusType, insertBusType, exportFile } from '@/api/basic/busType'
+import modifyDialog from './bussinessTypeModify'
+import axios from 'axios'
+import store from '@/store'
+import { findConfig } from '@/api/sync/spsSyncStatus'
+import { isBlank } from '@/utils/strUtil'
 
 export default {
   data() {
@@ -168,21 +182,22 @@ export default {
       filterQuery: {
         name: null,
         mainAction: null,
-        enable: "1",
+        enable: '1',
         page: 1,
-        limit: 20,
+        limit: 20
       },
+      showSearch:true,
       addDialogVisible: false,
       modifyDialogVisible: false,
       list: [],
       inputQuery: {
-        action: "",
-        name: "",
+        action: '',
+        name: '',
         enable: null,
-        remark: "",
-        mainAction: "",
-        thirdSysFk: "",
-        id: "",
+        remark: '',
+        mainAction: '',
+        thirdSysFk: '',
+        id: '',
         checkEnable: false,
         genUnit: false,
         innerOrder: false,
@@ -232,7 +247,6 @@ export default {
         inStock: false,
         actionType: 1,
         fillCodeRel: false,
-
         thrCheckEnable: null,
         thrCheckWebNew: null,
         thrCheckPdaUn: null,
@@ -243,19 +257,19 @@ export default {
         thrCheckChange: null,
         thrCheckBalance: null,
         thrCheckCopy: null,
-        advancePreIn:false,
+        advancePreIn: false,
         checkVailDate: 0, //校验近效期
         checkExpire: true,   //校验过期
-        checkCertExpire: false, //校验证书过期
+        checkCertExpire: false //校验证书过期
 
       },
       enableMap: {
-        true: "是",
-        false: "否",
+        true: '是',
+        false: '否'
       },
       mainActionMap: {
-        WareHouseIn: "入库",
-        WareHouseOut: "出库"
+        WareHouseIn: '入库',
+        WareHouseOut: '出库'
       },
       fileList: [],
       total: 0,
@@ -263,91 +277,94 @@ export default {
       uploadFileUrl: null,
       headers: {},
       configParams: {},
-      loading: false,
+      loading: false
 
-    };
+    }
   },
 
   methods: {
     onReset() {
       this.$router.push({
-        path: "",
-      });
+        path: ''
+      })
       this.filterQuery = {
         name: null,
         mainAction: null,
-        enable: "1",
+        enable: '1',
         page: 1,
-        limit: 20,
-      };
-      this.getList();
+        limit: 20
+      }
+      this.getList()
     },
     cancelDialog() {
-      this.modifyDialogVisible = false;
-      this.addDialogVisible = false;
-      this.getList();
+      this.modifyDialogVisible = false
+      this.addDialogVisible = false
+      this.getList()
     },
     search() {
-      this.filterQuery.page = 1;
-      this.getList();
+      this.filterQuery.page = 1
+      this.getList()
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
     },
     getList() {
-      this.loading = true;
+      this.loading = true
       getBusTypeList(this.filterQuery)
-          .then((response) => {
-            if (response.code === 20000) {
-              this.list = response.data.list || [];
-              this.total = response.data.total || 0;
-            } else {
-              this.$message.error(response.message);
-            }
-            this.loading = false;
-          })
-          .catch(() => {
-            this.loading = false;
-            this.list = [];
-            this.total = 0;
-          });
+        .then((response) => {
+          if (response.code === 20000) {
+            this.list = response.data.list || []
+            this.total = response.data.total || 0
+          } else {
+            this.$message.error(response.message)
+          }
+          this.loading = false
+        })
+        .catch(() => {
+          this.loading = false
+          this.list = []
+          this.total = 0
+        })
     },
     handleCurrentChange(val) {
-      this.filterQuery.page = val;
-      this.getList();
+      this.filterQuery.page = val
+      this.getList()
     },
 
     onAddSubmit() {
       //默认初始化
       if (this.inputQuery.corpType == null) {
-        this.inputQuery.corpType = 2;
+        this.inputQuery.corpType = 2
       }
       if (isBlank(this.inputQuery.name)) {
-        this.$message.error("单据类型名称不能为空！");
-        return;
+        this.$message.error('单据类型名称不能为空！')
+        return
       }
-      if (this.inputQuery.mainAction == "" || this.inputQuery.mainAction == null) {
-        this.$message.error("出入库类型不能为空！");
-        return;
+      if (this.inputQuery.mainAction == '' || this.inputQuery.mainAction == null) {
+        this.$message.error('出入库类型不能为空！')
+        return
       }
       if (isBlank(this.inputQuery.name)) {
-        this.$message.error("单据类型名称不能为空！");
-        return;
+        this.$message.error('单据类型名称不能为空！')
+        return
       }
       // if (isBlank(this.inputQuery.actionType)) {
       //   this.$message.error("请选择单据类型！");
       //   return;
       // }
       if (isBlank(this.inputQuery.inStock)) {
-        this.$message.error("请选择是否更改库存！");
-        return;
+        this.$message.error('请选择是否更改库存！')
+        return
       }
 
-      if(this.inputQuery.preInBack==1){
-        if(isBlank(this.inputQuery.backPreinType)){
-          this.$message.error("请选择预验收剩余库存退库方式！");
-          return;
+      if (this.inputQuery.preInBack == 1) {
+        if (isBlank(this.inputQuery.backPreinType)) {
+          this.$message.error('请选择预验收剩余库存退库方式！')
+          return
         }
-        if(isBlank(this.inputQuery.preInBackAction)){
-          this.$message.error("请选择预验收退库单据类型！");
-          return;
+        if (isBlank(this.inputQuery.preInBackAction)) {
+          this.$message.error('请选择预验收退库单据类型！')
+          return
         }
 
       }
@@ -356,41 +373,41 @@ export default {
       //   return;
       // }
       insertBusType(this.inputQuery)
-          .then((response) => {
-            if (response.code == 20000) {
-              this.loading = false;
-              this.cancelDialog();
-              this.getList();
-            } else {
-              this.$message.error(response.message);
-            }
-          })
-          .catch(() => {
-            this.loading = false;
-          });
+        .then((response) => {
+          if (response.code == 20000) {
+            this.loading = false
+            this.cancelDialog()
+            this.getList()
+          } else {
+            this.$message.error(response.message)
+          }
+        })
+        .catch(() => {
+          this.loading = false
+        })
     },
 
     onModifySubmit() {
 
       if (isBlank(this.inputQuery.name)) {
-        this.$message.error("单据类型名称不能为空！");
-        return;
+        this.$message.error('单据类型名称不能为空！')
+        return
       }
-      if (this.inputQuery.mainAction == "" || this.inputQuery.mainAction == null) {
-        this.$message.error("出入库类型不能为空！");
-        return;
+      if (this.inputQuery.mainAction == '' || this.inputQuery.mainAction == null) {
+        this.$message.error('出入库类型不能为空！')
+        return
       }
       if (isBlank(this.inputQuery.name)) {
-        this.$message.error("单据类型名称不能为空！");
-        return;
+        this.$message.error('单据类型名称不能为空！')
+        return
       }
       // if (isBlank(this.inputQuery.actionType)) {
       //   this.$message.error("请选择单据类型！");
       //   return;
       // }
       if (isBlank(this.inputQuery.inStock)) {
-        this.$message.error("请选择是否更改库存！");
-        return;
+        this.$message.error('请选择是否更改库存！')
+        return
       }
       // if (isBlank(this.inputQuery.busType)) {
       //   this.$message.error("请选择特定页面！");
@@ -398,54 +415,54 @@ export default {
       // }
 
       updateBusType(this.inputQuery)
-          .then((response) => {
-            if (response.code == 20000) {
-              this.loading = false;
-              this.cancelDialog();
-              this.getList();
-            } else {
-              this.$message.error(response.message);
-            }
-          })
-          .catch(() => {
-            this.loading = false;
-            this.cancelDialog();
-          });
+        .then((response) => {
+          if (response.code == 20000) {
+            this.loading = false
+            this.cancelDialog()
+            this.getList()
+          } else {
+            this.$message.error(response.message)
+          }
+        })
+        .catch(() => {
+          this.loading = false
+          this.cancelDialog()
+        })
     },
     exportJsonFile() {
       exportFile().then((response) => {
-        const binaryData = [];
-        binaryData.push(response);
+        const binaryData = []
+        binaryData.push(response)
         let url = window.URL.createObjectURL(
-            new Blob(binaryData, {type: "application/json"})
-        );
-        this.loading = false;
-        const eleLink = document.createElement('a');
+          new Blob(binaryData, { type: 'application/json' })
+        )
+        this.loading = false
+        const eleLink = document.createElement('a')
         // var timestamp = "yyyy-MM-dd_hh:mm";
-        eleLink.download = "扫码单据类型导出" + ".json";
-        eleLink.style.display = 'none';
-        eleLink.href = url;
+        eleLink.download = '扫码单据类型导出' + '.json'
+        eleLink.style.display = 'none'
+        eleLink.href = url
         document.body.appendChild(eleLink)
         eleLink.click()
         document.body.removeChild(eleLink)
       }).catch(() => {
-        this.loading = false;
-      });
+        this.loading = false
+      })
     },
 
     handleAddClick() {
       this.inputQuery = {
-        action: "",
-        name: "",
+        action: '',
+        name: '',
         enable: true,
-        remark: "",
-        mainAction: "",
-        thirdSysFk: "",
-        id: "",
+        remark: '',
+        mainAction: 'WareHouseIn',
+        thirdSysFk: '',
+        id: '',
         checkEnable: false,
         genUnit: false,
         innerOrder: false,
-        spUse: null,
+        spUse: 0,
         secCheckEnable: null,
         checkUdims: null,
         checkPdaEd: null,
@@ -466,7 +483,7 @@ export default {
         checkBalance: null,
         secCheckBalance: null,
         secCheckCopy: null,
-        corpType: null,
+        corpType: 2,
         storageCode: null,
         supplementOrderType: null,
         defaultUnit: null,
@@ -501,91 +518,92 @@ export default {
         thrCheckChange: null,
         thrCheckBalance: null,
         thrCheckCopy: null,
-        advancePreIn:false,
+        advancePreIn: false,
         checkVailDate: 0, //校验近效期
-        checkExpire: true,   //校验过期
-        checkCertExpire: false, //校验证书过期
-        backPreinType:1,
+        checkExpire: 2,   //校验过期
+        checkCertExpire: 0, //校验证书过期
+        backPreinType: 1,
+        sortNum: 999
       }
-      this.addDialogVisible = true;
+      this.addDialogVisible = true
     },
 
     handleModifyClick(row) {
-      this.inputQuery = row;
-      this.modifyDialogVisible = true;
+      this.inputQuery = row
+      this.modifyDialogVisible = true
     },
 
     deleteDialog(rowId) {
-      this.$confirm("此操作将永久删除该扫码类型信息, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
+      this.$confirm('此操作将永久删除该扫码类型信息, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       })
-          .then(() => {
-            this.deleteOrders(rowId);
-          })
-          .catch(() => {
-          });
+        .then(() => {
+          this.deleteOrders(rowId)
+        })
+        .catch(() => {
+        })
     },
 
     deleteOrders(data) {
-      this.loading = true;
+      this.loading = true
       let tquery = {
-        id: data.id + "",
-      };
+        id: data.id + ''
+      }
       deleteBusType(tquery)
-          .then((response) => {
-            this.getList();
-            if (response.code == 20000) {
-              this.$message({
-                type: "success",
-                message: "删除成功！",
-              });
-            } else {
-              this.$message.error(response.message);
-            }
+        .then((response) => {
+          this.getList()
+          if (response.code == 20000) {
+            this.$message({
+              type: 'success',
+              message: '删除成功！'
+            })
+          } else {
+            this.$message.error(response.message)
+          }
 
-          })
-          .catch(() => {
-          });
+        })
+        .catch(() => {
+        })
     },
     handleChange(response, files, fileList) {
       if (response.code != 20000) {
-        this.$message.error(response.message);
+        this.$message.error(response.message)
       } else {
-        this.$message.success(response.data);
-        this.getList();
+        this.$message.success(response.data)
+        this.getList()
       }
     },
     init() {
-      this.uploadFileUrl = process.env.VUE_APP_BASE_API + "/udiwms/bussinessType/file/upload";
+      this.uploadFileUrl = process.env.VUE_APP_BASE_API + '/udiwms/bussinessType/file/upload'
       this.headers = {
         ADMIN_ID: store.getters.adminId,
-        ADMIN_TOKEN: store.getters.token,
-      };
+        ADMIN_TOKEN: store.getters.token
+      }
     },
     getSyncConfig() {
       findConfig()
-          .then((response) => {
-            if (response.code == 20000) {
-              this.configParams = response.data;
-            }
-          })
-          .catch(() => {
-          });
-    },
+        .then((response) => {
+          if (response.code == 20000) {
+            this.configParams = response.data
+          }
+        })
+        .catch(() => {
+        })
+    }
   },
   components: {
-    modifyDialog,
+    modifyDialog
   },
   mounted() {
   },
   created() {
-    this.init();
-    this.getSyncConfig();
-    this.getList();
-  },
-};
+    this.init()
+    this.getSyncConfig()
+    this.getList()
+  }
+}
 </script>
 
 <style scoped>
diff --git a/src/views/basic/busType/bussinessTypeModify.vue b/src/views/basic/busType/bussinessTypeModify.vue
index ecf1371..9f95976 100644
--- a/src/views/basic/busType/bussinessTypeModify.vue
+++ b/src/views/basic/busType/bussinessTypeModify.vue
@@ -63,15 +63,14 @@
           </el-form-item>
         </el-col>
         <el-col :span="11" type="flex">
-          <el-form-item label="库存方式" prop="actionType">
+          <el-form-item label="仓库类型" prop="actionType">
             <el-select v-model="inputQuery.actionType"
                        size="small"
                        style="width: 90%"
-                       clearable
                        placeholder="请选择入库方式">
-              <el-option label="入账" :value="1"></el-option>
-              <el-option label="预验收" :value="2"></el-option>
-              <el-option label="寄售" :value="3"></el-option>
+              <el-option label="入账库" :value="1"></el-option>
+              <el-option label="预验收库" :value="2"></el-option>
+              <el-option label="寄售库" :value="3"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
@@ -81,7 +80,7 @@
           <el-form-item label="允许手动输入客户信息" prop="genUnit">
             <el-select v-model="inputQuery.genUnit"
                        :disabled="inputQuery.corpType != 1  || inputQuery.mainAction!='WareHouseOut'" style="width: 90%"
-                       placeholder="是否允许" clearable
+                       placeholder="是否允许"
             >
               <el-option label="允许" :value="true"></el-option>
               <el-option label="不允许" :value="false"></el-option>
@@ -91,7 +90,7 @@
 
         <el-col :span="11">
           <el-form-item label="内部单据自动平衡" prop="supplementOrderType">
-            <el-select :disabled="inputQuery.corpType !=3  || inputQuery.inStock!= true  || inputQuery.actionType != 1"
+            <el-select :disabled="inputQuery.corpType !=3  || inputQuery.inStock!= true"
                        size="small"
                        style="width: 90%"
                        v-model="inputQuery.supplementOrderType"
@@ -116,31 +115,32 @@
         <el-col :span="11">
           <el-form-item label="供应商使用权限" prop="prefix">
             <el-select v-model="inputQuery.spUse"
-                       :disabled=" inputQuery.corpType!=2 "
-                       style="width: 90%" placeholder="是否允许" clearable>
+                       style="width: 90%" placeholder="是否允许"   >
               <el-option label="无" :value="0"></el-option>
               <el-option label="可查看" :value="1"></el-option>
               <el-option label="增删改查" :value="2"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
-
         <el-col :span="11">
-          <el-form-item label="禁用单据类型" prop="prefix">
-            <el-select v-model="inputQuery.enable" style="width: 90%" placeholder="状态" clearable>
-              <el-option label="否" :value="true"></el-option>
-              <el-option label="是" :value="false"></el-option>
+          <el-form-item label="物资近效期处理方式" prop="prefix">
+            <el-select v-model="inputQuery.checkVailDate"
+                       style="width: 90%" placeholder=""   >
+              <el-option label="不处理" :value=0></el-option>
+              <el-option label="弹框提醒" :value=1></el-option>
+              <el-option label="禁止录入" :value=2></el-option>
             </el-select>
           </el-form-item>
         </el-col>
 
+
         <!--<el-col :span="11">-->
         <!--  <el-form-item label="预验收使用结束退回" prop="preInBack">-->
         <!--    <el-select v-model="inputQuery.preInBack"-->
         <!--               :disabled="inputQuery.actionType != 2 || inputQuery.mainAction!='WareHouseIn' ||-->
         <!--                        inputQuery.corpType != 2 || inputQuery.inStock==false "-->
         <!--               style="width: 90%"-->
-        <!--               placeholder="是否退回" clearable-->
+        <!--               placeholder="是否退回"   -->
         <!--    >-->
         <!--      <el-option label="是" :value="true"></el-option>-->
         <!--      <el-option label="否" :value="false"></el-option>-->
@@ -151,9 +151,9 @@
 
       <el-row type="flex">
         <el-col :span="11">
-          <el-form-item label="是否检查近效期" prop="prefix">
-            <el-select v-model="inputQuery.checkVailDate"
-                       style="width: 90%" placeholder="" clearable>
+          <el-form-item label="物资过期处理方式" prop="prefix">
+            <el-select v-model="inputQuery.checkExpire"
+                       style="width: 90%" placeholder=""   >
               <el-option label="不处理" :value=0></el-option>
               <el-option label="弹框提醒" :value=1></el-option>
               <el-option label="禁止录入" :value=2></el-option>
@@ -161,26 +161,18 @@
           </el-form-item>
         </el-col>
         <el-col :span="11">
-          <el-form-item label="是否检查过期" prop="prefix">
-            <el-select v-model="inputQuery.checkExpire"
-                       style="width: 90%" placeholder="" clearable>
-              <el-option label="是" :value="true"></el-option>
-              <el-option label="否" :value="false"></el-option>
+          <el-form-item label="资质过期处理方式" prop="prefix">
+            <el-select v-model="inputQuery.checkCertExpire"
+                       style="width: 90%" placeholder=""   >
+              <el-option label="不处理" :value=0></el-option>
+              <el-option label="弹框提醒" :value=1></el-option>
+              <el-option label="禁止录入" :value=2></el-option>
             </el-select>
           </el-form-item>
         </el-col>
       </el-row>
 
       <el-row type="flex">
-        <el-col :span="11">
-          <el-form-item label="是否检查资质过期" prop="prefix">
-            <el-select v-model="inputQuery.checkCertExpire"
-                       style="width: 90%" placeholder="" clearable>
-              <el-option label="是" :value="true"></el-option>
-              <el-option label="否" :value="false"></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
         <el-col :span="11">
           <el-form-item label="单据前缀" prop="prefix">
             <el-input
@@ -189,18 +181,23 @@
             </el-input>
           </el-form-item>
         </el-col>
+        <el-col :span="11">
+          <el-form-item label="排序" prop="sortNum">
+            <el-input v-model="inputQuery.sortNum" type="number" size="small" style="width: 90%">
+            </el-input>
+          </el-form-item>
+        </el-col>
       </el-row>
 
       <el-row type="flex">
-
-        <!--<el-col :span="11">-->
-        <!--  <el-form-item label="禁用单据类型" prop="prefix">-->
-        <!--    <el-select v-model="inputQuery.enable" style="width: 90%" placeholder="状态" clearable>-->
-        <!--      <el-option label="否" :value="true"></el-option>-->
-        <!--      <el-option label="是" :value="false"></el-option>-->
-        <!--    </el-select>-->
-        <!--  </el-form-item>-->
-        <!--</el-col>-->
+        <el-col :span="11">
+          <el-form-item label="禁用单据类型" prop="prefix">
+            <el-select v-model="inputQuery.enable" style="width: 90%" placeholder="状态"   >
+              <el-option label="否" :value="true"></el-option>
+              <el-option label="是" :value="false"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
         <el-col :span="11">
           <el-form-item prop="remark" label="备注">
             <el-input v-model="inputQuery.remark" size="small" style="width: 90%" type="textarea" autosize
@@ -242,7 +239,7 @@
             <el-col span="5">
               <el-select v-model="inputQuery.codeFillCheck" style="width: 65%"
                          :disabled="inputQuery.corpType!=2 || inputQuery.mainAction!= 'WareHouseIn'"
-                         placeholder="是否启用" clearable>
+                         placeholder="是否启用"   >
                 <el-option label="启用" :value="true"></el-option>
                 <el-option label="不启用" :value="false"></el-option>
               </el-select>
@@ -259,7 +256,7 @@
             </el-col>
             <el-divider direction="vertical"></el-divider>
             <el-col span="5">
-              <el-select v-model="inputQuery.fillCodeRel" style="width: 65%" placeholder="是否启用" clearable
+              <el-select v-model="inputQuery.fillCodeRel" style="width: 65%" placeholder="是否启用"
                          :disabled="inputQuery.corpType!=2 || inputQuery.mainAction!= 'WareHouseIn'"
               >
                 <el-option label="是" :value="true"></el-option>
@@ -278,7 +275,7 @@
             </el-col>
             <el-divider direction="vertical"></el-divider>
             <el-col span="5">
-              <el-select v-model="inputQuery.vailDispatch" style="width: 65%" placeholder="是否启用" clearable
+              <el-select v-model="inputQuery.vailDispatch" style="width: 65%" placeholder="是否启用"
                          :disabled="inputQuery.corpType!=2 || inputQuery.mainAction!= 'WareHouseIn'"
               >
                 <el-option label="启用" :value="true"></el-option>
@@ -298,7 +295,7 @@
             </el-col>
             <el-divider direction="vertical"></el-divider>
             <el-col span="5">
-              <el-select v-model="inputQuery.vailGroupBuy" style="width: 65%" placeholder="是否启用" clearable>
+              <el-select v-model="inputQuery.vailGroupBuy" style="width: 65%" placeholder="是否启用"   >
                 <el-option label="无需校验" :value=0></el-option>
                 <el-option label="只采集集采产品" :value=1></el-option>
                 <el-option label="只采集非集采产品" :value=2></el-option>
@@ -338,7 +335,7 @@
             <el-col span="5">
               <el-select v-model="inputQuery.scanPreIn" style="width: 65%"
                          :disabled=" inputQuery.mainAction == 'WareHouseIn' || inputQuery.corpType !== 1 || inputQuery.advancePreIn==1 || inputQuery.vailInv==1"
-                         placeholder="是否启用" clearable>
+                         placeholder="是否启用"   >
                 <el-option label="是" :value="true"></el-option>
                 <el-option label="否" :value="false"></el-option>
               </el-select>
@@ -358,7 +355,7 @@
             <el-col span="5">
               <el-select v-model="inputQuery.advancePreIn" style="width: 65%"
                          :disabled=" inputQuery.mainAction == 'WareHouseIn' || inputQuery.corpType !== 1 || inputQuery.scanPreIn==1 || inputQuery.vailInv==1"
-                         placeholder="是否启用" clearable>
+                         placeholder="是否启用"   >
                 <el-option label="是" :value="true"></el-option>
                 <el-option label="否" :value="false"></el-option>
               </el-select>
@@ -378,7 +375,7 @@
             <el-col span="5">
               <el-select v-model="inputQuery.vailInv" style="width: 65%"
                          :disabled=" inputQuery.mainAction!= 'WareHouseOut' || inputQuery.advancePreIn==1 || inputQuery.scanPreIn==1"
-                         placeholder="是否启用" clearable
+                         placeholder="是否启用"
               >
                 <el-option label="启用" :value="true"></el-option>
                 <el-option label="不启用" :value="false"></el-option>
@@ -399,7 +396,7 @@
             <el-col span="5">
               <el-select v-model="inputQuery.useDyCount" style="width: 65%"
                          :disabled=" inputQuery.mainAction!= 'WareHouseOut'  || inputQuery.corpType != 1"
-                         placeholder="是否启用" clearable
+                         placeholder="是否启用"
               >
                 <el-option label="是" :value="true"></el-option>
                 <el-option label="否" :value="false"></el-option>
@@ -419,9 +416,9 @@
             <el-divider direction="vertical"></el-divider>
             <el-col span="5">
               <el-select v-model="inputQuery.preInBack"
-                         :disabled="inputQuery.scanPreIn ==false "  @change="getPreInBack"
+                         :disabled="inputQuery.scanPreIn ==false " @change="getPreInBack"
                          style="width: 65%"
-                         placeholder="是否退回" clearable
+                         placeholder="是否退回"
               >
                 <el-option label="是" :value="true"></el-option>
                 <el-option label="否" :value="false"></el-option>
@@ -439,7 +436,7 @@
             </el-col>
             <el-divider direction="vertical"></el-divider>
             <el-col span="5">
-              <el-select  v-model="inputQuery.backPreinType" style="width: 65%" clearable>
+              <el-select  v-model="inputQuery.backPreinType" style="width: 65%"   >
                 <el-option label="按单使用和退库" :value="1"></el-option>
                 <el-option label="按货位（仓库）使用和退库" :value="2"></el-option>
               </el-select>
@@ -457,7 +454,7 @@
             </el-col>
             <el-divider direction="vertical"></el-divider>
             <el-col span="5">
-              <el-select  v-model="inputQuery.preInBackAction" style="width: 65%" clearable>
+              <el-select  v-model="inputQuery.preInBackAction" style="width: 65%"   >
                 <el-option
                   v-for="item in preInBackList"
                   :key="item.name"
@@ -530,7 +527,7 @@
               <el-divider direction="vertical"></el-divider>
               <el-col span="5">
                 <el-select v-model="inputQuery.checkWebNew" style="width: 65%" :disabled="!inputQuery.checkEnable"
-                           placeholder="是否启用" clearable
+                           placeholder="是否启用"
                 >
                   <el-option label="启用" :value="true"></el-option>
                   <el-option label="不启用" :value="false"></el-option>
@@ -550,7 +547,7 @@
               <el-divider direction="vertical"></el-divider>
               <el-col span="5">
                 <el-select v-model="inputQuery.checkPdaUn" style="width: 65%" :disabled="!inputQuery.checkEnable"
-                           placeholder="是否启用" clearable
+                           placeholder="是否启用"
                 >
                   <el-option label="启用" :value="true"></el-option>
                   <el-option label="不启用" :value="false"></el-option>
@@ -570,7 +567,7 @@
               <el-divider direction="vertical"></el-divider>
               <el-col span="5">
                 <el-select v-model="inputQuery.checkPdaEd" style="width: 65%" :disabled="!inputQuery.checkEnable"
-                           placeholder="是否启用" clearable
+                           placeholder="是否启用"
                 >
                   <el-option label="启用" :value="true"></el-option>
                   <el-option label="不启用" :value="false"></el-option>
@@ -585,12 +582,12 @@
 
             <el-row>
               <el-col span="5">
-                <span class="sptext">是否校验UDIMS平台单据</span>
+                <span class="sptext">UDIMS平台推送的单据</span>
               </el-col>
               <el-divider direction="vertical"></el-divider>
               <el-col span="5">
                 <el-select v-model="inputQuery.checkUdims" style="width: 65%" :disabled="!inputQuery.checkEnable"
-                           placeholder="是否启用" clearable
+                           placeholder="是否启用"
                 >
                   <el-option label="启用" :value="true"></el-option>
                   <el-option label="不启用" :value="false"></el-option>
@@ -598,19 +595,19 @@
               </el-col>
               <el-divider direction="vertical"></el-divider>
               <el-col span="13">
-                <span class="sptext">是否校验UDIMS平台单据</span>
+                <span class="sptext">UDIMS平台推送的单据</span>
               </el-col>
             </el-row>
             <el-divider></el-divider>
 
             <el-row>
               <el-col span="5">
-                <span class="sptext">UDI扫码通</span>
+                <span class="sptext">UDI扫码通单据</span>
               </el-col>
               <el-divider direction="vertical"></el-divider>
               <el-col span="5">
                 <el-select v-model="inputQuery.checkPc" style="width: 65%" :disabled="!inputQuery.checkEnable"
-                           placeholder="是否启用" clearable
+                           placeholder="是否启用"
                 >
                   <el-option label="启用" :value="true"></el-option>
                   <el-option label="不启用" :value="false"></el-option>
@@ -618,19 +615,19 @@
               </el-col>
               <el-divider direction="vertical"></el-divider>
               <el-col span="13">
-                <span class="sptext">UDI扫码通</span>
+                <span class="sptext">UDI扫码通单据</span>
               </el-col>
             </el-row>
             <el-divider></el-divider>
 
             <el-row>
               <el-col span="5">
-                <span class="sptext">自助平台同步</span>
+                <span class="sptext">内外网系统同步的单据</span>
               </el-col>
               <el-divider direction="vertical"></el-divider>
               <el-col span="5">
                 <el-select v-model="inputQuery.checkSp" style="width: 65%" :disabled="!inputQuery.checkEnable"
-                           placeholder="是否启用" clearable
+                           placeholder="是否启用"
                 >
                   <el-option label="启用" :value="true"></el-option>
                   <el-option label="不启用" :value="false"></el-option>
@@ -638,18 +635,18 @@
               </el-col>
               <el-divider direction="vertical"></el-divider>
               <el-col span="13">
-                <span class="sptext">自助平台同步</span>
+                <span class="sptext">内外网系统同步的单据</span>
               </el-col>
             </el-row>
             <el-divider></el-divider>
             <el-row>
               <el-col span="5">
-                <span class="sptext">缺量补单</span>
+                <span class="sptext">自动补单的单据</span>
               </el-col>
               <el-divider direction="vertical"></el-divider>
               <el-col span="5">
                 <el-select v-model="inputQuery.checkChange" style="width: 65%" :disabled="!inputQuery.checkEnable"
-                           placeholder="是否启用" clearable
+                           placeholder="是否启用"
                 >
                   <el-option label="启用" :value="true"></el-option>
                   <el-option label="不启用" :value="false"></el-option>
@@ -657,19 +654,19 @@
               </el-col>
               <el-divider direction="vertical"></el-divider>
               <el-col span="13">
-                <span class="sptext">缺量补单</span>
+                <span class="sptext">自动补单的单据</span>
               </el-col>
             </el-row>
             <el-divider></el-divider>
 
             <el-row>
               <el-col span="5">
-                <span class="sptext">平衡补单</span>
+                <span class="sptext">内部平衡补单的单据</span>
               </el-col>
               <el-divider direction="vertical"></el-divider>
               <el-col span="5">
                 <el-select v-model="inputQuery.checkBalance" :disabled="!inputQuery.checkEnable" style="width: 65%"
-                           placeholder="是否启用" clearable
+                           placeholder="是否启用"
                 >
                   <el-option label="启用" :value="true"></el-option>
                   <el-option label="不启用" :value="false"></el-option>
@@ -677,18 +674,18 @@
               </el-col>
               <el-divider direction="vertical"></el-divider>
               <el-col span="13">
-                <span class="sptext">平衡补单</span>
+                <span class="sptext">内部平衡补单的单据</span>
               </el-col>
             </el-row>
             <el-divider></el-divider>
             <el-row>
               <el-col span="5">
-                <span class="sptext">手动补单</span>
+                <span class="sptext">手工补单的单据</span>
               </el-col>
               <el-divider direction="vertical"></el-divider>
               <el-col span="5">
                 <el-select v-model="inputQuery.checkCopy" style="width: 65%" :disabled="!inputQuery.checkEnable"
-                           placeholder="是否启用" clearable
+                           placeholder="是否启用"
                 >
                   <el-option label="启用" :value="true"></el-option>
                   <el-option label="不启用" :value="false"></el-option>
@@ -696,7 +693,7 @@
               </el-col>
               <el-divider direction="vertical"></el-divider>
               <el-col span="13">
-                <span class="sptext">手动补单</span>
+                <span class="sptext">手工补单的单据</span>
               </el-col>
             </el-row>
           </div>
@@ -735,7 +732,7 @@
               </el-col>
               <el-divider direction="vertical"></el-divider>
               <el-col span="5">
-                <el-select v-model="inputQuery.thrCheckWebNew" style="width: 65%" placeholder="是否启用" clearable
+                <el-select v-model="inputQuery.thrCheckWebNew" style="width: 65%" placeholder="是否启用"
                            :disabled="!inputQuery.thrCheckEnable"
                 >
                   <el-option label="启用" :value="true"></el-option>
@@ -755,7 +752,7 @@
               </el-col>
               <el-divider direction="vertical"></el-divider>
               <el-col span="5">
-                <el-select v-model="inputQuery.thrCheckPdaUn" style="width: 65%" placeholder="是否启用" clearable
+                <el-select v-model="inputQuery.thrCheckPdaUn" style="width: 65%" placeholder="是否启用"
                            :disabled="!inputQuery.thrCheckEnable"
                 >
                   <el-option label="启用" :value="true"></el-option>
@@ -775,7 +772,7 @@
               </el-col>
               <el-divider direction="vertical"></el-divider>
               <el-col span="5">
-                <el-select v-model="inputQuery.thrCheckPdaEd" style="width: 65%" placeholder="是否启用" clearable
+                <el-select v-model="inputQuery.thrCheckPdaEd" style="width: 65%" placeholder="是否启用"
                            :disabled="!inputQuery.thrCheckEnable"
                 >
                   <el-option label="启用" :value="true"></el-option>
@@ -791,11 +788,11 @@
 
             <el-row>
               <el-col span="5">
-                <span class="sptext">校验产品是否可配送</span>
+                <span class="sptext">UDIMS平台推送的数据</span>
               </el-col>
               <el-divider direction="vertical"></el-divider>
               <el-col span="5">
-                <el-select v-model="inputQuery.thrCheckUdims" style="width: 65%" placeholder="是否启用" clearable
+                <el-select v-model="inputQuery.thrCheckUdims" style="width: 65%" placeholder="是否启用"
                            :disabled="!inputQuery.thrCheckEnable"
                 >
                   <el-option label="启用" :value="true"></el-option>
@@ -804,18 +801,18 @@
               </el-col>
               <el-divider direction="vertical"></el-divider>
               <el-col span="13">
-                <span class="sptext">是否校验UDIMS平台单据</span>
+                <span class="sptext">UDIMS平台推送的数据</span>
               </el-col>
             </el-row>
             <el-divider></el-divider>
 
             <el-row>
               <el-col span="5">
-                <span class="sptext">UDI扫码通</span>
+                <span class="sptext">UDI扫码通单据</span>
               </el-col>
               <el-divider direction="vertical"></el-divider>
               <el-col span="5">
-                <el-select v-model="inputQuery.thrCheckPc" style="width: 65%" placeholder="是否启用" clearable
+                <el-select v-model="inputQuery.thrCheckPc" style="width: 65%" placeholder="是否启用"
                            :disabled="!inputQuery.thrCheckEnable"
                 >
                   <el-option label="启用" :value="true"></el-option>
@@ -824,18 +821,18 @@
               </el-col>
               <el-divider direction="vertical"></el-divider>
               <el-col span="13">
-                <span class="sptext">UDI扫码通</span>
+                <span class="sptext">UDI扫码通单据</span>
               </el-col>
             </el-row>
             <el-divider></el-divider>
 
             <el-row>
               <el-col span="5">
-                <span class="sptext">校验产品是否可配送</span>
+                <span class="sptext">内外网系统同步的单据</span>
               </el-col>
               <el-divider direction="vertical"></el-divider>
               <el-col span="5">
-                <el-select v-model="inputQuery.thrCheckSp" style="width: 65%" placeholder="是否启用" clearable
+                <el-select v-model="inputQuery.thrCheckSp" style="width: 65%" placeholder="是否启用"
                            :disabled="!inputQuery.thrCheckEnable"
                 >
                   <el-option label="启用" :value="true"></el-option>
@@ -844,18 +841,18 @@
               </el-col>
               <el-divider direction="vertical"></el-divider>
               <el-col span="13">
-                <span class="sptext">校验产品是否可配送</span>
+                <span class="sptext">内外网系统同步的单据</span>
               </el-col>
             </el-row>
             <el-divider></el-divider>
 
             <el-row>
               <el-col span="5">
-                <span class="sptext">缺量补单</span>
+                <span class="sptext">自动补单的单据</span>
               </el-col>
               <el-divider direction="vertical"></el-divider>
               <el-col span="5">
-                <el-select v-model="inputQuery.thrCheckChange" style="width: 65%" placeholder="是否启用" clearable
+                <el-select v-model="inputQuery.thrCheckChange" style="width: 65%" placeholder="是否启用"
                            :disabled="!inputQuery.thrCheckEnable"
                 >
                   <el-option label="启用" :value="true"></el-option>
@@ -864,18 +861,18 @@
               </el-col>
               <el-divider direction="vertical"></el-divider>
               <el-col span="13">
-                <span class="sptext">缺量补单</span>
+                <span class="sptext">自动补单的单据</span>
               </el-col>
             </el-row>
             <el-divider></el-divider>
 
             <el-row>
               <el-col span="5">
-                <span class="sptext">平衡补单</span>
+                <span class="sptext">内部平衡补单的单据</span>
               </el-col>
               <el-divider direction="vertical"></el-divider>
               <el-col span="5">
-                <el-select v-model="inputQuery.thrCheckBalance" style="width: 65%" placeholder="是否启用" clearable
+                <el-select v-model="inputQuery.thrCheckBalance" style="width: 65%" placeholder="是否启用"
                            :disabled="!inputQuery.thrCheckEnable"
                 >
                   <el-option label="启用" :value="true"></el-option>
@@ -884,18 +881,18 @@
               </el-col>
               <el-divider direction="vertical"></el-divider>
               <el-col span="13">
-                <span class="sptext">平衡补单</span>
+                <span class="sptext">内部平衡补单的单据</span>
               </el-col>
             </el-row>
             <el-divider></el-divider>
 
             <el-row>
               <el-col span="5">
-                <span class="sptext">手动补单</span>
+                <span class="sptext">手工补单的单据</span>
               </el-col>
               <el-divider direction="vertical"></el-divider>
               <el-col span="5">
-                <el-select v-model="inputQuery.thrCheckCopy" style="width: 65%" placeholder="是否启用" clearable
+                <el-select v-model="inputQuery.thrCheckCopy" style="width: 65%" placeholder="是否启用"
                            :disabled="!inputQuery.thrCheckEnable"
                 >
                   <el-option label="启用" :value="true"></el-option>
@@ -904,7 +901,7 @@
               </el-col>
               <el-divider direction="vertical"></el-divider>
               <el-col span="13">
-                <span class="sptext">手动补单</span>
+                <span class="sptext">手工补单的单据</span>
               </el-col>
             </el-row>
           </div>
@@ -944,7 +941,7 @@
               </el-col>
               <el-divider direction="vertical"></el-divider>
               <el-col span="5">
-                <el-select v-model="inputQuery.secCheckWebNew" style="width: 65%" placeholder="是否启用" clearable
+                <el-select v-model="inputQuery.secCheckWebNew" style="width: 65%" placeholder="是否启用"
                            :disabled="!inputQuery.secCheckEnable"
                 >
                   <el-option label="启用" :value="true"></el-option>
@@ -964,7 +961,7 @@
               </el-col>
               <el-divider direction="vertical"></el-divider>
               <el-col span="5">
-                <el-select v-model="inputQuery.secCheckPdaUn" style="width: 65%" placeholder="是否启用" clearable
+                <el-select v-model="inputQuery.secCheckPdaUn" style="width: 65%" placeholder="是否启用"
                            :disabled="!inputQuery.secCheckEnable"
                 >
                   <el-option label="启用" :value="true"></el-option>
@@ -984,7 +981,7 @@
               </el-col>
               <el-divider direction="vertical"></el-divider>
               <el-col span="5">
-                <el-select v-model="inputQuery.secCheckPdaEd" style="width: 65%" placeholder="是否启用" clearable
+                <el-select v-model="inputQuery.secCheckPdaEd" style="width: 65%" placeholder="是否启用"
                            :disabled="!inputQuery.secCheckEnable"
                 >
                   <el-option label="启用" :value="true"></el-option>
@@ -1000,11 +997,11 @@
 
             <el-row>
               <el-col span="5">
-                <span class="sptext">校验产品是否可配送</span>
+                <span class="sptext">UDIMS平台推送的数据</span>
               </el-col>
               <el-divider direction="vertical"></el-divider>
               <el-col span="5">
-                <el-select v-model="inputQuery.secCheckUdims" style="width: 65%" placeholder="是否启用" clearable
+                <el-select v-model="inputQuery.secCheckUdims" style="width: 65%" placeholder="是否启用"
                            :disabled="!inputQuery.secCheckEnable"
                 >
                   <el-option label="启用" :value="true"></el-option>
@@ -1013,18 +1010,18 @@
               </el-col>
               <el-divider direction="vertical"></el-divider>
               <el-col span="13">
-                <span class="sptext">是否校验UDIMS平台单据</span>
+                <span class="sptext">UDIMS平台推送的数据</span>
               </el-col>
             </el-row>
             <el-divider></el-divider>
 
             <el-row>
               <el-col span="5">
-                <span class="sptext">UDI扫码通</span>
+                <span class="sptext">UDI扫码通单据</span>
               </el-col>
               <el-divider direction="vertical"></el-divider>
               <el-col span="5">
-                <el-select v-model="inputQuery.secCheckPc" style="width: 65%" placeholder="是否启用" clearable
+                <el-select v-model="inputQuery.secCheckPc" style="width: 65%" placeholder="是否启用"
                            :disabled="!inputQuery.secCheckEnable"
                 >
                   <el-option label="启用" :value="true"></el-option>
@@ -1033,18 +1030,18 @@
               </el-col>
               <el-divider direction="vertical"></el-divider>
               <el-col span="13">
-                <span class="sptext">UDI扫码通</span>
+                <span class="sptext">UDI扫码通单据</span>
               </el-col>
             </el-row>
             <el-divider></el-divider>
 
             <el-row>
               <el-col span="5">
-                <span class="sptext">校验产品是否可配送</span>
+                <span class="sptext">内外网系统同步的单据</span>
               </el-col>
               <el-divider direction="vertical"></el-divider>
               <el-col span="5">
-                <el-select v-model="inputQuery.secCheckSp" style="width: 65%" placeholder="是否启用" clearable
+                <el-select v-model="inputQuery.secCheckSp" style="width: 65%" placeholder="是否启用"
                            :disabled="!inputQuery.secCheckEnable"
                 >
                   <el-option label="启用" :value="true"></el-option>
@@ -1053,18 +1050,18 @@
               </el-col>
               <el-divider direction="vertical"></el-divider>
               <el-col span="13">
-                <span class="sptext">校验产品是否可配送</span>
+                <span class="sptext">内外网系统同步的单据</span>
               </el-col>
             </el-row>
             <el-divider></el-divider>
 
             <el-row>
               <el-col span="5">
-                <span class="sptext">缺量补单</span>
+                <span class="sptext">自动补单的单据</span>
               </el-col>
               <el-divider direction="vertical"></el-divider>
               <el-col span="5">
-                <el-select v-model="inputQuery.secCheckChange" style="width: 65%" placeholder="是否启用" clearable
+                <el-select v-model="inputQuery.secCheckChange" style="width: 65%" placeholder="是否启用"
                            :disabled="!inputQuery.secCheckEnable"
                 >
                   <el-option label="启用" :value="true"></el-option>
@@ -1073,18 +1070,18 @@
               </el-col>
               <el-divider direction="vertical"></el-divider>
               <el-col span="13">
-                <span class="sptext">缺量补单</span>
+                <span class="sptext">自动补单的单据</span>
               </el-col>
             </el-row>
             <el-divider></el-divider>
 
             <el-row>
               <el-col span="5">
-                <span class="sptext">平衡补单</span>
+                <span class="sptext">内部平衡补单的单据</span>
               </el-col>
               <el-divider direction="vertical"></el-divider>
               <el-col span="5">
-                <el-select v-model="inputQuery.secCheckBalance" style="width: 65%" placeholder="是否启用" clearable
+                <el-select v-model="inputQuery.secCheckBalance" style="width: 65%" placeholder="是否启用"
                            :disabled="!inputQuery.secCheckEnable"
                 >
                   <el-option label="启用" :value="true"></el-option>
@@ -1093,18 +1090,18 @@
               </el-col>
               <el-divider direction="vertical"></el-divider>
               <el-col span="13">
-                <span class="sptext">平衡补单</span>
+                <span class="sptext">内部平衡补单的单据</span>
               </el-col>
             </el-row>
             <el-divider></el-divider>
 
             <el-row>
               <el-col span="5">
-                <span class="sptext">手动补单</span>
+                <span class="sptext">手工补单的单据</span>
               </el-col>
               <el-divider direction="vertical"></el-divider>
               <el-col span="5">
-                <el-select v-model="inputQuery.secCheckCopy" style="width: 65%" placeholder="是否启用" clearable
+                <el-select v-model="inputQuery.secCheckCopy" style="width: 65%" placeholder="是否启用"
                            :disabled="!inputQuery.secCheckEnable"
                 >
                   <el-option label="启用" :value="true"></el-option>
@@ -1113,7 +1110,7 @@
               </el-col>
               <el-divider direction="vertical"></el-divider>
               <el-col span="13">
-                <span class="sptext">手动补单</span>
+                <span class="sptext">手工补单的单据</span>
               </el-col>
             </el-row>
           </div>
@@ -1253,7 +1250,7 @@ export default {
 
       if (this.inputQuery.corpType != 2) {    //往来类型非供应商时，采购方式未无
         this.inputQuery.actionType = 1;
-        this.inputQuery.spUse = null;
+        this.inputQuery.spUse = 0;
       }
 
       // if (this.inputQuery.corpType == 3) {//往来类型为内部科室
diff --git a/src/views/basic/business/stockOrder.vue b/src/views/basic/business/stockOrder.vue
index 2f8f704..7fc3c66 100644
--- a/src/views/basic/business/stockOrder.vue
+++ b/src/views/basic/business/stockOrder.vue
@@ -152,7 +152,7 @@
         </el-table-column>
         <el-table-column label="价格" prop="price"></el-table-column>
         <el-table-column label="生产企业" prop="ylqxzcrbarmc"></el-table-column>
-        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column>
+        <el-table-column label="注册/备案号" prop="certCode"></el-table-column>
       </el-table>
 
       <pagination
diff --git a/src/views/basic/business/stockOrderPrint.vue b/src/views/basic/business/stockOrderPrint.vue
new file mode 100644
index 0000000..268cf10
--- /dev/null
+++ b/src/views/basic/business/stockOrderPrint.vue
@@ -0,0 +1,546 @@
+<template>
+  <div>
+    <el-card class="el-card">
+      <el-form :model="query" label-width="100px" v-show="showSearch">
+        <el-row style="width: 100%">
+          <el-col :span="8">
+            <el-form-item label="单号:">
+              <el-input v-model="query.billNo" style="width: 90%" placeholder="请输入单号" clearable></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="打印状态：" prop="inCodeStatus" clearable>
+              <el-select v-model="query.inCodeStatus" style="width: 90%">
+                <el-option label="未打印" :value="0"></el-option>
+                <el-option label="已打印" :value="1"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <!--          <el-col :span="8">-->
+          <!--            <el-form-item label="送货单位:">-->
+          <!--              <el-input v-model="query.corpName" style="width: 90%" placeholder="请输入送货单位" clearable></el-input>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
+
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="单据类型:">
+              <el-select v-model="query.action" placeholder="请选择单据类型"
+                         style="width: 90%"
+                         clearable>
+                <el-option
+                  v-for="item in busTypes"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.action">
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="单据状态:">
+              <el-select v-model="query.status" placeholder="请选择单据状态" style="width: 90%">
+                <el-option label="草稿" :value=1>草稿</el-option>
+                <el-option label="待校验" :value=3>待校验</el-option>
+                <el-option label="待核对" :value=5>待核对</el-option>
+                <el-option label="待审核" :value=10>待审核</el-option>
+                <el-option label="已审核" :value=7>已审核</el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+
+          <el-col :span="8">
+            <el-form-item label="创建时间:">
+              <el-date-picker
+                :picker-options="pickerOptions"
+                v-model="actDateRange"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                style="width: 90%"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+      </el-form>
+
+
+      <div class="top-right-btn">
+        <el-button-group style="display:flex;">
+          <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-search" @click="combine">选入</el-button>
+        </el-button-group>
+      </div>
+
+      <el-divider style="margin: 15px"></el-divider>
+
+
+      <el-table v-loading="loading" :data="list" style="width: 100%;" border highlight-current-row
+                @row-click="getStockOrderDetailList" ref="multipleTable">
+        <el-table-column type="index" label="序号" width="50"></el-table-column>
+        <el-table-column label="单据号" prop="billNo" width="140" show-overflow-tooltip></el-table-column>
+        <el-table-column label="单据类型" prop="billTypeName" width="120">
+        </el-table-column>
+        <el-table-column label="创建时间" prop="createTime" width="150"></el-table-column>
+        <el-table-column label="打印状态" width="100" prop="inCodeStatus">
+          <template slot-scope="scope">
+            <span>{{ enableMap[scope.row.inCodeStatus] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="采购部门" prop="deptName" width="120">
+        </el-table-column>
+        <el-table-column label="收货仓库" prop="invName" width="150">
+        </el-table-column>
+        <el-table-column label="单据来源" prop="fromType" width="120">
+          <template slot-scope="scope">
+            <span>{{ sourceMap[scope.row.fromType] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :limit.sync="query.limit"
+        :page.sync="query.page"
+        @pagination="handleCurrentChange"
+      ></pagination>
+
+    </el-card>
+
+    <el-card class="el-card">
+      <el-table v-loading="detailLoading" :data="detailList" style="width: 100%" border>
+        <el-table-column type="index" label="序号" width="50"></el-table-column>
+        <el-table-column label="物资名称" prop="coName"></el-table-column>
+        <el-table-column label="规格型号" prop="spec"></el-table-column>
+        <el-table-column label="批次号" prop="batchNo"></el-table-column>
+        <el-table-column label="单据数量" prop="count"></el-table-column>
+        <!--        <el-table-column label="实际数量" prop="scanCount"></el-table-column>-->
+        <el-table-column label="生产日期" prop="productDate">
+          <template slot-scope="scope">
+            <span>{{ convertDateFun(scope.row.productDate) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="失效日期" prop="expireDate">
+          <template slot-scope="scope">
+            <span>{{ convertDateFun(scope.row.expireDate) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="价格" prop="price"></el-table-column>
+        <el-table-column label="生产企业" prop="ylqxzcrbarmc"></el-table-column>
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column>
+      </el-table>
+
+      <pagination
+        v-show="detailTotal>0"
+        :total="detailTotal"
+        :limit.sync="detailQuery.limit"
+        :page.sync="detailQuery.page"
+        @pagination="detailHandleCurrentChange"
+      ></pagination>
+    </el-card>
+
+<!--    <el-dialog-->
+<!--      title="内部码管理"-->
+<!--      :visible.sync="qrcodeDetailVisible"-->
+<!--      :close-on-click-modal="false"-->
+<!--      :close-on-press-escape="false"-->
+<!--      width="70%"-->
+<!--      append-to-body-->
+<!--      v-if="qrcodeDetailVisible"-->
+<!--      @close='closeQRCodeDetailDialog'-->
+<!--    >-->
+<!--      <stockOrderQRCodeDetail-->
+<!--        :closeDialog="closeQRCodeDetailDialog"-->
+<!--        :idQuery="idQuery"-->
+<!--      ></stockOrderQRCodeDetail>-->
+<!--    </el-dialog>-->
+
+  </div>
+</template>
+
+<script>
+import {
+  stockorderQuery, stockOrderDetail, deleteStockOrderById, deleteStockOrderDetailById,
+  copyStockOrderDetail, submitStockOrder,
+  uploadStockOrderDetail, uploadStockOrderDetailCount,
+  generateStockOrderQRCodeText
+} from "@/api/inout/stockOrder";
+import stockOrderDistribution from "./stockOrderDistribution";
+import stockOrderQRCodeDetail from "./stockOrderQRCodeDetail";
+import stockQRCodeExport from "./stockQRCodeExport";
+import draggable from "vuedraggable";
+import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile} from "@/api/itextpdf/itextpdf";
+import store from "@/store";
+import {getLocalJoinBusType} from "@/api/basic/busLocalType";
+import {filterAll, filterAllByUser} from "@/api/system/invWarehouse";
+import {filterSubByInv, findInvByUser} from '@/api/system/invSubWarehouse'
+import {convertDate} from "@/utils/date"
+import { filterOrder, orderDetailAdd } from '@/api/inout/order'
+import {getLocalJoinByUser} from "@/api/basic/busType";
+
+export default {
+  name: "stockOrder",
+  props: {
+    data: {
+      type: Object,
+      required: true,
+    },
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+    purType: {
+      type: Object,
+      required: true,
+    },
+    pId: {
+      type: Object,
+      required: true,
+    },
+    billNo: {
+      type: Object,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      showSearch: true,
+      convertDateFun: convertDate,
+      query: {
+        billType: null,
+        corpName: null,
+        locStorageCode: this.$store.getters.locInvCode,
+        invWarehouseCode: this.$store.getters.locSubInvCode,
+        billNo: "",
+        status: "",
+        action: null,
+        statusType: "supInCode",
+        page: 1,
+        limit: 10,
+        startTime: "",
+        endTime: "",
+        inCodeStatus: 1,
+      },
+      detailQuery: {
+        orderIdFk: "",
+        page: 1,
+        limit: 20
+      },
+      isSp: store.getters.customerId,
+      storageList: [],
+      subInvList: [],
+      busTypes: [],
+      list: [],
+      orderQuery:[],
+      detailList: [],
+      total: 0,
+      detailTotal: 0,
+      loading: false,
+      detailLoading: false,
+      enableMap: {
+        1: "已打印",
+        0: "未打印",
+      },
+      sourceMap: {
+        "1": "UDIMS平台",
+        "2": "网页新增",
+        "3": "pda已校验",
+        "4": "pda未校验",
+        "5": "pc端扫码精灵",
+        "6": "单据流转",
+        "7": "供应商平台",
+        "8": "平衡补单",
+        "9": "单据验收直接补单",
+        "10": "单据复制",
+        "11": "盘点单据转单",
+        "12": "申购计划转单",
+        "13": "领用单据转单",
+        "14": "第三方单据转单",
+
+      },
+      idQuery: {
+        id: "",
+        filterUDIType: null,
+      },
+      distributionVisible: false,
+      detailFormRules: {
+        batchNo: [
+          {required: true, message: "请输入批次号", trigger: "blur"}
+        ],
+        productDate: [
+          {required: true, message: "请输入生产日期", trigger: "blur"}
+        ],
+        expireDate: [
+          {required: true, message: "请输入失效日期", trigger: "blur"}
+        ],
+        sweepCount: [
+          {required: true, message: "请输入扫码数量", trigger: "blur"}
+        ]
+      },
+      detailFormVisible: false,
+      detailFormData: {},
+      detailFormLoading: false,
+      haveDistributionVisible: true,
+      qrcodeDetailVisible: false,
+      qrcodeExportVisible: false,
+      filterUDIType: true,
+      actDateRange: [],
+      auditDateRange: [],
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
+      },
+    }
+  },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: ""
+      });
+      this.query = {
+        billType: null,
+        corpName: null,
+        locStorageCode: this.$store.getters.locInvCode,
+        invWarehouseCode: this.$store.getters.locSubInvCode,
+        billNo: "",
+        status: "",
+        action: null,
+        statusType: "supInCode",
+        page: 1,
+        limit: 10,
+        startTime: "",
+        endTime: "",
+        inCodeStatus: 1,
+      };
+      this.getList();
+
+      this.haveDistributionVisible = true;
+      this.actDateRange = [];
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    onSubmit() {
+      this.query.page = 1;
+      if (this.actDateRange !== null) {
+        this.query.startTime = this.actDateRange[0];
+        this.query.endTime = this.actDateRange[1];
+      } else {
+        this.query.startTime = null;
+        this.query.endTime = null;
+      }
+
+      if (this.auditDateRange !== null) {
+        this.query.startAduditTime = this.auditDateRange[0];
+        this.query.endAduditTime = this.auditDateRange[1];
+      } else {
+        this.query.startAduditTime = null;
+        this.query.endAduditTime = null;
+      }
+      this.getList();
+      this.haveDistributionVisible = true;
+    },
+    handleCurrentChange(val) {
+      this.query.page = val.page;
+      this.getList();
+    },
+    detailHandleCurrentChange(val) {
+      this.detailQuery.page = val.page;
+      this.getStockOrderDetailList();
+    },
+    // 刷新表单
+    resetForm() {
+      if (this.$refs["dataForm"]) {
+        // 清空验证信息表单
+        this.$refs["dataForm"].clearValidate();
+        // 刷新表单
+        this.$refs["dataForm"].resetFields();
+        this.getList();
+      }
+    },
+    getList() {
+      this.loading = true;
+      this.orderQuery=[];
+      this.query.corpId = store.getters.customerId;
+      if (this.actDateRange !== null) {
+        this.query.startTime = this.actDateRange[0];
+        this.query.endTime = this.actDateRange[1];
+      } else {
+        this.query.startTime = null;
+        this.query.endTime = null;
+      }
+      this.query.vueType = "supDelivery";
+      filterOrder(this.query)
+        .then(response => {
+          this.loading = false;
+          if (response.code == 20000) {
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+            this.detailList = [];
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.detailList = [];
+          this.total = 0;
+        });
+    },
+
+    combine(){
+      if(this.orderQuery==null && this.orderQuery.length==0){
+        this.$message.error("请先选择单据！")
+        return;
+      }
+      var query={
+        orderIdFk:this.billNo,
+        billNo:this.orderQuery.billNo
+      }
+      orderDetailAdd(query).then(response =>{
+          if (response.code == 20000) {
+            this.closeDialog();
+          }
+      })
+    },
+
+    qrcodeDetail(row) {
+      this.idQuery.id = '';
+      if (this.$isNotBlank(row.id)) {
+        this.idQuery.id = row.id;
+        this.idQuery.formData = row;
+        this.idQuery.filterUDIType = this.filterUDIType;
+        this.qrcodeDetailVisible = true;
+      }
+    },
+    closeQRCodeDetailDialog() {
+      this.qrcodeDetailVisible = false;
+      this.getList();
+    },
+    getStockOrderDetailList(row) {
+      if (this.$isNotBlank(row)) {
+        this.detailQuery.orderIdFk = row.billNo;
+        this.orderQuery=row;
+      }
+      this.detailLoading = true;
+      stockOrderDetail(this.detailQuery)
+        .then((response) => {
+          this.detailLoading = false;
+          this.detailList = response.data.list || [];
+          this.detailTotal = response.data.total;
+        })
+        .catch(() => {
+          this.detailLoading = false;
+          this.detailList = [];
+        });
+    },
+    getBusType() {
+      let query = {
+        enabled: true,
+        vueType: "supDelivery",
+      };
+      getLocalJoinByUser(query)
+        .then((response) => {
+          this.busTypes = response.data.list || [];
+          this.filterQuery.action = this.busTypes[0].action;
+          // this.getList();
+        })
+        .catch(() => {
+        });
+    },
+    getSubInvList() {
+      findInvByUser()
+        .then((response) => {
+          this.subInvList = response.data || [];
+        })
+        .catch(() => {
+        });
+    },
+
+    subInvChange() {
+      this.getBusType();
+    },
+  },
+  components: {
+    draggable,
+    stockOrderDistribution,
+    stockOrderQRCodeDetail,
+    stockQRCodeExport,
+  },
+  filters: {
+    statusFilterType(status) {
+      const statusMap = {
+        0: "gray",
+        1: "success"
+      };
+      return statusMap[status];
+    },
+    statusFilterName(status) {
+      const statusMap = {
+        "1": "草稿",
+        "2": "未配货",
+        "3": "待校验",
+      };
+      return statusMap[status];
+    },
+    typeFilterName(type) {
+      const typeMap = {
+        1: "预入库",
+        2: "普通采购",
+      };
+      return typeMap[type];
+    }
+  },
+  created() {
+    // 加载表格数据
+    this.getSubInvList();
+    this.getBusType();
+    this.getList();
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/basic/locUdi/UdiSupplement.vue b/src/views/basic/locUdi/UdiSupplement.vue
index 9d2fc44..5079951 100644
--- a/src/views/basic/locUdi/UdiSupplement.vue
+++ b/src/views/basic/locUdi/UdiSupplement.vue
@@ -113,6 +113,12 @@
             width="120"
             show-overflow-tooltip
           ></el-table-column>
+          <el-table-column
+            label="创建时间"
+            prop="createTime"
+            width="120"
+            show-overflow-tooltip
+          ></el-table-column>
           <el-table-column
             label="生产日期"
             prop="produceDate"
@@ -331,7 +337,7 @@ export default {
       return !row.check;
     },
     handleCurrentChange(val) {
-      this.unionQuery.page = val;
+      this.unionQuery.page = val.page;
       this.getList();
     },
     tableRowClassName({row, rowIndex}) {
diff --git a/src/views/basic/product/productEdit.vue b/src/views/basic/product/productEdit.vue
index ae69725..0553ef8 100644
--- a/src/views/basic/product/productEdit.vue
+++ b/src/views/basic/product/productEdit.vue
@@ -578,7 +578,7 @@ import ProductSingleEdit from "@/views/basic/product/productSingleEdit";
 import selectErp from "./udiInfoselectErpUdi";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import Treeselect from "@riophae/vue-treeselect";
-import {getListMenu} from "@/api/basic/basicHospType";
+import { getListMenu, getOneName } from '@/api/basic/basicHospType'
 
 
 export default {
@@ -849,12 +849,15 @@ export default {
       }
     },
     getTreeselect() {
-      getListMenu().then(response => {
-        this.fromDeptOptions = [];
-        const menu = {id: 0, name: '主类目', children: []};
-        menu.children = this.handleTree(response.data, "code", "parentCode");
-        this.fromDeptOptions.push(menu);
-      });
+      getOneName().then(res =>{
+        const menu = {id: res.data.id,code:res.data.code, name: res.data.name, children: []};
+        getListMenu({}).then(response => {
+          this.fromDeptOptions = [];
+          menu.children = this.handleTree(response.data,"code", "parentCode");
+          console.log(menu)
+          this.fromDeptOptions.push(menu);
+        });
+      })
     },
     /** 转换菜单数据结构 */
     normalizer(node) {
diff --git a/src/views/basic/product/productUdiType.vue b/src/views/basic/product/productUdiType.vue
index fb186aa..1dc4bdd 100644
--- a/src/views/basic/product/productUdiType.vue
+++ b/src/views/basic/product/productUdiType.vue
@@ -32,7 +32,7 @@
         <el-table-column label="操作" class-name="small-padding fixed-width">
           <template slot-scope="scope">
             <el-button type="text"  @click="handleSubForm( scope.row, 'add')">新增</el-button>
-            <el-button type="text" v-if="scope.row.code!=10000" @click.native.stop="handleSubForm( scope.row, 'edit')">编辑</el-button>
+            <el-button type="text"  @click.native.stop="handleSubForm( scope.row, 'edit')">编辑</el-button>
             <el-button type="text" v-if="scope.row.code!=10000" @click.native.stop="handleDelInv(scope.row)">删除</el-button>
             <el-button type="text" v-if="scope.row.code!=10000"  @click.native.stop="addHospProduct( scope.row)">绑定</el-button>
             <el-button type="text" v-if="scope.row.code!=10000"   @click.native.stop="removeHospProduct(scope.row)">解绑</el-button>
@@ -54,10 +54,11 @@
             <el-col :span="12" class="el-col">
               <el-form-item label="上级菜单" prop="parentCode">
                 <treeselect
-                  :disabled="formName=='add'"
+                  :disabled="formName=='add' || subData.code==10000"
                   v-model="subData.parentCode"
                   :options="fromDeptOptions"
                   :normalizer="normalizer"
+                  :clearable = "false"
                   :show-count="true"
                   placeholder="选择上级菜单"
                 />
@@ -133,7 +134,7 @@
 <script>
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import Treeselect from "@riophae/vue-treeselect";
-import {getBasicHospType, getListMenu, saveBasicHospType,uodateBasicHospType,deleteBasicHospType} from "@/api/basic/basicHospType";
+import {getBasicHospType, getListMenu, saveBasicHospType,uodateBasicHospType,deleteBasicHospType,getOneName} from "@/api/basic/basicHospType";
 
 import selectHospProduct from "@/views/basic/product/bindHospProduct";
 import selectUnBindHospProduct from "@/views/basic/product/unbindHospProduct";
@@ -226,7 +227,7 @@ export default {
           parentCode:JSON.parse(JSON.stringify(data)).code
         };
       }
-      this.getTreeselect();
+      this.getTreeselect(data);
       this.subFormVisible = true;
     },
 
@@ -248,7 +249,7 @@ export default {
     },
     forInvSubmit() {    // 新增，编辑---提交
 
-      if(this.subData.parentCode==null){
+      if(this.subData.code!=10000 && this.subData.parentCode==null){
         this.$message.error("上级菜单不能为空");
         return
       }
@@ -282,13 +283,23 @@ export default {
     },
 
     /** 查询菜单下拉树结构 */
-    getTreeselect() {
-      getListMenu().then(response => {
-        this.fromDeptOptions = [];
-        const menu = {id: 0, name: '主类目', children: []};
-        menu.children = this.handleTree(response.data,"code", "parentCode");
-        this.fromDeptOptions.push(menu);
-      });
+    getTreeselect(row) {
+      debugger
+      if(row!=null){
+        var data={
+          code:row.code,
+          type:1
+        }
+      }
+      getOneName().then(res =>{
+        const menu = {id: res.data.id,code:res.data.code, name: res.data.name, children: []};
+        getListMenu(data).then(response => {
+          this.fromDeptOptions = [];
+          menu.children = this.handleTree(response.data,"code", "parentCode");
+          console.log(menu)
+          this.fromDeptOptions.push(menu);
+        });
+      })
     },
     /** 转换菜单数据结构 */
     normalizer(node) {
diff --git a/src/views/inout/DialogSelectRl.vue b/src/views/inout/DialogSelectRl.vue
index c9c7d5a..41d6c03 100644
--- a/src/views/inout/DialogSelectRl.vue
+++ b/src/views/inout/DialogSelectRl.vue
@@ -725,6 +725,7 @@ export default {
           mySupId: this.curRow.unitFk,
         };
         updateBind(query).then((response) => {
+          debugger
           if (response.code == 20000) {
             this.$message.success("绑定成功");
             this.closeBindDialog(this.curRow.id);
diff --git a/src/views/inout/InvoiceRegistration.vue b/src/views/inout/InvoiceRegistration.vue
index 8b6a791..61e2e77 100644
--- a/src/views/inout/InvoiceRegistration.vue
+++ b/src/views/inout/InvoiceRegistration.vue
@@ -690,7 +690,6 @@ export default {
       }
 
       this.filterQuery.page = 1;
-      this.filterQuery.supInoivceSearch=null;
       this.getList();
     },
     hideSearch() {
@@ -738,7 +737,7 @@ export default {
     getBusType() {
       let query = {
         code: this.filterQuery.invCode,
-        enabled: true,
+        enable: true,
         vueType: "supInvoice",
       };
       getLocalJoinByUser(query)
diff --git a/src/views/inout/IoDeliverySearchOrder.vue b/src/views/inout/IoDeliverySearchOrder.vue
index 309977f..19469ff 100644
--- a/src/views/inout/IoDeliverySearchOrder.vue
+++ b/src/views/inout/IoDeliverySearchOrder.vue
@@ -3,7 +3,7 @@
     <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="8">
+          <el-col :span="6">
             <el-form-item class="query-form-item" label="送货单号:">
               <el-input v-model="filterQuery.billNo" placeholder="请输入送货单号"
                         style="width: 90%"
@@ -11,17 +11,8 @@
             </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="8">
+          <el-col :span="6">
             <el-form-item class="query-form-item" label="收货仓库:">
               <el-select v-model="filterQuery.invCode" placeholder="请选择收货仓库" clearable="true"
                          style="width: 90%"
@@ -37,9 +28,17 @@
               </el-select>
             </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="8">
+          <el-col :span="6">
             <el-form-item class="query-form-item" label="单据类型:">
               <el-select v-model="filterQuery.action" placeholder="请选择单据类型"
                          style="width: 90%"
@@ -56,8 +55,16 @@
           </el-col>
         </el-row>
         <el-row>
-
-          <el-col :span="8">
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="单据来源:">
+              <el-select v-model="filterQuery.sourceLocalType" placeholder="请选择单据来源" style="width: 90%">
+                <el-option label="全部" value=""></el-option>
+                <el-option label="手工建单" value="1"></el-option>
+                <el-option label="自动建单" value="2"></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.fromCorp"
@@ -92,7 +99,7 @@
           <!--            </el-form-item>-->
           <!--          </el-col>-->
 
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item class="query-form-item" label="创建时间:">
               <el-date-picker
                 :picker-options="pickerOptions"
@@ -109,7 +116,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item class="query-form-item" label="审核时间:">
               <el-date-picker
                 :picker-options="pickerOptions"
@@ -564,6 +571,7 @@ export default {
         startTime: null,
         endTime: null,
         invCode: this.$store.getters.locInvCode,
+        sourceLocalType: "1",
       },
 
       corpLoading: false,
@@ -700,6 +708,7 @@ export default {
         status: null,
         limit: 10,
         startTime: null,
+        sourceLocalType: "1",
         endTime: null,
         invCode: this.$store.getters.locInvCode,
       };
diff --git a/src/views/inout/IoSupSearchOrder.vue b/src/views/inout/IoSupSearchOrder.vue
index 1398649..6cb3c76 100644
--- a/src/views/inout/IoSupSearchOrder.vue
+++ b/src/views/inout/IoSupSearchOrder.vue
@@ -41,7 +41,16 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <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%"
@@ -58,7 +67,16 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="8">
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="单据来源:">
+              <el-select v-model="filterQuery.sourceLocalType" placeholder="请选择单据来源" style="width: 90%">
+                <el-option label="全部" value=""></el-option>
+                <el-option label="手工建单" value="1"></el-option>
+                <el-option label="自动建单" value="2"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item class="query-form-item" label="创建时间:">
               <el-date-picker
                 :picker-options="pickerOptions"
@@ -74,7 +92,7 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item class="query-form-item" label="审核时间:">
               <el-date-picker
                 :picker-options="pickerOptions"
@@ -430,6 +448,7 @@ export default {
         startTime: null,
         endTime: null,
         invCode: this.$store.getters.locInvCode,
+        sourceLocalType: "1",
       },
 
       reviceStatus: {
@@ -561,9 +580,11 @@ export default {
         startTime: null,
         endTime: null,
         invCode: this.$store.getters.locInvCode,
+        sourceLocalType: "1",
+
       };
-      this.actDateRange=[];
-      this.auditDateRange=[];
+      this.actDateRange = [];
+      this.auditDateRange = [];
       this.getList();
     },
     onSubmit() {
@@ -603,7 +624,7 @@ export default {
         });
     },
     handleSelectionChange(val) {
-      this.currentRow.billNo=val.billNo;
+      this.currentRow.billNo = val.billNo;
       this.getOrderDetails();
     },
     // 获取单据 业务详情、扫码详情、扫码明细
diff --git a/src/views/inout/PanelCreateOrderCodes.vue b/src/views/inout/PanelCreateOrderCodes.vue
index 3492962..e304c34 100644
--- a/src/views/inout/PanelCreateOrderCodes.vue
+++ b/src/views/inout/PanelCreateOrderCodes.vue
@@ -246,6 +246,8 @@ export default {
           .then((response) => {
             if (response.code === 20000) {
               this.refreshPanel();
+            } else if (response.code == 506) {
+              this.codeArray.slice(index, 1);
             } else {
               this.$message.error(response.message);
             }
@@ -287,9 +289,10 @@ export default {
         mySupId: row.unitFk,
       };
       updateCodeBindSup(query).then((response) => {
+        debugger
         if (response.code == 20000) {
           this.$message.success("绑定成功");
-          this.orderFormData.id = this.curRow.orderId;
+          // this.orderFormData.id = this.curRow.orderId;
           this.closeBindDialog();
           this.getCodeList();
         } else {
diff --git a/src/views/inventory/InvPreProducts.vue b/src/views/inventory/InvPreProducts.vue
index 3f93b94..10002cb 100644
--- a/src/views/inventory/InvPreProducts.vue
+++ b/src/views/inventory/InvPreProducts.vue
@@ -142,10 +142,10 @@
         <el-table-column label="物资名称" prop="cpmctymc" width="180"></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" width="180" show-overflow-tooltip></el-table-column>
         <el-table-column label="批次号" prop="batchNo" width="120"></el-table-column>
-        <!--        <el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column>-->
-        <!--        <el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>-->
-        <!--        <el-table-column label="入库数量" prop="inCount" width="120"></el-table-column>-->
-        <!--        <el-table-column label="出库数量" prop="outCount" width="120"></el-table-column>-->
+        <el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column>
+        <el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
+        <el-table-column label="入库数量" prop="inCount" width="120"></el-table-column>
+        <el-table-column label="出库数量" prop="outCount" width="120"></el-table-column>
         <el-table-column label="库存数量" prop="reCount" width="120"></el-table-column>
         <el-table-column label="生产企业" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip
                          width="180"></el-table-column>
diff --git a/src/views/inventory/InvSupPreInProducts.vue b/src/views/inventory/InvSupPreInProducts.vue
index e7ffcd9..d4907e6 100644
--- a/src/views/inventory/InvSupPreInProducts.vue
+++ b/src/views/inventory/InvSupPreInProducts.vue
@@ -246,7 +246,7 @@ export default {
 
     getList() {
       this.loading = true;
-      this.filterQuery.supId = this.$store.getters.customerId;
+      // this.filterQuery.supId = this.$store.getters.customerId;
       getInvPreInProduct(this.filterQuery).then((res) => {
         this.loading = false;
         if (res.code === 20000) {
@@ -266,7 +266,7 @@ export default {
     },
     getInvList() {
       let query = {
-        advanceType: true,
+        advanceType: 2,
       };
       getInvListByUser(query)
         .then((response) => {
diff --git a/src/views/inventory/InvSupPreProducts.vue b/src/views/inventory/InvSupPreProducts.vue
index dae6671..65984a3 100644
--- a/src/views/inventory/InvSupPreProducts.vue
+++ b/src/views/inventory/InvSupPreProducts.vue
@@ -266,7 +266,7 @@ export default {
     },
     getInvList() {
       let query = {
-        advanceType: true,
+        advanceType: 3, //获取寄售库1：入账，2：预验收，3：寄售
       };
       getInvListByUser(query)
         .then((response) => {
diff --git a/src/views/inventory/InvSupProuducts.vue b/src/views/inventory/InvSupProuducts.vue
index 3d979ac..9dd109a 100644
--- a/src/views/inventory/InvSupProuducts.vue
+++ b/src/views/inventory/InvSupProuducts.vue
@@ -299,7 +299,6 @@ export default {
     },
     getList() {
       this.loading = true;
-
       getProduct(this.filterQuery).then((res) => {
         this.loading = false;
         if (res.code === 20000) {
@@ -335,9 +334,6 @@ export default {
         page: 1,
         limit: 20
       };
-      if (this.$store.getters.customerId !== 110) {
-        params.name = this.$store.getters.companyName;
-      }
       getBasicUnitMaintains(params).then((res) => {
         this.corpLoading = false;
         this.fromOptions = res.data.list || [];
diff --git a/src/views/inventory/inner/innerCodeDetail.vue b/src/views/inventory/inner/innerCodeDetail.vue
index b0b0ab8..51a311b 100644
--- a/src/views/inventory/inner/innerCodeDetail.vue
+++ b/src/views/inventory/inner/innerCodeDetail.vue
@@ -63,7 +63,7 @@
         <el-table-column
           label="时间"
           width="200"
-          prop="create_time"
+          prop="createTime"
           show-overflow-tooltip
         >
           <template slot-scope="scope">
@@ -273,7 +273,7 @@ export default {
 
     getOrderQRCodeTextList() {
       this.loading = true;
-      filterPrint(this.query) //查找该单号下的所有条码
+      filterPrint({sOrderId :this.query.sOrderId}) //查找该单号下的所有条码
         .then((response) => {
           console.log(response)
           this.codeArray = response.data.list || [];
@@ -288,17 +288,19 @@ export default {
     },
     printStockOrderDetailPDF(row) {
       let tQuery = {
-        id: 1
+        queryId: null,
+        orderId: null,
+        countList: [],
+        labelId:1
       };
-      // if (row == null) {
-      //   tQuery.orderId = this.formData.id;
-      // } else {
+      if (row == null) {
+        tQuery.orderId = this.query.orderIdFk;
+      } else {
         if (row.reCount <= 0) {
           return this.$message.error('数量错误');
         }
         tQuery.queryId = row.id;
-      // }
-
+      }
       this.loading = true;
       inspectionStockQRCodeTextPDFFromTemplateFile(tQuery).then((response) => {
         if (response.code === 20000) {
@@ -356,6 +358,7 @@ export default {
               );
               this.loading = false;
               window.open(url);//打开新标签页，预览pdf。
+              this.getOrderQRCodeTextList();
             }).catch(() => {
               this.loading = false;
             });
@@ -375,7 +378,7 @@ export default {
         type: "warning",
       }).then(() => {
         this.loading = true;
-        generateInnerQRCodeText({orderIdFk: this.formData.id})
+        generateInnerQRCodeText({orderIdFk: this.formData.recordKey})
           .then(response => {
             this.loading = false;
             if (response.code === 20000) {
@@ -424,8 +427,9 @@ export default {
     if (this.$isNotBlank(this.inQuery.id)) {
       this.formData = this.inQuery.formData;
       this.query.orderId = this.inQuery.id;
-      this.query.orderIdFk = this.formData.id;
+      this.query.orderIdFk = this.formData.recordKey;
       this.query.sOrderId = this.inQuery.id;
+      console.log(this.query)
       this.getOrderQRCodeTextList();
     }
   },
diff --git a/src/views/inventory/inner/innerOrder.vue b/src/views/inventory/inner/innerOrder.vue
index e080ee3..b89ef05 100644
--- a/src/views/inventory/inner/innerOrder.vue
+++ b/src/views/inventory/inner/innerOrder.vue
@@ -41,19 +41,19 @@
             <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="创建人" prop="createUser"></el-table-column>
+        <el-table-column label="创建人" prop="createByName"></el-table-column>
         <el-table-column label="备注说明" prop="remark"></el-table-column>
         <el-table-column label="打印状态" prop="printStatus">
           <template slot-scope="scope">
-            <el-tag :type="(scope.row.status) | statusFilterType">
-              {{ statusPrintMap[scope.row.status] }}
+            <el-tag :type="(scope.row.genStatus) | statusFilterType">
+              {{ statusPrintMap[scope.row.genStatus] }}
             </el-tag>
           </template>
         </el-table-column>
 
         <el-table-column label="操作">
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click.native="newDistributionForm(scope.$index, scope.row)">编辑
+            <el-button type="text" size="small" @click.native.stop="newDistributionForm(scope.$index, scope.row)">编辑
             </el-button>
             <el-button type="text" size="small" @click.native="printQRCodeText(scope.row)">打印</el-button>
             <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)">删除</el-button>
@@ -239,7 +239,7 @@ export default {
         });
     },
     handleDetail(row) {
-      let query = {orderIdFk: row.id};
+      let query = {orderIdFk: row.recordKey};
       this.loading = true;
       listInnerOrderDetail(query) //查找该单号下的所有条码
         .then((response) => {
diff --git a/src/views/inventory/inner/innerOrderEditDialog.vue b/src/views/inventory/inner/innerOrderEditDialog.vue
index d1fa892..7eb7493 100644
--- a/src/views/inventory/inner/innerOrderEditDialog.vue
+++ b/src/views/inventory/inner/innerOrderEditDialog.vue
@@ -108,6 +108,7 @@
                 :closeDialog="closeDialogC2"
                 :data="thisData"
                 :pId="pId"
+                :billNo="billNo"
                 :filterType="2"
             ></stockOrderNewSelectProduct>
         </el-dialog>
@@ -123,6 +124,11 @@
         :append-to-body='true'
       >
         <stockOrder
+          :closeDialog="closeDialogC2"
+          :data="thisData"
+          :pId="pId"
+          :billNo="billNo"
+          :filterType="2"
         ></stockOrder>
       </el-dialog>
     </div>
@@ -131,7 +137,7 @@
 <script>
 import draggable from "vuedraggable";
 import stockOrderNewSelectProduct from "@/views/inventory/inner/innerOrderSelectProduct";
-import stockOrder from "@/views/basic/business/stockOrder";
+import stockOrder from "@/views/basic/business/stockOrderPrint";
 import {
   inserThrOrderWeb,
   delInnerOrderDetail,
@@ -173,6 +179,7 @@ export default {
             codeArray: [],
             total: 0,
             pId:null,
+            billNo:null,
             loading: false,
             index: null,
             formLoading: false,
@@ -278,15 +285,39 @@ export default {
           this.selectedIndex = "";
         },
       stockOrderList(){
+          debugger
+        if(this.query.id==null) {
+          inserThrOrderWeb({innerOrderEntity: this.formData,editStatus:1})
+            .then(response => {
+              this.loading = false;
+              if (response.code === 20000) {
+                this.pId=response.data.id;
+                this.billNo=response.data.recordKey;
+                this.formData.billNo=response.data.recordKey;
+                this.formData.recordKey=response.data.recordKey;
+                this.formData.id=this.pId
+              } else {
+
+              }
+            })
+            .catch(() => {
+              this.loading = false;
+            })
+        }
+
         this.haveDistributionVisible = true;
       },
         selectProductFunction() {
+          debugger
           if(this.query.id==null) {
             inserThrOrderWeb({innerOrderEntity: this.formData,editStatus:1})
               .then(response => {
                 this.loading = false;
                 if (response.code === 20000) {
-                  this.pId=response.data;
+                  this.pId=response.data.id;
+                  this.billNo=response.data.recordKey;
+                  this.formData.billNo=response.data.recordKey;
+                  this.formData.recordKey=response.data.recordKey;
                   this.formData.id=this.pId
                 } else {
 
@@ -301,6 +332,7 @@ export default {
         },
         closeDialogC2(rData) {
             this.selectProductVisible = false;
+            this.haveDistributionVisible = false;
             this.getStockOrderDetailList();
         },
         rowChange(val) {
@@ -366,7 +398,7 @@ export default {
         },
         getStockOrderDetailList() {
             this.loading = true;
-            listInnerOrderDetail({orderIdFk:this.formData.id}) //查找该单号下的所有条码
+            listInnerOrderDetail({orderIdFk:this.formData.billNo}) //查找该单号下的所有条码
                 .then((response) => {
                     this.codeArray = response.data.list || [];
                     this.total = response.data.total || 0;
diff --git a/src/views/inventory/inner/innerOrderSelectProduct.vue b/src/views/inventory/inner/innerOrderSelectProduct.vue
index f62db9e..7889a78 100644
--- a/src/views/inventory/inner/innerOrderSelectProduct.vue
+++ b/src/views/inventory/inner/innerOrderSelectProduct.vue
@@ -148,6 +148,10 @@ export default {
       type: Object,
       required: true,
     },
+    billNo: {
+      type: Object,
+      required: true,
+    },
   },
 
   data() {
@@ -335,7 +339,7 @@ export default {
         productId: this.multipleSelection.rlId,
         productName: this.multipleSelection.cpmctymc,
         count: 1,
-        orderIdFk: this.pId,
+        orderIdFk: this.billNo,
         supId: this.multipleSelection.customerId,
         zczbhhzbapzbh: this.multipleSelection.zczbhhzbapzbh
       };
@@ -370,7 +374,6 @@ export default {
   components: {udiRlDetailDialog},
 
   created() {
-    console.log(this.data)
     if (this.$isNotBlank(this.data)) {
       this.ids = [];
       if (this.data.stockOrderLists.length > 0) {
diff --git a/src/views/inventory/supInoutSearchOrder.vue b/src/views/inventory/supInoutSearchOrder.vue
index 4f49e85..3f45e71 100644
--- a/src/views/inventory/supInoutSearchOrder.vue
+++ b/src/views/inventory/supInoutSearchOrder.vue
@@ -190,6 +190,7 @@ export default {
         limit: 10,
         startAduditTime: null,
         endAduditTime: null,
+        actionType: "norDetail",
       };
       this.actDateRange = [];
       this.getList();
diff --git a/src/views/myLogin.vue b/src/views/myLogin.vue
index 61a94b7..4496eea 100644
--- a/src/views/myLogin.vue
+++ b/src/views/myLogin.vue
@@ -17,31 +17,59 @@
       label-position="left"
     >
       <el-card class="box-card">
-        <div style="text-align: center; margin-top: 10px;margin-bottom: 15px">
-          <img alt="element-logo" src="@/assets/logo/logo.png"/>
+        <div style="text-align: center; margin-top: 10px; margin-bottom: 15px">
+          <img alt="element-logo" src="@/assets/logo/logo.png" />
         </div>
         <h3 class="title">用户登录</h3>
         <el-form-item prop="username" class="item" style="margin-top: -20px">
-          <el-input prefix-icon="el-icon-user" placeholder="账号" name="username" autocomplete="on" v-model="loginForm.username">
+          <el-input
+            prefix-icon="el-icon-user"
+            placeholder="账号"
+            name="username"
+            autocomplete="on"
+            v-model="loginForm.username"
+          >
             <i slot="prefix" class="el-input__icon">
-              <icon-svg icon-class="user"/>
+              <icon-svg icon-class="user" />
             </i>
           </el-input>
         </el-form-item>
         <el-form-item prop="password" class="item">
-          <el-input prefix-icon="el-icon-s-goods" placeholder="密码" name="password" :type="isShowPwd ? 'text' : 'password'" @keyup.enter.native="handleLogin"
-                    v-model="loginForm.password" autocomplete="on">
+          <el-input
+            prefix-icon="el-icon-s-goods"
+            placeholder="密码"
+            name="password"
+            :type="isShowPwd ? 'text' : 'password'"
+            @keyup.enter.native="handleLogin"
+            v-model="loginForm.password"
+            autocomplete="on"
+          >
             <i slot="prefix" class="el-input__icon">
-              <icon-svg icon-class="pwd"/>
+              <icon-svg icon-class="pwd" />
             </i>
-            <i slot="suffix" class="el-input__icon" @click="isShowPwd = !isShowPwd">
-              <icon-svg icon-class="eye"/>
+            <i
+              slot="suffix"
+              class="el-input__icon"
+              @click="isShowPwd = !isShowPwd"
+            >
+              <icon-svg icon-class="eye" />
             </i>
           </el-input>
         </el-form-item>
-        <el-form-item prop="verificationCode" class="item" style="background-color: white">
-          <Verify ref="checkV" :showButton="false" :barSize="{width:'305px',height:'37px'}" :vOffset="5"
-                  @success="verifyAlert('success')" @error="verifyAlert('error')" :type="3"></Verify>
+        <el-form-item
+          prop="verificationCode"
+          class="item"
+          style="background-color: white"
+        >
+          <Verify
+            ref="checkV"
+            :showButton="false"
+            :barSize="{ width: '305px', height: '37px' }"
+            :vOffset="5"
+            @success="verifyAlert('success')"
+            @error="verifyAlert('error')"
+            :type="3"
+          ></Verify>
         </el-form-item>
         <div style="text-align: center; margin-top: 15px">
           <el-button
@@ -49,49 +77,48 @@
             style="width: 60%; margin-bottom: 30px"
             :loading="loading"
             @click.native="handleLogin()"
-          >登录
+            >登录
           </el-button>
         </div>
         <div style="margin-top: -15px">
           <a style="margin-left: 50%; font-size: 12px" :href="'#/register'"
-          >新用户注册</a
+            >新用户注册</a
           >
           <a style="margin-left: 5%; font-size: 12px" :href="'#/forgetPasswd'"
-          >忘记密码</a
+            >忘记密码</a
           >
         </div>
-
       </el-card>
     </el-form>
 
-    <div style="
-          position: absolute;
-          bottom: 0;
-          margin-left: 36%;
-          font-size: 18px;
-          color: white;
-        ">
-
+    <div
+      style="
+        position: absolute;
+        bottom: 0;
+        margin-left: 36%;
+        font-size: 18px;
+        color: white;
+      "
+    >
       <a href="http://www.xmglxp.com/" target="_blank">
         软件名称: 医院UDI管理系统
       </a>
-      <a href="http://www.xmglxp.com/" target="_blank" style="margin-left: 20px; font-size: 12px">
-       开发单位：厦门高立新鹏软件科技有限公司 技术支持：400-990-9112
+      <a
+        href="http://www.xmglxp.com/"
+        target="_blank"
+        style="margin-left: 20px; font-size: 12px"
+      >
+        开发单位：厦门高立新鹏软件科技有限公司 技术支持：400-990-9112
       </a>
     </div>
-
-
-
-
-
   </div>
 </template>
 
 <script>
-import Verify from 'vue2-verify'
+import Verify from "vue2-verify";
 import axios from "axios";
 import Cookies from "js-cookie";
-import {decrypt, encrypt} from "@/utils/jsencrypt";
+import { decrypt, encrypt } from "@/utils/jsencrypt";
 
 export default {
   data() {
@@ -107,7 +134,7 @@ export default {
         userName: "",
         pwd: "",
         checked: true,
-        verificationCode: false
+        verificationCode: false,
       },
       loginForm: {
         username: "",
@@ -115,13 +142,13 @@ export default {
         rememberMe: false,
         verificationCode: false,
         code: "",
-        uuid: ""
+        uuid: "",
       },
       rules: {
         userName: [
-          {required: true, message: "请输入登录名", trigger: "blur"},
+          { required: true, message: "请输入登录名", trigger: "blur" },
         ],
-        pwd: [{validator: validatePwd, trigger: "blur"}],
+        pwd: [{ validator: validatePwd, trigger: "blur" }],
       },
       isShowPwd: false, // 是否显示密码
       loading: false, // 登录loading
@@ -132,9 +159,9 @@ export default {
   },
   methods: {
     verifyAlert(text) {
-      if (text === 'success') {
+      if (text === "success") {
         this.loginForm.verificationCode = true;
-      }else{
+      } else {
         this.loginForm.verificationCode = false;
       }
     },
@@ -183,47 +210,53 @@ export default {
     //   });
     // },
 
-
     getCookie() {
       const username = Cookies.get("username");
       const password = Cookies.get("password");
       // const rememberMe = Cookies.get('rememberMe')
       this.loginForm = {
         username: username === undefined ? this.loginForm.username : username,
-        password: password === undefined ? this.loginForm.password : decrypt(password),
+        password:
+          password === undefined ? this.loginForm.password : decrypt(password),
         // rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
       };
     },
     handleLogin() {
-      this.$refs.ruleForm.validate(valid => {
+      this.$refs.ruleForm.validate((valid) => {
         if (valid) {
           this.loading = true;
           if (this.loginForm.rememberMe) {
-            Cookies.set("username", this.loginForm.username, {expires: 30});
-            Cookies.set("password", encrypt(this.loginForm.password), {expires: 30});
+            Cookies.set("username", this.loginForm.username, { expires: 30 });
+            Cookies.set("password", encrypt(this.loginForm.password), {
+              expires: 30,
+            });
             // Cookies.set('rememberMe', this.loginForm.rememberMe, {expires: 30});
           } else {
             Cookies.remove("username");
             Cookies.remove("password");
             // Cookies.remove('rememberMe');
           }
-          this.$store.dispatch("Login", this.loginForm).then((res) => {
-            this.$router.push({path: this.redirect || "/"}).catch((res) => {
+          this.$store
+            .dispatch("Login", this.loginForm)
+            .then((res) => {
+              this.$router
+                .push({ path: this.redirect || "/" })
+                .catch((res) => {});
+            })
+            .catch((res) => {
+              this.loading = false;
+              this.$refs.checkV.refresh();
+              this.$message.error(res);
+              if (this.captchaEnabled) {
+                this.getCode();
+              }
             });
-          }).catch((res) => {
-            this.loading = false;
-            this.$refs.checkV.refresh();
-            this.$message.error(res);
-            if (this.captchaEnabled) {
-              this.getCode();
-            }
-          });
         }
       });
-    }
+    },
   },
   components: {
-    Verify
+    Verify,
   },
   created() {
     // 将参数拷贝进查询对象
@@ -233,12 +266,12 @@ export default {
       this.redirect = decodeURIComponent(query.redirect);
     }
 
-    axios.get("./config.json").then(res => {
+    axios.get("./config.json").then((res) => {
       this.hospName = res.data.hosp_name;
     });
 
     this.getCookie();
-  }
+  },
 };
 </script>
 
@@ -249,16 +282,18 @@ $bg: #2d3a4b;
 $dark_gray: #889aa4;
 $light_gray: #eee;
 .login-container {
-
   @include relative;
   background-color: white;
   background-image: url("../assets/login.jpg");
   background-size: 100vw 100vh;
   height: 100%;
 
-  input:-webkit-autofill {
-    -webkit-box-shadow: 0 0 0 1000px #293444 inset !important;
-    -webkit-text-fill-color: #fff !important;
+  input:-webkit-autofill,
+  input:-webkit-autofill:hover,
+  input:-webkit-autofill:focus,
+  input:-webkit-autofill:active {
+    -webkit-transition-delay: 99999s;
+    -webkit-transition: color 99999s ease-out, background-color 99999s ease-out;
   }
 
   .item {
@@ -311,11 +346,10 @@ $light_gray: #eee;
     margin-bottom: 50px;
   }
 
-
   .toptitle {
     position: absolute;
     font-size: 45px;
-    color: #FFFFFF;
+    color: #ffffff;
     margin: 120px auto 0.5333rem 180px;
     text-align: center;
     font-weight: bold;
diff --git a/src/views/register.vue b/src/views/register.vue
index 6fc2433..6171533 100644
--- a/src/views/register.vue
+++ b/src/views/register.vue
@@ -5,7 +5,7 @@
       style="
         width: 60%;
         margin-top: 35px;
-        margin-left:20%;
+        margin-left: 20%;
         margin-bottom: 35px;
         text-align: center;
       "
@@ -24,7 +24,7 @@
         :model="inputQuery"
         :rules="rules"
         ref="inputQuery"
-        style="margin-left: 20%;"
+        style="margin-left: 20%"
       >
         <el-row :gutter="20">
           <el-col :span="4">
@@ -141,7 +141,6 @@
             </div>
           </el-col>
           <el-col :span="10" v-if="registerConfigMap.companyCheckStatus">
-
             <el-form-item prop="companyName">
               <el-select
                 v-model="inputQuery.companyName"
@@ -166,7 +165,6 @@
                 </el-option>
               </el-select>
             </el-form-item>
-
           </el-col>
 
           <el-col :span="10" v-if="!registerConfigMap.companyCheckStatus">
@@ -193,8 +191,7 @@
         </el-row>
 
         <el-row :gutter="20" v-if="registerConfigMap.udplatCheckStatus">
-          <el-col :span="1">
-          </el-col>
+          <el-col :span="1"> </el-col>
           <el-col :span="10">
             <el-form-item>
               <el-checkbox v-model="udplatEnable">
@@ -210,7 +207,6 @@
             </div>
           </el-col>
           <el-col :span="10">
-
             <el-form-item prop="udplatCompanyName">
               <el-select
                 v-model="inputQuery.udplatCompanyName"
@@ -236,7 +232,6 @@
                 </el-option>
               </el-select>
             </el-form-item>
-
           </el-col>
           <el-col :span="3">
             <!--<el-button-->
@@ -251,7 +246,6 @@
           </el-col>
         </el-row>
 
-
         <!--                <el-row :gutter="20">-->
         <!--                    <el-col :span="4">-->
         <!--                        <div class="register-text">-->
@@ -299,11 +293,12 @@
           </el-col>
           <el-col :span="10">
             <el-form-item prop="bussinessStatus">
-              <el-select :disabled="true"
-                         size="small"
-                         style="width: 100%"
-                         v-model="inputQuery.bussinessStatus"
-                         placeholder="企业类型"
+              <el-select
+                :disabled="true"
+                size="small"
+                style="width: 100%"
+                v-model="inputQuery.bussinessStatus"
+                placeholder="企业类型"
               >
                 <!--                                <el-option label="医院" value="1"></el-option>-->
                 <el-option label="经营企业" value="2"></el-option>
@@ -441,16 +436,15 @@
               icon="search"
               style="margin-top: 20px; width: 200px"
               @click="onSubmit('inputQuery')"
-            >提交
-            </el-button
-            >
+              >提交
+            </el-button>
           </el-form-item>
         </div>
       </el-form>
     </el-card>
     <div style="color: #2d3a4b; text-align: center">
       <a href="http://www.xmglxp.com" style="color: #000000; font-size: 12px"
-      >厦门高立新鹏软件科技有限公司 &nbsp;13459286066</a
+        >厦门高立新鹏软件科技有限公司 &nbsp;13459286066</a
       >
     </div>
     <div style="color: #2d3a4b; text-align: center">
@@ -468,7 +462,6 @@
       </a>
     </div>
 
-
     <el-dialog
       title="注册成功"
       :close-on-click-modal="false"
@@ -482,21 +475,24 @@
         <el-row :gutter="20" class="el-row" type="flex">
           <el-col :span="20" class="el-col" type="flex">
             <div class="text item">
-              <span>您的注册信息已提交，等待审核，请牢记您的账号密码，方便登录系统。</span>
+              <span
+                >您的注册信息已提交，等待审核，请牢记您的账号密码，方便登录系统。</span
+              >
             </div>
           </el-col>
-
         </el-row>
-        <el-row :gutter="20" class="el-row" type="flex" style="margin-top: 20px">
-
+        <el-row
+          :gutter="20"
+          class="el-row"
+          type="flex"
+          style="margin-top: 20px"
+        >
           <el-col :span="10" class="el-col" type="flex">
             <div class="text item">
               <span>{{ this.acoountInfo }}</span>
             </div>
           </el-col>
-          <el-col :span="10" class="el-col" type="flex">
-
-          </el-col>
+          <el-col :span="10" class="el-col" type="flex"> </el-col>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -511,11 +507,13 @@
         <!--                    确定-->
         <!--                </el-button>-->
 
-        <el-button class="tag-read" type="primary" size="mini"
-                   v-clipboard:copy="acoountInfo"
-        >复制
+        <el-button
+          class="tag-read"
+          type="primary"
+          size="mini"
+          v-clipboard:copy="acoountInfo"
+          >复制
         </el-button>
-
       </div>
     </el-dialog>
   </div>
@@ -526,7 +524,9 @@ import { getCheckcode, register } from "@/api/login";
 import {
   getCompany,
   modifyCompany,
-  getRefid, checkCompany, getRegisterConfig,
+  getRefid,
+  checkCompany,
+  getRegisterConfig,
 } from "@/api/system/company";
 import {
   provinceAndCityData,
@@ -536,14 +536,13 @@ import {
   CodeToText,
   TextToCode,
 } from "element-china-area-data";
-import Clipboard from 'clipboard';
-import {BASE_URL} from "@/config/app";
-import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain"
-
-
+import Clipboard from "clipboard";
+import { BASE_URL } from "@/config/app";
+import { getBasicUnitMaintains } from "@/api/basic/basicUnitMaintain";
 
 export default {
   data() {
+    // 确认密码
     let validatePass2 = (rule, value, callback) => {
       if (value === "") {
         callback(new Error("请再次输入密码"));
@@ -553,6 +552,48 @@ export default {
         callback();
       }
     };
+    // 限制输入中文
+    const validateName = (rule, value, callback) => {
+      if (/^[\u4e00-\u9fa5]+$/.test(value) === false) {
+        callback(new Error("请输入中文"));
+      } else {
+        // 校验通过
+        callback();
+      }
+    };
+    //限制输入字母数字
+    const validatePass = (rule, value, callback) => {
+      if (
+        /^(?![0-9]+$)(?![a-zA-Z]+$)[a-zA-Z0-9]{8,20}$/.test(value) === false
+      ) {
+        callback(new Error("密码包含字母和数字且在8-20之间"));
+      } else {
+        // 校验通过
+        callback();
+      }
+    };
+    //输入正确的手机号码格式
+    const validatePhone = (rule, value, callback) => {
+      if (/^1[3-9]\d{9}$/.test(value) === false) {
+        callback(new Error("请输入正确的电话号码"));
+      } else {
+        // 校验通过
+        callback();
+      }
+    };
+    //限制输入正确的邮箱
+    const validateEmail = (rule, value, callback) => {
+      if (
+        /^([a-zA-Z0-9]+[_|_|.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|_|.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/.test(
+          value
+        ) === false
+      ) {
+        callback(new Error("请输入正确的邮箱地址"));
+      } else {
+        // 校验通过
+        callback();
+      }
+    };
     return {
       inputQuery: {
         nickName: null,
@@ -589,42 +630,62 @@ export default {
       acoountInfo: "账号：" + "------" + "\n密码：" + "-----",
       rules: {
         nickName: [
-          {required: true, message: "请输入用户名称", trigger: "blur"},
+          { required: true, message: "请输入用户名称", trigger: "blur" },
+          { min: 2, max: 8, message: "用户名称在2-8个字符", trigger: "blur" },
+        ],
+        password: [
+          { required: true, message: "请输入密码", trigger: "blur" },
+          { validator: validatePass, trigger: "blur" },
         ],
-        password: [{required: true, message: "请输入密码", trigger: "blur"}],
         realName: [
-          {required: true, message: "请输入负责人姓名", trigger: "blur"},
+          { required: true, message: "请输入负责人姓名", trigger: "blur" },
+          { validator: validateName, trigger: "blur" },
         ],
-        tel: [{required: true, message: "请输入联系电话", trigger: "blur"},
+        tel: [
+          { required: true, message: "请输入联系电话", trigger: "blur" },
+          { validator: validatePhone, trigger: "blur" },
           // { pattern:/^((0\d{2,3}-\d{7,8})|(1[3584]\d{9}))$/, message: "请输入正确的电话号码", trigger: "blur" }
         ],
-        mobile: [{required: true, message: "请输入手机号码", trigger: "blur"},
+        mobile: [
+          { required: true, message: "请输入手机号码", trigger: "blur" },
           // { pattern:/^0{0,1}(13[0-9]|15[7-9]|153|156|18[7-9])[0-9]{8}$/, message: "请输入正确的手机号", trigger: "blur" }
+          { validator: validatePhone, trigger: "blur" },
         ],
         confirmPassword: [
-          {required: true, message: "请确认密码", trigger: "blur"},
-          {validator: validatePass2, trigger: "blur"},
+          { required: true, message: "请确认密码", trigger: "blur" },
+          { validator: validatePass2, trigger: "blur" },
         ],
         checkCode: [
-          {required: true, message: "请输入手机验证码", trigger: "blur"},
+          { required: true, message: "请输入手机验证码", trigger: "blur" },
+        ],
+        email: [
+          { required: true, message: "请输入邮箱", trigger: "blur" },
+          {
+            validator: validateEmail,
+            trigger: "blur",
+          },
         ],
-        email: [{required: true, message: "请输入邮箱", trigger: "blur"}],
         companyName: [
-          {required: true, message: "请输入企业名称", trigger: "blur"},
+          { required: true, message: "请输入企业名称", trigger: "blur" },
         ],
         udplatCompanyName: [
-          {required: this.udplatEnable, message: "请输入阳光采购平台企业名称", trigger: "blur"},
+          {
+            required: this.udplatEnable,
+            message: "请输入阳光采购平台企业名称",
+            trigger: "blur",
+          },
         ],
 
         creditNum: [
-          {required: true, message: "请输入统一社会信用号", trigger: "blur"},
+          { required: true, message: "请输入统一社会信用号", trigger: "blur" },
         ],
-        area: [{required: true, message: "请选择所属地区", trigger: "blur"}],
+        area: [{ required: true, message: "请选择所属地区", trigger: "blur" }],
         detailAddr: [
-          {required: true, message: "请输入详细地址", trigger: "blur"},
+          { required: true, message: "请输入详细地址", trigger: "blur" },
+          { mix: 1, max: 30, message: "请输入详细地址", trigger: "blur" },
         ],
         bussinessStatus: [
-          {required: true, message: "请选择企业类型", trigger: "blur"},
+          { required: true, message: "请选择企业类型", trigger: "blur" },
         ],
       },
       registerConfigMap: {
@@ -635,13 +696,16 @@ export default {
       formData: {
         account: "",
         password: "",
-      }
+      },
     };
   },
   created() {
     this.registerConfig();
-    this.uploadUrl = process.env.VUE_APP_BASE_API + "/udiwms/upload/register/file";
-    this.fileUrl = process.env.VUE_APP_BASE_API + "/udiwms/image/register/file/getImage?type=image1&name=";
+    this.uploadUrl =
+      process.env.VUE_APP_BASE_API + "/udiwms/upload/register/file";
+    this.fileUrl =
+      process.env.VUE_APP_BASE_API +
+      "/udiwms/image/register/file/getImage?type=image1&name=";
     // this.getData();
     this.headers = {
       ADMIN_ID: store.getters.adminId,
@@ -656,7 +720,7 @@ export default {
         if (valid) {
           if (this.registerConfigMap.companyCheckStatus) {
             if (this.$isBlank(this.inputQuery.companyName)) {
-              this.$message.error('企业名称不能为空');
+              this.$message.error("企业名称不能为空");
               return;
             }
           }
@@ -673,11 +737,14 @@ export default {
               this.formData = {
                 account: response.data,
                 password: this.inputQuery.password,
-              }
+              };
               this.formVisible = true;
 
-              this.acoountInfo = "账号：" + this.formData.account + "\n密码：" + this.formData.password;
-
+              this.acoountInfo =
+                "账号：" +
+                this.formData.account +
+                "\n密码：" +
+                this.formData.password;
             } else {
               this.$message.error(response.message);
             }
@@ -689,7 +756,7 @@ export default {
     },
     formDefine() {
       this.formVisible = false;
-      this.$router.push({path: "../login"});
+      this.$router.push({ path: "../login" });
     },
     getData() {
       this.loading = true;
@@ -714,7 +781,7 @@ export default {
     },
     checkCompanyName() {
       if (this.$isBlank(this.inputQuery.companyName)) {
-        this.$message.error('企业名称不能为空');
+        this.$message.error("企业名称不能为空");
         return;
       }
       let tQuery = {
@@ -753,40 +820,46 @@ export default {
     },
     handleChange(value) {
       this.inputQuery.area = CodeToText[value[0]];
-      if (CodeToText[value[1]] != null && CodeToText[value[1]] != ""
-        && CodeToText[value[1]] != "undefined") {
+      if (
+        CodeToText[value[1]] != null &&
+        CodeToText[value[1]] != "" &&
+        CodeToText[value[1]] != "undefined"
+      ) {
         this.inputQuery.area += CodeToText[value[1]];
       }
-      if (CodeToText[value[2]] != null && CodeToText[value[2]] != ""
-        && CodeToText[value[2]] != "undefined") {
+      if (
+        CodeToText[value[2]] != null &&
+        CodeToText[value[2]] != "" &&
+        CodeToText[value[2]] != "undefined"
+      ) {
         this.inputQuery.area += CodeToText[value[2]];
       }
       this.inputQuery.areaCode = value.toString();
     },
     copy() {
-
       let sel = this;
-      let clipboard = new Clipboard('.tag-read');
+      let clipboard = new Clipboard(".tag-read");
 
-      clipboard.on('success', e => {
+      clipboard.on("success", (e) => {
         //  释放内存
         clipboard.destroy();
       });
-      clipboard.on('error', e => {
+      clipboard.on("error", (e) => {
         // 不支持复制
         // 释放内存
-        clipboard.destroy()
+        clipboard.destroy();
       });
       this.$confirm("账号已复制，请牢记自己的账号密码！是否跳转登录", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
-      }).then(() => {
-        // this.formVisible = false;
-        // this.$router.push({path: "../login"});
-        sel.formDefine();
-      }).catch(() => {
-      });
+      })
+        .then(() => {
+          // this.formVisible = false;
+          // this.$router.push({path: "../login"});
+          sel.formDefine();
+        })
+        .catch(() => {});
     },
     selectOne(event) {
       this.inputQuery.companyName = event.name;
@@ -802,7 +875,6 @@ export default {
       this.fromOptions = [];
       let cQuery = {
         key: query,
-
       };
       getBasicUnitMaintains(cQuery)
         .then((response) => {
@@ -829,23 +901,29 @@ export default {
           this.loading = false;
         });
     },
-    uploadHandleRemove(file, fileList) {
-    },
-    uploadHandlePreview(file) {
-    },
+    uploadHandleRemove(file, fileList) {},
+    uploadHandlePreview(file) {},
     uploadHandleExceed(files, fileList) {
-      this.$message.warning(`当前限制选择 1 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
+      this.$message.warning(
+        `当前限制选择 1 个文件，本次选择了 ${files.length} 个文件，共选择了 ${
+          files.length + fileList.length
+        } 个文件`
+      );
     },
     uploadOnchange(file, fileList) {
       let fileName = file.name;
-      let uid = file.uid
+      let uid = file.uid;
       let pos = fileName.lastIndexOf(".");
       let lastName = fileName.substring(pos, fileName.length);
-      if (lastName.toLowerCase() !== ".jpg" && lastName.toLowerCase() !== ".png") {
+      if (
+        lastName.toLowerCase() !== ".jpg" &&
+        lastName.toLowerCase() !== ".png"
+      ) {
         this.$message.error("上传文件只能是 .jpg,.png 格式");
-        for (let i = 0; i < fileList.length; i++) {//从list删除
+        for (let i = 0; i < fileList.length; i++) {
+          //从list删除
           if (fileList[i].uid === uid) {
-            fileList.splice(i, 1)
+            fileList.splice(i, 1);
           }
         }
         return;
@@ -856,7 +934,7 @@ export default {
         this.$message.error("上传文件大小不能超过 30MB");
         for (let i = 0; i < fileList.length; i++) {
           if (fileList[i].uid === uid) {
-            fileList.splice(i, 1)
+            fileList.splice(i, 1);
           }
         }
       }
@@ -869,8 +947,7 @@ export default {
         this.$message.error("文件上传失败：" + response.message);
       }
     },
-    uploadHandleError() {
-    },
+    uploadHandleError() {},
     openFile(path) {
       window.open(this.fileUrl + path);
     },
diff --git a/src/views/sync/SysUdimsConfig.vue b/src/views/sync/SysUdimsConfig.vue
index 37a29aa..28d7d8a 100644
--- a/src/views/sync/SysUdimsConfig.vue
+++ b/src/views/sync/SysUdimsConfig.vue
@@ -1,267 +1,696 @@
 <template>
   <el-card>
-
-    <el-descriptions class="margin-top" title="数据同步设置" :column="1" :size="100" border>
-      <template slot="extra">
-        <el-button type="primary" size="small" @click="saveConfig()">保存</el-button>
-      </template>
-      <el-descriptions-item>
-        <template slot="label">
-          同步服务
-        </template>
-        <el-row :gutter="20" class="el-row" type="flex">
-          <el-col :span="6" class="el-col">
-
-            <el-switch
-              v-model="configQuery.downstreamEnable"
-              active-text="是否启用数据同步">
-            </el-switch>
-
-          </el-col>
-          <el-col :span="14" class="el-col">
-            <div>
-              <span style="color: red;">说明:&nbsp;修改同步参数时,请关闭数据同步服务 </span>
-            </div>
-          </el-col>
-        </el-row>
-
-      </el-descriptions-item>
-
-    </el-descriptions>
-    <el-descriptions class="margin-top" title="同步至UDI管理系统基础数据" :column="1" :size="100" style="margin-top: 40px"
-                     border>
-
-
-      <el-descriptions-item>
-        <template slot="label">
-          轮询时间设置
-        </template>
-        <el-row :gutter="20" class="el-row" type="flex">
-
-          <el-col :span="8" class="el-col">
-            <div>
-              <span>数据同步轮询时间(单位:分钟):&nbsp;</span>
-              <el-input
-                style="width: 100px"
+    <el-collapse v-model="activeNames">
+      <!-- 数据同步设置 -->
+      <el-collapse-item title="数据同步设置" name="1">
+        <el-descriptions class="margin-top" :column="1" :size="100" border>
+          <template slot="extra">
+            <el-button type="primary" size="small" @click="saveConfig()"
+              >保存</el-button
+            >
+          </template>
+          <el-descriptions-item>
+            <template slot="label"> 同步服务 </template>
+            <el-row :gutter="20" class="el-row" type="flex">
+              <el-col :span="6" class="el-col">
+                <el-switch
+                  v-model="configQuery.downstreamEnable"
+                  active-text="是否启用数据同步"
+                >
+                </el-switch>
+              </el-col>
+              <el-col :span="14" class="el-col">
+                <div>
+                  <span style="color: red"
+                    >说明:&nbsp;修改同步参数时,请关闭数据同步服务
+                  </span>
+                </div>
+              </el-col>
+            </el-row>
+          </el-descriptions-item>
+
+          <el-descriptions-item>
+            <template slot="label"> 地址设置 </template>
+
+            <el-row :gutter="20" class="el-row" type="flex">
+              <el-col :span="20" class="el-col">
+                <div>
+                  <span>服务地址:&nbsp;</span>
+                  <el-input
+                    style="width: 50%"
+                    size="small"
+                    v-model="configQuery.syncIp"
+                    :disabled="configQuery.downstreamEnable"
+                    splaceholder="请输入内容"
+                  ></el-input>
+                  <el-button
+                    type="primary"
+                    size="small"
+                    @click="testConnect()"
+                    style="margin-left: 20px"
+                    :disabled="configQuery.downstreamEnable"
+                    :loading="testLoading"
+                    >测试连通
+                  </el-button>
+                </div>
+              </el-col>
+            </el-row>
+          </el-descriptions-item>
+        </el-descriptions>
+      </el-collapse-item>
+      <!-- 上传值UDI自助平台基础数据 -->
+      <el-collapse-item title="上传至UDI自助平台基础数据" name="2">
+        <el-descriptions class="margin-top" :column="1" :size="100" border>
+          <!-- 参数设置 -->
+          <el-descriptions-item>
+            <template slot="label"> 参数设置 </template>
+            <el-row :gutter="20" class="el-row" type="flex">
+              <el-col :span="20" class="el-col">
+                <div>
+                  <span>数据上传时间间隔(单位:分钟):&nbsp;</span>
+                  <el-input
+                    style="width: 100px"
+                    size="small"
+                    type="number"
+                    v-model="configQuery.syncTime"
+                    :disabled="configQuery.downstreamEnable"
+                    splaceholder="请输入内容"
+                  ></el-input>
+                  <span style="margin-left: 30px"
+                    >延时上传(单位:分钟):&nbsp;</span
+                  >
+                  <el-input
+                    style="width: 100px"
+                    size="small"
+                    type="number"
+                    v-model="configQuery.delaySyncTime"
+                    :disabled="configQuery.downstreamEnable"
+                    splaceholder="请输入内容"
+                  ></el-input>
+
+                  <span style="margin-left: 30px"
+                    >数据下载时间间隔(单位:分钟):&nbsp;</span
+                  >
+                  <el-input
+                    style="width: 100px"
+                    size="small"
+                    type="number"
+                    v-model="configQuery.syncDownloadTime"
+                    :disabled="configQuery.downstreamEnable"
+                    splaceholder="请输入内容"
+                  ></el-input>
+                </div>
+              </el-col>
+            </el-row>
+          </el-descriptions-item>
+          <!-- 系统设置信息 -->
+          <el-descriptions-item>
+            <template slot="label"> 系统设置信息 </template>
+            <el-form label-positiom="right" label-width="200px" :inline="true">
+              <el-form-item label="系统运行参数">
+                <el-select v-model="configQuery.systemConfig">
+                  <el-option :value="0" label="不同步"></el-option>
+                  <el-option :value="1" label="由内向外"></el-option>
+                  <el-option :value="2" label="由外向内"></el-option>
+                </el-select>
+              </el-form-item>
+
+              <el-form-item label="委托验收">
+                <el-select v-model="configQuery.entrustAction">
+                  <el-option :value="0" label="不同步"></el-option>
+                  <el-option :value="1" label="由内向外"></el-option>
+                  <el-option :value="2" label="由外向内"></el-option>
+                </el-select>
+              </el-form-item>
+
+              <el-form-item label="打印设置">
+                <el-select v-model="configQuery.printConfig">
+                  <el-option :value="0" label="不同步"></el-option>
+                  <el-option :value="1" label="由内向外"></el-option>
+                  <el-option :value="2" label="由外向内"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-form>
+            <el-form label-positiom="right" label-width="200px" :inline="true">
+              <el-form-item label="自动建出入库单设置">
+                <el-select v-model="configQuery.scanChangeConfig">
+                  <el-option :value="0" label="不同步"></el-option>
+                  <el-option :value="1" label="由内向外"></el-option>
+                  <el-option :value="2" label="由外向内"></el-option>
+                </el-select>
+              </el-form-item>
+
+              <el-form-item label="自动建业务单设置">
+                <el-select v-model="configQuery.busChangeConfig">
+                  <el-option :value="0" label="不同步"></el-option>
+                  <el-option :value="1" label="由内向外"></el-option>
+                  <el-option :value="2" label="由外向内"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-form>
+          </el-descriptions-item>
+          <!-- 单据类型 -->
+          <el-descriptions-item>
+            <template slot="label"> 单据类型 </template>
+            <el-form label-positiom="right" label-width="200px" :inline="true">
+              <el-form-item label="业务单据类型">
+                <el-select v-model="configQuery.typeBus">
+                  <el-option :value="0" label="不同步"></el-option>
+                  <el-option :value="1" label="由内向外"></el-option>
+                  <el-option :value="2" label="由外向内"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="扫码单据类型">
+                <el-select v-model="configQuery.typeScan">
+                  <el-option :value="0" label="不同步"></el-option>
+                  <el-option :value="1" label="由内向外"></el-option>
+                  <el-option :value="2" label="由外向内"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="第三方单据类型">
+                <el-select v-model="configQuery.typeThird">
+                  <el-option :value="0" label="不同步"></el-option>
+                  <el-option :value="1" label="由内向外"></el-option>
+                  <el-option :value="2" label="由外向内"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-form>
+          </el-descriptions-item>
+          <!-- 用户信息 -->
+          <el-descriptions-item>
+            <template slot="label"> 用户信息 </template>
+            <el-form label-positiom="right" label-width="200px" :inline="true">
+              <el-form-item label="部门信息">
+                <el-select v-model="configQuery.basicDept">
+                  <el-option :value="0" label="不同步"></el-option>
+                  <el-option :value="1" label="由内向外"></el-option>
+                  <el-option :value="2" label="由外向内"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="仓库字典">
+                <el-select v-model="configQuery.basicInv">
+                  <el-option :value="0" label="不同步"></el-option>
+                  <el-option :value="1" label="由内向外"></el-option>
+                  <el-option :value="2" label="由外向内"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="用户信息">
+                <el-select v-model="configQuery.sysUser">
+                  <el-option :value="0" label="不同步"></el-option>
+                  <el-option :value="1" label="由内向外"></el-option>
+                  <el-option :value="2" label="由外向内"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-form>
+          </el-descriptions-item>
+          <!-- 基础数据 -->
+          <el-descriptions-item>
+            <template slot="label"> 基础数据 </template>
+            <el-form label-positiom="right" label-width="200px" :inline="true">
+              <el-form-item label="耗材字典">
+                <el-select v-model="configQuery.basicProducts">
+                  <el-option :value="0" label="不同步"></el-option>
+                  <el-option :value="1" label="由内向外"></el-option>
+                  <el-option :value="2" label="由外向内"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="往来单位字典">
+                <el-select v-model="configQuery.basicCorp">
+                  <el-option :value="0" label="不同步"></el-option>
+                  <el-option :value="1" label="由内向外"></el-option>
+                  <el-option :value="2" label="由外向内"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="首营资质信息">
+                <el-select v-model="configQuery.supCert">
+                  <el-option :value="0" label="不同步"></el-option>
+                  <el-option :value="1" label="由内向外"></el-option>
+                  <el-option :value="2" label="由外向内"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-form>
+          </el-descriptions-item>
+          <!-- 第三方基础信息 -->
+          <el-descriptions-item>
+            <template slot="label"> 第三方基础信息 </template>
+            <el-form label-positiom="right" label-width="200px" :inline="true">
+              <el-form-item label="第三方产品信息">
+                <el-select v-model="configQuery.basicThirdProducts">
+                  <el-option :value="0" label="不同步"></el-option>
+                  <el-option :value="1" label="由内向外"></el-option>
+                  <el-option :value="2" label="由外向内"></el-option>
+                </el-select>
+              </el-form-item>
+
+              <el-form-item label="第三方往来信息">
+                <el-select v-model="configQuery.basicThirdCorp">
+                  <el-option :value="0" label="不同步"></el-option>
+                  <el-option :value="1" label="由内向外"></el-option>
+                  <el-option :value="2" label="由外向内"></el-option>
+                </el-select>
+              </el-form-item>
+
+              <el-form-item label="第三方仓库信息">
+                <el-select v-model="configQuery.basicThirdInv">
+                  <el-option :value="0" label="不同步"></el-option>
+                  <el-option :value="1" label="由内向外"></el-option>
+                  <el-option :value="2" label="由外向内"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="第三方业务单据">
+                <el-select v-model="configQuery.basicThirdBusOrder">
+                  <el-option :value="0" label="不同步"></el-option>
+                  <el-option :value="1" label="由内向外"></el-option>
+                  <el-option :value="2" label="由外向内"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-form>
+          </el-descriptions-item>
+          <!-- 国家库DI数据 -->
+          <el-descriptions-item>
+            <template slot="label"> 国家库DI数据 </template>
+            <el-form label-positiom="right" label-width="200px" :inline="true">
+              <el-form-item label="DI产品信息">
+                <el-select v-model="configQuery.dbDiProducts">
+                  <el-option :value="0" label="不同步"></el-option>
+                  <el-option :value="1" label="由内向外"></el-option>
+                  <el-option :value="2" label="由外向内"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="医疗器械注册人">
+                <el-select v-model="configQuery.dbDiProducts">
+                  <el-option :value="0" label="不同步"></el-option>
+                  <el-option :value="1" label="由内向外"></el-option>
+                  <el-option :value="2" label="由外向内"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-form>
+            <!-- <el-checkbox v-model="configQuery.dbDiProducts">DI产品信息</el-checkbox>
+        <el-checkbox v-model="configQuery.dbDiProducts"
+          >医疗器械注册人</el-checkbox
+        > -->
+          </el-descriptions-item>
+        </el-descriptions>
+      </el-collapse-item>
+
+      <!--UDI自助平台同步至UDI管理系统扫码单据  -->
+      <el-collapse-item title="UDI自助平台同步至UDI管理系统扫码单据" name="3">
+        <el-descriptions
+          class="margin-top"
+          :column="1"
+          :size="100"
+          style="margin-top: 40px"
+          border
+        >
+          <el-descriptions-item>
+            <template slot="label"> 参数设置 </template>
+
+            <el-row :gutter="20" class="el-row" type="flex">
+              <el-col :span="20" class="el-col">
+                <div>
+                  <span>单据上传时间间隔(单位:分钟):&nbsp;</span>
+                  <el-input
+                    style="width: 100px"
+                    size="small"
+                    type="number"
+                    v-model="configQuery.orderToInSyncTime"
+                    :disabled="configQuery.downstreamEnable"
+                    splaceholder="请输入内容"
+                  ></el-input>
+                </div>
+              </el-col>
+            </el-row>
+          </el-descriptions-item>
+
+          <el-descriptions-item
+            label="单据(单据类型)"
+            label-style="width: 150px"
+          >
+            <div style="float: right; margin-bottom: 10px; margin-right: 25px">
+              <el-button
+                type="primary"
                 size="small"
-                type="number"
-                v-model="configQuery.syncTime" :disabled="configQuery.downstreamEnable"
-                splaceholder="请输入内容"
-              ></el-input>
+                :disabled="configQuery.downstreamEnable"
+                @click="addToInBusTypeDialog()"
+                >添加扫码单据类型
+              </el-button>
             </div>
-          </el-col>
-          <el-col :span="10" class="el-col">
-            <div>
-              <span>延迟执行(单位:分钟):&nbsp;</span>
-              <el-input
+            <el-table :data="checkedToInBusTypes" border style="width: 100%">
+              <el-table-column label="序号" type="index"></el-table-column>
+              <el-table-column
+                label="单据类型"
+                prop="name"
+                show-overflow-tooltip
+              ></el-table-column>
+              <el-table-column
+                label="单据类型代码"
+                prop="action"
+                show-overflow-tooltip
+              ></el-table-column>
+              <el-table-column width="250" label="单据状态">
+                <template slot-scope="scope">
+                  <el-select
+                    v-model="scope.row.orderStatus"
+                    placeholder="请选择单据状态"
+                  >
+                    <el-option label="待校验" :value="3">待校验</el-option>
+                    <el-option label="待核对" :value="5">待核对</el-option>
+                    <el-option label="待审核" :value="10">待审核</el-option>
+                    <el-option label="已审核" :value="7">已审核</el-option>
+                  </el-select>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" fixed="right">
+                <template slot-scope="scope">
+                  <el-button
+                    type="text"
+                    size="small"
+                    :disabled="configQuery.downstreamEnable"
+                    @click.native="removeToInBus(scope.$index, scope.row)"
+                    >移除
+                  </el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-descriptions-item>
+        </el-descriptions>
+      </el-collapse-item>
+      <!-- UDI管理系统同步至UDI自助平台扫码单据 -->
+      <el-collapse-item title="UDI管理系统同步至UDI自助平台扫码单据" name="4">
+        <el-descriptions
+          class="margin-top"
+          :column="1"
+          :size="100"
+          style="margin-top: 40px"
+          border
+        >
+          <el-descriptions-item>
+            <template slot="label"> 参数设置 </template>
+
+            <el-row :gutter="20" class="el-row" type="flex">
+              <el-col :span="20" class="el-col">
+                <div>
+                  <span>单据上传时间间隔(单位:分钟):&nbsp;</span>
+                  <el-input
+                    style="width: 100px"
+                    size="small"
+                    type="number"
+                    v-model="configQuery.orderSyncTime"
+                    :disabled="configQuery.downstreamEnable"
+                    splaceholder="请输入内容"
+                  ></el-input>
+
+                  <span style="margin-left: 30px"
+                    >单据下载时间间隔(单位:分钟):&nbsp;</span
+                  >
+                  <el-input
+                    style="width: 100px"
+                    size="small"
+                    type="number"
+                    v-model="configQuery.orderSyncDlTime"
+                    :disabled="configQuery.downstreamEnable"
+                    splaceholder="请输入内容"
+                  ></el-input>
+                </div>
+              </el-col>
+            </el-row>
+          </el-descriptions-item>
+
+          <el-descriptions-item
+            label="单据(单据类型)"
+            label-style="width: 150px"
+          >
+            <div style="float: right; margin-bottom: 10px; margin-right: 25px">
+              <el-button
+                type="primary"
+                size="small"
                 :disabled="configQuery.downstreamEnable"
-                style="width: 40%;"
-                v-model="configQuery.delaySyncTime"
-              >
-              </el-input>
+                @click="addBusTypeDialog()"
+                >添加扫码单据类型
+              </el-button>
             </div>
-          </el-col>
-        </el-row>
-      </el-descriptions-item>
-
-<!--      <el-descriptions-item>-->
-<!--        <template slot="label">-->
-<!--          运行参数-->
-<!--        </template>-->
-<!--        <el-checkbox v-model="configQuery.entrustAction" :disabled="configQuery.downstreamEnable">委托验收-->
-<!--        </el-checkbox>-->
-<!--      </el-descriptions-item>-->
-
-<!--      <el-descriptions-item>-->
-      <!--        <template slot="label">-->
-      <!--          单据类型-->
-      <!--        </template>-->
-      <!--        <el-checkbox v-model="configQuery.typeBus" :disabled="configQuery.downstreamEnable">业务单据类型</el-checkbox>-->
-      <!--        <el-checkbox v-model="configQuery.typeScan" :disabled="configQuery.downstreamEnable">扫码单据类型-->
-      <!--        </el-checkbox>-->
-      <!--        <el-checkbox v-model="configQuery.typeThird" :disabled="configQuery.downstreamEnable">第三方单据类型-->
-      <!--        </el-checkbox>-->
-      <!--      </el-descriptions-item>-->
-      <el-descriptions-item>
-        <template slot="label">
-          基础信息
-        </template>
-<!--        <el-checkbox v-model="configQuery.sysUser" :disabled="configQuery.downstreamEnable">用户信息</el-checkbox>-->
-        <el-checkbox v-model="configQuery.basicType" :disabled="configQuery.downstreamEnable">物资分类
-        </el-checkbox>
-        <el-checkbox v-model="configQuery.basicProducts" :disabled="configQuery.downstreamEnable">物资字典
-        </el-checkbox>
-
-        <el-checkbox v-model="configQuery.basicCorp" :disabled="configQuery.downstreamEnable">往来单位字典
-        </el-checkbox>
-<!--        <el-checkbox v-model="configQuery.basicDept" :disabled="configQuery.downstreamEnable">部门信息</el-checkbox>-->
-        <!--        <el-checkbox v-model="configQuery.basicInv" :disabled="configQuery.downstreamEnable">仓库信息</el-checkbox>-->
-      </el-descriptions-item>
-<!--      <el-descriptions-item>-->
-<!--        <template slot="label">-->
-<!--          第三方基础信息-->
-<!--        </template>-->
-<!--        <el-checkbox v-model="configQuery.basicThirdProducts" :disabled="configQuery.downstreamEnable">第三方产品信息-->
-<!--        </el-checkbox>-->
-<!--        <el-checkbox v-model="configQuery.basicThirdCorp" :disabled="configQuery.downstreamEnable">第三方往来信息-->
-<!--        </el-checkbox>-->
-<!--        <el-checkbox v-model="configQuery.basicThirdInv" :disabled="configQuery.downstreamEnable">第三方仓库信息-->
-<!--        </el-checkbox>-->
-<!--        <el-checkbox v-model="configQuery.basicThirdBusOrder" :disabled="configQuery.downstreamEnable">第三方业务单据-->
-<!--        </el-checkbox>-->
-<!--      </el-descriptions-item>-->
-
-      <el-descriptions-item>
-        <template slot="label">
-          国家库DI数据
-        </template>
-        <el-checkbox v-model="configQuery.dbDiProducts" :disabled="configQuery.downstreamEnable">DI产品信息
-        </el-checkbox>
-      </el-descriptions-item>
-
-
-      <el-descriptions-item>
-        <template slot="label">
-          首营资质证书
-        </template>
-        <el-checkbox v-model="configQuery.companyCert" :disabled="configQuery.downstreamEnable">配送企业
-        </el-checkbox>
-        <el-checkbox v-model="configQuery.manufacturerCert" :disabled="configQuery.downstreamEnable">生产企业
-        </el-checkbox>
-        <el-checkbox v-model="configQuery.productCert" :disabled="configQuery.downstreamEnable">配送产品
-        </el-checkbox>
-      </el-descriptions-item>
-    </el-descriptions>
-
-    <el-descriptions class="margin-top" title="同步至UDI管理系统单据" :column="1" :size="100" style="margin-top: 30px"
-                     border>
-
-      <el-descriptions-item>
-        <template slot="label">
-          轮询时间设置
-        </template>
-        <el-row :gutter="20" class="el-row" type="flex">
-
-          <el-col :span="8" class="el-col">
-            <div>
-              <span>数据同步轮询时间(单位:分钟):&nbsp;</span>
-              <el-input
-                style="width: 100px"
+            <el-table :data="checkedBusTypes" border style="width: 100%">
+              <el-table-column label="序号" type="index"></el-table-column>
+              <el-table-column
+                label="单据类型"
+                prop="name"
+                show-overflow-tooltip
+              ></el-table-column>
+              <el-table-column
+                label="单据类型代码"
+                prop="action"
+                show-overflow-tooltip
+              ></el-table-column>
+              <el-table-column width="250" label="单据状态">
+                <template slot-scope="scope">
+                  <el-select
+                    v-model="scope.row.orderStatus"
+                    placeholder="请选择单据状态"
+                  >
+                    <el-option label="待校验" :value="3">待校验</el-option>
+                    <el-option label="待核对" :value="5">待核对</el-option>
+                    <el-option label="待审核" :value="10">待审核</el-option>
+                    <el-option label="已审核" :value="7">已审核</el-option>
+                  </el-select>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" fixed="right">
+                <template slot-scope="scope">
+                  <el-button
+                    type="text"
+                    size="small"
+                    :disabled="configQuery.downstreamEnable"
+                    @click.native="remveBus(scope.$index, scope.row)"
+                    >移除
+                  </el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-descriptions-item>
+        </el-descriptions>
+      </el-collapse-item>
+      <!-- UDI管理系统同步至UDI自助平台业务单据  -->
+      <el-collapse-item title="UDI管理系统同步至UDI自助平台业务单据" name="5">
+        <el-descriptions
+          class="margin-top"
+          :column="1"
+          :size="100"
+          style="margin-top: 40px"
+          border
+        >
+          <el-descriptions-item
+            label="单据(单据类型)"
+            label-style="width: 150px"
+          >
+            <div style="float: right; margin-bottom: 10px; margin-right: 25px">
+              <el-button
+                type="primary"
                 size="small"
-                type="number"
-                v-model="configQuery.orderSyncTime" :disabled="configQuery.downstreamEnable"
-                splaceholder="请输入内容"
-              ></el-input>
+                :disabled="configQuery.downstreamEnable"
+                @click="addChangeBusTypeDialog()"
+                >添加业务单据类型
+              </el-button>
             </div>
-          </el-col>
-          <!--                    <el-col :span="8" class="el-col">-->
-          <!--                        <div>-->
-          <!--                            <span>开始时间:&nbsp;</span>-->
-          <!--                            <el-time-picker-->
-          <!--                                :disabled="configQuery.downstreamEnable"-->
-          <!--                                v-model="configQuery.orderSyncStart"-->
-          <!--                                placeholder="开始时间">-->
-          <!--                            </el-time-picker>-->
-          <!--                        </div>-->
-          <!--                    </el-col>-->
-        </el-row>
-
-      </el-descriptions-item>
-
-      <el-descriptions-item label="单据(单据类型)" label-style="width: 150px">
-
-        <div style="float: right;margin-bottom: 10px;margin-right: 25px">
-          <el-button type="primary" size="small" @click="addBusTypeDialog()"
-                     :disabled="configQuery.downstreamEnable">添加扫码单据类型
-          </el-button>
+            <el-table :data="checkedChangeBusTypes" border style="width: 100%">
+              <el-table-column label="序号" type="index"></el-table-column>
+              <el-table-column
+                label="单据类型"
+                prop="name"
+                show-overflow-tooltip
+              ></el-table-column>
+              <el-table-column
+                label="单据类型代码"
+                prop="action"
+                show-overflow-tooltip
+              ></el-table-column>
+              <el-table-column width="250" label="单据状态">
+                <template slot-scope="scope">
+                  <el-select
+                    v-model="scope.row.orderStatus"
+                    placeholder="请选择单据状态"
+                  >
+                    <el-option label="待校验" :value="1">草稿</el-option>
+                    <el-option label="待核对" :value="2">未审核</el-option>
+                    <el-option label="待审核" :value="3">已审核</el-option>
+                  </el-select>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" fixed="right">
+                <template slot-scope="scope">
+                  <el-button
+                    type="text"
+                    size="small"
+                    :disabled="configQuery.downstreamEnable"
+                    @click.native="removeChangeBus(scope.$index, scope.row)"
+                    >移除
+                  </el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-descriptions-item>
+        </el-descriptions>
+      </el-collapse-item>
+      <el-dialog
+        title="添加扫码单据类型"
+        :visible.sync="addBusToInDialogVisible"
+        width="55%"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        v-if="addBusToInDialogVisible"
+      >
+        <div style="float: right; margin-bottom: 10px; margin-right: 25px">
+          <el-button type="primary" size="small" @click="addToInBusType()"
+            >选入</el-button
+          >
         </div>
-        <el-table :data="checkedBusTypes" border style="width: 100%">
+        <el-table
+          :data="busTypes"
+          border
+          style="width: 100%"
+          @selection-change="handleToInCheckedChange"
+        >
+          <el-table-column
+            type="selection"
+            width="55"
+            :selectable="checkSelectable"
+          ></el-table-column>
           <el-table-column label="序号" type="index"></el-table-column>
-          <el-table-column label="单据类型" prop="name" show-overflow-tooltip></el-table-column>
-          <el-table-column label="单据类型代码" prop="action" show-overflow-tooltip></el-table-column>
-          <el-table-column width="250" label="单据状态">
-            <template slot-scope="scope">
-              <el-select v-model="scope.row.orderStatus" placeholder="请选择单据状态">
-                <el-option label="待校验" :value=3>待校验</el-option>
-                <el-option label="待核对" :value=5>待核对</el-option>
-                <el-option label="待审核" :value=10>待审核</el-option>
-                <el-option label="已审核" :value=7>已审核</el-option>
-              </el-select>
-            </template>
-          </el-table-column>
-          <el-table-column label="操作" fixed="right">
-            <template slot-scope="scope">
-              <el-button type="text" size="small" :disabled="configQuery.downstreamEnable"
-                         @click.native="remveBus(scope.$index, scope.row)">移除
-              </el-button>
-            </template>
-          </el-table-column>
+          <el-table-column
+            label="单据类型"
+            prop="name"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="单据类型代码"
+            prop="action"
+            show-overflow-tooltip
+          ></el-table-column>
         </el-table>
 
-      </el-descriptions-item>
-
-    </el-descriptions>
-
-    <el-dialog
-      title="添加扫码单据类型"
-      :visible.sync="addBusDialogVisible"
-      width="55%"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      v-if="addBusDialogVisible"
-    >
-
-      <div style="float: right;margin-bottom: 10px;margin-right: 25px">
-        <el-button type="primary" size="small" @click="addBusType()">选入</el-button>
-      </div>
-      <el-table
-        :data="busTypes"
-        border
-        style="width: 100%"
-        @selection-change="handleCheckedChange"
+        <el-pagination
+          :page-size="busQuery.limit"
+          @current-change="handleCurrentChange"
+          layout="prev, pager, next"
+          :total="total"
+          :current-page="busQuery.page"
+        ></el-pagination>
+      </el-dialog>
+      <el-dialog
+        title="添加扫码单据类型"
+        :visible.sync="addBusDialogVisible"
+        width="55%"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        v-if="addBusDialogVisible"
       >
-        <el-table-column type="selection" width="55" :selectable="checkSelectable"></el-table-column>
-        <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column
-          label="单据类型"
-          prop="name"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          label="单据类型代码"
-          prop="action"
-          show-overflow-tooltip
-        ></el-table-column>
-      </el-table>
-
-      <el-pagination
-        :page-size="busQuery.limit"
-        @current-change="handleCurrentChange"
-        layout="prev, pager, next"
-        :total="total"
-        :current-page="busQuery.page"
-      ></el-pagination>
-
-    </el-dialog>
+        <div style="float: right; margin-bottom: 10px; margin-right: 25px">
+          <el-button type="primary" size="small" @click="addBusType()"
+            >选入</el-button
+          >
+        </div>
+        <el-table
+          :data="busTypes"
+          border
+          style="width: 100%"
+          @selection-change="handleCheckedChange"
+        >
+          <el-table-column
+            type="selection"
+            width="55"
+            :selectable="checkSelectable"
+          ></el-table-column>
+          <el-table-column label="序号" type="index"></el-table-column>
+          <el-table-column
+            label="单据类型"
+            prop="name"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="单据类型代码"
+            prop="action"
+            show-overflow-tooltip
+          ></el-table-column>
+        </el-table>
+
+        <el-pagination
+          :page-size="busQuery.limit"
+          @current-change="handleCurrentChange"
+          layout="prev, pager, next"
+          :total="total"
+          :current-page="busQuery.page"
+        ></el-pagination>
+      </el-dialog>
+
+      <el-dialog
+        title="添加业务单据类型"
+        :visible.sync="addChangeBusDialogVisible"
+        width="55%"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        v-if="addChangeBusDialogVisible"
+      >
+        <div style="float: right; margin-bottom: 10px; margin-right: 25px">
+          <el-button type="primary" size="small" @click="addChangeBusType()"
+            >选入</el-button
+          >
+        </div>
+        <el-table
+          :data="changeBusTypes"
+          border
+          style="width: 100%"
+          @selection-change="handleCheckedChangeBus"
+        >
+          <el-table-column
+            type="selection"
+            width="55"
+            :selectable="checkSelectableChange"
+          ></el-table-column>
+          <el-table-column label="序号" type="index"></el-table-column>
+          <el-table-column
+            label="单据类型"
+            prop="name"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="单据类型代码"
+            prop="action"
+            show-overflow-tooltip
+          ></el-table-column>
+        </el-table>
+
+        <el-pagination
+          :page-size="changeBusQuery.limit"
+          @current-change="handleCurrentChangePage"
+          layout="prev, pager, next"
+          :total="changeBusTypeTotal"
+          :current-page="changeBusQuery.page"
+        ></el-pagination>
+      </el-dialog>
+    </el-collapse>
   </el-card>
 </template>
 
 <script>
-import {findConfig, updateConfig} from "@/api/sync/spsSyncStatus";
+import {
+  findConfig,
+  testConnect,
+  updateConfig,
+} from "@/api/sync/spsSyncStatus";
 import store from "@/store";
-import {getBussinessType} from "@/api/basic/bussinessType";
+import { getBussinessType } from "@/api/basic/bussinessType";
+import { getBusTypeChangeList } from "@/api/basic/busTypeChange";
 
 export default {
   name: "SysUdimsConfig",
   data() {
     return {
+      activeNames: ["2"],
       configQuery: {
         id: null,
         typeBus: null,
         typeScan: null,
         typeThird: null,
         basicProducts: null,
-        sysUser: null,
         basicCorp: null,
         basicInv: null,
         basicThirdProducts: null,
@@ -271,108 +700,133 @@ export default {
         orderScanFinish: null,
         dbDiProducts: null,
         downstreamEnable: null,
+        syncIp: null,
         syncTime: null,
-        delaySyncTime: null,
+        syncDownloadTime: null,
         orderUnCheck: null,
         orderUnReceive: null,
-        busTypes: [],
-        basicSyncStart: null,
+        sysUser: null,
+        orderToInSyncTime: null,
         orderSyncTime: null,
-        orderSyncStart: null,
-        entrustAction: null,
-        unCheckCert: null,
-        checkedCert: null,
+        orderSyncDlTime: null,
+        delaySyncTime: null,
+        busTypes: [],
+        toInBusTypes: [],
+        changeBusTypes: [],
         companyCert: null,
         manufacturerCert: null,
         productCert: null,
-        basicType: null,
         basicDept: null,
-
-
+        supCert: null,
+        systemConfig: null,
+        entrustAction: null,
+        printConfig: null,
+        scanChangeConfig: null,
+        busChangeConfig: null,
       },
       checkedBusTypes: [],
+      checkedToInBusTypes: [],
+      checkedChangeBusTypes: [],
       busQuery: {
         page: 1,
         limit: 10,
       },
       busTypes: [],
       multipleSelection: [],
+      toInSelecttions: [],
       addBusDialogVisible: false,
+      addBusToInDialogVisible: false,
       total: 0,
-    }
+      testLoading: false,
+      addChangeBusDialogVisible: false,
+      changeBusQuery: {
+        page: 1,
+        limit: 10,
+      },
+      changeBusTypeTotal: 0,
+      changeBusTypes: [],
+      changeBusTypeSelection: [],
+    };
   },
   methods: {
     getConfig() {
       findConfig()
         .then((response) => {
-          if (response.code == 20000) {
-            this.configQuery = response.data;
-            this.checkedBusTypes = this.configQuery.busTypes;
-            if (this.configQuery.busTypes != null) {
-              // for (let i = 0; i < this.configQuery.busTypes.length; i++) {
-              //
-              //     for (let k = 0; k < this.busTypes.length; k++) {
-              //         if (this.busTypes[k].action == this.configQuery.busTypes[i]) {
-              //             this.checkedBusTypes.push(this.busTypes[k]);
-              //             this.busTypes[k].isSelect = true;
-              //         }
-              //     }
-              // }
-            }
-          } else {
-            this.$message.error(response.message);
-          }
+          this.configQuery = response.data;
+          // console.log("this.configQuery", this.configQuery);
+          this.checkedBusTypes = this.configQuery.busTypes;
+          this.checkedToInBusTypes = this.configQuery.toInBusTypes;
+          this.checkedChangeBusTypes = this.configQuery.changeBusTypes;
         })
         .catch(() => {
           this.loading = false;
-          this.list = [];
-          this.total = 0;
         });
     },
     saveConfig() {
-
-      this.$confirm('是否确认修改?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
+      this.$confirm("是否确认修改?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
         center: true,
-      }).then(() => {
-        if (this.checkedBusTypes != null) {
-          this.configQuery.busTypes = this.checkedBusTypes;
-          // for (let i = 0; i < this.checkedBusTypes.length; i++) {
-          //     this.configQuery.busTypes.push(this.checkedBusTypes);
-          // }
-        }
-        updateConfig(this.configQuery)
-          .then((response) => {
-            this.loading = false;
-            if (response.code == 20000) {
-              this.$message.success("修改成功！");
-              this.getConfig();
-            } else {
-              this.$message.error(response.message);
-            }
-          })
-          .catch(() => {
-            this.loading = false;
-          });
-      }).catch(() => {
-      });
+      })
+        .then(() => {
+          if (this.checkedBusTypes != null) {
+            this.configQuery.busTypes = this.checkedBusTypes;
+          }
+          if (this.checkedChangeBusTypes != null) {
+            this.configQuery.changeBusTypes = this.checkedChangeBusTypes;
+          }
+          if (this.checkedToInBusTypes != null) {
+            this.configQuery.toInBusTypes = this.checkedToInBusTypes;
+          }
+          updateConfig(this.configQuery)
+            .then((response) => {
+              this.loading = false;
+              if (response.code == 20000) {
+                this.$message.success("修改成功！");
+                this.getConfig();
+              } else {
+                this.$message.error(response.message);
+              }
+            })
+            .catch(() => {
+              this.loading = false;
+            });
+        })
+        .catch(() => {});
+    },
+
+    testConnect() {
+      this.testLoading = true;
+      testConnect()
+        .then((response) => {
+          this.testLoading = false;
+          if (response.code == 20000) {
+            this.$message.success("连接成功");
+          } else {
+            this.$message.error("连接失败！");
+          }
+        })
+        .catch(() => {
+          this.testLoading = false;
+        });
     },
 
     handleCheckedChange(val) {
       this.multipleSelection = val;
     },
 
+    handleToInCheckedChange(val) {
+      this.toInSelecttions = val;
+    },
+
     getBusType() {
       getBussinessType(this.busQuery)
         .then((response) => {
           this.busTypes = response.data.list || [];
           this.total = response.data.total || 0;
-          // this.getConfig();
         })
-        .catch(() => {
-        });
+        .catch(() => {});
     },
 
     addBusTypeDialog() {
@@ -380,10 +834,33 @@ export default {
       this.multipleSelection = [];
     },
 
+    addToInBusTypeDialog() {
+      this.addBusToInDialogVisible = true;
+      this.toInSelecttions = [];
+    },
+
+    addToInBusType() {
+      var selectData = this.toInSelecttions;
+      selectData.forEach((obj) => {
+        obj.outChange = false;
+        obj.orderStatus = 7;
+        obj.direct = 2;
+        let isPut = true;
+        for (let i = 0; i < this.checkedToInBusTypes.length; i++) {
+          if (this.checkedToInBusTypes[i].action == obj.action) {
+            isPut = false;
+          }
+        }
+        if (isPut) this.checkedToInBusTypes.push(obj);
+      });
+      this.addBusToInDialogVisible = false;
+    },
+
     addBusType() {
       var selectData = this.multipleSelection;
       selectData.forEach((obj) => {
         obj.outChange = false;
+        obj.direct = 1;
         obj.orderStatus = 7;
         let isPut = true;
         for (let i = 0; i < this.checkedBusTypes.length; i++) {
@@ -391,16 +868,18 @@ export default {
             isPut = false;
           }
         }
-        if (isPut)
-          this.checkedBusTypes.push(obj);
+        if (isPut) this.checkedBusTypes.push(obj);
       });
       this.addBusDialogVisible = false;
     },
-
-
     remveBus(index, row) {
       this.checkedBusTypes.splice(index, 1);
     },
+
+    removeToInBus(index, row) {
+      this.checkedToInBusTypes.splice(index, 1);
+    },
+
     checkSelectable(row) {
       return !row.isSelect;
     },
@@ -408,18 +887,73 @@ export default {
       this.busQuery.page = val;
       this.getBusType();
     },
+    addChangeBusType() {
+      let selectData = this.changeBusTypeSelection;
+      selectData.forEach((obj) => {
+        obj.outChange = false;
+        obj.orderStatus = 7;
+        let isPut = true;
+        for (let i = 0; i < this.checkedBusTypes.length; i++) {
+          if (this.checkedChangeBusTypes[i].action == obj.action) {
+            isPut = false;
+          }
+        }
+        if (isPut) this.checkedChangeBusTypes.push(obj);
+      });
+      this.addChangeBusDialogVisible = false;
+    },
+    addChangeBusTypeDialog() {
+      this.addChangeBusDialogVisible = true;
+      this.changeBusTypeSelection = [];
+      this.changeBusQuery.page = 1;
+    },
+    getChangeBusType() {
+      getBusTypeChangeList(this.changeBusQuery).then((res) => {
+        if (res.data.list.length > 0) {
+          res.data.list.forEach((item) => {
+            let changeBusType = {
+              action: item.originAction,
+              name: item.originName,
+            };
+            this.changeBusTypes.push(changeBusType);
+          });
+        }
+        this.changeBusTypeTotal = res.data.total || 0;
+      });
+    },
+    handleCurrentChangePage(val) {
+      this.changeBusQuery.page = val;
+      this.getChangeBusType();
+    },
+    handleCheckedChangeBus(val) {
+      this.changeBusTypeSelection = val;
+    },
+    checkSelectableChange(row) {
+      return !row.isSelect;
+    },
+    removeChangeBus(index, row) {
+      this.checkedChangeBusTypes.splice(index, 1);
+    },
   },
   created() {
     this.headers = {
       ADMIN_ID: store.getters.adminId,
       ADMIN_TOKEN: store.getters.token,
     };
-    this.getConfig();
+
     this.getBusType();
+    this.getChangeBusType();
+    this.getConfig();
   },
-}
+};
 </script>
 
 <style scoped>
-
+/deep/ .el-select {
+  width: 100px;
+}
+/deep/ .el-collapse-item__header {
+  font-size: 18px;
+  font-weight: bold;
+}
 </style>
diff --git a/src/views/system/dept/authDept.vue b/src/views/system/dept/authDept.vue
index a3e77d4..46f51c6 100644
--- a/src/views/system/dept/authDept.vue
+++ b/src/views/system/dept/authDept.vue
@@ -2,7 +2,12 @@
   <div>
     <!--    部门信息相关-->
     <el-card>
-      <el-form :inline="true" :model="filterQuery" class="query-form" size="mini" >
+      <el-form
+        :inline="true"
+        :model="filterQuery"
+        class="query-form"
+        size="mini"
+      >
         <el-row>
           <el-form-item class="query-form-item" label="部门名称:">
             <el-input
@@ -12,7 +17,11 @@
             ></el-input>
           </el-form-item>
           <el-form-item class="query-form-item" label="状态:">
-            <el-select v-model="filterQuery.status" placeholder="请选择状态:" clearable>
+            <el-select
+              v-model="filterQuery.status"
+              placeholder="请选择状态:"
+              clearable
+            >
               <el-option label="全部" value=""></el-option>
               <el-option label="禁用" :value="0"></el-option>
               <el-option label="正常" :value="1"></el-option>
@@ -20,17 +29,12 @@
           </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" @click="onSubmit"
-                         icon="el-icon-search"
-              >查询
-              </el-button
+              <el-button type="primary" icon="el-icon-refresh" @click="onReset"
+                >重置</el-button
               >
+              <el-button type="primary" @click="onSubmit" icon="el-icon-search"
+                >查询
+              </el-button>
               <!--              <el-button type="primary" @click="addDeptDialog"-->
               <!--                         icon="el-icon-plus"-->
               <!--              >新增-->
@@ -40,81 +44,82 @@
                 type="primary"
                 icon="el-icon-sort"
                 @click="toggleExpandAll"
-              >展开/折叠
+                >展开/折叠
               </el-button>
             </el-button-group>
           </el-form-item>
         </el-row>
       </el-form>
-      <el-table v-loading="loading" :data="list" style="width: 100%" ref="deptTableRef"
-                highlight-current-row
-                border
-                v-if="refreshTable"
-                row-key="id"
-                @current-change="handleDeptChange"
-                :default-expand-all="isExpandAll"
-                :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+      <el-table
+        v-loading="loading"
+        ref="list"
+        :data="list"
+        style="width: 100%"
+        highlight-current-row
+        border
+        v-if="refreshTable"
+        row-key="id"
+        @current-change="handleDeptChange"
+        :default-expand-all="isExpandAll"
+        :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
       >
         <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column
-          label="部门名称"
-          prop="name"
-        ></el-table-column>
-        <el-table-column
-          label="部门编码"
-          prop="code"
-        ></el-table-column>
+        <el-table-column label="部门名称" prop="name"></el-table-column>
+        <el-table-column label="部门编码" prop="code"></el-table-column>
+        <el-table-column label="部门名称" prop="name"></el-table-column>
+        <el-table-column label="部门编码" prop="code"></el-table-column>
         <el-table-column label="状态" prop="status">
           <template slot-scope="scope">
-            <el-tag :type="scope.row.status | statusFilterType">{{
-                scope.row.status | statusFilterName
-              }}
+            <el-tag :type="scope.row.status | statusFilterType"
+              >{{ scope.row.status | statusFilterName }}
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="允许供应商使用" prop="spUse">
-          <template slot-scope="scope">
-            <el-tag :type="scope.row.spUse | spUerFilterType">{{
-                scope.row.spUse | spUerFilterName
-              }}
-            </el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column label="备注" prop="remark">
-        </el-table-column>
+        <el-table-column label="备注" prop="remark"> </el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">
             <el-button
-              type="text" :disabled="scope.row.status==0"
+              type="text"
+              :disabled="scope.row.status == 0"
               @click.native.stop="subAddDeptDialog(scope.row)"
-            >新增
-            </el-button
-            >
+              >新增
+            </el-button>
 
             <el-button
               type="text"
               @click.native.stop="updateDeptDialog(scope.row)"
-            >编辑
-            </el-button
-            >
+              >编辑
+            </el-button>
 
             <el-button
               type="text"
+              :disabled="scope.row.id === 1"
               @click.native.stop="deleteDialog(scope.row)"
-            >删除
-            </el-button
-            >
+              >删除
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
-      <el-dialog :title="formMap[formName]" :before-close="cancelDialog" :visible.sync="formVisible" width="45%">
-        <el-form :model="formData" ref="dataForm" :rules="rules" label-width="150px">
+      <el-dialog
+        :title="formMap[formName]"
+        :visible.sync="formVisible"
+        width="45%"
+      >
+        <el-form :model="formData" ref="dataForm" :rules="rules">
           <el-row>
-            <el-form-item label="上级部门:" v-if="formData.pid != 0">
-              <treeselect v-model="formData.pcode"  :options="deptOptions" :normalizer="normalizer"
-                          :disabled="isShow"
-                          style="width: 90%"
-                          placeholder="选择上级部门"/>
+            <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>
           </el-row>
           <el-row>
@@ -128,15 +133,22 @@
             </el-form-item>
           </el-row>
           <el-row>
-            <el-form-item label="状态:"  prop="status">
-              <el-radio-group :disabled="formData.pid==0" v-model="formData.status">
+            <el-form-item label="状态:" prop="status">
+              <el-radio-group
+                :disabled="formData.pid == 0"
+                v-model="formData.status"
+              >
                 <el-radio :label="1">正常</el-radio>
                 <el-radio :label="0">禁用</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-row>
 
-          <el-form-item label="是否能被供应商使用" prop="spUse" class="query-form-item">
+          <el-form-item
+            label="是否能被供应商使用"
+            prop="spUse"
+            class="query-form-item"
+          >
             <el-radio-group v-model="formData.spUse">
               <el-radio :label="true">是</el-radio>
               <el-radio :label="false">否</el-radio>
@@ -169,14 +181,12 @@
                         ></el-tree>
                       </el-form-item>
                     </el-row>-->
-
         </el-form>
 
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" size="small" @click.native="formSubmit()"
-          >提交
-          </el-button
-          >
+            >提交
+          </el-button>
           <el-button @click.native="cancelDialog" size="small">取消</el-button>
         </div>
       </el-dialog>
@@ -185,7 +195,12 @@
       <!--      部门绑定用户列表-->
       <el-tab-pane>
         <span slot="label">{{ currentRow.name }}-用户列表</span>
-        <el-form :inline="true" :model="userQuery" class="query-form" size="mini">
+        <el-form
+          :inline="true"
+          :model="userQuery"
+          class="query-form"
+          size="mini"
+        >
           <el-form-item class="query-form-item" label="用户名称/账号:">
             <el-input
               v-model="userQuery.key"
@@ -200,47 +215,50 @@
                 type="primary"
                 icon="el-icon-refresh"
                 @click="onUserReset"
-              >重置
+                >重置
+              </el-button>
+              <el-button
+                type="primary"
+                @click="onUserSubmit"
+                icon="el-icon-search"
+                >查询
               </el-button>
-              <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"
+        <el-table
+          v-loading="userloading"
+          :data="userlist"
+          style="width: 100%"
+          border
+          row-key="id"
         >
           <el-table-column label="序号" type="index"></el-table-column>
           <el-table-column
             label="用户名称"
             prop="employeeName"
           ></el-table-column>
-          <el-table-column
-            label="用户账号"
-            prop="userName"
-          ></el-table-column>
-          <el-table-column label="备注" prop="comments">
-          </el-table-column>
+          <el-table-column label="用户账号" prop="userName"></el-table-column>
+          <el-table-column label="备注" prop="comments"> </el-table-column>
           <el-table-column label="操作">
             <template slot-scope="scope">
               <el-button
                 type="text"
                 @click.native.stop="removeUserDialog(scope.row)"
-              >移除
-              </el-button
-              >
+                >移除
+              </el-button>
             </template>
           </el-table-column>
         </el-table>
         <pagination
-          v-show="userTotal>0"
+          v-show="userTotal > 0"
           :total="userTotal"
           :page.sync="userQuery.page"
           :limit.sync="userQuery.limit"
@@ -248,11 +266,15 @@
         />
       </el-tab-pane>
 
-
       <!--      部门绑定仓库信息-->
       <el-tab-pane>
         <span slot="label">{{ currentRow.name }}-仓库列表</span>
-        <el-form :inline="true" :model="invQuery" class="query-form" size="mini">
+        <el-form
+          :inline="true"
+          :model="invQuery"
+          class="query-form"
+          size="mini"
+        >
           <el-form-item class="query-form-item" label="仓库名称/编码:">
             <el-input
               v-model="invQuery.key"
@@ -267,34 +289,35 @@
                 type="primary"
                 icon="el-icon-refresh"
                 @click="onInvReset"
-              >重置
+                >重置
+              </el-button>
+              <el-button
+                type="primary"
+                @click="onInvSubmit"
+                icon="el-icon-search"
+                >查询
               </el-button>
-              <el-button type="primary" @click="onInvSubmit"
-                         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="invLoading" :data="invlist" style="width: 100%" border
-                  row-key="id"
+        <el-table
+          v-loading="invLoading"
+          :data="invlist"
+          style="width: 100%"
+          border
+          row-key="id"
         >
           <el-table-column label="序号" type="index"></el-table-column>
-          <el-table-column
-            label="仓库名称"
-            prop="name"
-          ></el-table-column>
-          <el-table-column
-            label="仓库编码"
-            prop="code"
-          ></el-table-column>
-          <el-table-column label="备注" prop="remark">
-          </el-table-column>
+          <el-table-column label="仓库名称" prop="name"></el-table-column>
+          <el-table-column label="仓库编码" prop="code"></el-table-column>
+          <el-table-column label="备注" prop="remark"> </el-table-column>
           <!--          <el-table-column label="操作">-->
           <!--            <template slot-scope="scope">-->
           <!--              <el-button-->
@@ -307,9 +330,8 @@
           <!--          </el-table-column>-->
         </el-table>
 
-
         <pagination
-          v-show="invTotal>0"
+          v-show="invTotal > 0"
           :total="invTotal"
           :page.sync="invQuery.page"
           :limit.sync="invQuery.limit"
@@ -317,21 +339,31 @@
         />
       </el-tab-pane>
     </el-tabs>
-
   </div>
 </template>
 
 <script>
+import {
+  filterList,
+  deleteWarehouse,
+  saveWarehouse,
+} from "@/api/system/invWarehouse";
 
-import {filterList, deleteWarehouse, saveWarehouse} from "@/api/system/invWarehouse";
-
-import {treeList, treeSelectedList} from "@/api/system/dataStatus";
+import { treeList, treeSelectedList } from "@/api/system/dataStatus";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import {listDeptUser, removeUser} from "@/api/system/deptUser";
-import {filterSubAll} from "@/api/system/invSubWarehouse";
+import { listDeptUser, removeUser } from "@/api/system/deptUser";
+import { filterSubAll } from "@/api/system/invSubWarehouse";
 
 export default {
+  watch: {
+    list: {
+      handler: function () {
+        this.$refs.list.setCurrentRow(this.list[0]);
+      },
+      deep: true,
+    },
+  },
   data() {
     return {
       filterQuery: {
@@ -359,21 +391,19 @@ export default {
       deptOptions: [],
       rules: {
         name: [
-          {required: true, message: "部门名称不能为空", trigger: "blur"}
-        ],
-        status: [
-          {required: true, message: "状态不能为空", trigger: "blur"}
+          { required: true, message: "部门名称不能为空", trigger: "blur" },
         ],
+        status: [{ required: true, message: "状态不能为空", trigger: "blur" }],
       },
       menuExpand: false,
       menuNodeAll: false,
       menuOptions: [],
       defaultProps: {
         children: "children",
-        label: "label"
+        label: "label",
       },
       currentRow: {
-        name: "部门"
+        name: "部门",
       },
 
       //部门用户
@@ -392,15 +422,14 @@ export default {
       selectUserQuery: {
         code: null,
         page: 1,
-        limit: 10
+        limit: 10,
       },
 
-
       //部门仓库
       invQuery: {
         key: null,
         page: 1,
-        limit: 10
+        limit: 10,
       },
       invlist: [],
       invTotal: 0,
@@ -446,12 +475,12 @@ export default {
         path: "",
       });
       this.filterQuery = {
-        name: ""
+        name: "",
       };
       this.getList();
     },
     formSubmit() {
-      this.$refs["dataForm"].validate(valid => {
+      this.$refs["dataForm"].validate((valid) => {
         if (valid) {
           if (this.$isBlank(this.formData.name)) {
             this.$message.error("部门名称不能为空！");
@@ -499,8 +528,6 @@ export default {
           }
         }
       });
-
-
     },
     onSubmit() {
       this.getList();
@@ -518,6 +545,8 @@ export default {
         level: 1,
       };
     },
+
+    /* 新增按钮点击事件 */
     subAddDeptDialog(row) {
       this.formName = "add";
       this.formVisible = true;
@@ -526,10 +555,10 @@ export default {
         pid: row.id,
         pcode: row.code,
         status: 1,
-        spUse:false
-      }
+        spUse: false,
+      };
       // this.getStatusTreeselect();
-      filterList().then(response => {
+      filterList().then((response) => {
         let depList = response.data.list || [];
         this.deptOptions = this.handleTree(depList, "code", "pcode");
       });
@@ -543,6 +572,8 @@ export default {
         this.$refs["dataForm"].resetFields();
       }
     },
+
+    /* 编辑按钮点击事件 */
     updateDeptDialog(row) {
       this.resetForm();
       this.formName = "edit";
@@ -550,11 +581,12 @@ export default {
       this.isShow = true;
       this.formData = row;
       // const roleMenu = this.getDeptStatusMenuTreeselect(this.formData.id);
-      filterList().then(response => {
+      filterList().then((response) => {
         let depList = response.data.list || [];
         this.deptOptions = this.handleTree(depList, "code", "pcode");
       });
     },
+    /* 获取列表 */
     getList() {
       this.loading = true;
       filterList(this.filterQuery)
@@ -569,11 +601,14 @@ export default {
         });
     },
     cancelDialog() {
+      tQuer;
       this.formVisible = false;
       // 刷新表单
       this.$refs["dataForm"].resetFields();
       this.getList();
     },
+
+    /* 删除按钮点击事件 */
     deleteDialog(row) {
       this.$confirm("是否删除该部门?", "提示", {
         confirmButtonText: "确定",
@@ -590,11 +625,9 @@ export default {
             } else {
               this.$message.error(res.message);
             }
-
           });
         })
-        .catch(() => {
-        });
+        .catch(() => {});
     },
     toggleExpandAll() {
       this.refreshTable = false;
@@ -611,7 +644,7 @@ export default {
       return {
         id: node.code,
         label: node.name,
-        children: node.children
+        children: node.children,
       };
     },
     // 树权限（展开/折叠）
@@ -627,13 +660,13 @@ export default {
     },
     /** 查询菜单树结构 */
     getStatusTreeselect() {
-      treeList().then(response => {
+      treeList().then((response) => {
         this.menuOptions = response.data;
       });
     },
     getDeptStatusMenuTreeselect(deptId) {
-      let query = {deptId: deptId};
-      return treeSelectedList(query).then(response => {
+      let query = { deptId: deptId };
+      return treeSelectedList(query).then((response) => {
         this.menuOptions = response.data.menus;
         return response;
       });
@@ -652,11 +685,12 @@ export default {
       this.onInvSubmit();
     },
 
-
     //用户相关
     handleUserSelectionChange(val) {
       this.selectAddUser = val;
     },
+
+    /* 重置按钮点击事件 */
     onUserReset() {
       this.userQuery = {
         key: null,
@@ -666,6 +700,8 @@ export default {
       };
       this.getUerList();
     },
+
+    /* 查询按钮点击事件 */
     onUserSubmit() {
       this.userQuery.deptId = this.currentRow.id;
       this.userQuery.page = 1;
@@ -689,7 +725,7 @@ export default {
         key: "",
         parentId: this.currentRow.code,
         page: 1,
-        limit: 20
+        limit: 20,
       };
       this.onInvSubmit();
     },
@@ -712,11 +748,9 @@ export default {
             }
           });
         })
-        .catch(() => {
-        });
+        .catch(() => {});
     },
 
-
     //仓库相关
     getInvList() {
       filterSubAll(this.invQuery)
@@ -735,12 +769,10 @@ export default {
       this.getInvList();
     },
   },
-  components: {Treeselect},
-  mounted() {
-
-  },
+  components: { Treeselect },
+  mounted() {},
   created() {
     this.getList();
-  }
+  },
 };
 </script>
diff --git a/src/views/system/dept/invWarehouse.vue b/src/views/system/dept/invWarehouse.vue
index d56a082..6ad7fd8 100644
--- a/src/views/system/dept/invWarehouse.vue
+++ b/src/views/system/dept/invWarehouse.vue
@@ -9,6 +9,20 @@
             placeholder="仓库名称"
           ></el-input>
         </el-form-item>
+        <!-- <el-form-item class="query-form-item" label="仓库类型:">
+          <el-input
+
+            clearable
+            placeholder="仓库类型"
+          ></el-input>
+        </el-form-item> -->
+        <el-form-item label="仓库类型" prop="advanceType">
+          <el-select v-model="subData.advanceType" placeholder="请选择仓库类型" style="width: 80%">
+            <el-option label="入账库" :value="1"/>
+            <el-option label="预验收库" :value="2"/>
+            <el-option label="寄售库" :value="3"/>
+          </el-select>
+        </el-form-item>
         <el-form-item>
           <el-button-group style="margin-left: 10px;display:flex;">
             <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
@@ -28,26 +42,40 @@
       >
         <el-table-column label="序号" type="index" ref="dataForm"></el-table-column>
         <el-table-column
-          prop="name"
-          label="仓库名称"
+          prop="code"
+          width="140"
+          label="仓库编码"
         >
         </el-table-column>
         <el-table-column
-          prop="code"
-          label="仓库编码"
+          width="160"
+          prop="name"
+          label="仓库名称"
         >
         </el-table-column>
         <el-table-column
           prop="parentName"
+          width="180"
           label="所属部门"
         >
         </el-table-column>
+        <el-table-column width="160"
+                         prop="parentInvName"
+                         label="上级仓库"
+        >
+        </el-table-column>
         <el-table-column
-          prop="parentInvName"
-          label="上级仓库"
+          width="140"
+          prop="advanceType"
+          label="仓库类型"
         >
+
+          <template slot-scope="scope">
+            <span>{{ advanceTypeTypeMap[scope.row.advanceType] }}</span>
+          </template>
+
         </el-table-column>
-        <el-table-column label="允许供应商使用" prop="spUse">
+        <el-table-column label="允许供应商使用" prop="spUse" width="140">
           <template slot-scope="scope">
             <el-tag :type="scope.row.spUse | spUerFilterType">{{
                 scope.row.spUse | spUerFilterName
@@ -55,7 +83,7 @@
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="操作" class-name="small-padding fixed-width">
+        <el-table-column label="操作" width="220">
           <template slot-scope="scope">
             <el-button
               type="text"
@@ -168,11 +196,12 @@
           </el-row>
           <el-row :gutter="20" class="el-row" type="flex">
             <el-col :span="12" class="el-col">
-              <el-form-item label="仓库类型" prop="advanceType" >
-                <el-select v-model="subData.advanceType" :disabled="invWouse != null" placeholder="请选择仓库类型" style="width: 80%">
-                  <el-option  label="入账库"  value="1"/>
-                  <el-option  label="寄售库"  value="2"/>
-                  <el-option  label="预验收库" value="3"/>
+              <el-form-item label="仓库类型" prop="advanceType">
+                <el-select v-model="subData.advanceType" :disabled="invWouse != null" placeholder="请选择仓库类型"
+                           style="width: 80%">
+                  <el-option label="入账库" value="1"/>
+                  <el-option label="预验收库" value="2"/>
+                  <el-option label="寄售库" value="3"/>
                 </el-select>
               </el-form-item>
 
@@ -395,17 +424,22 @@ export default {
         // page: 1,
         // limit: 10,
       },
-      isAdvanceTypeShow:false,
-      isShow:false,
+      isAdvanceTypeShow: false,
+      isShow: false,
       loading: true,
       list: [],
       isExpandAll: true,
       total: 0,
+      advanceTypeTypeMap: {
+        1: "入账库",
+        2: "寄售库",
+        3: "预验收库",
+      },
       formMap: {
         add: "仓库信息-新增",
         edit: "仓库信息-编辑"
       },
-      invWouse:{},
+      invWouse: {},
       formName: null,
       configParms: {},
       currentCode: null,
@@ -448,6 +482,7 @@ export default {
       },
       sysList: [],
       sysSubList: [],
+      advanceTypese: [],
     };
   },
   methods: {
@@ -483,6 +518,7 @@ export default {
           this.loading = false;
           let invlist = response.data || [];
           this.list = this.handleTree(invlist, "code", "parentCode");
+          console.log(this.list);
         })
         .catch(() => {
           this.loading = false;
@@ -491,34 +527,38 @@ export default {
         });
     },
     handleSubForm(data, formName) {   //新增，编辑
-      if(data != null ){
-        this.invWouse=data;
+      if (data != null) {
+        this.invWouse = data;
       }
       this.formName = formName;
       if (formName === "edit") {
         this.subData = JSON.parse(JSON.stringify(data));
-        this.subData.advanceType=this.subData.advanceType.toString();
-        if(this.subData.parentCode!=null && this.subData.parentCode!=""){
-          this.isAdvanceTypeShow=true;
-          this.isShow=false;
-        }else{
-          this.isAdvanceTypeShow=false;
-          this.isShow=true
-          this.subData.parentCode=null;
+        this.subData.advanceType = this.subData.advanceType.toString();
+        if (this.subData.parentCode != null && this.subData.parentCode != "") {
+          this.isAdvanceTypeShow = true;
+          this.isShow = false;
+        } else {
+          this.isAdvanceTypeShow = false;
+          this.isShow = true
+          this.subData.parentCode = null;
         }
       } else if (formName === "add") {
-        this.isShow=true
-        if(data==null){
-          this.isAdvanceTypeShow=false;
-          this.subData = {advanceType: '1', spUse: false,parentCode:null};
-        }else{
-          this.isAdvanceTypeShow=true;
-          this.subData = {advanceType: data.advanceType.toString(), spUse: false,parentCode:data.code};
+        this.isShow = true
+        if (data == null) {
+          this.isAdvanceTypeShow = false;
+          this.subData = {advanceType: '1', spUse: false, parentCode: null};
+        } else {
+          this.isAdvanceTypeShow = true;
+          this.subData = {advanceType: data.advanceType.toString(), spUse: false, parentCode: data.code};
         }
       }
+      //转换
+      let advanceTypese = this.subData.advanceType
+
+
       this.subFormVisible = true;
       this.getSubThrsysDetailData();
-      if(this.subData.parentCode!=null && this.subData.parentCode!=""){
+      if (this.subData.parentCode != null && this.subData.parentCode != "") {
         filterSubAll(this.query)
           .then((response) => {
             let invList = response.data || [];
diff --git a/src/views/system/param/busTypePre.vue b/src/views/system/param/busTypePre.vue
index 09dbcfe..227b1b9 100644
--- a/src/views/system/param/busTypePre.vue
+++ b/src/views/system/param/busTypePre.vue
@@ -55,7 +55,13 @@
             <span>{{ enableMap[scope.row.supplementAll] }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="说明" prop="intro"></el-table-column>
+        <el-table-column label="创建单据模式" prop="createType">
+
+          <template slot-scope="scope">
+            <span>{{ createTypeMap[scope.row.createType] }}</span>
+          </template>
+
+        </el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">
             <el-button
@@ -137,11 +143,12 @@ export default {
         defaultInvCode: null,
         beforeTime: 0,
         busBeforeTime: 0,
-        supplementAll: null,
+        supplementAll: true,
         intro: null,
         remark: null,
         auditStatus: null,
         busAuditStatus: null,
+        createType: null,
       },
       enableMap: {
         true: "全量补单",
@@ -153,6 +160,14 @@ export default {
         2: "待审核",
         3: "已审核"
       },
+
+      createTypeMap: {
+        1: "送货至入库补单",
+        2: "向上级仓库补单",
+        3: "预验收转入库补单",
+        4: "寄售转入库补单",
+      },
+
       total: 0,
       loading: false,
       formMap: {
@@ -215,7 +230,7 @@ export default {
         this.$message.error("目标出入库单与目标业务单不能同时为空！")
         return;
       }
-      if(isBlank(this.inputQuery.supplementAll)){
+      if (isBlank(this.inputQuery.supplementAll)) {
         this.$message.error("补单方式不能为空！")
         return;
       }
@@ -273,11 +288,13 @@ export default {
         defaultInvCode: null,
         beforeTime: 0,
         busBeforeTime: 0,
-        supplementAll: null,
+        supplementAll: true,
         intro: null,
         remark: null,
         auditStatus: null,
         busAuditStatus: null,
+        createType: null,
+
       };
       this.modifyDialogVisible = true;
     },
diff --git a/src/views/system/param/busTypePreModify.vue b/src/views/system/param/busTypePreModify.vue
index b5cb8ea..e19e04f 100644
--- a/src/views/system/param/busTypePreModify.vue
+++ b/src/views/system/param/busTypePreModify.vue
@@ -90,17 +90,29 @@
         </el-col>
       </el-row>
       <el-row style="margin-bottom: 20px">
+
+        <el-col :span="11">
+          <el-form-item label="创建单据模式" prop="createType">
+            <el-select v-model="inputQuery.createType" placeholder="创建单据模式" size="small"
+                       style="width: 90%">
+              <el-option label="送货至入库补单" :value="1"></el-option>
+              <el-option label="向上级仓库补单" :value="2"></el-option>
+              <el-option label="预验收转入库补单" :value="3"></el-option>
+              <el-option label="寄售转入库补单" :value="4"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
         <el-col :span="11">
           <el-form-item label="审核状态" prop="auditStatus" class="query-form-item">
             <el-radio-group v-model="inputQuery.auditStatus">
               <el-radio :label="1">草稿</el-radio>
               <el-radio :label="2">待核对</el-radio>
             </el-radio-group>
-<!--            <el-select v-model="inputQuery.auditStatus" placeholder="请选择出入库类型" style="width: 90%">-->
-<!--              <el-radio :label="1">草稿</el-radio>-->
-<!--              <el-radio :label="2">待核对</el-radio>-->
-<!--              <el-radio :label="3">待审核</el-radio>-->
-<!--            </el-select>-->
+            <!--            <el-select v-model="inputQuery.auditStatus" placeholder="请选择出入库类型" style="width: 90%">-->
+            <!--              <el-radio :label="1">草稿</el-radio>-->
+            <!--              <el-radio :label="2">待核对</el-radio>-->
+            <!--              <el-radio :label="3">待审核</el-radio>-->
+            <!--            </el-select>-->
 
           </el-form-item>
         </el-col>
@@ -307,6 +319,7 @@ export default {
   created() {
     if (this.inputQuery.originAction == null) {
       this.isAdd = true;
+      this.inputQuery.createType = 1;
       this.inputQuery.auditStatus = 1;
       this.inputQuery.busAuditStatus = 1;
     } else {
diff --git a/src/views/thirdSys/product/thrProductsExport.vue b/src/views/thirdSys/product/thrProductsExport.vue
index cc9d415..bcf1ca7 100644
--- a/src/views/thirdSys/product/thrProductsExport.vue
+++ b/src/views/thirdSys/product/thrProductsExport.vue
@@ -78,6 +78,7 @@ import {formatDate} from "../../../utils/date";
 export default {
   data() {
     return {
+      BASE_URL: process.env.VUE_APP_BASE_API,
       showSearch: true,
       filterQuery: {
         genKey: null,
@@ -158,8 +159,8 @@ export default {
       this.thrProductsSelectVisible = true;
     },
     downloadExcel(row) {
-      axios.get("./config.json").then(res => {
-        let baseUrl = res.data.BASE_URL;
+      debugger
+        let baseUrl = this.BASE_URL;
         let href = baseUrl + "/udiwms/thrProducts/exportLog/download" + "?genKey=" + row.genKey;
         let a = document.createElement("a");
         var timestamp = formatDate(new Date(), "yyyyMMddhhmmss")
@@ -173,8 +174,6 @@ export default {
             a.click();
             this.getList();
           });
-      });
-
     },
 
     cancelDialog(val) {