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

# Conflicts:
#	src/components/sale/ordertrans-form.vue

src/components/sale/createbackbill-form.vue

@@ -135,7 +135,7 @@
       }
     },
     created() {
-      this.FinanceMsg.BackClassId = this.setingObj.BackId;
+      this.FinanceMsg.BackClassId = this.setingObj.DataObj.BackId;
       this.addMsg.ObjID = this.setingObj.GuestId;
       this.financeinfo_post_GetList();
       this.getGuestBankAccount()

src/pages/financial/reportform/activityCommissionUserList.vue

@@ -60,7 +60,7 @@
           </el-table-column>
         
           <el-table-column prop="CommissionMoney" label="提成金额" sortable :sort-method="CommissionMoney">
-            
+
           </el-table-column>
        
           <el-table-column label="操作">
@@ -137,7 +137,7 @@
           this.msg.School_Id = this.$route.query.School_Id
         }
         this.getList()
-        this.setClass()
+        // this.setClass()
       },
       methods: {
         getList() {

src/pages/teacher/changeClassManager.vue

@@ -50,8 +50,9 @@
         <q-tab :ripple="false" name="2" label="已审批" />
         <q-tab :ripple="false" name="4" label="抄送给我的" />
       </q-tabs>
-      <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-tow-column-table sticky-right-column-table"
-        separator="none" :data="data" :columns="columns" row-key="name">
+      <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat
+        class="sticky-tow-column-table sticky-right-column-table" separator="none" :data="data" :columns="columns"
+        row-key="name">
         <template v-slot:body-cell-ReceiptTypeName="props">
           <q-td :props="props">
             <span class="ReceipTypeName">{{props.row.ReceiptTypeName}}</span>
@@ -60,7 +61,8 @@
         <template v-slot:body-cell-ApplyReason="props">
           <q-td :props="props">
             <div class="bill_Rearsons">
-              <template v-if="props.row.ReceiptType==1||props.row.ReceiptType==5||props.row.ReceiptType==3||props.row.ReceiptType==4">
+              <template
+                v-if="props.row.ReceiptType==1||props.row.ReceiptType==5||props.row.ReceiptType==3||props.row.ReceiptType==4">
                 <span v-if="props.row.DataObj&&props.row.DataObj.Remarks">
                   {{props.row.DataObj.Remarks}}
                   <q-tooltip :offset="[0, 10]">
@@ -90,16 +92,17 @@
                 @click="showBillForm(props.row,2)" />
             </template>
             <template v-else>
-              <template v-if="props.row.FinanceId&& props.row.FinanceId>0">
-                <a style="cursor:pointer;color:blue;" title="退课财务单据号"
-                  @click="goFinaceUrl('FinancialDocumentsDetail',props.row)">{{props.row.FinanceId}}</a>
+              <template
+                v-if="props.row.VerifyStatus==2&&props.row.ReceiptType==2&&props.row.DataObj.FinanceId<=0&& tabCheck=='1'">
+                <q-btn flat size="xs" icon="directions" color="secondary" style="font-weight:400" label="制单"
+                  @click="createBillForm(props.row)" />
               </template>
-              <template v-else>
-                <q-btn v-if="tabCheck=='1' && props.row.AuditStatus==2" flat size="xs" icon="edit" color="accent"
-                  style="font-weight:400" label="生成单据" @click="createBillForm(props.row)" />
+              <template v-if="props.row.VerifyStatus==2&&props.row.ReceiptType==2&&props.row.DataObj.FinanceId>0">
+                <span @click="goFinaceUrl('FinancialDocumentsDetail',props.row.DataObj)" title="退课财务单据号"
+                  style="color: #2961FE;font-weight: bold;cursor: pointer;">{{props.row.DataObj.FinanceId}}</span>
               </template>
-              <q-btn v-if="props.row.VerifyStatus==0 && tabCheck=='1'" flat size="xs" icon="delete" color="negative" style="font-weight:400" label="作废"
-                @click="invalidBillForm(props.row)" />
+              <q-btn v-if="props.row.VerifyStatus==0 && tabCheck=='1'" flat size="xs" icon="delete" color="negative"
+                style="font-weight:400" label="作废" @click="invalidBillForm(props.row)" />
               <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="查看"
                 @click="showBillForm(props.row,1)" />
             </template>
@@ -119,11 +122,11 @@
         @success="refreshPage">
       </stopbill-form>
       <!-- 订单转班-查看 -->
-      <ordertrans-form v-if="isShowClassTrans" :seting-obj="billObj" :showType="showType" @close="closeBillForm" 
+      <ordertrans-form v-if="isShowClassTrans" :seting-obj="billObj" :showType="showType" @close="closeBillForm"
         @success="refreshPage">
       </ordertrans-form>
-         <!-- 订单临时上课邀请-查看 -->
-      <temporaryClass-form v-if="isShowTemporaryClass" :seting-obj="billObj" :showType="showType" @close="closeBillForm" 
+      <!-- 订单临时上课邀请-查看 -->
+      <temporaryClass-form v-if="isShowTemporaryClass" :seting-obj="billObj" :showType="showType" @close="closeBillForm"
         @success="refreshPage">
       </temporaryClass-form>
     </div>
@@ -162,7 +165,7 @@
             label: '单号',
             field: 'Id',
             align: 'left'
-          },  
+          },
           {
             name: 'ReceiptTypeName',
             label: '单据类型',
@@ -223,7 +226,7 @@
           pageIndex: 1,
           pageSize: 12,
           rowsPerPage: 12,
-          Id:"",
+          Id: "",
           VerifyStatus: "", //审核状态
           StartTime: "", //开始时间
           EndTime: "", //结束时间
@@ -238,9 +241,9 @@
         billObj: {}, //单据信息
         showType: 1, //1-查看，2-审核
         OrderTypeList: [],
-        isShowStopBillForm:false,//是否显示停课订单详情
-        isShowClassTrans:false, //是否显示订单转班详情
-        isShowTemporaryClass:false,//是否显示临时上课邀请订单详情
+        isShowStopBillForm: false, //是否显示停课订单详情
+        isShowClassTrans: false, //是否显示订单转班详情
+        isShowTemporaryClass: false, //是否显示临时上课邀请订单详情
       }
     },
     created() {
@@ -254,13 +257,8 @@
     methods: {
       //跳转到财务单据
       goFinaceUrl(path, rowData) {
-        this.$router.push({
-          path: '/financial/financalDocument/' + path,
-          query: {
-            "id": rowData.FinanceId,
-            blank: 'y',
-            tab: '单据详情'
-          }
+        this.OpenNewUrl('/financial/financalDocument/' + path, {
+          'id': rowData.FinanceId
         })
       },
       //生成财务单据
@@ -273,7 +271,7 @@
         this.isShowBillForm = false;
         this.isShowChangeBillForm = false;
         this.isShowCreateBillForm = false;
-        this.isShowStopBillForm=false;
+        this.isShowStopBillForm = false;
         this.isShowClassTrans = false;
         this.isShowTemporaryClass = false;
         this.billObj = {};
@@ -288,17 +286,17 @@
         else if (item.ReceiptType == 2) {
           this.isShowBillForm = true;
         }
-         //停课
+        //停课
         else if (item.ReceiptType == 3) {
           this.isShowStopBillForm = true;
         }
-         //临时上课邀请
-        else if (item.ReceiptType == 4){
-          this.isShowTemporaryClass =true;
+        //临时上课邀请
+        else if (item.ReceiptType == 4) {
+          this.isShowTemporaryClass = true;
         }
         //转班
-        else if (item.ReceiptType == 5 || item.ReceiptType==6){
-          this.isShowClassTrans =true;
+        else if (item.ReceiptType == 5 || item.ReceiptType == 6) {
+          this.isShowClassTrans = true;
         }
         this.showType = type;
         this.billObj = item;
@@ -339,7 +337,7 @@
         this.isShowBillForm = false;
         this.isShowChangeBillForm = false;
         this.isShowCreateBillForm = false;
-        this.isShowStopBillForm=false;
+        this.isShowStopBillForm = false;
         this.isShowClassTrans = false;
         this.billObj = {};
         this.getStuBackBill();
@@ -353,12 +351,12 @@
         }).catch(() => {})
       },
       //作废
-      invalidBillForm(item){
-         let delMsg = {
+      invalidBillForm(item) {
+        let delMsg = {
           Id: item.Id,
         };
         var message = "是否要作废此单据？";
- 
+
         this.$q.dialog({
           title: '提示信息',
           message: message,

src/router/routes.js

@@ -1090,6 +1090,11 @@ const routes = [{
     component: () =>
       import("pages/stuMan/todaysOrder")
   },
+  {
+    path: "/stuMan/stuClassManage", //学管 班级管理
+    component: () =>
+    import("pages/stuMan/stuClassManage")
+  }
   ],
 
 },