From aed5f3c44a97731e2ca36b62bc9c03323f9003c1 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Fri, 10 Jun 2022 11:05:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E5=AE=8C=E6=95=B4=E6=80=A7,?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=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                           |  17 +-
 src/views/basic/BussinessTypeModify.vue       |   8 +-
 src/views/basic/BussinessTypeThird.vue        | 601 +++++++++---------
 src/views/thrsys/SysUdimsConfig.vue           |   8 +-
 src/views/thrsys/thrOrderNew.vue              |  29 +-
 src/views/userManage/admin/authRole.vue       |  22 +-
 src/views/warehouse/addHosOrder.vue           |   2 +-
 src/views/warehouse/addOrder.vue              |   2 +-
 src/views/warehouse/stockHospOrderNew.vue     |  10 +-
 .../warehouse/stockOrderEditDistribution.vue  |  79 +--
 src/views/warehouse/stockOrderEditor.vue      |  10 +-
 .../warehouse/stockOrderNewDistribution.vue   |  10 +-
 12 files changed, 403 insertions(+), 395 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index aa22ce6..d1923cd 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -396,15 +396,6 @@ export const asyncRouterMap = [
                 }
             },
 
-            {
-                path: "BasicEntrutsRece",
-                name: "委托验收",
-                component: BasicEntrutsRece,
-                meta: {
-                    authRule: ["basic/BasicEntrutsRece"]
-                }
-            },
-
             // {
             //     path: "systemPDFTemplate",
             //     component: systemPDFTemplate,
@@ -805,6 +796,14 @@ export const asyncRouterMap = [
                     authRule: ["stock/additionalOrder"]
                 }
             },
+            {
+                path: "BasicEntrutsRece",
+                name: "委托验收",
+                component: BasicEntrutsRece,
+                meta: {
+                    authRule: ["basic/BasicEntrutsRece"]
+                }
+            },
 
             {
                 path: "stockOrderDelSearch",
diff --git a/src/views/basic/BussinessTypeModify.vue b/src/views/basic/BussinessTypeModify.vue
index 764a4eb..d2811d9 100644
--- a/src/views/basic/BussinessTypeModify.vue
+++ b/src/views/basic/BussinessTypeModify.vue
@@ -270,13 +270,13 @@
         <el-row :gutter="20" class="el-row" type="flex" style="margin-left: 15px">
             <el-col :span="4" class="el-col">
                 <div class="text item">
-                    <el-checkbox v-model="inputQuery.checkChange" :disabled="!inputQuery.checkEnable">自动缺量补单
+                    <el-checkbox v-model="inputQuery.checkChange" :disabled="!inputQuery.checkEnable">缺量补单
                     </el-checkbox>
                 </div>
             </el-col>
             <el-col :span="4" class="el-col">
                 <div class="text item">
-                    <el-checkbox v-model="inputQuery.checkBalacne" :disabled="!inputQuery.checkEnable">自动平衡补单
+                    <el-checkbox v-model="inputQuery.checkBalacne" :disabled="!inputQuery.checkEnable">平衡补单
                     </el-checkbox>
                 </div>
             </el-col>
@@ -335,13 +335,13 @@
         <el-row :gutter="20" class="el-row" type="flex" style="margin-left: 15px">
             <el-col :span="4" class="el-col">
                 <div class="text item">
-                    <el-checkbox v-model="inputQuery.secCheckChange" :disabled="!inputQuery.secCheckEnable">自动缺量补单
+                    <el-checkbox v-model="inputQuery.secCheckChange" :disabled="!inputQuery.secCheckEnable">缺量补单
                     </el-checkbox>
                 </div>
             </el-col>
             <el-col :span="4" class="el-col">
                 <div class="text item">
-                    <el-checkbox v-model="inputQuery.secCheckBalacne" :disabled="!inputQuery.secCheckEnable">自动平衡补单
+                    <el-checkbox v-model="inputQuery.secCheckBalacne" :disabled="!inputQuery.secCheckEnable">平衡补单
                     </el-checkbox>
                 </div>
             </el-col>
diff --git a/src/views/basic/BussinessTypeThird.vue b/src/views/basic/BussinessTypeThird.vue
index 74e1ac0..1b2b3ed 100644
--- a/src/views/basic/BussinessTypeThird.vue
+++ b/src/views/basic/BussinessTypeThird.vue
@@ -1,125 +1,125 @@
 <template>
-  <div>
-    <el-card>
+    <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"
-              placeholder="业务类型"
-              style="width: 400px"
-          ></el-input>
-        </el-form-item>
+            <el-form :inline="true" :model="filterQuery" class="query-form" size="mini">
+                <el-form-item class="query-form-item">
+                    <el-input
+                        v-model="filterQuery.name"
+                        placeholder="业务类型"
+                        style="width: 400px"
+                    ></el-input>
+                </el-form-item>
 
-        <el-form-item class="query-form-item">
-          <el-select v-model="filterQuery.thirdSys" placeholder="请选择第三方系统" @change="thirdSysChange">
-            <el-option
-                v-for="item in thirdSys"
-                :key="item.value"
-                :label="item.thirdName"
-                :value="item.thirdId">
-              <span style="float: left">{{ item.thirdName }}</span>
-              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.thirdId }}</span>
-            </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-button type="primary" icon="search" @click="updateDownload">更新下载</el-button>
-          </el-button-group>
+                <el-form-item class="query-form-item">
+                    <el-select v-model="filterQuery.thirdSys" placeholder="请选择第三方系统" @change="thirdSysChange">
+                        <el-option
+                            v-for="item in thirdSys"
+                            :key="item.value"
+                            :label="item.thirdName"
+                            :value="item.thirdId">
+                            <span style="float: left">{{ item.thirdName }}</span>
+                            <span style="float: right; color: #8492a6; font-size: 13px">{{ item.thirdId }}</span>
+                        </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-button type="primary" icon="search" @click="updateDownload">更新下载</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="55"></el-table-column>
+            <el-table v-loading="loading" :data="list" style="width: 100%">
+                <el-table-column label="序号" type="index" width="55"></el-table-column>
 
