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

src/App.vue

@@ -12,7 +12,7 @@ export default {
 
 <style>
 @import url('~assets/css/font.css');
-@import url('//at.alicdn.com/t/font_2077629_9bdr67jqiee.css');
+@import url('//at.alicdn.com/t/font_2077629_tknu7rklxe.css');
 .q-scrollarea__thumb{
     z-index: 999999!important;
 }

src/api/teacher/student.js

@@ -23,3 +23,28 @@ export function setStopClassApply(data) {
         data
     })
 }
+
+/**
+ * 临时上课邀请，获取学员列表
+ * @param {JSON参数} data
+ */
+export function getNotClassStudentList(data) {
+    return request({
+        url: '/TeacherClass/GetNotClassStudentList',
+        method: 'post',
+        data
+    })
+}
+
+
+/**
+ * 创建临时上课邀请申请单
+ * @param {JSON参数} data
+ */
+export function setStuInviteApply(data) {
+    return request({
+        url: 'TempInvitationClass/SetStudentTempInvitation',
+        method: 'post',
+        data
+    })
+}
\ No newline at end of file

src/components/flow/temporaryClass-form.vue

+<style>
+  .changeClassProcess {
+    width: 350px;
+  }
+
+  .changeClassProcess .processList {
+    width: 100%;
+    height: auto;
+  }
+
+  .changeClassProcess .processTop {
+    width: 100%;
+    height: 54px;
+    background-color: #F1F1F1;
+    color: #000000;
+    text-align: center;
+    line-height: 54px;
+    border-radius: 2px;
+    cursor: pointer;
+    position: relative;
+  }
+
+  .changeClassProcess .processLine {
+    width: 100%;
+    height: 54px;
+    background-color: #fff;
+    color: #bbb6b6;
+    text-align: center;
+    line-height: 54px;
+  }
+
+  .changeClassProcess .processLine i {
+    font-size: 25px;
+    font-weight: bold;
+  }
+
+  .changeClassProcess .otherList {
+    background-color: #2961FE !important;
+    color: #fff;
+    font-weight: bold;
+  }
+
+  .changeClassProcess .process_TwoList {
+    display: flex;
+    background-color: #2961FE !important;
+    color: #fff;
+    font-weight: bold;
+    align-items: center;
+    justify-content: center;
+  }
+
+  .changeClassProcess .process_He {
+    width: 36px;
+    height: 36px;
+    background-color: #3FC4FF;
+    text-align: center;
+    line-height: 36px;
+    color: #fff;
+    border-radius: 50%;
+  }
+
+  .changeClassProcess .process_Left {
+    width: 40%;
+    height: 100%;
+    text-align: right;
+  }
+
+  .changeClassProcess .process_center {
+    width: 20%;
+    height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+
+  .changeClassProcess .process_Right {
+    width: 40%;
+    height: 100%;
+    text-align: left;
+  }
+
+  .changeClassProcess .process_OR {
+    background-color: #F28C1D;
+  }
+
+  .changeClassProcess .addProcessBtn {
+    width: 100%;
+    height: 45px;
+    text-align: center;
+    line-height: 45px;
+    color: #2961FE;
+    border: 1px dashed #2961FE;
+    border-radius: 2px;
+    cursor: pointer;
+  }
+
+  .changeClassProcess .process_BtnList {
+    margin-top: 30px;
+    width: 100%;
+    display: flex;
+    justify-content: center;
+  }
+
+  .changeClassProcess .process_BtnOne {
+    width: 90px;
+    height: 38px;
+    text-align: center;
+    line-height: 38px;
+    border-radius: 2px;
+    border: 1px solid #A1AAB2;
+    color: #000000;
+    cursor: pointer;
+    margin-right: 50px;
+  }
+
+  .changeClassProcess .SetShouSun {
+    display: inline-block;
+    border-radius: 2px;
+    background-color: #8175FB;
+    color: #fff;
+    position: absolute;
+    right: 10px;
+    width: 60px;
+    height: 27px;
+    left: 0;
+    top: 0;
+    line-height: 27px;
+    font-size: 13px;
+  }
+
+  .changeClassProcess .operationDiv {
+    position: absolute;
+    right: 0;
+    top: 0;
+    height: 30px;
+    line-height: 30px;
+    padding-right: 10px;
+    vertical-align: top;
+  }
+
+  .changeClassProcess .operationDiv i:first-child {
+    font-size: 13px;
+  }
+
+  .changeClassProcess .operationDiv i:hover {
+    color: red;
+  }
+
+  .changeClassProcess .justTwoClass {
+    margin-left: 8px;
+  }
+
+</style>
+<template>
+  <div class="changeClassProcess">
+    <div class="processList">
+      <div class="processTop">发起人</div>
+      <div class="processLine">
+        <i class="iconfont icon-down"></i>
+      </div>
+    </div>
+    <template v-for="(item,index) in flowObj.FlowNodeList">
+      <div class="processList" @click="getItem(index)">
+        <template v-if="item.FlowAduitList&&item.FlowAduitList.length==1">
+          <div class="processTop otherList">
+            {{item.FlowAduitList[0].AduitName}}
+            <template v-if="item.FlowAduitList&&item.FlowAduitList.length>0 && item.FlowAduitList[0].IsSpecNode==1">
+              <span class="SetShouSun">设定收损</span>
+            </template>
+            <div class="operationDiv">
+              <i class="iconfont icon-shanchu" style="position:relative;top:-2px;" @click.stop="DeleteNode(index)"></i>
+              <i style="margin:0 8px;" class="iconfont icon-shangyi2" v-if="index!=0"
+                @click.stop="moveDown(index,0)"></i>
+              <i class="iconfont icon-xiayi" :class="{'justTwoClass':index==0}" @click.stop="moveDown(index,1)"
+                v-if="index!=flowObj.FlowNodeList.length-1"></i>
+            </div>
+          </div>
+          <div class="processLine" v-if="index!=flowObj.FlowNodeList.length-1">
+            <i class="iconfont icon-down"></i>
+          </div>
+        </template>
+        <template v-else>
+          <div class="processTop process_TwoList">
+            <div class="process_Left">{{item.FlowAduitList[0].AduitName}}</div>
+            <div class="process_center">
+              <template v-if="item.FlowAduitList[0].AuditWay==2">
+                <div class="process_He">和</div>
+              </template>
+              <template v-if="item.FlowAduitList[0].AuditWay==3">
+                <div class="process_He process_OR">或者</div>
+              </template>
+            </div>
+            <div class="process_Right">
+              <template v-for="(subItem,subIndex) in item.FlowAduitList" v-if="subIndex>0">
+                {{subItem.AduitName}}
+              </template>
+            </div>
+            <template v-if="item.FlowAduitList&&item.FlowAduitList.length>0 && item.FlowAduitList[0].IsSpecNode==1">
+              <span class="SetShouSun">设定收损</span>
+            </template>
+            <div class="operationDiv">
+              <i class="iconfont icon-shanchu" style="position:relative;top:-2px;" @click.stop="DeleteNode(index)"></i>
+              <i style="margin:0 8px;" class="iconfont icon-shangyi2" v-if="index!=0"
+                @click.stop="moveDown(index,0)"></i>
+              <i class="iconfont icon-xiayi" :class="{'justTwoClass':index==0}" @click.stop="moveDown(index,1)"
+                v-if="index!=flowObj.FlowNodeList.length-1"></i>
+            </div>
+          </div>
+          <div class="processLine" v-if="index!=flowObj.FlowNodeList.length-1">
+            <i class="iconfont icon-down"></i>
+          </div>
+        </template>
+      </div>
+    </template>
+    <br />
+    <div class="addProcessBtn" @click="AddNode">新增节点</div>
+    <div class="process_BtnList">
+
+      <q-btn label="保存" color="accent q-px-md" style="font-weight:400 !important" @click="setBackClassFlow" />
+    </div>
+    <process-form v-if="isShowProcess" :save-obj="processObj" :NodeIndex="ChooseNodeIndex" @close="closeProcessForm"
+      @success="refreshPage" :authObj="showObj">
+    </process-form>
+  </div>
+</template>
+<script>
+  import processForm from '../../components/flow/process-form';
+  import {
+    queryBackClassFlow,
+    saveBackClassFlow
+  } from '../../api/system/index'
+  export default {
+    meta: {
+      title: ""
+    },
+    components: {
+      processForm
+    },
+    data() {
+      return {
+        msg: {
+          FlowId: 4
+        },
+        isShowProcess: false, //显示旁边弹窗
+        processObj: {}, //传递子组件
+        flowObj: {
+          FlowId: 4,
+          FlowName: "临时上课邀请流程",
+          FlowNodeList: [], //审核节点列表
+        },
+        //显示对象
+        showObj: {
+          isShowShouSun: 0,//不显示收损
+        },
+        ChooseNodeIndex: 0,
+      }
+    },
+    created() {},
+    mounted() {
+      this.getBackClassFlow();
+    },
+    methods: {
+      //新增节点
+      AddNode() {
+        this.flowObj.FlowNodeList.push({
+          FlowId: 0,
+          NodeId: 0,
+          NodeName: "新增节点",
+          SortNum: 0,
+          FlowAduitList: [{
+            AduitName: "新增节点",
+            AuditType: 2,
+            AuditWay: 2,
+            CheckId: 0,
+            FlowId: 0,
+            IsSpecNode: 0,
+            NodeId: 8,
+            PostType: 0,
+            UserId: 0,
+          }]
+        });
+      },
+      //删除节点
+      DeleteNode(index) {
+        this.$q.dialog({
+          title: '提示信息',
+          message: '是否确定删除该流程',
+          cancel: true,
+          persistent: true,
+          ok: "确定",
+          cancel: "取消",
+        }).onOk(() => {
+          this.flowObj.FlowNodeList.splice(index, 1);
+        }).onCancel(() => {
+
+        });
+      },
+      getBackClassFlow() {
+        queryBackClassFlow(this.msg).then(res => {
+          if (res.Code == 1 && res.Data) {
+            this.flowObj = res.Data;
+          }
+        })
+      },
+      //点开旁边
+      getItem(nodeIndex) {
+        this.processObj = this.flowObj;
+        this.ChooseNodeIndex = nodeIndex;
+        this.isShowProcess = true;
+      },
+      //关闭
+      closeProcessForm() {
+        this.isShowProcess = false
+      },
+      //成功刷新
+      refreshPage() {
+        this.isShowProcess = false;
+        this.getBackClassFlow();
+      },
+      //保存退课流程
+      setBackClassFlow() {
+        saveBackClassFlow(this.flowObj).then(res => {
+          if (res.Code == 1) {
+            this.$q.notify({
+              icon: 'iconfont icon-chenggong',
+              color: 'accent',
+              timeout: 2000,
+              message: '操作成功',
+              position: 'top'
+            })
+            this.refreshPage();
+          }
+        })
+      },
+      //下移下移
+      moveDown(index, IsUp) {
+        var currentItem = this.flowObj.FlowNodeList[index];
+        if (IsUp == 0) {
+          if (index > 0) {
+            var upItem = this.flowObj.FlowNodeList[index - 1];
+            this.$set(this.flowObj.FlowNodeList, index - 1, currentItem);
+            this.$set(this.flowObj.FlowNodeList, index, upItem);
+          }
+        } else {
+          if (index != this.flowObj.FlowNodeList.length - 1) {
+            var downItem = this.flowObj.FlowNodeList[index + 1];
+            this.$set(this.flowObj.FlowNodeList, index + 1, currentItem);
+            this.$set(this.flowObj.FlowNodeList, index, downItem);
+          }
+        }
+      }
+    }
+  }
+
+</script>

src/components/sale/continueclass-form.vue

@@ -166,7 +166,7 @@
       <template v-else>
         <div class="contiue_Top">
           <span class="backContius" @click="isShowTuike=true">
-            <返回</span> <span style="margin-left:20px;">班级选择
+            <i style="font-size:18px;margin-left:15px;" title="返回" class="iconfont icon-fanhui"></i></span> <span style="margin-left:20px;">班级选择
           </span>
         </div>
         <div class="col row wrap q-mr-lg q-col-gutter-md" style="margin:10px;">

src/components/sale/offertransorder-form.vue

@@ -276,6 +276,7 @@
           let val = item.ClassList.find(x => x.ClassId == item.ClassId);
           if (val) {
             item.ClassName = val.ClassName;
+            item.Teacher_Id = val.Teacher_Id;
           }
         } else {
           item.ClassName = ""
@@ -337,6 +338,16 @@
           OfferType: this.obj.OfferType,
           OfferDetails: this.model.OfferDetails
         };
