页面修改

src/components/course/course-form.vue

@@ -95,7 +95,8 @@
         <div class="row wrap">
           <div class="col-6">
             <q-select filled stack-label option-value="Id" option-label="Name" v-model="objOption.CourseRate"
-              ref="CourseRate" :options="courseLevelList" label="课程等级" class="col-6 q-pr-lg q-pb-lg" emit-value map-options />
+              ref="CourseRate" :options="courseLevelList" label="课程等级" class="col-6 q-pr-lg q-pb-lg" emit-value
+              map-options />
           </div>
           <div class="col-6">
           </div>
@@ -183,7 +184,7 @@
           IsKCourse: 0, //是否是K12课程(1-是)
           ClassHours: 0,
           CategoryList: [],
-          CourseRate:"",//课程等级
+          CourseRate: "", //课程等级
         },
         optionTitle: "",
         defaultArray: [],
@@ -234,7 +235,17 @@
       getCourseRateList() {
         getCourseRate({}).then(res => {
           if (res.Code == 1) {
-            this.courseLevelList = res.Data;
+            var tempData = res.Data;
+            if (tempData && tempData.length > 0) {
+              tempData.forEach(item => {
+                if ((item.Id >= 2 && item.Id <= 6) || item.Id == 8) {
+                  this.courseLevelList.push({
+                    Id: item.Id,
+                    Name: item.Name.replace(/课程/g,'')
+                  })
+                }
+              })
+            }
           }
         })
       },
@@ -318,7 +329,7 @@
             this.objOption.RenewSlPrice = res.Data.RenewSlPrice;
             this.objOption.Saleplat = res.Data.Saleplat;
             this.objOption.IsKCourse = res.Data.IsKCourse;
-            this.objOption.CourseRate=res.Data.CourseRate;
+            this.objOption.CourseRate = res.Data.CourseRate;
             if (res.Data.StepPriceList && res.Data.StepPriceList.length > 0) {
               this.ladderPriceList = res.Data.StepPriceList;
             }
@@ -358,7 +369,7 @@
           this.objOption.RenewSlPrice = 0;
           this.objOption.Saleplat = "";
           this.objOption.IsKCourse = 0;
-          this.objOption.CourseRate="";
+          this.objOption.CourseRate = "";
           this.getCategorytree();
         }
       },

src/pages/sale/studentList.vue

@@ -8,8 +8,8 @@
     width: 100%;
   }
 
