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

package.json

@@ -21,7 +21,7 @@
     "cos-js-sdk-v5": "^1.1.5",
     "echarts": "^5.1.2",
     "element-ui": "^2.14.1",
-    "html2canvas": "^1.2.2",
+    "html2canvas": "^1.3.2",
     "js-md5": "^0.7.3",
     "lockr": "^0.8.5",
     "lrz": "^4.9.41",

src/pages/teacher/changeClassManager.vue

@@ -267,6 +267,14 @@
         @success="refreshPage"
       >
       </temporaryClass-form>
+      <!-- 请假申请 -->
+      <leaveBillForm
+        v-if="isShowLeaveBillForm"
+        :seting-obj="billObj"
+        :showType="showType"
+        @close="closeBillForm"
+        @success="refreshPage"
+      ></leaveBillForm>
     </div>
   </div>
 </template>
@@ -283,6 +291,7 @@ import stopbillForm from "../../components/sale/stopbill-form";
 import createbackbillForm from "../../components/sale/createbackbill-form";
 import ordertransForm from "../../components/sale/ordertrans-form";
 import temporaryClassForm from "../../components/sale/temporaryClassbill-form";
+import leaveBillForm from "../../components/sale/leavebill-form.vue";
 export default {
   meta: {
     title: "业务单据",
@@ -294,6 +303,7 @@ export default {
     stopbillForm,
     ordertransForm,
     temporaryClassForm,
+    leaveBillForm,
   },
   data() {
     return {
@@ -384,6 +394,7 @@ export default {
       isShowStopBillForm: false, //是否显示停课订单详情
       isShowClassTrans: false, //是否显示订单转班详情
       isShowTemporaryClass: false, //是否显示临时上课邀请订单详情
+      isShowLeaveBillForm: false, //是否显示请假申请单详情
     };
   },
   created() {
@@ -431,6 +442,7 @@ export default {
       this.isShowStopBillForm = false;
       this.isShowClassTrans = false;
       this.isShowTemporaryClass = false;
+      this.isShowLeaveBillForm = false;
       this.billObj = {};
     },
     //显示表单
@@ -455,6 +467,10 @@ export default {
       else if (item.ReceiptType == 5 || item.ReceiptType == 6) {
         this.isShowClassTrans = true;
       }
+      //学生请假
+      else if (item.ReceiptType == 7) {
+        this.isShowLeaveBillForm = true;
+      }
       this.showType = type;
       this.billObj = item;
     },
@@ -498,6 +514,7 @@ export default {
       this.isShowCreateBillForm = false;
       this.isShowStopBillForm = false;
       this.isShowClassTrans = false;
+      this.isShowLeaveBillForm = false;
       this.billObj = {};
       this.getStuBackBill();
     },