-        <el-table-column label="单据类型名称" prop="name"></el-table-column>
-        <el-table-column label="单据类型代码" prop="action"></el-table-column>
-        <el-table-column label="第三方系统" prop="thirdSys"></el-table-column>
-        <el-table-column label="备注" prop="remark"></el-table-column>
-        <el-table-column label="操作" width="100" 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="handleDeleteClick(scope.row)"
-            >删除
-            </el-button
-            >
-          </template>
-        </el-table-column>
-      </el-table>
+                <el-table-column label="单据类型名称" prop="name"></el-table-column>
+                <el-table-column label="单据类型代码" prop="action"></el-table-column>
+                <el-table-column label="第三方系统" prop="thirdSys"></el-table-column>
+                <el-table-column label="备注" prop="remark"></el-table-column>
+                <el-table-column label="操作" width="100" 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="handleDeleteClick(scope.row)"
+                        >删除
+                        </el-button
+                        >
+                    </template>
+                </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 {
-  getOriginBusType,
-  updateBussinessType, delBussinessType,
-  insertBussinessType, downloadBussinessType
+    getOriginBusType,
+    updateBussinessType, delBussinessType,
+    insertBussinessType, downloadBussinessType
 } from "../../api/basic/busOriginType";
 
 import modifyDialog from "./BussinessTypeThirdModify";
