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

src/components/school/manager/employee_finace.vue

@@ -3,7 +3,7 @@
     <q-btn-toggle style="width:50%;margin:0 auto;" v-model="msg.Conditon" spread no-caps toggle-color="primary"
       color="#2961FE" text-color="black" class="my-custom-toggle" :options="[
           {label: '交接人发起的', value: 1},
-          {label: '待交接人审批的', value: 2}
+          {label: '待交接人审批的', value: 3}
         ]" @input="queryChange" />
     <br />
     <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关单据信息" flat
@@ -163,7 +163,7 @@
       saveObj: function (val, oldval) {
         this.msg.pageIndex = 1;
         if (this.saveObj.EmAccountId && this.saveObj.EmAccountId > 0) {
-          this.msg.UpdateBy = this.saveObj.EmAccountId;
+          this.msg.CreateBy = this.saveObj.EmAccountId;
         }
         this.getPageList();
       }