Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/App.vue

@@ -19,6 +19,7 @@ export default {
   },
 
   created(){
+    
     // getOrgs().then(response => {
     //   if (response.data.state === 1) {
     //     var creator = response.data.data.creator;

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -1117,18 +1117,15 @@
     height: 100%;
     display: flex;
     flex-direction: column;
-
-  .mainLeft {
-    width: 200px;
-    height: 100%;
-    display: flex;
-    flex-direction: column;
-    padding-top: 20px;
-
-  .el-radio {
-    margin-right: 5px;
-  }
-
+    .mainLeft {
+      width: 200px;
+      height: 100%;
+      display: flex;
+      flex-direction: column;
+      padding-top: 20px;
+    .el-radio {
+      margin-right: 5px;
+    }
   }
   .mainCell {
     height: 36px;
@@ -1253,10 +1250,14 @@
     border-bottom: 1px solid #e5e5e5;
     border-right: 1px solid #e5e5e5;
     width: 100%;
-    height: 38px;
-    line-height: 38px;
-    text-indent: 5px;
+    min-height: 38px;
+    /* line-height: 38px;
+    text-indent: 5px; */
     font-size: 14px;
+    display:flex;
+    align-items:center;
+    padding:5px;
+    box-sizing:border-box;
   }
 
   }
@@ -1265,26 +1266,22 @@
 
 <style lang="scss">
   #tab-more {
-
-  .el-icon-close {
-    display: none;
-  }
-
+    .el-icon-close {
+      display: none;
+    }
   }
   .settlementTabs {
-
-  .el-tabs__content {
-    height: 90%;
-  }
-
+    .el-tabs__content {
+      height: 90%;
+    }
   }
   .preTabs {
 
-  .el-tabs__content {
-    flex: 1;
-    overflow-y: auto;
-    padding: 5px 0 5px 5px;
-  }
+    .el-tabs__content {
+      flex: 1;
+      overflow-y: auto;
+      padding: 5px 0 5px 5px;
+    }
 
   }
   .centerDialog{

src/xt_pages/workforce/components/nextTableWeeks.vue

@@ -231,7 +231,7 @@ export default {
     getNextScheduleWeekDay() {
         const start = moment().weekday(1).format('YYYY-MM-DD'); //本周一
         const end = moment().weekday(7).format('YYYY-MM-DD')
-        console.log("start",moment(start).unix())
+        // console.log("start",moment(start).unix())
       
         // const params = {
         //   start_time:moment().week(moment().week() + 1).startOf('week').unix(),