1

src/components/CommodityMan/goodsList.vue

@@ -156,7 +156,7 @@
         </el-table-column>
         <el-table-column prop="address" width="200" label="操作">
           <template slot-scope="scope">
-            <img @click="goGoodsEdit(scope.row.Id)" style="width:32px;height:32px;margin:0 10px"
+            <img @click="goGoodsEdit(scope.row.Id)" style="width:32px;height:32px;margin:0 10px" v-if="currentUserInfo.empid == 0 || currentUserInfo.IsOtherUpdateGoods ==1"
               src="../../assets/img/userman/edit.png" alt="">
             <img @click="Delete(scope.row)" style="width:32px;height:32px;margin:0 10px"
               src="../../assets/img/userman/del.png" alt="">

src/components/StoreDesign/EmployeesList.vue

@@ -280,10 +280,12 @@
         });
       },
       handleCheckAllChange(val) {
+        
         this.checkArr = [];
         if (val) {
           this.RoleList.forEach(x => {
             this.checkArr.push(x.RoleId);
+            
           });
         }
       },
@@ -302,9 +304,14 @@
       },
       //获取角色列表
       getRoleList() {
+        let userInfo = this.getLocalStorage();
         this.apipost("/api/Employee/GetRoleList", {}, res => {
           if (res.data.resultCode == 1) {
             this.RoleList = res.data.data;
+            if(userInfo && userInfo.TenantId==1 && userInfo.MallBaseId==1){
+              let obj={RoleId:-1,RoleName:'修改他人商品'}
+              this.RoleList.push(obj)
+            }
           } else {
             this.Info(res.data.message);
           }