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/dialysisPrintOrder.vue

@@ -206,11 +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"
-      ></DialysisPrintOrderNine>
+      <!--<DialysisPrintOrderNine-->
+        <!--v-bind:childResponse="childResponse"-->
+        <!--v-if="org_template_info.template_id == 9"-->
+      <!--&gt;</DialysisPrintOrderNine>-->
     </div>
   </div>
 </template>
@@ -231,7 +232,6 @@ import DialysisPrintOrderSeven from "./template/DialysisPrintOrderSeven";
 import DialysisPrintOrderEight from "./template/DialysisPrintOrderEight";
 import print from "print-js";
 import DialysisPrintOrderTen from "./template/DialysisPrintOrderTen";
-import DialysisPrintOrderNine from "./template/DialysisPrintOrderNine";
 
 export default {
   name: "dialysisPrintOrder",

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>