Browse Source

新分支

28169 1 year ago
parent
commit
8e625f0912
2 changed files with 4 additions and 2 deletions
  1. 2 0
      src/xt_pages/user/doctorAdvice.vue
  2. 2 2
      src/xt_pages/workforce/appointment.vue

+ 2 - 0
src/xt_pages/user/doctorAdvice.vue View File

201
               <span class="el-dropdown-link" v-if="scope.row.parent_id == 0">
201
               <span class="el-dropdown-link" v-if="scope.row.parent_id == 0">
202
                 <span v-if="scope.row.frequency_type ==1" style="color:#1AAD19"> {{ scope.row.advice_name}}</span>
202
                 <span v-if="scope.row.frequency_type ==1" style="color:#1AAD19"> {{ scope.row.advice_name}}</span>
203
                 <span v-if="scope.row.frequency_type ==2 && scope.row.day_count>0" style="color:#1AAD19"> {{ scope.row.advice_name}}</span>
203
                 <span v-if="scope.row.frequency_type ==2 && scope.row.day_count>0" style="color:#1AAD19"> {{ scope.row.advice_name}}</span>
204
+                <span v-if="scope.row.frequency_type ==2 && scope.row.day_count==0" style="color:#1AAD19"> {{ scope.row.advice_name}}</span>
204
                 <span v-if="scope.row.frequency_type ==3 && scope.row.week_day!=''" style="color:#1AAD19"> {{ scope.row.advice_name}}</span>
205
                 <span v-if="scope.row.frequency_type ==3 && scope.row.week_day!=''" style="color:#1AAD19"> {{ scope.row.advice_name}}</span>
206
+                <span v-if="scope.row.frequency_type ==3 && scope.row.week_day==''" > {{ scope.row.advice_name}}</span>
205
                 <span v-if="scope.row.frequency_type ==0"> {{ scope.row.advice_name}}</span>
207
                 <span v-if="scope.row.frequency_type ==0"> {{ scope.row.advice_name}}</span>
206
                 <i class="el-icon-arrow-down el-icon--right"></i>
208
                 <i class="el-icon-arrow-down el-icon--right"></i>
207
               </span>
209
               </span>

+ 2 - 2
src/xt_pages/workforce/appointment.vue View File

124
         <table-data ref="tableData"  :week-time="activeName" :partitions-prop="partitions"
124
         <table-data ref="tableData"  :week-time="activeName" :partitions-prop="partitions"
125
                     :schedule-zone-row-prop="scheduleZoneRow"
125
                     :schedule-zone-row-prop="scheduleZoneRow"
126
                     :schedule-zone-prop="scheduleZone" title="" @event1="changePartition"
126
                     :schedule-zone-prop="scheduleZone" title="" @event1="changePartition"
127
-                    @event2="changeSchedule"  @event3="changeWeekDay"  @guanliu_show="guanliu" v-show="showtableOne">
127
+                    @event2="changeSchedule"  @event3="changeWeekDay"  @guanliu_show="guanliu" v-show="showtableOne"  @event6="changeScheduleType">
128
         </table-data>
128
         </table-data>
129
         <!-- @event6="changeScheduleType" -->
129
         <!-- @event6="changeScheduleType" -->
130
       </div>
130
       </div>
4898
 
4898
 
4899
     changeScheduleType(val){
4899
     changeScheduleType(val){
4900
       // console.log('444444');
4900
       // console.log('444444');
4901
-      // this.schedule_type = val
4901
+      this.schedule_type = val
4902
     },
4902
     },
4903
 
4903
 
4904
     changeWeek(val) {
4904
     changeWeek(val) {