Merge branch 'Inspection' of http://git.dayaedu.com/molingzhide/dy-admin-manager into Inspection

src/views/main/baseinfo/business.vue

@@ -50,7 +50,10 @@ export default {
             type: 'shadow',
             shadowStyle: {
               color: 'rgba(150,150,150,0.2)'
-            }
+            },
+          },
+          formatter: item => {
+            return [item[0].axisValueLabel, ...item.map(d => `<br/>${d.marker}${d.seriesName}: ${d.value} %`)].join('')
           }
         }
       }

src/views/main/baseinfo/student.vue

@@ -8,7 +8,7 @@
         type="text"
       >{{isHistogram ? '学员转化漏斗图' : '学员柱状图'}}</el-button>
     </div>
-    <statistic :col="5" class="statistic" :cols="0">
+    <statistic class="statistic" :cols="0">
       <statistic-item v-for="(item, key) in items" :key="key" :class="{active: active === key}" @click="active = key">
         <span>
           {{item.title}}
@@ -51,7 +51,6 @@ export default {
         OTHER_STUDENT: this.data['OTHER_STUDENT'] || {},
         NEWLY_STUDENT_NUM: this.data['NEWLY_STUDENT_NUM'] || {},
         QUIT_MUSIC_GROUP_STUDENT_NUM: this.data['QUIT_MUSIC_GROUP_STUDENT_NUM'] || {},
-        STUDENT_CONVERSION: this.data['STUDENT_CONVERSION'] || {},
       }
     },
     chartExtend() {

src/views/teacherManager/teacherOperation/components/salarySet.vue

@@ -506,71 +506,71 @@ export default {
       this.teamSmallTable = smallResult;
     },
     onSave () {
+      let teamTable = this.teamTable;
+      let checkStatus = true;
+      teamTable.forEach(item => {
+        if (
+          item.assistantTeacher30MinSalary < 0 ||
+          item.assistantTeacher90MinSalary < 0 ||
+          item.mainTeacher30MinSalary < 0 ||
+          item.mainTeacher90MinSalary < 0
+        ) {
+          this.$message.error("输入课酬不能为负数");
+          checkStatus = false;
+          return;
+        }
+      });
+      let temps = []
+      this.teamSmallTable.forEach(item => {
+        if (item.v1 < 0 || item.v2 < 0 || item.v3 < 0 || item.v4 < 0 || item.v5 < 0) {
+          this.$message.error("输入课酬不能为负数");
+          checkStatus = false;
+          return;
+        }
+        temps.push({
+          courseScheduleType: item.courseScheduleType,
+          salaryRuleJson: JSON.stringify({ 1: Number(item.v1), 2: Number(item.v2), 3: Number(item.v3), 4: Number(item.v4), 5: Number(item.v5) }),
+          assistantTeacher30MinSalary: 0,
+          assistantTeacher90MinSalary: 0,
+          mainTeacher30MinSalary: 0,
+          mainTeacher90MinSalary: 0,
+          userId: item.userId
+        })
+      })
+      this.vipTable.forEach(item => {
+        console.log(item)
+        if (item.offlineClassesSalary < 0 || item.onlineClassesSalary < 0) {
+          this.$message.error("输入课酬不能为负数");
+          checkStatus = false;
+          return;
+        }
+      });
+      this.accompanyTable.forEach(item => {
+        if (item.mainTeacherSalary < 0) {
+          this.$message.error("输入课酬不能为负数");
+          checkStatus = false;
+          return;
+        }
+        if (!item.mainTeacherSalary.toString()) {
+          this.$message.error("输入网管课课酬");
+          checkStatus = false;
+          return;
+        }
+      });
+      // 判断输入的值是否正确
+      if (!this.startDate) {
+        this.$message.error("请填写生效日期");
+        return;
+      }
+      if (!checkStatus) {
+        return
+      }
       this.$confirm("您确定更改老师课酬", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
       })
         .then(() => {
-          let teamTable = this.teamTable;
-          let checkStatus = true;
-          teamTable.forEach(item => {
-            if (
-              item.assistantTeacher30MinSalary < 0 ||
-              item.assistantTeacher90MinSalary < 0 ||
-              item.mainTeacher30MinSalary < 0 ||
-              item.mainTeacher90MinSalary < 0
-            ) {
-              this.$message.error("输入课酬不能为负数");
-              checkStatus = false;
-              return;
-            }
-          });
-          let temps = []
-          this.teamSmallTable.forEach(item => {
-            if (item.v1 < 0 || item.v2 < 0 || item.v3 < 0 || item.v4 < 0 || item.v5 < 0) {
-              this.$message.error("输入课酬不能为负数");
-              checkStatus = false;
-              return;
-            }
-            temps.push({
-              courseScheduleType: item.courseScheduleType,
-              salaryRuleJson: JSON.stringify({ 1: Number(item.v1), 2: Number(item.v2), 3: Number(item.v3), 4: Number(item.v4), 5: Number(item.v5) }),
-              assistantTeacher30MinSalary: 0,
-              assistantTeacher90MinSalary: 0,
-              mainTeacher30MinSalary: 0,
-              mainTeacher90MinSalary: 0,
-              userId: item.userId
-            })
-          })
-          this.vipTable.forEach(item => {
-            if (item.offlineClassesSalary < 0 && item.onlineClassesSalary < 0) {
-              this.$message.error("输入课酬不能为负数");
-              checkStatus = false;
-              return;
-            }
-          });
-          this.accompanyTable.forEach(item => {
-            if (item.mainTeacherSalary < 0) {
-              this.$message.error("输入课酬不能为负数");
-              checkStatus = false;
-              return;
-            }
-            if (!item.mainTeacherSalary.toString()) {
-              this.$message.error("输入网管课课酬");
-              checkStatus = false;
-              return;
-            }
-          });
-          // 判断输入的值是否正确
-          if (!this.startDate) {
-            this.$message.error("请填写生效日期");
-            return;
-          }
-          if (!checkStatus) {
-            return
-          }
-
           let params = teamTable.concat(temps)
           teacherSalaryBatchUpset({
             teacherDefaultMusicGroupSalaries: params,
@@ -596,9 +596,6 @@ export default {
                       });
                     }
                   });
-                  // if(this.$route.query.type == 'create') {
-
-                  // }
                 }
               });
             }