Merge branch 'master' of http://git.shengws.com/csx/Vue_New

src/views/layout/components/Sidebar/SidebarItem.vue

@@ -6,9 +6,21 @@
           :index="resolvePath(item.src)"
           :class="{ 'submenu-title-noDropdown': !isNest }"
         >
-          <i v-if="item.name == 'slow'" class="icon iconfont icon-manbing-xuanzhong" style="margin-right:4px"></i>
-          <i v-if="item.name == 'scrm'" class="icon iconfont icon-pengyou" style="margin-right:4px"></i>
-          <i v-if="item.name == 'shop'" class="icon iconfont icon-service_fill" style="margin-right:4px"></i>
+          <i
+            v-if="item.name == 'slow'"
+            class="icon iconfont icon-manbing-xuanzhong"
+            style="margin-right: 4px;"
+          ></i>
+          <i
+            v-if="item.name == 'scrm'"
+            class="icon iconfont icon-pengyou"
+            style="margin-right: 4px;"
+          ></i>
+          <i
+            v-if="item.name == 'shop'"
+            class="icon iconfont icon-service_fill"
+            style="margin-right: 4px;"
+          ></i>
           <span slot="title">{{ generateTitle(item.name) }}</span>
         </el-menu-item>
       </a>
@@ -17,8 +29,8 @@
       <div
         v-if="
           hasOneShowingChild(item.children) &&
-            !onlyOneChild.children &&
-            !item.alwaysShow
+          !onlyOneChild.children &&
+          !item.alwaysShow
         "
         @click="onClick(item)"
       >
@@ -34,20 +46,25 @@
             <span
               v-if="onlyOneChild.meta && onlyOneChild.meta.title"
               slot="title"
-            >{{ generateTitle(onlyOneChild.meta.title) }}</span>
+              >{{ generateTitle(onlyOneChild.meta.title) }}</span
+            >
           </el-menu-item>
         </router-link>
-        
       </div>
 
       <div v-else>
-        <el-submenu v-if="item.meta.isChild" id="mySubmenu" :index="item.name || item.path">
+        <el-submenu
+          v-if="item.meta.isChild"
+          id="mySubmenu"
+          :index="item.name || item.path"
+        >
           <template slot="title">
-            <svg-icon v-if="item.meta && item.meta.icon" :icon-class="item.meta.icon"></svg-icon>
+            <svg-icon
+              v-if="item.meta && item.meta.icon"
+              :icon-class="item.meta.icon"
+            ></svg-icon>
             <span v-if="item.meta && item.meta.title" slot="title">
-              {{
-              generateTitle(item.meta.title)
-              }}
+              {{ generateTitle(item.meta.title) }}
             </span>
           </template>
           <template v-for="child in item.children" v-if="!child.hidden">
@@ -56,23 +73,35 @@
               v-if="child.meta.isChild != true"
               :key="child.name"
             >
-              <el-menu-item @click="onClick(item)" :index="resolvePath(child.path)">
-                <svg-icon v-if="child.meta && child.meta.icon" :icon-class="child.meta.icon"></svg-icon>
+              <el-menu-item
+                @click="onClick(item)"
+                :index="resolvePath(child.path)"
+              >
+                <svg-icon
+                  v-if="child.meta && child.meta.icon"
+                  :icon-class="child.meta.icon"
+                ></svg-icon>
                 <span v-if="child.meta && child.meta.title" slot="title">
-                  {{
-                  generateTitle(child.meta.title)
-                  }}
+                  {{ generateTitle(child.meta.title) }}
                 </span>
               </el-menu-item>
             </router-link>
 
-            <router-link v-else :to="child.path" :key="child.name">
-              <el-menu-item @click="onClick(item,child.parentNum)" :index="resolvePath(child.path)">
-                <svg-icon v-if="child.meta && child.meta.icon" :icon-class="child.meta.icon"></svg-icon>
+            <router-link
+              v-if="child.meta.isChild == true"
+              :to="child.path"
+              :key="child.name"
+            >
+              <el-menu-item
+                @click="onClick(item, child.parentNum)"
+                :index="resolvePath(child.path)"
+              >
+                <svg-icon
+                  v-if="child.meta && child.meta.icon"
+                  :icon-class="child.meta.icon"
+                ></svg-icon>
                 <span v-if="child.meta && child.meta.title" slot="title">
-                  {{
-                  generateTitle(child.meta.title)
-                  }}
+                  {{ generateTitle(child.meta.title) }}
                 </span>
               </el-menu-item>
             </router-link>
@@ -82,36 +111,41 @@
           <router-link :to="resolvePath(item.children[0].path)">
             <el-menu-item :index="item.name || item.path">
               <template slot="title">
-                <svg-icon v-if="item.meta && item.meta.icon" :icon-class="item.meta.icon"></svg-icon>
+                <svg-icon
+                  v-if="item.meta && item.meta.icon"
+                  :icon-class="item.meta.icon"
+                ></svg-icon>
                 <span v-if="item.meta && item.meta.title" slot="title">
-                  {{
-                  generateTitle(item.meta.title)
-                  }}
+                  {{ generateTitle(item.meta.title) }}
                 </span>
               </template>
 
               <!-- <template v-for="child in item.children" v-if="!child.hidden">
-          <sidebar-item
-            :is-nest="true"
-            class="nest-menu"
-            v-if="child.children && child.children.length > 0"
-            :item="child"
-            :key="child.path"
-            :base-path="resolvePath(child.path)"
-          ></sidebar-item>
+                <sidebar-item
+                  :is-nest="true"
+                  class="nest-menu"
+                  v-if="child.children && child.children.length > 0"
+                  :item="child"
+                  :key="child.path"
+                  :base-path="resolvePath(child.path)"
+                ></sidebar-item>
 
