diff --git a/src/views/basic/BussinessTypeModify.vue b/src/views/basic/BussinessTypeModify.vue
index 4cb395d..e05b260 100644
--- a/src/views/basic/BussinessTypeModify.vue
+++ b/src/views/basic/BussinessTypeModify.vue
@@ -67,7 +67,7 @@
                     <div class="itemTag">
                         <span>内部进出平衡补单&nbsp;</span>
                     </div>
-                    <el-select :disabled="inputQuery.corpType !=1"
+                    <el-select :disabled="inputQuery.corpType != '1'"
                                v-model="inputQuery.supplementOrderType"
                                clearable
                                placeholder="单据类型">
@@ -91,7 +91,7 @@
                         style="width: 40%"
                         size="small"
                         v-model="inputQuery.defaultUnit"
-                        :disabled="editDefaultUnit"
+                        :disabled="inputQuery.corpType != '3'"
                     ></el-input>
                 </div>
             </el-col>
@@ -187,11 +187,6 @@ export default {
         };
     },
     methods: {
-        getList() {
-            let query = {
-                curAction: this.inputQuery.localAction
-            };
-        },
         getStorage() {
             this.storageList = [];
             filterAll()
@@ -241,16 +236,6 @@ export default {
             } else {
                 this.inputQuery.orderTypeEnable = false;
             }
-
-            //当选择的挂往来单位类型为仓库信息时，清空 特殊单据往来 的值并且禁用输入框
-            if (val == 1) {
-                this.inputQuery.defaultUnit = null;
-                this.editDefaultUnit = true;
-            } else if (val == 3) {
-                this.editDefaultUnit = false;
-            } else {
-                this.editDefaultUnit = true;
-            }
         }
     },
 
@@ -258,7 +243,6 @@ export default {
         if (this.inputQuery.mainAction != null && this.inputQuery.mainAction != "") {
             this.getOrderType();
         }
-        this.getList();
         this.getStorage();
 
     }
diff --git a/src/views/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue
index e67c910..6f5d2c1 100644
--- a/src/views/basic/invWarehouse.vue
+++ b/src/views/basic/invWarehouse.vue
@@ -213,8 +213,9 @@
         >
             <el-table v-loading="loading" :data="userList" ref="checkUserList"
                       @selection-change="handleUserSelectionChange"
+                      style="width: 100%;"
                       class="tableClass"
-                      style="width: 100%">
+            >
                 <el-table-column
                     type="selection"
                     :reserve-selection="true"
@@ -224,15 +225,6 @@
                 <el-table-column label="用户名" prop="employeeName" fixed></el-table-column>
             </el-table>
 
-            <el-pagination
-                :page-size="addUserQuery.limit"
-                @current-change="getAddUserList"
-                layout="prev, pager, next"
-                :total="addUserTotal"
-                :current-page="addUserQuery.page"
-            >
-            </el-pagination>
-
             <div slot="footer" class="dialog-footer">
                 <el-button @click.native="userFormVisible = !userFormVisible"
                 >取消
@@ -256,7 +248,9 @@
         >
             <el-table v-loading="loading" :data="bussinessTypeList" ref="typeList"
                       @selection-change="handleBussinessTypeSelectionChange"
-                      style="width: 100%">
+                      style="width: 100%"
+                      class="tableClass"
+            >
                 <el-table-column
                     type="selection"
                     :reserve-selection="false"
@@ -266,15 +260,6 @@
                 <el-table-column label="单据类型名称" prop="name" fixed></el-table-column>
             </el-table>
 
-            <el-pagination
-                :page-size="bussinessTypeQuery.limit"
-                @current-change="addBussinessType"
-                layout="prev, pager, next"
-                :total="bussinessTypeTotal"
-                :current-page="bussinessTypeQuery.page"
-            >
-            </el-pagination>
-
             <div slot="footer" class="dialog-footer">
                 <el-button @click.native="bussinessTypeFormVisible = !bussinessTypeFormVisible"
                 >取消
@@ -401,7 +386,8 @@
                     </el-col>
                     <el-col :span="12" class="el-col">
                         <el-form-item class="query-form-item" label="上级仓库">