@@ -127,216 +127,223 @@ import axios from "axios";
 import {getBasicThirdSys} from "@/api/basic/basicThirdSys";
 
 export default {
-  data() {
-    return {
-      filterQuery: {
-        name: "",
-        page: 1,
-        limit: 20,
-      },
-      addDialogVisible: false,
-      modifyDialogVisible: false,
-      list: [],
-      inputQuery: {
-        action: "",
-        name: "",
-        enable: "",
-        remark: "",
-        thirdSys: null,
-        thirdSysName: null,
-
-      },
-      enableMap: {
-        true: "是",
-        false: "否",
-      },
-      thirdSys: [],
-      total: 0,
-      multipleSelection: [],
-      uploadFileUrl: null,
-      loading: false,
-    };
-  },
+    data() {
+        return {
+            filterQuery: {
+                name: "",
+                page: 1,
+                limit: 20,
+            },
+            addDialogVisible: false,
+            modifyDialogVisible: false,
+            list: [],
+            inputQuery: {
+                action: "",
+                name: "",
+                enable: "",
+                remark: "",
+                thirdSys: null,
+                thirdSysName: null,
 
-  methods: {
-    onReset() {
-      this.$router.push({
-        path: "",
-      });
-      this.filterQuery = {
-        thirdSys: "thirdId",
-        name: null,
-        enable: null,
-        page: 1,
-        limit: 20,
-      };
-      this.getList();
-    },
-    cancelDialog() {
-      this.modifyDialogVisible = false;
-      this.addDialogVisible = false;
+            },
+            enableMap: {
+                true: "是",
+                false: "否",
+            },
+            thirdSys: [],
+            total: 0,
+            multipleSelection: [],
+            uploadFileUrl: null,
+            loading: false,
+        };
     },
 
-    getList() {
-      this.loading = true;
-      getOriginBusType(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;
-          });
-    },
-    getBasicThirdSys() {
-      let query = {
-        enabled: true,
-      };
-      getBasicThirdSys(query)
-          .then((response) => {
-            this.thirdSys = response.data.list || [];
-            this.filterQuery.thirdSys = this.thirdSys[0].thirdId;
-          })
-          .catch(() => {
-            this.loading = false;
-            this.list = [];
-          });
-    },
-    updateDownload() {
-      let query = {
-        thirdSys: this.filterQuery.thirdSys,
-      }
-      downloadBussinessType(query)
-          .then((response) => {
-            this.loading = false;
+    methods: {
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.filterQuery = {
+                thirdSys: "thirdId",
+                name: null,
+                enable: null,
+                page: 1,
+                limit: 20,
+            };
             this.getList();
-          })
-          .catch(() => {
-            this.loading = false;
-          });
-    },
-    handleCurrentChange(val) {
-      this.filterQuery.page = val;
-      this.getList();
-    },
+        },
+        cancelDialog() {
+            this.modifyDialogVisible = false;
+            this.addDialogVisible = false;
+        },
 
-    onAddSubmit() {
+        getList() {
+            this.loading = true;
+            getOriginBusType(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;
+                });
+        },
+        getBasicThirdSys() {
+            let query = {
+                enabled: true,
+            };
+            getBasicThirdSys(query)
+                .then((response) => {
+                    this.thirdSys = response.data.list || [];
+                    this.filterQuery.thirdSys = this.thirdSys[0].thirdId;
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                });
+        },
+        updateDownload() {
+            let query = {
+                thirdSys: this.filterQuery.thirdSys,
+            }
+            downloadBussinessType(query)
+                .then((response) => {
+                    this.loading = false;
+                    this.getList();
+                })
+                .catch(() => {
+                    this.loading = false;
+                });
+        },
+        handleCurrentChange(val) {
+            this.filterQuery.page = val;
+            this.getList();
+        },
 
+        onAddSubmit() {
 
-      insertBussinessType(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;
+            }
+            insertBussinessType(this.inputQuery)
+                .then((response) => {
+                    this.loading = false;
+                    this.cancelDialog();
+                    this.getList();
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.cancelDialog();
+                });
+        },
 
-    onModifySubmit() {
-      updateBussinessType(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;
+            }
+            updateBussinessType(this.inputQuery)
+                .then((response) => {
+                    this.loading = false;
+                    this.cancelDialog();
+                    this.getList();
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.cancelDialog();
+                });
+        },
 
-    handleModifyClick(row) {
+        handleModifyClick(row) {
 
-      this.inputQuery = {
-        id: row.id,
-        remark: row.remark,
-        action: row.action,
-        name: row.name,
-        enable: row.enable,
-        thirdSys: row.thirdSys,
-        thirdSysName: row.thirdSysName
-      };
-      this.modifyDialogVisible = true;
-    },
+            this.inputQuery = {
+                id: row.id,
+                remark: row.remark,
+                action: row.action,
+                name: row.name,
+                enable: row.enable,
+                thirdSys: row.thirdSys,
+                thirdSysName: row.thirdSysName
+            };
+            this.modifyDialogVisible = true;
+        },
 
 
-    handleDeleteClick(row) {
-      this.deleteDialog(row.id)
-    },
+        handleDeleteClick(row) {
+            this.deleteDialog(row.id)
+        },
+
+        handleAddClick() {
+            this.inputQuery = {
+                action: "",
+                name: "",
+                enable: "",
+                remark: "",
+                thirdSys: null,
+                thirdSysName: null
+            };
+            this.addDialogVisible = true;
+        },
+
+        deleteDialog(rowId) {
+            this.$confirm("此操作将永久删除该单据类型信息, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    let query = {
+                        id: rowId,
+                    }
+                    delBussinessType(query)
+                        .then((response) => {
+                            this.getList();
+                        })
+                        .catch(() => {
+                        });
 
-    handleAddClick() {
-      this.inputQuery = {
-        action: "",
-        name: "",
-        enable: "",
-        remark: "",
-        thirdSys: null,
-        thirdSysName: null
-      };
-      this.addDialogVisible = true;
-    },
 
-    deleteDialog(rowId) {
-      this.$confirm("此操作将永久删除该单据类型信息, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-          .then(() => {
-            let query = {
-              id: rowId,
-            }
-            delBussinessType(query)
-                .then((response) => {
-                  this.getList();
                 })
                 .catch(() => {
                 });
+        },
 
+        thirdSysChange() {
+            this.getList();
+        },
 
-          })
-          .catch(() => {
-          });
+        init() {
+            axios.get("./config.json").then(res => {
+                // 基础地址
+                let response = res.data.BASE_URL;
+                this.uploadFileUrl = response + "udiwms/busstiness/file/upload";
+            });
+        },
+        handleChange(response, files, fileList) {
+            console.log(response);
+            if (response.code != 20000) {
+                this.$message.error(response.message);
+            } else {
+                // console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]);
+                this.$message.success(response.data);
+                this.getList();
+            }
+        },
     },
-
-    thirdSysChange() {
-      this.getList();
+    components: {
+        modifyDialog,
     },
-
-    init() {
-      axios.get("./config.json").then(res => {
-        // 基础地址
-        let response = res.data.BASE_URL;
-        this.uploadFileUrl = response + "udiwms/busstiness/file/upload";
-      });
+    mounted() {
     },
-    handleChange(response, files, fileList) {
-      console.log(response);
-      if (response.code != 20000) {
-        this.$message.error(response.message);
-      } else {
-        // console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]);
-        this.$message.success(response.data);
+    created() {
+        this.init();
+        this.getBasicThirdSys();
         this.getList();
-      }
-    },
-  },
-  components: {
-    modifyDialog,
-  },
-  mounted() {
-  },
-  created() {
-    this.init();
-    this.getBasicThirdSys();
-    this.getList();
 
-  },
+    },
 };
 </script>
diff --git a/src/views/thrsys/SysUdimsConfig.vue b/src/views/thrsys/SysUdimsConfig.vue
index a4043da..1347911 100644
--- a/src/views/thrsys/SysUdimsConfig.vue
+++ b/src/views/thrsys/SysUdimsConfig.vue
@@ -29,6 +29,10 @@
 
             </el-descriptions-item>
 
+
+        </el-descriptions>
+        <el-descriptions class="margin-top" title="同步至UDI管理系统基础数据" :column="1" :size="100" style="margin-top: 40px"
+                         border>
             <el-descriptions-item>
                 <template slot="label">
                     单据类型
@@ -37,7 +41,6 @@
                 <el-checkbox v-model="configQuery.typeScan">扫码单据类型</el-checkbox>
                 <el-checkbox v-model="configQuery.typeThird">第三方单据类型</el-checkbox>
             </el-descriptions-item>
-
             <el-descriptions-item>
                 <template slot="label">
                     基础信息
@@ -67,7 +70,8 @@
 
         </el-descriptions>
 
-        <el-descriptions class="margin-top" title="" :column="1" :size="100" style="margin-top: 30px" border>
+        <el-descriptions class="margin-top" title="同步至UDI管理系统单据" :column="1" :size="100" style="margin-top: 30px"
+                         border>
             <el-descriptions-item>
                 <template slot="label">
                     单据(单据状态)
diff --git a/src/views/thrsys/thrOrderNew.vue b/src/views/thrsys/thrOrderNew.vue
index 830be39..aa7e47d 100644
--- a/src/views/thrsys/thrOrderNew.vue
+++ b/src/views/thrsys/thrOrderNew.vue
@@ -617,23 +617,26 @@ export default {
         this.thisData.formData.thirdSysFk = this.curAction.thirdSys;
         this.thisData.billType = this.curAction.localAction;
 
-        // this.thisData.formData.billType = this.curAction.localAction;
-        if (this.curAction.mainAction == 'WareHouseOut' && this.formData.noInvOut != true) {
-          this.invQueryData = {
-            locStorageCode: this.formData.locStorageCode,
-          };
-          this.selectInvProductVisible = true;
-        } else if (this.curAction.mainAction == "WareHouseIn" && this.curAction.corpType == 1 && this.formData.noInvOut != true) {
 
           this.invQueryData = {
-            locStorageCode: this.formData.corpId,
-
+              locStorageCode: this.formData.locStorageCode,
           };
-          console.log("his.invQueryData " + this.invQueryData.locStorageCode);
           this.selectInvProductVisible = true;
-        } else {
-          this.selectProductVisible = true;
-        }
+
+        // this.thisData.formData.billType = this.curAction.localAction;
+          // if (this.curAction.mainAction == 'WareHouseOut' && this.formData.noInvOut != true) {
+          //
+          // } else if (this.curAction.mainAction == "WareHouseIn" && this.curAction.corpType == 1 && this.formData.noInvOut != true) {
+          //
+          //   this.invQueryData = {
+          //     locStorageCode: this.formData.corpId,
+          //
+          //   };
+          //   console.log("his.invQueryData " + this.invQueryData.locStorageCode);
+          //   this.selectInvProductVisible = true;
+          // } else {
+          //   this.selectProductVisible = true;
+          // }
 
 
         return;
diff --git a/src/views/userManage/admin/authRole.vue b/src/views/userManage/admin/authRole.vue
index ff4df9c..0551f96 100644
--- a/src/views/userManage/admin/authRole.vue
+++ b/src/views/userManage/admin/authRole.vue
@@ -7,13 +7,13 @@
                 <el-form-item class="query-form-item">
                     <el-input v-model="query.name" placeholder="角色名称"></el-input>
                 </el-form-item>
-<!--                <el-form-item class="query-form-item">-->
-<!--                    <el-select v-model="query.status" placeholder="状态">-->
-<!--                        <el-option label="全部" value=""></el-option>-->
-<!--                        <el-option label="禁用" value="0"></el-option>-->
-<!--                        <el-option label="正常" value="1"></el-option>-->
-<!--                    </el-select>-->
-<!--                </el-form-item>-->
+                <!--                <el-form-item class="query-form-item">-->
+                <!--                    <el-select v-model="query.status" placeholder="状态">-->
+                <!--                        <el-option label="全部" value=""></el-option>-->
+                <!--                        <el-option label="禁用" value="0"></el-option>-->
+                <!--                        <el-option label="正常" value="1"></el-option>-->
+                <!--                    </el-select>-->
+                <!--                </el-form-item>-->
 
                 <el-form-item>
                     <el-button-group>
@@ -99,7 +99,7 @@
         </el-card>
         <!--授权界面-->
         <el-dialog
-            title="授权"
+            :title="authTitle"
             :close-on-click-modal="false"
             :close-on-press-escape="false"
             :visible.sync="authFormVisible"
@@ -277,6 +277,8 @@ export default {
                 role_id: "",
                 auth_rules: []
             },
+
+            authTitle: "授权",
             authDefaultCheckedKeys: [],
             index: null,
             formName: null,
@@ -341,7 +343,9 @@ export default {
                 });
         },
         // 显示授权界面
