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

src/store/modules/xt_user.js

@@ -199,65 +199,7 @@ const xt_user = {
         })
 
         // console.log('登录信息缓存：', cacheInfo)
-        if (cacheInfo != null && cacheInfo.length > 0) {
-          var infoJSON = JSON.parse(cacheInfo)
-          // console.log('用户信息缓存：', infoJSON)
-          commit('SET_CURRENT_INFO', {
-            user: infoJSON.user,
-            cur_org_id: infoJSON.current_org_id,
-            cur_app_id: infoJSON.current_app_id,
-            org: infoJSON.org,
-            subscibe: infoJSON.subscibe,
-            template_info: infoJSON.template_info,
-            scrm_role_exist: infoJSON.scrm_role_exist,
-            cdm_role_exist: infoJSON.cdm_role_exist,
-            mall_role_exist: infoJSON.mall_role_exist
-          })
-
-          
-          // let urlfors = infoJSON.urlfors
-          // if(infoJSON.cdm_role_exist == true){
-          //   console.log("有")
-          //   urlfors.push("/slow")
-          //   this.commit('SET_URLFORS', {
-          //     urlfors: urlfors
-          //   })
-          // }else{
-          //   this.commit('SET_URLFORS', {
-          //     urlfors: infoJSON.urlfors
-          //   })
-          // }
-
-          // if(infoJSON.scrm_role_exist == true){
-          //   urlfors.push("/scrm")
-          //   this.commit('SET_URLFORS', {
-          //     urlfors: urlfors
-          //   })
-          // }else{
-          //   this.commit('SET_URLFORS', {
-          //     urlfors: infoJSON.urlfors
-          //   })
-          // }
-
-          // if(infoJSON.mall_role_exist == true){
-          //   console.log("有")
-          //   urlfors.push("/shop")
-          //   this.commit('SET_URLFORS', {
-          //     urlfors: urlfors
-          //   })
-          // }else{
-          //   this.commit('SET_URLFORS', {
-          //     urlfors: infoJSON.urlfors
-          //   })
-          // }
-          // console.log(222222222222,infoJSON)
-          
-          commit('SET_URLFORS', {
-            urlfors: infoJSON.urlfors
-          })
 
-          resolve(infoJSON.user.user_id)
-        } else {
           verifyToken(token).then(response => {
             if (response.data.state === 1) {
               // alert('验证通过')
@@ -310,7 +252,7 @@ const xt_user = {
                   urlfors: data.urlfors
                 })
               }
-              
+
 
               // this.commit('SET_URLFORS', {
               //   urlfors: data.urlfors
@@ -331,7 +273,6 @@ const xt_user = {
               })
             }
           })
