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

src/store/modules/data.js

@@ -9,41 +9,31 @@ const data = {
   mutations: {
     SET_CONFIGLIST: (state, configlist) => {
       state.configlist = configlist
-    },
+    }
 
   },
 
   actions: {
     VerifyConfigList({ commit, state }) {
       return new Promise((resolve, reject) => {
-        var configlist = getDataConfigList()
-
-        // console.log('configLIST数据：', configlist)
-        if (configlist != null && configlist.length > 0) {
-          var infoJSON = JSON.parse(configlist)
-          // console.log('configLISt数据：', infoJSON)
-          commit('SET_CONFIGLIST', infoJSON)
-          resolve()
-        } else {
-            getConfigList().then(response => {
-              if (!response.data) { // 由于mockjs 不支持自定义状态码只能这样hack
-                reject('error')
-              }
-              const list = response.data.data
-              // console.log('请求返回的数据：', list)
-              if (list) { // 验证返回的configlist是否是一个非空数组
-                // console.log('转换的configlist为：', list.configlist)
-                console.log('转换的configlist为：', list.configlist)
-                commit('SET_CONFIGLIST', list.configlist)
-                setDataConfigList(JSON.stringify(list.configlist))
-                resolve()
-              } else {
-                reject('getInfo: configlist must be a non-null array !')
-              }
-            }).catch(error => {
-              reject(error)
-            })
-        }
+        getConfigList().then(response => {
+          if (!response.data) { // 由于mockjs 不支持自定义状态码只能这样hack
+            reject('error')
+          }
+          const list = response.data.data
+          // console.log('请求返回的数据：', list)
+          if (list) { // 验证返回的configlist是否是一个非空数组
+            // console.log('转换的configlist为：', list.configlist)
+            console.log('转换的configlist为：', list.configlist)
+            commit('SET_CONFIGLIST', list.configlist)
+            setDataConfigList(JSON.stringify(list.configlist))
+            resolve()
+          } else {
+            reject('getInfo: configlist must be a non-null array !')
+          }
+        }).catch(error => {
+          reject(error)
+        })
       })
     },
     updateConfigList({ commit }, configArr) {
@@ -138,7 +128,7 @@ const data = {
         setDataConfigList(JSON.stringify(infoJSON))
         resolve()
       })
-    },
+    }
 
   }
 }

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -120,6 +120,16 @@
           >批量打印</el-button
         >
       </template>
+      <template v-if="this.template_id == 9">
+        <el-button
+          size="small"
+          icon="el-icon-printer"
+          :disabled="selecting_schs.length == 0"
+          @click="batchPrintAction"
+          type="primary"
+          >批量打印</el-button
+        >
+      </template>
     </div>
     <div class="app-container">
       <!-- <div class="filter-container">
