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

src/components/sale/changebill-form.vue

@@ -533,7 +533,6 @@
       this.getEmployee();
     },
     mounted() {
-      console.log("this.setingObj", this.setingObj)
       this.changeBillMsg.Id = this.setingObj.Id;
       this.changeBillMsg.SpecialNode = this.setingObj.SpecialNode;
       if (this.setingObj.DataObj.ChangeType == 1) {
@@ -552,7 +551,6 @@
               }
               this.dataList.push(obj);
             })
-            console.log(this.dataList, 'datraList');
           }
         }
       }
@@ -568,7 +566,6 @@
         this.changeTitle = '取消上课变更'
         this.dataList = this.setingObj.DataObj.NewChangePlanItemList
       }
-      console.log(this.setingObj.DataObj.OldChangePlanItemList);
     },
     methods: {
 

src/components/sale/continueclass-form.vue

@@ -170,7 +170,7 @@
         </div>
         <div class="col row wrap q-mr-lg q-col-gutter-md" style="margin:10px;">
           <div class="col-3">
-            <q-select @input="getRenewClassList" standout="bg-primary text-white" option-value="SId" option-label="SName"
+            <q-select @input="getRenewClassList" filled option-value="SId" option-label="SName"
               v-model="classMsg.School_Id" :options="schoolList" emit-value map-options label="关联校区" />
           </div>
           <div class="col-3">
@@ -188,12 +188,22 @@
             </q-field>
           </div>
           <div class="col-3">
-            <q-input @change="getRenewClassList" clearable standout="bg-primary text-white" v-model="classMsg.TeacherName"
+            <q-input @change="getRenewClassList" clearable filled v-model="classMsg.TeacherName"
             label="带班老师" @clear="getRenewClassList" maxlength="20" />
           </div>
           <div class="col-3">
-            <q-select @input="getRenewClassList" standout="bg-primary text-white" option-value="CourseId"
-            option-label="CourseName" v-model="classMsg.CouseId" :options="ClassList" emit-value map-options label="学习课程" />
+            <q-select filled stack-label use-input
+              option-value="CourseId" option-label="CourseName" v-model="classMsg.CouseId"
+              :options="ClassList" label="学习课程" :dense="false" emit-value map-options @filter="filterFn"
+              @input="getRenewClassList">
+              <template v-slot:no-option>
+                <q-item>
+                  <q-item-section class="text-grey">
+                    未找到相关数据
+                  </q-item-section>
+                </q-item>
+              </template>
+            </q-select>
           </div>
         </div>
         <div class="continus_ClassChoice">
@@ -305,7 +315,8 @@
         schoolList: [], //校区列表
         classTypeList:[], //班级类型
         dateList:[], //日期
-        ClassList:[], //学习课程
+        ClassList: [], //学习课程
+        AllClassList: [],
         isShowAdd:false,
       }
     },
@@ -464,11 +475,22 @@
           }
         })
       },