-        }
       })
     },
     ModifyAdminUserInfo({

src/views/layout/components/Navbar.vue

@@ -177,48 +177,49 @@ export default {
             this.org_id = data.org.id;
             this.org_name = data.org.org_name;
 
-            this.$store.dispatch("ModifyAdminUserOrgInfo", {
-              user: data.user,
-              cur_org_id: data.current_org_id,
-              cur_app_id: data.current_app_id,
-              org: data.org,
-              subscibe: data.subscibe,
-              template_info: data.template_info,
-              scrm_role_exist: data.scrm_role_exist,
-              cdm_role_exist: data.cdm_role_exist,
-              mall_role_exist: data.mall_role_exist
-            });
-
-            this.$store.dispatch("ModifyUrlInfo", {
-              urlfors: data.urlfors
-            });
-
-            this.$store.dispatch("ModifyFiled", {
-              fileds: data.fileds
-            });
-
-            setFiledConfigList(JSON.stringify(data.fileds));
-            cacheAdminUserInfo(JSON.stringify(data));
-
-            this.$store
-              .dispatch(
-                "xt_GenerateRoutes",
-                this.$store.getters.current_role_urls
-              )
-              .then(() => {
-                this.$store.dispatch("VerifyConfigList").then(() => {
-                  // alert('token 验证成功')
-                  // console.log(this.$store.getters.xt_permission.addRouters)
-                  this.$router.addRoutes(
-                    this.$store.getters.xt_permission.addRouters
-                  ); // 动态添加可访问路由表
-                  //        next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
-                  // this.$router.replace({ path: '/' })
-                  window.location.reload();
-                  // this.$router.go(0)
-                  // this.reload()
-                });
-              });
+            // this.$store.dispatch("ModifyAdminUserOrgInfo", {
+            //   user: data.user,
+            //   cur_org_id: data.current_org_id,
+            //   cur_app_id: data.current_app_id,
+            //   org: data.org,
+            //   subscibe: data.subscibe,
+            //   template_info: data.template_info,
+            //   scrm_role_exist: data.scrm_role_exist,
+            //   cdm_role_exist: data.cdm_role_exist,
+            //   mall_role_exist: data.mall_role_exist
+            // });
+            //
+            // this.$store.dispatch("ModifyUrlInfo", {
+            //   urlfors: data.urlfors
+            // });
+            //
+            // this.$store.dispatch("ModifyFiled", {
+            //   fileds: data.fileds
+            // });
+
+            // setFiledConfigList(JSON.stringify(data.fileds));
+            // cacheAdminUserInfo(JSON.stringify(data));
+
+            window.location.reload();
+
+            // this.$store
+            //   .dispatch(
+            //     "xt_GenerateRoutes",
+            //     this.$store.getters.current_role_urls
+            //   )
+            //   .then(() => {
+            //     this.$store.dispatch("VerifyConfigList").then(() => {
+            //       // alert('token 验证成功')
+            //       // console.log(this.$store.getters.xt_permission.addRouters)
+            //       this.$router.addRoutes(
+            //         this.$store.getters.xt_permission.addRouters
+            //       ); // 动态添加可访问路由表
+            //       //        next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+            //       // this.$router.replace({ path: '/' })
+            //       // this.$router.go(0)
+            //       // this.reload()
+            //     });
+            //   });
           } else {
             this.$message.success(response.data.msg);
           }

src/xt_pages/dialysis/batch_print/batch_print_order.vue

@@ -1217,7 +1217,7 @@
                               ? true
                               : false
                           "
-                          showValue="减弱"
+                          text="减弱"
                         ></check-box>
                         <check-box
                           :checked="
@@ -1227,7 +1227,7 @@
                               ? true
                               : false
                           "
-                          showValue="无"
+                          text="无"
                         ></check-box>
                       </div>
                     </div>

src/xt_pages/dialysis/batch_print/batch_print_order_other_two.vue

@@ -519,11 +519,11 @@
                         class="under_line"
                         style="width:60px;text-align: left"
                         v-if="
-                          record.prescription &&
-                            record.prescription.ultrafiltration
+                          record.assessment_after_dislysis &&
+                            record.assessment_after_dislysis.actual_ultrafiltration
                         "
                       >
-                        {{ getFloat(record.prescription.ultrafiltration) }}
+                        {{ getFloat(record.assessment_after_dislysis.actual_ultrafiltration) }}
                       </div>
                       <div class="under_line" style="width:60px;" v-else>
                         {{ "/" }}

src/xt_pages/dialysis/template/DialysisPrintOrderTen.vue

@@ -580,18 +580,17 @@
                     style="width: 100px;text-align: center"
                   >
                     {{
-                    predialysis.weight_after_last_transparency
+                    last_afterdialysis.weight_after
                     ? parseFloat(
-                    predialysis.weight_after_last_transparency -
-                    predialysis.additional_weight
+                    last_afterdialysis.weight_after
                     ).toFixed(1)
                     : '未称重'
                     }}
                   </div>
                   kg
                 </div>
-                <div class="inline_block" style="flex:1;">
                   透前体重：
+                  <div class="inline_block" style="flex:1;">
                   <div
                     class="under_line"
                     style="width: 70px;text-align: center"
@@ -1897,24 +1896,11 @@
                 </div>
                 <div class="inline_block" style="flex:1;">
                   治疗医生：
-                  <div
-                    class="under_line"
-                    style="width: 120px;"
-                  >
+                  <div class="under_line" style="width: 80px">
                     <img style="height:20px;" src="https://images.shengws.com/FgnRnBcx1BgULJ1dn7VKzeBPEvtm" alt="" srcset="">
-                    <span
-                        v-if="setAdminUserES(prescription.prescription_doctor) == ''"
-                      >{{
-                          getAdminUser(prescription.prescription_doctor)
-                        }}</span
-                      >
-                    <img
-                      style="height:20px;"
-                      :src="setAdminUserES(prescription.prescription_doctor)"
-                      alt=""
-                      srcset=""
-                      v-else
-                    />
+                    <!--<img style="height:20px;" src="https://images.shengws.com/FgnRnBcx1BgULJ1dn7VKzeBPEvtm" alt="" srcset="">-->
+                    <span v-if="setAdminUserES(prescription.prescription_doctor) == ''">{{getAdminUser(prescription.prescription_doctor)}}</span>
+                    <img style="height:20px;" :src="setAdminUserES(prescription.prescription_doctor)" alt="" srcset="" v-else>
                   </div>
                 </div>
                 <div class="inline_block" style="flex:1;">
@@ -2017,6 +2003,10 @@
           },
           gender: 0
         },
+        last_afterdialysis:{
+          weight_after:'',
+
+        },
         predialysis: {
           score: '',
           internal_fistula: '',
@@ -2236,6 +2226,9 @@
             this.predialysis.blood_access_part_opera_id
           )
           this.afterdialysis = response.data.data.AssessmentAfterDislysis
+
+          this.last_afterdialysis = response.data.data.assessmentAfterDislysis
+
           this.operators = response.data.data.operators
           this.dialysisOrder =
             response.data.data.dialysisOrder === null