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

src/store/modules/globalConfig.js

@@ -1521,11 +1521,11 @@ const global_config = {
       },
       {
         id: 3,
-        name: '透析起-Ⅱ度'
+        name: '透析器-Ⅱ度'
       },
       {
         id: 4,
-        name: '透析起-Ⅲ度'
+        name: '透析器-Ⅲ度'
       },
       {
         id: 5,

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

@@ -117,7 +117,7 @@
       </div>
       <div>
         <i class="el-icon-question"></i>
-        <span @click="toClick">帮助中心</span>
+        <a href="https://sso.kuyicloud.com/help" target="_blank">帮助中心</a>
       </div>
     </div>
   </div>
@@ -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);
           }
@@ -272,9 +273,6 @@ export default {
         "/org/admin/apps?org=" +
         this.$store.getters.xt_user.org_id
       );
-    },
-    toClick() {
-      window.location.href = "https://sso.kuyicloud.com/help";
     }
   },
   created() {

src/xt_pages/data/printTemplate.vue

@@ -144,26 +144,26 @@
             >
           </el-col>
 
-          <el-col :span="6" style="text-align: center">
-            <div class="demo-image__preview">
-              <el-tooltip
-                class="item"
-                effect="dark"
-                content="点击查看大图"
-                placement="top-start"
-                :hide-after="2000"
-              >
-                <el-image
-                  style="width: 200px; height: 200px;margin-left:30px"
-                  :src="require('@/assets/home/template_ten.jpg')"
-                  :preview-src-list="imgs_ten"
-                ></el-image>
-              </el-tooltip>
-            </div>
-            <el-radio v-model="radio" label="10" @change="change"
-            >模版十</el-radio
-            >
-          </el-col>
+          <!--<el-col :span="6" style="text-align: center">-->
+            <!--<div class="demo-image__preview">-->
+              <!--<el-tooltip-->
+                <!--class="item"-->
+                <!--effect="dark"-->
+                <!--content="点击查看大图"-->
+                <!--placement="top-start"-->
+                <!--:hide-after="2000"-->
+              <!--&gt;-->
+                <!--<el-image-->
+                  <!--style="width: 200px; height: 200px;margin-left:30px"-->
+                  <!--:src="require('@/assets/home/template_ten.jpg')"-->
+                  <!--:preview-src-list="imgs_ten"-->
+                <!--&gt;</el-image>-->
+              <!--</el-tooltip>-->
+            <!--</div>-->
+            <!--<el-radio v-model="radio" label="10" @change="change"-->
+            <!--&gt;模版十</el-radio-->
+            <!--&gt;-->
+          <!--</el-col>-->
         </el-row>
       </div>
     </div>

src/xt_pages/dialysis/batch_print/batch_print_order.vue

@@ -1199,36 +1199,36 @@
                       </div>
                       <div class="inline_block" style="margin-left: 40px;">
                         压迫后内瘘震颤：
-                        <label-box
-                          :isChecked="
+                        <check-box
+                          :checked="
                             record.assessment_after_dislysis.internal_fistula.indexOf(
                               '存在'
                             ) > -1
                               ? true
                               : false
                           "
-                          showValue="存在"
-                        ></label-box>
-                        <label-box
-                          :isChecked="
+                          text="存在"
+                        ></check-box>
+                        <check-box
+                          :checked="
                             record.assessment_after_dislysis.internal_fistula.indexOf(
                               '减弱'
                             ) > -1
                               ? true
                               : false
                           "
-                          showValue="减弱"
-                        ></label-box>
-                        <label-box
-                          :isChecked="
+                          text="减弱"
+                        ></check-box>
+                        <check-box
+                          :checked="
                             record.assessment_after_dislysis.internal_fistula.indexOf(
                               '无'
                             ) > -1
                               ? true
                               : false
                           "
-                          showValue="无"
-                        ></label-box>
+                          text="无"
+                        ></check-box>
                       </div>
                     </div>
                     <div class="row" style="padding: 2px 0;">

src/xt_pages/dialysis/batch_print/batch_print_order_eight.vue

@@ -773,7 +773,7 @@
                               v-else
                               style="height: 20px;"
                             /></td>
-          <td> <span v-if="advice[0].parent_id > 0">└</span>
+          <td style="text-align:left;padding-left:20px"> <span v-if="advice[0].parent_id > 0">└</span>
                        <span>{{ advice[0].advice_name }}</span>
                         <span
                            >{{ advice[0].advice_desc

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/details/dialog/AssessmentAfterDislysis.vue

@@ -7,7 +7,7 @@
       width="1010px"
       :modal-append-to-body="false"
     >
-    <div class="warnTxt" v-if="showTxt != ''">{{ showTxt }}</div>
+      <div class="warnTxt" v-if="showTxt != ''">{{ showTxt }}</div>
       <el-form ref="form" :model="form" label-width="160px">
         <!-- <el-row :gutter="20"> -->
         <el-row :gutter="20">
@@ -41,7 +41,6 @@
             </el-form-item>
           </el-col>
 
-
           <el-col :span="8" v-if="isShow('体重减少')">
             <el-form-item label="体重减少(kg): ">
               <el-input v-model="form.weight_loss"></el-input>
@@ -57,7 +56,6 @@
             </el-form-item>
           </el-col>
 
-
           <el-col :span="8" v-if="isShow('并发症')">
             <el-form-item label="并发症: ">
               <el-input
@@ -68,7 +66,6 @@
             </el-form-item>
           </el-col>
 
-
           <el-col :span="8" v-if="isShow('内瘘')">
             <el-form-item label="内瘘: ">
               <el-input
@@ -120,7 +117,6 @@
             </el-form-item>
           </el-col>
 
-
           <el-col :span="8" v-if="isShow('透析过程提前其他原因')">
             <el-form-item label="透析过程提前其他原因: ">
               <el-input
@@ -130,7 +126,6 @@
             </el-form-item>
           </el-col>
 
-
           <el-col :span="8" v-if="isShow('内瘘管拔针后压迫止血时间')">
             <el-form-item label="内瘘管拔针后压迫止血时间(min): ">
               <el-input v-model="form.hemostasis_minute" :rows="5"></el-input>
@@ -151,7 +146,6 @@
             </el-form-item>
           </el-col>
 
-
           <el-col :span="8" v-if="isShow('动脉管道')">
             <el-form-item label="动脉管道: ">
               <el-select v-model="form.arterial_tube">
@@ -181,7 +175,6 @@
             </el-form-item>
           </el-col>
 
-
           <el-col :span="8" v-if="isShow('透析器凝血')">
             <el-form-item label="透析器凝血: ">
               <el-input
@@ -192,7 +185,6 @@
             </el-form-item>
           </el-col>
 
-
           <el-col :span="8" v-if="isShow('患者去向')">
             <el-form-item label="患者去向: ">
               <el-select v-model="form.patient_gose">
@@ -217,25 +209,20 @@
             </el-form-item>
           </el-col>
 
-
-
-<!--          <el-col :span="8" v-if="isShow('压迫后内瘘震颤')">-->
-<!--            <el-form-item label="压迫后内瘘震颤: ">-->
-<!--              <el-select v-model="form.internal_fistula_tremor_ac">-->
-<!--                <el-option :key="0" label="请选择" :value="0"></el-option>-->
-
-<!--                <el-option-->
-<!--                  v-for="item in internalFistulaTremorAcOptions"-->
-<!--                  :label="item.name"-->
-<!--                  :value="item.id"-->
-<!--                  :key="item.id"-->
-<!--                ></el-option>-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-
-
-
+          <!--          <el-col :span="8" v-if="isShow('压迫后内瘘震颤')">-->
+          <!--            <el-form-item label="压迫后内瘘震颤: ">-->
+          <!--              <el-select v-model="form.internal_fistula_tremor_ac">-->
+          <!--                <el-option :key="0" label="请选择" :value="0"></el-option>-->
+
+          <!--                <el-option-->
+          <!--                  v-for="item in internalFistulaTremorAcOptions"-->
+          <!--                  :label="item.name"-->
+          <!--                  :value="item.id"-->
+          <!--                  :key="item.id"-->
+          <!--                ></el-option>-->
+          <!--              </el-select>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
 
           <el-row :gutter="20" v-if="form.patient_gose == 3 && isShow('科室')">
             <el-col :span="24">
@@ -277,7 +264,6 @@
             </el-col>
           </el-row>
 
-
           <el-col :span="8" v-if="isShow('体温')">
             <el-form-item label="体温(℃): ">
               <el-input v-model="form.temperature"></el-input>
@@ -342,11 +328,11 @@
 
         <el-row :gutter="20"> -->
 
-          <!--<el-col :span="8" v-if="isShow('实际置换量')">-->
-          <!--<el-form-item label="实际置换量(L): "  >-->
-          <!--<el-input v-model="form.actual_displacement"></el-input>-->
-          <!--</el-form-item>-->
-          <!--</el-col>-->
+          <el-col :span="8" v-if="isShow('实际置换量')">
+            <el-form-item label="实际置换量(L): ">
+              <el-input v-model="form.actual_displacement"></el-input>
+            </el-form-item>
+          </el-col>
 
           <!-- </el-row>
 
@@ -356,50 +342,44 @@
 
         <el-row :gutter="20"> -->
 
-
-<!--          <el-col :span="8" v-if="isShow('血管通路部位')">-->
-<!--            <el-form-item label="血管通路部位: ">-->
-<!--              <el-select v-model="form.blood_access_part_id">-->
-<!--                <el-option :key="0" label="请选择" :value="0"></el-option>-->
-
-<!--                <el-option-->
-<!--                  v-for="item in vascularAccessOptions"-->
-<!--                  :label="item.name"-->
-<!--                  :value="item.id"-->
-<!--                  :key="item.id"-->
-<!--                ></el-option>-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--          <el-col :span="8" v-if="isShow('血管通路')">-->
-<!--            <el-form-item label="血管通路: ">-->
-<!--              <el-select v-model="form.blood_access_part_opera_id">-->
-<!--                <el-option :key="0" label="请选择" :value="0"></el-option>-->
-
-<!--                <el-option-->
-<!--                  v-for="item in vascularAccessDescOptions"-->
-<!--                  :label="item.name"-->
-<!--                  :value="item.id"-->
-<!--                  :key="item.id"-->
-<!--                ></el-option>-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
+          <!--          <el-col :span="8" v-if="isShow('血管通路部位')">-->
+          <!--            <el-form-item label="血管通路部位: ">-->
+          <!--              <el-select v-model="form.blood_access_part_id">-->
+          <!--                <el-option :key="0" label="请选择" :value="0"></el-option>-->
+
+          <!--                <el-option-->
+          <!--                  v-for="item in vascularAccessOptions"-->
+          <!--                  :label="item.name"-->
+          <!--                  :value="item.id"-->
+          <!--                  :key="item.id"-->
+          <!--                ></el-option>-->
+          <!--              </el-select>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
+          <!--          <el-col :span="8" v-if="isShow('血管通路')">-->
+          <!--            <el-form-item label="血管通路: ">-->
+          <!--              <el-select v-model="form.blood_access_part_opera_id">-->
+          <!--                <el-option :key="0" label="请选择" :value="0"></el-option>-->
+
+          <!--                <el-option-->
+          <!--                  v-for="item in vascularAccessDescOptions"-->
+          <!--                  :label="item.name"-->
+          <!--                  :value="item.id"-->
+          <!--                  :key="item.id"-->
+          <!--                ></el-option>-->
+          <!--              </el-select>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
           <!-- </el-row>
 
         <el-row :gutter="20"> -->
 
-
-
-
-
           <!-- </el-row>
 
 
 
           <el-row :gutter="20" > -->
 
-
           <!--
                   </el-row>
 
@@ -407,20 +387,20 @@
 
 
                   <el-row :gutter="20"> -->
-<!--          <el-col :span="8" v-if="isShow('内瘘震颤和血管杂音')">-->
-<!--            <el-form-item label="内瘘震颤和血管杂音: ">-->
-<!--              <el-select v-model="form.tremor_noise">-->
-<!--                <el-option :key="0" label="请选择" :value="0"></el-option>-->
-
-<!--                <el-option-->
-<!--                  v-for="item in this.$store.getters.tremor_noise"-->
-<!--                  :label="item.name"-->
-<!--                  :value="item.id"-->
-<!--                  :key="item.id"-->
-<!--                ></el-option>-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
+          <!--          <el-col :span="8" v-if="isShow('内瘘震颤和血管杂音')">-->
+          <!--            <el-form-item label="内瘘震颤和血管杂音: ">-->
+          <!--              <el-select v-model="form.tremor_noise">-->
+          <!--                <el-option :key="0" label="请选择" :value="0"></el-option>-->
+
+          <!--                <el-option-->
+          <!--                  v-for="item in this.$store.getters.tremor_noise"-->
+          <!--                  :label="item.name"-->
+          <!--                  :value="item.id"-->
+          <!--                  :key="item.id"-->
+          <!--                ></el-option>-->
+          <!--              </el-select>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
           <el-col :span="8" v-if="isShow('失衡综合症')">
             <el-form-item label="失衡综合症: ">
               <el-select v-model="form.disequilibrium_syndrome">
@@ -435,15 +415,15 @@
               </el-select>
             </el-form-item>
           </el-col>
-<!--          <el-col :span="8" v-if="isShow('失衡综合症症状')">-->
-<!--            <el-form-item label="失衡综合症症状: ">-->
-<!--              <el-input-->
-<!--                v-model="form.disequilibrium_syndrome_option"-->
-<!--                readonly-->
-<!--                @focus="showDialog('8')"-->
-<!--              ></el-input>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
+          <!--          <el-col :span="8" v-if="isShow('失衡综合症症状')">-->
+          <!--            <el-form-item label="失衡综合症症状: ">-->
+          <!--              <el-input-->
+          <!--                v-model="form.disequilibrium_syndrome_option"-->
+          <!--                readonly-->
+          <!--                @focus="showDialog('8')"-->
+          <!--              ></el-input>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
 
           <!-- </el-row>
 
@@ -451,20 +431,20 @@
 
           <el-row :gutter="20"  > -->
 
-<!--          <el-col :span="8" v-if="isShow('透析器')">-->
-<!--            <el-form-item label="透析器凝血: ">-->
-<!--              <el-select v-model="form.dialyzer">-->
-<!--                <el-option :key="0" label="请选择" :value="0"></el-option>-->
-
-<!--                <el-option-->
-<!--                  v-for="item in this.$store.getters.dialyzer"-->
-<!--                  :label="item.name"-->
-<!--                  :value="item.id"-->
-<!--                  :key="item.id"-->
-<!--                ></el-option>-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
+          <!--          <el-col :span="8" v-if="isShow('透析器')">-->
+          <!--            <el-form-item label="透析器凝血: ">-->
+          <!--              <el-select v-model="form.dialyzer">-->
+          <!--                <el-option :key="0" label="请选择" :value="0"></el-option>-->
+
+          <!--                <el-option-->
+          <!--                  v-for="item in this.$store.getters.dialyzer"-->
+          <!--                  :label="item.name"-->
+          <!--                  :value="item.id"-->
+          <!--                  :key="item.id"-->
+          <!--                ></el-option>-->
+          <!--              </el-select>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
           <el-col :span="8" v-if="isShow('透析期间进食')">
             <el-form-item label="透析期间进食: ">
               <el-radio-group v-model="form.is_eat">
@@ -478,7 +458,11 @@
 
       <span slot="footer" class="dialog-footer">
         <el-button @click="hide">取 消</el-button>
-        <el-button type="primary" @click="submitForm" :loading="loading" v-if="hasPermission"
+        <el-button
+          type="primary"
+          @click="submitForm"
+          :loading="loading"
+          v-if="hasPermission"
           >保 存</el-button
         >
       </span>
@@ -499,7 +483,7 @@ import { postAssessmentAfterDislysis } from "@/api/dialysis";
 import { uParseTime } from "@/utils/tools";
 import store from "@/store";
 
-import request from '@/utils/request'
+import request from "@/utils/request";
 
 export default {
   name: "AssessmentAfterDislysis",
@@ -528,8 +512,8 @@ export default {
   },
   data() {
     return {
-      showTxt:'',
-      hasPermission:true,
+      showTxt: "",
+      hasPermission: true,
       loading: false,
       record_date: "",
       isVisibility: false,
@@ -935,7 +919,7 @@ export default {
         default:
           break;
       }
-      console.log(val);
+      // console.log(val);
     },
     DialogCancle: function(val) {
       this.InnerDialogProps.visibility = false;
@@ -943,9 +927,9 @@ export default {
 
     show(predialysis) {
       this.isVisibility = true;
-      this.predialysis = predialysis
-      console.log("透后",predialysis)
-      this.getPermission()
+      this.predialysis = predialysis;
+      // console.log("透后", predialysis);
+      this.getPermission();
     },
 
     hide() {
@@ -977,44 +961,54 @@ export default {
         this.assessment_after_dislysis["actual_treatment_minute"]
       );
     },
-    getPermission(){
-      request.get("/api/func_per/get",{
-        params:{
-          create_url:"/api/dialysis/assessmentafterdislysis?mode=1",
-          modify_url:"/api/dialysis/assessmentafterdislysis?mode=2",
-          modify_other_url:"/api/dialysis/assessmentafterdislysis?mode=3",
-          module:8
-        }
-      }).then(res => {
-        console.log(res)
-        console.log("透后",this.predialysis)
-        if(res.data.state == 0){
-          this.hasPermission = false
-        }else if(res.data.state == 1){
-          if(this.predialysis.id != "" && this.predialysis.creater != 0){//有数据
-            if(this.predialysis.creater == this.$store.getters.xt_user.user.id){//创建人是自己
-              if(res.data.data.is_has_modify == false){
-                this.hasPermission = false
-                this.showTxt = "你没有修改透后评估权限"
+    getPermission() {
+      request
+        .get("/api/func_per/get", {
+          params: {
+            create_url: "/api/dialysis/assessmentafterdislysis?mode=1",
+            modify_url: "/api/dialysis/assessmentafterdislysis?mode=2",
+            modify_other_url: "/api/dialysis/assessmentafterdislysis?mode=3",
+            module: 8
+          }
+        })
+        .then(res => {
+          console.log(res);
+          // console.log("透后", this.predialysis);
+          if (res.data.state == 0) {
+            this.hasPermission = false;
+          } else if (res.data.state == 1) {
+            if (this.predialysis.id != "" && this.predialysis.creater != 0) {
+              //有数据
+              if (
+                this.predialysis.creater == this.$store.getters.xt_user.user.id
+              ) {
+                //创建人是自己
+                if (res.data.data.is_has_modify == false) {
+                  this.hasPermission = false;
+                  this.showTxt = "你没有修改透后评估权限";
+                }
+              } else {
+                //创建人不是自己
+                if (res.data.data.is_has_modify_other == false) {
+                  this.hasPermission = false;
+                  this.showTxt = "你没有修改他人透后评估权限";
+                }
               }
-            }else{//创建人不是自己
-              if(res.data.data.is_has_modify_other == false){
-                this.hasPermission = false
-                this.showTxt = "你没有修改他人透后评估权限"
+            } else if (
+              this.predialysis.id == "" ||
+              this.predialysis.creater == 0
+            ) {
+              if (res.data.data.is_has_create == false) {
+                this.hasPermission = false;
+                this.showTxt = "你没有新增透后评估权限";
               }
             }
-          }else if(this.predialysis.id == "" || this.predialysis.creater == 0){
-            if(res.data.data.is_has_create  == false){
-              this.hasPermission = false
-              this.showTxt = "你没有新增透后评估权限"
-            }
           }
-        }
-      })
+        });
     }
   },
   created() {
-    console.log("this.form", this.form);
+    // console.log("this.form", this.form);
     this.cruorOptions = getDataConfig("hemodialysis", "cruor");
     this.symptomsOptions = getDataConfig("hemodialysis", "symptoms");
     this.internalFistulaOptions = getDataConfig(
@@ -1046,7 +1040,7 @@ export default {
 </script>
 
 <style scoped>
-.warnTxt{
+.warnTxt {
   text-align: center;
   margin: 0 auto;
   background: #faa331;
@@ -1054,12 +1048,12 @@ export default {
   padding: 10px 20px;
   border-radius: 4px;
   margin-bottom: 10px;
-  color:#fff;
+  color: #fff;
 }
 </style>
 <style lang="scss">
-.newDialog{
-  .el-dialog__body{
+.newDialog {
+  .el-dialog__body {
     padding: 10px 20px 30px;
   }
 }

src/xt_pages/dialysis/details/dialog/assessmentBeforeDislysisDialog.vue

@@ -165,7 +165,7 @@
 
 
           <el-col :span="8">
-            <el-form-item label="内瘘皮肤情况: " v-if="isShow('内瘘皮肤情况')">
+            <el-form-item label="血管通路皮肤情况: " v-if="isShow('血管通路皮肤情况')">
               <el-input v-model="assessmentBeforeDislysis.internal_fistula_skin" readonly
                         @focus="showInnerDialog('8')"></el-input>
             </el-form-item>
@@ -727,7 +727,7 @@
             break
           case '8': // 内瘘皮肤情况
             this.InnerDialogProps.values = this.internal_fistula_skin
-            this.InnerDialogProps.titles = '内瘘皮肤情况'
+            this.InnerDialogProps.titles = '血管通路皮肤情况'
             this.InnerDialogProps.type = 'internal_fistula_skin'
             this.InnerDialogProps.selected = this.assessmentBeforeDislysis.internal_fistula_skin
             this.InnerDialogProps.isShowTextArea = false

src/xt_pages/dialysis/template/DialysisPrintOrderEight.vue

@@ -623,7 +623,7 @@
         <tr>
           <td style="text-align:left;" colspan="8">
             <span style="display:inline-block;margin-left:15px;">
-              血管通路皮肤:
+              血管通路皮肤情况:
               <label-box
                 :isChecked="
                   predialysis.internal_fistula_skin.indexOf('正常') > -1
@@ -902,7 +902,9 @@
           <td>{{ monitor.sodium_concentration }}</td>
           <td>
             <span style="line-height:18px;display:block;"
-              >{{ monitor.symptom }} &nbsp;{{ monitor.result }}</span
+              >{{ monitor.symptom }} &nbsp;{{ monitor.result }}&nbsp;{{
+                monitor.dispose
+              }}</span
             >
           </td>
           <td>
@@ -1030,7 +1032,10 @@
           </td>
         </tr>
         <tr>
-          <td style="text-align:left;" colspan="12">
+          <td style="text-align:left;">
+            置换液总量:{{ afterdialysis.actual_displacement }} L
+          </td>
+          <td style="text-align:left;" colspan="11">
             <span style="display:inline-block;margin-left:15px;">
               内瘘搏动及震颤音:
               <label-box
@@ -1135,8 +1140,8 @@
               v-else
             />
           </td>
-          <td>
-            <span v-if="advice.parent_id > 0">---></span>
+          <td class="parent">
+            <span v-if="advice.parent_id > 0">&nbsp;&nbsp;&nbsp</span>
             <span>{{ advice.advice_name }}</span>
             <span v-if="advice && advice.advice_desc"
               >({{ advice.advice_desc }}{{ advice.drug_spec_unit }})</span
@@ -1201,22 +1206,6 @@
             <span style="display:inline-block;margin-left:15px;"
               >质控护士签名:</span
             >
-            <div
-              style="width: 80px;text-align: center;display:inline-block;"
-              v-if="dialysisOrder != null"
-            >
-              <span
-                v-if="setAdminUserES(check == null ? 0 : check.creater) == ''"
-                >{{ getAdminUser(check == null ? 0 : check.creater) }}</span
-              >
-              <img
-                style="height:20px;"
-                :src="setAdminUserES(check == null ? 0 : check.creater)"
-                alt
-                srcset
-                v-else
-              />
-            </div>
           </td>
         </tr>
       </table>
@@ -1593,6 +1582,7 @@ export default {
           var doctoradvce = response.data.data.doctorAdvice;
           var doctorAdevieInfo = response.data.data.doctorAdevieInfo;
           var tableAdvice = doctorAdevieInfo;
+          console.log("tableAdvice", tableAdvice);
           // console.log('医生', tableAdvice.length)
           if (tableAdvice.length === 0) {
             var obj = { advice_name: "", start_time: "" };
@@ -2294,4 +2284,8 @@ export default {
 .print-template-two tr {
   line-height: 30px;
 }
+.parent {
+  text-align: left;
+  padding-left: 20px !important;
+}
 </style>

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -970,8 +970,8 @@
                   <div class="inline_block" style="flex:1;">
                     治疗医生：
                     <div class="under_line" style="width: 80px;text-align: center" >
-                      <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  />
+                      <span v-if=" setAdminUserES(prescription.creater) == '' " >{{ getAdminUser(prescription.creater) }}</span >
+                      <img style="height:20px;" :src="setAdminUserES(prescription.creater)" alt="" srcset="" v-else  />
                     </div>
                   </div>
                 </div>

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,41 +1896,18 @@
                 </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;">
                   患者签名：
-                  <div
-                    class="under_line"
-                    style="width: 40px;text-align: center"
-                  >
-
-
+                  <div class="under_line" style="width: 70px">
                   </div>
                 </div>
-
               </div>
             </td>
           </tr>
@@ -2027,6 +2003,10 @@
           },
           gender: 0
         },
+        last_afterdialysis:{
+          weight_after:'',
+
+        },
         predialysis: {
           score: '',
           internal_fistula: '',
@@ -2246,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