+      //筛选课程
+      filterFn(val, update) {
+        update(() => {
+          if (val === '') {
+            this.ClassList = JSON.parse(JSON.stringify(this.AllClassList))
+          } else {
+            this.ClassList = this.AllClassList.filter(v => v.CourseName.indexOf(val) > -1);
+          }
+        })
+      },
       //获取课程
       CourseList() {
         queryCourseDropdownList({}).then(res => {
           if (res.Code == 1) {
             this.ClassList = res.Data;
+            this.AllClassList = res.Data;
             this.ClassList.unshift({
               CourseId: 0,
               CourseName: "不限"

src/components/sale/orderlist.vue

@@ -131,13 +131,13 @@
                 <div style="color:red" v-if="item.CommissionBack>0">补交提成：{{item.CommissionBack}}</div>
               </template>
             </td>
-            <td style="border:none">{{item.GuestNum}}人</td>
-            <td style="border:none">
+            <td style="border:none;width:7%">{{item.GuestNum}}人</td>
+            <td style="border:none;width:7%">
               <template v-if="item.Class_Price>=0">
                 {{item.Class_Price.toFixed(2)}}
               </template>
             </td>
-            <td :style="{color:item.Class_Price!=item.Unit_Price?'var(--q-color-negative)':'','border':'none'}">
+            <td style="width:7%" :style="{color:item.Class_Price!=item.Unit_Price?'var(--q-color-negative)':'','border':'none'}">
               <template v-if="item.Unit_Price>=0">
                 {{item.Unit_Price.toFixed(2)}}
               </template>
@@ -145,7 +145,7 @@
                 <span class="redstyle">{{item.Unit_Price.toFixed(2)}}</span>
               </template>
             </td>
-            <td style="border:none">
+            <td style="border:none;width:7%">
               <template v-if="item.PreferPrice>=0">
                 {{item.PreferPrice.toFixed(2)}}
               </template>
@@ -154,7 +154,7 @@
               </template>
 
             </td>
-            <td style="border:none">
+            <td style="border:none;width:7%">
               <template v-if="item.Income>=0">
                 {{item.Income.toFixed(2)}}
               </template>
@@ -162,7 +162,7 @@
                 <span class="redstyle">{{item.Income.toFixed(2)}}</span>
               </template>
             </td>
-            <td style="color:var(--q-color-negative);border:none">
+            <td style="color:var(--q-color-negative);border:none;width:7%">
               <template v-if="item.DiscountMoney>=0">
                 {{item.DiscountMoney.toFixed(2)}}
               </template>
@@ -170,7 +170,7 @@
                 <span class="redstyle">{{item.DiscountMoney.toFixed(2)}}</span>
               </template>
             </td>
-            <td style="border:none">
+            <td style="border:none;width:6%">
               <template v-if="item.LessPrice>=0">
                 {{item.LessPrice.toFixed(2)}}
               </template>
@@ -178,7 +178,7 @@
                 <span class="redstyle">{{item.LessPrice.toFixed(2)}}</span>
               </template>
             </td>
-            <td style="border:none">
+            <td style="border:none;width:7%">
               <template v-if="item.Refund>=0">
                 {{item.Refund.toFixed(2)}}
               </template>
@@ -186,7 +186,7 @@
                 <span class="redstyle">{{item.Refund.toFixed(2)}}</span>
               </template>
             </td>
-            <td style="border:none">
+            <td style="border:none;width:7%">
               <template v-if="item.PlatformTax>=0">
                 {{item.PlatformTax.toFixed(2)}}
               </template>
@@ -194,7 +194,7 @@
                 <span class="redstyle">{{item.PlatformTax.toFixed(2)}}</span>
               </template>
             </td>
-            <td style="color:#2961FE;border:none">
+            <td style="color:#2961FE;border:none;width:7%">
               <template v-if="item.DueInMoney>=0">
                 {{item.DueInMoney.toFixed(2)}}
               </template>
@@ -202,7 +202,7 @@
                 <span class="redstyle">{{item.DueInMoney.toFixed(2)}}</span>
               </template>
             </td>
-            <td style="border:none">
+            <td style="border:none;width:7%">
               <div style="background: rgba(2, 196, 153, 0.2);width: 80px;border-radius: 2px;text-align: center">
                 <span style="color: #02C499">{{item.OrderStateName}}</span>
               </div>

src/components/sale/ordertrans-form.vue

@@ -518,7 +518,6 @@
       this.getEmployee();
     },
     mounted() {
-      console.log("this.setingObj", this.setingObj)
       this.changeBillMsg.Id = this.setingObj.Id;
       this.changeBillMsg.SpecialNode = this.setingObj.SpecialNode;
       if (this.setingObj.DataObj.ChangeType == 1) {
@@ -537,7 +536,6 @@
               }
               this.dataList.push(obj);
             })
-            console.log(this.dataList, 'datraList');
           }
         }
       }
@@ -553,7 +551,6 @@
         this.changeTitle = '取消上课变更'
         this.dataList = this.setingObj.DataObj.NewChangePlanItemList
       }
