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

src/pages/exam/examEdit.vue

@@ -208,10 +208,10 @@
   <div class="examPaper page-body">
     <div class="examPaper_Top">
       <div style="width:80%;display:flex;">
-        <div style="width:40%;margin:0 20px;">
+        <div style="width:36%;margin:0 20px;">
           <q-input filled label="标题" v-model="DataObj.PaperName" />
         </div>
-        <div style="width:20%;">
+        <div style="width:24%;">
           <q-select filled option-value="Id" option-label="Name" :options="questionDifficultyTypeList" emit-value
             map-options label="难度" use-input clearable v-model="DataObj.DifficultyType" />
         </div>
@@ -224,8 +224,8 @@
     <div class="Exam-main">
       <div class="Exam-left f1">
         <p class="Left-ptitel">
-          <span>题量：<i>10</i></span>
-          <span>  总分：<i>50.0</i></span>
+          <span>题量：<i>{{examNum}}</i></span>
+          <span>  总分：<i>{{examScore}}</i></span>
         </p>
         <div class="Left-list" style="height:740px;overflow:auto;">
           <template v-if="DataObj&&DataObj.GroupList&&DataObj.GroupList.length>0">
@@ -250,7 +250,7 @@
                   <span class="exam_ListSHow">
                     <i class="iconfont icon-shangyi2" @click.stop="MoveChildItem(gIndex,dIndex,0)" style="margin-right:5px;" v-if="dIndex!=0"></i>
                     <i class="iconfont icon-xiayi" @click.stop="MoveChildItem(gIndex,dIndex,1)" v-if="dIndex!=gItem.DetailsList.length-1"></i>
-                    <i class="iconfont icon-shanchu2" style="margin-left:5px;font-size:17px;"></i> 
+                    <i class="iconfont icon-shanchu2" @click.stop="delExam(gItem.DetailsList,dIndex)" style="margin-left:5px;font-size:17px;"></i> 
                   </span>
                 </li>
               </ul>
@@ -436,7 +436,9 @@
         firstTypeList: [], //第一类题型
         secondTypeList: [], //第二类题型
         isShowQuestion: false,
-        commonIndex: -1
+        commonIndex: -1,
+        examNum:0, //题量
+        examScore:0 //总分
       }
     },
     created() {
@@ -494,6 +496,10 @@
           }
         }
       },
+      //删除题目
+      delExam(item,index){
+        item.splice(index,1);
+      },
       //点击修改标题名字和分数
       getNameEdit(item,index){
         item.forEach(x=>{
@@ -566,8 +572,14 @@
           if (res.Code == 1) {
             this.DataObj = res.Data;
           }
+          this.examScore = 0;
+          this.examNum = 0;
           this.DataObj.GroupList.forEach(x=>{
             x.isShowEdit = false;
+            this.examNum += x.DetailsList.length;
+            x.DetailsList.forEach(y=>{
+              this.examScore += y.Score;
+            })
           })
         })
       },

src/pages/teacher/changeClassManager.vue

 <style>
-  .Sysuser_Date .el-range-editor .el-range-input {
+.Sysuser_Date .el-range-editor .el-range-input {
   background-color: transparent;
-  }
+}
 
-  .Sysuser_Date .el-range-editor.el-input__inner {
+.Sysuser_Date .el-range-editor.el-input__inner {
   background-color: transparent;
-  }
+}
 
-  .ReceipTypeName {
+.ReceipTypeName {
   display: inline-block;
   padding: 2px 8px;
   color: white;
   background-color: rgb(233, 82, 82);
   line-height: 16px;
   border-radius: 4px;
-  }
+}
 
-  .bill_Rearsons {
+.bill_Rearsons {
   width: 250px;
   overflow: hidden;
   white-space: nowrap;
-    text-overflow: ellipsis
-  }
-
+  text-overflow: ellipsis;
+}
 </style>
 <template>
   <div class="page-body">
     <div class="page-search row items-center">
       <div class="col row wrap q-col-gutter-md">
         <div class="col-3">
-          <q-input @change="resetSearch" clearable filled v-model="msg.Id" label="单号" maxlength="10" />
+          <q-input
+            @change="resetSearch"
+            clearable
+            filled
+            v-model="msg.Id"
+            label="单号"
+            maxlength="10"
+          />
         </div>
         <div class="col-3">
-          <q-select @input="resetSearch" clearable filled v-model="msg.VerifyStatus" :options="ShowOpts" emit-value
-            map-options label="审核状态" />
+          <q-select
+            @input="resetSearch"
+            clearable
+            filled
+            v-model="msg.VerifyStatus"
+            :options="ShowOpts"
+            emit-value
+            map-options
+            label="审核状态"
+          />
         </div>
         <div class="col-3">
