0707commit

src/Global.js

@@ -317,7 +317,28 @@ turnResToOption = function (data) {
     });
     return ids
 };
-
+turnResShopAcrossOption = function (data) {
+    if (!data) return false
+    let ids = data.map(item => {
+        return {
+            label: item.group_name,
+            key: item.group_id,
+            value: item.group_id,
+        }
+    });
+    return ids
+};
+turnResToOption = function (data) {
+    if (!data) return false
+    let ids = data.map(item => {
+        return {
+            label: item.user_name + ' ' + item.usercode,
+            key: item.uu_user_id,
+            value: item.uu_user_id,
+        }
+    });
+    return ids
+};
 turnResToOptionByViper = function (data) {
     if (!data) return false;
     let ids = data.map(item => {
@@ -357,7 +378,7 @@ turnResToOptionByRegionDev = function (data) {
     let ids = data.map(item => {
         return {
             label: item.eq_name,
-            key: item.eqsn,
+            key: item.uu_eq_id,
             value: item.uu_eq_id
         }
     });
@@ -367,10 +388,9 @@ turnResToOptionByTempUser = function (data) {
     if (!data) return false;
     let ids = data.map(item => {
         return {
-            label: item.UserName + ' ' + item.Phone,
-            key: parseInt(item.TuId),
-            value: parseInt(item.TuId),
-            RemainHour: parseInt(item.RemainHour),
+            label: item.user_name + ' ' + item.usercode,
+            key: item.uu_tu_id,
+            value: item.uu_tu_id
         }
     });
     return ids
@@ -378,11 +398,11 @@ turnResToOptionByTempUser = function (data) {
 
 turnResToOptionByCoach = function (data) {
     if (!data) return false;
-    let ids = data.map((item,index) => {
+    let ids = data.map((item, index) => {
         return {
             label: item.Name + ' ' + item.Phone,
-            key: item.Id,
-            value: item.Id,
+            key: item.Id.toString(),
+            value: item.Id.toString(),
         }
     });
     return ids
@@ -473,7 +493,7 @@ numberToWeekdays = function (val) {
         case 6:
             return '星期六';
             break;
-        case 0:
+        case 7:
             return '星期天';
             break;
     }

src/views/Class/LessonTableManageEdit.vue

@@ -259,8 +259,7 @@ export default {
         course_type: 1,
         is_classgroup: 0,
         order_minilimit: 0,
-        last_classon: getDate(new Date(), 0, 0, 0),
-        curr_date: getDate(new Date(), 0, 0, 0)
+        last_classon: getDate(new Date(), 0, 0, 0)
       },
       tabs: [
         {
@@ -385,6 +384,7 @@ export default {
     },
     // 选择课程后，获取当前课程的建议上课人数和课时消耗
     getLessonInfo(row) {
+
       let that = this;
       const jsonStr = {
         shopId: localStorage.shopId,
@@ -540,7 +540,6 @@ export default {
           thisRow.begin_str = getHoursAndMin(thisRow.timeLong[0]);
           thisRow.end_str = getHoursAndMin(thisRow.timeLong[1]);
           thisRow.last_classon = nonTfmtDate(thisRow.last_classon);
-          thisRow.curr_date = nonTfmtDate(thisRow.curr_date).toString().substring(0, 10);
           this.$delete(thisRow, 'Base');
           this.$delete(thisRow, 'SpdId');
           planRs.push(thisRow);
@@ -614,6 +613,7 @@ export default {
       ];
 
     },
+    // 检查数据
     checkData() {
       let res = true
       for (let i = 0; i < this.tabs.length; i++) {
@@ -623,20 +623,12 @@ export default {
             let lessonIndex = j + 1;
             this.$message.error(days + '第' + lessonIndex + '节课有课程未选择，请选择后再提交')
             res = false
-            break;
+            return
           }
         }
       }
       return res
     },
-    // 检查数据
-    checkData2() {
-      // todo
-      let tableDate = this.tabs;
-      tableDate.map(function (item) {
-        console.log(item);
-      })
-    },
     // 新增一行
     addRow() {
       // 读取当前周几

src/views/Class/LessonTableTemplateEdit.vue

@@ -529,7 +529,7 @@ export default {
             let lesson_index = j + 1;
             this.$message.error(days + '第' + lesson_index + '节课有课程未选择，请选择后再提交');
             res = false;
-            break;
+            return;
           }
         }
       }