-      console.log(this.setingObj.DataObj.OldChangePlanItemList);
     },
     methods: {
 

src/components/sale/stopbill-form.vue

@@ -233,11 +233,13 @@
               <div style="color:#666666;margin-top:5px;" class="q-mb-md">
                 {{handleDate(setingObj.DataObj.TakeEffectTime)}}
               </div>
+            </div>
+            <div class="replayReason">
               <div class="replay_Title">停课原因</div>
               <div style="color:#666666;margin-top:5px;">
                 {{setingObj.DataObj.Remarks}}
               </div>
-            </div>
+            </div> 
             <!-- <template v-if="setingObj.SpecialNode==1">
               <span>
                 <q-input filled stack-label :dense="false" v-model="stopBillMsg.BackMoney" class="col-12"

src/components/sale/transferclass-form.vue

@@ -199,7 +199,7 @@
         </div>
         <div class="col row wrap q-mr-lg q-col-gutter-md" style="margin:10px;">
           <div class="col-3">
-            <q-select @input="getRenewClassList" standout="bg-primary text-white" option-value="SId"
+            <q-select @input="getRenewClassList" filled option-value="SId"
               option-label="SName" v-model="classMsg.School_Id" :options="schoolList" emit-value map-options
               label="关联校区" />
           </div>
@@ -217,13 +217,22 @@
             </q-field>
           </div>
           <div class="col-3">
-            <q-input @change="getRenewClassList" clearable standout="bg-primary text-white"
+            <q-input @change="getRenewClassList" clearable filled
               v-model="classMsg.TeacherName" label="带班老师" @clear="getRenewClassList" maxlength="20" />
           </div>
           <div class="col-3">
-            <q-select @input="getRenewClassList" standout="bg-primary text-white" option-value="CourseId"
-              option-label="CourseName" v-model="classMsg.CouseId" :options="ClassList" emit-value map-options
-              label="学习课程" />
+            <q-select filled stack-label use-input
+              option-value="CourseId" option-label="CourseName" v-model="classMsg.CouseId"
+              :options="ClassList" label="学习课程" :dense="false" emit-value map-options @filter="filterFn"
+              @input="getRenewClassList">
+              <template v-slot:no-option>
+                <q-item>
+                  <q-item-section class="text-grey">
+                    未找到相关数据
+                  </q-item-section>
+                </q-item>
+              </template>
+            </q-select>
           </div>
         </div>
         <div class="continus_ClassChoice">
@@ -349,6 +358,7 @@
         classTypeList: [], //班级类型
         dateList: [], //日期
         ClassList: [], //学习课程
+        AllClassList: [],
         isShowAdd: false,
       }
     },
@@ -537,11 +547,22 @@
           }
         })
       },