-          <q-select @input="resetSearch" clearable filled option-value="Id" option-label="Name"
-            v-model="msg.ReceiptType" :options="OrderTypeList" emit-value map-options label="单据类型" />
+          <q-select
+            @input="resetSearch"
+            clearable
+            filled
+            option-value="Id"
+            option-label="Name"
+            v-model="msg.ReceiptType"
+            :options="OrderTypeList"
+            emit-value
+            map-options
+            label="单据类型"
+          />
         </div>
         <div class="col-3 Sysuser_Date">
           <q-field filled>
              <template v-slot:control>
-              <el-date-picker v-model="applyDateList" @change="resetSearch()" value-format="yyyy-MM-dd" type="daterange"
-                style="border: none" range-separator="至" start-placeholder="申请开始日期" end-placeholder="申请结束日期">
-                 </el-date-picker>       
+              <el-date-picker
+                v-model="applyDateList"
+                @change="resetSearch()"
+                value-format="yyyy-MM-dd"
+                type="daterange"
+                style="border: none"
+                range-separator="至"
+                start-placeholder="申请开始日期"
+                end-placeholder="申请结束日期"
+              >
+                 </el-date-picker
+              >       
             </template>
           </q-field>
         </div>
       </div>
     </div>
     <div class="page-content">
-      <q-tabs style="margin-bottom: 20px" v-model="tabCheck" narrow-indicator dense align="left" class="text-primary">
+      <q-tabs
+        style="margin-bottom: 20px"
+        v-model="tabCheck"
+        narrow-indicator
+        dense
+        align="left"
+        class="text-primary"
+      >
         <q-tab :ripple="false" name="1" label="我发起的" />
         <q-tab :ripple="false" name="3" label="待我审批" />
         <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>
@@ -68,24 +116,19 @@
         <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
-                ">
-                <span v-if="props.row.DataObj && props.row.DataObj.Remarks">
-                  {{ props.row.DataObj.Remarks }}
+              <template v-if="props.row.ReceiptType == 2">
+                <span v-if="props.row.DataObj && props.row.DataObj.ApplyReason">
+                  {{ props.row.DataObj.ApplyReason }}
                   <q-tooltip :offset="[0, 10]">
-                    {{ props.row.DataObj.Remarks }}
+                    {{ props.row.DataObj.ApplyReason }}
                   </q-tooltip>
                 </span>
               </template>
-              <template v-if="props.row.ReceiptType == 2 && props.row.DataObj&&props.row.DataObj.ApplyReason">
-                <span>
-                  {{ props.row.DataObj.ApplyReason }}
+              <template v-else>
+                <span v-if="props.row.DataObj && props.row.DataObj.Remarks">
+                  {{ props.row.DataObj.Remarks }}
                   <q-tooltip :offset="[0, 10]">
-                    {{ props.row.DataObj.ApplyReason }}
+                    {{ props.row.DataObj.Remarks }}
                   </q-tooltip>
                 </span>
               </template>
@@ -93,82 +136,154 @@
           </q-td>
         </template>
         <template v-slot:bottom>
-          <q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="pageCount"
-            :input="true" @input="changePage" />
+          <q-pagination
+            class="full-width justify-end"
+            v-model="msg.pageIndex"
+            color="primary"
+            :max="pageCount"
+            :input="true"
+            @input="changePage"
+          />
         </template>
         <template v-slot:body-cell-optioned="props">
           <q-td :props="props">
             <template v-if="tabCheck == '3'">
-              <q-btn flat size="xs" icon="edit" color="accent" style="font-weight: 400" label="审核"
-                @click="showBillForm(props.row, 2)" />
+              <q-btn
+                flat
+                size="xs"
+                icon="edit"
+                color="accent"
+                style="font-weight: 400"
+                label="审核"
+                @click="showBillForm(props.row, 2)"
+              />
             </template>
             <template v-else>
-              <template v-if="
-                 props.row.DataObj&&
+              <template
+                v-if="
+                  props.row.DataObj &&
                   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)" />
+                "
+              >
+                <q-btn
+                  flat
+                  size="xs"
+                  icon="directions"
+                  color="secondary"
+                  style="font-weight: 400"
+                  label="制单"
+                  @click="createBillForm(props.row)"
+                />
               </template>
-              <template v-if="
+              <template
+                v-if="
                   props.row.DataObj &&
                   props.row.VerifyStatus == 2 &&
                   props.row.ReceiptType == 2 &&
                   props.row.DataObj.FinanceId > 0
-                ">
-                <span @click="
+                "
+              >
+                <span
+                  @click="
                     goFinaceUrl('FinancialDocumentsDetail', props.row.DataObj)
