Merge branch 'feature/dxp' into 'develop'

Feature/dxp

See merge request !157

.vscode/settings.json

-{
-  // 是否允许自定义的snippet片段提示
-  "editor.snippetSuggestions": "top",
-  // vscode默认启用了根据文件类型自动设置tabsize的选项
-  "editor.detectIndentation": false,
-  // 重新设定tabsize
-  "editor.tabSize": 2,
-  // #每次保存的时候自动格式化 
-  "editor.formatOnSave": false,
-  // #每次保存的时候将代码按eslint格式进行修复
-  "eslint.autoFixOnSave": true,
-  "editor.fontWeight": "300",
-  "editor.formatOnType": false,
-  "workbench.iconTheme": "material-icon-theme",
-  "git.confirmSync": false,
-  "team.showWelcomeMessage": false,
-  "window.zoomLevel": 0,
-  // "editor.renderWhitespace": "boundary",
-  "editor.cursorBlinking": "smooth",
-  "editor.minimap.enabled": true,
-  // "editor.minimap.renderCharacters": false,
-  "window.title": "${dirty}${activeEditorMedium}${separator}${rootName}",
-  "editor.codeLens": true,
-  //eslint 代码自动检查相关配置
-  "eslint.enable": true,
-  "eslint.run": "onType",
-  "eslint.options": {
-    "extensions": [
-      ".js",
-      ".vue"
-    ]
-  },
-  // 添加 vue 支持
-  "eslint.validate": [
-    "javascriptreact",
-    "vue",
-    "javascript",
-    {
-      "language": "vue",
-      "autoFix": true
-    },
-    "html",
-    {
-      "language": "html",
-      "autoFix": true
-    }
-  ],
-  //  #让prettier使用eslint的代码格式进行校验 
-  "prettier.eslintIntegration": true,
-  //  #去掉代码结尾的分号 
-  "prettier.semi": false,
-  //  #使用带引号替代双引号 
-  "prettier.singleQuote": true,
-  //  #让函数(名)和后面的括号之间加个空格
-  "javascript.format.insertSpaceBeforeFunctionParenthesis": true,
-  // #这个按用户自身习惯选择 
-  "vetur.format.defaultFormatter.html": "js-beautify-html",
-  // #让vue中的js按编辑器自带的ts格式进行格式化 
-  "vetur.format.defaultFormatter.js": "vscode-typescript",
-  "explorer.confirmDelete": false,
-  "vetur.format.defaultFormatterOptions": {
-    "js-beautify-html": {
-      "wrap_attributes": "force-aligned"
-      // #vue组件中html代码格式化样式
-    }
-  },
-  "files.associations": {
-    "*.cjson": "jsonc",
-    "*.wxss": "css",
-    "*.wxs": "javascript"
-  },
-  "emmet.includeLanguages": {
-    "wxml": "html"
-  },
-  "minapp-vscode.disableAutoConfig": true,
-  "window.menuBarVisibility": "visible",
-  "git.enableSmartCommit": true,
-  "git.autofetch": true,
-  "liveServer.settings.donotShowInfoMsg": true,
-  "[html]": {
-    "editor.defaultFormatter": "vscode.html-language-features"
-  },
-  "javascript.updateImportsOnFileMove.enabled": "always",
-  "workbench.colorTheme": "SynthWave '84",
-  "editor.fontSize": 16,
-  "search.followSymlinks": false,
-  "workbench.sideBar.location": "left",
-  // 是否开启保存自动格式化
-  "zenMode.restore": true,
-  "breadcrumbs.enabled": true,
-  "gitlens.advanced.messages": {
-    "suppressLineUncommittedWarning": true
-  },
-  "javascript.format.placeOpenBraceOnNewLineForControlBlocks": true,
-  "editor.formatOnPaste": false,
-  "editor.cursorStyle": "line-thin",
-  "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": true
-  }
-}

src/views/IM/diagnosis-admin/modal/index.scss

+.agment-box {
+  height: 100%;
+  background: #fff;
+  overflow: hidden;
+  padding: 20px;
+  border-radius: 6px;
+  flex: 3.8;
+}
+.agment-box-left {
+  flex: 1;
+  height: 100%;
+  padding: 20px;
+  margin-left: 12px;
+  background: #fff;
+  border-radius: 6px;
+}
+.agment-left-con {
+  margin-top: 70px;
+  background: #f0f2f5;
+  height: auto;
+  padding: 20px;
+  overflow: hidden;
+  border-radius: 8px;
+}
+.agment-head {
+  border-radius: 5px;
+  display: flex;
+  justify-content: flex-start;
+  align-items: flex-end;
+}
+.agment-head-name {
+  font-size: 20px;
+  color: #02120f;
+  font-weight: 600;
+}
+.agment-head-phone {
+  font-size: 18px;
+  margin-left: 16px;
+}
+.agment-hospital {
+  color: #89888b;
+  font-size: 16px;
+  margin-top: 14px;
+  line-height: 24px;
+}
+.agment-hospital-ks {
+  margin-top: 8px;
+}
+.agment-head-title {
+  font-size: 14px;
+  color: #02120f;
+  margin-top: 19px;
+}
+.agment-head-priority {
+  padding-top: 20px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  .item {
+    width: 42px;
+    height: 32px;
+    border: 1px solid #d9d9d9;
+    border-radius: 8px;
+    text-align: center;
+    line-height: 32px;
+    cursor: pointer;
+  }
+  .active {
+    color: #fff;
+    background: #0d9078;
+    border: none;
+  }
+}
+.agment-left-button {
+  margin-top: 34px;
+  display: flex;
+  justify-content: space-around;
+}
+/deep/.fc-timegrid-event {
+  border-radius: 1px !important;
+}
+/deep/thead .fc-scroller-harness {
+  background: #fcfbff;
+}
+/deep/.fc-col-header-cell-cushion {
+  color: #333;
+  height: 45px;
+  line-height: 45px;
+}
+/deep/.fc .fc-highlight {
+  background: transparent;
+}
+/deep/.fc-header-toolbar {
+  position: absolute;
+  right: 0;
+  top: 25px;
+  width: 20%;
+  display: flex;
+}
+/deep/.fc-toolbar-title {
+  font-size: 6px;
+}
+/deep/.fc-button-primary {
+  background: #fff;
+  color: #02120f;
+  border-color: #d9d9d9;
+  border-radius: 8px;
+  padding: 1.3px 5px;
+}
+/deep/.fc-button-primary:hover {
+  background: #fff;
+  color: #02120f;
+}

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

@@ -395,7 +395,6 @@
       .serviceSchedule-containerInfo {
         position: relative;
         min-width: 1200px;
-        background: #ffffff;
         height: 73px;
         border-radius: 8px;
         display: flex;
@@ -484,12 +483,11 @@
       width: 100%;
       padding: 0 14px;
       .serviceSchedule-containerInfo {
-        background: #ffffff;
         border-radius: 8px;
         height: 100%;
         display: flex;
         align-items: center;
-        padding: 21px 18px 20px 18px;
+        //padding: 21px 18px 20px 18px;
       }
     }
   }