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

src/components/FinancialModule/RecPayQuery.vue

@@ -97,6 +97,15 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="4">
+              <el-form-item :label="$t('fnc.sfkzhanghu')">
+                <el-select filterable v-model='msg.BankID'>
+                  <el-option value="" :label="$t('pub.unlimitedSel')"></el-option>
+                  <el-option v-for='item in accountList' :label='item.Name' :value='item.ID' :key='item.ID'>
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
             <el-col :span="4">
               <el-form-item :label="$t('fnc.dxleixing')">
                 <el-select filterable v-model='msg.ClientType'
@@ -135,16 +144,6 @@
   </el-select>
               </el-form-item>
             </el-col>
-
-            <el-col :span="4">
-              <el-form-item :label="$t('fnc.sfkzhanghu')">
-                <el-select filterable v-model='msg.BankID'>
-                  <el-option value="" :label="$t('pub.unlimitedSel')"></el-option>
-                  <el-option v-for='item in accountList' :label='item.Name' :value='item.ID' :key='item.ID'>
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
             <el-col :span="4">
               <el-form-item :label="$t('system.table_rank')">
                 <el-select filterable v-model='msg.Sort'>
@@ -966,7 +965,7 @@
           BranchId: -1,
           DepartmentId: 0,
           PostId: 0,
-          IsLeave: 0,
+          IsLeave: -1,
         },
         zhuanMsg: {
           AuditEmId: null,
@@ -1134,7 +1133,7 @@
       this.financeinfo_post_GetClientTypeList();
       this.FinancialFlowTemplate_post_GetStatusList();
       this.getPageList();
-      this.AccountType_post_GetList();
+      //this.AccountType_post_GetList();
 
       var that = this;
       that.MsgBus.$on('getRecQuery', function (FrID) {