-                  " title="退课财务单据号"
-                  style="color: #2961fe; font-weight: bold; cursor: pointer">{{ props.row.DataObj.FinanceId }}</span>
+                  "
+                  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 flat size="xs" icon="edit" color="accent" style="font-weight: 400" label="查看"
-                @click="showBillForm(props.row, 1)" />
+              <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>
           </q-td>
         </template>
       </q-table>
-      <backbill-form v-if="isShowBillForm" :seting-obj="billObj" :showType="showType" @close="closeBillForm"
-        @success="refreshPage">
+      <backbill-form
+        v-if="isShowBillForm"
+        :seting-obj="billObj"
+        :showType="showType"
+        @close="closeBillForm"
+        @success="refreshPage"
+      >
       </backbill-form>
-      <createbackbill-form v-if="isShowCreateBillForm" :seting-obj="billObj" @close="closeBillForm"
-        @success="refreshPage">
+      <createbackbill-form
+        v-if="isShowCreateBillForm"
+        :seting-obj="billObj"
+        @close="closeBillForm"
+        @success="refreshPage"
+      >
       </createbackbill-form>
-      <changebill-form v-if="isShowChangeBillForm" :seting-obj="billObj" :showType="showType" @close="closeBillForm"
-        @success="refreshPage">
+      <changebill-form
+        v-if="isShowChangeBillForm"
+        :seting-obj="billObj"
+        :showType="showType"
+        @close="closeBillForm"
+        @success="refreshPage"
+      >
       </changebill-form>
-      <stopbill-form v-if="isShowStopBillForm" :seting-obj="billObj" :showType="showType" @close="closeBillForm"
-        @success="refreshPage">
+      <stopbill-form
+        v-if="isShowStopBillForm"
+        :seting-obj="billObj"
+        :showType="showType"
+        @close="closeBillForm"
+        @success="refreshPage"
+      >
       </stopbill-form>
       <!-- 订单转班-查看 -->
-      <ordertrans-form v-if="isShowClassTrans" :seting-obj="billObj" :showType="showType" @close="closeBillForm"
-        @success="refreshPage">
+      <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"
-        @success="refreshPage">
+      <temporaryClass-form
+        v-if="isShowTemporaryClass"
+        :seting-obj="billObj"
+        :showType="showType"
+        @close="closeBillForm"
+        @success="refreshPage"
+      >
       </temporaryClass-form>
     </div>
   </div>
 </template>
 <script>
-  import {
+import {
   GetEducationReceiptPage,
   GetEducationReceiptType,
   invalidReceiptInfo,
-  } from "../../api/teacher/index";
+} from "../../api/teacher/index";
 
-  import backbillForm from "../../components/sale/backbill-form";
-  import changebillForm from "../../components/sale/changebill-form";
-  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";
-  export default {
+import backbillForm from "../../components/sale/backbill-form";
+import changebillForm from "../../components/sale/changebill-form";
+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";
+export default {
   meta: {
     title: "业务单据",
   },
@@ -183,7 +298,8 @@
   data() {
     return {
       currentUrl: "",
-        columns: [{
+      columns: [
+        {
           name: "Id",
           label: "单号",
           field: "Id",
@@ -228,7 +344,8 @@
       data: [],
       loading: true,
       applyDateList: [], //申请日期
-        ShowOpts: [{
+      ShowOpts: [
+        {
           label: "审核中",
           value: "1",
         },
@@ -270,11 +387,11 @@
     };
   },
   created() {
-      if(this.$route.query.tab){
-        this.tabCheck=this.$route.query.tab
+    if (this.$route.query.tab) {
+      this.tabCheck = this.$route.query.tab;
     }
-      if(this.$route.query.id){
-        this.msg.Id=this.$route.query.id
+    if (this.$route.query.id) {
+      this.msg.Id = this.$route.query.id;
     }
   },
   mounted() {
@@ -291,9 +408,10 @@
     },
     //生成财务单据
     createBillForm(item) {
-        this.$q.dialog({
+      this.$q
+        .dialog({
           title: "提示信息",
-            message: '退课单据将扣除10%违约金',
+          message: "退课单据将扣除10%违约金",
           cancel: true,
           persistent: true,
           ok: "确定",
@@ -400,7 +518,8 @@
       };
       var message = "是否要作废此单据？";
 
-        this.$q.dialog({
+      this.$q
+        .dialog({
           title: "提示信息",
           message: message,
           cancel: true,
@@ -438,10 +557,8 @@
       this.resetSearch();
     },
   },
-  };
-
+};
 </script>
 <style lang="sass">
-  @import url('~assets/css/table.sass')
-
+@import url('~assets/css/table.sass')
 </style>