diff --git a/src/views/basic/BasicEntrutsRece.vue b/src/views/basic/BasicEntrutsRece.vue
index 7440138..3f08d45 100644
--- a/src/views/basic/BasicEntrutsRece.vue
+++ b/src/views/basic/BasicEntrutsRece.vue
@@ -1,304 +1,314 @@
 <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"
-                        >新增
-                        </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"
+            >新增
+            </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="entrustInvName" 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"
-                            @click.native.stop="handleModifyClick(scope.row)"
-                        >编辑
-                        </el-button
-                        >
-                        <el-button
-                            type="text"
-                            size="small"
-                            @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="entrustInvName" 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"
+                @click.native.stop="handleModifyClick(scope.row)"
+            >编辑
+            </el-button
+            >
+            <el-button
+                type="text"
+                size="small"
+                @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"
-            ></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"
+      ></el-pagination>
+    </el-card>
+  </div>
 </template>
 <script>
 import {
-    getEntrustRece,
-    deleteEntrustRece,
-    updateEntrustRece,
-    insertEntrustRece,
+  getEntrustRece,
+  deleteEntrustRece,
+  updateEntrustRece,
+  insertEntrustRece,
 } from "../../api/basic/EntrustRece";
 
 import modifyDialog from "./BasicEntrutsReceModify";
 
 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: "",
-            },
-            enableMap: {
-                true: "是",
-                false: "否",
-            },
-            mainActionMap: {
-                WareHouseIn: "入库",
-                WareHouseOut: "出库"
-            },
-            fileList: [],
-            total: 0,
-            multipleSelection: [],
-            uploadFileUrl: null,
-            headers: {},
-
-        };
-    },
-
-    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;
-                });
-        },
+  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: "",
+      },
+      enableMap: {
+        true: "是",
+        false: "否",
+      },
+      mainActionMap: {
+        WareHouseIn: "入库",
+        WareHouseOut: "出库"
+      },
+      fileList: [],
+      total: 0,
+      multipleSelection: [],
+      uploadFileUrl: null,
+      headers: {},
 
+    };
+  },
 
-        onAddSubmit() {
+  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;
+          });
+    },
 
-            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;
-                    this.cancelDialog();
-                    this.getList();
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.cancelDialog();
-                });
-        },
+    onAddSubmit() {
 
-        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;
-                    this.cancelDialog();
-                    this.getList();
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.cancelDialog();
-                });
-        },
+      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;
+      }
 
-        handleAddClick() {
-            this.inputQuery = {enable: true, expireTip: true};
-            this.addDialogVisible = true;
-        },
+      if (this.$isBlank(this.inputQuery.invWarehouseCode)) {
+        this.$message.error("当前分库不能为空！");
+        return;
+      }
+      if (this.$isBlank(this.inputQuery.entrustSubInv)) {
+        this.$message.error("请输入接受委托分库！");
+        return;
+      }
 
-        handleModifyClick(row) {
-            this.inputQuery = row;
-            this.modifyDialogVisible = true;
-        },
 
-        deleteDialog(rowId) {
-            this.$confirm("此操作将永久删除该委托验收信息, 是否继续?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            })
-                .then(() => {
-                    this.deleteOrders(rowId);
-                })
-                .catch(() => {
-                });
-        },
+      insertEntrustRece(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);
-                    }
+    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;
+            this.cancelDialog();
+            this.getList();
+          })
+          .catch(() => {
+            this.loading = false;
+            this.cancelDialog();
+          });
+    },
 
-                })
-                .catch(() => {
-                });
-        },
+    handleAddClick() {
+      this.inputQuery = {enable: true, expireTip: true};
+      this.addDialogVisible = true;
     },
-    components: {
-        modifyDialog,
+
+    handleModifyClick(row) {
+      this.inputQuery = row;
+      this.modifyDialogVisible = true;
     },
-    mounted() {
+
+    deleteDialog(rowId) {
+      this.$confirm("此操作将永久删除该委托验收信息, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+          .then(() => {
+            this.deleteOrders(rowId);
+          })
+          .catch(() => {
+          });
     },
-    created() {
-        this.getList();
+
+    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(() => {
+          });
     },
+  },
+  components: {
+    modifyDialog,
+  },
+  mounted() {
+  },
+  created() {
+    this.getList();
+  },
 };
 </script>
