diff --git a/src/role.js b/src/role.js
index e3dd15d..51be483 100644
--- a/src/role.js
+++ b/src/role.js
@@ -101,7 +101,7 @@ router.beforeEach((to, from, next) => {
                     //     accessedRouters[1].children.splice(5,1); //删除admin里面不显示的客户用户管理
                     //     accessedRouters[3].children.splice(8,1);//删除admin里面不显示的用户信息管理
                     // }
-                 
+
                     // 生成可访问的路由表
                     router.addRoutes(accessedRouters); // 动态添加可访问路由表
                     next({ ...to }); // hack方法 确保addRoutes已完成
@@ -112,7 +112,7 @@ router.beforeEach((to, from, next) => {
                 })
                 .catch(() => {
                     store.dispatch("fedLogout").then(() => {
-                        Message.error("验证失败,请重新登录");
+                        Message.error("登录失效,请重新登录");
                         let redirect = to.fullPath;
                         store.dispatch("loginOut").then(() => {
                             next({
diff --git a/src/utils/axios.js b/src/utils/axios.js
index f1380bf..7d43b0d 100644
--- a/src/utils/axios.js
+++ b/src/utils/axios.js
@@ -46,7 +46,7 @@ service.interceptors.response.use(
         if (data.code) {
             if (data.code === 2) {
                 store.dispatch("fedLogout").then(() => {
-                    Message.error("验证失败,请重新登录");
+                    Message.error("登录失效,请重新登录");
                     router.push({
                         path: "/login",
                         query: { redirect: router.currentRoute.fullPath } // 从哪个页面跳转过来
diff --git a/src/views/basic/UdiRlDetailDialog.vue b/src/views/basic/UdiRlDetailDialog.vue
index d8ec7b8..3171970 100644
--- a/src/views/basic/UdiRlDetailDialog.vue
+++ b/src/views/basic/UdiRlDetailDialog.vue
@@ -393,7 +393,7 @@ export default {
     methods: {
         getThirdSysDetail() {
             let query = {
-                id: this.editQuery.id,
+                id: this.editQuery.rlId,
             };
 
             thirdSysDetail(query)
diff --git a/src/views/warehouse/DialogSelectErpOrder.vue b/src/views/warehouse/DialogSelectErpOrder.vue
index 26e4486..a2b8a20 100644
--- a/src/views/warehouse/DialogSelectErpOrder.vue
+++ b/src/views/warehouse/DialogSelectErpOrder.vue
@@ -110,25 +110,30 @@
             >
                 <el-table-column label="序号" type="index"></el-table-column>
 
-                <el-table-column
-                    label="产品ID"
-                    prop="productId"
-                    :show-overflow-tooltip="true"
-                ></el-table-column>
 
                 <el-table-column
                     label="产品名称"
                     prop="productName"
                     :show-overflow-tooltip="true"
                 ></el-table-column>
+                <el-table-column
+                    label="规格型号"
+                    prop="spec"
+                    :show-overflow-tooltip="true"
+                ></el-table-column>
                 <el-table-column
                     label="批号"
                     prop="batchNo"
                     :show-overflow-tooltip="true"
                 ></el-table-column>
                 <el-table-column
-                    label="规格型号"
-                    prop="spec"
+                    label="生产日期"
+                    prop="productDate"
+                    :show-overflow-tooltip="true"
+                ></el-table-column>
+                <el-table-column
+                    label="失效日期"
+                    prop="expireDate"
                     :show-overflow-tooltip="true"
                 ></el-table-column>
                 <el-table-column label="单据数量" prop="count"></el-table-column>
diff --git a/src/views/warehouse/DialogSelectUnit.vue b/src/views/warehouse/DialogSelectUnit.vue
index 64e605b..501a82b 100644
--- a/src/views/warehouse/DialogSelectUnit.vue
+++ b/src/views/warehouse/DialogSelectUnit.vue
@@ -91,15 +91,15 @@ export default {
     },
     methods: {
         getUnitList() {
-            this.loading = true;
-            getBasicUnitMaintains(this.unitquery)
-                .then((response) => {
-                    this.loading = false;
-                    this.unitlist = response.data.page.list || [];
-                })
-                .catch(() => {
-                    this.loading = false;
-                });
+            // this.loading = true;
+            // getBasicUnitMaintains(this.unitquery)
+            //     .then((response) => {
+            //         this.loading = false;
+            //         this.unitlist = response.data.page.list || [];
+            //     })
+            //     .catch(() => {
+            //         this.loading = false;
+            //     });
         },
         getUnitListByCode(row) {
             let query = {
diff --git a/src/views/warehouse/addHosOrder.vue b/src/views/warehouse/addHosOrder.vue
index 1366a36..d545d76 100644
--- a/src/views/warehouse/addHosOrder.vue
+++ b/src/views/warehouse/addHosOrder.vue
@@ -591,6 +591,7 @@ export default {
         closeCodeDialog() {
             this.editCodeVisible = false;
             this.editOriginCodeVisible = false;
+            this.getCodeList();
         },
         editCode(row) {
             this.codeDetail = row;
diff --git a/src/views/warehouse/errorCode.vue b/src/views/warehouse/errorCode.vue
index ced106c..014fbc0 100644
--- a/src/views/warehouse/errorCode.vue
+++ b/src/views/warehouse/errorCode.vue
@@ -245,6 +245,7 @@ export default {
         },
         closeCodeDialog() {
             this.editCodeVisible = false;
+            this.getCodeList();
         },
         deleteDialog() {
             this.$confirm("是否删除所选条码?", "提示", {
diff --git a/src/views/warehouse/stockHospOrderNew.vue b/src/views/warehouse/stockHospOrderNew.vue
index bb3b35b..7cd707b 100644
--- a/src/views/warehouse/stockHospOrderNew.vue
+++ b/src/views/warehouse/stockHospOrderNew.vue
@@ -560,17 +560,9 @@ export default {
                             if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") {
                                 return this.$message.error('单据数量不能为0');
                             }
-                            // if (this.$isBlank(this.codeArray[i].batchNo)) {
-                            //     if (!this.codeArray[i].allowNoBatch) {
-                            //         return this.$message.error('批次号不能为空');
-                            //     }
-                            // }
                             if (this.$isBlank(this.codeArray[i].productDate) && this.$isBlank(this.codeArray[i].expireDate)) {
                                 return this.$message.error('生产日期与失效日期不能全部为空');
                             }
-                            // if (this.$isBlank(this.codeArray[i].expireDate)) {
-                            //     return this.$message.error('失效日期不能为空');
-                            // }
 
 
                         }
@@ -580,14 +572,6 @@ export default {
                             if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") {
                                 return this.$message.error('单据数量不能为0');
                             }
-
-                            // if (!this.$isBlank(this.codeArray[i].productDate && this.codeArray[i].productDate.length != 6)) {
-                            //     return this.$message.error('生产日期格式错误');
-                            // }
-                            // if (!this.$isBlank(this.codeArray[i].expireDate && this.codeArray[i].expireDate.length != 6)) {
-                            //     return this.$message.error('失效日期不能为空');
-                            // }
-
                         }
                     }
 
@@ -704,15 +688,12 @@ export default {
             this.loading = true;
             let tQuery = this.formData;
             tQuery.status = status;
-            // if (!this.orderEditor) {
             tQuery.subErpOrders = this.codeArray;
             if (status == '3') {
                 tQuery.subErpOrders.forEach((obj) => {
                     obj.reCount = obj.count;
                 });
             }
-
-
             insertStockOrderWeb(tQuery)
                 .then(response => {
                     this.loading = false;
diff --git a/src/views/warehouse/stockOrderEditDistribution.vue b/src/views/warehouse/stockOrderEditDistribution.vue
index ab7262c..768955c 100644
--- a/src/views/warehouse/stockOrderEditDistribution.vue
+++ b/src/views/warehouse/stockOrderEditDistribution.vue
@@ -135,6 +135,24 @@
                     </el-col>
 
                 </el-row>
+
+
+                <el-row :gutter="20" style="margin-top: -10px;">
+                    <el-col :span="3">
+                        <div class="ao-text">
+                            <span></span>
+                        </div>
+                    </el-col>
+                    <el-col :span="7">
+                        <el-form-item prop="type" style="margin-right: 20px;"
+                                      v-if="!(curAction.mainAction=='WareHouseIn' && curAction.corpType == 0)">
+                            <el-checkbox v-model="formData.noInvOut">允许无库存出库
+                            </el-checkbox>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+
             </el-card>
 
             <el-card>
@@ -263,33 +281,9 @@
                         </template>
                     </el-table-column>
                 </el-table>
-
-                <!--                <div class="block" v-if="orderEditor">-->
-                <!--                    <el-pagination-->
-                <!--                        @current-change="handleCurrentChange"-->
-                <!--                        layout="prev, pager, next"-->
-                <!--                        :page-size="query.limit"-->
-                <!--                        :total="total">-->
-                <!--                    </el-pagination>-->
-                <!--                </div>-->
             </el-card>
         </el-form>
 
-        <!--        <el-dialog-->
-        <!--            title="产品录入"-->
-        <!--            :visible.sync="selectProductVisible"-->
-        <!--            width="85%"-->
-        <!--            v-if="selectProductVisible"-->
-        <!--            :append-to-body='true'-->
-        <!--            :close-on-click-modal="false"-->
-        <!--            :close-on-press-escape="false"-->
-        <!--        >-->
-        <!--            <stockOrderNewSelectProduct-->
-        <!--                :closeDialog="closeDialogC2"-->
-        <!--                :data="thisData"-->
-        <!--            ></stockOrderNewSelectProduct>-->
-        <!--        </el-dialog>-->
-
 
         <el-dialog
             title="产品录入"
@@ -373,7 +367,21 @@ export default {
                 page: 1,
                 limit: 10,
             },
-            formData: {},
+            formData: {
+
+                noInvOut: false,
+                locStorageCode: null,
+                invWarehouseCode: null,
+                fromSubInvCode: null,
+                billNo: null,
+                billdate: "",
+                customerId: store.getters.customerId,
+                billType: "",
+                type: null,
+                corpName: "",
+                corpId: "",
+
+            },
             formRules: {
                 corpName: [
                     {required: true, message: "请输入供应商", trigger: "blur"}
@@ -1052,13 +1060,16 @@ export default {
             this.invChange();
         } else {
             this.formData = {
+                billNo: null,
                 billdate: "",
-                corpName: store.getters.companyName,
                 customerId: store.getters.customerId,
-                // billType: "deliveryNote",
                 billType: "",
-                type: "1",
-                // type: "",
+                type: "2",
+                corpName: "",
+                corpId: "",
+                noInvOut: "",
+                locStorageCode: store.getters.locInvCode,
+                invWarehouseCode: store.getters.locSubInvCode,
             };
             this.iCount = 0;
             this.orderEditor = false;
diff --git a/src/views/warehouse/stockOrderNew.vue b/src/views/warehouse/stockOrderNew.vue
index 9976624..d632389 100644
--- a/src/views/warehouse/stockOrderNew.vue
+++ b/src/views/warehouse/stockOrderNew.vue
@@ -109,11 +109,6 @@
                 </el-table-column>
                 <el-table-column label="当前分库" prop="subInvName" width="120">
                 </el-table-column>
-                <!--                <el-table-column label="采购类别" width="150">-->
-                <!--                    <template slot-scope="scope">-->
-                <!--                        {{ scope.row.type | typeFilterName }}-->
-                <!--                    </template>-->
-                <!--                </el-table-column>-->
                 <el-table-column label="操作" fixed="right" width="150">
                     <template slot-scope="scope">
                         <el-button
@@ -193,7 +188,7 @@
         </el-card>
 
         <el-dialog
-            title="编辑"
+            :title="formMap[formName]"
             :visible.sync="newDistributionVisible"
             width="80%"
             v-if="newDistributionVisible"
@@ -209,7 +204,7 @@
             ></stockOrderNewDistribution>
         </el-dialog>
         <el-dialog
-            title="编辑"
+            :title="formMap[formName]"
             :visible.sync="newSpDistributionVisible"
             width="80%"
             v-if="newSpDistributionVisible"
@@ -568,6 +563,15 @@ export default {
                     },
                 ],
             },
+
+
+            formMap: {
+                add: "新增业务单据",
+                edit: "编辑业务单据"
+            },
+
+            formName: null,
+
         }
     },
     methods: {
@@ -655,6 +659,9 @@ export default {
             if (this.$isNotBlank(row) && this.$isNotBlank(row.id)) {
                 this.idQuery.id = row.id;
                 this.idQuery.formData = row;
+                this.formName = "edit";
+            } else {
+                this.formName = "add";
             }
             if (store.getters.customerId == 110) {
                 this.newSpDistributionVisible = true;
diff --git a/src/views/warehouse/stockOrderNewDistribution.vue b/src/views/warehouse/stockOrderNewDistribution.vue
index 6bbe512..c26d782 100644
--- a/src/views/warehouse/stockOrderNewDistribution.vue
+++ b/src/views/warehouse/stockOrderNewDistribution.vue
@@ -563,6 +563,16 @@ export default {
                 // this.$refs.inputRef.focus();
             } else event.target.select();
             if (this.$isBlank(event)) {
+
+                if (this.$isBlank(this.formData.billType)) {
+                    this.$message.error("单据类型不能为空！")
+                    return;
+                }
+                if (this.$isBlank(this.formData.locStorageCode) || this.$isBlank(this.formData.invWarehouseCode)) {
+                    this.$message.error("当前仓库和当前分库不能为空！");
+                    return;
+                }
+
                 this.code = "";
                 this.$refs.multipleTable.setCurrentRow();
                 this.currentRow = {};