+      //筛选课程
+      filterFn(val, update) {
+        update(() => {
+          if (val === '') {
+            this.ClassList = JSON.parse(JSON.stringify(this.AllClassList))
+          } else {
+            this.ClassList = this.AllClassList.filter(v => v.CourseName.indexOf(val) > -1);
+          }
+        })
+      },
       //获取课程
       CourseList() {
         queryCourseDropdownList({}).then(res => {
           if (res.Code == 1) {
             this.ClassList = res.Data;
+            this.AllClassList = res.Data;
             this.ClassList.unshift({
               CourseId: 0,
               CourseName: "不限"

src/pages/course/lessonPreparation.vue

@@ -343,7 +343,7 @@ export default {
                 ClassPlanId: 0, //排课id
                 LessonPlan: '', //教案名称
                 IsTemplate: 0, //是否设置成模板0-否，1-是
-                LessonPlanList: [] //老师教案详情
+                LessonPlanList: [], //老师教案详情
             },
             TeacherName: '', //教师名字
             WorkDate: '', //时间
@@ -401,6 +401,7 @@ export default {
                     } else {
                         this.addMsg.LessonPlanList = data.LessonPlanList;
                         this.addMsg.LessonPlanList.forEach(x => {
+                            x.ClassDate=data.ClassStartTime.slice(0,10);
                             x.LessonPlanProjectsList.push({
                                 ProjectContent: ''
                             })

src/pages/course/prepareclassDetails.vue

@@ -470,8 +470,12 @@
         </div>
         <div class="row" style="margin-top: 20px;align-items: center">
           <q-input filled v-model="plmsg.Comment" label="写下你想评价的内容" type="textarea" style="flex:1" />
-          <img src="../../assets/images/course/fasong.png" alt=""
-            style="width: 35px;height: 35px;margin-left: 20px;cursor:pointer;" @click="btnpl()">
+          <q-btn round flat :loading="saveLoading" style="width: 50px;height: 50px;margin-left: 20px;cursor:pointer;"  @click="btnpl()">
+            <template slot="default">
+              <img src="../../assets/images/course/fasong.png" style="width: 100%;height: 100%;" alt=""/>
+            </template>
+          </q-btn>
+
         </div>
       </div>
 
@@ -497,7 +501,7 @@
     name: "prepareclassDetails",
     data() {
       return {
-        loginId:0,
+        loginId: 0,
         contentStyle: {},
         contentActiveStyle: {},
         thumbStyle: {
@@ -514,20 +518,22 @@
         },
         Dloading: false,
         plmsg: {
-          LessonCommentId:0,
+          LessonCommentId: 0,
           Comment: '',
           Score: 5,
           LessonPlanId: 0,
           ClassId: 0,
           ClassPlanId: 0,
-          TeacherId: 0
+          TeacherId: 0,
+          ClassDate: "",
         },
         data: {},
         CommentList: [],
         AccountType: true,
         scoreMsg: {
           ClassPlanId: 0,
-          ClassId: 0
+          ClassId: 0,
+          ClassDate: "",
         },
         Score: 0,
         nowDate: '', //现在时间
@@ -547,13 +553,13 @@
           'font-weight': 'bold',
           'letter-spacing': '.005em',
           'padding-left': '0'
-        }
+        },
+        saveLoading:false
       }
     },
     created() {
-      let data=JSON.parse(localStorage.getItem("loginUserInfo"))
-      this.loginId=data.data.Id
-      console.log(556,this.loginId)
+      let data = JSON.parse(localStorage.getItem("loginUserInfo"))
+      this.loginId = data.data.Id
     },
     mounted() {
       this.msg.ClassId = this.$route.query.ClassId ? this.$route.query.ClassId : 0;
@@ -577,8 +583,7 @@
         this.isShowBtn = false;
       }
       this.getList() //备课内容
-      this.getCommentList() //评价
-      this.getUserComment();
+
 
       var today = new Date();
       var y = today.getFullYear();
@@ -631,6 +636,10 @@
               this.ImgList = this.data.LessonPlanList[0].ProjectPicList;
               // this.isShowBtn=false
             }
+            this.plmsg.ClassDate = res.Data.ClassStartTime
+            this.scoreMsg.ClassDate = res.Data.ClassStartTime
+            this.getCommentList() //评价
+            this.getUserComment();
           }
         })
       },
@@ -638,6 +647,7 @@
         getLessonCommentList({
           ClassId: this.msg.ClassId,
           ClassPlanId: this.msg.ClassPlanId,
+          ClassDate: this.plmsg.ClassDate,
         }).then(res => {
           if (res.Code == 1) {
             this.CommentList = res.Data
@@ -663,8 +673,9 @@
           })
           return
         }
-
+        this.saveLoading=true
         setLessonComment(this.plmsg).then(res => {
+          this.saveLoading=false
           if (res.Code == 1) {
             this.$q.notify({
               icon: 'iconfont icon-chenggong',
@@ -675,13 +686,15 @@
             })
             this.plmsg.Score = 5;
             this.plmsg.Comment = '';
-            this.plmsg.LessonCommentId=0;
+            this.plmsg.LessonCommentId = 0;
             this.getUserComment()
             this.getCommentList()
             if (this.data.TotalScore === 0) {
               this.getList()
             }
           }
+        }).catch(err=>{
+          this.saveLoading=false
         })
       },
       saveOrderInfo() {
@@ -748,16 +761,15 @@
               })
             }
           })
-        }).onCancel(() => {
-        });
+        }).onCancel(() => {});
       },
       //修改评论
-      modifyComment(item){
+      modifyComment(item) {
         console.log(item)
-        this.plmsg.LessonCommentId=item.LessonCommentId
-        this.plmsg.Comment=item.Comment
-        this.plmsg.Score=item.Score
-        this.Score=item.Score
+        this.plmsg.LessonCommentId = item.LessonCommentId
+        this.plmsg.Comment = item.Comment
+        this.plmsg.Score = item.Score
+        this.Score = item.Score
       }
     }
   }

src/pages/course/teacherLesson.vue