diff --git a/src/views/inventory/InvProductsDetail.vue b/src/views/inventory/InvProductsDetail.vue
index f28489f..7125854 100644
--- a/src/views/inventory/InvProductsDetail.vue
+++ b/src/views/inventory/InvProductsDetail.vue
@@ -1,296 +1,299 @@
 <template>
-  <div>
+    <div>
 
-    <el-descriptions class="margin-top" title="产品信息" :column="3" :size="size" border>
-      <el-descriptions-item>
-        <template slot="label">
-          产品名称
-        </template>
-        {{ idQuery.cpmctymc }}
-      </el-descriptions-item>
-      <el-descriptions-item>
-        <template slot="label">
-          产品标识
-        </template>
-        {{ idQuery.nameCode }}
-      </el-descriptions-item>
+        <el-descriptions class="margin-top" title="产品信息" :column="3" :size="size" border>
+            <el-descriptions-item>
+                <template slot="label">
+                    产品名称
+                </template>
+                {{ idQuery.cpmctymc }}
+            </el-descriptions-item>
+            <el-descriptions-item>
+                <template slot="label">
+                    产品标识
+                </template>
+                {{ idQuery.nameCode }}
+            </el-descriptions-item>
 
-      <el-descriptions-item>
-        <template slot="label">
-          批次号
-        </template>
-        {{ idQuery.batchNo }}
-      </el-descriptions-item>
-      <el-descriptions-item>
-        <template slot="label">
-          规格型号
-        </template>
-        {{ idQuery.ggxh }}
-      </el-descriptions-item>
-      <el-descriptions-item>
-        <template slot="label">
-          生产日期
-        </template>
-        {{ idQuery.productionDate }}
-      </el-descriptions-item>
-      <el-descriptions-item>
-        <template slot="label">
-          失效日期
-        </template>
-        {{ idQuery.expireDate }}
-      </el-descriptions-item>
-    </el-descriptions>
+            <el-descriptions-item>
+                <template slot="label">
+                    批次号
+                </template>
+                {{ idQuery.batchNo }}
+            </el-descriptions-item>
+            <el-descriptions-item>
+                <template slot="label">
+                    规格型号
+                </template>
+                {{ idQuery.ggxh }}
+            </el-descriptions-item>
+            <el-descriptions-item>
+                <template slot="label">
+                    生产日期
+                </template>
+                {{ idQuery.productionDate }}
+            </el-descriptions-item>
+            <el-descriptions-item>
+                <template slot="label">
+                    失效日期
+                </template>
+                {{ idQuery.expireDate }}
+            </el-descriptions-item>
+        </el-descriptions>
 
-    <!--        <el-descriptions style="margin-top: 15px" class="margin-top" title="库存统计" :column="3" :size="size" border>-->
+        <!--        <el-descriptions style="margin-top: 15px" class="margin-top" title="库存统计" :column="3" :size="size" border>-->
 
-    <!--            <el-descriptions-item>-->
-    <!--                <template slot="label">-->
-    <!--                    入库数量-->
-    <!--                </template>-->
-    <!--                {{ statData.inCount }}-->
-    <!--            </el-descriptions-item>-->
-    <!--            <el-descriptions-item>-->
-    <!--                <template slot="label">-->
-    <!--                    出库数量-->
-    <!--                </template>-->
-    <!--                {{ statData.outCount }}-->
-    <!--            </el-descriptions-item>-->
-    <!--            <el-descriptions-item>-->
-    <!--                <template slot="label">-->
-    <!--                    结余数量-->
-    <!--                </template>-->
-    <!--                {{ (statData.inCount - statData.outCount) }}-->
-    <!--            </el-descriptions-item>-->
-    <!--            <el-descriptions-item>-->
-    <!--                <template slot="label">-->
-    <!--                    普通采购数量-->
-    <!--                </template>-->
-    <!--                {{ statData.commonCount }}-->
-    <!--            </el-descriptions-item>-->
-    <!--            <el-descriptions-item>-->
-    <!--                <template slot="label">-->
-    <!--                    预入库数量-->
-    <!--                </template>-->
-    <!--                {{ statData.advanceCount }}-->
-    <!--            </el-descriptions-item>-->
-    <!--        </el-descriptions>-->
+        <!--            <el-descriptions-item>-->
+        <!--                <template slot="label">-->
+        <!--                    入库数量-->
+        <!--                </template>-->
+        <!--                {{ statData.inCount }}-->
+        <!--            </el-descriptions-item>-->
+        <!--            <el-descriptions-item>-->
+        <!--                <template slot="label">-->
+        <!--                    出库数量-->
+        <!--                </template>-->
+        <!--                {{ statData.outCount }}-->
+        <!--            </el-descriptions-item>-->
+        <!--            <el-descriptions-item>-->
+        <!--                <template slot="label">-->
+        <!--                    结余数量-->
+        <!--                </template>-->
+        <!--                {{ (statData.inCount - statData.outCount) }}-->
+        <!--            </el-descriptions-item>-->
+        <!--            <el-descriptions-item>-->
+        <!--                <template slot="label">-->
+        <!--                    普通采购数量-->
+        <!--                </template>-->
+        <!--                {{ statData.commonCount }}-->
+        <!--            </el-descriptions-item>-->
+        <!--            <el-descriptions-item>-->
+        <!--                <template slot="label">-->
+        <!--                    预入库数量-->
+        <!--                </template>-->
+        <!--                {{ statData.advanceCount }}-->
+        <!--            </el-descriptions-item>-->
+        <!--        </el-descriptions>-->
 
