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

src/components/course/mateitem.vue

 <style></style>
 <template>
   <div>
-    <el-collapse
-      v-if="dayData && dayData.SubList && dayData.SubList.length > 0"
-    >
-      <el-collapse-item
-        v-for="(subItem, subIndex) in dayData.SubList"
-        :key="subIndex"
-        :name="subIndex"
-      >
+    <el-collapse v-if="dayData && dayData.SubList && dayData.SubList.length > 0">
+      <el-collapse-item v-for="(subItem, subIndex) in dayData.SubList" :key="subIndex" :name="subIndex">
         <template slot="title">
           <div class="plan_Tdiv">
-            <span
-              v-if="subItem.TimeStr === '早上'"
-              class="commonTimeStr greenTime"
-              >{{ subItem.TimeStr }}</span
-            >
-            <span
-              v-if="subItem.TimeStr === '下午'"
-              class="commonTimeStr blueTime"
-              >{{ subItem.TimeStr }}</span
-            >
-            <span
-              v-if="subItem.TimeStr === '晚上'"
-              class="commonTimeStr orangeTime"
-              >{{ subItem.TimeStr }}</span
-            >
-            <q-badge
-              rounded
-              color="orange"
-              label="试听课"
-              v-if="subItem.ClassType == 2"
-              style="margin-left:5px;font-size:10px"
-            />
-            <q-badge
-              rounded
-              color="cyan-7"
-              label="预约课"
-              v-if="subItem.ClassType == 3"
-              style="margin-left:5px;font-size:10px"
-            />
+            <span v-if="subItem.TimeStr === '早上'" class="commonTimeStr greenTime">{{ subItem.TimeStr }}</span>
+            <span v-if="subItem.TimeStr === '下午'" class="commonTimeStr blueTime">{{ subItem.TimeStr }}</span>
+            <span v-if="subItem.TimeStr === '晚上'" class="commonTimeStr orangeTime">{{ subItem.TimeStr }}</span>
+            <q-badge rounded color="orange" label="试听课" v-if="subItem.ClassType == 2"
+              style="margin-left:5px;font-size:10px" />
+            <q-badge rounded color="cyan-7" label="预约课" v-if="subItem.ClassType == 3"
+              style="margin-left:5px;font-size:10px" />
             <span style="color:red;margin:0 5px;">{{
               subItem.TeacherName
             }}</span>
             <span>[{{ subItem.RoomName }}]</span>
-            <template
-              v-if="
+            <template v-if="
                 subItem.ClassType == 3 &&
                   subItem.AppointState == 1 &&
                   isShowTag(subItem.GuestList, subItem.ScrollMinNum)
-              "
-            >
+              ">
               <q-badge color="red" rounded style="margin-left:5px;">
                 未
               </q-badge>
@@ -63,10 +33,7 @@
             {{ subItem.StartTime }}-{{ subItem.EndTime }}
           </div>
         </div>
-        <div
-          class="plan_Inner"
-          v-if="subItem.ClassName && subItem.ClassType !== 3"
-        >
+        <div class="plan_Inner" v-if="subItem.ClassName && subItem.ClassType !== 3">
           <div class="plan_LeftTitle">班级：</div>
           <div class="plan_RightInner">{{ subItem.ClassName }}</div>
         </div>
@@ -74,17 +41,11 @@
           <div class="plan_LeftTitle">课程名称：</div>
           <div class="plan_RightInner">{{ subItem.CourseName }}</div>
         </div>
-        <div
-          class="plan_Inner"
-          v-if="subItem.GuestList && subItem.GuestList.length > 0"
-        >
+        <div class="plan_Inner" v-if="subItem.GuestList && subItem.GuestList.length > 0">
           <div class="plan_LeftTitle">学生名称：</div>
           <div class="plan_RightInner">
-            <span
-              style="margin-right:10px;"
-              v-for="(tItem, tIndex) in subItem.GuestList"
-              :key="tIndex"
-              >{{ tItem.GuestName }}
+            <span style="margin-right:10px;" v-for="(tItem, tIndex) in subItem.GuestList"
+              :key="tIndex">{{ tItem.GuestName }}
               <span v-if="tItem.AppointType == 2">(补)</span>
               <span v-if="tItem.AppointType == 3">(重)</span>
             </span>
@@ -99,11 +60,7 @@
           </div>
         </template>
         <template v-else>
