Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/pages/financial/empBankAccount.vue

@@ -109,9 +109,9 @@
               <el-button v-if='item.Status==1'  @click="deleteData(item.ID)"  type="primary"  style='background:#09D49D; border-color:#09D49D' icon="iconfont icon-qidong" ></el-button>
               <el-button v-if='item.Status==0'  @click="deleteData(item.ID)"  type="primary"  style='background:#E95252; border-color:#E95252' icon="iconfont icon-dongjie" ></el-button>
             </el-tooltip>
-            <el-tooltip class="item" effect="dark" :content="$t('ground.mingxi')" placement="top-start">
-              <el-button  type="primary"  style='background:#E6A014; border-color:#E6A014' icon="iconfont icon-rizhi1"  ></el-button>
-            </el-tooltip>
+<!--            <el-tooltip class="item" effect="dark" :content="$t('ground.mingxi')" placement="top-start">-->
+<!--              <el-button  type="primary"  style='background:#E6A014; border-color:#E6A014' icon="iconfont icon-rizhi1"  ></el-button>-->
+<!--            </el-tooltip>-->
           </el-button-group>
         </td>
       </tr>

src/pages/financial/paySetting.vue

@@ -752,7 +752,7 @@
               list.push(cp)
             }
           })
-          let allArr = list2.concat(list); //  数组合并 
+          let allArr = list2.concat(list); //  数组合并
           var obj = {};
           allArr = allArr.reduce(function (item, next) { //数组对象去重
             obj[next.Branch_Id] ? '' : obj[next.Branch_Id] = true && item.push(next);
@@ -834,7 +834,7 @@
     mounted() {
       let userInfo = this.getLocalStorage();
       console.log(userInfo, 'userInfouserInfo');
-      this.getCompanyMsg.RB_Group_Id = userInfo.data.Group_Id; //集团ID
+      this.getCompanyMsg.RB_Group_Id = userInfo.Group_Id; //集团ID
       this.getCompanyList();
       this.getList();
       this.AccountType_post_GetList();