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

src/store/modules/xt_permission.js

@@ -47,28 +47,6 @@ function setupRouters(urls) {
     if (Object.prototype.toString.call(router.children) === '[object Array]') {
       router.hidden = true
       router.children.forEach(c_router => {
-        if(router.path == "/slow"){
-          if(IndexOf(urls, router.path) != -1){
-            router.hidden = false
-          }else{
-            router.hidden = true
-          }
-        }
-        if(router.path == "/scrm"){
-          if(IndexOf(urls, router.path) != -1){
-            router.hidden = false
-          }else{
-            router.hidden = true
-          }
-        }
-        if(router.path == "/shop"){
-          if(IndexOf(urls, router.path) != -1){
-            router.hidden = false
-          }else{
-            router.hidden = true
-          }
-        }
-
         // console.log(c_router.path)
         if (IndexOf(urls, c_router.path) !== -1) {
         // if (urls.indexOf(c_router.path) !== -1) {
@@ -79,7 +57,7 @@ function setupRouters(urls) {
           // console.log('router.children hide : ' + c_router.path)
           c_router.hidden = true
         }
-        
+
       })
     } else {
       router.hidden = true

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

@@ -8,7 +8,8 @@
       "
       @click="onClick(item)"
     >
-      <router-link v-if="!onlyOneChild.meta.other" :to="resolvePath(onlyOneChild.path)">
+      <!--v-if="!onlyOneChild.meta.other"-->
+      <router-link  :to="resolvePath(onlyOneChild.path)">
         <el-menu-item
           :index="resolvePath(onlyOneChild.path)"
           :class="{ 'submenu-title-noDropdown': !isNest }"
@@ -23,20 +24,20 @@
           >{{ generateTitle(onlyOneChild.meta.title) }}</span>
         </el-menu-item>
       </router-link>
-      <a v-else :href="onlyOneChild.path" target="_blank">
-        <el-menu-item
-          :index="resolvePath(onlyOneChild.path)"
-          :class="{ 'submenu-title-noDropdown': !isNest }"
-        >
-          <i v-if="onlyOneChild.name == 'slow'" class="icon iconfont icon-manbing-xuanzhong" style="margin-right:4px"></i>
-          <i v-if="onlyOneChild.name == 'scrm'" class="icon iconfont icon-pengyou" style="margin-right:4px"></i>
-          <i v-if="onlyOneChild.name == 'shop'" class="icon iconfont icon-service_fill" style="margin-right:4px"></i>
-          <span
-            v-if="onlyOneChild.meta && onlyOneChild.meta.title"
-            slot="title"
-          >{{ generateTitle(onlyOneChild.meta.title) }}</span>
-        </el-menu-item>
-      </a>
+      <!--<a v-else :href="onlyOneChild.path" target="_blank">-->
+        <!--<el-menu-item-->
+          <!--:index="resolvePath(onlyOneChild.path)"-->
+          <!--:class="{ 'submenu-title-noDropdown': !isNest }"-->
+        <!--&gt;-->
+          <!--<i v-if="onlyOneChild.name == 'slow'" class="icon iconfont icon-manbing-xuanzhong" style="margin-right:4px"></i>-->
+          <!--<i v-if="onlyOneChild.name == 'scrm'" class="icon iconfont icon-pengyou" style="margin-right:4px"></i>-->
+          <!--<i v-if="onlyOneChild.name == 'shop'" class="icon iconfont icon-service_fill" style="margin-right:4px"></i>-->
+          <!--<span-->
+            <!--v-if="onlyOneChild.meta && onlyOneChild.meta.title"-->
+            <!--slot="title"-->
+          <!--&gt;{{ generateTitle(onlyOneChild.meta.title) }}</span>-->
+        <!--</el-menu-item>-->
+      <!--</a>-->
     </div>
 
     <div v-else>

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

@@ -37,7 +37,7 @@
         :index="index"
         @a="b"
       ></sidebar-item>
-     <!-- <el-menu-item v-if="this.$store.getters.xt_user.cdm_role_exist" index="100">
+ <el-menu-item v-if="this.$store.getters.xt_user.cdm_role_exist" index="100">
       <a :href="CDMWebsit()">
         <i class="icon iconfont icon-manbing-xuanzhong" style="margin-right:4px"></i>
         <span
@@ -60,7 +60,7 @@
             slot="title"
           >分销商城</span>
         </a>
-      </el-menu-item> -->
+      </el-menu-item>
     </el-menu>
 
   </el-scrollbar>

src/xt_pages/dialysis/batch_print/batch_print_order.vue

@@ -1202,7 +1202,7 @@
                         <label-box
                           :isChecked="
                             record.assessment_after_dislysis.internal_fistula.indexOf(
-                              '震颤-存在'
+                              '存在'
                             ) > -1
                               ? true
                               : false
@@ -1212,7 +1212,7 @@
                         <label-box
                           :isChecked="
                             record.assessment_after_dislysis.internal_fistula.indexOf(
-                              '震颤-减弱'
+                              '减弱'
                             ) > -1
                               ? true
                               : false
@@ -1222,7 +1222,7 @@
                         <label-box
                           :isChecked="
                             record.assessment_after_dislysis.internal_fistula.indexOf(
-                              '震颤-无'
+                              '无'
                             ) > -1
                               ? true
                               : false

src/xt_pages/dialysis/batch_print/batch_print_order_other.vue

@@ -1863,7 +1863,7 @@
                         穿刺者：
                         <div
                           class="under_line"
-                          style="width: 80px;text-align: left"
+                          style="width: 70px;text-align: left"
                         >
                           <span
                             v-if="
@@ -1898,12 +1898,12 @@
                         &emsp;核对人：
                         <div
                           class="under_line"
-                          style="width: 80px;text-align: left"
+                          style="width: 70px;text-align: left"
                           v-if="record.dialysis_order == null"
                         ></div>
                         <div
                           class="under_line"
-                          style="width: 80px;text-align: left"
+                          style="width: 70px;text-align: left"
                           v-if="
                             record.dialysis_order != null &&
                               record.dialysis_order.start_nurse ==
@@ -1926,7 +1926,7 @@
                         </div>
                         <div
                           class="under_line"
-                          style="width: 80px;text-align: left"
+                          style="width: 70px;text-align: left"
                           v-if="
                             record.dialysis_order != null &&
                               record.dialysis_order.start_nurse ==
@@ -1947,7 +1947,7 @@
                         </div>
                         <div
                           class="under_line"
-                          style="width: 80px;text-align: left"
+                          style="width: 70px;text-align: left"
                           v-if="
                             record.dialysis_order != null &&
                               record.dialysis_order.start_nurse !=
@@ -2025,7 +2025,7 @@
                         收针者：
                         <div
                           class="under_line"
-                          style="width: 80px;text-align: left"
+                          style="width: 70px;text-align: left"
                         >
                           <span
                             v-if="

src/xt_pages/dialysis/batch_print/batch_print_order_other_one.vue

@@ -1750,7 +1750,7 @@
                         穿刺者：
                         <div
                           class="under_line"
-                          style="width: 80px;text-align: left"
+                          style="width: 70px;text-align: left"
                         >
                           <span
                             v-if="
@@ -1785,7 +1785,7 @@
                         &emsp;核对人：
                         <div
                           class="under_line"
-                          style="width: 80px;text-align: left"
+                          style="width: 70px;text-align: left"
                           v-if="record.dialysis_order == null"
                         ></div>
                         <div
@@ -1813,7 +1813,7 @@
                         </div>
                         <div
                           class="under_line"
-                          style="width: 80px;text-align: left"
+                          style="width: 70px;text-align: left"
                           v-if="
                             record.dialysis_order != null &&
                               record.dialysis_order.start_nurse ==
@@ -1834,7 +1834,7 @@
                         </div>
                         <div
                           class="under_line"
-                          style="width: 80px;text-align: left"
+                          style="width: 70px;text-align: left"
                           v-if="
                             record.dialysis_order != null &&
                               record.dialysis_order.start_nurse !=
@@ -1910,7 +1910,7 @@
                         收针者：
                         <div
                           class="under_line"
-                          style="width: 80px;text-align: left"
+                          style="width: 70px;text-align: left"
                         >
                           <span
                             v-if="

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -88,7 +88,7 @@
           >
         </div>
       </template>
-      <template v-if="org_template_info.template_id == 6">
+      <template v-if="org_template_info.template_id == 6 || org_template_info.template_id == 10">
         <el-button
           :loading="loading"
           size="small"
@@ -98,6 +98,7 @@
           >打印</el-button
         >
       </template>
+
       <template v-if="org_template_info.template_id == 7">
         <el-button
           :loading="loading"
@@ -393,7 +394,7 @@ export default {
           style: style2,
           scanStyles: false
         });
-      } else if (this.org_template_info.template_id == 6) {
+      } else if (this.org_template_info.template_id == 6 || this.org_template_info.template_id == 10) {
         printJS({
           printable: "dialysis-print-box-1",
           type: "html",
@@ -414,13 +415,6 @@ export default {
           style: style,
           scanStyles: false
         });
-      } else if (this.org_template_info.template_id == 10) {
-        printJS({
-          printable: "dialysis-print-box",
-          type: "html",
-          style: style,
-          scanStyles: false
-        });
       }
     },
     printThisOnePage() {

src/xt_pages/dialysis/template/DialysisPrintOrderOne.vue

@@ -663,16 +663,15 @@
                 </td>
 
                 <td width="10"></td>
-                <td width="105">压迫后内瘘震颤:</td>
-                <td width="140">
-                  <label-box :isChecked="afterdialysis.internal_fistula.indexOf('震颤-存在')>-1?true:false"
-                               showValue='存在'></label-box>
-                    &nbsp;
-                    <label-box :isChecked="afterdialysis.internal_fistula.indexOf('震颤-减弱')>-1?true:false"
-                               showValue='减弱'></label-box>
-                    &nbsp;
-                    <label-box :isChecked="afterdialysis.internal_fistula.indexOf('震颤-无')>-1?true:false"
-                               showValue='无'></label-box>
+                <td width="105" colspan="2">压迫后内瘘震颤:
+                  <label-box :isChecked="afterdialysis.internal_fistula.indexOf('存在')>-1?true:false"
+                             showValue='存在'></label-box>
+                  &nbsp;
+                  <label-box :isChecked="afterdialysis.internal_fistula.indexOf('减弱')>-1?true:false"
+                             showValue='减弱'></label-box>
+                  &nbsp;
+                  <label-box :isChecked="afterdialysis.internal_fistula.indexOf('无')>-1?true:false"
+                             showValue='无'></label-box>
                 </td>
                 <td width="">
                 </td>

src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue

@@ -1184,38 +1184,38 @@
                   </div>
                   <div class="inline_block">
                     （
-                    <label-box
+                    <check-box
                       :isChecked="
                         afterdialysis.complication.indexOf('头晕') > -1
                           ? true
                           : false
                       "
-                      showValue="头晕"
-                    ></label-box>
-                    <label-box
+                      text="头晕"
+                    ></check-box>
+                    <check-box
                       :isChecked="
                         afterdialysis.complication.indexOf('头痛') > -1
                           ? true
                           : false
                       "
-                      showValue="头痛"
-                    ></label-box>
-                    <label-box
+                      text="头痛"
+                    ></check-box>
+                    <check-box
                       :isChecked="
                         afterdialysis.complication.indexOf('呕吐') > -1
                           ? true
                           : false
                       "
-                      showValue="呕吐"
-                    ></label-box>
-                    <label-box
+                      text="呕吐"
+                    ></check-box>
+                    <check-box
                       :isChecked="
                         afterdialysis.complication.indexOf('低血压') > -1
                           ? true
                           : false
                       "
-                      showValue="低血压"
-                    ></label-box>
+                      text="低血压"
+                    ></check-box>
                     ）
                   </div>
                 </div>
@@ -1286,7 +1286,7 @@
                     责任护士：
                     <div
                       class="under_line"
-                      style="width: 80px;text-align: left"
+                      style="width: 70px;text-align: left"
                     >
                       <span
                         v-if="
@@ -1324,7 +1324,7 @@
                     穿刺者：
                     <div
                       class="under_line"
-                      style="width: 80px;text-align: left"
+                      style="width: 70px;text-align: left"
                     >
                       <span
                         v-if="
@@ -1361,7 +1361,7 @@
                     &emsp;核对人：
                     <div
                       class="under_line"
-                      style="width: 80px;text-align: left"
+                      style="width: 70px;text-align: left"
                       v-if="dialysisOrder == null"
                     >
                       <span
@@ -1383,7 +1383,7 @@
                     </div>
                     <div
                       class="under_line"
-                      style="width: 80px;text-align: left"
+                      style="width: 70px;text-align: left"
                       v-if="
                         dialysisOrder != null &&
                           dialysisOrder.start_nurse == check.modifier
@@ -1408,7 +1408,7 @@
                     </div>
                     <div
                       class="under_line"
-                      style="width: 80px;text-align: left"
+                      style="width: 70px;text-align: left"
                       v-if="
                         dialysisOrder != null &&
                           dialysisOrder.start_nurse == check.creater
@@ -1435,7 +1435,7 @@
                     </div>
                     <div
                       class="under_line"
-                      style="width: 80px;text-align: left"
+                      style="width: 70px;text-align: left"
                       v-if="
                         dialysisOrder != null &&
                           dialysisOrder.start_nurse != check.creater &&
@@ -1503,7 +1503,7 @@
                     &emsp;收针者：
                     <div
                       class="under_line"
-                      style="width: 80px;text-align: left"
+                      style="width: 70px;text-align: left"
                     >
                       <span
                         v-if="