-          <div
-            class="plan_Inner"
-            style="align-items:center;"
-            v-if="subItem.CompleteProgress >= 0"
-          >
+          <div class="plan_Inner" style="align-items:center;" v-if="subItem.CompleteProgress >= 0">
             <div class="plan_LeftTitle">课程进度：</div>
             <div class="plan_RightInner">
               <el-progress :percentage="subItem.CompleteProgress"></el-progress>
@@ -113,18 +70,10 @@
         <template v-if="subItem.ClassType == 3">
           <div class="plan_Inner">
             <div class="plan_LeftTitle">课程状态：</div>
-            <div
-              class="plan_RightInner"
-              style="color: rgb(239, 83, 80);"
-              v-if="subItem.AppointState == 1"
-            >
+            <div class="plan_RightInner" style="color: rgb(239, 83, 80);" v-if="subItem.AppointState == 1">
               待确认
             </div>
-            <div
-              class="plan_RightInner"
-              style="color: rgb(33, 186, 69);"
-              v-if="subItem.AppointState == 2"
-            >
+            <div class="plan_RightInner" style="color: rgb(33, 186, 69);" v-if="subItem.AppointState == 2">
               已确认
             </div>
           </div>
@@ -133,8 +82,7 @@
             <div class="plan_RightInner">
               <span style="color: rgb(33, 186, 69);">{{
                 subItem.ScrollMinNum
-              }}</span
-              >人
+              }}</span>人
             </div>
           </div>
         </template>
@@ -143,33 +91,34 @@
   </div>
 </template>
 <script>
-export default {
-  props: {
-    dayData: {
-      type: Object,
-      default: null
-    }
-  },
-  components: {},
-  data() {
-    return {};
-  },
-  created() {},
-  mounted() {},
-  methods: {
-    isShowTag(arr, min) {
-      let n = 0;
-      arr.map(e => {
-        if (e.AppointType !== 3) {
-          n += 1;
+  export default {
+    props: {
+      dayData: {
+        type: Object,
+        default: null
+      }
+    },
+    components: {},
+    data() {
+      return {};
+    },
+    created() {},
+    mounted() {},
+    methods: {
+      isShowTag(arr, min) {
+        let n = 0;
+        arr.map(e => {
+          if (e.AppointType !== 3) {
+            n += 1;
+          }
+        });
+        if (n < min) {
+          return true;
+        } else {
+          return false;
         }
-      });
-      if (n < min) {
-        return true;
-      } else {
-        return false;
       }
     }
-  }
-};
+  };
+
 </script>

src/components/work/commission.vue

@@ -9,7 +9,6 @@
         <!-- <div class="tab" :class="{'active-tab':tab==2}" @click="checkTab(2)">年度
               <div class='dot' v-show="tab==2"></div>
             </div> -->
-
       </div>
       <div>
         <el-date-picker v-model="msg.Month" value-format="yyyy-MM" size="small" :type="elDateType" style="width:110px"
@@ -240,7 +239,7 @@
           style: 'color: #A4A5B7',
         }, {
           name: 'Rate',
-          label: '比例',
+          label: '发放比例',
           align: 'center',
           field: "Rate",
           headerStyle: 'color: #A4A5B7;width: 100px',

src/pages/teacher/components/mateitem.vue

@@ -14,6 +14,15 @@
             <q-badge rounded color="cyan-7" label="预约课" v-if="subItem.ClassType==3" style="margin-left:5px;font-size:10px"/>
             <span style="color:red;margin:0 5px;">{{subItem.TeacherName}}</span>
             <span>[{{subItem.RoomName}}]</span>
+            <template v-if="
+                subItem.ClassType == 3 &&
+                  subItem.AppointState == 1 &&
+                  isShowTag(subItem.GuestList, subItem.ScrollMinNum)
+              ">
+              <q-badge color="red" rounded style="margin-left:5px;">
+                未
+              </q-badge>
+            </template>
           </div>
         </template>
         <div @click="goUrl(subItem)" style="cursor:pointer;">
@@ -73,6 +82,19 @@
             id: item.Id
           });
         }
+      },
+      isShowTag(arr, min) {
+        let n = 0;
+        arr.map(e => {
+          if (e.AppointType !== 3) {
+            n += 1;
+          }
+        });
+        if (n < min) {
+          return true;
+        } else {
+          return false;
+        }
       }
     }
   }