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

config/dev.env.js

@@ -6,9 +6,8 @@
 module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
-  //BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
+  BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
   // BASE_API:'"http://localhost:9531"',
-  BASE_API: '"http://api.xt.test.sgjyun.com"',
   SSO_HOST: '"http://testsso.sgjyun.com"',
   SRCM_HOST: '"http://test1.sgjyun.com"',
   XT_HOST: '"http://xt.test.sgjyun.com"',

src/store/modules/xt_user.js

@@ -363,12 +363,16 @@ const xt_user = {
         resolve()
       })
     }, updateAllFiledConfigList({ commit }, object) {
+      console.log(object)
       var oldFiledList = getFiledConfigList()
       var infoJSON = JSON.parse(oldFiledList)
 
       return new Promise((resolve, reject) => {
         infoJSON = object
+        console.log(infoJSON)
+
         setFiledConfigList(JSON.stringify(infoJSON))
+
         commit('SET_FILEDS_LIST', infoJSON)
         resolve()
       })

src/xt_pages/data/printTemplate.vue

@@ -222,9 +222,9 @@ export default {
               this.radio = template_id.toString();
               this.tempRadio = template_id.toString();
               // 同步
-              console.log(response.data.data.fileds)
+              // console.log(response.data.data.fileds)
               this.loading = false;
-               store.dispatch("updateAllFiledConfigList", response.data.data.fileds).then(() => {});
+               // store.dispatch("updateAllFiledConfigList", response.data.data.fileds).then(() => {});
               this.$message({
                 type: "success",
                 message: "切换成功"

src/xt_pages/dialysis/template/dialysisPrintOrderTwelve.vue

@@ -11,22 +11,52 @@
             </td>
           </tr>
           <tr>
-            <td width="50" style="padding-left:5px;border:none">姓 名:</td>
-            <td width="120" style="border:none;text-align: left;">
-              <div>&nbsp;{{ patientInfo.name ? patientInfo.name : "/" }}</div>
+            <td
+              width="120"
+              style="padding-left:5px;border:none;text-align: left;"
+            >
+              <div>
+                姓 名:&nbsp;{{ patientInfo.name ? patientInfo.name : "/" }}
+              </div>
             </td>
-            <td width="100" style="border:none"></td>
 
-            <td width="50" style="border:none">性 别:</td>
-            <td width="180" style="border:none;text-align: left;">
-              <div>
+            <td width="120" style="border:none;text-align: left;">
+              性 别：
+              <span>
                 {{ patientInfo.gender ? patientInfo.gender : "/" }}
+              </span>
+            </td>
+            <td width="120" style="border:none;text-align: left;">
+              年 龄：
+              <span>
+                {{ getAge(patientInfo) }}
+              </span>
+            </td>
+            <td width="50" style="border:none">身 高:</td>
+            <td width="80" style="border:none;text-align: left;">
+              <span>
+                &nbsp;&nbsp;&nbsp;{{
+                  patientInfo.height ? patientInfo.height : ""
+                }}&nbsp;&nbsp;&nbsp;
+              </span>
+              cm
+            </td>
+            <td width="50" style="border:none">科 室:</td>
+            <td width="140" style="border:none;text-align: left;">
+              <div>
+                <label-box
+                  showValue="住院"
+                  :isChecked="patientInfo_source_1 ? true : false"
+                ></label-box>
+                <label-box
+                  showValue="门诊"
+                  :isChecked="patientInfo_source_2 ? true : false"
+                ></label-box>
               </div>
             </td>
-            <!-- <td width="1"></td> -->
 
             <td width="80" style="border:none">透析机号:</td>
-            <td width="130" style="border:none;text-align: left;">
+            <td width="80" style="border:none;text-align: left;">
               <div>
                 {{
                   dialysisOrder &&
@@ -39,7 +69,7 @@
             </td>
             <!-- <td width="1"></td> -->
             <td width="50" style="border:none">床位号:</td>
-            <td width="180" style="border-left:none;text-align: left;">
+            <td width="80" style="border-left:none;text-align: left;">
               <div>
                 {{ patientInfo.dialysis_no }}
               </div>
@@ -714,7 +744,8 @@
           <td style="width:60px" rowspan="2">时间</td>
           <td colspan="4">透析参数</td>
           <td colspan="5">生命体征</td>
-          <td colspan="3">治疗中病情变化</td>
+          <td colspan="2">治疗中病情变化</td>
+          <td style="width:80px" rowspan="2">护士签名</td>
         </tr>
         <tr>
           <th style="width:70px">
@@ -731,7 +762,7 @@
           </th>
           <th style="width:70px">
             <p style="height:20px;line-height:20px">脱水量</p>
-            <p style="height:20px;line-height:20px">ml</p>
+            <p style="height:20px;line-height:20px">L</p>
           </th>
           <th style="width:30px">
             <p style="height:20px;line-height:20px">T</p>
@@ -753,14 +784,12 @@
             <p style="height:20px;line-height:20px">Spo<sub>2</sub></p>
             <p style="height:20px;line-height:20px">%</p>
           </th>
-          <th style="width:60px">
-            <p style="height:20px;line-height:20px">时间</p>
-          </th>
           <th style="width:333px">
             <p style="height:20px;line-height:20px">
               记&nbsp;&nbsp;&nbsp;&nbsp;录
             </p>
           </th>
+          <!-- <td style="width:80px">护士签名</td> -->
         </tr>
 
         <tr v-for="(monitor, monindex) in monitors" :key="monindex">
@@ -836,9 +865,6 @@
                 : "0"
             }}</span>
           </td>
-          <td>
-            {{ getTime(monitor.operate_time, "{h}:{i}") }}
-          </td>
           <td>
             <span v-if="monitor.symptom || monitor.dispose || monitor.result">
               {{
@@ -846,6 +872,19 @@
               }}
             </span>
           </td>
+          <td width="0" style="border:none;visibility: hidden;padding:0"></td>
+          <td>
+            <span v-if="setAdminUserES(monitor.monitoring_nurse) == ''">{{
+              getAdminUser(monitor.monitoring_nurse)
+            }}</span>
+            <img
+              class="es-img"
+              :src="setAdminUserES(monitor.monitoring_nurse)"
+              alt=""
+              srcset=""
+              v-else
+            />
+          </td>
         </tr>
       </table>
 
@@ -975,16 +1014,11 @@
       <table class="print-table" border="1">
         <tbody>
           <tr>
-            <td width="100" style="padding-left:5px;border:none">透析体重:</td>
+            <td width="100" style="padding-left:5px;border:none">透前体重:</td>
             <td width="120" style="border:none;text-align:left;border:none;">
               <div>
                 &nbsp;<span style="width:70px;display:inline-block">{{
-                  predialysis.weight_before
-                    ? parseFloat(
-                        predialysis.weight_before -
-                          predialysis.additional_weight
-                      ).toFixed(1)
-                    : ""
+                  predialysis.weight_before ? predialysis.weight_before : ""
                 }}</span
                 >Kg
               </div>
@@ -1045,6 +1079,56 @@
           </tr>
         </tbody>
       </table>
+      <table class="print-table" border="1">
+        <tbody>
+          <tr>
+            <td
+              width="100"
+              style="padding-left:5px;border:none;border-right:1px solid #000;"
+            >
+              透后评估
+            </td>
+
+            <td width="100" style="border:none;padding-left:5px;">
+              透析器凝血:
+            </td>
+            <td width="100" style="text-align:left;border:none;">
+              <div>
+                <span style="width:100px;display:inline-block;border:none;">{{
+                  afterdialysis.cruor ? afterdialysis.cruor : ""
+                }}</span>
+              </div>
+            </td>
+            <!-- <td width="10" style="border:none;"></td> -->
+
+            <td width="70" style="border:none;padding-left:5px;">
+              内瘘:
+            </td>
+            <td
+              width="200"
+              style="text-align:left;border:none;line-height: 30px;"
+            >
+              <div>
+                <span style="width:200px;display:inline-block">{{
+                  afterdialysis.internal_fistula
+                    ? afterdialysis.internal_fistula
+                    : ""
+                }}</span>
+              </div>
+            </td>
+            <td width="70" style="border:none;padding-left:5px">
+              导管:
+            </td>
+            <td width="180" style="text-align:left;border:none;">
+              <div>
+                <span style="width:180px;display:inline-block">{{
+                  afterdialysis.catheter ? afterdialysis.catheter : ""
+                }}</span>
+              </div>
+            </td>
+          </tr>
+        </tbody>
+      </table>
       <table class="print-table" border="1">
         <!-- <td>
           <table class="table-box" style="table-layout:fixed">
@@ -1586,7 +1670,7 @@ export default {
           console.log("上次透后体重", this.assessmentafter);
           var doctorAdevieInfo = response.data.data.doctorAdevieInfo;
           var tableAdvice = doctorAdevieInfo;
-          // console.log('医生', tableAdvice.length)
+          console.log("医生", tableAdvice);
           if (tableAdvice.length === 0) {
             var obj = { advice_name: "", start_time: "" };
             var obj1 = { advice_name: "", start_time: "" };

src/xt_permission.js

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-  //   store.dispatch('VerifyConfigList', []).then(() => {
-  //     next()
-  //   })
-  // }
-  // if (store.getters.permission_routers === undefined) {
-  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
-  //     next()
-  //   })
-  // } else {
-  //   next()
-  // }
-  // return
+  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+    store.dispatch('VerifyConfigList', []).then(() => {
+      next()
+    })
+  }
+  if (store.getters.permission_routers === undefined) {
+    store.dispatch('xt_GenerateRoutes', []).then(() => {
+      next()
+    })
+  } else {
+    next()
+  }
+  return
   // 线上注释
 
   NProgress.start()