diff --git a/src/views/basic/BasicEntrutsRece.vue b/src/views/basic/BasicEntrutsRece.vue
index 5e09e65..aeb2de3 100644
--- a/src/views/basic/BasicEntrutsRece.vue
+++ b/src/views/basic/BasicEntrutsRece.vue
@@ -1,334 +1,357 @@
 <template>
-    <div>
-        <el-card>
-            <el-form :inline="true" :model="filterQuery" class="query-form" size="mini">
-                <el-form-item class="query-form-item">
-                    <el-input
-                        v-model="filterQuery.name"
-                        style="width: 250px"
-                        placeholder="单据类型名称"
-                    ></el-input>
-                </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="search" @click="getList">查询</el-button>
-                        <el-button type="primary" icon="search" @click="handleAddClick"
-                                   :disabled="!configParms.entrustAction"
-                        >新增
-                        </el-button
-                        >
-                    </el-button-group>
+  <div>
+    <el-card>
+      <el-form :inline="true" :model="filterQuery" class="query-form" size="mini">
+        <el-form-item class="query-form-item">
+          <el-input
+              v-model="filterQuery.name"
+              style="width: 250px"
+              placeholder="单据类型名称"
+          ></el-input>
+        </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="search" @click="getList">查询</el-button>
+            <el-button type="primary" icon="search" @click="handleAddClick"
+                       :disabled="!configParms.entrustAction"
+            >新增
+            </el-button
+            >
+          </el-button-group>
 
-                </el-form-item>
-            </el-form>
+        </el-form-item>
+      </el-form>
 
-            <el-table v-loading="loading" :data="list" style="width: 100%">
-                <el-table-column label="序号" type="index" width="60" fixed></el-table-column>
-                <el-table-column label="扫码单据类型" prop="curName" fixed></el-table-column>
-                <el-table-column label="当前仓库" prop="curInvName" fixed></el-table-column>
-                <el-table-column label="当前分库" prop="invWarehouseName" fixed></el-table-column>
-                <el-table-column label="委托验收仓库" prop="entrustInvName" fixed></el-table-column>
-                <el-table-column label="委托验收分库" prop="entrustSubInvName" fixed></el-table-column>
-                <el-table-column label="委托验收人" prop="employeeName" fixed>
-                </el-table-column>
-                <el-table-column label="操作" fixed="right">
-                    <template slot-scope="scope">
-                        <el-button
-                            type="text"
-                            size="small"
-                            :disabled="!configParms.entrustAction"
-                            @click.native.stop="handleModifyClick(scope.row)"
-                        >编辑
-                        </el-button
-                        >
-                        <el-button
-                            type="text"
-                            size="small"
-                            :disabled="!configParms.entrustAction"
-                            @click.native.stop="deleteDialog(scope.row)"
-                        >删除
-                        </el-button
-                        >
-                    </template>
+      <el-table v-loading="loading" :data="list" style="width: 100%">
+        <el-table-column label="序号" type="index" width="60" fixed></el-table-column>
+        <el-table-column label="扫码单据类型" prop="curName" fixed></el-table-column>
+        <el-table-column label="当前仓库" prop="curInvName" fixed></el-table-column>
+        <el-table-column label="当前分库" prop="invWarehouseName" fixed></el-table-column>
+        <el-table-column label="委托验收仓库" prop="entrustInvName" fixed></el-table-column>
+        <el-table-column label="委托验收分库" prop="entrustSubInvName" fixed></el-table-column>
+        <el-table-column label="委托验收人" prop="employeeName" fixed>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right">
+          <template slot-scope="scope">
+            <el-button
+                type="text"
+                size="small"
+                :disabled="!configParms.entrustAction"
+                @click.native.stop="handleModifyClick(scope.row)"
+            >编辑
+            </el-button
+            >
+            <el-button
+                type="text"
+                size="small"
+                :disabled="!configParms.entrustAction"
+                @click.native.stop="deleteDialog(scope.row)"
+            >删除
+            </el-button
+            >
+          </template>
 
-                </el-table-column>
-            </el-table>
+        </el-table-column>
+      </el-table>
 
-            <el-dialog
-                title="新增委托验收"
-                :visible.sync="addDialogVisible"
-                width="70%"
-                :close-on-click-modal="false"
-                :close-on-press-escape="false"
-                v-if="addDialogVisible"
-            >
-                <modifyDialog :inputQuery="inputQuery"></modifyDialog>
-                <div style="text-align: center">
-                    <el-button type="primary" size="small" icon="search" @click="onAddSubmit"
-                    >提交
-                    </el-button
-                    >
-                    <el-button type="primary" size="small" icon="search" @click="cancelDialog"
-                    >取消
-                    </el-button
-                    >
-                </div>
-            </el-dialog>
+      <el-dialog
+          title="新增委托验收"
+          :visible.sync="addDialogVisible"
+          width="70%"
+          :close-on-click-modal="false"
+          :close-on-press-escape="false"
+          v-if="addDialogVisible"
+      >
+        <modifyDialog :inputQuery="inputQuery"></modifyDialog>
+        <div style="text-align: center">
+          <el-button type="primary" size="small" icon="search" @click="onAddSubmit"
+          >提交
+          </el-button
+          >
+          <el-button type="primary" size="small" icon="search" @click="cancelDialog"
+          >取消
+          </el-button
+          >
+        </div>
+      </el-dialog>
 
