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

src/components/FinancialModule/accDetail/CashAccDetail.vue

@@ -263,7 +263,8 @@
                   </tr>
                   <tr v-else class="_show_class">
                     <td>
-                      <el-select  filterable  v-model='item.AccName'  @change="clearAccBank()" class=" _border_b_1">
+                      <el-select  filterable  v-model='item.AccName'
+                      @change="clearAccBank(),item.show=false,CalculationMoney()" class=" _border_b_1">
                         <el-option v-for='i in AccListT'
                                    :label='i.Name'
                                    :value='i.Name'
@@ -272,7 +273,8 @@
                       </el-select>
                     </td>
                     <td>
-                      <el-select  filterable  v-model='item.Type'  @change="getAccountList(item.Type)" class=" _border_b_1">
+                      <el-select  filterable  v-model='item.Type'
+                      @change="getAccountList(item.Type),item.show=false,CalculationMoney()" class=" _border_b_1">
                         <el-option v-for='i in GetAccountType'
                                    :label='i.Name'
                                    :value='i.ID'
@@ -281,7 +283,8 @@
                       </el-select>
                     </td>
                     <td>
-                      <el-select  filterable  v-model='item.AccountId' :placeholder="$t('rule.qxzzhanghu')" @change="setAccountName(item.AccountId,1,index)" class=" _border_b_1">
+                      <el-select  filterable  v-model='item.AccountId' :placeholder="$t('rule.qxzzhanghu')"
+                      @change="setAccountName(item.AccountId,1,index),item.show=false,CalculationMoney()" class=" _border_b_1">
                         <el-option v-for='i in accountList'
                                    :label='i.allName'
                                    :value='i.ID'

src/components/FinancialModule/accDetail/CompanyAccDetail.vue

@@ -318,7 +318,7 @@
                 </template>
                 <tr>
                   <td>
-                    <el-select  filterable  v-model='payMsg.AccName'  @change="clearAccBank()" class=" _border_b_1">
+                    <el-select  filterable  v-model='payMsg.AccName'  @change="clearAccBank(),addList()" class=" _border_b_1">
                       <el-option v-for='i in AccListT'
                                  :label='i.Name'
                                  :value='i.Name'
@@ -327,7 +327,7 @@
                     </el-select>
                   </td>
                   <td>
-                    <el-select  filterable  v-model='payMsg.Type'  @change="getAccountList(payMsg.Type)" class=" _border_b_1">
+                    <el-select  filterable  v-model='payMsg.Type'  @change="getAccountList(payMsg.Type),addList()" class=" _border_b_1">
                       <el-option v-for='i in GetAccountType'
                                  :label='i.Name'
                                  :value='i.ID'
@@ -336,7 +336,8 @@
                     </el-select>
                   </td>
                   <td>
-                    <el-select  filterable  v-model='payMsg.AccountId'  :placeholder="$t('rule.qxzzhanghu')" @change="setAccountName(payMsg.AccountId,2)" class=" _border_b_1">
+                    <el-select  filterable  v-model='payMsg.AccountId'  :placeholder="$t('rule.qxzzhanghu')"
+                    @change="setAccountName(payMsg.AccountId,2),addList()" class=" _border_b_1">
                       <el-option v-for='i in accountList'
                                  :label='i.allName'
                                  :value='i.ID'

src/components/FinancialModule/accDetail/PlatformAccDetail.vue

@@ -252,7 +252,8 @@
               </tr>
               <tr v-else class="_show_class">
                 <td>
-                  <el-select  filterable  v-model='item.AccName'  @change="clearAccBank()" class=" _border_b_1">
+                  <el-select  filterable  v-model='item.AccName'
+                  @change="clearAccBank(),item.show=false,CalculationMoney()" class=" _border_b_1">
                     <el-option v-for='i in AccListT'
                                :label='i.Name'
                                :value='i.Name'
@@ -261,7 +262,8 @@
                   </el-select>
                 </td>
                 <td>
-                  <el-select  filterable  v-model='item.Type'  @change="getAccountList(item.Type)" class=" _border_b_1">
+                  <el-select  filterable  v-model='item.Type'
+                  @change="getAccountList(item.Type),item.show=false,CalculationMoney()" class=" _border_b_1">
                     <el-option v-for='i in GetAccountType'
                                :label='i.Name'
                                :value='i.ID'
@@ -270,7 +272,8 @@
                   </el-select>
                 </td>
                 <td>
-                  <el-select  filterable  v-model='item.AccountId' :placeholder="$t('rule.qxzzhanghu')" @change="setAccountName(item.AccountId,1,index)" class=" _border_b_1">
+                  <el-select  filterable  v-model='item.AccountId' :placeholder="$t('rule.qxzzhanghu')"
+                  @change="setAccountName(item.AccountId,1,index),item.show=false,CalculationMoney()" class=" _border_b_1">
                     <el-option v-for='i in accountList'
                                :label='i.allName'
                                :value='i.ID'

src/components/LeaderManagement/leaderReimbursement.vue

@@ -1728,9 +1728,9 @@
           id = [98, 99];
         } else {
           if (obj.OutBranchId === 0) {
-            id = [43, 48];
+            id = [43, 48, 245, 246];
           } else {
-            id = [56, 53];
+            id = [56, 53, 245, 246];
           }
         }
         this.$router.push({