-                            <el-select v-model="formData.pcode" placeholder="请选择当前仓库" :disabled="true" clearable="true"
+                            <el-select v-model="formData.pcode" placeholder="请选择当前仓库" :disabled="true"
+                                       clearable="true"
                                        size="mini"
                                        @change="pcodeChange">
                                 <el-option
@@ -418,7 +404,8 @@
                 <el-row :gutter="20" class="el-row" type="flex">
                     <el-col :span="12" class="el-col">
                         <el-form-item class="query-form-item" label="仓库类型">
-                            <el-select v-model="formData.advanceType" placeholder="仓库类型" :disabled="formName =='edit'">
+                            <el-select v-model="formData.advanceType" placeholder="仓库类型"
+                                       :disabled="formName =='edit'">
                                 <!--                                <el-option label="寄售" :value="true"></el-option>-->
                                 <el-option label="仓库" :value="false"></el-option>
                             </el-select>
@@ -614,9 +601,7 @@ export default {
             addUserTotal: 0,
             bussinessTypeQuery: {
                 customerId: this.$store.getters.customerId,
-                enabled: true,
-                page: 1,
-                limit: 10
+                enabled: true
             },
             bussinessTypeTotal: 0
         };
@@ -730,7 +715,6 @@ export default {
             }
             this.formName = formName;
             this.getParentInv(this.formData.level);
