Merge branch 'feature/dxp' into 'develop'

Feature/dxp

See merge request !185

src/components/list/table-serviceSchedule.vue

@@ -271,20 +271,20 @@
 <style lang="scss" scoped>
 .table-serviceSchedule {
   .el-table {
-    .nothing-data{
+    .nothing-data {
       display: inline-grid;
       padding-top: 100px;
-      img{
+      img {
         width: 338px;
         height: 159px;
       }
-      .nothing-data-title{
+      .nothing-data-title {
         padding-top: 40px;
         padding-bottom: 150px;
         font-size: 16px;
         font-family: PingFangSC-Regular, PingFang SC;
         font-weight: 400;
-        color: #89888B;
+        color: #89888b;
         line-height: 22px;
       }
     }

src/router/index.js

@@ -68,13 +68,13 @@ const serviceSchedule = (r) =>
     () => r(require('@/views/IM/diagnosis-admin/serviceSchedule.vue')),
     'serviceSchedule'
   );
-  const addEditSchedule = (r) =>
+const addEditSchedule = (r) =>
   require.ensure(
     [],
     () => r(require('@/views/IM/diagnosis-admin/addEditSchedule.vue')),
     'addEditSchedule'
   );
-  const overviewScheduling = (r) =>
+const overviewScheduling = (r) =>
   require.ensure(
     [],
     () => r(require('@/views/IM/diagnosis-admin/overviewScheduling.vue')),
@@ -171,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

@@ -361,6 +361,7 @@
         const objParms = {};
         objParms.doctorId = this.doctorId;
         objParms.week = type == 1 ? copyWeek : this.week;
+        // type == 1 表示 copy
         objParms.workId = this.id;
         console.log(objParms.week, 'objParms.week');
         dutyRosterQuery(objParms).then((res) => {
@@ -371,16 +372,28 @@
               this.getWeekMax(res.data);
             }
             this.handleInitData(res.data);
-            if (res.data.countList.length > 0 && type != 1) {
-              const newAR = res.data.countList.map((item, index) => {
-                if (item.weekDay == this.maxList[index].weekDay) {
-                  return {
-                    preNum: item.preNum,
-                  };
-                }
-              });
-              this.maxList = newAR;
-              console.log(newAR, 'newAR');
+            if (type != 1) {
+              if (res.data.countList.length > 0) {
+                const newAR = res.data.countList.map((item, index) => {
+                  if (item.weekDay == this.maxList[index].weekDay) {
+                    return {
+                      preNum: item.preNum,
+                    };
+                  }
+                });
+                this.maxList = newAR;
+                console.log(newAR, 'newAR');
+              } else {
+                this.maxList = [
+                  { preNum: 0 },
+                  { preNum: 0 },
+                  { preNum: 0 },
+                  { preNum: 0 },
+                  { preNum: 0 },
+                  { preNum: 0 },
+                  { preNum: 0 },
+                ];
+              }
             }
           } else {
             this.$toast(res.message);