新分支

src/xt_pages/user/doctorAdvice.vue

@@ -201,7 +201,9 @@
               <span class="el-dropdown-link" v-if="scope.row.parent_id == 0">
                 <span v-if="scope.row.frequency_type ==1" style="color:#1AAD19"> {{ scope.row.advice_name}}</span>
                 <span v-if="scope.row.frequency_type ==2 && scope.row.day_count>0" style="color:#1AAD19"> {{ scope.row.advice_name}}</span>
+                <span v-if="scope.row.frequency_type ==2 && scope.row.day_count==0" style="color:#1AAD19"> {{ scope.row.advice_name}}</span>
                 <span v-if="scope.row.frequency_type ==3 && scope.row.week_day!=''" style="color:#1AAD19"> {{ scope.row.advice_name}}</span>
+                <span v-if="scope.row.frequency_type ==3 && scope.row.week_day==''" > {{ scope.row.advice_name}}</span>
                 <span v-if="scope.row.frequency_type ==0"> {{ scope.row.advice_name}}</span>
                 <i class="el-icon-arrow-down el-icon--right"></i>
               </span>

src/xt_pages/workforce/appointment.vue

@@ -124,7 +124,7 @@
         <table-data ref="tableData"  :week-time="activeName" :partitions-prop="partitions"
                     :schedule-zone-row-prop="scheduleZoneRow"
                     :schedule-zone-prop="scheduleZone" title="" @event1="changePartition"
-                    @event2="changeSchedule"  @event3="changeWeekDay"  @guanliu_show="guanliu" v-show="showtableOne">
+                    @event2="changeSchedule"  @event3="changeWeekDay"  @guanliu_show="guanliu" v-show="showtableOne"  @event6="changeScheduleType">
         </table-data>
         <!-- @event6="changeScheduleType" -->
       </div>
@@ -4898,7 +4898,7 @@ export default {
 
     changeScheduleType(val){
       // console.log('444444');
-      // this.schedule_type = val
+      this.schedule_type = val
     },
 
     changeWeek(val) {