业务单据类型，扫码单据类型bug修复，新增用户bug修复，

单据打印bug修复；
仓库，添加用户，添加单据类型界面优化；

src/views/basic/BussinessType.vue

@@ -87,7 +87,7 @@
             </el-table>
 
             <el-dialog
-                title="新增业务类型关联"
+                title="新增扫码单据类型"
                 :visible.sync="addDialogVisible"
                 width="70%"
                 :close-on-click-modal="false"
@@ -210,6 +210,7 @@ export default {
                 path: "",
             });
             this.filterQuery = {
+                enable: null,
                 udiwmsType: "",
                 thirdType: "",
                 page: 1,

src/views/basic/BussinessTypeLocl.vue

@@ -201,8 +201,12 @@ export default {
             addLocalBusType(this.inputQuery)
                 .then((response) => {
                     this.loading = false;
+                    if (response.code == 20000) {
                         this.cancelDialog();
                         this.getList();
+                    } else {
+                        this.$message.error(response.message);
+                    }
                 })
                 .catch(() => {
                     this.loading = false;

src/views/basic/BussinessTypeLoclModify.vue

@@ -84,7 +84,7 @@
             <el-col :span="4" class="el-col">
                 <div class="text item">
                     <el-checkbox v-model="inputQuery.changeEnable" @change="isChangeOrder"
-                                 :disabled="!changeEnable || inputQuery.mainAction">
+                                 :disabled="!changeEnable || inputQuery.mainAction=='WareHouseIn'">
                         缺量自动补单
                     </el-checkbox>
                 </div>
@@ -98,7 +98,6 @@
 
         <div v-if="visibleChange">
 
-
             <!--            <div style="float:right;margin-bottom: 10px">-->
             <!--                <el-button-->
             <!--                    type="primary"-->
@@ -266,10 +265,12 @@ export default {
                         if (this.inputQuery.changeEnable) {
                             this.visibleChange = true;
                         }
-                        if (this.changeList.length == 0)
+
-                            this.changeEnable = false;
-                        else
                         this.changeEnable = true;
+                        // if (this.changeList.length == 0)
+                        //     this.changeEnable = false;
+                        // else
+                        //     this.changeEnable = true;
 
                     } else {
                         // this.$message.error(response.message);
@@ -289,8 +290,7 @@ export default {
                 })
                 .catch(() => {
                 });
-            this.getBusTypes(null);
+            this.getBusTypes();
-
         },
 
         getBusTypes() {

src/views/basic/BussinessTypeModify.vue

@@ -36,7 +36,6 @@
                     <div class="itemTag">
                         <span>出入库类型:&nbsp;</span>
                     </div>
-
                     <el-select v-model="inputQuery.mainAction" placeholder="出入库类型" @change="getOrderType">
                         <el-option label="入库" value="WareHouseIn"></el-option>
                         <el-option label="出库" value="WareHouseOut"></el-option>
@@ -268,13 +267,13 @@
             </el-col>
             <el-col :span="4" class="el-col">
                 <div class="text item">
-                    <el-checkbox v-model="inputQuery.secCheckPdaEd" :disabled="!inputQuery.secCheckEnable">手持终端未校验单据
+                    <el-checkbox v-model="inputQuery.secCheckPdaUn" :disabled="!inputQuery.secCheckEnable">手持终端未校验单据
                     </el-checkbox>
                 </div>
             </el-col>
             <el-col :span="4" class="el-col">
                 <div class="text item">
-                    <el-checkbox v-model="inputQuery.secCheckPdaUn" :disabled="!inputQuery.secCheckEnable">手持终端已校验单据
+                    <el-checkbox v-model="inputQuery.secCheckPdaEd" :disabled="!inputQuery.secCheckEnable">手持终端已校验单据
                     </el-checkbox>
                 </div>
             </el-col>
@@ -309,10 +308,9 @@ import {
 } from "../../api/basic/basicThirdSys";
 
 import {
-    getLocalBusType, getLocalJoinNoUse
+    getLocalJoinNoUse
 } from "../../api/basic/busLocalType";
 import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
-import {getJoinBussinessType} from "../../api/basic/bussinessType";
 import {getCandidateBussinessType} from "../../api/receipts/bussinessType";
 
 export default {
@@ -329,6 +327,7 @@ export default {
             filterQuery: {
                 enabled: true,
                 isBuType: true,
+                isFilterBind: true,
             },
             storageList: [],
             orderTypeList: [],

src/views/basic/invWarehouse.vue

@@ -116,7 +116,17 @@
 
                 </el-table-column>
             </el-table>
-
+            <!--            <el-tree-->
+            <!--                :data="mergeList"-->
+            <!--                :props="defaultProps"-->
+            <!--                node-key="id"-->
+            <!--                style="width: 50%"-->
+            <!--                default-expand-all-->
+            <!--                :expand-on-click-node="false"-->
+            <!--                :render-content="renderContent"-->
+            <!--            >-->
+            <!--            </el-tree>-->
+        </el-card>
         <div>
             <el-card style="width: 49%; float: left; margin-right: 0px;">
                 <div slot="header" class="clearfix" style="margin-bottom: 20px;">
@@ -127,14 +137,14 @@
                     stripe
                     style="width: 100%">
                     <el-table-column
-                            prop="userid"
+                        prop="username"
-                            label="用户ID"
+                        label="账号"
                         min-width="20%">
                     </el-table-column>
                     <el-table-column
-                            prop="username"
+                        prop="employeeName"
                         label="用户名"
-                            min-width="40%">
+                        min-width="30%">
                     </el-table-column>
                     <el-table-column
                         prop="isDirector"
@@ -182,27 +192,12 @@
             </el-card>
         </div>
 
-
-            <!--            <el-tree-->
-            <!--                :data="mergeList"-->
-            <!--                :props="defaultProps"-->
-            <!--                node-key="id"-->
-            <!--                style="width: 50%"-->
-            <!--                default-expand-all-->
-            <!--                :expand-on-click-node="false"-->
-            <!--                :render-content="renderContent"-->
-            <!--            >-->
-            <!--            </el-tree>-->
-        </el-card>
-
-
         <!--添加用户弹窗-->
         <el-dialog
             title="用户列表"
             :close-on-click-modal="false"
             :close-on-press-escape="false"
             :visible.sync="userFormVisible"
-            class="dialog"
         >
             <el-table v-loading="loading" :data="userList" ref="checkUserList"
                       @selection-change="handleUserSelectionChange"
@@ -212,8 +207,8 @@
                     :reserve-selection="false"
                     width="55">
                 </el-table-column>
-                <el-table-column label="用户ID" prop="id" fixed></el-table-column>
+                <el-table-column label="账号" prop="userName" fixed></el-table-column>
-                <el-table-column label="用户名" prop="userName" fixed></el-table-column>
+                <el-table-column label="用户名" prop="employeeName" fixed></el-table-column>
             </el-table>
 
             <div slot="footer" class="dialog-footer">
@@ -236,7 +231,6 @@
             :close-on-click-modal="false"
             :close-on-press-escape="false"
             :visible.sync="bussinessTypeFormVisible"
-            class="dialog"
         >
             <el-table v-loading="loading" :data="bussinessTypeList" ref="typeList"
                       @selection-change="handleBussinessTypeSelectionChange"

src/views/warehouse/IOCheckErrOrder.vue

@@ -46,7 +46,18 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
-
+                    <el-form-item class="query-form-item">
+                        <el-select v-model="filterQuery.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
@@ -473,6 +484,7 @@ import {downloadInoutOrderSuccessPDF} from "../../api/itextpdf/itextpdf";
 import selectErpOrder from "./DialogSelectErpOrder";
 import selectRlDialog from "./DialogSelectRl";
 import {getBussinessType} from "../../api/basic/bussinessType";
+import {filterAllByUser} from "@/api/basic/invWarehouse";
 
 const formJson = {
     site_id: "",
@@ -551,6 +563,7 @@ export default {
             idQuery: {
                 id: "",
             },
+            storageList: [],
             curIndex: "",
             adListNoDataText: "无数据",
             queryAdIdAsyncLoading: false,
@@ -1022,6 +1035,15 @@ export default {
                 }
             }
         },
+        getStorage() {
+            this.storageList = [];
+            filterAllByUser()
+                .then((response) => {
+                    this.storageList = response.data || [];
+                })
+                .catch(() => {
+                });
+        },
         getBusType() {
             let query = {
                 enabled: true,
@@ -1190,6 +1212,7 @@ export default {
     },
 
     created() {
+        this.getStorage();
         this.getBusType();
         let query = this.$route.query;
         this.query = Object.assign(this.query, query);

src/views/warehouse/IONewOrder.vue

@@ -25,6 +25,17 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-select v-model="filterQuery.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>
                         <el-button-group>
                             <el-button
@@ -295,6 +306,7 @@ import addOrder from "./addOrder";
 import addHosOrder from "./addHosOrder";
 import store from "../../store";
 import {getBussinessType} from "../../api/basic/bussinessType";
+import {filterAllByUser} from "@/api/basic/invWarehouse";
 
 const formJson = {
     site_id: "",
@@ -334,6 +346,7 @@ export default {
             idQuery: {
                 id: "",
             },
+            storageList: [],
             errOrderVisible: false,
             list: [],
             adId: [],
@@ -431,6 +444,15 @@ export default {
                 .catch(() => {
                 });
         },
+        getStorage() {
+            this.storageList = [];
+            filterAllByUser()
+                .then((response) => {
+                    this.storageList = response.data || [];
+                })
+                .catch(() => {
+                });
+        },
         addOrders(row) {
             console.log(row)
             this.idQuery.id = '';
@@ -638,6 +660,7 @@ export default {
         };
     },
     created() {
+        this.getStorage();
         this.getBusType();
         let query = this.$route.query;
         this.filterQuery = Object.assign(this.filterQuery, query);

src/views/warehouse/IOSearchOrder.vue

@@ -35,6 +35,18 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item class="query-form-item">
+                        <el-select v-model="filterQuery.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;font-size: small"
             >创建日期:</span
             >
@@ -401,6 +413,8 @@ import {downloadInoutOrderSuccessPDF} from "../../api/itextpdf/itextpdf";
 import selectErpOrder from "./DialogSelectErpOrder";
 import {getBussinessType} from "../../api/basic/bussinessType";
 import {formatDate} from "../../utils/date";
+import {filterAllByUser} from "@/api/basic/invWarehouse";
+
 const formJson = {
     site_id: "",
     site_name: "",
@@ -448,6 +462,7 @@ export default {
             unitlist: [],
             list: [],
             detailList: [],
+            storageList: [],
             unitUpdateQuery: {
                 id: "",
                 fromCorpId: "",
@@ -589,7 +604,15 @@ export default {
             console.log(val);
             this.multipleSelection = val;
         },
-
+        getStorage() {
+            this.storageList = [];
+            filterAllByUser()
+                .then((response) => {
+                    this.storageList = response.data || [];
+                })
+                .catch(() => {
+                });
+        },
         handleErrorDetail(poistion) {
             var mOrder = this.list[poistion];
             this.errorDetail = mOrder.remark;
@@ -924,6 +947,7 @@ export default {
     ,
 
     created() {
+        this.getStorage();
         this.getBusType();
         let query = this.$route.query;
         this.query = Object.assign(this.query, query);

src/views/warehouse/IOWaitOrder.vue

@@ -34,6 +34,18 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item class="query-form-item">
+                        <el-select v-model="filterQuery.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
             >
@@ -397,6 +409,7 @@ import successOrderExportPDFSetting from "./successOrderExportPDF";
 import {downloadInoutOrderSuccessPDF} from "../../api/itextpdf/itextpdf";
 import selectErpOrder from "./DialogSelectErpOrder";
 import {getBussinessType} from "../../api/basic/bussinessType";
+import {filterAllByUser} from "@/api/basic/invWarehouse";
 
 const formJson = {
     site_id: "",
@@ -497,6 +510,7 @@ export default {
                 orderId: "",
             },
             busTypes: [],
+            storageList: [],
             multipleSelection: [],
             dialogTableVisible: false,
             formLoading: false,
@@ -932,6 +946,15 @@ export default {
                 }
             }
         },
+        getStorage() {
+            this.storageList = [];
+            filterAllByUser()
+                .then((response) => {
+                    this.storageList = response.data || [];
+                })
+                .catch(() => {
+                });
+        },
     },
     filters: {
         statusFilterType(status) {
@@ -950,6 +973,7 @@ export default {
     },
 
     created() {
+        this.getStorage();
         this.getBusType();
         let query = this.$route.query;
         this.query = Object.assign(this.query, query);

src/views/warehouse/addOrder.vue

@@ -71,7 +71,8 @@
                     <el-col :span="8">
 
                         <el-form-item class="query-form-item">
-                            <el-select v-model="formData.billType" placeholder="请选择单据类型" @change="actionChange">
+                            <el-select v-model="formData.billType" placeholder="请选择单据类型" @change="actionChange"
+                                       clearable>
                                 <el-option
                                     v-for="item in busTypes"
                                     :key="item.name"
@@ -98,7 +99,7 @@
                             <!--<el-select v-model="formData.billType" style="width: 100%" placeholder="业务类型" :disabled="true">-->
                             <!--<el-option label="送货单" value="deliveryNote"></el-option>-->
                             <!--</el-select>-->
-                            <el-select v-model="formData.locStorageCode" placeholder="当前仓库信息">
+                            <el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" clearable>
                                 <el-option
                                     v-for="item in storageList"
                                     :key="item.name"
@@ -435,12 +436,13 @@ export default {
             this.$router.go(-1);
         },
         getStorage(event) {
-            // let query = {
+            let query = {
                 // advanceType: this.getActionName(event),
-            // };
+                isDefault: true,
+            };
             this.storageList = [];
             // this.formData.locStorageCode = null;
-            filterAllByUser()
+            filterAll(query)
                 .then((response) => {
                     this.storageList = response.data || [];
                 })

src/views/warehouse/stockHospOrderNew.vue

@@ -64,18 +64,20 @@
                 <el-row :gutter="20" style="margin-top: -10px">
                     <el-col :span="3">
                         <div class="ao-text">
-                            <span>业务类型：</span>
+                            <span>当前仓库：</span>
                         </div>
                     </el-col>
+
                     <el-col :span="7">
-                        <el-form-item prop="billType">
+                        <el-form-item prop="locStorageCode">
-                            <el-select v-model="formData.billType" placeholder="请选择业务类型" @change="actionChange">
+                            <el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" @change="locInChange"
+                                       clearable>
                                 <el-option
-                                    v-for="item in busTypes"
+                                    v-for="item in storageList"
-                                    :key="item.localAction"
+                                    :key="item.name"
-                                    :label="item.localName"
+                                    :label="item.name"
-                                    :value="item.localAction">
+                                    :value="item.code">
-                                    <span style="float: left">{{ item.localName }}</span>
+                                    <span style="float: left">{{ item.name }}</span>
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -147,23 +149,25 @@
 
                     <el-col :span="3">
                         <div class="ao-text">
-                            <span>当前仓库：</span>
+                            <span>业务类型：</span>
                         </div>
                     </el-col>
-
                     <el-col :span="7">
-                        <el-form-item prop="locStorageCode">
+                        <el-form-item prop="billType">
-                            <el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" @change="locInChange">
+                            <el-select v-model="formData.billType" placeholder="请选择业务类型" @change="actionChange"
+                                       clearable>
                                 <el-option
-                                    v-for="item in storageList"
+                                    v-for="item in busTypes"
-                                    :key="item.name"
+                                    :key="item.localAction"
-                                    :label="item.name"
+                                    :label="item.localName"
-                                    :value="item.code">
+                                    :value="item.localAction">
-                                    <span style="float: left">{{ item.name }}</span>
+                                    <span style="float: left">{{ item.localName }}</span>
                                 </el-option>
                             </el-select>
                         </el-form-item>
                     </el-col>
+
+
                     <el-col :span="3">
                         <div class="ao-text">
                             <span></span>
@@ -1198,9 +1202,10 @@ export default {
                     }
                 });
         },
-        getBusType() {
+        getBusType(invCode) {
             let query = {
                 enabled: true,
+                code: invCode,
             };
             getLocalJoinByUser(query)
                 .then((response) => {
@@ -1248,6 +1253,7 @@ export default {
             console.log(item);
             this.formData.locStorageCode = item;
             this.$forceUpdate();
+            this.getBusType(item);
         }
     },
     filters: {},
@@ -1258,7 +1264,7 @@ export default {
         };
     },
     created() {
-        this.getBusType();
+        this.getBusType("NOCODE");
         this.getStorage();
         this.formData = {};
         this.codeArray = [];

src/views/warehouse/stockOrderNewDistribution.vue

@@ -74,7 +74,7 @@
                             <!--<el-select v-model="formData.billType" style="width: 100%" placeholder="业务类型" :disabled="true">-->
                             <!--<el-option label="送货单" value="deliveryNote"></el-option>-->
                             <!--</el-select>-->
-                            <el-select v-model="formData.billType" placeholder="请选择业务类型" @change="getStorage">
+                            <el-select v-model="formData.billType" placeholder="请选择业务类型" @change="getStorage" clearable>
                                 <el-option
                                     v-for="item in busTypes"
                                     :key="item.localName"
@@ -129,7 +129,7 @@
                             <!--<el-select v-model="formData.billType" style="width: 100%" placeholder="业务类型" :disabled="true">-->
                             <!--<el-option label="送货单" value="deliveryNote"></el-option>-->
                             <!--</el-select>-->
-                            <el-select v-model="formData.locStorageCode" placeholder="当前仓库信息">
+                            <el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" clearable>
                                 <el-option
                                     v-for="item in storageList"
                                     :key="item.name"
@@ -1082,6 +1082,7 @@ export default {
         getBusType() {
             let query = {
                 enabled: true,
+
             };
             getLocalJoinBusType(query)
                 .then((response) => {
@@ -1095,9 +1096,10 @@ export default {
             console.log("-----" + event);
             let query = {
                 advanceType: this.getActionName(event),
+                isDefault: true,
             };
             this.storageList = [];
-            filterAllByUser(query)
+            filterAll(query)
                 .then((response) => {
                     this.storageList = response.data || [];
                 })