diff --git a/src/views/basic/busType/bussinessType.vue b/src/views/basic/busType/bussinessType.vue
index 6db810c..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>
@@ -155,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() {
@@ -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,
@@ -245,17 +259,17 @@ export default {
         thrCheckCopy: null,
         advancePreIn: false,
         checkVailDate: 0, //校验近效期
-        checkExpire: 0,   //校验过期
-        checkCertExpire: 0, //校验证书过期
+        checkExpire: true,   //校验过期
+        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;
+            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() {
       //默认初始化
       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;
+          this.$message.error('请选择预验收剩余库存退库方式！')
+          return
         }
         if (isBlank(this.inputQuery.preInBackAction)) {
-          this.$message.error("请选择预验收退库单据类型！");
-          return;
+          this.$message.error('请选择预验收退库单据类型！')
+          return
         }
 
       }
@@ -358,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("请选择特定页面！");
@@ -400,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,
@@ -466,7 +483,7 @@ export default {
         checkBalance: null,
         secCheckBalance: null,
         secCheckCopy: null,
-        corpType: null,
+        corpType: 2,
         storageCode: null,
         supplementOrderType: null,
         defaultUnit: null,
@@ -503,89 +520,90 @@ export default {
         thrCheckCopy: null,
         advancePreIn: false,
         checkVailDate: 0, //校验近效期
-        checkExpire: true,   //校验过期
-        checkCertExpire: false, //校验证书过期
+        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() {
-      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;
+            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 686e0c2..ad33b4a 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,9 +161,9 @@
           </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-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>
@@ -173,16 +173,6 @@
       </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=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-input
@@ -191,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
@@ -244,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>
@@ -261,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>
@@ -280,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>
@@ -300,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>
@@ -340,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>
@@ -360,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>
@@ -380,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>
@@ -401,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>
@@ -423,7 +418,7 @@
               <el-select v-model="inputQuery.preInBack"
                          :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>
@@ -441,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>
@@ -459,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"
@@ -532,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>
@@ -552,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>
@@ -572,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>
@@ -592,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>
@@ -612,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>
@@ -632,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>
@@ -651,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>
@@ -671,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>
@@ -690,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>
@@ -737,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>
@@ -757,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>
@@ -777,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>
@@ -797,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>
@@ -817,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>
@@ -837,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>
@@ -857,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>
@@ -877,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>
@@ -897,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>
@@ -946,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>
@@ -966,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>
@@ -986,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>
@@ -1006,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>
@@ -1026,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>
@@ -1046,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>
@@ -1066,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>
@@ -1086,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>
@@ -1106,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>
@@ -1130,7 +1125,7 @@
 import {candidateBusType} from '@/api/basic/busType'
 import busTypeAdvancedSettings from '@/views/basic/busType/busTypeAdvancedSettings.vue'
 import {isBlank} from '@/utils/strUtil'
-import {getOriginBusType, selectList} from '@/api/basic/busOriginType'
+import {getOriginBusType,selectList} from '@/api/basic/busOriginType'
 import {getBasicUnitMaintains2} from '@/api/basic/basicUnitMaintain'
 
 export default {
@@ -1255,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) {//往来类型为内部科室
@@ -1265,17 +1260,17 @@ export default {
 
     },
 
-    selectBussinessList() {
+    selectBussinessList(){
       selectList().then((res) => {
-        this.preInBackList = res.data;
+        this.preInBackList=res.data;
       })
     },
-    getPreInBack() {
-      if (this.inputQuery.preInBack == false) {
-        this.inputQuery.preInBackAction = null;
-        this.inputQuery.backPreinType = '';
-      } else {
-        this.inputQuery.backPreinType = 1;
+    getPreInBack(){
+      if(this.inputQuery.preInBack==false){
+        this.inputQuery.preInBackAction=null;
+        this.inputQuery.backPreinType='';
+      }else{
+        this.inputQuery.backPreinType=1;
       }
     },
     //获取单据类型
@@ -1361,9 +1356,9 @@ export default {
     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;
+    if(this.inputQuery.id==null || this.inputQuery.id==''){
+      this.inputQuery.codeFillCheck=false;
+      this.inputQuery.preInBack=false;
     }
 
   }