diff --git a/src/api/basic/invWarehouse.js b/src/api/basic/invWarehouse.js
index 7185f01..056625c 100644
--- a/src/api/basic/invWarehouse.js
+++ b/src/api/basic/invWarehouse.js
@@ -18,6 +18,16 @@ export function filterAll(query) {
         params: query
     });
 }
+
+export function filterNext(query) {
+    return axios({
+        url: "/spms/inv/warehouse/filterNext",
+        method: "get",
+        params: query
+    });
+}
+
+
 export function filterAllByLoc(query) {
     return axios({
         url: "/spms/inv/warehouse/filterAllLocInv",
diff --git a/src/views/basic/BasicEntrutsRece.vue b/src/views/basic/BasicEntrutsRece.vue
index d0197d2..0ab707c 100644
--- a/src/views/basic/BasicEntrutsRece.vue
+++ b/src/views/basic/BasicEntrutsRece.vue
@@ -186,6 +186,24 @@ export default {
 
 
         onAddSubmit() {
+
+            if (this.$isBlank(this.inputQuery.action)) {
+                this.$message.error("单据类型不能为空！");
+                return;
+            }
+            if (this.$isBlank(this.inputQuery.curInv)) {
+                this.$message.error("请输入委托仓库！");
+                return;
+            }
+            if (this.$isBlank(this.inputQuery.entrustInv)) {
+                this.$message.error("请输入委托验收人仓库！");
+                return;
+            }
+            if (this.$isBlank(this.inputQuery.entrustInv)) {
+                this.$message.error("请输入委托验收人！");
+                return;
+            }
+
             insertEntrustRece(this.inputQuery)
                 .then((response) => {
                     this.loading = false;
@@ -199,6 +217,22 @@ export default {
         },
 
         onModifySubmit() {
+            if (this.$isBlank(this.inputQuery.action)) {
+                this.$message.error("单据类型不能为空！");
+                return;
+            }
+            if (this.$isBlank(this.inputQuery.curInv)) {
+                this.$message.error("请输入委托仓库！");
+                return;
+            }
+            if (this.$isBlank(this.inputQuery.entrustInv)) {
+                this.$message.error("请输入委托验收人仓库！");
+                return;
+            }
+            if (this.$isBlank(this.inputQuery.entrustInv)) {
+                this.$message.error("请输入委托验收人！");
+                return;
+            }
             insertEntrustRece(this.inputQuery)
                 .then((response) => {
                     this.loading = false;
diff --git a/src/views/basic/BasicEntrutsReceModify.vue b/src/views/basic/BasicEntrutsReceModify.vue
index 1cd13e8..b20f92c 100644
--- a/src/views/basic/BasicEntrutsReceModify.vue
+++ b/src/views/basic/BasicEntrutsReceModify.vue
@@ -1,113 +1,112 @@
 <template>
     <div>
+        <el-form :model="inputQuery" :rules="formRules" ref="dataForm">
+
+
+            <el-row :gutter="20" class="el-row" type="flex">
+                <el-col :span="10" class="el-col">
+                    <div class="text item">
+                        <div class="itemTag">
+                            <span>扫码单据类型:&nbsp;</span>
+                        </div>
+                        <el-select v-model="inputQuery.action" placeholder="请选择" clearable @change="actionChange">
+                            <el-option
+                                v-for="item in busTypes"
+                                :key="item.localAction"
+                                :label="item.name"
+                                :value="item.localAction">
+                                <span style="float: left">{{ item.localName }}</span>
+                            </el-option>
+                        </el-select>
+                    </div>
+                </el-col>
+                <el-col :span="10" class="el-col">
+                    <div class="text item">
+                        <div class="itemTag">
+                            <span>委托仓库:&nbsp;</span>
+                        </div>
+                        <el-select v-model="inputQuery.curInv" placeholder="当前仓库" @change="invChange" clearable>
+                            <el-option
+                                v-for="item in storageList"
+                                :key="item.code"
+                                :label="item.name"
+                                :value="item.code">
+                                <span style="float: left">{{ item.name }}</span>
+                            </el-option>
+
+                        </el-select>
 
-        <el-row :gutter="20" class="el-row" type="flex">
-            <el-col :span="10" class="el-col">
-                <div class="text item">
-                    <div class="itemTag">
-                        <span>扫码单据类型:&nbsp;</span>
                     </div>
-                    <el-select v-model="inputQuery.action" placeholder="请选择" clearable  @change="actionChange">
-                        <el-option
-                            v-for="item in busTypes"
-                            :key="item.localAction"
-                            :label="item.name"
-                            :value="item.localAction">
-                            <span style="float: left">{{ item.localName }}</span>
-                        </el-option>
-                    </el-select>
-                </div>
-            </el-col>
-            <el-col :span="10" class="el-col">
-                <div class="text item">
-                    <div class="itemTag">
-                        <span>当前仓库:&nbsp;</span>
+                </el-col>
+
+            </el-row>
+            <el-row :gutter="20" class="el-row" type="flex">
+                <el-col :span="10" class="el-col">
+                    <div class="text item">
+                        <div class="itemTag">
+                            <span>委托验收人仓库:&nbsp;</span>
+                        </div>
+                        <el-select v-model="inputQuery.entrustInv" placeholder="委托验收人仓库" @change="entrustInvChange" clearable>
+                            <el-option
+                                v-for="item in entrustStorageList"
+                                :key="item.code"
+                                :label="item.name"
+                                :value="item.code">
+                                <span style="float: left">{{ item.name }}</span>
+                            </el-option>
+
+                        </el-select>
+
                     </div>
-                    <el-select v-model="inputQuery.curInv" placeholder="当前仓库" @change="invChange" clearable>
-                        <el-option
-                            v-for="item in storageList"
-                            :key="item.code"
-                            :label="item.name"
-                            :value="item.code">
-                            <span style="float: left">{{ item.name }}</span>
-                        </el-option>
-
-                    </el-select>
-
-                </div>
-            </el-col>
-
-        </el-row>
-        <el-row :gutter="20" class="el-row" type="flex">
-
-            <el-col :span="10" class="el-col">
-                <div class="text item">
-                    <div class="itemTag">
-                        <span>委托验收人:&nbsp;</span>
+                </el-col>
+                <el-col :span="10" class="el-col">
+                    <div class="text item">
+                        <div class="itemTag">
+                            <span>委托验收人:&nbsp;</span>
+                        </div>
+                        <el-select v-model="inputQuery.entrustUser" placeholder="委托验收人" clearable>
+                            <el-option
+                                v-for="item in entrustUserArray"
+                                :key="item.userid"
+                                :label="item.employeeName"
+                                :value="item.userid">
+                                <span style="float: left">{{ item.employeeName }}</span>
+                            </el-option>
+
+                        </el-select>
+
                     </div>
-                    <el-select v-model="inputQuery.entrustUser" placeholder="委托验收人">
-                        <el-option
-                            v-for="item in entrustUserArray"
-                            :key="item.userid"
-                            :label="item.employeeName"
-                            :value="item.userid">
-                            <span style="float: left">{{ item.employeeName }}</span>
-                        </el-option>
-
-                    </el-select>
-
-                </div>
-            </el-col>
-            <el-col :span="10" class="el-col">
-                <div class="text item">
-                    <div class="itemTag">
-                        <span>委托验收人仓库:&nbsp;</span>
+                </el-col>
+
+
+            </el-row>
+
+            <el-row :gutter="20" class="el-row" type="flex">
+
+                <el-col :span="10" class="el-col">
+                    <div class="text item">
+                        <div class="itemTag">
+                            <span>委托生成单据类型:&nbsp;</span>
+                        </div>
+                        <el-select v-model="inputQuery.entrustAction" placeholder="单据类型" clearable>
+                            <el-option
+                                v-for="item in entrustBusArray"
+                                :key="item.action"
+                                :label="item.name"
+                                :value="item.action">
+                                <span style="float: left">{{ item.name }}</span>
+                            </el-option>
+                        </el-select>
                     </div>
-                    <el-select v-model="inputQuery.entrustInv" placeholder="委托验收人仓库" @change="invChange">
-                        <el-option
-                            v-for="item in storageList"
-                            :key="item.code"
-                            :label="item.name"
-                            :value="item.code">
-                            <span style="float: left">{{ item.name }}</span>
-                        </el-option>
-
-                    </el-select>
-
-                </div>
-            </el-col>
-
-
-        </el-row>
-
-        <el-row :gutter="20" class="el-row" type="flex">
-
-            <el-col :span="10" class="el-col">
-                <div class="text item">
-                    <div class="itemTag">
-                        <span>委托生成单据类型:&nbsp;</span>
+                </el-col>
+                <el-col :span="4" class="el-col">
+                    <div class="text item">
+                        <el-checkbox v-model="inputQuery.finishRece">是否直接验收完成
+                        </el-checkbox>
                     </div>
-                    <el-select v-model="inputQuery.entrustAction" placeholder="单据类型">
-                        <el-option
-                            v-for="item in entrustBusArray"
-                            :key="item.action"
-                            :label="item.name"
-                            :value="item.action">
-                            <span style="float: left">{{ item.name }}</span>
-                        </el-option>
-
-                    </el-select>
-
-                </div>
-            </el-col>
-            <el-col :span="4" class="el-col">
-                <div class="text item">
-                    <el-checkbox v-model="inputQuery.finishRece">是否直接验收完成
-                    </el-checkbox>
-                </div>
-            </el-col>
-        </el-row>
-
+                </el-col>
+            </el-row>
+        </el-form>
     </div>
 </template>
 
@@ -120,7 +119,7 @@ import {
 import {
     getLocalJoinNoUse
 } from "../../api/basic/busLocalType";
-import {filterAll, filterAllByUser, warehouseBussinessTypeList, warehouseUserList} from "@/api/basic/invWarehouse";
+import {filterAll, filterNext, warehouseBussinessTypeList, warehouseUserList} from "@/api/basic/invWarehouse";
 import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
 import {filterNoUseBusType} from "@/api/basic/EntrustRece";
 
@@ -142,12 +141,27 @@ export default {
                 isFilterBind: true,
             },
             storageList: [],
+            entrustStorageList: [],
             orderTypeList: [],
             fromSpecialOptions: [],
             thirdSys: [],
             busTypes: [],
             entrustBusArray: [],
             entrustUserArray: [],
+            formRules: {
+                action: [
+                    {required: true, message: "请输入扫码单据类型", trigger: "blur"}
+                ],
+                curInv: [
+                    {required: true, message: "请输入委托仓库", trigger: "blur"}
+                ],
+                entrustInv: [
+                    {required: true, message: "请输入委托验收人仓库", trigger: "blur"}
+                ],
+                entrustUser: [
+                    {required: true, message: "请输入委托验收人", trigger: "blur"}
+                ],
+            },
         }
     },
     methods: {
@@ -181,6 +195,17 @@ export default {
                 .catch(() => {
                 });
         },
+
+        getEntrustStorage() {
+            this.entrustStorageList = [];
+            let nextQuery = {pcode: this.inputQuery.curInv};
+            filterNext(nextQuery)
+                .then((response) => {
+                    this.entrustStorageList = response.data || [];
+                })
+                .catch(() => {
+                });
+        },
         getOrderType() {
             filterNoUseBusType().then((response) => {
                 this.busTypes = response.data || [];
@@ -192,6 +217,8 @@ export default {
             let query = {
                 code: code
             }
+
+            this.inputQuery.entrustInv="";
             //加载用户数据
             warehouseUserList(query).then((res) => {
                 this.entrustUserArray = res.data;
@@ -205,10 +232,34 @@ export default {
             }).catch((error) => {
                 this.$message.error("单据类型数据加载失败")
             });
+            if (this.$isBlank(this.inputQuery.entrustInv)) {
+                this.inputQuery.entrustUser = null;
+            }
+            this.getEntrustStorage();
         },
 
-        actionChange(action){
+        entrustInvChange(code) {
+            let query = {
+                code: code
+            }
 
+            //加载用户数据
+            warehouseUserList(query).then((res) => {
+                this.entrustUserArray = res.data;
+            }).catch((error) => {
+                this.$message.error("用户数据加载失败")
+            });
+
+            //加载单据类型数据
+            warehouseBussinessTypeList(query).then((res) => {
+                this.entrustBusArray = res.data;
+            }).catch((error) => {
+                this.$message.error("单据类型数据加载失败")
+            });
+
+        },
+
+        actionChange(action) {
 
 
         }
@@ -224,9 +275,9 @@ export default {
         this.getOrderType();
         this.getList();
         this.getStorage();
-
+        this.getEntrustStorage();
         if (this.$isNotBlank(this.inputQuery.entrustInv)) {
-            this.invChange(this.inputQuery.entrustInv);
+            this.entrustInvChange(this.inputQuery.entrustInv);
         }
 
     },
diff --git a/src/views/thrsys/SysUdimsConfig.vue b/src/views/thrsys/SysUdimsConfig.vue
index ece3181..a4043da 100644
--- a/src/views/thrsys/SysUdimsConfig.vue
+++ b/src/views/thrsys/SysUdimsConfig.vue
@@ -1,171 +1,172 @@
 <template>
-  <el-card>
+    <el-card>
 
-    <el-descriptions class="margin-top" title="数据同步设置" :column="1" :size="100" border>
-      <template slot="extra">
-        <el-button type="primary" size="small" @click="saveConfig()">保存</el-button>
-      </template>
-      <el-descriptions-item>
-        <template slot="label">
-          参数设置
-        </template>
-        <el-row :gutter="20" class="el-row" type="flex">
-          <el-col :span="4" class="el-col" style="margin-top: 6px">
-            <el-checkbox v-model="configQuery.downstreamEnable">是否连通中继服务</el-checkbox>
-          </el-col>
-          <el-col :span="20" class="el-col">
-            <div>
-              <span>数据同步轮询时间(单位:分钟):&nbsp;</span>
-              <el-input
-                  style="width: 100px"
-                  size="small"
-                  type="number"
-                  v-model="configQuery.syncTime"
-                  splaceholder="请输入内容"
-              ></el-input>
-            </div>
-          </el-col>
-        </el-row>
+        <el-descriptions class="margin-top" title="数据同步设置" :column="1" :size="100" border>
+            <template slot="extra">
+                <el-button type="primary" size="small" @click="saveConfig()">保存</el-button>
+            </template>
+            <el-descriptions-item>
+                <template slot="label">
+                    参数设置
+                </template>
+                <el-row :gutter="20" class="el-row" type="flex">
+                    <el-col :span="4" class="el-col" style="margin-top: 6px">
+                        <el-checkbox v-model="configQuery.downstreamEnable">是否连通中继服务</el-checkbox>
+                    </el-col>
+                    <el-col :span="20" class="el-col">
+                        <div>
+                            <span>数据同步轮询时间(单位:分钟):&nbsp;</span>
+                            <el-input
+                                style="width: 100px"
+                                size="small"
+                                type="number"
+                                v-model="configQuery.syncTime"
+                                splaceholder="请输入内容"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                </el-row>
 
-      </el-descriptions-item>
+            </el-descriptions-item>
 
-      <el-descriptions-item>
-        <template slot="label">
-          单据类型
-        </template>
-        <el-checkbox v-model="configQuery.typeBus">业务单据类型</el-checkbox>
-        <el-checkbox v-model="configQuery.typeScan">扫码单据类型</el-checkbox>
-        <el-checkbox v-model="configQuery.typeThird">第三方单据类型</el-checkbox>
-      </el-descriptions-item>
+            <el-descriptions-item>
+                <template slot="label">
+                    单据类型
+                </template>
+                <el-checkbox v-model="configQuery.typeBus">业务单据类型</el-checkbox>
+                <el-checkbox v-model="configQuery.typeScan">扫码单据类型</el-checkbox>
+                <el-checkbox v-model="configQuery.typeThird">第三方单据类型</el-checkbox>
+            </el-descriptions-item>
 
-      <el-descriptions-item>
-        <template slot="label">
-          基础信息
-        </template>
-        <el-checkbox v-model="configQuery.basicProducts">耗材字典</el-checkbox>
-        <el-checkbox v-model="configQuery.basicCorp">往来单位字典</el-checkbox>
-        <el-checkbox v-model="configQuery.basicInv">仓库字典</el-checkbox>
-      </el-descriptions-item>
-      <el-descriptions-item>
-        <template slot="label">
-          第三方基础信息
-        </template>
-        <el-checkbox v-model="configQuery.basicThirdProducts">第三方产品信息</el-checkbox>
-        <el-checkbox v-model="configQuery.basicThirdCorp">第三方往来信息</el-checkbox>
-        <el-checkbox v-model="configQuery.basicThirdInv">第三方仓库信息</el-checkbox>
-        <el-checkbox v-model="configQuery.basicThirdBusOrder">第三方业务单据</el-checkbox>
-      </el-descriptions-item>
+            <el-descriptions-item>
+                <template slot="label">
+                    基础信息
+                </template>
+                <el-checkbox v-model="configQuery.sysUser">用户信息</el-checkbox>
+                <el-checkbox v-model="configQuery.basicProducts">耗材字典</el-checkbox>
+                <el-checkbox v-model="configQuery.basicCorp">往来单位字典</el-checkbox>
+                <el-checkbox v-model="configQuery.basicInv">仓库字典</el-checkbox>
+            </el-descriptions-item>
+            <el-descriptions-item>
+                <template slot="label">
+                    第三方基础信息
+                </template>
+                <el-checkbox v-model="configQuery.basicThirdProducts">第三方产品信息</el-checkbox>
+                <el-checkbox v-model="configQuery.basicThirdCorp">第三方往来信息</el-checkbox>
+                <el-checkbox v-model="configQuery.basicThirdInv">第三方仓库信息</el-checkbox>
+                <el-checkbox v-model="configQuery.basicThirdBusOrder">第三方业务单据</el-checkbox>
+            </el-descriptions-item>
 
-      <el-descriptions-item>
-        <template slot="label">
-          国家库DI数据
-        </template>
-        <el-checkbox v-model="configQuery.dbDiProducts">DI产品信息</el-checkbox>
-      </el-descriptions-item>
+            <el-descriptions-item>
+                <template slot="label">
+                    国家库DI数据
+                </template>
+                <el-checkbox v-model="configQuery.dbDiProducts">DI产品信息</el-checkbox>
+            </el-descriptions-item>
 
 
-    </el-descriptions>
+        </el-descriptions>
 
-    <el-descriptions class="margin-top" title="" :column="1" :size="100" style="margin-top: 30px" border>
-      <el-descriptions-item>
-        <template slot="label">
-          单据(单据状态)
-        </template>
-        <el-checkbox v-model="configQuery.orderUnCheck">待校验单据</el-checkbox>
-        <el-checkbox v-model="configQuery.orderUnReceive">未验收单据</el-checkbox>
-        <el-checkbox v-model="configQuery.orderScanFinish">已完成单据</el-checkbox>
-      </el-descriptions-item>
-      <el-descriptions-item label="单据(单据类型)" label-style="width: 150px">
+        <el-descriptions class="margin-top" title="" :column="1" :size="100" style="margin-top: 30px" border>
+            <el-descriptions-item>
+                <template slot="label">
+                    单据(单据状态)
+                </template>
+                <el-checkbox v-model="configQuery.orderUnCheck">待校验单据</el-checkbox>
+                <el-checkbox v-model="configQuery.orderUnReceive">未验收单据</el-checkbox>
+                <el-checkbox v-model="configQuery.orderScanFinish">已完成单据</el-checkbox>
+            </el-descriptions-item>
+            <el-descriptions-item label="单据(单据类型)" label-style="width: 150px">
 
-        <div style="float: right;margin-bottom: 10px;margin-right: 25px">
-          <el-button type="primary" size="small" @click="addBusTypeDialog()">添加扫码单据类型</el-button>
-        </div>
-        <el-table
-            :data="checkedBusTypes"
-            border
-            style="width: 100%"
-        >
-          <el-table-column label="序号" type="index"></el-table-column>
-          <el-table-column
-              label="单据类型"
-              prop="name"
-              show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-              label="单据类型代码"
-              prop="action"
-              show-overflow-tooltip
-          ></el-table-column>
+                <div style="float: right;margin-bottom: 10px;margin-right: 25px">
+                    <el-button type="primary" size="small" @click="addBusTypeDialog()">添加扫码单据类型</el-button>
+                </div>
+                <el-table
+                    :data="checkedBusTypes"
+                    border
+                    style="width: 100%"
+                >
+                    <el-table-column label="序号" type="index"></el-table-column>
+                    <el-table-column
+                        label="单据类型"
+                        prop="name"
+                        show-overflow-tooltip
+                    ></el-table-column>
+                    <el-table-column
+                        label="单据类型代码"
+                        prop="action"
+                        show-overflow-tooltip
+                    ></el-table-column>
 
-          <el-table-column label="操作" fixed="right">
-            <template slot-scope="scope">
-              <el-button
-                  type="text"
-                  size="small"
-                  @click.native="remveBus(scope.$index, scope.row)"
-              >移除
-              </el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
+                    <el-table-column label="操作" fixed="right">
+                        <template slot-scope="scope">
+                            <el-button
+                                type="text"
+                                size="small"
+                                @click.native="remveBus(scope.$index, scope.row)"
+                            >移除
+                            </el-button
+                            >
+                        </template>
+                    </el-table-column>
+                </el-table>
 
-      </el-descriptions-item>
+            </el-descriptions-item>
 
 
-      <!--      <el-descriptions-item label="单据(单据类型)" label-style="width: 150px">-->
-      <!--        <el-checkbox-group v-model="checkedBusTypes" @change="handleCheckedChange">-->
-      <!--          <el-checkbox-->
-      <!--              style="padding-top: 10px"-->
-      <!--              v-for="busType in busTypes" :label="busType" :key="busType.action"-->
-      <!--              :value="busType.action">{{ busType.name }}-->
-      <!--          </el-checkbox>-->
-      <!--        </el-checkbox-group>-->
-      <!--      </el-descriptions-item>-->
+            <!--      <el-descriptions-item label="单据(单据类型)" label-style="width: 150px">-->
+            <!--        <el-checkbox-group v-model="checkedBusTypes" @change="handleCheckedChange">-->
+            <!--          <el-checkbox-->
+            <!--              style="padding-top: 10px"-->
+            <!--              v-for="busType in busTypes" :label="busType" :key="busType.action"-->
+            <!--              :value="busType.action">{{ busType.name }}-->
+            <!--          </el-checkbox>-->
+            <!--        </el-checkbox-group>-->
+            <!--      </el-descriptions-item>-->
 
-    </el-descriptions>
+        </el-descriptions>
 
-    <el-dialog
-        title="添加扫码单据类型"
-        :visible.sync="addBusDialogVisible"
-        width="55%"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        v-if="addBusDialogVisible"
-    >
+        <el-dialog
+            title="添加扫码单据类型"
+            :visible.sync="addBusDialogVisible"
+            width="55%"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+            v-if="addBusDialogVisible"
+        >
 
-      <div style="float: right;margin-bottom: 10px;margin-right: 25px">
-        <el-button type="primary" size="small" @click="addBusType()">选入</el-button>
-      </div>
-      <el-table
-          :data="busTypes"
-          border
-          style="width: 100%"
-          @selection-change="handleCheckedChange"
-      >
-        <el-table-column type="selection" width="55" :selectable="checkSelectable"></el-table-column>
-        <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column
-            label="单据类型"
-            prop="name"
-            show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-            label="单据类型代码"
-            prop="action"
-            show-overflow-tooltip
-        ></el-table-column>
-      </el-table>
+            <div style="float: right;margin-bottom: 10px;margin-right: 25px">
+                <el-button type="primary" size="small" @click="addBusType()">选入</el-button>
+            </div>
+            <el-table
+                :data="busTypes"
+                border
+                style="width: 100%"
+                @selection-change="handleCheckedChange"
+            >
+                <el-table-column type="selection" width="55" :selectable="checkSelectable"></el-table-column>
+                <el-table-column label="序号" type="index"></el-table-column>
+                <el-table-column
+                    label="单据类型"
+                    prop="name"
+                    show-overflow-tooltip
+                ></el-table-column>
+                <el-table-column
+                    label="单据类型代码"
+                    prop="action"
+                    show-overflow-tooltip
+                ></el-table-column>
+            </el-table>
 
-      <el-pagination
-          :page-size="busQuery.limit"
-          @current-change="handleCurrentChange"
-          layout="prev, pager, next"
-          :total="total"
-      ></el-pagination>
+            <el-pagination
+                :page-size="busQuery.limit"
+                @current-change="handleCurrentChange"
+                layout="prev, pager, next"
+                :total="total"
+            ></el-pagination>
 
-    </el-dialog>
-  </el-card>
+        </el-dialog>
+    </el-card>
 </template>
 
 <script>
@@ -174,136 +175,137 @@ import store from "@/store";
 import {getBussinessType} from "@/api/basic/bussinessType";
 
 export default {
-  name: "SysUdimsConfig",
-  data() {
-    return {
-      configQuery: {
-        id: null,
-        typeBus: null,
-        typeScan: null,
-        typeThird: null,
-        basicProducts: null,
-        basicCorp: null,
-        basicInv: null,
-        basicThirdProducts: null,
-        basicThirdCorp: null,
-        basicThirdInv: null,
-        basicThirdBusOrder: null,
-        orderScanFinish: null,
-        dbDiProducts: null,
-        downstreamEnable: null,
-        syncTime: null,
-        orderUnCheck: null,
-        orderUnReceive: null,
-        busTypes: [],
-      },
-      checkedBusTypes: [],
-      busQuery: {
-        page: 1,
-        limit: 10,
-      },
-      busTypes: [],
-      multipleSelection: [],
-      addBusDialogVisible: false,
-      total: 0,
-    }
-  },
-  methods: {
-    getConfig() {
-      findConfig()
-          .then((response) => {
-            if (response.code == 20000) {
-              this.configQuery = response.data;
-              this.checkedBusTypes = [];
-              if (this.configQuery.busTypes != null) {
-                for (let i = 0; i < this.configQuery.busTypes.length; i++) {
+    name: "SysUdimsConfig",
+    data() {
+        return {
+            configQuery: {
+                id: null,
+                typeBus: null,
+                typeScan: null,
+                typeThird: null,
+                basicProducts: null,
+                sysUser: null,
+                basicCorp: null,
+                basicInv: null,
+                basicThirdProducts: null,
+                basicThirdCorp: null,
+                basicThirdInv: null,
+                basicThirdBusOrder: null,
+                orderScanFinish: null,
+                dbDiProducts: null,
+                downstreamEnable: null,
+                syncTime: null,
+                orderUnCheck: null,
+                orderUnReceive: null,
+                busTypes: [],
+            },
+            checkedBusTypes: [],
+            busQuery: {
+                page: 1,
+                limit: 10,
+            },
+            busTypes: [],
+            multipleSelection: [],
+            addBusDialogVisible: false,
+            total: 0,
+        }
+    },
+    methods: {
+        getConfig() {
+            findConfig()
+                .then((response) => {
+                    if (response.code == 20000) {
+                        this.configQuery = response.data;
+                        this.checkedBusTypes = [];
+                        if (this.configQuery.busTypes != null) {
+                            for (let i = 0; i < this.configQuery.busTypes.length; i++) {
 
-                  for (let k = 0; k < this.busTypes.length; k++) {
-                    if (this.busTypes[k].action == this.configQuery.busTypes[i]) {
-                      this.checkedBusTypes.push(this.busTypes[k]);
-                      this.busTypes[k].isSelect = true;
+                                for (let k = 0; k < this.busTypes.length; k++) {
+                                    if (this.busTypes[k].action == this.configQuery.busTypes[i]) {
+                                        this.checkedBusTypes.push(this.busTypes[k]);
+                                        this.busTypes[k].isSelect = true;
+                                    }
+                                }
+                            }
+                        }
+                    } else {
+                        this.$message.error(response.message);
                     }
-                  }
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                    this.total = 0;
+                });
+        },
+        saveConfig() {
+            if (this.checkedBusTypes != null) {
+                this.configQuery.busTypes = [];
+                for (let i = 0; i < this.checkedBusTypes.length; i++) {
+                    this.configQuery.busTypes.push(this.checkedBusTypes[i].action);
                 }
-              }
-            } else {
-              this.$message.error(response.message);
-            }
-          })
-          .catch(() => {
-            this.loading = false;
-            this.list = [];
-            this.total = 0;
-          });
-    },
-    saveConfig() {
-      if (this.checkedBusTypes != null) {
-        this.configQuery.busTypes = [];
-        for (let i = 0; i < this.checkedBusTypes.length; i++) {
-          this.configQuery.busTypes.push(this.checkedBusTypes[i].action);
-        }
-      }
-      updateConfig(this.configQuery)
-          .then((response) => {
-            this.loading = false;
-            if (response.code == 20000) {
-              this.$message.success("更新成功！");
-              this.getConfig();
             }
-          })
-          .catch(() => {
-            this.loading = false;
-          });
-    },
+            updateConfig(this.configQuery)
+                .then((response) => {
+                    this.loading = false;
+                    if (response.code == 20000) {
+                        this.$message.success("更新成功！");
+                        this.getConfig();
+                    }
+                })
+                .catch(() => {
+                    this.loading = false;
+                });
+        },
 
-    handleCheckedChange(val) {
-      this.multipleSelection = val;
-    },
+        handleCheckedChange(val) {
+            this.multipleSelection = val;
+        },
 
-    getBusType() {
-      getBussinessType(this.busQuery)
-          .then((response) => {
-            this.busTypes = response.data.list || [];
-            this.total = response.data.total || 0;
-            this.getConfig();
-          })
-          .catch(() => {
-          });
-    },
+        getBusType() {
+            getBussinessType(this.busQuery)
+                .then((response) => {
+                    this.busTypes = response.data.list || [];
+                    this.total = response.data.total || 0;
+                    this.getConfig();
+                })
+                .catch(() => {
+                });
+        },
 
-    addBusTypeDialog() {
-      this.addBusDialogVisible = true;
-      this.multipleSelection = [];
-    },
+        addBusTypeDialog() {
+            this.addBusDialogVisible = true;
+            this.multipleSelection = [];
+        },
 
-    addBusType(){
-      var selectData = this.multipleSelection;
-      selectData.forEach((obj) => {
-        this.checkedBusTypes.push(obj);
-      });
-      this.addBusDialogVisible = false;
-    },
+        addBusType() {
+            var selectData = this.multipleSelection;
+            selectData.forEach((obj) => {
+                this.checkedBusTypes.push(obj);
+            });
+            this.addBusDialogVisible = false;
+        },
 
 
-    remveBus(index,row){
-      this.checkedBusTypes.splice(index,1);
-    },
-    checkSelectable(row) {
-      return !row.isSelect;
+        remveBus(index, row) {
+            this.checkedBusTypes.splice(index, 1);
+        },
+        checkSelectable(row) {
+            return !row.isSelect;
+        },
+        handleCurrentChange(val) {
+            this.busQuery.page = val;
+            this.getBusType();
+        },
     },
-    handleCurrentChange(val) {
-      this.busQuery.page = val;
-      this.getBusType();
-    },
-  },
-  created() {
-    this.headers = {
-      ADMIN_ID: store.getters.adminId,
-      ADMIN_TOKEN: store.getters.token,
-    };
+    created() {
+        this.headers = {
+            ADMIN_ID: store.getters.adminId,
+            ADMIN_TOKEN: store.getters.token,
+        };
 
-    this.getBusType();
-  },
+        this.getBusType();
+    },
 }
 </script>
 
diff --git a/src/views/warehouse/addHosOrder.vue b/src/views/warehouse/addHosOrder.vue
index 4f3efb8..767144a 100644
--- a/src/views/warehouse/addHosOrder.vue
+++ b/src/views/warehouse/addHosOrder.vue
@@ -171,7 +171,7 @@
                         </el-checkbox>
 
                         <el-checkbox v-model="formData.preCheck"
-                                     :disabled="!curAction.changeEnable  ||corpOrderIdDisabled"
+                                     :disabled="corpOrderIdDisabled || curAction.corpType !=2"
                         >是否只采集预验收产品
                         </el-checkbox>
                     </div>