Merge branch 'feature/dxp' into 'release-new'

Feature/dxp

See merge request !223

src/components/common/diagnosis-doctor.vue

@@ -253,7 +253,11 @@
     created() {
       vm = this;
       this.getDoctorList();
-      if (!(this.doctorList || []).some(item => { item.doctorId == this.formData.receptionId;})) {
+      if (
+        !(this.doctorList || []).some((item) => {
+          item.doctorId == this.formData.receptionId;
+        })
+      ) {
         this.refreshData();
       }
     },

src/components/common/diagnosis-time.vue

@@ -143,12 +143,13 @@
         chooseTimeIndex: 1000,
         pickerOptionsStart: {
           disabledDate: (time) => {
-            const now = new Date(); 
+            const now = new Date();
             const day = now.getDay();
             const oneDayTime = 24 * 60 * 60 * 1000;
-            const SundayTime = ((7 - day) * oneDayTime) + 21 * 24 * 60 * 60 * 1000; 
+            const SundayTime = (7 - day) * oneDayTime + 21 * 24 * 60 * 60 * 1000;
             return (
-              time.getTime() + 1 * 24 * 60 * 60 * 1000 < new Date() || time.getTime() > new Date().getTime() + SundayTime
+              time.getTime() + 1 * 24 * 60 * 60 * 1000 < new Date() ||
+              time.getTime() > new Date().getTime() + SundayTime
             );
           },
         },
@@ -179,11 +180,13 @@
         this.getLeisureTime(this.chooseTime);
       },
       nextChangeData() {
-        const now = new Date(); 
+        const now = new Date();
         const day = now.getDay();
         const SundayTime = 7 - day;
         console.log(SundayTime, 'SundayTime');
-        const maxDate = dayjs(new Date()).add((SundayTime + 20), 'day').unix();
+        const maxDate = dayjs(new Date())
+          .add(SundayTime + 20, 'day')
+          .unix();
         if (dayjs(this.chooseTime).unix() > maxDate) {
           this.$message({
             message: '时间不能超过28天',
@@ -232,7 +235,7 @@
           })
           .catch(function () {
             vm.isClick = false;
-            // vm.$message.error(err.message);
+          // vm.$message.error(err.message);
           });
       },
       cancel() {

src/components/common/matching-doctor.vue

@@ -124,8 +124,7 @@
           ],
         },
         allTilst: [],
-        allList: {
-        },
+        allList: {},
       };
     },
     watch: {
@@ -251,7 +250,7 @@
         if (checkedNodes.length > 0) {
           this.model.triageDepartmentId = checkedNodes[0].value;
           this.model.triageDepartment = checkedNodes[0].label;
-        }else{
+        } else {
           this.model.triageDepartmentId = '';
           this.model.triageDepartment = '';
         }

src/views/IM/diagnosis-admin/diagnosis-list-new.vue

@@ -532,7 +532,7 @@
     getDepartments,
     diagnoseExport,
     diagnoseList,
-    departmentAll
+    departmentAll,
   } from '@/api/diagnosis';
 
   import MatchComponent from '@/components/common/match';
@@ -658,7 +658,7 @@
         triageDepartment: '',
         departmentId: '',
         allTilst: [],
-        allList: {}
+        allList: {},
       };
     },
     watch: {
@@ -676,7 +676,7 @@
     },
     created() {
       vm = this;
-      // this.getDep();
+    // this.getDep();
     },
     mounted() {
       this.setTableHeight();
@@ -729,15 +729,18 @@
 
         console.log(arr);
         this.allTilst = arr;
-      },      
+      },
       changeDepart() {
         const checkedNodes = this.$refs['cascader'].getCheckedNodes();
         if (checkedNodes.length > 0) {
           this.searchParam.triageDepartmentId = checkedNodes[0].value;
-        }else{
+        } else {
           this.searchParam.triageDepartmentId = '';
         }
-        console.log(this.searchParam.triageDepartmentId, 'this.searchParam.triageDepartmentId');
+        console.log(
+          this.searchParam.triageDepartmentId,
+          'this.searchParam.triageDepartmentId'
+        );
       },
       changeStartTime(time) {
         this.rangeTimeData = time

src/views/IM/diagnosis-admin/overviewScheduling.vue

@@ -51,7 +51,7 @@
                 }"
               >{{ data.text }}</span>
             </template>
-          </el-cascader>          
+          </el-cascader>
           <el-date-picker
             v-model="dateTime"
             class="serviceSchedule_dateTime"
@@ -268,7 +268,7 @@
         const checkedNodes = this.$refs['cascader'].getCheckedNodes();
         if (checkedNodes.length > 0) {
           this.departmentId = checkedNodes[0].value;
-        }else{
+        } else {
           this.departmentId = '';
         }
       },

src/views/IM/diagnosis-admin/serviceSchedule.vue

@@ -284,7 +284,7 @@
         const checkedNodes = this.$refs['cascader'].getCheckedNodes();
         if (checkedNodes.length > 0) {
           this.searchParam.departmentId = checkedNodes[0].value;
-        }else{
+        } else {
           this.searchParam.departmentId = '';
         }
       },