@@ -579,6 +589,8 @@ export default {
         this.$router.push({ path: "/dialysis/print/batch/seven" });
       } else if (this.template_id == 8) {
         this.$router.push({ path: "/dialysis/print/batch/eight" });
+      } else if (this.template_id == 9) {
+        this.$router.push({ path: "/dialysis/print/batch/nine" });
       }
     },
     batchPrintActionOne: function() {

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -12,7 +12,12 @@
           >打印</el-button
         >
       </template>
-      <template v-if=" org_template_info.template_id == 2 || org_template_info.template_id == 0  " >
+      <template
+        v-if="
+          org_template_info.template_id == 2 ||
+            org_template_info.template_id == 0
+        "
+      >
         <div>
           <el-button
             :loading="loading"
@@ -88,7 +93,12 @@
           >
         </div>
       </template>
-      <template v-if="org_template_info.template_id == 6 || org_template_info.template_id == 10">
+      <template
+        v-if="
+          org_template_info.template_id == 6 ||
+            org_template_info.template_id == 10
+        "
+      >
         <el-button
           :loading="loading"
           size="small"
@@ -119,6 +129,16 @@
           >打印</el-button
         >
       </template>
+      <template v-if="org_template_info.template_id == 9">
+        <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+      </template>
     </div>
     <div class="app-container ">
       <!--<div class="order-print-btn"-->
@@ -186,8 +206,12 @@
         v-bind:childResponse="childResponse"
         v-if="org_template_info.template_id == 10"
       ></DialysisPrintOrderTen>
+      <DialysisPrintOrder
 
-
+      <!--<DialysisPrintOrderNine-->
+        <!--v-bind:childResponse="childResponse"-->
+        <!--v-if="org_template_info.template_id == 9"-->
+      <!--&gt;</DialysisPrintOrderNine>-->
     </div>
   </div>
 </template>
@@ -207,7 +231,7 @@ import DialysisPrintOrderSix from "./template/DialysisPrintOrderSix";
 import DialysisPrintOrderSeven from "./template/DialysisPrintOrderSeven";
 import DialysisPrintOrderEight from "./template/DialysisPrintOrderEight";
 import print from "print-js";
-import DialysisPrintOrderTen from './template/DialysisPrintOrderTen'
+import DialysisPrintOrderTen from "./template/DialysisPrintOrderTen";
 
 export default {
   name: "dialysisPrintOrder",
@@ -356,6 +380,9 @@ export default {
       //   '@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;}';
       //
 
+      const style5 =
+        '@media print {.dialysis-print-order {width: 960px; margin: 0 auto;}.dialysis-print-order .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.dialysis-print-order .order-title {  margin: auto;  font-weight: 600;  text-align: center;  font-size: 22px;  padding: 10px 20px 0px 20px;}.dialysis-print-order .table-box {  width: 100%;  line-height: 18px;  font-size: 14px;}.dialysis-print-order .print-table {  width: 100%;  text-align: center;  border-collapse: collapse;  line-height: 40px;  font-size: 14px;}.dialysis-print-order .print-table-no {  width: 100%;  text-align: center;  border-collapse: collapse;  font-size: 14px;}.dialysis-print-order .under-line {  border-bottom: 1px solid #999;  width: 95%;  text-align: center;  margin-left: 2px;}.dialysis-print-order .title-box {  text-align: center;  font-size: 16px;}.dialysis-print-order .radio-lebel-box {  font-weight: 400;  cursor: pointer;}.dialysis-print-order .radio-no {  opacity: 0;  outline: none;  position: absolute;  margin: 0;  width: 0;  height: 0;  z-index: -1;}.dialysis-print-order .radio-inner {  white-space: nowrap;  cursor: pointer;  outline: none;  display: inline-block;  line-height: 1;  position: relative;  vertical-align: middle;}.dialysis-print-order .radio-fang {  display: inline-block;  position: relative;  border: 1px solid #000;  box-sizing: border-box;  width: 14px;  height: 14px;  background-color: #fff;  z-index: 1;  transition: border-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46),    background-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46);}.dialysis-print-order .is-checked-radio::after {  content: "√";  font-size: 15px;}.dialysis-print-order .print-table-no tr td {  padding: 8px 5px;  line-height: 25px;}.dialysis-print-order .print-table tr td {  padding: 1px 1px;  /*line-height: 25px;*/}.es-img {  height: 25px;}.advice-name {  text-align: left;}.advice-children {  display: flex;}.title-box-pro {  border: 0 #fff;  line-height: 25px;  height: 25px;  text-align: left;  padding-left: 10px !important;}.title-box-pro-tr {  border: 0 #fff;}.text-align-left {  text-align: left !important;  padding-left: 10px !important;  font-size: 14px !important;  line-height: 25px;}.print-table-tr-new td {line-height: 20px !important;}.border-top-solid {border: solid 1px #000;}.print-template-two tr {line-height: 30px;}}';
+
       if (this.org_template_info.template_id == 1) {
         printJS({
           printable: "dialysis-print-box",
@@ -394,7 +421,10 @@ export default {
           style: style2,
           scanStyles: false
         });
-      } else if (this.org_template_info.template_id == 6 || this.org_template_info.template_id == 10) {
+      } else if (
+        this.org_template_info.template_id == 6 ||
+        this.org_template_info.template_id == 10
+      ) {
         printJS({
           printable: "dialysis-print-box-1",
           type: "html",
@@ -415,6 +445,13 @@ export default {
           style: style,
           scanStyles: false
         });
+      } else if (this.org_template_info.template_id == 9) {
+        printJS({
+          printable: "dialysis-print-box",
+          type: "html",
+          style: style5,
+          scanStyles: false
+        });
       }
     },
     printThisOnePage() {

src/xt_pages/dialysis/template/dialysisPrintOrderFive.vue

@@ -602,25 +602,87 @@
               <div class="row" style="padding: 2px 0;line-height:19px;">
                 <div class="inline_block">
                   内瘘震颤和血管杂音：
-                  <check-box text="存在" :checked="afterdialysis.tremor_noise==1?true:false"></check-box>
-                  <check-box text="减弱" :checked="afterdialysis.tremor_noise==2?true:false"></check-box>
-                  <check-box text="不存在" :checked="afterdialysis.tremor_noise==3?true:false"></check-box>
+                  <check-box
+                    text="正常"
+                    :checked="
+                        afterdialysis.internal_fistula.indexOf('正常') > -1
+                          ? true
+                          : false
+                      "
+                  ></check-box>
+                  <check-box
+                    text="减弱"
+                    :checked="
+                        afterdialysis.internal_fistula.indexOf('减弱') > -1
+                          ? true
+                          : false
+                      "
+                  ></check-box>
+                  <check-box
+                    text="不存在"
+                    :checked="
+                        afterdialysis.internal_fistula.indexOf('不存在') > -1
+                          ? true
+                          : false
+                      "
+                  ></check-box>
                 </div>
                 <div class="inline_block">
                   &emsp;失衡综合症：
-                  <check-box text="无" :checked="afterdialysis.disequilibrium_syndrome==1?true:false"></check-box>
-                  <check-box text="有" :checked="afterdialysis.disequilibrium_syndrome==2?true:false"></check-box>
+                  <check-box
+                    text="无"
+                    :checked="
+                       afterdialysis.complication.indexOf('无') > -1
+                          ? true
+                          : false
+                      "
+                  ></check-box>
+                  <check-box
+                    text="有"
+                    :checked="
+                        afterdialysis.complication.indexOf('头晕') > -1 ||
+                          afterdialysis.complication.indexOf('头痛') > -1||
+                            afterdialysis.complication.indexOf('呕吐') > -1||
+                              afterdialysis.complication.indexOf('低血压') > -1
+                          ? true
+                          : false
+                      "
+                  ></check-box>
                 </div>
                 <div class="inline_block">
                   （
-                  <check-box text="头晕"
-                             :checked="afterdialysis.disequilibrium_syndrome_option.indexOf('头晕')>-1?true:false"></check-box>
-                  <check-box text="头痛"
-                             :checked="afterdialysis.disequilibrium_syndrome_option.indexOf('头痛')>-1?true:false"></check-box>
-                  <check-box text="呕吐"
-                             :checked="afterdialysis.disequilibrium_syndrome_option.indexOf('呕吐')>-1?true:false"></check-box>
-                  <check-box text="低血压"
-                             :checked="afterdialysis.disequilibrium_syndrome_option.indexOf('低血压')>-1?true:false"></check-box>
+                  <check-box
+                    :isChecked="
+                        afterdialysis.complication.indexOf('头晕') > -1
+                          ? true
+                          : false
+                      "
+                    text="头晕"
+                  ></check-box>
+                  <check-box
+                    :isChecked="
+                        afterdialysis.complication.indexOf('头痛') > -1
+                          ? true
+                          : false
+                      "
+                    text="头痛"
+                  ></check-box>
+                  <check-box
+                    :isChecked="
+                        afterdialysis.complication.indexOf('呕吐') > -1
+                          ? true
+                          : false
+                      "
+                    text="呕吐"
+                  ></check-box>
+                  <check-box
+                    :isChecked="
+                        afterdialysis.complication.indexOf('低血压') > -1
+                          ? true
+                          : false
+                      "
+                    text="低血压"
+                  ></check-box>
                   ）
                 </div>
               </div>
@@ -643,7 +705,9 @@
                 </div>
                 <div class="inline_block">
                   透析器：
-                  <check-box text="0" :checked="afterdialysis.dialyzer == 1?true:false"></check-box>
+                  <check-box text="0" :checked=" afterdialysis.dialyzer.indexOf('透析器-0度') > -1
+                          ? true
+                          : false"></check-box>
                   <check-box text="+" :checked="afterdialysis.dialyzer == 2?true:false"></check-box>
                   <check-box text="++" :checked="afterdialysis.dialyzer == 3?true:false"></check-box>
                   <check-box text="+++" :checked="afterdialysis.dialyzer == 4?true:false"></check-box>