-  ._addUpload_stu > div {
-    display:inline-block;
+  ._addUpload_stu>div {
+    display: inline-block;
     width: 138px;
     height: 92px;
     border: 1px dashed rgba(210, 210, 210, 1);
@@ -20,9 +20,11 @@
     margin-right: 10px;
     position: relative;
   }
-  ._addUpload_stu > div:hover {
+
+  ._addUpload_stu>div:hover {
     background-color: #f5f5f5;
   }
+
   .stuCard .el-upload-dragger {
     font-size: 28px;
     color: #8c939d;
@@ -31,6 +33,7 @@
     line-height: 41px;
     text-align: center;
   }
+
   ._addUpload_stu .icon-guanbi1 {
     font-size: 12px;
     color: white;
@@ -46,9 +49,11 @@
     text-align: center;
     line-height: 20px;
   }
-  .el-image-viewer__wrapper{
-    z-index:9999!important;
+
+  .el-image-viewer__wrapper {
+    z-index: 9999 !important;
   }
+
 </style>
 <template>
   <div class="page-body">
@@ -80,12 +85,46 @@
                                 生效状态: {{props.row.EffectStatusStr}}<br  />
                                 <template v-if="props.row.UpOrderId&&props.row.UpOrderId>0">
                                     前置订单: {{props.row.UpOrderId}}<br  />
-                                  </template>
-                              </q-tooltip>
+                                 </template>
+                </q-tooltip>
               </div>
             </span>
           </q-td>
         </template>
+        <template v-slot:body-cell-BackClassList="props">
+          <q-td :props="props" class="row" style="align-items: center">
+            <template v-if="props.row.BackClassList&&props.row.BackClassList.length>0">
+              <div>退课单据</div><br /><br />
+              <span v-for="(item,index) in props.row.BackClassList" :key="index"
+                style="cursor:pointer;color:blue;text-decoration:underline;"
+                @click="goEduReceiptInfo(item.Id)">{{item.Id}}</span>
+            </template>
+            <template v-if="props.row.StopClassList&&props.row.StopClassList.length>0">
+              <div>停课单据</div><br /><br />
+              <span v-for="(item,index) in props.row.StopClassList" :key="index"
+                style="cursor:pointer;color:blue;text-decoration:underline;"
+                @click="goEduReceiptInfo(item.Id)">{{item.Id}}</span>
+            </template>
+            <template v-if="props.row.InvitationClassList&&props.row.InvitationClassList.length>0">
+              <div>临沭上课邀请单据</div><br /><br />
+              <span v-for="(item,index) in props.row.InvitationClassList" :key="index"
+                style="cursor:pointer;color:blue;text-decoration:underline;"
+                @click="goEduReceiptInfo(item.Id)">{{item.Id}}</span>
+            </template>
+            <template v-if="props.row.OrderTransClassList&&props.row.OrderTransClassList.length>0">
+              <div>订单转班单据</div><br /><br />
+              <span v-for="(item,index) in props.row.OrderTransClassList" :key="index"
+                style="cursor:pointer;color:blue;text-decoration:underline;"
+                @click="goEduReceiptInfo(item.Id)">{{item.Id}}</span>
+            </template>
+            <template v-if="props.row.OrderSplitClassList&&props.row.OrderSplitClassList.length>0">
+              <div>订单分拆单据</div><br /><br />
+              <span v-for="(item,index) in props.row.OrderSplitClassList" :key="index"
+                style="cursor:pointer;color:blue;text-decoration:underline;"
+                @click="goEduReceiptInfo(item.Id)">{{item.Id}}</span>
+            </template>
+          </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" />
@@ -207,8 +246,8 @@
         <div class="row wrap" style="margin:0 20px;">
           <q-input clearable filled class="col-6 q-pb-lg q-pr-lg" v-model="addMsg.GuestContractNo" label="合同编号" />
           <q-select class="col-6 q-pb-lg" ref="ContractType" @input="resetContractArr" standout="bg-primary text-white"
-            option-value="Id" option-label="Name" v-model="addMsg.ContractType" :options="ContractTypeList" emit-value map-options label="上传类型"
-            use-input new-value-mode="add-unique" />
+            option-value="Id" option-label="Name" v-model="addMsg.ContractType" :options="ContractTypeList" emit-value
+            map-options label="上传类型" use-input new-value-mode="add-unique" />
         </div>
         <div class="row wrap" style="margin:0 20px;">
           <div class="col-12 text-grey-6">
@@ -220,12 +259,14 @@
             <template v-for="(file, fIndex) in addMsg.ContractUrl">
               <div v-if="addMsg.ContractType == 2">
                 <div style="width: 100%; height: 100%; overflow: hidden">
-                  <el-image style="width: 100%; height: 100%" :src="file" :preview-src-list="addMsg.ContractUrl"></el-image>
+                  <el-image style="width: 100%; height: 100%" :src="file" :preview-src-list="addMsg.ContractUrl">
+                  </el-image>
                 </div>
                 <span class="iconfont icon-guanbi1" @click="deleteUploadFile(fIndex)"></span>
               </div>
               <div v-if="addMsg.ContractType == 1" style="float:left;">
-                <div class="iconfont icon-pdf" style="font-size:38px;color:green;text-align:center;line-height:75px;" @click="showUpLoadFile(file)"></div>
+                <div class="iconfont icon-pdf" style="font-size:38px;color:green;text-align:center;line-height:75px;"
+                  @click="showUpLoadFile(file)"></div>
                 <span class="iconfont icon-guanbi1" @click="deleteUploadFile(fIndex)"></span>
               </div>
             </template>
@@ -298,6 +339,12 @@
             label: '课程名称',
             field: 'CourseName',
             align: 'left'
+          },
+           {
+            name: 'GuestStateStr',
+            label: '学员状态',
+            field: 'GuestStateStr',
+            align: 'left'
           },
           {
             name: 'TotalHours',
@@ -305,6 +352,36 @@
             field: 'TotalHours',
             align: 'left'
           },
+          {
+            name: 'ValidClassHours',
+            label: '有效课时',
+            field: 'ValidClassHours',
+            align: 'left'
+          },
+          {
+            name: 'CompleteHours',
+            label: '已上课时',
+            field: 'CompleteHours',
+            align: 'left'
+          },
+          {
+            name: 'SurplusHours',
+            label: '剩余课时',
+            field: 'SurplusHours',
+            align: 'left'
+          },
+          {
+            name: 'MakeUpHours',
+            label: '可补课时',
+            field: 'MakeUpHours',
+            align: 'left'
+          },
+          {
+            name: 'BackClassList',
+            label: '业务单据',
+            field: 'BackClassList',
+            align: 'left'
+          },
           {
             name: 'Mobile',
             label: '电话',
@@ -426,12 +503,12 @@
 
         ], //可见列
         initialIndex: 0,
-        ContractTypeList:[{
-          Name:'PDF',
-          Id:1
-        },{
-          Name:'图片',
-          Id:2
+        ContractTypeList: [{
+          Name: 'PDF',
+          Id: 1
+        }, {
+          Name: '图片',
+          Id: 2
         }]
       }
     },
@@ -454,7 +531,8 @@
       }
       if (this.msg.ClassId > 0) {
         this.visibleColumns = ['GuestName', 'Profession', 'Sex', 'BirthDate', 'Mobile', 'Basics', 'GuestSourceName',
-          'LearningGoalsName', 'Contact', 'ContactMobile', 'TotalHours', 'StartClassHours', 'CourseName', 'IsChaBan'
+          'LearningGoalsName', 'Contact', 'ContactMobile', 'TotalHours','ValidClassHours','CompleteHours','MakeUpHours',
+          'SurplusHours', 'StartClassHours', 'CourseName', 'IsChaBan','BackClassList','GuestStateStr'
         ];
       }
       if (this.msg.SourceId > 0) {
@@ -473,7 +551,13 @@
       this.getGuestPage();
     },
     methods: {
-      resetContractArr(){
+      //跳转到教务单据
+      goEduReceiptInfo(Id) {
+        this.OpenNewUrl("/user/billquery", {
+          Id: Id
+        })
+      },
+      resetContractArr() {
         this.addMsg.ContractUrl = [];
       },
       showUpLoadFile(file) {
@@ -509,8 +593,8 @@
             fileTypeNumber = x.type;
           }
         });
-        if(this.addMsg.ContractType==1){
-          if(fileTypeNumber!=1){
+        if (this.addMsg.ContractType == 1) {
+          if (fileTypeNumber != 1) {
             this.$q.notify({
               type: 'negative',
               position: "top",
@@ -519,8 +603,8 @@
             return
           }
         }
-        if(this.addMsg.ContractType==2){
-          if(fileTypeNumber!=2){
+        if (this.addMsg.ContractType == 2) {
+          if (fileTypeNumber != 2) {
             this.$q.notify({
               type: 'negative',
               position: "top",
@@ -535,17 +619,17 @@
           file.file,
           (x) => {
             if (x.Code == 1) {
-              if(this.addMsg.ContractType==1){
-                if(this.addMsg.ContractUrl.length<1){
+              if (this.addMsg.ContractType == 1) {
+                if (this.addMsg.ContractUrl.length < 1) {
                   this.addMsg.ContractUrl.push(x.FileUrl);
-                }else{
+                } else {
                   this.$q.notify({
                     type: 'negative',
                     position: "top",
                     message: `只能上传一个PDF文件`
                   })
                 }
-              }else{
+              } else {
                 this.addMsg.ContractUrl.push(x.FileUrl);
               }
               this.$message.success(this.$t("tips.scchenggong"));

src/pages/stuMan/stuList.vue

@@ -535,6 +535,18 @@
             field: "GuestStateStr",
             align: "left",
           },
+          {
+            name: "GraduationTime",
+            label: "毕业时间",
+            field: "GraduationTime",
+            align: "left",
+          },
+          {
+            name: "CourseRateName",
+            label: "毕业课程等级",
+            field: "CourseRateName",
+            align: "left",
+          },
           {
             name: "JoinTypeStr",
             label: "类型",