Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/utils/move.js

@@ -0,0 +1,52 @@
+// 鼠标移动滚动位置类
+class Drag {
+  constructor(vm) {
+    this.dragWrap = vm;// 要挂载的容器
+    this._dom = {};
+    this._x = 0;
+    this._y = 0;
+    this._top = 0;
+    this._left = 0;
+    this.move = false;
+    this.down = false;
+    this.init.apply(this, arguments);
+  }
+
+  // 绑定事件
+  init() {
+    this.bindEvent();
+  }
+
+  // 给要素增加鼠标事件mousedown，mouseup，mousemove
+  bindEvent() {
+    var t = this;
+    this.dragWrap.addEventListener('mousedown', function (e) {
+      e && e.preventDefault();
+      if (!t.move) {
+        t.move = false;
+        t.down = true;
+        t._x = e.clientX;
+        t._y = e.clientY;
+        t._top = t.dragWrap.scrollTop;
+        t._left = t.dragWrap.scrollLeft;
+      }
+    });
+    this.dragWrap.addEventListener('mouseup', function (e) {
+      e && e.preventDefault();
+      t.move = false;
+      t.down = false;
+    });
+    this.dragWrap.addEventListener('mousemove', function (e) {
+      if (t.down) {
+        e && e.preventDefault();
+        t.move = true;
+        let x = t._x - e.clientX;
+        let y = t._y - e.clientY;
+        t.dragWrap.scrollLeft = t._left + x;
+        t.dragWrap.scrollTop = t._top + y;
+      }
+    });
+  }
+}
+export default Drag;
+

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,9 +124,9 @@
         <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" @event6="changeScheduleType" @guanliu_show="guanliu" v-show="showtableOne">
+                    @event2="changeSchedule"  @event3="changeWeekDay"  @guanliu_show="guanliu" v-show="showtableOne"  @event6="changeScheduleType">
         </table-data>
-        <!--  -->
+        <!-- @event6="changeScheduleType" -->
       </div>
       <!-- 编辑 -->
        <edit-table-data ref="edittableData"  :week-time="activeName" :partitions-prop="partitions"
@@ -1332,8 +1332,8 @@ export default {
       } else if (this.activeName == 'nextTwoWeek') {
         date = date + 14 * 24 * 60 * 60 * 1000
       }
-      console.log('3333333',this.partition_id,this.activeName,this.week_date);
        this.$router.push({path: '/scheduleTablePrintSix?partition_id=' + this.partition_id + "&weekTime=" + this.activeName+"&week_date="+this.week_date+"&schedule_type="+this.schedule_type})
+
     },
     isShow() {
       let isShow = false