提交代码

src/views/IM/diagnosis-admin/modal/newScheduling.vue

@@ -12,11 +12,11 @@
     <div
       ref="agment"
       class="agment-box"
-      :class="{ w2: week == 2, w3: week == 3 }"
+      :class="{'w2':week==2,'w3':week==3}"
     >
       <FullCalendar :options="calendarOptions" />
     </div>
-    <div
+    <div    
       class="agment-box-left"
       :style="{ height: scrollerHeight }"
     >
@@ -24,7 +24,7 @@
         <div
           v-if="week == 2"
           class="ag-left1"
-        />
+        /> 
         <!-- v-if="week == 2" -->
         <div
           v-if="week == 3"
@@ -48,11 +48,13 @@
           {{ this.schedulingTypeValue.departmentName }}
         </div>
       </div>
-      <div style="margin-top: 24px">
+      <div
+        style="margin-top: 24px"
+      >
         <p class="agment-head-title">
           选择匹配优先级
         </p>
-        <div :class="this.schedulingType == 3 ? 'agment-head-none' : ''">
+        <div :class="this.schedulingType == 3 ? 'agment-head-none' : '' ">
           <div class="agment-head-priority">
             <p
               v-for="(item, index) in createList"
@@ -110,9 +112,9 @@
     },
     data() {
       return {
-        id: '',
-        doctorId: '',
-        schedulingTypeValue: {},
+        id:'',
+        doctorId:'',
+        schedulingTypeValue:{},
         schedulingType: 1, // 1 新增  2 编辑  3 查看
         createList: [],
         listDate: [],
@@ -189,30 +191,31 @@
         workingTicketVisible: false, // 工作表票详情页面
         scrollerHeight: 0,
         loading: false,
-        isDoIt: false,
+        isDoIt:false
       };
     },
     watch: {
       week(newV, oldV) {
-        // if (this.haveWeek.indexOf(newV) == -1) {
-        //   this.haveWeek.push(newV);
-        //   this.handleInitSearch();
-        // }
-        if (newV !== oldV) {
+        console.log(newV, oldV, 'newV, oldV');
+        if (this.haveWeek.indexOf(newV) == -1) {
+          this.haveWeek.push(newV);
           this.handleInitSearch();
-          this.saveDoctoreScheduling(2);
+        }
+        if(newV !== oldV) {
+          this.handleInitSearch();
+          this.saveDoctoreScheduling(2, oldV);
         }
       },
     },
     created() {
       this.schedulingType = this.$route.query.type || 1;
       this.id = this.$route.query.id;
-      (this.doctorId = this.$route.query.doctorId),
+      this.doctorId = this.$route.query.doctorId,
       getDoctorInfo({ id: this.id }).then((res) => {
         if (res.code == '000000') {
           this.schedulingTypeValue = res.data;
           this.currentIndex = res.data.level;
-        } else {
+        }else{
           this.$toast(res.message);
         }
       });
@@ -223,6 +226,7 @@
       });
     },
     mounted() {
+      console.log(this.calendarOptions.events, 'this.calendarOptions.events');
       this.scrollerHeight = this.$refs.agment.clientHeight + 'px';
       // console.log(this.$refs.agment.clientHeight, 'this.$refs.agment.offsetHeight;');
       this.init();
@@ -249,7 +253,8 @@
       },
       handleInitSearch(isReset) {
         if (isReset) {
-          this.calendarOptions.events = [];
+          this.calendarOptions.events = this.calendarOptions.events.filter((v) => (v.week !== this.week));
+          console.log(this.calendarOptions.events);
         }
         const objParms = {};
         objParms.doctorId = this.doctorId;
@@ -258,6 +263,7 @@
         // this.currentIndex = this.schedulingTypeValue.level;
         dutyRosterQuery(objParms).then((res) => {
           if (res.code == '000000') {
+            this.calendarOptions.events = [];
             this.handleInitData(res.data);
           } else {
             this.$toast(res.message);
@@ -268,12 +274,14 @@
         var newDate = null;
         if (this.schedulingType != 3) {
           newDate = [].concat(data.noAcceptList);
+          console.log(newDate, 'newDate');
         } else {
           var acceptList = [];
           data.acceptList.forEach((item) => {
             item.type = 88;
             acceptList.push(item);
           });
+          console.log(data.acceptList, 'data.acceptList');
           newDate = [].concat(acceptList, data.noAcceptList);
         }
         // const keyAll = ['end', 'endStr', 'id', 'start', 'startStr'];
@@ -284,6 +292,7 @@
           dataObj['id'] = id;
           dataObj['end'] = item.endTime;
           dataObj['start'] = item.startTime;
+          console.log(item.type);
           dataObj['type'] = item.type;
           if (item.type == 88) {
             dataObj['color'] = '#FFEDE9';
@@ -339,7 +348,9 @@
           .then((_) => {
             console.log(_);
             const index = this.getIdDeleteData(event.event.id);
-            return this.calendarOptions.events.splice(index, 1);
+            this.isDoIt = true;
+            this.calendarOptions.events.splice(index, 1);
+            console.log(this.calendarOptions.events);
           })
           .catch((_) => {
             console.log(_);
@@ -411,27 +422,33 @@
         return indexObj;
       },
       handlePriority(index) {
+        this.isDoIt = true;
         this.currentIndex = index;
       },
       resetDoctoreScheduling() {
         this.handleInitSearch(true);
       },
-      saveDoctoreScheduling(type) {
-        if (this.isDoIt) {
+      saveDoctoreScheduling(type, weekV = 0) {
+        if(this.isDoIt) {
+          console.log(this.week, 'this.week', weekV);
           this.loading = true;
           const objParms = {};
-          objParms.week = this.week;
+          objParms.week = weekV ? weekV : this.week;
           objParms.workId = this.schedulingTypeValue.id;
           objParms.level = this.currentIndex;
           objParms.list = [];
           const data = this.calendarOptions.events;
+          console.log(data, 'data');
           data.forEach((item) => {
-            // if (item.week == this.week) {
-            const obj = {};
-            obj.startTime = this.dateFormat('YYYY-mm-dd HH:MM:SS', item.start);
-            obj.endTime = this.dateFormat('YYYY-mm-dd HH:MM:SS', item.end);
-            objParms.list.push(obj);
-          // }
+            console.log(item.week == (weekV ? weekV : this.week));
+            if (item.week == (weekV ? weekV : this.week)) {
+              console.log(item.week, this.week, weekV, 'this.week');
+              const obj = {};
+              obj.startTime = this.dateFormat('YYYY-mm-dd HH:MM:SS', item.start);
+              obj.endTime = this.dateFormat('YYYY-mm-dd HH:MM:SS', item.end);
+              console.log(obj, 'obj');
+              objParms.list.push(obj);
+            }
           });
           saveDutyRoster(objParms).then((res) => {
             if (res.code === '000000') {
@@ -439,10 +456,10 @@
               // this.handleInitSearch(true);
               // this.$router.go(0);
               this.loading = false;
-              if (type == 1) {
+              if(type == 1) {
                 this.$message({
                   message: '排班保存成功',
-                  type: 'success',
+                  type: 'success'
                 });
               }
               this.isDoIt = false;