From 4308e3c4640830b153d72445b94b303b3ec72490 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Sun, 6 Mar 2022 15:11:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=8D=95=E6=8D=AE=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E7=95=8C=E9=9D=A2=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=E7=B1=BB=E5=9E=8B=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js                           |  22 +-
 src/views/basic/BussinessType.vue             | 673 +++++++++---------
 src/views/basic/BussinessTypeLocl.vue         |   2 +-
 src/views/basic/BussinessTypeModify.vue       |  13 +-
 src/views/warehouse/stockDeliveryOrder.vue    |   2 +-
 src/views/warehouse/stockOrder.vue            |   5 +-
 src/views/warehouse/stockOrderDelSearch.vue   |   2 +-
 src/views/warehouse/stockOrderEditor.vue      |  31 +-
 src/views/warehouse/stockOrderError.vue       |   2 +-
 src/views/warehouse/stockOrderInCode.vue      |   2 +-
 src/views/warehouse/stockOrderNew.vue         |  33 +-
 .../warehouse/stockOrderNewDistribution.vue   |  19 +-
 .../warehouse/stockOrderNewSelectProduct.vue  |   7 +-
 src/views/warehouse/stockOrderPrint.vue       |   2 +-
 src/views/warehouse/stockOrderSearch.vue      |   2 +-
 src/views/warehouse/stockOrderWaitCheck.vue   |  31 +-
 16 files changed, 474 insertions(+), 374 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 28523a6..b996d4c 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -755,7 +755,7 @@ export const asyncRouterMap = [
                 name: "库存统计",
                 icon: "",
                 meta: {
-                    authRule: ["inv/invProducts"]
+                    authRule: ["inv/invStatistics"]
                 }
             },
             {
@@ -1002,16 +1002,16 @@ export const asyncRouterMap = [
                             authRule: ["spInv/spInvProducts"]
                         }
                     },
