Merge branch 'feature/jq' into 'release'

Feature/jq

See merge request !179

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

@@ -84,7 +84,7 @@
           type="primary"
           round
           style="width: 110px"
-          @click="saveDoctoreScheduling"
+          @click="saveDoctoreScheduling(1)"
         >
           保存
         </el-button>
@@ -191,14 +191,20 @@
         workingTicketVisible: false, // 工作表票详情页面
         scrollerHeight: 0,
         loading: false,
+        isDoIt:false
       };
     },
     watch: {
-      week(newV) {
+      week(newV, oldV) {
+        console.log(newV, oldV, 'newV, oldV');
         if (this.haveWeek.indexOf(newV) == -1) {
           this.haveWeek.push(newV);
           this.handleInitSearch();
         }
+        if(newV !== oldV) {
+          this.handleInitSearch();
+          this.saveDoctoreScheduling(2, oldV);
+        }
       },
     },
     created() {
@@ -220,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();
@@ -246,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;
@@ -255,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);
@@ -265,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'];
@@ -337,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(_);
@@ -368,6 +381,7 @@
         this.calendarOptions.events.push(dataObj);
       },
       selectAllow(info) {
+        this.isDoIt = true;
         const startDay = new Date(info.start).getDay();
         const endDay = new Date(info.end).getDay();
         if (startDay != endDay) {
@@ -408,42 +422,53 @@
         return indexObj;
       },
       handlePriority(index) {
+        this.isDoIt = true;
         this.currentIndex = index;
       },
       resetDoctoreScheduling() {
         this.handleInitSearch(true);
       },
-      saveDoctoreScheduling() {
-        this.loading = true;
-        const objParms = {};
-        objParms.week = this.week;
-        objParms.workId = this.schedulingTypeValue.id;
-        objParms.level = this.currentIndex;
-        objParms.list = [];
-        const data = this.calendarOptions.events;
-        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);
-          }
-        });
-        saveDutyRoster(objParms).then((res) => {
-          if (res.code === '000000') {
-            // this.$toast(res.message);
-            // this.handleInitSearch(true);
-            // this.$router.go(0);
-            this.loading = false;
-            this.$message({
-              message: '排班保存成功',
-              type: 'success'
-            });
-          } else {
-            // this.$toast(res.message);
-            this.$message.error(res.message || '排班保存失败');
-          }
-        });
+      saveDoctoreScheduling(type, weekV = 0) {
+        if(this.isDoIt) {
+          console.log(this.week, 'this.week', weekV);
+          this.loading = true;
+          const objParms = {};
+          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) => {
+            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') {
+              // this.$toast(res.message);
+              // this.handleInitSearch(true);
+              // this.$router.go(0);
+              this.loading = false;
+              if(type == 1) {
+                this.$message({
+                  message: '排班保存成功',
+                  type: 'success'
+                });
+              }
+              this.isDoIt = false;
+            } else {
+              // this.$toast(res.message);
+              this.$message.error(res.message || '排班保存失败');
+            }
+          });
+        }
       },
       dateFormat(fmt, date2) {
         const date = new Date(date2);

vue.config.js

@@ -71,7 +71,7 @@ module.exports = {
     port: 8080,
     proxy: {
       '/proxy': {
-        target: 'https://test1-sc.yunqueyi.com/',
+        target: 'https://dev-sc.yunqueyi.com/',
         ws: false,
         changeOrigin: true,
         secure: true,