1.修复部分bug

src/views/basic/BussinessType.vue

@@ -58,6 +58,7 @@
                         <span>{{ enableMap[scope.row.secCheckEnable] }}</span>
                     </template>
                 </el-table-column>
+                <el-table-column label="备注" prop="remark" fixed></el-table-column>
                 <el-table-column label="操作" fixed="right">
                     <template slot-scope="scope">
                         <el-button
@@ -141,6 +142,7 @@ import {
 import modifyDialog from "./BussinessTypeModify";
 import axios from "axios";
 import store from "@/store";
+import {isBlank} from "@/utils/strUtil";
 
 export default {
     data() {
@@ -263,12 +265,20 @@ export default {
                 this.$message.error("出入库类型不能为空！");
                 return;
             }
+            if (isBlank(this.inputQuery.corpType)) {
+                this.$message.error("往来信息类型为必选项！");
+                return;
+            }
             this.inputQuery.customerId = this.$store.getters.customerId;
             insertBussinessType(this.inputQuery)
                 .then((response) => {
+                    if (response.code === 20000) {
                         this.loading = false;
                         this.cancelDialog();
                         this.getList();
+                    } else {
+                        this.$message.error(response.message);
+                    }
                 })
                 .catch(() => {
                     this.loading = false;

src/views/basic/invWarehouse.vue

@@ -146,6 +146,15 @@
                         </template>
                     </el-table-column>
                 </el-table>
+
+                <el-pagination
+                    :page-size="userQuery.limit"
+                    @current-change="loadUserList"
+                    layout="prev, pager, next"
+                    :total="userTotal"
+                    :current-page="userQuery.page"
+                >
+                </el-pagination>
             </el-card>
 
             <el-card style="width: 49%; float: right; margin-left: 0px;">
@@ -206,6 +215,15 @@
                 <el-table-column label="用户名" prop="employeeName" fixed></el-table-column>
             </el-table>
 
+            <el-pagination
+                :page-size="addUserQuery.limit"
+                @current-change="loadUserList"
+                layout="prev, pager, next"
+                :total="addUserTotal"
+                :current-page="addUserQuery.page"
+            >
+            </el-pagination>
+
             <div slot="footer" class="dialog-footer">
                 <el-button @click.native="userFormVisible = !userFormVisible"
                 >取消
@@ -558,7 +576,32 @@ export default {
             thrWareHouseVisible: false,
             checkThrWarehouseRow: null,
             currentSysId: null,
-            thirdSysVisible: false
+            thirdSysVisible: false,
+            userQuery: {
+                code: null,
+                page: 1,
+                limit: 10
+            },
+            userTotal: 0,
+            busQuery: {
+                code: null,
+                page: 1,
+                limit: 10
+            },
+            busTotal: 0,
+            addUserQuery: {
+                customerId: this.$store.getters.customerId,
+                page: 1,
+                limit: 10
+            },
+            addUserTotal: 0,
+            bussinessTypeQuery: {
+                customerId: this.$store.getters.customerId,
+                enabled: true,
+                page: 1,
+                limit: 10
+            },
+            bussinessTypeTotal: 0
         };
     },
     methods: {
@@ -844,15 +887,12 @@ export default {
                 this.$message.error("单据类型数据加载失败");
             });
         },
-        addUser() {
+        getAddUserList(val) {
-            if (this.currentCode == null || this.currentCode == "") {
+            this.addUserQuery.page = val;
-                this.$message.error("请先选择仓库");
+            getUserList(this.addUserQuery).then((res) => {
-            } else {
-                this.userFormVisible = true;
-                let query = {customerId: this.$store.getters.customerId};
-                getUserList(query).then((res) => {
                 this.selectUserList = [];
-                    this.userList = res.data;
+                this.userList = res.data.list || [];
+                this.addUserTotal = res.data.total || 0;
                 var that = this;
                 that.$nextTick(() => {
                     if (that.$refs.checkUserList) {
@@ -867,7 +907,27 @@ export default {
                     });
                 });
             });
+        },
+        addUser() {
+            if (this.currentCode == null || this.currentCode == "") {
+                this.$message.error("请先选择仓库");
+            } else {
+                this.userFormVisible = true;
+                this.getAddUserList(1);
+            }
+        },
+
+        loadUserList(val) {
+            if (val != null) {
+                this.userQuery.page = val;
             }
+            //加载用户数据
+            warehouseUserList(this.userQuery).then((res) => {
+                this.userData = res.data.list;
+                this.userTotal = res.data.total;
+            }).catch((error) => {
+                this.$message.error("用户数据加载失败")
+            });
         },
         handleUserSelectionChange(row) {
             let _this = this;

src/views/sys/bindPlatform.vue

@@ -142,7 +142,7 @@
                 <el-row :gutter="20" class="el-row" type="flex">
                     <el-col :span="20" class="el-col" type="flex">
                         <div class="text item">
-                            <el-form-item label="目标仓库分库" prop="targetAction">
+                            <el-form-item label="目标仓库分库" prop="invCode">
                                 <el-select v-model="editLogin.invCode"
                                            style="width: 35%;"
                                            placeholder="目标仓库信息" @change="locInvChange"
@@ -307,6 +307,12 @@ export default {
                 platformId: [
                     {required: true, message: "请选择自助平台", trigger: "change"}
                 ],
+                invCode: [
+                    {required: true, message: "请选择目标分库", trigger: "change"}
+                ],
+                invSubCode: [
+                    {required: true, message: "请选择目标分库", trigger: 'change'}
+                ],
                 platformUsername: [
                     {required: true, message: "请输入账号", trigger: "change"}
                 ],
@@ -356,6 +362,12 @@ export default {
             };
             this.getList();
         },
+        resetForm() {
+            this.$nextTick(() => {
+                this.$refs['editLogin'].resetFields();
+                this.$refs["editLogin"].clearValidate();
+            });
+        },
         search() {
             this.query.page = 1;
             this.getList();
@@ -405,6 +417,7 @@ export default {
             this.editType = 0;
             this.editLoginVisible = true;
             this.editDialogVisible = false;
+            this.resetForm();
             this.curPlatformId = "",
                 //清空表单数据
                 this.editLogin = {

src/views/userManage/admin/authPermissionRule.vue

@@ -129,7 +129,6 @@ export default {
     data() {
         return {
             query: {
-                name: "",
                 status: ""
             },
             mergeList: [],

src/views/userManage/param/systemPDFModule.vue

@@ -11,7 +11,7 @@
             >
                 <el-row>
                     <el-form-item class="query-form-item">
-                        <el-input v-model="moduleQuery.name" placeholder="功能名称"></el-input>
+                        <el-input v-model="moduleQuery.name" placeholder="功能名称" clearable></el-input>
                     </el-form-item>
                     <el-form-item>
                         <el-button-group>
@@ -157,6 +157,15 @@
                     </template>
                 </el-table-column>
             </el-table>
+
+            <el-pagination
+                :current-page="detailQuery.page"
+                :page-size="detailQuery.limit"
+                @current-change="handleCurrentChange"
+                layout="prev, pager, next"
+                :total="detailTotal"
+            ></el-pagination>
+
             <el-dialog
                 title="接口参数设置"
                 :close-on-click-modal="false"
@@ -177,13 +186,6 @@
                     >
                 </div>
             </el-dialog>
-            <el-pagination
-                :current-page="moduleQuery.page"
-                :page-size="moduleQuery.limit"
-                @current-change="handlePageChange"
-                layout="prev, pager, next"
-                :total="total"
-            ></el-pagination>
 
         </el-card>
         <!--表单-->
@@ -358,7 +360,7 @@
                 <el-pagination
                     :current-page="selectTemplateQuery.page"
                     :page-size="selectTemplateQuery.limit"
-                    @current-change="moduleHandleCurrentChange"
+                    @current-change="selectTemplateHandleCurrentChange"
                     layout="prev, pager, next"
                     :total="selectTemplateTotal"
                 >
@@ -423,13 +425,6 @@ const moduleFormJson = {
 export default {
     data() {
         return {
-            query: {
-                templateType: null,
-                moduleId: null,
-                name: "",
-                page: 1,
-                limit: 20
-            },
             headers: {},
             list: [],
             total: 0,
@@ -438,10 +433,18 @@ export default {
                 page: 1,
                 limit: 20
             },
+            moduleTotal: 0,
+            detailQuery: {
+                templateType: null,
+                moduleId: null,
+                name: "",
+                page: 1,
+                limit: 20
+            },
+            detailTotal: 0,
             currentRow: null,
             moduleList: [],
             moduleNameList: [],
-            moduleTotal: 0,
             selectTemplateQuery: {
                 busRlId: null,
                 name: "",
@@ -496,10 +499,7 @@ export default {
             this.$router.push({
                 path: ""
             });
-            this.query = {
+            this.moduleQuery = {
-                templateType: null,
-                moduleId: null,
-                customerId: this.$store.getters.customerId,
                 name: "",
                 page: 1,
                 limit: 20
@@ -507,22 +507,27 @@ export default {
             this.getModuleList();
         },
         onSubmit() {
-            this.query.page = 1;
+            this.moduleQuery.page = 1;
             this.getModuleList();
         },
         handleCurrentChange(val) {
-            this.query.page = val;
+            this.detailQuery.page = val;
             this.getList();
         },
         moduleHandleCurrentChange(val) {
             this.moduleQuery.page = val;
             this.getModuleList();
         },
+        selectTemplateHandleCurrentChange(val) {
+            this.selectTemplateQuery.page = val;
+            this.selectTemplateGetList();
+        },
         getList() {
-            moduleDetail(this.query)
+            moduleDetail(this.detailQuery)
                 .then(response => {
                     this.loading = false;
-                    this.list = response.data || [];
+                    this.list = response.data.list || [];
+                    this.detailTotal = response.data.total || 0;
                 })
                 .catch(() => {
                     this.loading = false;
@@ -531,7 +536,7 @@ export default {
         },
 
         moduleClick(row) {
-            this.query = {
+            this.detailQuery = {
                 templateType: row.templateType,
                 moduleId: row.id,
                 customerId: this.$store.getters.customerId,
@@ -641,12 +646,11 @@ export default {
                 type: 1,
                 name: "",
                 page: 1,
-                limit: 20
+                limit: 10
             };
             this.selectTemplateGetList();
         },
 
-
         selectTemplateGetList() {
             this.selectTemplateLoading = true;
             systemPDFTemplateList(this.selectTemplateQuery)

src/views/userManage/param/systemParamConfig.vue

@@ -249,6 +249,7 @@ export default {
         // 显示表单
         handleForm(index, row) {
             this.formVisible = true;
+            this.resetForm();
             formJson.customerId = this.$store.getters.customerId;
             this.formData = JSON.parse(JSON.stringify(formJson));
             if (row !== null) {

src/views/userManage/userAccountManage.vue

@@ -141,6 +141,15 @@
                         </div>
                     </el-col>
                 </el-row>
+                <el-row :gutter="20" class="el-row" type="flex">
+                    <el-col :span="10" class="el-col" type="flex">
+                        <div class="text item">
+                            <el-form-item label="备注" prop="comments">
+                                <el-input v-model="formData.comments" size="small"></el-input>
+                            </el-form-item>
+                        </div>
+                    </el-col>
+                </el-row>
             </el-form>
             <div slot="footer" class="dialog-footer">
                 <el-button @click.native="hideForm" size="small">取消</el-button>
@@ -370,6 +379,7 @@ export default {
                         customerId: this.userInfo.customerId,
                         companyName: this.userInfo.companyName,
                         passWord: this.formData.passWord,
+                        checkPassword: this.formData.checkPassword,
                         userName: this.formData.userName,
                         employeeName: this.formData.employeeName,
                     };

src/views/warehouse/InvProducts.vue

@@ -24,6 +24,17 @@
                         <el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="注册/备案证号"
                                   :clearable="true"></el-input>
                     </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-select v-model="filterQuery.invStorageCode" 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
@@ -51,6 +62,7 @@
                 <el-table-column label="入库数量" prop="inCount"></el-table-column>
                 <el-table-column label="出库数量" prop="outCount"></el-table-column>
                 <el-table-column label="结余数量" prop="reCount"></el-table-column>
+                <el-table-column label="仓库" prop="invStorageName"></el-table-column>
                 <el-table-column label="注册/备案证号" width="180" prop="zczbhhzbapzbh"></el-table-column>
                 <el-table-column label="生产厂家" width="200" prop="manufactory"></el-table-column>
                 <el-table-column label="操作" width="80" fixed="right">
@@ -72,6 +84,8 @@
             :visible.sync="codeDetailVisible"
             width="65%"
             v-if="codeDetailVisible"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
         >
             <codeDetail
                 :idQuery="idQuery"
@@ -97,6 +111,7 @@ import draggable from "vuedraggable";
 import codeDetail from "../inventory/InvPreProductsDetail";
 import store from "../../store";
 import {getBusType} from "../../api/warehouse/BusRole";
+import {filterAllByUser} from "@/api/basic/invWarehouse";
 
 
 export default {
@@ -107,9 +122,13 @@ export default {
                 nameCode: null,
                 relIdFk: null,
                 batchNo: null,
+                ggxh: null,
+                manufactory: null,
+                zczbhhzbapzbh: null,
+                customerId: store.getters.customerId,
+                invStorageCode: null,
                 page: 1,
-                limit: 20,
+                limit: 20
-                customerId: null
             },
             detailQuery: {
                 code: null,
@@ -127,7 +146,8 @@ export default {
             dialogVisible: false,
             deleteLoading: false,
             busTypes: [],
-            idQuery: null
+            idQuery: null,
+            storageList: [],
         };
     },
     components: {
@@ -144,7 +164,11 @@ export default {
                 nameCode: null,
                 relIdFk: null,
                 batchNo: null,
-                customerId: null,
+                ggxh: null,
+                manufactory: null,
+                zczbhhzbapzbh: null,
+                customerId: store.getters.customerId,
+                invStorageCode: null,
                 page: 1,
                 limit: 20
             };
@@ -195,7 +219,15 @@ export default {
                     this.total = 0;
                 });
         },
-
+        getStorage() {
+            this.storageList = [];
+            filterAllByUser()
+                .then((response) => {
+                    this.storageList = response.data || [];
+                })
+                .catch(() => {
+                });
+        },
         deleteOrders(data) {
             this.loading = true;
             let query = {
@@ -264,6 +296,7 @@ export default {
         this.filterQuery.limit = parseInt(this.filterQuery.limit);
         // 加载表格数据
         this.getList();
+        this.getStorage();
     }
 };
 </script>

src/views/warehouse/ioErrorOrder.vue

@@ -244,9 +244,10 @@ export default {
                 limit: 20
             },
             checkStatus: {
-                error: "校验异常",
+                1: "等待处理",
-                process: "等待校验",
+                2: "正在处理",
-                success: "校验成功"
+                3: "已完成",
+                9: "异常"
             },
             curIndex: "",
             unitquery: {key: "", page: 1, limit: 10},

src/views/warehouse/stockOrderDelete.vue

@@ -30,7 +30,6 @@
                 style="width: 100%"
                 @row-click="getOrderDetailList"
                 highlight-current-row
-                @selection-change="handleSelectionChange"
                 :row-class-name="tableRowClassName"
             >
                 <el-table-column label="序号" type="index"></el-table-column>
@@ -44,11 +43,7 @@
                     prop="orderId"
                     show-overflow-tooltip="true"
                 ></el-table-column>
-                <el-table-column label="来源" prop="fromType">
+                <el-table-column label="来源" prop="fromType"></el-table-column>
-                    <template slot-scope="scope">
-                        <span>{{ fromTypeMap[scope.row.fromType] }}</span>
-                    </template>
-                </el-table-column>
                 <el-table-column label="往来单位" prop="fromCorp" width="250">
                 </el-table-column>
                 <el-table-column label="当前仓库" prop="locStorageCode" width="150">
@@ -67,10 +62,10 @@
                         <span>{{ scope.row.actDate }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="校验状态" prop="contrastStatus" width="120">
+                <el-table-column label="验收状态" prop="receiveStatus" width="120">
                     <template slot-scope="scope">
-                        <el-tag :type="(scope.row.contrastStatus === 1) | statusFilterType">
+                        <el-tag :type="(scope.row.receiveStatus === 1) | statusFilterType">
-                            {{ erpCheckStatus[scope.row.contrastStatus] }}
+                            {{ erpCheckStatus[scope.row.receiveStatus] }}
                         </el-tag>
                     </template>
                 </el-table-column>
@@ -271,9 +266,9 @@
                     "8": "平衡补录单据",
                 },
                 erpCheckStatus: {
-                    1: "已完成",
+                    1: "已验收",
-                    0: "已完成",
+                    0: "未验收",
-                    2: "已完成",
+                    2: "无需验收",
                 },
                 isSp: store.getters.customerId,
                 detailFormData: {},