-          <router-link v-else :to="resolvePath(child.path)" :key="child.name">
-            <el-menu-item :index="resolvePath(child.path)">
-              <svg-icon
-                v-if="child.meta && child.meta.icon"
-                :icon-class="child.meta.icon"
-              ></svg-icon>
-              <span v-if="child.meta && child.meta.title" slot="title">{{
-                generateTitle(child.meta.title)
-              }}</span>
-            </el-menu-item>
-          </router-link>
-              </template>-->
+                <router-link
+                  v-else
+                  :to="resolvePath(child.path)"
+                  :key="child.name"
+                >
+                  <el-menu-item :index="resolvePath(child.path)">
+                    <svg-icon
+                      v-if="child.meta && child.meta.icon"
+                      :icon-class="child.meta.icon"
+                    ></svg-icon>
+                    <span v-if="child.meta && child.meta.title" slot="title">{{
+                      generateTitle(child.meta.title)
+                    }}</span>
+                  </el-menu-item>
+                </router-link>
+              </template> -->
             </el-menu-item>
           </router-link>
         </div>
@@ -131,31 +165,31 @@ export default {
     // route object
     item: {
       type: Object,
-      required: true
+      required: true,
     },
     isNest: {
       type: Boolean,
-      default: false
+      default: false,
     },
     basePath: {
       type: String,
-      default: ""
+      default: "",
     },
     index: {
-      type: Number
-    }
+      type: Number,
+    },
   },
   computed: {
-    ...mapGetters(["permission_routers"])
+    ...mapGetters(["permission_routers"]),
   },
   data() {
     return {
-      onlyOneChild: null
+      onlyOneChild: null,
     };
   },
   methods: {
     hasOneShowingChild(children) {
-      const showingChildren = children.filter(item => {
+      const showingChildren = children.filter((item) => {
         if (item.hidden) {
           return false;
         } else {
@@ -201,9 +235,11 @@ export default {
       }
 
       return true;
-    }
+    },
+  },
+  created() {
+    console.log(this.permission_routers);
   },
-  created() {}
 };
 </script>
 
@@ -219,30 +255,29 @@ export default {
       min-width: 0;
       padding: 0 5px !important;
       font-size: 12px;
-      background-color:#1F2D3D !important;
+      background-color: #1f2d3d !important;
     }
   }
 }
-.menu-wrapper{
-  .el-menu-item{
-   background-color:#1F2D3D !important;
-   color: #fff !important;
+.menu-wrapper {
+  .el-menu-item {
+    background-color: #1f2d3d !important;
+    color: #fff !important;
   }
-  .el-menu{
-    background-color:#1F2D3D !important;
+  .el-menu {
+    background-color: #1f2d3d !important;
   }
-  .el-submenu__title{
-    background-color:#1F2D3D !important;
+  .el-submenu__title {
+    background-color: #1f2d3d !important;
     color: #fff !important;
     height: 32px !important;
     line-height: 32px !important;
   }
-  .router-link-exact-active{
+  .router-link-exact-active {
     color: rgb(64, 158, 255) !important;
-    .el-menu-item{
+    .el-menu-item {
       color: rgb(64, 158, 255) !important;
     }
   }
 }
-
 </style>

src/xt_pages/dialysis/batch_print/batch_print_order_twelve.vue

@@ -1324,7 +1324,7 @@
                 <tr style="height:40px">
                   <td
                     rowspan="11"
-                    style="border:none;text-align:right;padding-right:100px;height:40px"
+                    style="border:none;text-align:right;height:40px"
                   >
                     医生签名
                     <span
@@ -1365,6 +1365,28 @@
                             style="height: 20px;"
                           />
                     </span>
+                    核对护士
+                    <span
+                      style="display: inline-block;width:100px;text-align: left;"
+                    >
+                      <span
+                          v-if="
+                            setAdminUserES(record.check, 'modifier') ==
+                              ''
+                          "
+                          >{{
+                            getAdminUser(record.check, "modifier")
+                          }}</span
+                        >
+                        <img
+                          class="es-img"
+                          :src="setAdminUserES(record.check, 'modifier')"
+                          alt=""
+                          srcset=""
+                          v-else
+                          style="height: 20px;"
+                        />
+                    </span>
                     护士签名
                     <span
                       style="display: inline-block;width:100px;text-align: left;"

src/xt_pages/dialysis/template/dialysisPrintOrderTwelve.vue

@@ -1339,10 +1339,7 @@
           </td>
         </tr>
         <tr style="height:40px">
-          <td
-            rowspan="11"
-            style="border:none;text-align:right;padding-right:100px;height:40px"
-          >
+          <td rowspan="11" style="border:none;text-align:right;height:40px">
             医生签名
             <span style="display: inline-block;width:100px;text-align: left;">
               &nbsp;
@@ -1351,6 +1348,21 @@
                 <img class="es-img" :src="doctorForm.url" />
               </span>
             </span>
+            核对护士
+            <span style="display: inline-block;width:100px;text-align: left;">
+              &nbsp;
+              <span
+                v-if="setAdminUserES(check == null ? 0 : check.modifier) == ''"
+                >{{ getAdminUser(check == null ? 0 : check.modifier) }}</span
+              >
+              <img
+                style="height:20px;"
+                :src="setAdminUserES(check == null ? 0 : check.modifier)"
+                alt=""
+                srcset=""
+                v-else
+              />
+            </span>
             护士签名
             <span style="display: inline-block;width:100px;text-align: left;">
               &nbsp;