diff --git a/src/api/basic/busOriginType.js b/src/api/basic/busOriginType.js
index fc7fdd2c..7ac49316 100644
--- a/src/api/basic/busOriginType.js
+++ b/src/api/basic/busOriginType.js
@@ -44,3 +44,11 @@ export function getOriginJoinBusType(query) {
         params: query
     });
 }
+
+export function selectList(query) {
+  return axios({
+    url: "/udiwms/busType/selectList",
+    method: "get",
+    params: query
+  });
+}
diff --git a/src/views/basic/busType/bussinessType.vue b/src/views/basic/busType/bussinessType.vue
index e222d055..8223c74a 100644
--- a/src/views/basic/busType/bussinessType.vue
+++ b/src/views/basic/busType/bussinessType.vue
@@ -1,51 +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="请输入单据类型"
-          ></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>
@@ -107,8 +122,9 @@
       >
         <modifyDialog :inputQuery="inputQuery"></modifyDialog>
         <div slot="footer" class="dialog-footer">
+          <!--           :disabled="!configParams.typeScan"-->
           <el-button type="primary" size="small" @click="onAddSubmit"
-                     :disabled="!configParams.typeScan"
+
           >提交
           </el-button
           >
@@ -126,6 +142,7 @@
         :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">
@@ -152,12 +169,12 @@
   </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() {
@@ -165,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,
@@ -206,15 +224,15 @@ export default {
         storageCode: null,
         supplementOrderType: null,
         defaultUnit: null,
-        useDyCount: null,
+        useDyCount: false,
         expireTip: true,
         prefix: null,
         outToSpms: null,
         ullageFill: null,
-        scanPreIn: null,
-        vailInv: null,
+        scanPreIn: false,
+        vailInv: false,
         entrutSpms: null,
-        codeFillCheck: null,
+        codeFillCheck: true,
         defaultInv: null,
         defaultSubInv: null,
         orderVisibleType: null,
@@ -223,13 +241,12 @@ export default {
         originAction: null,
         checkBalance: null,
         secCheckBalance: null,
-        preInBack: true,
-        vailDispatch: null,
-        vailGroupBuy: null,
+        preInBack: false,
+        vailDispatch: false,
+        vailGroupBuy: 0,
         inStock: false,
-        actionType: 0,
+        actionType: 1,
         fillCodeRel: false,
-
         thrCheckEnable: null,
         thrCheckWebNew: null,
         thrCheckPdaUn: null,
@@ -240,18 +257,19 @@ export default {
         thrCheckChange: null,
         thrCheckBalance: null,
         thrCheckCopy: null,
-        checkVailDate:true, //校验近效期
-        checkExpire:true,   //校验过期
-        checkCertExpire:true, //校验证书过期
+        advancePreIn: false,
+        checkVailDate: 0, //校验近效期
+        checkExpire: true,   //校验过期
+        checkCertExpire: false //校验证书过期
 
       },
       enableMap: {
-        true: "是",
-        false: "否",
+        true: '是',
+        false: '否'
       },
       mainActionMap: {
-        WareHouseIn: "入库",
-        WareHouseOut: "出库"
+        WareHouseIn: '入库',
+        WareHouseOut: '出库'
       },
       fileList: [],
       total: 0,
@@ -259,79 +277,96 @@ 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;
+            this.list = response.data.list || []
+            this.total = response.data.total || 0
           } else {
-            this.$message.error(response.message);
+            this.$message.error(response.message)
           }
-          this.loading = false;
+          this.loading = false
         })
         .catch(() => {
-          this.loading = false;
-          this.list = [];
-          this.total = 0;
-        });
+          this.loading = false
+          this.list = []
+          this.total = 0
+        })
     },
     handleCurrentChange(val) {
-      this.filterQuery.page = val;
-      this.getList();
+      this.filterQuery.page = val
+      this.getList()
     },
 
     onAddSubmit() {
       //默认初始化
-      this.inputQuery.corpType = 2;
+      if (this.inputQuery.corpType == null) {
+        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 (isBlank(this.inputQuery.preInBackAction)) {
+          this.$message.error('请选择预验收退库单据类型！')
+          return
+        }
+
       }
       // if (isBlank(this.inputQuery.busType)) {
       //   this.$message.error("请选择特定页面！");
@@ -340,39 +375,39 @@ export default {
       insertBusType(this.inputQuery)
         .then((response) => {
           if (response.code == 20000) {
-            this.loading = false;
-            this.cancelDialog();
-            this.getList();
+            this.loading = false
+            this.cancelDialog()
+            this.getList()
           } else {
-            this.$message.error(response.message);
+            this.$message.error(response.message)
           }
         })
         .catch(() => {
-          this.loading = false;
-        });
+          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("请选择特定页面！");
@@ -382,52 +417,52 @@ export default {
       updateBusType(this.inputQuery)
         .then((response) => {
           if (response.code == 20000) {
-            this.loading = false;
-            this.cancelDialog();
-            this.getList();
+            this.loading = false
+            this.cancelDialog()
+            this.getList()
           } else {
-            this.$message.error(response.message);
+            this.$message.error(response.message)
           }
         })
         .catch(() => {
-          this.loading = false;
-          this.cancelDialog();
-        });
+          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,
@@ -448,30 +483,30 @@ export default {
         checkBalance: null,
         secCheckBalance: null,
         secCheckCopy: null,
-        corpType: null,
+        corpType: 2,
         storageCode: null,
         supplementOrderType: null,
         defaultUnit: null,
-        useDyCount: null,
+        useDyCount: false,
         expireTip: true,
         prefix: null,
         outToSpms: null,
         ullageFill: null,
-        scanPreIn: null,
-        vailInv: null,
+        scanPreIn: false,
+        vailInv: false,
         entrutSpms: null,
-        codeFillCheck: null,
+        codeFillCheck: true,
         defaultInv: null,
         defaultSubInv: null,
         orderVisibleType: null,
         advanceType: null,
         preIn: null,
         originAction: null,
-        preInBack: true,
-        vailDispatch: null,
-        vailGroupBuy: null,
+        preInBack: false,
+        vailDispatch: false,
+        vailGroupBuy: 0,
         inStock: false,
-        actionType: 0,
+        actionType: 1,
         fillCodeRel: false,
         thrCheckEnable: null,
         thrCheckWebNew: null,
@@ -483,94 +518,92 @@ export default {
         thrCheckChange: null,
         thrCheckBalance: null,
         thrCheckCopy: null,
-
-        checkVailDate:true, //校验近效期
-        checkExpire:true,   //校验过期
-        checkCertExpire:true, //校验证书过期
+        advancePreIn: false,
+        checkVailDate: 0, //校验近效期
+        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);
+          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();
+          this.getList()
           if (response.code == 20000) {
             this.$message({
-              type: "success",
-              message: "删除成功！",
-            });
+              type: 'success',
+              message: '删除成功！'
+            })
           } else {
-            this.$message.error(response.message);
+            this.$message.error(response.message)
           }
 
         })
         .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() {
-      axios.get("./config.json").then(res => {
-        // 基础地址
-        let response = res.data.BASE_URL;
-        this.uploadFileUrl = response + "/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;
+            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 01a048b3..e3f8fd5e 100644
--- a/src/views/basic/busType/bussinessTypeModify.vue
+++ b/src/views/basic/busType/bussinessTypeModify.vue
@@ -62,23 +62,15 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="11">
-          <el-form-item label="内部单据自动平衡" prop="supplementOrderType">
-            <el-select :disabled="inputQuery.corpType !=3  || inputQuery.inStock!= true"
+        <el-col :span="11" type="flex">
+          <el-form-item label="仓库类型" prop="actionType">
+            <el-select v-model="inputQuery.actionType"
                        size="small"
                        style="width: 90%"
-                       v-model="inputQuery.supplementOrderType"
-                       clearable
-                       placeholder="单据类型"
-            >
-              <el-option
-                v-for="item in orderTypeList"
-                :key="item.name"
-                :label="item.name"
-                :value="item.action"
-              >
-                <span style="float: left">{{ item.name }}</span>
-              </el-option>
+                       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>
@@ -86,8 +78,9 @@
       <el-row type="flex">
         <el-col :span="11">
           <el-form-item label="允许手动输入客户信息" prop="genUnit">
-            <el-select v-model="inputQuery.genUnit" :disabled="inputQuery.corpType != 1" style="width: 90%"
-                       placeholder="是否允许" clearable
+            <el-select v-model="inputQuery.genUnit"
+                       :disabled="inputQuery.corpType != 1  || inputQuery.mainAction!='WareHouseOut'" style="width: 90%"
+                       placeholder="是否允许"
             >
               <el-option label="允许" :value="true"></el-option>
               <el-option label="不允许" :value="false"></el-option>
@@ -95,81 +88,91 @@
           </el-form-item>
         </el-col>
 
-        <el-col :span="11" type="flex">
-          <el-form-item label="采购方式" prop="actionType">
-            <el-select v-model="inputQuery.actionType"
+        <el-col :span="11">
+          <el-form-item label="内部单据自动平衡" prop="supplementOrderType">
+            <el-select :disabled="inputQuery.corpType !=3  || inputQuery.inStock!= true"
                        size="small"
                        style="width: 90%"
+                       v-model="inputQuery.supplementOrderType"
                        clearable
-                       :disabled="inputQuery.mainAction!='WareHouseIn' || inputQuery.corpType!=2 "
-                       placeholder="请选择入库方式">
-              <el-option label="无" :value="0"></el-option>
-              <el-option label="带票" :value="1"></el-option>
-              <el-option label="预验收" :value="2"></el-option>
-              <el-option label="寄售" :value="3"></el-option>
+                       placeholder="单据类型"
+            >
+              <el-option
+                v-for="item in orderTypeList"
+                :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>
+        <!--   :disabled="inputQuery.mainAction!='WareHouseIn' || inputQuery.corpType!=2 "-->
+
       </el-row>
       <el-row type="flex">
         <el-col :span="11">
-          <el-form-item label="允许供应商使用" prop="prefix">
+          <el-form-item label="供应商使用权限" prop="prefix">
             <el-select v-model="inputQuery.spUse"
-                       :disabled=" inputQuery.corpType!=2 "
-                       style="width: 90%" placeholder="是否允许" clearable>
-              <el-option label="是" :value="1"></el-option>
-              <el-option label="否" :value="0"></el-option>
+                       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  "
-
-                       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="是否退回"   -->
+        <!--    >-->
+        <!--      <el-option label="是" :value="true"></el-option>-->
+        <!--      <el-option label="否" :value="false"></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.checkVailDate"
-                       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.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>
             </el-select>
           </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
@@ -178,13 +181,18 @@
             </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-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>
@@ -204,7 +212,8 @@
 
     <div style="margin-left: 25px">
       <el-collapse>
-        <el-collapse-item title="供应商送货设置" v-if="inputQuery.corpType==2 && inputQuery.mainAction!= 'WareHouseOut'">
+        <el-collapse-item title="供应商送货设置"
+                          v-if="inputQuery.corpType==2 && inputQuery.mainAction!= 'WareHouseOut'">
 
           <div style="width: 100%;margin-top: 15px">
             <el-row>
@@ -230,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>
@@ -247,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>
@@ -266,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>
@@ -286,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>
@@ -300,7 +309,7 @@
           <el-divider></el-divider>
         </el-collapse-item>
 
-        <el-collapse-item title="医院使用出库设置" v-if="inputQuery.mainAction!='WareHouseIn'">
+        <el-collapse-item title="出库单据设置" v-if="inputQuery.mainAction!='WareHouseIn'">
           <div style="width: 100%;margin-top: 15px">
             <el-row>
               <el-col span="5">
@@ -325,8 +334,8 @@
             <el-divider direction="vertical"></el-divider>
             <el-col span="5">
               <el-select v-model="inputQuery.scanPreIn" style="width: 65%"
-                         :disabled="inputQuery.corpType!=1 || inputQuery.mainAction== 'WareHouseIn'"
-                         placeholder="是否启用" clearable>
+                         :disabled=" inputQuery.mainAction == 'WareHouseIn' || inputQuery.corpType !== 1 || inputQuery.advancePreIn==1 || inputQuery.vailInv==1"
+                         placeholder="是否启用"   >
                 <el-option label="是" :value="true"></el-option>
                 <el-option label="否" :value="false"></el-option>
               </el-select>
@@ -338,6 +347,26 @@
           </el-row>
           <el-divider></el-divider>
 
+          <el-row>
+            <el-col span="5">
+              <span class="sptext">寄售使用禁止无库存出库</span>
+            </el-col>
+            <el-divider direction="vertical"></el-divider>
+            <el-col span="5">
+              <el-select v-model="inputQuery.advancePreIn" style="width: 65%"
+                         :disabled=" inputQuery.mainAction == 'WareHouseIn' || inputQuery.corpType !== 1 || inputQuery.scanPreIn==1 || inputQuery.vailInv==1"
+                         placeholder="是否启用"   >
+                <el-option label="是" :value="true"></el-option>
+                <el-option label="否" :value="false"></el-option>
+              </el-select>
+            </el-col>
+            <el-divider direction="vertical"></el-divider>
+            <el-col span="13">
+              <span class="sptext">寄售使用禁止无库存出库</span>
+            </el-col>
+          </el-row>
+          <el-divider></el-divider>
+
           <el-row>
             <el-col span="5">
               <span class="sptext">是否只允许有库存产品出库</span>
@@ -345,8 +374,8 @@
             <el-divider direction="vertical"></el-divider>
             <el-col span="5">
               <el-select v-model="inputQuery.vailInv" style="width: 65%"
-                         :disabled="inputQuery.corpType!=1 || inputQuery.mainAction!= 'WareHouseOut'"
-                         placeholder="是否启用" clearable
+                         :disabled=" inputQuery.mainAction!= 'WareHouseOut' || inputQuery.advancePreIn==1 || inputQuery.scanPreIn==1"
+                         placeholder="是否启用"
               >
                 <el-option label="启用" :value="true"></el-option>
                 <el-option label="不启用" :value="false"></el-option>
@@ -366,8 +395,8 @@
             <el-divider direction="vertical"></el-divider>
             <el-col span="5">
               <el-select v-model="inputQuery.useDyCount" style="width: 65%"
-                         :disabled="inputQuery.corpType!=1 || inputQuery.mainAction!= 'WareHouseOut'"
-                         placeholder="是否启用" clearable
+                         :disabled=" inputQuery.mainAction!= 'WareHouseOut'  || inputQuery.corpType != 1"
+                         placeholder="是否启用"
               >
                 <el-option label="是" :value="true"></el-option>
                 <el-option label="否" :value="false"></el-option>
@@ -380,6 +409,69 @@
           </el-row>
           <el-divider></el-divider>
 
+          <el-row>
+            <el-col span="5">
+              <span class="sptext">预验收剩余库存自动退库</span>
+            </el-col>
+            <el-divider direction="vertical"></el-divider>
+            <el-col span="5">
+              <el-select v-model="inputQuery.preInBack"
+                         :disabled="inputQuery.scanPreIn ==false " @change="getPreInBack"
+                         style="width: 65%"
+                         placeholder="是否退回"
+              >
+                <el-option label="是" :value="true"></el-option>
+                <el-option label="否" :value="false"></el-option>
+              </el-select>
+            </el-col>
+            <el-divider direction="vertical"></el-divider>
+            <el-col span="13">
+              <span class="sptext">预验收剩余库存自动退库</span>
+            </el-col>
+          </el-row>
+          <el-divider></el-divider>
+          <el-row v-if="inputQuery.preInBack==true">
+            <el-col span="5">
+              <span class="sptext">预验收剩余库存退库方式</span>
+            </el-col>
+            <el-divider direction="vertical"></el-divider>
+            <el-col span="5">
+              <el-select  v-model="inputQuery.backPreinType" style="width: 65%"   >
+                <el-option label="按单使用和退库" :value="1"></el-option>
+                <el-option label="按货位（仓库）使用和退库" :value="2"></el-option>
+              </el-select>
+            </el-col>
+            <el-divider direction="vertical"></el-divider>
+            <el-col span="13">
+              <span class="sptext">预验收剩余库存退库方式</span>
+            </el-col>
+          </el-row>
+
+          <el-divider></el-divider>
+          <el-row v-if="inputQuery.preInBack==true ">
+            <el-col span="5">
+              <span class="sptext">预验收退库单据类型</span>
+            </el-col>
+            <el-divider direction="vertical"></el-divider>
+            <el-col span="5">
+              <el-select  v-model="inputQuery.preInBackAction" style="width: 65%"   >
+                <el-option
+                  v-for="item in preInBackList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.action"
+                >
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-col>
+            <el-divider direction="vertical"></el-divider>
+            <el-col span="13">
+              <span class="sptext">预验收退库单据类型</span>
+            </el-col>
+          </el-row>
+
+
         </el-collapse-item>
 
         <el-collapse-item title="是否校验业务单设置">
@@ -435,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>
@@ -455,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>
@@ -475,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>
@@ -495,7 +587,7 @@
               <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>
@@ -515,7 +607,7 @@
               <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>
@@ -535,7 +627,7 @@
               <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>
@@ -554,7 +646,7 @@
               <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>
@@ -574,7 +666,7 @@
               <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>
@@ -593,7 +685,7 @@
               <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>
@@ -640,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>
@@ -660,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>
@@ -680,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>
@@ -700,7 +792,7 @@
               </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>
@@ -720,7 +812,7 @@
               </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>
@@ -740,7 +832,7 @@
               </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>
@@ -760,7 +852,7 @@
               </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>
@@ -780,7 +872,7 @@
               </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>
@@ -800,7 +892,7 @@
               </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>
@@ -849,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>
@@ -869,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>
@@ -889,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>
@@ -909,7 +1001,7 @@
               </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>
@@ -929,7 +1021,7 @@
               </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>
@@ -949,7 +1041,7 @@
               </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>
@@ -969,7 +1061,7 @@
               </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>
@@ -989,7 +1081,7 @@
               </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>
@@ -1009,7 +1101,7 @@
               </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>
@@ -1033,7 +1125,7 @@
 import {candidateBusType} from '@/api/basic/busType'
 import busTypeAdvancedSettings from '@/views/basic/busType/busTypeAdvancedSettings.vue'
 import {isBlank} from '@/utils/strUtil'
-import {getOriginBusType} from '@/api/basic/busOriginType'
+import {getOriginBusType,selectList} from '@/api/basic/busOriginType'
 import {getBasicUnitMaintains2} from '@/api/basic/basicUnitMaintain'
 
 export default {
@@ -1080,6 +1172,7 @@ export default {
         isBuType: true,
         isFilterBind: true
       },
+      preInBackList: [],
       orderTypeList: [],
       fromSpecialOptions: [],
       originTypes: [],
@@ -1133,6 +1226,7 @@ export default {
     },
 
     corpTypeChange(type) {
+      debugger
       if (type != 2) {
         this.inputQuery.genUnit = false
       }
@@ -1155,12 +1249,30 @@ export default {
       }
 
       if (this.inputQuery.corpType != 2) {    //往来类型非供应商时，采购方式未无
-        this.inputQuery.actionType = 0;
+        this.inputQuery.actionType = 1;
         this.inputQuery.spUse = 0;
       }
 
+      // if (this.inputQuery.corpType == 3) {//往来类型为内部科室
+      //   this.inputQuery.inStock = null;
+      //
+      // }
+
     },
 
+    selectBussinessList(){
+      selectList().then((res) => {
+        this.preInBackList=res.data;
+      })
+    },
+    getPreInBack(){
+      if(this.inputQuery.preInBack==false){
+        this.inputQuery.preInBackAction=null;
+        this.inputQuery.backPreinType='';
+      }else{
+        this.inputQuery.backPreinType=1;
+      }
+    },
     //获取单据类型
     getOrderType() {
       this.orderTypeList = []
@@ -1169,13 +1281,25 @@ export default {
         curAction: this.inputQuery.supplementOrderType
       }
       candidateBusType(query).then((response) => {
-        this.orderTypeList = response.data || []
+        let data = response.data || []
+        if (data != null && data.length > 0) {
+          for (var i = 0; i < data.length; i++) {
+            if (data[i].action != this.inputQuery.action) {
+              this.orderTypeList.push(data[i]);
+            }
+          }
+        }
+
       }).catch(() => {
 
       })
+      // if (this.inputQuery.mainAction != 'WareHouseIn') {
+      //   this.inputQuery.actionType = null
+      // }
 
-      if (this.inputQuery.mainAction != 'WareHouseIn') {
-        this.inputQuery.actionType = null
+      // 联动修改允许手动输入客户信息值
+      if (this.inputQuery.corpType != 1 || this.inputQuery.mainAction != "WarehouseOut") {
+        this.inputQuery.genUnit = false;
       }
     },
 
@@ -1229,7 +1353,14 @@ export default {
     }
     this.getList()
     this.findSpecialMethod()
+    this.selectBussinessList()
     this.oldData = Object.assign({}, this.inputQuery)
+    debugger
+    if(this.inputQuery.id==null || this.inputQuery.id==''){
+      this.inputQuery.codeFillCheck=false;
+      this.inputQuery.preInBack=false;
+    }
+
   }
 
 }
diff --git a/vue.config.js b/vue.config.js
index ebbd3f18..68b3fb0a 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -35,7 +35,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://192.168.0.66:9150/UDI_WMS_MC/`,
+        target: `http://192.168.0.43:9991/`,
         changeOrigin: true,
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",