-        handleAuth(roleId) {
+        handleAuth(row) {
+            this.authFormData.role_id = row.id;
+            this.authTitle = "授权角色<" + row.name + ">";
             this.authFormData.role_id = roleId;
             this.authFormData.auth_rules = [];
             this.authList = [];
diff --git a/src/views/warehouse/addHosOrder.vue b/src/views/warehouse/addHosOrder.vue
index 1fd59f0..1349a49 100644
--- a/src/views/warehouse/addHosOrder.vue
+++ b/src/views/warehouse/addHosOrder.vue
@@ -994,7 +994,7 @@ export default {
             if (text.includes("delete")) {
                 that.formData.code = "";
                 that.sictomText = "";
-                this.originCode = "";
+                that.originCode = "";
                 return;
             }
             if (that.sitcomScan) {
diff --git a/src/views/warehouse/addOrder.vue b/src/views/warehouse/addOrder.vue
index bfae674..6396e4a 100644
--- a/src/views/warehouse/addOrder.vue
+++ b/src/views/warehouse/addOrder.vue
@@ -818,7 +818,7 @@ export default {
             if (text.includes("delete")) {
                 that.formData.code = "";
                 that.sictomText = "";
-                this.originCode = "";
+                that.originCode = "";
                 return;
             }
             if (that.sitcomScan) {
diff --git a/src/views/warehouse/stockHospOrderNew.vue b/src/views/warehouse/stockHospOrderNew.vue
index d141928..f6f68c9 100644
--- a/src/views/warehouse/stockHospOrderNew.vue
+++ b/src/views/warehouse/stockHospOrderNew.vue
@@ -643,11 +643,11 @@ export default {
                             if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") {
                                 return this.$message.error('单据数量不能为0');
                             }
-                            if (this.$isBlank(this.codeArray[i].batchNo)) {
-                                if (!this.codeArray[i].allowNoBatch) {
-                                    return this.$message.error('批次号不能为空');
-                                }
-                            }
+                            // if (this.$isBlank(this.codeArray[i].batchNo)) {
+                            //     if (!this.codeArray[i].allowNoBatch) {
+                            //         return this.$message.error('批次号不能为空');
+                            //     }
+                            // }
                             if (this.$isBlank(this.codeArray[i].productDate) && this.$isBlank(this.codeArray[i].expireDate)) {
                                 return this.$message.error('生产日期与失效日期不能全部为空');
                             }
diff --git a/src/views/warehouse/stockOrderEditDistribution.vue b/src/views/warehouse/stockOrderEditDistribution.vue
index d63e488..cf9278b 100644
--- a/src/views/warehouse/stockOrderEditDistribution.vue
+++ b/src/views/warehouse/stockOrderEditDistribution.vue
@@ -10,15 +10,6 @@
                         :loading="loading"
                     >保存
                     </el-button>
-                    <!--&gt;-->
-                    <!--<el-button-->
-                    <!--type="primary"-->
-                    <!--@click.native="saveOrder('2')"-->
-                    <!--:loading="loading"-->
-                    <!--&gt;未配货提交-->
-                    <!--</el-button-->
-                    <!--&gt;-->
-
                     <el-button
                         type="primary"
                         @click.native="saveOrder('3')"
@@ -575,11 +566,11 @@ export default {
                         this.submitFunction(status);
                     } else {
                         for (let i = 0; i < this.codeArray.length; i++) {
-                            if (this.$isBlank(this.codeArray[i].batchNo)) {
-                                if (!this.codeArray[i].allowNoBatch) {
-                                    return this.$message.error('批次号不能为空');
-                                }
-                            }
+                            // if (this.$isBlank(this.codeArray[i].batchNo)) {
+                            //     if (!this.codeArray[i].allowNoBatch) {
+                            //         return this.$message.error('批次号不能为空');
+                            //     }
+                            // }
                             if (this.$isBlank(this.codeArray[i].productDate) && this.$isBlank(this.codeArray[i].expireDate)) {
                                 return this.$message.error('生产日期与失效日期不能全部为空');
                             }
@@ -935,36 +926,36 @@ export default {
                 });
             }
         },
-        saveCodeArray(index, row) {
-            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 = "";
-            this.iCount = 0;
-
-            this.detailLoading = true;
-            // row.count = row.reCount;
-            let tQuery = row;
-            uploadStockOrderDetail(tQuery).then((response) => {
-                this.detailLoading = false;
-                if (response.code === 20000) {
-                    this.$message.success("修改完成");
-                    this.getStockOrderDetailList();
-                    this.$refs.inputRef.focus();
-                } else {
-                    this.$message.error(response.message);
-                }
-            });
-        },
+        // saveCodeArray(index, row) {
+        //     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 = "";
+        //     this.iCount = 0;
+        //
+        //     this.detailLoading = true;
+        //     // row.count = row.reCount;
+        //     let tQuery = row;
+        //     uploadStockOrderDetail(tQuery).then((response) => {
+        //         this.detailLoading = false;
+        //         if (response.code === 20000) {
+        //             this.$message.success("修改完成");
+        //             this.getStockOrderDetailList();
+        //             this.$refs.inputRef.focus();
+        //         } else {
+        //             this.$message.error(response.message);
+        //         }
+        //     });
+        // },
         deleteCodeArray(index, row) {
             this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
                 confirmButtonText: "确定",
diff --git a/src/views/warehouse/stockOrderEditor.vue b/src/views/warehouse/stockOrderEditor.vue
index cebec5d..9aeb9b9 100644
--- a/src/views/warehouse/stockOrderEditor.vue
+++ b/src/views/warehouse/stockOrderEditor.vue
@@ -871,11 +871,11 @@ export default {
                             return;
                         }
                     }
-                    if (this.$isBlank(tQuery.batchNo)) {
-                        if (!tQuery.allowNoBatch) {
-                            return this.$message.error('批次号不能为空');
-                        }
-                    }
+                    // if (this.$isBlank(tQuery.batchNo)) {
+                    //     if (!tQuery.allowNoBatch) {
+                    //         return this.$message.error('批次号不能为空');
+                    //     }
+                    // }
                     if (this.$isBlank(tQuery.productDate) && this.$isBlank(tQuery.expireDate)) {
                         return this.$message.error('生产日期与失效日期不能全部为空');
                     }
diff --git a/src/views/warehouse/stockOrderNewDistribution.vue b/src/views/warehouse/stockOrderNewDistribution.vue
index d681085..6439327 100644
--- a/src/views/warehouse/stockOrderNewDistribution.vue
+++ b/src/views/warehouse/stockOrderNewDistribution.vue
@@ -569,11 +569,11 @@ export default {
                             if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") {
                                 return this.$message.error('单据数量不能为0');
                             }
-                            if (this.$isBlank(this.codeArray[i].batchNo)) {
-                                if (!this.codeArray[i].allowNoBatch) {
-                                    return this.$message.error('批次号不能为空');
-                                }
-                            }
+                            // if (this.$isBlank(this.codeArray[i].batchNo)) {
+                            //     if (!this.codeArray[i].allowNoBatch) {
+                            //         return this.$message.error('批次号不能为空');
+                            //     }
+                            // }
                             if (this.$isBlank(this.codeArray[i].productDate) && this.$isBlank(this.codeArray[i].expireDate)) {
                                 return this.$message.error('生产日期与失效日期不能全部为空');
                             }