Merge branch '03/12permission' into dev

src/views/businessManager/orderManager/financeManager-taoqi.vue

@@ -358,6 +358,7 @@
         :title="isAdd ? '添加订单' : '查看'"
         destroy-on-close
         :visible.sync="routeOrderStatus"
+        v-if="routeOrderStatus"
         @close="onFormClose('ruleForm')"
         width="600px"
       >
@@ -1237,6 +1238,7 @@ export default {
           ],
           applyType: null,
           userId: "",
+          calenderId: null
         };
       }
     },

src/views/businessManager/orderManager/financeManager.vue

@@ -1254,6 +1254,7 @@ export default {
           ],
           applyType: null,
           userId: "",
+          calenderId: null
         };
       }
     },

src/views/businessManager/orderManager/payRecord.vue

@@ -241,7 +241,7 @@
                 >
                 <el-popconfirm
                   title="确定删除该条数据吗？"
-                  @onConfirm="() => removeRecord(scope.row.id)"
+                  @confirm="() => removeRecord(scope.row.id)"
                   v-permission="'financialExpenditure/batchDel/4042'"
                 >
                   <el-button type="text" slot="reference">删除</el-button>

src/views/businessManager/orderManager/salesList.vue

@@ -274,7 +274,7 @@
               >
               <el-popconfirm
                 title="退货后该销售金额将退还到学员账户余额"
-                @onConfirm="() => refund({ id: scope.row.id })"
+                @confirm="() => refund({ id: scope.row.id })"
                 v-if="scope.row.status === 0"
                 v-permission="'sellOrder/refund'"
               >