Merge branch 'release' into 'develop'

Release

See merge request com.pica.cloud.education.frontend/pica-admin-consultation!183

package.json

@@ -19,8 +19,10 @@
     "tinypng": "pica-cli-service tinypng"
   },
   "dependencies": {
+    "@fullcalendar/core": "^5.10.0",
     "@fullcalendar/daygrid": "^5.10.0",
     "@fullcalendar/interaction": "^5.10.0",
+    "@fullcalendar/resource-timegrid": "^5.10.0",
     "@fullcalendar/timegrid": "^5.10.0",
     "@fullcalendar/vue": "^5.10.0",
     "axios": "^0.19.2",

src/api/serviceSchedule.js

@@ -58,3 +58,10 @@ export const getDoctorInfo = async (data) => {
     method: 'post',
   });
 };
+export const previewWork = async (data) => {
+  return request({
+    url: '/diagnose/doctor/work/previewWork',
+    method: 'post',
+    data: data,
+  });
+};

src/router/index.js

@@ -74,6 +74,12 @@ const serviceSchedule = (r) =>
     () => r(require('@/views/IM/diagnosis-admin/addEditSchedule.vue')),
     'addEditSchedule'
   );
+  const overviewScheduling = (r) =>
+  require.ensure(
+    [],
+    () => r(require('@/views/IM/diagnosis-admin/overviewScheduling.vue')),
+    'overviewScheduling'
+  );
 const administrators = (r) =>
   require.ensure(
     [],
@@ -144,6 +150,10 @@ const routerConfig = [
         path: '/addEditSchedule',
         component: addEditSchedule,
       },
+      {
+        path: '/overviewScheduling',
+        component: overviewScheduling,
+      },
       {
         path: '/administrators',
         component: administrators,
@@ -161,4 +171,4 @@ if (process.env.VUE_APP_ENV == 'uat') {
     routerConfig: routerConfig,
   };
   handleAllRouter(routerInfo);
-}
+}
\ No newline at end of file

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'];
@@ -296,7 +307,7 @@
         const oneHour = 1 * 60 * 60 * 1000 * 24;
         const timeDifference = (cz / oneHour) | 0;
         const headObj = this.calendarOptions.customButtons.myCustomButton;
-        if (timeDifference > 0 && timeDifference < 7) {
+        if (timeDifference >= 0 && timeDifference < 7) {
           // 过去
           this.week = 1;
           headObj.text = '本周';
@@ -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,

yarn.lock

@@ -1046,7 +1046,7 @@
   dependencies:
     tslib "^2.1.0"
 
-"@fullcalendar/core@~5.10.0":
+"@fullcalendar/core@^5.10.0", "@fullcalendar/core@~5.10.0":
   version "5.10.0"
   resolved "http://192.168.110.93:4873/@fullcalendar%2fcore/-/core-5.10.0.tgz#5e8f46618bf45ddfb16827e68fe11dbd655d529f"
   integrity sha1-Xo9GYYv0Xd+xaCfmj+EdvWVdUp8=
@@ -1071,7 +1071,47 @@
     "@fullcalendar/common" "~5.10.0"
     tslib "^2.1.0"
 
-"@fullcalendar/timegrid@^5.10.0":
+"@fullcalendar/premium-common@~5.10.0":
+  version "5.10.0"
+  resolved "http://192.168.110.93:4873/@fullcalendar%2fpremium-common/-/premium-common-5.10.0.tgz#1abd26483243482eda26ffcf3d65e63d9e1cc64f"
+  integrity sha1-Gr0mSDJDSC7aJv/PPWXmPZ4cxk8=
+  dependencies:
+    "@fullcalendar/common" "~5.10.0"
+    tslib "^2.1.0"
+
+"@fullcalendar/resource-common@~5.10.0":
+  version "5.10.0"
+  resolved "http://192.168.110.93:4873/@fullcalendar%2fresource-common/-/resource-common-5.10.0.tgz#fd40974d1b8540673617c6ac4a0df56eea17a6b6"
+  integrity sha1-/UCXTRuFQGc2F8asSg31buoXprY=
+  dependencies:
+    "@fullcalendar/common" "~5.10.0"
+    "@fullcalendar/premium-common" "~5.10.0"
+    tslib "^2.1.0"
+
+"@fullcalendar/resource-daygrid@~5.10.0":
+  version "5.10.0"
+  resolved "http://192.168.110.93:4873/@fullcalendar%2fresource-daygrid/-/resource-daygrid-5.10.0.tgz#0ee59679e735f924164c1d208e5459bbaf3af920"
+  integrity sha1-DuWWeec1+SQWTB0gjlRZu686+SA=
+  dependencies:
+    "@fullcalendar/common" "~5.10.0"
+    "@fullcalendar/daygrid" "~5.10.0"
+    "@fullcalendar/premium-common" "~5.10.0"
+    "@fullcalendar/resource-common" "~5.10.0"
+    tslib "^2.1.0"
+
+"@fullcalendar/resource-timegrid@^5.10.0":
+  version "5.10.0"
+  resolved "http://192.168.110.93:4873/@fullcalendar%2fresource-timegrid/-/resource-timegrid-5.10.0.tgz#bdf276bf163670097fbfd0664821822a8d4986f4"
+  integrity sha1-vfJ2vxY2cAl/v9BmSCGCKo1JhvQ=
+  dependencies:
+    "@fullcalendar/common" "~5.10.0"
+    "@fullcalendar/premium-common" "~5.10.0"
+    "@fullcalendar/resource-common" "~5.10.0"
+    "@fullcalendar/resource-daygrid" "~5.10.0"
+    "@fullcalendar/timegrid" "~5.10.0"
+    tslib "^2.1.0"
+
+"@fullcalendar/timegrid@^5.10.0", "@fullcalendar/timegrid@~5.10.0":
   version "5.10.0"
   resolved "http://192.168.110.93:4873/@fullcalendar%2ftimegrid/-/timegrid-5.10.0.tgz#7177914bdc5a6c58ec4af851520b12eb8c480141"
   integrity sha1-cXeRS9xabFjsSvhRUgsS64xIAUE=