-                    {
-                        path: "spInvProducts",
-                        component: supInvProducts,
-                        name: "库存统计",
-                        icon: "",
-                        hidden: false,
-                        meta: {
-                            authRule: ["spInv/spInvProducts"]
-                        }
-                    },
+                    // {
+                    //     path: "spInvProducts",
+                    //     component: supInvProducts,
+                    //     name: "库存统计",
+                    //     icon: "",
+                    //     hidden: false,
+                    //     meta: {
+                    //         authRule: ["spInv/spInvProducts"]
+                    //     }
+                    // },
                     {
                         path: "spInvPreProducts",
                         component: supInvPreProducts,
diff --git a/src/views/basic/BussinessType.vue b/src/views/basic/BussinessType.vue
index c705736..8c0e395 100644
--- a/src/views/basic/BussinessType.vue
+++ b/src/views/basic/BussinessType.vue
@@ -1,365 +1,374 @@
 <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.action"
-                        placeholder="业务类型"
-                        style="width: 400px"
-                    ></el-input>
-                </el-form-item>
-                <el-form-item class="query-form-item">
-                    <el-select v-model="filterQuery.enabled" placeholder="状态">
-                        <el-option label="全部" value=""></el-option>
-                        <el-option label="已启用" value=1></el-option>
-                        <el-option label="未启用" value=0></el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item>
-                    <el-button-group style="margin-left: 10px;display:flex;">
-                        <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
-                        <el-button type="primary" icon="search" @click="getList">查询</el-button>
-                        <el-button type="primary" icon="search" @click="handleAddClick"
-                        >新增
-                        </el-button
-                        >
-                        <el-upload
-                            :action="uploadFileUrl"
-                            multiple
-                            :limit="3"
-                            :show-file-list="false"
-                            :on-success="handleChange"
-                            :file-list="fileList"
-                        >
-                            <el-button size="mini" type="primary">导入单据类型</el-button>
-                        </el-upload>
-                    </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.action"
+              placeholder="业务类型"
+              style="width: 400px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item class="query-form-item">
+          <el-select v-model="filterQuery.enabled" placeholder="状态">
+            <el-option label="全部" value=""></el-option>
+            <el-option label="已启用" value=1></el-option>
+            <el-option label="未启用" value=0></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button-group style="margin-left: 10px;display:flex;">
+            <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+            <el-button type="primary" icon="search" @click="getList">查询</el-button>
+            <el-button type="primary" icon="search" @click="handleAddClick"
+            >新增
+            </el-button
+            >
+            <el-upload
+                :action="uploadFileUrl"
+                multiple
+                :limit="3"
+                :show-file-list="false"
+                :on-success="handleChange"
+                :file-list="fileList"
+            >
+              <el-button size="mini" type="primary">导入单据类型</el-button>
+            </el-upload>
+          </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="120" fixed></el-table-column>
+      <el-table v-loading="loading" :data="list" style="width: 100%">
+        <el-table-column label="序号" type="index" width="120" fixed></el-table-column>
 
-                <el-table-column label="扫码单据类型" prop="name" fixed></el-table-column>
-                <!--            <el-table-column label="出入库类型代码" prop="mainAction" fixed></el-table-column>-->
-                <el-table-column label="扫码单据类型代码" prop="action" fixed></el-table-column>
-                <el-table-column label="是否启用" prop="enable" fixed>
-                    <template slot-scope="scope">
-                        <span>{{ enableMap[scope.row.enable] }}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column label="必须选择业务单据校验" prop="checkEnable" fixed>
-                    <template slot-scope="scope">
-                        <span>{{ enableMap[scope.row.checkEnable] }}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column label="二次核对" prop="secCheckEnable" fixed>
-                    <template slot-scope="scope">
-                        <span>{{ enableMap[scope.row.secCheckEnable] }}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column label="关联业务单据" prop="localName" fixed></el-table-column>
+        <el-table-column label="扫码单据类型" prop="name" fixed></el-table-column>
+        <!--            <el-table-column label="出入库类型代码" prop="mainAction" fixed></el-table-column>-->
+        <el-table-column label="扫码单据类型代码" prop="action" fixed></el-table-column>
+        <el-table-column label="是否启用" prop="enable" fixed>
+          <template slot-scope="scope">
+            <span>{{ enableMap[scope.row.enable] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="必须选择业务单据校验" prop="checkEnable" fixed>
+          <template slot-scope="scope">
+            <span>{{ enableMap[scope.row.checkEnable] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="二次核对" prop="secCheckEnable" fixed>
+          <template slot-scope="scope">
+            <span>{{ enableMap[scope.row.secCheckEnable] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="关联业务单据" prop="localName" fixed></el-table-column>
 
-                <!--            <el-table-column label="第三方系统" prop="thirdName" fixed></el-table-column>-->
+        <!--            <el-table-column label="第三方系统" prop="thirdName" 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 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 {
-    getJoinBussinessType,
-    deleteBussinessType,
-    updateBussinessType,
-    insertBussinessType,
+  getJoinBussinessType,
+  deleteBussinessType,
+  updateBussinessType,
+  insertBussinessType,
 } from "../../api/basic/bussinessType";
 
 import modifyDialog from "./BussinessTypeModify";
 import axios from "axios";
 
 export default {
-    data() {
-        return {
-            filterQuery: {
-                enabled: "1",
-                udiwmsType: "",
-                thirdType: "",
-                page: 1,
-                limit: 20,
-            },
-            addDialogVisible: false,
-            modifyDialogVisible: false,
-            list: [],
-            inputQuery: {
-                action: "",
-                name: "",
-                enable: "",
-                remark: "",
-                mainAction: "",
-                thirdSysFk: "",
-                id: "",
-                localAction: null,
-                checkEnable: false,
-                genUnit: false,
-                innerOrder: false,
-                spUse: null,
-                secCheckEnable: null,
-                checkUdims: null,
-                checkPdaEd: null,
-                checkPdaUn: null,
-                checkPc: null,
-                checkWebNew: null,
-                checkChange: null,
-                secCheckUdims: null,
-                secCheckPdaEd: null,
-                secCheckPdaUn: null,
-                secCheckPc: null,
-                secCheckWebNew: null,
-                secCheckChange: null,
-                corpType: null,
-                storageCode: null,
-                supplementOrderType: null,
-            },
-            enableMap: {
-                true: "是",
-                false: "否",
-            },
-            fileList: [],
-            total: 0,
-            multipleSelection: [],
-            uploadFileUrl: null,
-        };
+  data() {
+    return {
+      filterQuery: {
+        enabled: "1",
+        udiwmsType: "",
+        thirdType: "",
+        page: 1,
+        limit: 20,
+      },
+      addDialogVisible: false,
+      modifyDialogVisible: false,
+      list: [],
+      inputQuery: {
+        action: "",
+        name: "",
+        enable: "",
+        remark: "",
+        mainAction: "",
+        thirdSysFk: "",
+        id: "",
+        localAction: null,
+        checkEnable: false,
+        genUnit: false,
+        innerOrder: false,
+        spUse: null,
+        secCheckEnable: null,
+        checkUdims: null,
+        checkPdaEd: null,
+        checkPdaUn: null,
+        checkPc: null,
+        checkWebNew: null,
+        checkChange: null,
+        secCheckUdims: null,
+        secCheckPdaEd: null,
+        secCheckPdaUn: null,
+        secCheckPc: null,
+        secCheckWebNew: null,
+        secCheckChange: null,
+        corpType: null,
+        storageCode: null,
+        supplementOrderType: null,
+      },
+      enableMap: {
+        true: "是",
+        false: "否",
+      },
+      fileList: [],
+      total: 0,
+      multipleSelection: [],
+      uploadFileUrl: null,
+    };
+  },
+
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        udiwmsType: "",
+        thirdType: "",
+        page: 1,
+        limit: 20,
+      };
+      this.getList();
+    },
+    cancelDialog() {
+      this.modifyDialogVisible = false;
+      this.addDialogVisible = false;
+    },
+    handleChange() {
+      this.getList();
+    },
+    getList() {
+      this.loading = true;
+      getJoinBussinessType(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 = {
-                udiwmsType: "",
-                thirdType: "",
-                page: 1,
-                limit: 20,
-            };
-            this.getList();
-        },
-        cancelDialog() {
-            this.modifyDialogVisible = false;
-            this.addDialogVisible = false;
-        },
-        handleChange() {
-            this.getList();
-        },
-        getList() {
-            this.loading = true;
-            getJoinBussinessType(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() {
+      if (this.inputQuery.enable && this.inputQuery.localAction == "") {
+        this.$message.error("本地单据不能为空！");
+        return;
+      }
+      if (this.inputQuery.mainAction == "" || this.inputQuery.mainAction == null) {
+        this.$message.error("出入库类型不能为空！");
+        return;
+      }
+      insertBussinessType(this.inputQuery)
+          .then((response) => {
+            this.loading = false;
+            this.cancelDialog();
+            this.getList();
+          })
+          .catch(() => {
+            this.loading = false;
+            this.cancelDialog();
+          });
+    },
 
-        onAddSubmit() {
-            if (this.inputQuery.enable && this.inputQuery.localAction == "") {
-                this.$message.error("本地单据不能为空！");
-                return;
-            }
-            insertBussinessType(this.inputQuery)
-                .then((response) => {
-                    this.loading = false;
-                    this.cancelDialog();
-                    this.getList();
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.cancelDialog();
-                });
-        },
+    onModifySubmit() {
+      if (this.inputQuery.enable && this.inputQuery.localAction == "") {
+        this.$message.error("本地单据不能为空！");
+        return;
+      }
 
-        onModifySubmit() {
-            if (this.inputQuery.enable && this.inputQuery.localAction == "") {
-                this.$message.error("本地单据不能为空！");
-                return;
-            }
-            updateBussinessType(this.inputQuery)
-                .then((response) => {
-                    this.loading = false;
-                    this.cancelDialog();
-                    this.getList();
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.cancelDialog();
-                });
-        },
+      if (this.inputQuery.mainAction == "" || this.inputQuery.mainAction == null) {
+        this.$message.error("出入库类型不能为空！");
+        return;
+      }
+      updateBussinessType(this.inputQuery)
+          .then((response) => {
+            this.loading = false;
+            this.cancelDialog();
+            this.getList();
+          })
+          .catch(() => {
+            this.loading = false;
+            this.cancelDialog();
+          });
+    },
 
-        handleAddClick() {
-            this.inputQuery = {};
-            this.addDialogVisible = true;
-        },
+    handleAddClick() {
+      this.inputQuery = {};
+      this.addDialogVisible = true;
+    },
 
-        handleModifyClick(row) {
-            this.inputQuery = {
-                id: row.id,
-                remark: row.remark,
-                action: row.action,
-                name: row.name,
-                enable: row.enable,
-                mainAction: row.mainAction,
-                localAction: row.localAction,
-                thirdSysFk: row.thirdSysFk,
-                checkEnable: row.checkEnable,
-                genUnit: row.genUnit,
-                innerOrder: row.innerOrder,
-                spUse: row.spUse,
-                secCheckEnable: row.secCheckEnable,
-                checkUdims: row.checkUdims,
-                checkPdaEd: row.checkPdaEd,
-                checkPdaUn: row.checkPdaUn,
-                checkPc: row.checkPc,
-                checkWebNew: row.checkWebNew,
-                checkChange: row.checkChange,
-                secCheckUdims: row.secCheckUdims,
-                secCheckPdaEd: row.secCheckPdaEd,
-                secCheckPdaUn: row.secCheckPdaUn,
-                secCheckPc: row.secCheckPc,
-                secCheckWebNew: row.secCheckWebNew,
-                secCheckChange: row.secCheckChange,
-                corpType: row.corpType + "",
-                storageCode: row.storageCode,
-                supplementOrderType: row.supplementOrderType,
-            };
-            this.modifyDialogVisible = true;
-        },
+    handleModifyClick(row) {
+      this.inputQuery = {
+        id: row.id,
+        remark: row.remark,
+        action: row.action,
+        name: row.name,
+        enable: row.enable,
+        mainAction: row.mainAction,
+        localAction: row.localAction,
+        thirdSysFk: row.thirdSysFk,
+        checkEnable: row.checkEnable,
+        genUnit: row.genUnit,
+        innerOrder: row.innerOrder,
+        spUse: row.spUse,
+        secCheckEnable: row.secCheckEnable,
+        checkUdims: row.checkUdims,
+        checkPdaEd: row.checkPdaEd,
+        checkPdaUn: row.checkPdaUn,
+        checkPc: row.checkPc,
+        checkWebNew: row.checkWebNew,
+        checkChange: row.checkChange,
+        secCheckUdims: row.secCheckUdims,
+        secCheckPdaEd: row.secCheckPdaEd,
+        secCheckPdaUn: row.secCheckPdaUn,
+        secCheckPc: row.secCheckPc,
+        secCheckWebNew: row.secCheckWebNew,
+        secCheckChange: row.secCheckChange,
+        corpType: row.corpType + "",
+        storageCode: row.storageCode,
+        supplementOrderType: row.supplementOrderType,
+      };
+      this.modifyDialogVisible = true;
+    },
 
-        deleteDialog(rowId) {
-            this.$confirm("此操作将永久删除该扫码类型信息, 是否继续?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            })
-                .then(() => {
-                    this.deleteOrders(rowId);
-                })
-                .catch(() => {
-                });
-        },
+    deleteDialog(rowId) {
+      this.$confirm("此操作将永久删除该扫码类型信息, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+          .then(() => {
+            this.deleteOrders(rowId);
+          })
+          .catch(() => {
+          });
+    },
 
-        deleteOrders(data) {
-            this.loading = true;
-            let tquery = {
-                id: data.id + "",
-            };
+    deleteOrders(data) {
+      this.loading = true;
+      let tquery = {
+        id: data.id + "",
+      };
 
-            deleteBussinessType(tquery)
-                .then((response) => {
-                    this.getList();
-                    if (response.code == 20000) {
-                        this.$message({
-                            type: "success",
-                            message: "删除成功！",
-                        });
-                    } else {
-                        this.$message.error(response.message);
-                    }
+      deleteBussinessType(tquery)
+          .then((response) => {
+            this.getList();
+            if (response.code == 20000) {
+              this.$message({
+                type: "success",
+                message: "删除成功！",
+              });
+            } else {
+              this.$message.error(response.message);
+            }
 
-                })
-                .catch(() => {
-                });
-        },
-        init() {
-            axios.get("./config.json").then(res => {
-                // 基础地址
-                let response = res.data.BASE_URL;
-                this.uploadFileUrl = response + "/udiwms/busstiness/file/upload";
-            });
-        },
-    },
-    components: {
-        modifyDialog,
-    },
-    mounted() {
+          })
+          .catch(() => {
+          });
     },
-    created() {
-        this.init();
-        this.getList();
+    init() {
+      axios.get("./config.json").then(res => {
+        // 基础地址
+        let response = res.data.BASE_URL;
+        this.uploadFileUrl = response + "/udiwms/busstiness/file/upload";
+      });
     },
+  },
+  components: {
+    modifyDialog,
+  },
+  mounted() {
+  },
+  created() {
+    this.init();
+    this.getList();
+  },
 };
 </script>
diff --git a/src/views/basic/BussinessTypeLocl.vue b/src/views/basic/BussinessTypeLocl.vue
index f5b8671..93dbbe3 100644
--- a/src/views/basic/BussinessTypeLocl.vue
+++ b/src/views/basic/BussinessTypeLocl.vue
@@ -40,7 +40,7 @@
                         <span>{{ enableMap[scope.row.enable] }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="是否预入库" prop="advanceType" fixed>
+                <el-table-column label="是否寄售" prop="advanceType" fixed>
                     <template slot-scope="scope">
                         <span>{{ enableMap[scope.row.advanceType] }}</span>
                     </template>
diff --git a/src/views/basic/BussinessTypeModify.vue b/src/views/basic/BussinessTypeModify.vue
index b7c2960..60c8593 100644
--- a/src/views/basic/BussinessTypeModify.vue
+++ b/src/views/basic/BussinessTypeModify.vue
@@ -37,7 +37,7 @@
                         <span>出入库类型:&nbsp;</span>
                     </div>
 
-                    <el-select v-model="inputQuery.mainAction" placeholder="出入库类型">
+                    <el-select v-model="inputQuery.mainAction" placeholder="出入库类型" @change="getOrderType">
                         <el-option label="入库" value="WareHouseIn"></el-option>
                         <el-option label="出库" value="WareHouseOut"></el-option>
                     </el-select>
@@ -138,7 +138,9 @@
                     <div class="itemTag">
                         <span>补单单据类型:&nbsp;</span>
                     </div>
-                    <el-select :disabled="inputQuery.orderTypeEnable" v-model="inputQuery.supplementOrderType"
+                    <el-select :disabled="inputQuery.corpType !=1"
+                               v-model="inputQuery.supplementOrderType"
+                               clearable
                                placeholder="单据类型">
                         <el-option
                             v-for="item in orderTypeList"
@@ -373,7 +375,7 @@ export default {
         getOrderType() {
             this.orderTypeList = [];
             let query = {
-                id: this.inputQuery.id
+                mainAction: this.inputQuery.mainAction
             };
             getCandidateBussinessType(query).then((response) => {
                 this.orderTypeList = response.data || [];
@@ -399,9 +401,12 @@ export default {
     },
 
     created() {
+        if (this.inputQuery.mainAction != null && this.inputQuery.mainAction != "") {
+            this.getOrderType();
+        }
         this.getList();
         this.getStorage();
-        this.getOrderType();
+
     },
 };
 </script>
diff --git a/src/views/warehouse/stockDeliveryOrder.vue b/src/views/warehouse/stockDeliveryOrder.vue
index 2b93a9b..6e6d2a3 100644
--- a/src/views/warehouse/stockDeliveryOrder.vue
+++ b/src/views/warehouse/stockDeliveryOrder.vue
@@ -38,7 +38,7 @@
                 </el-table-column>
                 <el-table-column type="index" label="序号" width="50"></el-table-column>
                 <el-table-column label="单据号" prop="billNo" width="250"></el-table-column>
-                <el-table-column label="供应商名称" prop="corpName" width="250"></el-table-column>
+                <el-table-column label="往来单位" prop="corpName" width="250"></el-table-column>
                 <el-table-column label="单据日期" prop="billdate" width="100"></el-table-column>
                 <el-table-column label="单据状态" width="100">
                     <template slot-scope="scope">
diff --git a/src/views/warehouse/stockOrder.vue b/src/views/warehouse/stockOrder.vue
index c09b826..e4fd729 100644
--- a/src/views/warehouse/stockOrder.vue
+++ b/src/views/warehouse/stockOrder.vue
@@ -68,7 +68,7 @@
                 </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>
+                <el-table-column label="往来单位" prop="corpName" show-overflow-tooltip></el-table-column>
                 <el-table-column label="单据来源" prop="sourceType" width="150">
                     <template slot-scope="scope">
                         <span>{{ sourceMap[scope.row.sourceType] }}</span>
@@ -348,6 +348,9 @@ export default {
     data() {
         return {
             query: {
+                billType:null,
+                corpName:null,
+                locStorageCode:null,
                 billNo: "",
                 status: "3",
                 page: 1,
diff --git a/src/views/warehouse/stockOrderDelSearch.vue b/src/views/warehouse/stockOrderDelSearch.vue
index dd8fe5b..1402bc0 100644
--- a/src/views/warehouse/stockOrderDelSearch.vue
+++ b/src/views/warehouse/stockOrderDelSearch.vue
@@ -54,7 +54,7 @@
                 </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>
+                <el-table-column label="往来单位" prop="corpName" show-overflow-tooltip></el-table-column>
                 <el-table-column label="单据来源" prop="sourceType" width="150">
                     <template slot-scope="scope">
                         <span>{{ sourceMap[scope.row.sourceType] }}</span>
diff --git a/src/views/warehouse/stockOrderEditor.vue b/src/views/warehouse/stockOrderEditor.vue
index 667c170..5e434e8 100644
--- a/src/views/warehouse/stockOrderEditor.vue
+++ b/src/views/warehouse/stockOrderEditor.vue
@@ -9,7 +9,33 @@
             >
                 <el-row>
                     <el-form-item class="query-form-item">
-                        <el-input v-model="query.billNo" placeholder="单据号"></el-input>
+                        <el-input v-model="query.billNo" placeholder="单据号" clearable></el-input>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-select v-model="query.billType" placeholder="请选择业务类型" clearable="true" size="mini">
+                            <el-option
+                                v-for="item in busTypes"
+                                :key="item.localName"
+                                :label="item.localName"
+                                :value="item.localAction">
+                                <span style="float: left">{{ item.localName }}</span>
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+
+                    <el-form-item class="query-form-item">
+                        <el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-select v-model="query.locStorageCode" placeholder="请选择当前仓库" clearable="true" size="mini">
+                            <el-option
+                                v-for="item in storageList"
+                                :key="item.name"
+                                :label="item.name"
+                                :value="item.code">
+                                <span style="float: left">{{ item.name }}</span>
+                            </el-option>
+                        </el-select>
                     </el-form-item>
                     <el-form-item class="query-form-item">
                         <span style="color: #000; margin-left: 10px; margin-right: 6px">单据日期:</span>
@@ -476,6 +502,9 @@ export default {
     data() {
         return {
             query: {
+                billType:null,
+                corpName:null,
+                locStorageCode:null,
                 billNo: "",
                 status: "2",
                 startTime: "",
diff --git a/src/views/warehouse/stockOrderError.vue b/src/views/warehouse/stockOrderError.vue
index 8f9eea4..92854a6 100644
--- a/src/views/warehouse/stockOrderError.vue
+++ b/src/views/warehouse/stockOrderError.vue
@@ -27,7 +27,7 @@
                       @row-click="getStockOrderDetailList">
                 <el-table-column type="index" label="序号" width="50"></el-table-column>
                 <el-table-column label="单据号" prop="billNo" width="250"></el-table-column>
-                <el-table-column label="供应商名称" prop="corpName" width="250"></el-table-column>
+                <el-table-column label="往来单位" prop="corpName" width="250"></el-table-column>
                 <el-table-column label="单据日期" prop="billdate" width="100"></el-table-column>
                 <el-table-column label="单据状态" width="100">
                     <template slot-scope="scope">
diff --git a/src/views/warehouse/stockOrderInCode.vue b/src/views/warehouse/stockOrderInCode.vue
index 93d4756..b02a9b1 100644
--- a/src/views/warehouse/stockOrderInCode.vue
+++ b/src/views/warehouse/stockOrderInCode.vue
@@ -46,7 +46,7 @@
                 </el-table-column>
                 <el-table-column type="index" label="序号" width="50"></el-table-column>
                 <el-table-column label="单据号" prop="billNo"></el-table-column>
-                <el-table-column label="供应商名称" prop="corpName"></el-table-column>
+                <el-table-column label="往来单位" prop="corpName"></el-table-column>
                 <el-table-column label="单据来源" prop="sourceType" width="150">
                     <template slot-scope="scope">
                         <span>{{ sourceMap[scope.row.sourceType] }}</span>
diff --git a/src/views/warehouse/stockOrderNew.vue b/src/views/warehouse/stockOrderNew.vue
index 1d0e805..52c7f89 100644
--- a/src/views/warehouse/stockOrderNew.vue
+++ b/src/views/warehouse/stockOrderNew.vue
@@ -9,7 +9,33 @@
             >
                 <el-row>
                     <el-form-item class="query-form-item">
-                        <el-input v-model="query.billNo" placeholder="单据号"></el-input>
+                        <el-input v-model="query.billNo" placeholder="单据号" clearable></el-input>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-select v-model="query.billType" placeholder="请选择业务类型" clearable="true" size="mini">
+                            <el-option
+                                v-for="item in busTypes"
+                                :key="item.localName"
+                                :label="item.localName"
+                                :value="item.localAction">
+                                <span style="float: left">{{ item.localName }}</span>
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+
+                    <el-form-item class="query-form-item">
+                        <el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-select v-model="query.locStorageCode" placeholder="请选择当前仓库" clearable="true" size="mini">
+                            <el-option
+                                v-for="item in storageList"
+                                :key="item.name"
+                                :label="item.name"
+                                :value="item.code">
+                                <span style="float: left">{{ item.name }}</span>
+                            </el-option>
+                        </el-select>
                     </el-form-item>
                     <el-form-item class="query-form-item">
                         <span style="color: #000; margin-left: 10px; margin-right: 6px">单据日期:</span>
@@ -47,7 +73,7 @@
                 </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>
+                <el-table-column label="往来单位" prop="corpName" show-overflow-tooltip></el-table-column>
                 <el-table-column label="单据来源" prop="sourceType" width="150">
                     <template slot-scope="scope">
                         <span>{{ sourceMap[scope.row.sourceType] }}</span>
@@ -430,6 +456,9 @@ export default {
     data() {
         return {
             query: {
+                billType:null,
+                corpName:null,
+                locStorageCode:null,
                 billNo: "",
                 status: "1",
                 page: 1,
diff --git a/src/views/warehouse/stockOrderNewDistribution.vue b/src/views/warehouse/stockOrderNewDistribution.vue
index 307676b..dfd3056 100644
--- a/src/views/warehouse/stockOrderNewDistribution.vue
+++ b/src/views/warehouse/stockOrderNewDistribution.vue
@@ -552,30 +552,27 @@ export default {
                         this.$message.warning('未添加产品');
                         return;
                     }
+
                     for (let i = 0; i < this.codeArray.length; i++) {
-                        if (!this.$isBlank(this.codeArray[i].productDate && this.codeArray[i].productDate.length != 6)) {
+                        if (!this.$isBlank(this.codeArray[i].productDate) && this.codeArray[i].productDate.length != 6) {
                             return this.$message.error('生产日期格式错误');
                         }
-                        if (!this.$isBlank(this.codeArray[i].expireDate && this.codeArray[i].expireDate.length != 6)) {
+                        if (!this.$isBlank(this.codeArray[i].expireDate) && this.codeArray[i].expireDate.length != 6) {
                             return this.$message.error('失效日期格式错误');
                         }
 
                     }
                     if (status === '3') {
                         for (let i = 0; i < this.codeArray.length; i++) {
+                            if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") {
+                                return this.$message.error('单据数量不能为0');
+                            }
                             if (this.$isBlank(this.codeArray[i].batchNo)) {
                                 return this.$message.error('批次号不能为空');
                             }
-                            if (this.$isBlank(this.codeArray[i].productDate)) {
-                                return this.$message.error('生产日期不能为空');
+                            if (this.$isBlank(this.codeArray[i].productDate) && this.$isBlank(this.codeArray[i].expireDate)) {
+                                return this.$message.error('生产日期与失效日期不能全部为空');
                             }
-                            if (this.$isBlank(this.codeArray[i].expireDate)) {
-                                return this.$message.error('失效日期不能为空');
-                            }
-                            if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count === '0') {
-                                return this.$message.error('单据数量不能小于0');
-                            }
-
                         }
                     }
 
diff --git a/src/views/warehouse/stockOrderNewSelectProduct.vue b/src/views/warehouse/stockOrderNewSelectProduct.vue
index d838ccf..1076f76 100644
--- a/src/views/warehouse/stockOrderNewSelectProduct.vue
+++ b/src/views/warehouse/stockOrderNewSelectProduct.vue
@@ -263,12 +263,11 @@ export default {
                 return;
             }
             let ids = [];
+
             selection.forEach((obj, index) => {
+                console.log("obj:===" + obj + "==" + obj.relIdFk)
                 let data = {
-                    relId: obj.relIdFk,
-                    batchNo: obj.batchNo,
-                    productDate: obj.productionDate,
-                    expireDate: obj.expireDate,
+                    relId: obj.rlId,
                 }
                 ids.push(data);
             });
diff --git a/src/views/warehouse/stockOrderPrint.vue b/src/views/warehouse/stockOrderPrint.vue
index a422f7b..1bdd400 100644
--- a/src/views/warehouse/stockOrderPrint.vue
+++ b/src/views/warehouse/stockOrderPrint.vue
@@ -37,7 +37,7 @@
                 </el-table-column>
                 <el-table-column type="index" label="序号" width="50"></el-table-column>
                 <el-table-column label="单据号" prop="billNo"></el-table-column>
-                <el-table-column label="供应商名称" prop="corpName"></el-table-column>
+                <el-table-column label="往来单位" prop="corpName"></el-table-column>
                 <el-table-column label="单据日期" prop="billdate"></el-table-column>
                 <el-table-column label="单据状态">
                     <template slot-scope="scope">
diff --git a/src/views/warehouse/stockOrderSearch.vue b/src/views/warehouse/stockOrderSearch.vue
index 0ef4fe4..68598a2 100644
--- a/src/views/warehouse/stockOrderSearch.vue
+++ b/src/views/warehouse/stockOrderSearch.vue
@@ -54,7 +54,7 @@
                 </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>
+                <el-table-column label="往来单位" prop="corpName" show-overflow-tooltip></el-table-column>
                 <el-table-column label="单据来源" prop="sourceType" width="150" show-overflow-tooltip>
                     <template slot-scope="scope">
                         <span>{{ sourceMap[scope.row.sourceType] }}</span>
diff --git a/src/views/warehouse/stockOrderWaitCheck.vue b/src/views/warehouse/stockOrderWaitCheck.vue
index bd9f6bd..f8edb55 100644
--- a/src/views/warehouse/stockOrderWaitCheck.vue
+++ b/src/views/warehouse/stockOrderWaitCheck.vue
@@ -12,6 +12,32 @@
                     <el-form-item class="query-form-item">
                         <el-input v-model="query.billNo" placeholder="单据号"></el-input>
                     </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-select v-model="query.billType" placeholder="请选择业务类型" clearable="true" size="mini">
+                            <el-option
+                                v-for="item in busTypes"
+                                :key="item.localName"
+                                :label="item.localName"
+                                :value="item.localAction">
+                                <span style="float: left">{{ item.localName }}</span>
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+
+                    <el-form-item class="query-form-item">
+                        <el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-select v-model="query.locStorageCode" placeholder="请选择当前仓库" clearable="true" size="mini">
+                            <el-option
+                                v-for="item in storageList"
+                                :key="item.name"
+                                :label="item.name"
+                                :value="item.code">
+                                <span style="float: left">{{ item.name }}</span>
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
                     <el-form-item class="query-form-item">
                         <span style="color: #000; margin-left: 10px; margin-right: 6px">单据日期:</span>
                         <el-date-picker
@@ -46,7 +72,7 @@
                 </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>
+                <el-table-column label="往来单位" prop="corpName" show-overflow-tooltip></el-table-column>
                 <el-table-column label="单据来源" prop="sourceType" width="150">
                     <template slot-scope="scope">
                         <span>{{ sourceMap[scope.row.sourceType] }}</span>
@@ -321,6 +347,9 @@ export default {
     data() {
         return {
             query: {
+                billType:null,
+                corpName:null,
+                locStorageCode:null,
                 billNo: "",
                 status: "3",
                 page: 1,