-            this.getThrsysDetailData();
         },
         handleSubForm(node, data, formName) {
             this.subFormVisible = true;
@@ -895,8 +879,7 @@ export default {
             this.loadUserList();
             this.loadBussinessTypeList();
         },
-        getAddUserList(val) {
-            this.addUserQuery.page = val;
+        getAddUserList() {
             getUserList(this.addUserQuery).then((res) => {
                 this.selectUserList = [];
                 this.userList = res.data.list || [];
@@ -925,7 +908,7 @@ export default {
                     this.addUserTotal = 0;
                 }
                 this.userFormVisible = true;
-                this.getAddUserList(1);
+                this.getAddUserList();
             }
         },
 
@@ -988,16 +971,11 @@ export default {
                 this.$message.error("添加失败");
             });
         },
-        addBussinessType(val) {
+        addBussinessType() {
             if (this.currentCode == null || this.currentCode == "") {
                 this.$message.error("请先选择仓库");
             } else {
                 this.bussinessTypeFormVisible = true;
-                if (val === null || val === undefined) {
-                    this.bussinessTypeQuery.page = 1;
-                } else {
-                    this.bussinessTypeQuery.page = val;
-                }
                 getBussinessType(this.bussinessTypeQuery).then((res) => {
                     this.selectBussinessTypeList = [];
                     this.bussinessTypeList = res.data.list || [];
@@ -1161,11 +1139,11 @@ export default {
 };
 </script>
 
-<style type="text/scss" lang="scss">
+<style lang="scss">
 
 .tableClass {
     .el-table__fixed-right {
-        height: 100% !important; //设置高优先，以覆盖内联样式
+        height: 100% !important;
     }
 }
 
diff --git a/src/views/userManage/admin/authAdmin.vue b/src/views/userManage/admin/authAdmin.vue
index 1ac8916..9605864 100644
--- a/src/views/userManage/admin/authAdmin.vue
+++ b/src/views/userManage/admin/authAdmin.vue
@@ -165,7 +165,7 @@
                             <el-radio :label="1">正常</el-radio>
                         </el-radio-group>
                     </el-form-item>
-                    <el-form-item v-if="showRole" label="角色">
+                    <el-form-item label="角色">
                         <el-checkbox-group v-model="formData.roles" :disabled="formData.id === 1">
                             <el-checkbox
                                 v-for="item in roles"
@@ -332,10 +332,10 @@ export default {
         getRoles() {
             let roleQuery = {
                 page: 1,
-                limit: 20
+                limit: 1000
             };
             getAdminRoles(roleQuery).then((res) => {
-                this.roles = res.data;
+                this.roles = res.data.list || [];
             });
         },
         // 刷新表单
@@ -366,19 +366,26 @@ export default {
         handleForm(index, row) {
             this.formVisible = true;
             this.resetForm();
+            this.formData = JSON.parse(JSON.stringify(formJson));
+            if (row !== null) {
+                this.formData = {
+                    id: row.id,
+                    passWord: row.passWord,
+                    userName: row.userName,
+                    checkPassword: "",
+                    employeeName: row.employeeName,
+                    userFlag: 1,
+                    comments: row.comments,
+                    roles: row.roles,
+                    dept: row.dept,
+                };
+            }
             this.formName = "add";
             this.formRules = this.addRules;
             if (index !== null) {
                 this.index = index;
                 this.formName = "edit";
                 this.formRules = this.editRules;
-                this.formData = JSON.parse(JSON.stringify(formJson));
-                if (row !== null) {
-                    this.formData = Object.assign({}, row);
-                }
-            }
-            if (this.$store.getters.customerId == 110) {
-                this.showRole = true;
             }
         },
         formSubmit() {
diff --git a/src/views/userManage/customerManage.vue b/src/views/userManage/customerManage.vue
index ba00549..0b4b644 100644
--- a/src/views/userManage/customerManage.vue
+++ b/src/views/userManage/customerManage.vue
@@ -183,7 +183,12 @@
             </div>
         </el-dialog>
 
-        <el-dialog title="客户联系人" :visible.sync="contractVisible" width="60%">
+        <el-dialog title="客户联系人"
+                   :visible.sync="contractVisible"
+                   width="60%"
+                   :close-on-click-modal="false"
+                   :close-on-press-escape="false"
+        >
             <el-form :model="contractData" ref="dataForm">
                 <el-row :gutter="20" class="el-row" type="flex">
                     <el-col :span="10" class="el-col" type="flex">
@@ -246,7 +251,7 @@
             </el-form>
 
             <div slot="footer" class="dialog-footer">
-                <el-button @click.native="cancelDialog" size="small">确定</el-button>
+                <el-button type="primary" @click.native="cancelDialog" size="small">确定</el-button>
             </div>
         </el-dialog>
 
@@ -257,6 +262,8 @@
                 width="70%"
                 append-to-body
                 :modal-append-to-body="false"
+                :close-on-click-modal="false"
+                :close-on-press-escape="false"
                 @close="closeCustomerDialog"
             >
                 <customerUser :currentCustomer="currentCustomer"></customerUser>
diff --git a/src/views/userManage/phoneRegisterManage.vue b/src/views/userManage/phoneRegisterManage.vue
index 5fd10ce..0463223 100644
--- a/src/views/userManage/phoneRegisterManage.vue
+++ b/src/views/userManage/phoneRegisterManage.vue
@@ -118,7 +118,7 @@
                 </el-col>
             </el-row>
             <span slot="footer" class="dialog-footer" style="margin-top: 40px">
-                <el-button @click="centerDialogVisible = false">取消</el-button>
+                <el-button @click="cancelDialog">取消</el-button>
                 <el-button type="primary" @click="passRegister">通过</el-button>
                 <el-button type="primary" @click="noPassRegister">不通过</el-button>
             </span>
@@ -163,7 +163,7 @@
                 </el-col>
             </el-row>
             <span slot="footer" class="dialog-footer" style="margin-top: 40px">
-                <el-button @click="cancelDialog">取消</el-button>
+                <el-button @click="cancelEdit">取消</el-button>
                 <el-button type="primary" @click="confirmEdit">确定</el-button>
             </span>
         </el-dialog>
@@ -245,7 +245,7 @@ export default {
             this.editDialogVisible = true;
         },
         cancelDialog() {
-            this.editDialogVisible = false
+            this.centerDialogVisible = false
             this.getList();
         },
 
@@ -287,7 +287,10 @@ export default {
         confirmEdit() {
             this.checkRegister();
         },
-
+        cancelEdit() {
+            this.editDialogVisible = false;
+            this.getList();
+        },
         deleteDialog(row) {
             let query = {
                 id: row.id
diff --git a/src/views/userManage/register.vue b/src/views/userManage/register.vue
index 59a2c96..5e3a003 100644
--- a/src/views/userManage/register.vue
+++ b/src/views/userManage/register.vue
@@ -541,6 +541,10 @@ export default {
             this.$refs[formName].validate((valid) => {
                 if (valid) {
                     this.loading = true;
+                    if (this.fileList.length === 0) {
+                        this.$message.error("请上传营业执照电子档案！")
+                        return;
+                    }
                     register(this.inputQuery).then((response) => {
                         if (response.code === 20000) {
                             this.loading = false;