-            <el-dialog
-                title="编辑委托验收"
-                :visible.sync="modifyDialogVisible"
-                width="70%"
-                :close-on-click-modal="false"
-                :close-on-press-escape="false"
-                v-if="modifyDialogVisible"
-            >
-                <modifyDialog :inputQuery="inputQuery"></modifyDialog>
-                <div style="text-align: center">
-                    <el-button type="primary" size="small" icon="search" @click="onModifySubmit"
-                    >提交
-                    </el-button
-                    >
-                    <el-button type="primary" size="small" icon="search" @click="cancelDialog"
-                    >取消
-                    </el-button
-                    >
-                </div>
-            </el-dialog>
-            <el-pagination
-                :page-size="filterQuery.limit"
-                @current-change="handleCurrentChange"
-                layout="prev, pager, next"
-                :total="total"
-                :current-page="filterQuery.page"
-            ></el-pagination>
-        </el-card>
-    </div>
+      <el-dialog
+          title="编辑委托验收"
+          :visible.sync="modifyDialogVisible"
+          width="70%"
+          :close-on-click-modal="false"
+          :close-on-press-escape="false"
+          v-if="modifyDialogVisible"
+      >
+        <modifyDialog :inputQuery="inputQuery"></modifyDialog>
+        <div style="text-align: center">
+          <el-button type="primary" size="small" icon="search" @click="onModifySubmit"
+          >提交
+          </el-button
+          >
+          <el-button type="primary" size="small" icon="search" @click="cancelDialog"
+          >取消
+          </el-button
+          >
+        </div>
+      </el-dialog>
+      <el-pagination
+          :page-size="filterQuery.limit"
+          @current-change="handleCurrentChange"
+          layout="prev, pager, next"
+          :total="total"
+          :current-page="filterQuery.page"
+      ></el-pagination>
+    </el-card>
+  </div>
 </template>
 <script>
 import {
-    getEntrustRece,
-    deleteEntrustRece,
-    updateEntrustRece,
-    insertEntrustRece,
+  getEntrustRece,
+  deleteEntrustRece,
+  updateEntrustRece,
+  insertEntrustRece,
 } from "../../api/basic/EntrustRece";
 
 import modifyDialog from "./BasicEntrutsReceModify";
 import {findConfig} from "@/api/thrsys/spsSyncStatus";
 
 export default {
-    data() {
-        return {
-            filterQuery: {
-                name: "",
-                page: 1,
-                limit: 20,
-            },
-            loading: false,
-            addDialogVisible: false,
-            modifyDialogVisible: false,
-            list: [],
-            inputQuery: {
-                action: "",
-                name: "",
-                entrustInv: "",
-                entrustUser: "",
-                entrustAction: null,
-                finishRece: false,
-                curInv: "",
-                entrustSubInv: "",
-                invWarehouseCode: "",
-                userId: null,
-            },
-            enableMap: {
-                true: "是",
-                false: "否",
-            },
-            mainActionMap: {
-                WareHouseIn: "入库",
-                WareHouseOut: "出库"
-            },
-            fileList: [],
-            total: 0,
-            multipleSelection: [],
-            uploadFileUrl: null,
-            headers: {},
-            configParms: {},
+  data() {
+    return {
+      filterQuery: {
+        name: "",
+        page: 1,
+        limit: 20,
+      },
+      loading: false,
+      addDialogVisible: false,
+      modifyDialogVisible: false,
+      list: [],
+      inputQuery: {
+        action: "",
+        name: "",
+        entrustInv: "",
+        entrustUser: "",
+        entrustAction: null,
+        finishRece: false,
+        curInv: "",
+        entrustSubInv: "",
+        invWarehouseCode: "",
+        userId: null,
+      },
+      enableMap: {
+        true: "是",
+        false: "否",
+      },
+      mainActionMap: {
+        WareHouseIn: "入库",
+        WareHouseOut: "出库"
+      },
+      fileList: [],
+      total: 0,
+      multipleSelection: [],
+      uploadFileUrl: null,
+      headers: {},
+      configParms: {},
+
 
+    };
+  },
 
-        };
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        name: "",
+        page: 1,
+        limit: 20,
+      };
+      this.getList();
+    },
+    cancelDialog() {
+      this.modifyDialogVisible = false;
+      this.addDialogVisible = false;
+    },
+    handleCurrentChange(val) {
+      this.filterQuery.page = val;
+      this.getList();
+    },
+    getList() {
+      this.loading = true;
+      getEntrustRece(this.filterQuery)
+          .then((response) => {
+            this.loading = false;
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+          })
+          .catch(() => {
+            this.loading = false;
+            this.list = [];
+            this.total = 0;
+          });
     },
 
-    methods: {
-        onReset() {
-            this.$router.push({
-                path: "",
-            });
-            this.filterQuery = {
-                name: "",
-                page: 1,
-                limit: 20,
-            };
-            this.getList();
-        },
-        cancelDialog() {
-            this.modifyDialogVisible = false;
-            this.addDialogVisible = false;
-        },
-        handleCurrentChange(val) {
-            this.filterQuery.page = val;
-            this.getList();
-        },
-        getList() {
-            this.loading = true;
-            getEntrustRece(this.filterQuery)
-                .then((response) => {
-                    this.loading = false;
-                    this.list = response.data.list || [];
-                    this.total = response.data.total || 0;
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                    this.total = 0;
-                });
-        },
 
+    onAddSubmit() {
 
-        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.entrustUser)) {
+        this.$message.error("请输入接受委托人！");
+        return;
+      }
 
-            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.entrustUser)) {
-                this.$message.error("请输入接受委托人！");
-                return;
-            }
-
-            if (this.$isBlank(this.inputQuery.invWarehouseCode)) {
-                this.$message.error("当前分库不能为空！");
-                return;
-            }
-            if (this.$isBlank(this.inputQuery.entrustSubInv)) {
-                this.$message.error("请输入接受委托分库！");
-                return;
-            }
+      if (this.$isBlank(this.inputQuery.invWarehouseCode)) {
+        this.$message.error("当前分库不能为空！");
+        return;
+      }
+      if (this.$isBlank(this.inputQuery.entrustSubInv)) {
+        this.$message.error("请输入接受委托分库！");
+        return;
+      }
 
+      if (this.$isBlank(this.inputQuery.entrustAction)) {
+        this.$message.error("请输入生成单据类型！");
+        return;
+      }
 
-            insertEntrustRece(this.inputQuery)
-                .then((response) => {
-                    this.loading = false;
-                    this.cancelDialog();
-                    this.getList();
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.cancelDialog();
-                });
-        },
 
-        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;
+      insertEntrustRece(this.inputQuery)
+          .then((response) => {
+            if (response.code == 20000) {
+              this.loading = false;
+              this.cancelDialog();
+              this.getList();
+            } else {
+              this.$message.error(response.message);
             }
-            if (this.$isBlank(this.inputQuery.entrustInv)) {
-                this.$message.error("请输入接受委托人！");
-                return;
-            }
-            updateEntrustRece(this.inputQuery)
-                .then((response) => {
-                    this.loading = false;
-                    this.cancelDialog();
-                    this.getList();
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.cancelDialog();
-                });
-        },
+          })
+          .catch(() => {
+            this.loading = false;
+            this.cancelDialog();
+          });
+    },
 
-        handleAddClick() {
-            this.inputQuery = {enable: true, expireTip: true};
-            this.addDialogVisible = true;
-        },
+    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.entrustUser)) {
+        this.$message.error("请输入接受委托人！");
+        return;
+      }
 