-    <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-form-item>
+        <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-form-item>
 
-      <el-form-item>
-        <el-button-group>
-          <el-button type="primary" icon="search" @click="getCodeList"
-          >查询
-          </el-button
-          >
-        </el-button-group>
-      </el-form-item>
-    </el-form>
-    <el-table v-loading="loading" :data="codeArry" style="width: 100%">
-      <el-table-column label="序号" type="index"></el-table-column>
-      <el-table-column
-          label="条码"
-          prop="originCode"
-          width="300"
-          show-overflow-tooltip
-      ></el-table-column>
-      <el-table-column label="单据类型" prop="action" width="150">
-        <template slot-scope="scope">
-          <span>{{ getActionName(scope.row.action) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-          label="出入库类型"
-          prop="mainActionStr"
-          width="120"
-          show-overflow-tooltip
-      ></el-table-column>
-      <el-table-column
-          label="入库数量"
-          prop="inCount"
-          width="120"
-          show-overflow-tooltip
-      ></el-table-column>
+            <el-form-item>
+                <el-button-group>
+                    <el-button type="primary" icon="search" @click="getCodeList"
+                    >查询
+                    </el-button
+                    >
+                </el-button-group>
+            </el-form-item>
+        </el-form>
+        <el-table v-loading="loading" :data="codeArry" style="width: 100%">
+            <el-table-column label="序号" type="index"></el-table-column>
+            <el-table-column
+                label="条码"
+                prop="originCode"
+                width="300"
+                show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column label="单据类型" prop="action" width="150">
+                <template slot-scope="scope">
+                    <span>{{ getActionName(scope.row.action) }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column
+                label="出入库类型"
+                prop="mainActionStr"
+                width="120"
+                show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+                label="入库数量"
+                prop="inCount"
+                width="120"
+                show-overflow-tooltip
+            ></el-table-column>
 
-      <el-table-column
-          label="出库数量"
-          prop="outCount"
-          width="120"
-          show-overflow-tooltip
-      ></el-table-column>
-      <el-table-column
-          label="订单日期"
-          prop="updateTime"
-          width="150"
-          show-overflow-tooltip
-      ></el-table-column>
-      <el-table-column
-          label="所属扫码单据"
-          prop="orderIdFk"
-          show-overflow-tooltip
-      ></el-table-column>
-      <el-table-column
-          label="所属业务单据"
-          prop="stockIdFk"
-          show-overflow-tooltip
-      ></el-table-column>
-    </el-table>
+            <el-table-column
+                label="出库数量"
+                prop="outCount"
+                width="120"
+                show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+                label="订单日期"
+                prop="updateTime"
+                width="150"
+                show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+                label="所属扫码单据"
+                prop="orderIdFk"
+                show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+                label="所属业务单据"
+                prop="stockIdFk"
+                show-overflow-tooltip
+            ></el-table-column>
+        </el-table>
 
-    <el-pagination
-        :page-size="query.limit"
-        @current-change="handleCurrentChange"
-        layout="prev, pager, next,total"
-        :total="total"
-    >
-    </el-pagination>
-  </div>
+        <el-pagination
+            :page-size="query.limit"
+            @current-change="handleCurrentChange"
+            layout="prev, pager, next,total"
+            :total="total"
+        >
+        </el-pagination>
+    </div>
 </template>
 
 <script>
 import {
-  filterDetailProducts, statDetailProducts
+    filterDetailProducts, statDetailProducts
 } from "../../api/inventory/InvProducts";
 import store from "../../store";
 import draggable from "vuedraggable";
 import {getBussinessType} from "../../api/basic/bussinessType";
 
 export default {
-  name: "idQuery",
-  props: {
-    idQuery: {
-      type: Object,
-      required: true,
+    name: "idQuery",
+    props: {
+        idQuery: {
+            type: Object,
+            required: true,
+        },
     },
-  },
-  data() {
-    return {
-      query: {
-        batchNo: null,
-        productIdFk: null,
-        customerId: null,
-        page: 1,
-        invStorageCode: null,
-        limit: 20,
-      },
-      codeArry: [],
-      total: 0,
-      loading: true,
-      index: null,
-      formLoading: false,
-      formVisible: false,
-      deleteLoading: false,
-      orderNo: null,
-      busTypes: [],
-      statData: {},
-    };
-  },
-  components: {
-    draggable,
-  },
-  methods: {
-    onReset() {
-      this.$router.push({
-        path: "",
-      });
-      this.query = {
-        productIdFk: null,
-        customerId: null,
-        page: 1,
-        limit: 20,
-      };
-      this.getCodeList();
+    data() {
+        return {
+            query: {
+                batchNo: null,
+                productIdFk: null,
+                customerId: null,
+                page: 1,
+                invStorageCode: null,
+                invWarehouseCode: null,
+                limit: 20,
+            },
+            codeArry: [],
+            total: 0,
+            loading: true,
+            index: null,
+            formLoading: false,
+            formVisible: false,
+            deleteLoading: false,
+            orderNo: null,
+            busTypes: [],
+            statData: {},
+        };
     },
-    onSubmit() {
-      this.$router.push({
-        path: "",
-        query: this.query,
-      });
-      this.getCodeList();
-    },
-    handleSizeChange(val) {
-      this.query.limit = val;
-      this.getCodeList();
-    },
-    handleCurrentChange(val) {
-      this.query.page = val;
-      this.getCodeList();
+    components: {
+        draggable,
     },
+    methods: {
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.query = {
+                productIdFk: null,
+                customerId: null,
+                page: 1,
+                limit: 20,
+            };
+            this.getCodeList();
+        },
+        onSubmit() {
+            this.$router.push({
+                path: "",
+                query: this.query,
+            });
+            this.getCodeList();
+        },
+        handleSizeChange(val) {
+            this.query.limit = val;
+            this.getCodeList();
+        },
+        handleCurrentChange(val) {
+            this.query.page = val;
+            this.getCodeList();
+        },
 
-    getCodeList() {
-      this.loading = true;
-      this.query.productIdFk = this.idQuery.relIdFk;
-      this.query.batchNo = this.idQuery.batchNo;
-      this.query.supId = this.idQuery.supId;
-      this.query.invStorageCode = this.idQuery.invStorageCode;
-      filterDetailProducts(this.query) //查找该单号下的所有条码
-          .then((response) => {
-            this.loading = false;
-            this.codeArry = response.data.list || [];
-            this.total = response.data.total || 0;
-          })
-          .catch(() => {
-            this.loading = false;
-            this.list = [];
-            this.total = 0;
-          });
-    },
+        getCodeList() {
+            this.loading = true;
+            this.query.productIdFk = this.idQuery.relIdFk;
+            this.query.batchNo = this.idQuery.batchNo;
+            this.query.supId = this.idQuery.supId;
+            this.query.invStorageCode = this.idQuery.invStorageCode;
+            this.query.invWarehouseCode = this.idQuery.invWarehouseCode;
+            filterDetailProducts(this.query) //查找该单号下的所有条码
+                .then((response) => {
+                    this.loading = false;
+                    this.codeArry = response.data.list || [];
+                    this.total = response.data.total || 0;
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                    this.total = 0;
+                });
+        },
 
-    getStat() {
-      this.query.productIdFk = this.idQuery.relIdFk;
-      this.query.batchNo = this.idQuery.batchNo;
-      this.query.customerId = store.getters.customerId;
-      this.query.invStorageCode = this.idQuery.invStorageCode;
-      statDetailProducts(this.query) //查找该单号下的所有条码
-          .then((response) => {
-            this.loading = false;
-            this.statData = response.data;
-          })
-          .catch(() => {
-            this.loading = false;
-          });
+        getStat() {
+            this.query.productIdFk = this.idQuery.relIdFk;
+            this.query.batchNo = this.idQuery.batchNo;
+            this.query.customerId = store.getters.customerId;
+            this.query.invStorageCode = this.idQuery.invStorageCode;
+            this.query.invWarehouseCode = this.idQuery.invWarehouseCode;
+            statDetailProducts(this.query) //查找该单号下的所有条码
+                .then((response) => {
+                    this.loading = false;
+                    this.statData = response.data;
+                })
+                .catch(() => {
+                    this.loading = false;
+                });
 
-    },
+        },
 
-    intentBack() {
-      //  this.$router.push({path:'../readme/detail',query:{id:row.corpOrderId}});
-      this.$router.go(-1);
+        intentBack() {
+            //  this.$router.push({path:'../readme/detail',query:{id:row.corpOrderId}});
+            this.$router.go(-1);
+        },
+        getActionName(action) {
+            for (let i = 0; i < this.busTypes.length; i++) {
+                if (this.busTypes[i].action === action) {
+                    return this.busTypes[i].name;
+                }
+            }
+        },
+        getBusType() {
+            let query = {
+                enabled: true,
+            };
+            getBussinessType(query)
+                .then((response) => {
+                    this.busTypes = response.data.list || [];
+                    this.filterQuery.billAction = this.busTypes[0].action;
+                    // this.getList();
+                })
+                .catch(() => {
+                });
+        },
     },
-    getActionName(action) {
-      for (let i = 0; i < this.busTypes.length; i++) {
-        if (this.busTypes[i].action === action) {
-          return this.busTypes[i].name;
-        }
-      }
+    filters: {},
+    mounted() {
+        document.body.ondrop = function (event) {
+            event.preventDefault();
+            event.stopPropagation();
+        };
     },
-    getBusType() {
-      let query = {
-        enabled: true,
-      };
-      getBussinessType(query)
-          .then((response) => {
-            this.busTypes = response.data.list || [];
-            this.filterQuery.billAction = this.busTypes[0].action;
-            // this.getList();
-          })
-          .catch(() => {
-          });
+    created() {
+        this.getBusType();
+        this.getCodeList();
+        this.getStat();
     },
-  },
-  filters: {},
-  mounted() {
-    document.body.ondrop = function (event) {
-      event.preventDefault();
-      event.stopPropagation();
-    };
-  },
-  created() {
-    this.getBusType();
-    this.getCodeList();
-    this.getStat();
-  },
 };
 </script>
 
diff --git a/src/views/warehouse/AdditionalOrder.vue b/src/views/warehouse/AdditionalOrder.vue
index c493fbf..ad6f2aa 100644
--- a/src/views/warehouse/AdditionalOrder.vue
+++ b/src/views/warehouse/AdditionalOrder.vue
@@ -87,6 +87,11 @@
                         <span>{{ getStorageName(scope.row.locStorageCode) }}</span>
                     </template>
                 </el-table-column>
+                <el-table-column label="当前分库" prop="invWarehouseCode" width="120">
+                    <template slot-scope="scope">
+                        <span>{{ getSubStorageName(scope.row.invWarehouseCode) }}</span>
+                    </template>
+                </el-table-column>
                 <el-table-column label="创建时间" prop="actDate" show-overflow-tooltip>
                     <template slot-scope="scope">
                         <i class="el-icon-time"></i>
@@ -283,8 +288,8 @@ export default {
     data() {
         return {
             filterQuery: {
-                locStorageCode:null,
-                invWarehouseCode:null,
+                locStorageCode: null,
+                invWarehouseCode: null,
                 id: "",
                 mainAction: null,
                 action: null,
@@ -548,6 +553,13 @@ export default {
                 }
             }
         },
+        getSubStorageName(code) {
+            for (let i = 0; i < this.subInvList.length; i++) {
+                if (this.subInvList[i].code === code) {
+                    return this.subInvList[i].name;
+                }
+            }
+        },
         addOrders(row) {
             console.log(row)
             this.idQuery.id = '';