Merge branch 'master' of http://192.168.1.89:3000/wilson/krd-srm-vue

src/views/modules/common/Chooselist_eam.vue

@@ -226,11 +226,13 @@ export default {
       if (this.param6 ) {
         sql += " and active like '%" + this.param6 + "%'"
       }
+      //500以内自动增加site和BU过滤
       if (this.tagNo <= 500 && this.tagNo !== 93 && this.tagNo !== 201) {
         if (this.param7) {
           sql += " and site in (select site from eam_access_site where username = '" + this.param7 + "') " + " and bu_no in (select a.bu_no from AccessBu as a left join eam_access_site as b on a.site = b.site and a.username = b.username where a.username = '" + this.param7 + "')"
         }
       }
+      //500-1000自动增加site过滤
       if (this.tagNo > 500 && this.tagNo < 1000) {
         if (this.param7) {
           sql += " and site in (select site from eam_access_site where username = '" + this.param7 + "') "

src/views/modules/srmSupplier/supplierList.vue

@@ -317,7 +317,7 @@
           </div>
         </el-form>
       </div>
-      <div slot="footer" class="dialog-footer-center">
+      <div slot="footer" class="dialog-footer" style="margin-top: 20px">
         <el-button type="primary" @click="saveSupplier()">保存</el-button>
         <el-button @click="supplierDialogVisible = false">取消</el-button>
       </div>

src/views/modules/sys/user.vue

@@ -13,7 +13,7 @@
         <el-button v-if="isAuth('sys:user:save')" :disabled="this.showButton" type="primary" @click="siteAuthorize()">{{ buttons.factoryAuthorization || '工厂授权' }}</el-button>
         <el-button v-if="isAuth('sys:user:save')" :disabled="this.showButton" type="primary" @click="buAuthorize()">{{ buttons.buAuthorization || 'BU授权' }}</el-button>
         <el-button v-if="isAuth('sys:user:save')" :disabled="this.showButton" type="primary" @click="deptAuthorize()">{{ buttons.deptAuthorization || '部门授权' }}</el-button>
-        <el-button v-if="isAuth('sys:user:save')" :disabled="this.showButton" type="primary" @click="businessRoleAuthorize()">{{ buttons.businessRoleAuthorization || '角色授权' }}
+        <el-button v-if="isAuth('sys:user:save')" :disabled="this.showButton" type="primary" @click="businessRoleAuthorize()">{{ buttons.businessRoleAuthorization || '岗位' }}
         </el-button>
       </el-form-item>
     </el-form>
@@ -181,11 +181,11 @@
       </span>
     </el-dialog>
 
-    <!--  角色授权  -->
+    <!--  岗位  -->
     <el-dialog
       style="font-size: 12px"
       v-drag
-      :title="'角色授权'"
+      :title="'岗位'"
       :visible.sync="businessRoleVisible"
       width="518px"
       :append-to-body="true">
@@ -727,7 +727,7 @@ export default {
         factoryAuthorization: '工厂授权',
         buAuthorization: 'BU授权',
         deptAuthorization: '部门授权',
-        businessRoleAuthorization: '角色授权',
+        businessRoleAuthorization: '岗位',
         createTime: '创建时间',
         username: '用户账号',
         userDisplay: '用户名',
@@ -1202,7 +1202,7 @@ export default {
         }
       })
     },
-// 角色授权
+// 岗位
     businessRoleAuthorize () {
       this.businessRoleData = {
         site: '',