-        handleModifyClick(row) {
-            this.inputQuery = row;
-            this.modifyDialogVisible = true;
-        },
+      if (this.$isBlank(this.inputQuery.invWarehouseCode)) {
+        this.$message.error("当前分库不能为空！");
+        return;
+      }
+      if (this.$isBlank(this.inputQuery.entrustSubInv)) {
+        this.$message.error("请输入接受委托分库！");
+        return;
+      }
 
-        deleteDialog(rowId) {
-            this.$confirm("此操作将永久删除该委托验收信息, 是否继续?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            })
-                .then(() => {
-                    this.deleteOrders(rowId);
-                })
-                .catch(() => {
-                });
-        },
+      if (this.$isBlank(this.inputQuery.entrustAction)) {
+        this.$message.error("请输入生成单据类型！");
+        return;
+      }
+      updateEntrustRece(this.inputQuery)
+          .then((response) => {
+            this.loading = false;
+            this.cancelDialog();
+            this.getList();
+          })
+          .catch(() => {
+            this.loading = false;
+            this.cancelDialog();
+          });
+    },
 
-        deleteOrders(data) {
-            this.loading = true;
-            let tquery = {
-                id: data.id + "",
-            };
-            deleteEntrustRece(tquery)
-                .then((response) => {
-                    this.getList();
-                    if (response.code == 20000) {
-                        this.$message({
-                            type: "success",
-                            message: "删除成功！",
-                        });
-                    } else {
-                        this.$message.error(response.message);
-                    }
+    handleAddClick() {
+      this.inputQuery = {enable: true, expireTip: true};
+      this.addDialogVisible = true;
+    },
 
-                })
-                .catch(() => {
-                });
-        },
-        getSyncConfig() {
-            findConfig()
-                .then((response) => {
-                    if (response.code == 20000) {
-                        this.configParms = response.data;
-                    }
-                })
-                .catch(() => {
-                });
-        },
+    handleModifyClick(row) {
+      this.inputQuery = row;
+      this.modifyDialogVisible = true;
     },
-    components: {
-        modifyDialog,
+
+    deleteDialog(rowId) {
+      this.$confirm("此操作将永久删除该委托验收信息, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+          .then(() => {
+            this.deleteOrders(rowId);
+          })
+          .catch(() => {
+          });
     },
-    mounted() {
+
+    deleteOrders(data) {
+      this.loading = true;
+      let tquery = {
+        id: data.id + "",
+      };
+      deleteEntrustRece(tquery)
+          .then((response) => {
+            this.getList();
+            if (response.code == 20000) {
+              this.$message({
+                type: "success",
+                message: "删除成功！",
+              });
+            } else {
+              this.$message.error(response.message);
+            }
+
+          })
+          .catch(() => {
+          });
     },
-    created() {
-        this.getSyncConfig();
-        this.getList();
+    getSyncConfig() {
+      findConfig()
+          .then((response) => {
+            if (response.code == 20000) {
+              this.configParms = response.data;
+            }
+          })
+          .catch(() => {
+          });
     },
+  },
+  components: {
+    modifyDialog,
+  },
+  mounted() {
+  },
+  created() {
+    this.getSyncConfig();
+    this.getList();
+  },
 };
 </script>
diff --git a/src/views/basic/UdiInfoManage.vue b/src/views/basic/UdiInfoManage.vue
index d95a5d4..6a5b098 100644
--- a/src/views/basic/UdiInfoManage.vue
+++ b/src/views/basic/UdiInfoManage.vue
@@ -79,6 +79,7 @@
                 v-loading="loading"
                 :data="list"
                 style="width: 100%"
+                highlight-current-row
                 key="1"
                 @selection-change="handleSelectionChange"
             >
diff --git a/src/views/basic/basicCompanyProductsImport.vue b/src/views/basic/basicCompanyProductsImport.vue
index 2574361..15d6104 100644
--- a/src/views/basic/basicCompanyProductsImport.vue
+++ b/src/views/basic/basicCompanyProductsImport.vue
@@ -15,17 +15,17 @@
                 </el-form-item>
 
 
-                <el-form-item class="query-form-item">
-                    <el-select v-model="filterQuery.filterType" placeholder="请选择过滤对照条件">
-                        <el-option
-                            v-for="item in filterList"
-                            :key="item.filterType"
-                            :label="item.sysName"
-                            :value="item.filterType">
-                            <span style="float: left">{{ item.sysName }}</span>
-                        </el-option>
-                    </el-select>
-                </el-form-item>
+                <!--                <el-form-item class="query-form-item">-->
+                <!--                    <el-select v-model="filterQuery.filterType" placeholder="请选择过滤对照条件">-->
+                <!--                        <el-option-->
+                <!--                            v-for="item in filterList"-->
+                <!--                            :key="item.filterType"-->
+                <!--                            :label="item.sysName"-->
+                <!--                            :value="item.filterType">-->
+                <!--                            <span style="float: left">{{ item.sysName }}</span>-->
+                <!--                        </el-option>-->
+                <!--                    </el-select>-->
+                <!--                </el-form-item>-->
             </el-row>
 
             <el-row>
@@ -558,6 +558,7 @@
                     <el-col :span="12" class="el-col">
                         <el-form-item prop="name">
                             <el-checkbox v-model="checked" class="text item itemTag"
+                                         :disabled="true"
                             >以使用单元数量入库
                             </el-checkbox>
                         </el-form-item>
diff --git a/src/views/inventory/DialogInvProduct.vue b/src/views/inventory/DialogInvProduct.vue
index dbf7d50..d7e663e 100644
--- a/src/views/inventory/DialogInvProduct.vue
+++ b/src/views/inventory/DialogInvProduct.vue
@@ -97,7 +97,7 @@ export default {
             type: Function,
             required: true,
         },