+        for(var i=0;i<sMsg.OfferDetails.length;i++){
+          if(sMsg.OfferDetails[i].Teacher_Id==0){
+            this.$q.notify({
+              type: 'negative',
+              position: "top",
+              message: `请联系班级管理员，关联${sMsg.OfferDetails[i].ClassName}班级老师后转单`
+            })
+            return
+          }
+        }
         saveOfferToOrder(sMsg).then(res => {
           if (res.Code == 1) {
             this.$q.notify({

src/components/sale/transferclass-form.vue

@@ -195,7 +195,7 @@
       <template v-else>
         <div class="contiue_Top">
           <span class="backContius" @click="isShowTuike=true">
-            <返回</span> <span style="margin-left:20px;">班级选择
+            <i style="font-size:18px;margin-left:15px;" title="返回" class="iconfont icon-fanhui"></i></span> <span style="margin-left:20px;">班级选择
           </span>
         </div>
         <div class="col row wrap q-mr-lg q-col-gutter-md" style="margin:10px;">

src/pages/course/classManage.vue

@@ -122,7 +122,12 @@
         </template>
         <template v-slot:body-cell-TeacherName="props">
           <q-td auto-width :props="props">
-            <span style="color:#3FC4FF;">{{props.row.TeacherName}}</span>
+            <template v-if="props.row.Teacher_Id==0">
+              <span style="color:red">未指定</span>
+            </template>
+            <template v-else>
+              <span style="color:#3FC4FF;">{{props.row.TeacherName}}</span>
+            </template>
           </q-td>
         </template>
         <template v-slot:body-cell-ClassPersion="props">

src/pages/sale/japaneseTrain.vue

@@ -114,15 +114,20 @@
               <div class="d2">
                 <div class="row" style="align-items: center ;margin:0;padding:0;">
                   <span class="d2-n">带课老师</span>
-                  <q-avatar rounded size="sm" v-if="item.TeacherHead&&item.TeacherHead!=''">
-                    <img :src="item.TeacherHead" />
-                  </q-avatar>
-                  <q-avatar v-else rounded size="sm" color="teal-10" text-color="white">
-                    <template v-if="item.TeacherName&&item.TeacherName!=''">
-                      {{item.TeacherName.substr(0,1)}}
-                    </template>
-                  </q-avatar>
-                  &nbsp;{{item.TeacherName}}
+                  <template v-if="item.Teacher_Id==0">
+                    <span style="color:red">未指定</span>  
+                  </template>
+                  <template v-else>
+                    <q-avatar rounded size="sm" v-if="item.TeacherHead&&item.TeacherHead!=''">
+                      <img :src="item.TeacherHead" />
+                    </q-avatar>
+                    <q-avatar v-else rounded size="sm" color="teal-10" text-color="white">
+                      <template v-if="item.TeacherName&&item.TeacherName!=''">
+                        {{item.TeacherName.substr(0,1)}}
+                      </template>
+                    </q-avatar>
+                    &nbsp;{{item.TeacherName}}
+                  </template>
                 </div>
                 <div><span class="d2-n">上课教室</span>{{item.RoomName}}</div>
                 <div><span class="d2-n">上课时间</span><span
@@ -524,6 +529,14 @@
       },
       //立即报名和插班报名
       placeAnorder(item, type) {
+        if(item.Teacher_Id==0){
+          this.$q.notify({
+            type: 'negative',
+            position: "top",
+            message: `请联系班级管理员，关联班级老师后报名`
+          })
+          return
+        }
         this.isChaBan = type;
         this.orderObj.ClassId = item.ClassId;
         this.orderObj.Unit_Price = item.SellPrice;

src/pages/sale/reserveClass.vue

@@ -44,6 +44,16 @@
           <q-btn color="accent" size="sm" class="q-mr-md" icon="add" label="添加试听" @click="editVisitor(null)" />
         </div>
       </template>
+      <template v-slot:body-cell-TeacherName="props">
+        <q-td>
+          <template v-if="props.row.TeacherId==0">
+            <span style="color:red">未指定</span>
+          </template>
+          <template>
+            {{props.row.TeacherName}}
+          </template>
+        </q-td>  
+      </template>
       <template v-slot:body-cell-ClassContent="props">
         <q-td :props="props">
           <div style="min-width: 150px;word-break: break-word;white-space: normal;">

src/pages/system/processSet.vue

@@ -23,6 +23,10 @@
         <!-- 转班流程 -->
         <transfer-form></transfer-form>
       </template>
+       <template v-if="tabCheck=='5'">
+        <!-- 临时上课邀请流程 -->
+        <temporaryClass-form></temporaryClass-form>
+      </template>
     </div>
   </div>
 </template>
@@ -31,6 +35,7 @@
   import changeclassflowForm from '../../components/flow/changeclassflow-form';
   import stopclassflowForm from '../../components/flow/stopclassflow-form';
   import transferForm from '../../components/flow/transfer-form';
+  import temporaryClassForm from '../../components/flow/temporaryClass-form';
   export default {
     meta: {
       title: "流程设置"
@@ -39,7 +44,8 @@
       backclassflowForm,
       changeclassflowForm,
       stopclassflowForm,
-      transferForm
+      transferForm,
+      temporaryClassForm
     },
     data() {
       return {
@@ -58,6 +64,10 @@
           {
             name: "4",
             label: "转班流程"
+          },
+           {
+            name: "5",
+            label: "临时上课邀请流程"
           }
         ],
         tabCheck: '1',

src/pages/teacher/changeClassManager.vue

@@ -137,7 +137,6 @@
   import stopbillForm from '../../components/sale/stopbill-form';
   import createbackbillForm from '../../components/sale/createbackbill-form';
   import ordertransForm from '../../components/sale/ordertrans-form';
-
   export default {
     meta: {
       title: "退课单据"

src/pages/teacher/studentManager.vue

@@ -74,6 +74,8 @@
         <template v-slot:top="props">
           <div class="col-2 q-table__title">学员管理</div>
           <q-space />
+          <q-btn color="accent" size="sm" class="q-mr-md" label="临时上课邀请"
+              @click="isShowProvisionalInvite=true" />
         </template>
         <!--课时-->
         <template v-slot:body-cell-TotalPlanNum="props">
@@ -109,6 +111,7 @@
         </template>
       </q-table>
        <StopLesson-form  v-if="isShowStopLesson" :setObj="stuObj" @success="reloadPage" @close="closeMenuSaveForm"/>
+        <ProvisionalInvite-form v-if="isShowProvisionalInvite" @close="closeMenuSaveForm"/>
     </div>
 
    
@@ -134,6 +137,7 @@
   //   import classinfoForm from '../../components/course/classinfo-form';
   //   import othercourseForm from '../../components/course/othercourse-form';
   import StopLessonForm from '../../components/teacher/stopLessonForm'
+  import ProvisionalInviteForm from '../../components/teacher/provisionalInviteForm'
   export default {
     meta: {
       title: "班级管理"
@@ -142,7 +146,8 @@
       //   classForm,
       //   classinfoForm,
       //   othercourseForm,
-      StopLessonForm
+      StopLessonForm,
+      ProvisionalInviteForm
     },
     data() {
       return {
@@ -228,6 +233,7 @@
         allClassList: [],
         isShowStopLesson:false,
         stuObj:{},
+        isShowProvisionalInvite:false,
       }
     },
     created() {
@@ -381,6 +387,7 @@
       //关闭弹窗
       closeMenuSaveForm() {
         this.isShowStopLesson = false;
+        this.isShowProvisionalInvite=false;
       },
        //刷新页面
       reloadPage() {

src/pages/user/billquery.vue

@@ -149,6 +149,9 @@
       <changebill-form v-if="isShowChangeBillForm" :seting-obj="billObj" :showType="showType" @close="closeBillForm"
         @success="refreshPage">
       </changebill-form>
+      <ordertrans-form v-if="isShowTransForm" :seting-obj="billObj" :showType="showType" @close="closeBillForm"
+        @success="refreshPage">
+      </ordertrans-form>
     </div>
   </div>
 </template>
@@ -166,6 +169,7 @@
 
   import backbillForm from '../../components/sale/backbill-form';
   import changebillForm from '../../components/sale/changebill-form';
+  import ordertransForm from '../../components/sale/ordertrans-form'
 
   export default {
     meta: {
@@ -174,6 +178,7 @@
     components: {
       backbillForm,
       changebillForm,
+      ordertransForm
     },
     data() {
       return {
@@ -268,6 +273,7 @@
         EmployeeList: [],
         AllemployeeList: [],
         IsEditEduReceipAudit: false, //是否有修改审核人权限
+        isShowTransForm:false
       }
     },
     created() {
@@ -307,6 +313,7 @@
       closeBillForm() {
         this.isShowBackBillForm = false;
         this.isShowChangeBillForm = false;
+        this.isShowTransForm = false;
         this.billObj = {};
       },
       //显示表单
@@ -319,6 +326,10 @@
         else if (item.ReceiptType == 2) {
           this.isShowBackBillForm = true;
         }
+        //转班
+        else if(item.ReceiptType == 5){
+          this.isShowTransForm = true;
+        }
         this.showType = type;
         this.billObj = item;
         this.isShowEdit = false;