@@ -333,10 +333,11 @@
               <span class="beikeBtn" v-if="AccountType&&item1.LessonPlanNum===0" @click="goBeike(item1)">备课</span>
               <span style="color:#3FC4FF;font-size:12px;cursor:pointer" v-if="item1.LessonPlanSummaryNum>0&&item1.LessonPlanNum>0" @click="goyibeike(item1)">已反馈</span>
               <span style="color:#FFA800;font-size:12px;" v-if="item1.LessonPlanSummaryNum==0&&item1.LessonPlanNum>0">未反馈</span>
+              <span class="fankuiBtn"  v-if="AccountType&&item1.LessonPlanSummaryNum==0&&item1.LessonPlanNum>0" @click="goyibeike(item1)">反馈</span>
               <span style="color:#3FC4FF;font-size:12px;margin-left:20px;cursor:pointer" v-if="item1.ParentFanKuiStatus>0&&item1.LessonPlanNum>0" @click="goyibeike(item1)">主管已反馈</span>
               <span style="color:#FFA800;font-size:12px;margin-left:20px;" v-if="item1.ParentFanKuiStatus==0&&item1.LessonPlanNum>0">主管未反馈</span>
              
-               <span class="fankuiBtn"  v-if="AccountType&&item1.LessonPlanSummaryNum==0&&item1.LessonPlanNum>0" @click="goyibeike(item1)">反馈</span>
+            
             </div>
           </div>
           <div class="TeacherInfo_List" v-for="(item,index) in item1.planListTeacher">

src/pages/financial/orderCompleteStatistics.vue

@@ -304,6 +304,7 @@
                 v-model="AdjustPriceMsg.AdjustPrice"
                 label="协调金额"
                 lazy-rules
+                step="0.000001"
                 type="number"
                 :rules="[(val) => (val&&val>=0) || '请输入协调金额']"
               />
@@ -623,7 +624,7 @@
         if(res.Code===1){
           this.getData()
         }
-        
+        this.$refs.dialog.hide();
         })
       
       }

src/pages/teacher/changeClassManager.vue

@@ -119,7 +119,9 @@
         @success="refreshPage">
       </stopbill-form>
       <!-- 订单转班-查看 -->
-      <ordertrans-form v-if="isShowClassTrans" :seting-obj="billObj" :showType="showType" @close="closeBillForm"></ordertrans-form>
+      <ordertrans-form v-if="isShowClassTrans" :seting-obj="billObj" :showType="showType" @close="closeBillForm" 
+        @success="refreshPage">
+      </ordertrans-form>
     </div>
   </div>
 </template>
@@ -326,6 +328,9 @@
       refreshPage() {
         this.isShowBillForm = false;
         this.isShowChangeBillForm = false;
+        this.isShowCreateBillForm = false;
+        this.isShowStopBillForm=false;
+        this.isShowClassTrans = false;
         this.billObj = {};
         this.getStuBackBill();
       },

src/pages/teacher/myPrepareLessons.vue

@@ -346,12 +346,13 @@
                 v-if="item1.LessonPlanSummaryNum>0&&item1.LessonPlanNum>0" @click="goyibeike(item1)">已反馈</span>
               <span style="color:#FFA800;font-size:12px;"
                 v-if="item1.LessonPlanSummaryNum==0&&item1.LessonPlanNum>0">未反馈</span>
+              <span class="fankuiBtn" v-if="AccountType&&item1.LessonPlanSummaryNum==0&&item1.LessonPlanNum>0"
+                @click="goyibeike(item1)">反馈</span>
               <span style="color:#3FC4FF;font-size:12px;margin-left:20px;cursor:pointer"
                 v-if="item1.ParentFanKuiStatus>0&&item1.LessonPlanNum>0" @click="goyibeike(item1)">主管已反馈</span>
               <span style="color:#FFA800;font-size:12px;margin-left:20px;"
                 v-if="item1.ParentFanKuiStatus==0&&item1.LessonPlanNum>0">主管未反馈</span>
-              <span class="fankuiBtn" v-if="AccountType&&item1.LessonPlanSummaryNum==0&&item1.LessonPlanNum>0"
-                @click="goyibeike(item1)">反馈</span>
+
             </div>
           </div>
           <div class="TeacherInfo_List" v-for="(item,index) in item1.planListTeacher">