-        invQueryData:{
+        invQueryData: {
             type: Object,
             required: true,
         }
@@ -115,6 +115,7 @@ export default {
                 supId: null,
                 unitFk: null,
                 invStorageCode: null,
+                invWarehouseCode: null,
             },
             detailQuery: {
                 code: null,
@@ -325,8 +326,12 @@ export default {
     created() {
         this.getBusType();
         let query = this.$route.query;
-        this.filterQuery.invStorageCode = this.invQueryData.locStorageCode;
+
         this.filterQuery = Object.assign(this.filterQuery, query);
+
+
+        this.filterQuery.invStorageCode = this.invQueryData.locStorageCode;
+        this.filterQuery.invWarehouseCode = this.invQueryData.invWarehouseCode;
         this.filterQuery.limit = parseInt(this.filterQuery.limit);
         // 加载表格数据
         this.getList();
diff --git a/src/views/inventory/invUdiTraceOrder.vue b/src/views/inventory/invUdiTraceOrder.vue
index 65368fc..b269756 100644
--- a/src/views/inventory/invUdiTraceOrder.vue
+++ b/src/views/inventory/invUdiTraceOrder.vue
@@ -250,7 +250,7 @@
             </el-table>
         </el-dialog>
         <el-dialog
-            title="选择erp业务单据"
+            title="选择业务单据"
             :visible.sync="addDialogVisible"
             width="80%"
             v-if="addDialogVisible"
diff --git a/src/views/thrsys/thrOrderNew.vue b/src/views/thrsys/thrOrderNew.vue
index 3e045c5..cece22e 100644
--- a/src/views/thrsys/thrOrderNew.vue
+++ b/src/views/thrsys/thrOrderNew.vue
@@ -489,9 +489,9 @@ export default {
                             if (this.$isBlank(this.codeArray[i].batchNo)) {
                                 return this.$message.error('批次号不能为空');
                             }
-                            if (this.$isBlank(this.codeArray[i].productDate) && this.$isBlank(this.codeArray[i].expireDate)) {
+                          /*  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('失效日期不能为空');
                             // }
diff --git a/src/views/warehouse/AdditionalOrder.vue b/src/views/warehouse/AdditionalOrder.vue
index d004582..561733d 100644
--- a/src/views/warehouse/AdditionalOrder.vue
+++ b/src/views/warehouse/AdditionalOrder.vue
@@ -234,7 +234,7 @@
         ></el-pagination>
 
         <el-dialog
-            title="新增订单"
+            title="编辑单据"
             :visible.sync="addOrderVisible"
             width="75%"
             :close-on-click-modal="false"
@@ -261,7 +261,7 @@ import {
 
 import draggable from "vuedraggable";
 import codeDetail from "./errorCode";
-import addOrder from "./addOrder";
+import addOrder from "./addHosOrder";
 import store from "../../store";
 import {getBussinessType} from "../../api/basic/bussinessType";
 import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
@@ -292,7 +292,6 @@ export default {
             },
             checkStatus: {
                 '-1': "等待提交",
-                // 1: "等待处理",
                 1: "等待处理",
                 2: "等待校验",
                 3: "校验异常",
@@ -556,9 +555,8 @@ export default {
             }
         },
         addOrders(row) {
-            this.idQuery.id = '';
-            this.idQuery.actDate = '';
-            this.idQuery.corpOrderId = '';
+
+            this.idQuery = row;
             this.idQuery.billType = row.action;
             this.idQuery.invName = row.invName;
             this.idQuery.subInvName = row.subInvName;
diff --git a/src/views/warehouse/IOCheckErrOrder.vue b/src/views/warehouse/IOCheckErrOrder.vue
index 18113c2..48b7280 100644
--- a/src/views/warehouse/IOCheckErrOrder.vue
+++ b/src/views/warehouse/IOCheckErrOrder.vue
@@ -364,6 +364,8 @@
         </el-card>
         <el-dialog
             title="选择往来单位"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
             :visible.sync="dialogTableVisible"
             width="70%"
         >
@@ -417,7 +419,9 @@
             </el-table>
         </el-dialog>
         <el-dialog
-            title="选择erp业务单据"
+            title="选择业务单据"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
             :visible.sync="addDialogVisible"
             width="80%"
             v-if="addDialogVisible"
@@ -432,6 +436,8 @@
 
         <el-dialog
             title="单号详情"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
             :visible.sync="codeDetailVisible"
             width="80%"
             v-if="codeDetailVisible"
@@ -446,6 +452,8 @@
         <el-dialog
             title="绑定产品ID"
             :visible.sync="selectRlVisible"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
             width="80%"
             v-if="selectRlVisible"
         >
@@ -911,11 +919,6 @@ export default {
                 });
         },
         intentDetail(row) {
-            // this.$router.push({
-            //   path: "../inout/detail",
-            //   query: { id: row.id },
-            // });
-
             this.codeDetailVisible = true;
             this.idQuery.id = row.id;
         },
diff --git a/src/views/warehouse/IONewOrder.vue b/src/views/warehouse/IONewOrder.vue
index 1e4282e..3c8d0bc 100644
--- a/src/views/warehouse/IONewOrder.vue
+++ b/src/views/warehouse/IONewOrder.vue
@@ -73,7 +73,7 @@
                         <el-form-item style="margin-right: 50px; margin-left: auto">
                             <el-button-group>
                                 <el-button type="primary" icon="search" @click="mergesOrders">合并单据</el-button>
-                                <el-button type="primary" icon="search" @click="addOrders">新增订单</el-button>
+                                <el-button type="primary" icon="search" @click="addOrders">新增单据</el-button>
                                 <el-button type="primary" icon="search" @click="errOrders">异常单据</el-button>
 
                             </el-button-group>
@@ -83,6 +83,7 @@
             </el-form>
 
             <el-table v-loading="loading" :data="list" style="width: 100%"
+                      highlight-current-row
                       @selection-change="handleSelectionChange">
                 <el-table-column type="selection" width="55"></el-table-column>
                 <el-table-column label="序号" type="index"></el-table-column>
@@ -221,7 +222,7 @@
             </el-dialog>
 
             <el-dialog
-                title="新增订单"
+                :title="formMap[formName]"
                 :visible.sync="addOrderVisible"
                 width="85%" append-to-body
                 :close-on-click-modal="false"
@@ -236,7 +237,7 @@
             </el-dialog>
 
             <el-dialog
-                title="新增订单"
+                :title="formMap[formName]"
                 :visible.sync="addHosOrderVisible"
                 width="75%"
                 append-to-body
@@ -314,7 +315,6 @@ export default {
             },
             checkStatus: {
                 '-1': "草稿",
-                // 1: "等待处理",
                 1: "等待处理",
                 2: "等待校验",
                 3: "校验异常",
@@ -350,8 +350,8 @@ export default {
             formName: null,
             errorDetail: "1111111111111",
             formMap: {
-                add: "新增",
-                edit: "编辑",
+                add: "新增单据",
+                update: "编辑单据",
             },
             fromTypeMap: {
                 "1": "UDIMS平台",
@@ -373,6 +373,7 @@ export default {
             formData: formJson,
             deleteLoading: false,
             busTypes: [],
+
         };
     },
     components: {
@@ -466,6 +467,7 @@ export default {
             this.idQuery.actDate = '';
             this.idQuery.corpOrderId = '';
 
+
             this.idQuery.outChangeEnable = row.outChangeEnable;
             if (row.id !== null && row.id !== undefined && row.id !== '') {
                 this.idQuery.id = row.id;
@@ -475,9 +477,10 @@ export default {
                 this.idQuery.locStorageCode = row.locStorageCode;
                 this.idQuery.invWarehouseCode = row.invWarehouseCode;
                 this.idQuery.fromSubInvCode = row.fromSubInvCode;
-
-
                 this.idQuery.preCheck = row.preCheck;
+                this.formName = "update";
+            } else {
+                this.formName = "add";
             }
 
             if (store.getters.customerId == 110) {
@@ -486,13 +489,10 @@ export default {
                 this.idQuery.fromCorp = row.fromCorp;
                 this.idQuery.fromCorpId = row.fromCorpId;
                 this.idQuery.preCheck = row.preCheck;
-
             } else {
                 this.idQuery.preCheck = row.preCheck;
                 this.addOrderVisible = true;
             }
-
-
         },
         errOrders() {
             this.errOrderVisible = true;
@@ -561,19 +561,24 @@ export default {
             let unit = repeatData[0].fromCorp;
             let action = repeatData[0].action;
             let orderList = [];
-            repeatData.forEach((obj, index) => {
-                if (unit !== obj.fromCorp) {
-                    this.$message.warning("往来单位不一致！");
+
+
+
+            for(let index in repeatData){
+                if (action !== repeatData[index].action) {
+                    this.$message.warning("业务类型不一致！");
                     return;
                 }
-                if (action !== obj.action) {
-                    this.$message.warning("业务类型不一致！");
+                if (unit !== repeatData[index].fromCorp) {
+                    this.$message.warning("往来单位不一致！");
                     return;
                 }
-                orderList.push(obj.id);
-            });
+
+                orderList.push(repeatData[index].id);
+            }
             let tquery = {
                 orderList: orderList,
+                type: 2,
             };
 
             this.$confirm(
diff --git a/src/views/warehouse/IOSearchOrder.vue b/src/views/warehouse/IOSearchOrder.vue
index 4129b33..dfb0385 100644
--- a/src/views/warehouse/IOSearchOrder.vue
+++ b/src/views/warehouse/IOSearchOrder.vue
@@ -80,7 +80,7 @@
                         <el-button-group>
                             <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
                             <el-button type="primary" icon="search" @click="onSubmit">查询</el-button>
-                            <el-button type="primary" icon="search" @click="exportOrders">导出单据</el-button>
+<!--                            <el-button type="primary" icon="search" @click="exportOrders">导出单据</el-button>-->
                         </el-button-group>
                     </el-form-item>
                 </el-row>
@@ -350,7 +350,7 @@
             </el-table>
         </el-dialog>
         <el-dialog
-            title="选择erp业务单据"
+            title="选择业务单据"
             :visible.sync="addDialogVisible"
             width="80%"
             v-if="addDialogVisible"
diff --git a/src/views/warehouse/IOWaitOrder.vue b/src/views/warehouse/IOWaitOrder.vue
index 8d0dea6..03d0748 100644
--- a/src/views/warehouse/IOWaitOrder.vue
+++ b/src/views/warehouse/IOWaitOrder.vue
@@ -376,7 +376,7 @@
         </el-dialog>
 
         <el-dialog
-            title="单号详情"
+            title="条码详情"
             :visible.sync="codeDetailVisible"
             width="80%"
             v-if="codeDetailVisible"
@@ -656,19 +656,23 @@ export default {
             let unit = repeatData[0].fromCorp;
             let action = repeatData[0].action;
             let orderList = [];
-            repeatData.forEach((obj, index) => {
-                if (unit !== obj.fromCorp) {
-                    this.$message.warning("往来单位不一致！");
+
+
+            for (let index in repeatData) {
+                if (action !== repeatData[index].action) {
+                    this.$message.warning("业务类型不一致！");
                     return;
                 }
-                if (action !== obj.action) {
-                    this.$message.warning("业务类型不一致！");
+                if (unit !== repeatData[index].fromCorp) {
+                    this.$message.warning("往来单位不一致！");
                     return;
                 }
-                orderList.push(obj.id);
-            });
+                orderList.push(repeatData[index].id);
+            }
+
             let tquery = {
                 orderList: orderList,
+                type: 1,
             };
 
             this.$confirm(
diff --git a/src/views/warehouse/addHosOrder.vue b/src/views/warehouse/addHosOrder.vue
index d545d76..73fef8e 100644
--- a/src/views/warehouse/addHosOrder.vue
+++ b/src/views/warehouse/addHosOrder.vue
@@ -364,6 +364,8 @@
         <el-dialog
             :title="selectUnitTitle"
             :visible.sync="dialogTableVisible"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
             v-if="dialogTableVisible"
             width="70%"
             append-to-body
@@ -378,6 +380,8 @@
             :title="selectRlTitle"
             :visible.sync="selectRlVisible"
             width="80%"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
             v-if="selectRlVisible"
             append-to-body
         >
@@ -393,6 +397,8 @@
             :title="editTitle"
             :visible.sync="editCodeVisible"
             append-to-body width="70%"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
             v-if="editCodeVisible"
         >
             <editCodeDialog
@@ -406,6 +412,8 @@
             :title="editTitle"
             :visible.sync="editOriginCodeVisible"
             append-to-body width="70%"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
             v-if="editOriginCodeVisible">
             <editCodeDialog
                 :closeCodeDialog="closeCodeDialog"
@@ -646,7 +654,7 @@ export default {
                     } else if (response.code == 508) {
                         this.originCode = "";
                         this.formData.code = "01" + response.data.nameCode;
-                        this.originCode =this.formData.code ;
+                        this.originCode = this.formData.code;
                     } else {
                         this.$alert(response.message, '提示', {
                             confirmButtonText: '确定',
@@ -886,7 +894,7 @@ export default {
                             this.formData.vailInv = this.curAction.vailInv;
                             this.formData.codeFillCheck = this.curAction.codeFillCheck;
                         } else {
-                            this.curAction = {corpType:0,genUnit: false,changeEnable:false,};
+                            this.curAction = {corpType: 0, genUnit: false, changeEnable: false,};
                             this.formData.action = null;
                         }
 
@@ -1150,8 +1158,6 @@ export default {
         this.formData.actDate = new Date();
         this.codeArray = [];
         this.getStorage(this.formData.action);
-        this.findSubInvByInv();
-        this.findSubStorageMethod();
         if (this.$isNotBlank(this.idQuery.id)) {
             this.formData.actDate = new Date(this.idQuery.actDate);
             this.formData.corpOrderId = this.idQuery.corpOrderId;
@@ -1186,7 +1192,8 @@ export default {
                 this.findStorageMethod();
             }
         }
-
+        this.findSubInvByInv(this.formData.locStorageCode);
+        this.findSubStorageMethod();
         this.getBusType();
 
 
diff --git a/src/views/warehouse/code.vue b/src/views/warehouse/code.vue
index 1d2124d..cf570ea 100644
--- a/src/views/warehouse/code.vue
+++ b/src/views/warehouse/code.vue
@@ -2,7 +2,7 @@
     <div>
         <el-form :inline="true" :model="query" class="query-form" size="mini">
             <el-form-item class="query-form-item">
-                <el-input v-model="query.code" placeholder="条码查询"></el-input>
+                <el-input v-model="query.code" placeholder="条码查询" style="width: 300px"></el-input>
             </el-form-item>
 
             <el-form-item>
diff --git a/src/views/warehouse/errorCode.vue b/src/views/warehouse/errorCode.vue
index 014fbc0..b144edb 100644
--- a/src/views/warehouse/errorCode.vue
+++ b/src/views/warehouse/errorCode.vue
@@ -29,7 +29,6 @@
         >
             <el-table-column type="selection" width="55"></el-table-column>
             <el-table-column label="序号" type="index" fixed></el-table-column>
-            <!-- <el-table-column label="ID" prop="id" fixed></el-table-column> -->
             <el-table-column label="条码" prop="code" show-overflow-tooltip fixed></el-table-column>
             <el-table-column
                 label="生产日期"
@@ -62,13 +61,6 @@
                 width="220"
                 show-overflow-tooltip
             ></el-table-column>
-            <!--            <el-table-column label="创建时间" prop="actDate">-->
-            <!--                <template slot-scope="scope">-->
-            <!--                    <i class="el-icon-time"></i>-->
-            <!--                    <span>{{ scope.row.actDate }}</span>-->
-            <!--                </template>-->
-            <!--            </el-table-column>-->
-
 
             <el-table-column label="操作" fixed="right" width="250">
                 <template slot-scope="scope">
@@ -80,14 +72,6 @@
                     >编辑
                     </el-button
                     >
-
-                    <!--                    <el-button-->
-                    <!--                        type="text"-->
-                    <!--                        size="small"-->
-                    <!--                        @click.native.stop="deleteCode(scope.$index, scope.row)"-->
-                    <!--                    >删除-->
-                    <!--                    </el-button-->
-                    <!--                    >-->
                     <el-button
                         type="text"
                         size="small"
@@ -95,7 +79,6 @@
                     >选择产品
                     </el-button
                     >
-                    <!--                      :disabled="scope.row.relId != null "-->
                     <el-button
                         type="text"
                         size="small"
@@ -103,7 +86,6 @@
                     >选择供应商
                     </el-button
                     >
-                    <!--                        :disabled=" scope.row.supId !=null"-->
                 </template>
             </el-table-column>
 
@@ -295,7 +277,6 @@ export default {
                 });
         },
         intentBack() {
-            //  this.$router.push({path:'../readme/detail',query:{id:row.corpOrderId}});
             this.$router.go(-1);
         },
         //绑定数据
@@ -355,7 +336,6 @@ export default {
         rowStyle({row, rowIndex}) {
             let rowBackground = {};
             if (row.supId == null || row.relId == null) {
-                //rowBackground.background="#f6f5ee";
                 rowBackground.color = '#f60303';
             }
 
diff --git a/src/views/warehouse/stockHospOrderNew.vue b/src/views/warehouse/stockHospOrderNew.vue
index 7cd707b..fad741e 100644
--- a/src/views/warehouse/stockHospOrderNew.vue
+++ b/src/views/warehouse/stockHospOrderNew.vue
@@ -560,9 +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].productDate) && this.$isBlank(this.codeArray[i].expireDate)) {
-                                return this.$message.error('生产日期与失效日期不能全部为空');
-                            }
+                            // if (this.$isBlank(this.codeArray[i].productDate) && this.$isBlank(this.codeArray[i].expireDate)) {
+                            //     return this.$message.error('生产日期与失效日期不能全部为空');
+                            // }
 
 
                         }
@@ -740,7 +740,6 @@ export default {
         selectProductFunction(event) {
 
             if (event == null) {
-                // this.$refs.inputRef.focus();
             } else {
                 event.target.select();
             }
@@ -771,12 +770,14 @@ export default {
                 if (item.mainAction == 'WareHouseOut' && this.formData.noInvOut != true) {
                     this.invQueryData = {
                         locStorageCode: this.formData.locStorageCode,
+                        invWarehouseCode: this.formData.invWarehouseCode,
                     };
                     this.selectInvProductVisible = true;
                 } else if (item.mainAction == "WareHouseIn" && this.curAction.corpType == 1 && this.formData.noInvOut != true) {
 
                     this.invQueryData = {
                         locStorageCode: this.formData.corpId,
+                        invWarehouseCode: this.formData.fromSubInvCode,
                     };
                     this.selectInvProductVisible = true;
                 } else {
@@ -800,7 +801,6 @@ export default {
                 code: this.code,
                 customerId: store.getters.customerId,
             };
-
             stockOrderDetailQueryProduct(tQuery).then((response) => {
                 this.loading = false;
                 if (response.code === 20000) {
@@ -835,12 +835,9 @@ export default {
                     }
                 } else {
                     this.$message.warning(response.message);
-                    // this.focusNext('inputRef');
                     if (this.$isNotBlank(event)) {
                         event.target.select();
                     }
-                    // event.target.select();
-                    // event.currentTarget.select();
                 }
             });
 
@@ -870,35 +867,13 @@ export default {
 
             this.focusNext('iCount');
 
-            // let sc = this.selectedIndex + 'reCount';
-            // const _this = this;
-            // this.$nextTick(() => {
-            //     setTimeout(function() {
-            //         console.log(sc);
-            //         console.log(_this.$refs[sc]);
-            //         console.log(_this.$refs[sc].focus());
-            //         _this.$refs[sc].focus();
-            //     }, 1)
-            //     // this.$refs['inputBatchNoRef'][0].focus()
-            // })
-        },
-        iCountChange() {
-            // console.log(this.iCount)
-            // this.currentRow.count = this.iCount;
-            // this.currentRow.reCount = this.iCount;
         },
         iCountEnterFunction() {
             if (this.$isNotBlank(this.currentRow)) {
                 this.currentRow.count = this.iCount;
-                // this.currentRow.reCount = this.iCount;
             }
             this.focusNext('inputRef');
         },
-        tableCountChange(row) {
-            if (this.$isNotBlank(row)) {
-                // row.count = row.reCount;
-            }
-        },
         tableRowClassName({row, rowIndex}) {
             row.index = rowIndex;
         },
@@ -990,13 +965,6 @@ export default {
             if (this.$isBlank(row.batchNo)) {
                 return this.$message.error('批次号不能为空');
             }
-            // if (this.$isBlank(row.productDate)) {
-            //     return this.$message.error('生产日期不能为空');
-            // }
-            // if (this.$isBlank(row.expireDate)) {
-            //     return this.$message.error('失效日期不能为空');
-            // }
-
             this.$refs.multipleTable.setCurrentRow();
             this.currentRow = {};
             this.selectedIndex = "";
@@ -1035,7 +1003,6 @@ export default {
                                 this.detailLoading = false;
                                 if (response.code === 20000) {
                                     this.$message.success(response.data);
-                                    // this.getStockOrderDetailList();
                                     this.codeArray.splice(index, 1);
                                 } else {
                                     this.$message.error(response.message);
@@ -1062,21 +1029,6 @@ export default {
                 cancelButtonText: "取消",
                 type: "warning",
             }).then(() => {
-                // let tQuery = {
-                //     id: row.id
-                // }
-                // this.detailLoading = true;
-                // copyStockOrderDetail(tQuery)
-                //     .then((response) => {
-                //         this.detailLoading = false;
-                //         if (response.code === 20000) {
-                //             this.$message.success("复制成功");
-                //             this.getStockOrderDetailList();
-                //         } else {
-                //             this.$message.error(response.message);
-                //         }
-                //     });
-
                 let rData = JSON.parse(JSON.stringify(row));
                 rData.id = null;
                 if (this.codeArray.length === 0) {
@@ -1128,23 +1080,6 @@ export default {
         intentBack() {
             this.$router.go(-1);
         },
-        // generateBillNo() {
-        //     let tQuery = {
-        //         action: this.formData.billType
-        //     }
-        //     this.loading = true;
-        //     stockOrderGenerateBillNo(tQuery)
-        //         .then((response) => {
-        //             this.loading = false;
-        //             if (response.code === 20000) {
-        //                 this.formData.billNo = response.data;
-        //                 // this.formData.billdate = parseTime(new Date(), '{y}{m}{d}');
-        //                 this.formData.billdate = new Date();
-        //             } else {
-        //                 this.closeDialog(true);
-        //             }
-        //         });
-        // },
         getBusType() {
             let query = {
                 code: this.formData.invWarehouseCode,
@@ -1233,8 +1168,6 @@ export default {
             this.getBusType();
         },
         invChange() {
-            /*if (this.$isNotBlank(this.formData.invWarehouseCode))
-                this.formData.invWarehouseCode = null;*/
             this.findSubInvs();
         },
 
@@ -1289,7 +1222,6 @@ export default {
             this.iCount = 0;
             this.orderEditor = false;
             this.formData.billdate = new Date();
-            // this.generateBillNo();
         }
         this.findMethod();
         this.getBusType();
diff --git a/src/views/warehouse/stockOrder.vue b/src/views/warehouse/stockOrder.vue
index 492c41e..6165fb4 100644
--- a/src/views/warehouse/stockOrder.vue
+++ b/src/views/warehouse/stockOrder.vue
@@ -332,7 +332,7 @@
         </el-dialog>
 
         <el-dialog
-            title="码详情"
+            title="内部码详情"
             :visible.sync="qrcodeDetailVisible"
             :close-on-click-modal="false"
             :close-on-press-escape="false"
diff --git a/src/views/warehouse/stockOrderDelSearch.vue b/src/views/warehouse/stockOrderDelSearch.vue
index 0fe9d1a..eb7c0d7 100644
--- a/src/views/warehouse/stockOrderDelSearch.vue
+++ b/src/views/warehouse/stockOrderDelSearch.vue
@@ -6,7 +6,6 @@
                 :model="query"
                 class="query-form"
                 size="mini"
-
             >
                 <el-row style="width: 100%">
                     <el-form-item class="query-form-item">
@@ -81,10 +80,6 @@
                       :data="list"
                       style="width: 100%; " highlight-current-row
                       @row-click="getStockOrderDetailList" ref="multipleTable">
-                <!--<el-table-column
-                    type="selection"
-                    width="55">
-                </el-table-column>-->
                 <el-table-column type="index" label="序号" width="50"></el-table-column>
                 <el-table-column label="单据号" prop="billNo" show-overflow-tooltip></el-table-column>
                 <el-table-column label="往来单位" prop="corpName" show-overflow-tooltip></el-table-column>
@@ -105,20 +100,8 @@
                 </el-table-column>
                 <el-table-column label="当前分库" prop="subInvName" width="120">
                 </el-table-column>
-                <!--                <el-table-column label="采购类型">-->
-                <!--                    <template slot-scope="scope">-->
-                <!--                        {{ scope.row.type | typeFilterName }}-->
-                <!--                    </template>-->
-                <!--                </el-table-column>-->
                 <el-table-column label="操作" fixed="right" width="200">
                     <template slot-scope="scope">
-                        <!--                        <el-button-->
-                        <!--                            type="text"-->
-                        <!--                            size="small"-->
-                        <!--                            @click.native="qrcodeDetail(scope.row)"-->
-                        <!--                        >码详情-->
-                        <!--                        </el-button-->
-                        <!--                        >-->
                         <el-button
                             type="text"
                             size="small"
diff --git a/src/views/warehouse/stockOrderEdit.vue b/src/views/warehouse/stockOrderEdit.vue
index bee8014..c4e23de 100644
--- a/src/views/warehouse/stockOrderEdit.vue
+++ b/src/views/warehouse/stockOrderEdit.vue
@@ -9,6 +9,7 @@
 
             <el-table v-loading="detailLoading"
                       :data="detailList"
+                      highlight-current-row
                       @selection-change="changeFun"
                       style="width: 100%">
 
diff --git a/src/views/warehouse/stockOrderEditDistribution.vue b/src/views/warehouse/stockOrderEditDistribution.vue
index 768955c..9617da0 100644
--- a/src/views/warehouse/stockOrderEditDistribution.vue
+++ b/src/views/warehouse/stockOrderEditDistribution.vue
@@ -478,9 +478,9 @@ export default {
                             //         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].productDate) && this.$isBlank(this.codeArray[i].expireDate)) {
+                            //     return this.$message.error('生产日期与失效日期不能全部为空');
+                            // }
                             if (this.$isBlank(this.codeArray[i].reCount) || this.codeArray[i].reCount < 1) {
                                 return this.$message.error('配货数量不能小于0');
                             }
diff --git a/src/views/warehouse/stockOrderEditor.vue b/src/views/warehouse/stockOrderEditor.vue
index e2bae02..ec8da7c 100644
--- a/src/views/warehouse/stockOrderEditor.vue
+++ b/src/views/warehouse/stockOrderEditor.vue
@@ -374,16 +374,6 @@
                     </el-col>
                     <el-col :span="7">
                         <el-form-item prop="productDate">
-                            <!--              <el-input v-model="detailFormData.productDate" auto-complete="off"-->
-                            <!--                        :disabled="false"></el-input>-->
-                            <!--                            <el-date-picker-->
-                            <!--                                type="date"-->
-                            <!--                                size="small" v-model="detailFormData.productDate"-->
-                            <!--                                placeholder="请选择生产日期" style="width: 80%"-->
-                            <!--                                value-format="yyMMdd"-->
-                            <!--                                format="yyyy-MM-dd"-->
-                            <!--                            >-->
-                            <!--                            </el-date-picker>-->
                             <el-input v-model="detailFormData.productDate" auto-complete="off"
                                       oninput="if(value.length>6)value=value.slice(0,6)"
                                       type="number"
@@ -397,22 +387,12 @@
                     </el-col>
                     <el-col :span="7">
                         <el-form-item prop="expireDate">
-                            <!--              <el-input v-model="detailFormData.expireDate" auto-complete="off"-->
-                            <!--                        :disabled="false"></el-input>-->
                             <el-input v-model="detailFormData.expireDate" auto-complete="off"
                                       oninput="if(value.length>6)value=value.slice(0,6)"
                                       type="number"
                                       :disabled="false"></el-input>
 
 
-                            <!--                            <el-date-picker-->
-                            <!--                                type="date"-->
-                            <!--                                size="small" v-model="detailFormData.expireDate"-->
-                            <!--                                placeholder="请选择失效日期" style="width: 80%"-->
-                            <!--                                value-format="yyMMdd"-->
-                            <!--                                format="yyyy-MM-dd"-->
-                            <!--                            >-->
-                            <!--                            </el-date-picker>-->
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -890,9 +870,9 @@ export default {
                     //         return this.$message.error('批次号不能为空');
                     //     }
                     // }
-                    if (this.$isBlank(tQuery.productDate) && this.$isBlank(tQuery.expireDate)) {
-                        return this.$message.error('生产日期与失效日期不能全部为空');
-                    }
+                    // if (this.$isBlank(tQuery.productDate) && this.$isBlank(tQuery.expireDate)) {
+                    //     return this.$message.error('生产日期与失效日期不能全部为空');
+                    // }
                     uploadStockOrderDetail(tQuery).then((response) => {
                         this.detailLoading = false;
                         if (response.code === 20000) {
diff --git a/src/views/warehouse/stockOrderNewDistribution.vue b/src/views/warehouse/stockOrderNewDistribution.vue
index c26d782..4fe446a 100644
--- a/src/views/warehouse/stockOrderNewDistribution.vue
+++ b/src/views/warehouse/stockOrderNewDistribution.vue
@@ -455,9 +455,9 @@ export default {
                             //         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].productDate) && this.$isBlank(this.codeArray[i].expireDate)) {
+                            //     return this.$message.error('生产日期与失效日期不能全部为空');
+                            // }
                         }
                     }
 
@@ -560,7 +560,6 @@ export default {
         },
         selectProductFunction(event) {
             if (event == null) {
-                // this.$refs.inputRef.focus();
             } else event.target.select();
             if (this.$isBlank(event)) {
 
@@ -604,7 +603,6 @@ export default {
                 code: this.code,
                 customerId: store.getters.customerId,
             };
-
             stockOrderDetailQueryProduct(tQuery).then((response) => {
                 this.loading = false;
                 console.log(response)
@@ -641,12 +639,9 @@ export default {
                     }
                 } else {
                     this.$message.warning(response.message);
-                    // this.focusNext('inputRef');
                     if (this.$isNotBlank(event)) {
                         event.target.select();
                     }
-                    // event.target.select();
-                    // event.currentTarget.select();
                 }
             });
 
diff --git a/src/views/warehouse/stockOrderQRCodeDetail.vue b/src/views/warehouse/stockOrderQRCodeDetail.vue
index cf8e7bc..f3051bb 100644
--- a/src/views/warehouse/stockOrderQRCodeDetail.vue
+++ b/src/views/warehouse/stockOrderQRCodeDetail.vue
@@ -81,22 +81,8 @@
 
             <el-table v-loading="loading" :data="codeArray" style="width: 100%;" max-height="350" height="350"
                       ref="multipleTable">
-                <!--                <el-table-column-->
-                <!--                    type="selection"-->
-                <!--                    width="55">-->
-                <!--                </el-table-column>-->
                 <el-table-column label="序号" type="index" width="50"></el-table-column>
-                <el-table-column label="码" prop="udiCode"></el-table-column>
-                <!--<el-table-column label="订单数量">-->
-                <!--<template slot-scope="scope">-->
-                <!--<span>{{ scope.row.count }}</span>-->
-                <!--</template>-->
-                <!--</el-table-column>-->
-                <!--<el-table-column label="实际数量">-->
-                <!--<template slot-scope="scope">-->
-                <!--<span>{{ scope.row.reCount }}</span>-->
-                <!--</template>-->
-                <!--</el-table-column>-->
+                <el-table-column label="内部码" prop="udiCode"></el-table-column>
                 <el-table-column label="状态">
                     <template slot-scope="scope">
                         <span>{{ statusMap[scope.row.printStatus] }}</span>
@@ -346,7 +332,7 @@ export default {
 
         generateQRCodeText() {
             let tip = "确定生成内部码？";
-            if(this.codeArray .length>1){
+            if (this.codeArray.length > 1) {
                 tip = "是否确定重新生成内部码？";
             }