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

src/router/modules/scrm.js

@@ -4,7 +4,6 @@ export default {
   path: '/scrm',
   component: Layout,
   redirct: 'noredirect',
-//   hidden:true,
   children: [{
     path: process.env.SRCM_HOST,
     name: 'scrm',

src/router/modules/slow.js

@@ -5,7 +5,7 @@ export default {
   component: Layout,
   redirct: 'noredirect',
   children: [{
-    path: 'process.env.CDM_HOST',
+    path: process.env.CDM_HOST,
     name: 'slow',
     meta: {
       title: 'slow',

src/store/modules/xt_permission.js

@@ -41,12 +41,34 @@ function xt_filterAsyncRouter(routers) {
 }
 
 function setupRouters(urls) {
-  // console.log(urls)
+  console.log(urls)
   xt_asyncRouterMap.forEach(router => {
-    console.log(router)
+    // console.log(router)
     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) {
@@ -57,11 +79,12 @@ function setupRouters(urls) {
           // console.log('router.children hide : ' + c_router.path)
           c_router.hidden = true
         }
+        
       })
     } else {
       router.hidden = true
       if (IndexOf(urls, router.path) !== -1) {
-        console.log('router show : ' + router.path)
+        // console.log('router show : ' + router.path)
       // if (urls.indexOf(router.path) !== -1) {
         router.hidden = false
       }

src/xt_pages/dialysis/batch_print/batch_print_order_other.vue

@@ -1763,49 +1763,64 @@
                           "
                         ></check-box>
                       </div>
+                      <!--<div class="inline_block">-->
+                        <!--透析器:-->
+                        <!--<check-box-->
+                          <!--text="0"-->
+                          <!--:checked="-->
+                            <!--isCheckBoxChecked(-->
+                              <!--record.assessment_after_dislysis,-->
+                              <!--'dialyzer',-->
+                              <!--1-->
+                            <!--)-->
+                          <!--"-->
+                        <!--&gt;</check-box>-->
+                        <!--<check-box-->
+                          <!--text="+"-->
+                          <!--:checked="-->
+                            <!--isCheckBoxChecked(-->
+                              <!--record.assessment_after_dislysis,-->
+                              <!--'dialyzer',-->
+                              <!--2-->
+                            <!--)-->
+                          <!--"-->
+                        <!--&gt;</check-box>-->
+                        <!--<check-box-->
+                          <!--text="++"-->
+                          <!--:checked="-->
+                            <!--isCheckBoxChecked(-->
+                              <!--record.assessment_after_dislysis,-->
+                              <!--'dialyzer',-->
+                              <!--3-->
+                            <!--)-->
+                          <!--"-->
+                        <!--&gt;</check-box>-->
+                        <!--<check-box-->
+                          <!--text="+++"-->
+                          <!--:checked="-->
+                            <!--isCheckBoxChecked(-->
+                              <!--record.assessment_after_dislysis,-->
+                              <!--'dialyzer',-->
+                              <!--4-->
+                            <!--)-->
+                          <!--"-->
+                        <!--&gt;</check-box>-->
+                      <!--</div>-->
                       <div class="inline_block">
-                        透析器:
-                        <check-box
-                          text="0"
-                          :checked="
-                            isCheckBoxChecked(
-                              record.assessment_after_dislysis,
-                              'dialyzer',
-                              1
-                            )
-                          "
-                        ></check-box>
-                        <check-box
-                          text="+"
-                          :checked="
-                            isCheckBoxChecked(
-                              record.assessment_after_dislysis,
-                              'dialyzer',
-                              2
-                            )
-                          "
-                        ></check-box>
-                        <check-box
-                          text="++"
-                          :checked="
-                            isCheckBoxChecked(
-                              record.assessment_after_dislysis,
-                              'dialyzer',
-                              3
-                            )
-                          "
-                        ></check-box>
-                        <check-box
-                          text="+++"
-                          :checked="
-                            isCheckBoxChecked(
-                              record.assessment_after_dislysis,
-                              'dialyzer',
-                              4
-                            )
-                          "
-                        ></check-box>
+                        透析器凝血:
+                        <div
+                          class="under_line"
+                          style="width: 100px;text-align: center"
+                        >
+                          {{
+                          record.assessment_after_dislysis &&
+                          record.assessment_after_dislysis.cruor
+                          ? record.assessment_after_dislysis.cruor
+                          : "/"
+                          }}
+                        </div>
                       </div>
+
                     </div>
                   </td>
                 </tr>

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -351,6 +351,10 @@ export default {
       const style2 =
         '@media print {.option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 50px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 14px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;}.print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 3px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 14px;padding: 6px 5px;line-height: 16px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-50{margin-bottom:50px;}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:900px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top: 1050px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}';
 
+      // const style3 =
+      //   '@media print {.option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 50px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 16px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;}.print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 5px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 16px;padding: 5px 5px;line-height: 18px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:950px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top:1050px;left: 50%;}.print-yema5{position: absolute;top:1370px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}';
+      //
+
       if (this.org_template_info.template_id == 1) {
         printJS({
           printable: "dialysis-print-box",