Merge remote-tracking branch 'remotes/origin/dev' into dev_lyj

src/components/FormComponents/CustomForm/FormContent.vue

@@ -186,7 +186,6 @@ export default {
     // 切换不符合筛查条件的显示
     formChange() {
       // 入选，排除标准，一个填写是就不符合筛查条件
-      console.log(this.form)
       let arr = [
         "is_one_year",
         "is_subtotal_history",
@@ -202,6 +201,9 @@ export default {
           flag++
         }
       }
+      if (this.form.is_know && this.form.is_know == 0) {
+        flag = 1
+      }
       if (flag == 0) {
         this.$emit("showError", false)
       } else {

src/components/FormComponents/CustomForm/index.vue

@@ -78,6 +78,7 @@
             >上一步</el-button
           >
         </template>
+        <!-- 下一步按钮 -->
         <template v-if="options.submitBtn">
           <el-button
             type="primary"
@@ -424,6 +425,7 @@ export default {
 }
 .noCol {
   font-size: 12px;
+  margin-left: 12px;
   font-family: AlibabaPuHuiTiR;
   color: #ff4d4f;
 }

src/components/FormComponents/CustomForm/层级关系.md

+```js
+
+!实在是累的没办法了，只能在这里记住这些文件的层级关系
+
+?  FormItemSelf\ FormContent\
+?  FormItemText/              CustomForm/index——————views/screening/FormTab——————ConfigForms————index
+
+
+
+*/
+
+上一步下一步提交按钮触发:在CustomForm/index 最终处理实在ConfigForms以及同级中的mixin
+
+
+
+
+
+
+
+```

src/components/FormComponents/ReadForm/index.vue

@@ -49,10 +49,9 @@
           >
             <template slot="title">
               {{ g.label }}
-              <span
-                v-if="g.label == '二、排除标准'"
-                class="noCol"
-              >{{errorText}}</span>
+              <span v-if="g.label == '二、排除标准'" class="noCol">{{
+                errorText
+              }}</span>
             </template>
             <form-content
               v-if="collapseNames.includes(g.prop)"
@@ -63,7 +62,7 @@
               :is-show-important="isShowImportant"
               @showError="showError"
               :showIndex="g.showIndex"
-              :class="g.showIndex?'simple-form':'index-form'"
+              :class="g.showIndex ? 'simple-form' : 'index-form'"
             ></form-content>
           </el-collapse-item>
         </template>
@@ -160,7 +159,7 @@ export default {
     },
   },
   watch: {
-    formEdit:{
+    formEdit: {
       handler() {
         this.initfields(this.formEdit)
       },
@@ -313,19 +312,19 @@ export default {
       this.$nextTick(() => {
         // 子组件数据初始化完成后
         // setTimeout(() => {
-          this.initfields(this.formEdit)
+        this.initfields(this.formEdit)
         // }, 0)
         if (this.$refs.form && this.$refs.form.clearValidate) {
           this.$refs.form.clearValidate()
         }
-        this.$forceUpdate();
+        this.$forceUpdate()
       })
     },
     // 绑定部分值(此时表单已渲染)
     initfields(obj) {
       for (let k in obj) {
         // if (this.form.hasOwnProperty(k)) {
-          this.form[k] = obj[k]
+        this.form[k] = obj[k]
         // }
       }
     },
@@ -420,10 +419,10 @@ export default {
   // }
 }
 .simple-form {
-   ::v-deep {
-      .el-form-item__label {
-        margin-left: 20px;
-      }
-   }
+  ::v-deep {
+    .el-form-item__label {
+      margin-left: 20px;
+    }
+  }
 }
 </style>

src/components/layout/index.vue

@@ -44,9 +44,16 @@
         </div>
       </div>
       <div v-if="allianceToken" class="userInfo">
-        <div class="white"></div>
-        <div class="text">欢迎，{{ userInfo.name }}</div>
-        <div class="exit" @click="logout">退出</div>
+        <div class="top">
+          <div class="text">欢迎，{{ userInfo.name }}</div>
+          <div class="exit" @click="logout">退出</div>
+        </div>
+        <div class="bot" @click="$router.push('/')">
+          <div class="left_chart">
+            <img src="@/assets/img/Home/chart.png" alt="" />
+          </div>
+          <div class="right_text">数据中心</div>
+        </div>
       </div>
     </header>
     <div class="sider">
@@ -260,26 +267,56 @@ export default {
     display: flex;
     flex-direction: column;
     align-items: flex-end;
-    .white {
-      width: 32px;
-      height: 4px;
-      background: #ffffff;
-    }
-    .text {
-      font-size: 20px;
-      font-family: AlibabaPuHuiTiM;
-      color: #ffffff;
-      margin: 10px 0;
+    .top {
+      display: flex;
+      align-items: center;
+      .text {
+        font-size: 20px;
+        font-family: AlibabaPuHuiTiM;
+        color: #ffffff;
+        margin: 10px 24px;
+      }
+      .exit {
+        font-size: 16px;
+        cursor: pointer;
+        font-family: AlibabaPuHuiTiR;
+        text-decoration: underline;
+        color: rgba(255, 255, 255, 0.8);
+        line-height: 16px;
+        &:active {
+          color: #4e68ff;
+        }
+      }
     }
-    .exit {
-      font-size: 16px;
+    .bot {
+      width: 183px;
+      height: 60px;
+      background: rgba(255, 255, 255, 0.9);
+      box-shadow: 0px 12px 36px 0px rgba(23, 44, 105, 0.3);
+      border-radius: 8px;
+      display: flex;
+      margin-top: 32px;
       cursor: pointer;
-      font-family: AlibabaPuHuiTiR;
-      text-decoration: underline;
-      color: rgba(255, 255, 255, 0.8);
-      line-height: 16px;
-      &:active {
-        color: #4e68ff;
+      .left_chart {
+        width: 60px;
+        height: 60px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        img {
+          width: 36px;
+          height: 36px;
+        }
+      }
+      .right_text {
+        flex: 1;
+        background: #4e68ff;
+        border-radius: 0px 8px 8px 0px;
+        line-height: 60px;
+        font-size: 22px;
+        font-family: PingFangSC-Medium, PingFang SC;
+        color: #f1f5fd;
+        text-align: center;
       }
     }
   }

src/layouts/components/NavBar/index.vue

@@ -7,7 +7,7 @@
     <div class="userInfo">
       <error-log></error-log>
       <!-- <avatar></avatar> -->
-      <div class="fontSelect">
+      <div v-if="$route.path != '/auditqualitycontrol'" class="fontSelect">
         <div
           v-for="(item, index) in fontList"
           :key="index"
@@ -18,7 +18,7 @@
         </div>
       </div>
       <div
-        v-show="curSelectedIndex != -1"
+        v-show="curSelectedIndex != -1 && $route.path != '/auditqualitycontrol'"
         class="community"
         @click="openModalFlag"
       >
@@ -62,6 +62,10 @@
           </el-badge>
         </template>
       </el-popover>
+      <div class="user" @click="$router.push('/home')">
+        <img src="~@/assets/img/DataCenter/backhome.png" alt />
+        <span>返回首页</span>
+      </div>
     </div>
   </div>
 </template>

src/layouts/components/index.js

 export { default as TagsBar } from "zx-layouts/zx-tags-bar"
-export { default as SideBar } from "zx-layouts/zx-side-bar"
+export { default as SideBar } from "@/layouts/components/zx-side-bar"
 export { default as Breadcrumb } from "zx-layouts/zx-breadcrumb"
 export { default as FullScreenBar } from "zx-layouts/zx-full-screen-bar"
 export { default as ErrorLog } from "zx-layouts/zx-error-log"

src/layouts/components/zx-side-bar/components/SideBarItem.vue

+<template>
+  <div v-if="!item.hidden">
+    <template
+      v-if="
+        handleChildren(item.children, item) &&
+        (!onlyOneChildren.children || onlyOneChildren.notShowChildren) &&
+        !item.alwaysShow
+      "
+    >
+      <app-link
+        v-if="onlyOneChildren.meta"
+        :target="onlyOneChildren.meta.target ? onlyOneChildren.meta.target : ''"
+        :to="handlePath(onlyOneChildren.path)"
+      >
+        <el-menu-item
+          :class="{ 'submenu-title-noDropdown': !isNest }"
+          :index="handlePath(onlyOneChildren.path)"
+        >
+          <vab-icon
+            v-if="onlyOneChildren.meta && onlyOneChildren.meta.icon"
+            :icon="['fas', onlyOneChildren.meta.icon]"
+            class="vab-nav-icon"
+          />
+          <vab-remix-icon
+            v-if="onlyOneChildren.meta && onlyOneChildren.meta.remixIcon"
+            :icon-class="onlyOneChildren.meta.remixIcon"
+            class="vab-nav-icon"
+          />
+          <span slot="title">{{ onlyOneChildren.meta.title }} </span>
+          <el-tag
+            v-if="onlyOneChildren.meta && onlyOneChildren.meta.badge"
+            type="danger"
+            effect="dark"
+            >{{ onlyOneChildren.meta.badge }}</el-tag
+          >
+        </el-menu-item>
+      </app-link>
+    </template>
+    <el-submenu v-else ref="subMenu" :index="handlePath(item.path)">
+      <template slot="title">
+        <vab-icon
+          v-if="item.meta && item.meta.icon"
+          :icon="['fas', item.meta.icon]"
+          class="vab-nav-icon"
+        />
+        <vab-remix-icon
+          v-if="item.meta && item.meta.remixIcon"
+          :icon-class="item.meta.remixIcon"
+          class="vab-nav-icon"
+        />
+        <span>{{ item.meta.title }}</span>
+      </template>
+      <side-bar-item
+        v-for="child in item.children"
+        :key="child.path"
+        :base-path="handlePath(child.path)"
+        :is-nest="true"
+        :item="child"
+        class="nest-menu"
+      />
+    </el-submenu>
+  </div>
+</template>
+
+<script>
+import path from "path";
+import { isExternal } from "@/utils/validate";
+import AppLink from "@/layouts/components/Link";
+
+export default {
+  name: "SideBarItem",
+  components: { AppLink },
+  props: {
+    item: {
+      type: Object,
+      required: true,
+    },
+    isNest: {
+      type: Boolean,
+      default: false,
+    },
+    basePath: {
+      type: String,
+      default: "",
+    },
+  },
+  data() {
+    this.onlyOneChild = null;
+    return {};
+  },
+  methods: {
+    handleChildren(children = [], parent) {
+      if (children === null) children = [];
+      const showChildren = children.filter((item) => {
+        if (item.hidden) {
+          return false;
+        } else {
+          this.onlyOneChildren = item;
+          return true;
+        }
+      });
+      if (showChildren.length === 1) {
+        return true;
+      }
+
+      if (showChildren.length === 0) {
+        this.onlyOneChildren = {
+          ...parent,
+          path: "",
+          notShowChildren: true,
+        };
+        return true;
+      }
+      return false;
+    },
+    handlePath(routePath) {
+      if (isExternal(routePath)) {
+        return routePath;
+      }
+      if (isExternal(this.basePath)) {
+        return this.basePath;
+      }
+      return path.resolve(this.basePath, routePath);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.vab-nav-icon {
+  margin-right: 4px;
+}
+::v-deep {
+  .el-tag {
+    margin-top: 15px;
+    padding-left: 3px;
+    padding-right: 3px;
+    height: 16px;
+    line-height: 13px;
+    float: right;
+  }
+}
+</style>

src/layouts/components/zx-side-bar/index.vue

+<template>
+  <el-scrollbar class="side-bar-container" :class="{ 'is-collapse': collapse }">
+    <logo />
+    <el-menu
+      :background-color="variables['menu-background']"
+      :text-color="variables['menu-color']"
+      :active-text-color="variables['menu-color-active']"
+      :default-active="activeMenu"
+      :collapse="collapse"
+      :collapse-transition="false"
+      :default-openeds="defaultOpens"
+      :unique-opened="uniqueOpened"
+      mode="vertical"
+      class="undefineMenu"
+    >
+      <side-bar-item
+        v-for="route in routes"
+        :key="route.path"
+        :base-path="route.path"
+        :item="route"
+      />
+      <div class="qrcode">
+        <div class="img"></div>
+        <div class="text">问题反馈群</div>
+      </div>
+    </el-menu>
+  </el-scrollbar>
+</template>
+<script>
+import Logo from "@/layouts/components/Logo"
+import SideBarItem from "./components/SideBarItem"
+import variables from "@/styles/variables.scss"
+import { mapGetters } from "vuex"
+import { defaultOopeneds, uniqueOpened } from "@/config/settings"
+
+export default {
+  name: "SideBar",
+  components: { SideBarItem, Logo },
+  data() {
+    return {
+      uniqueOpened,
+    }
+  },
+  computed: {
+    ...mapGetters({
+      collapse: "settings/collapse",
+      routes: "routes/routes",
+    }),
+    defaultOpens() {
+      if (this.collapse) {
+      }
+      return defaultOopeneds
+    },
+    activeMenu() {
+      const route = this.$route
+      const { meta, path } = route
+      if (meta.activeMenu) {
+        return meta.activeMenu
+      }
+      return path
+    },
+    variables() {
+      return variables
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+.qrcode {
+  width: 108px;
+  height: 136px;
+  background: #546184;
+  border-radius: 4px;
+  position: absolute;
+  bottom: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  padding: 8px;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  .img {
+    width: 92px;
+    height: 92px;
+    background: url("~@/assets/img/DataCenter/qrcode.png") no-repeat;
+    background-size: cover;
+    background-position: center center;
+    border-radius: 2px;
+  }
+  .text {
+    font-size: 14px;
+    font-family: AlibabaPuHuiTiR;
+    color: #ffffff;
+    text-align: center;
+    margin-top: 8px;
+  }
+}
+@mixin active {
+  &:hover {
+    color: $base-color-white !important;
+    background-color: $base-menu-background-active !important;
+  }
+
+  &.is-active {
+    color: $base-color-white !important;
+    background-color: $base-menu-background-active !important;
+  }
+}
+.undefineMenu {
+  min-height: calc(100vh - 120px);
+  padding-bottom: 166px;
+}
+.side-bar-container {
+  position: fixed;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  z-index: $base-z-index;
+  width: $base-left-menu-width;
+  height: 100vh;
+  overflow: hidden;
+  background: $base-menu-background;
+  box-shadow: 2px 0 6px rgba(0, 21, 41, 0.35);
+  transition: all 0.1s;
+  padding: 8px 0 14px;
+
+  &.is-collapse {
+    width: $base-left-menu-width-min;
+    border-right: 0 !important;
+
+    ::v-deep {
+      .el-menu {
+        transition: all 0.1s;
+      }
+
+      .el-menu--collapse {
+        border-right: 0 !important;
+
+        .el-submenu__icon-arrow {
+          right: 10px;
+          margin-top: -3px;
+        }
+
+        .el-submenu__title {
+          span {
+            display: none;
+          }
+        }
+      }
+    }
+  }
+
+  ::v-deep {
+    .el-scrollbar__wrap {
+      overflow-x: hidden;
+    }
+
+    .el-menu {
+      border: 0;
+    }
+
+    .svg-inline {
+      &--fa {
+        width: 1rem;
+      }
+    }
+
+    .el-menu-item {
+      height: 46px !important;
+      overflow: hidden;
+      line-height: 46px !important;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      @include active;
+    }
+
+    .nest-menu {
+      .el-menu-item {
+        background-color: $base-menu-children-background !important;
+
+        @include active;
+      }
+
+      .el-submenu .el-menu-item {
+        background-color: $base-menu-children-background !important;
+
+        @include active;
+      }
+    }
+  }
+}
+</style>

src/views/screening/DraftBox/index.vue

-<template>
-  <div>草稿箱</div>
-</template>
-<script>
-export default {
-  data() {
-    return {}
-  },
-  methods: {},
-  mounted() {},
-  watch: {},
-}
-</script>
-<style lang="scss" scoped></style>

src/views/screening/ScreeningAdd.vue

 <template>
-  <ConfigForms form-type="1"></ConfigForms>
+  <ConfigForms form-type="1" :prods="'add'"></ConfigForms>
 </template>
 
 <script>

src/views/screening/components/ConfigForms.vue

@@ -107,6 +107,7 @@ export default {
     formType: String,
     patientId: String,
     formClass: String,
+    prods: String,
   },
   data() {
     return {

src/views/screening/components/FormTab.vue

@@ -230,7 +230,13 @@ export default {
           formId: this.form.formId,
           patientId: this.patientId || this.patientStandbyId,
           formRecordId: this.formData.formRecordId,
+          statusMap: {
+            patientFrom: this.$store.getters["table/selectedIndex"],
+            is_draft: 1,
+            check_status: 1,
+          },
         },
+
         done,
         (res) => {
           // 多次填写的表单新增时，获取最新数据
@@ -351,6 +357,9 @@ export default {
       )
     }
   },
+  mounted() {
+    // console.log()
+  },
 }
 </script>
 <style scoped lang="scss">