Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

klp-ui/src/views/finance/jounery/index.vue

@@ -167,10 +167,10 @@
           <el-input v-model="form.counterpart" placeholder="请输入对方户名" />
         </el-form-item>
         <el-form-item label="收入金额" prop="incomeAmount">
-          <el-input v-model="form.incomeAmount" placeholder="请输入收入金额" />
+          <el-input v-model="form.incomeAmount" :disabled="form.journalId" placeholder="请输入收入金额" />
         </el-form-item>
         <el-form-item label="支出金额" prop="expenseAmount">
-          <el-input v-model="form.expenseAmount" placeholder="请输入支出金额" />
+          <el-input v-model="form.expenseAmount" :disabled="form.journalId" placeholder="请输入支出金额" />
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />

klp-ui/src/views/finance/order/index.vue

@@ -8,12 +8,17 @@
               @keyup.enter.native="handleQuery" />
           </el-row>
           <el-tree v-loading="orderListLoading" :data="treeData" :props="defaultProps" @node-click="handleNodeClick" />
-          <el-pagination :current-page="queryParams.pageNum" :page-size="10" :total="total"
-            layout="prev, pager, next" />
+          <pagination 
+            :page.sync="queryParams.pageNum" 
+            :limit.sync="queryParams.pageSize" 
+            :total="total"
+            layout="prev, pager, next" 
+            @pagination="getList" 
+          />
         </div>
       </el-col>
 
-      <el-col :span="18">
+      <el-col :span="18" v-loading="rightLoading">
         <el-tabs v-if="currentOrder" v-model="activeTab">
           <el-tab-pane label="订单信息" name="orderDetail">
             <el-form>
@@ -129,7 +134,7 @@ export default {
   },
   methods: {
     handleQuery() {
-      this.queryParams.pageNum = 1;
+      this.queryParams.pageNum = 1; 
       this.getList();
     },
     getList() {
@@ -145,6 +150,10 @@ export default {
       });
     },
     handleNodeClick(data) {
+      if (this.rightLoading) {
+        this.$message.warning('请等待当前订单加载完成');
+        return;
+      }
       this.currentOrder = data.value;
       this.fetchData(data.value.orderId);
     },