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

config/dev.env.js

@@ -4,8 +4,8 @@ const prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  //BASE_API: '"https://api.xt.kuyicloud.com"'
-  BASE_API: '"http://localhost:9531"'
+  BASE_API: '"https://api.xt.kuyicloud.com"'
+  // BASE_API: '"http://localhost:9531"'
   //BASE_API: '"http://localhost:9529"'
   //http://api.xt.test.sgjyun.com http://localhost:9529
   // BASE_API: '"http://api.xt.test.sgjyun.com"'

config/prod.env.js

@@ -2,7 +2,7 @@
 module.exports = {
   NODE_ENV: '"production"',
   BASE_API: '"http://new_mobile.xt.api.sgjyun.com"'
-  //  BASE_API: '"https://api.xt.kuyicloud.com"'
+  // BASE_API: '"https://api.xt.kuyicloud.com"'
   // BASE_API:'"http://localhost:9529"',
   // BASE_API: '"http://api.xt.test.sgjyun.com"'
   // http://api.xt.test.sgjyun.com

src/api/patient/patient.js

@@ -478,6 +478,19 @@ export function getAllDoctor(params) {
   })
 }
 
+export function GetAllProjectNameByDate(date, patientid) {
+  const params = {
+    date: date,
+    patientid: patientid
+  }
+  console.log('params', params)
+  return request({
+    url: '/m/api/patient/getallprojectname',
+    method: 'Get',
+    params: params
+  })
+}
+
 export function getAllInspection(params) {
   return request({
     url: '/m/api/patient/getallinspection',
@@ -764,12 +777,11 @@ export function saveName(id, name) {
   })
 }
 
-export function saveNameTwo(id, name) {
-  console.log('id', id)
-  console.log('name', name)
+export function saveNameTwo(id, name, orgid) {
   const params = {
     id: id,
-    name: name
+    name: name,
+    orgid: orgid
   }
   return request({
     url: '/m/api/patient/savenametwo',
@@ -903,3 +915,11 @@ export function getMyInformationFour(params) {
     params: params
   })
 }
+
+export function submitForm(params) {
+  return request({
+    url: '/m/api/patient/sumitform',
+    method: 'Get',
+    params: params
+  })
+}

src/pages/home/active.vue

@@ -0,0 +1,183 @@
+<template>
+    <div class="page_active">
+        <div class="activeBox">
+            <div class="activeTitleBox">
+                <div class="activeTitle">
+                    <img src="../../assets/images/activeIcon_03.png" alt="">
+                    <p>活 动 详 情</p>
+                </div>
+            </div>
+            <div class="activeOne">
+                <div class="activeTipBox">
+                    <div class="activeTip"></div>
+                    <p>活动介绍</p>
+                </div>
+                <div class="activeTxt">
+                    注册酷医云系统并体验系统即可获得<span>价值69元的精美礼品一份（多功能补水仪/多功能加湿器/保温杯套装）</span>
+                </div>  
+            </div>
+            <div class="activeOne">
+                <div class="activeTipBox">
+                    <div class="activeTip"></div>
+                    <p>参与对象</p>
+                </div>
+                <div class="activeTxt">
+                    民营透析中心<span>医护人员</span>
+                </div>  
+            </div>
+            <div class="activeOne">
+                <div class="activeTipBox">
+                    <div class="activeTip"></div>
+                    <p>活动主题</p>
+                </div>
+                <div class="activeTxt">
+                    自春节以来，新冠肺炎疫情肆虐。疫期，民营透析中心在医护紧缺的情况下，仍辛苦坚守阵地，为透析患者提供服务，逆行并开辟透析患者生命之路。基于此情况，酷医云决定向广大民营透析机构/单位进行疫期致敬回馈活动，为每一家民营透析机构
+                    <span>赠送一份价值69元的精美礼品</span>
+                </div>  
+            </div>
+            <div class="activeOne">
+                <div class="activeTipBox">
+                    <div class="activeTip"></div>
+                    <p>领取精美礼品满足条件</p>
+                </div>
+                <div class="activeTxt">
+                    <p>1.未使用酷医云系统的新用户机构，注册酷医云账号并完善账号信息</p>
+                    <p>2.注册医护必须为民营透析中心的医护</p>
+                    <p>3.每家机构有且仅有一位医护代表参与领取，先注册先得</p>
+                    <p class="litle">*以上解释权归酷医云所有，谢谢配合</p>
+                    <p class="big">价值69元精美礼品(三选一)</p>
+                    <img src="../../assets/images/goods_03.png" alt="">
+                    <img src="../../assets/images/goods_07.png" alt="">
+                    <img src="../../assets/images/goods_09.png" alt="">
+                    
+                </div>  
+            </div>
+            <div class="join" @click="toActiveForm">我 要 报 名</div>
+            <div class="joinImg" @click="toActiveForm"><img src="../../assets/images/apply.png" alt=""></div>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+    methods:{
+        toActiveForm(){
+            this.$router.push({ path: "/activeForm" });
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.page_active{
+    // overflow-y: auto;
+    background: url("https://images.shengws.com/2020/4/23/admin_avatar_1587638028661.png") no-repeat;
+    background-size:100%;
+    height:90rem;
+    position: relative;
+    .activeBox{
+        position: absolute;
+        left: 1.4375rem;
+        top: 10rem;
+        width:20.625rem;
+        height:72.375rem;
+        background:rgba(255,255,255,1);
+        box-shadow:0px 0px 44px 0px rgba(173,198,238,0.68);
+        opacity:0.9;
+        border-radius:15px;
+        // margin: 10rem auto 0;
+    }
+    .activeTitleBox{
+        
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+    }
+    .activeTitle{
+        margin: 1.5rem auto;
+        display: flex;
+        align-items: center;
+        img{
+            width: 1.5rem;
+            height: 1.5rem;
+            margin-right: 1rem;
+        }
+        p{
+            color: #1979F4;
+            font-size: 1.375rem;
+            font-weight: 600;
+        }
+    }
+    .activeOne{
+        .activeTipBox{
+            display: flex;
+            align-items: center;
+            .activeTip{
+                width:.3125rem;
+                height:.625rem;
+                background:linear-gradient(0deg,rgba(26,121,244,1),rgba(123,186,250,1));
+                border-radius:.125rem;
+                margin-left: .9375rem;
+                margin-right: .5rem;
+            }
+            p{
+                font-size: .9375rem;
+                font-weight:bold;
+            }
+        }
+        .activeTxt{
+            width: 17.75rem;
+            font-size: .875rem;
+            color: #242D39;
+            margin: .625rem 0 1.875rem 1.75rem;
+            line-height: 1.5rem;
+            span{
+                color: #FD543A;
+                font-weight: bold;
+            }
+            .litle{
+                font-size: .75rem;
+                color: #FD543A;
+            }
+            .big{
+               font-size: 1.125rem;
+               color: #FD543A;
+               font-weight: bold;
+               margin-top: .375rem;
+            }
+            img{
+                width:17.5rem;
+                height:7.75rem;
+                background:rgba(158,119,108,1);
+                border-radius:5px;
+                margin-top: .625rem;
+            }
+            .attention{
+                font-size: .9375rem;
+                font-weight: bold;
+            }
+        }
+    }
+    .join{
+        height: 3.75rem;
+        line-height: 3.75rem;
+        text-align: center;
+        color: #fff;
+        width: 18.75rem;
+        margin: 1.625rem auto .625rem;
+        background: #1B97FF;
+        border-radius: 1.875rem;
+        font-weight: 600;
+        font-size: 1.25rem;
+    }
+    .joinImg{
+        position: fixed;
+        bottom: 3.75rem;
+        right: .625rem;
+        img{
+            width: 5rem;
+            height: 5rem;
+        }
+    }
+}
+</style>

src/pages/home/activeForm.vue

@@ -0,0 +1,356 @@
+<template>
+    <div class="page_activeForm">
+        <van-sticky>
+            <div class="activeFormTitle">
+                <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
+                <span class="titleName">活动报名表</span>
+            </div>
+        </van-sticky>
+        
+        <div class="formBox">
+            <div class="attentionBox">
+                <p class="attention">注意</p>
+                <p>*本次活动免费赠送且包邮，请正确填写您的个人资料，工作人员将在<span>1-3</span>天内通过电话或微信方式联系您并核对信息，尽快为您安排发货</p>
+                <span>*提交信息成功即可扫码加入活动微信交流群</span>
+                <p>*标有<span>*</span>的栏目必须填写;</p>
+                <p>有问题请联系客服微信：<span>kuyicloud</span></p>
+                <p class="litle">以上解释权归酷医云所有，敬请留意</p>
+            </div>
+            <van-field v-model="form.name" label="收件姓名" required placeholder="请填写"/>
+            <van-field v-model="form.mobile" label="收件手机" required placeholder="请填写"/>
+            <van-field v-model="form.address" label="收件地址" required placeholder="请填写"/>
+            <van-field v-model="form.position" label="您的职务" required placeholder="请填写"/>
+            <van-field v-model="form.hospital_name" label="医院名称" required placeholder="请填写"/>
+            <div class="formOne">
+                <div class="formTitle"><span style="color:#ee0a24">*</span>目前医院/机构是否正在使用透析管理系统</div>
+                <van-radio-group v-model="radio">
+                    <van-radio name="1">有</van-radio>
+                    <van-radio name="2">无</van-radio>
+                </van-radio-group>
+            </div>
+            <van-field v-model="form.system_name" placeholder="请填写系统名称"/>
+            <div class="formOne">
+                <div class="formTitle"><span style="color:#ee0a24">*</span>是否考虑使用酷医云免费透析管理系统</div>
+                <van-radio-group v-model="radioOne">
+                    <van-radio name="1">是</van-radio>
+                    <van-radio name="2">否</van-radio>
+                </van-radio-group>
+            </div>
+            <div class="formOne">
+                <div class="formTitle"><span style="color:#ee0a24">*</span>除酷医云免费使用的透析管理系统外，您还想了解酷医云系统其他哪些服务板块？（多选） </div>
+                <van-checkbox-group v-model="result">
+                    <van-checkbox name="1">慢病管理</van-checkbox>
+                    <van-checkbox name="2">营销管理</van-checkbox>
+                    <van-checkbox name="3">分销商城</van-checkbox>
+                    <van-checkbox name="4">医护培训</van-checkbox>
+                    <van-checkbox name="5">供应链</van-checkbox>
+                    <van-checkbox name="6">其他</van-checkbox>
+                </van-checkbox-group>
+                <p style="color:#ccc">请填写其他（30个字以内）</p>
+                <div class="textareaBox">
+                    <van-field v-model="form.other_remark" rows="3" type="textarea" maxlength="30" />
+                </div>
+            </div>
+            <div class="formTwo">
+                <div class="formTitle"><span style="color:#ee0a24">*</span>请选择以下礼品（任选其一）</div>
+                <van-radio-group v-model="resultTwo">
+                    <van-radio name="1">保湿纳米喷雾补水仪</van-radio>
+                    <van-radio name="2">车载加湿器</van-radio>
+                    <van-radio name="3">商务保温杯套装</van-radio>
+                </van-radio-group>
+                <p>其他留言（200个字以内）</p>
+                <div class="textareaBox2">
+                    <van-field v-model="form.other_message" rows="5" type="textarea" maxlength="200" />
+                </div>
+            </div>
+        </div>
+        <div class="submit" @click="submitForm">提 交</div>
+    </div>
+</template>
+
+<script>
+import { submitForm } from "@/api/patient/patient";
+export default {
+  data() {
+    return {
+      radio: "0",
+      radioOne: "0",
+      resultTwo: [],
+      result: [],
+      form: {
+        name: "",
+        mobile: "",
+        address: "",
+        position: "",
+        hospital_name: "",
+        is_user: 0,
+        is_think: 0,
+        other_mode: 0,
+        gift: 0,
+        other_remark: "",
+        other_message: "",
+        system_name: ""
+      }
+    };
+  },
+  methods: {
+    submitForm() {
+      if (this.form.name == "") {
+        this.$toast("收件姓名不能为空");
+        return false;
+      }
+      if (this.form.mobile == "") {
+        this.$toast("收件手机不能为空");
+        return false;
+      }
+      if (this.form.address == "") {
+        this.$toast("收件地址不能为空");
+        return false;
+      }
+      if (this.form.position == "") {
+        this.$toast("您的职务不能为空");
+        return false;
+      }
+      if (this.form.hospital_name == "") {
+        this.$toast("医院名称不能为空");
+        return false;
+      }
+      if (this.radio == "0") {
+        this.$toast("目前医院/机构是否正在使用透析管理系统不能为空");
+        return false;
+      }
+      if (this.radioOne == "0") {
+        this.$toast("是否考虑使用酷医云免费透析管理系统不能为空");
+        return false;
+      }
+      if (this.result.length == 0) {
+        this.$toast("是否考虑使用酷医云免费透析管理系统不能为空");
+        return false;
+      }
+      if (this.resultTwo.length == 0) {
+        this.$toast("请选择以下礼品不能为空");
+        return false;
+      }
+      if (this.radio == "1") {
+        this.form.is_user = 1;
+      }
+      if (this.radio == "2") {
+        this.form.is_user = 2;
+      }
+      if (this.radioOne == "1") {
+        this.form.is_think = 1;
+      }
+      if (this.radioOne == "2") {
+        this.form.is_think = 2;
+      }
+      if (this.resultTwo == "1") {
+        this.form.gift = 1;
+      }
+      if (this.resultTwo == "2") {
+        this.form.gift = 2;
+      }
+      if (this.resultTwo == "3") {
+        this.form.gift = 3;
+      }
+      var result = this.result.join(",");
+      console.log("result", result);
+      const params = {
+        name: this.form.name,
+        mobile: this.form.mobile,
+        address: this.form.address,
+        position: this.form.position,
+        hospitalName: this.form.hospital_name,
+        systemName: this.form.system_name,
+        isUser: this.form.is_user,
+        isThink: this.form.is_think,
+        result: result,
+        otherRemark: this.form.other_remark,
+        otherMessage: this.form.other_message,
+        gift: this.form.gift
+      };
+      console.log("params", params);
+      submitForm(params).then(response => {
+        if (response.data.state === 1) {
+          var table = response.data.data.table;
+          this.$router.push({ path: "/activeSuccess" });
+        } else {
+          this.$toast("您已提交过信息,请勿重复提交");
+        }
+      });
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.page_activeForm {
+  height: 100%;
+  overflow-y: auto;
+  background: #eaf4fe;
+  .activeFormTitle {
+    background: #fff;
+    height: 3.125rem;
+    line-height: 3.125rem;
+    display: flex;
+    align-items: center;
+  }
+
+  .jiantou {
+    margin-left: 1.25rem;
+    font-size: 1.5rem;
+    font-weight: 600;
+    margin-right: 6.2rem;
+  }
+
+  .titleName {
+    font-size: 1.125rem;
+    font-weight: 600;
+  }
+    .formBox{
+        width:21rem;
+        height:97rem;
+        background:rgba(255,255,255,1);
+        border-radius:15px;
+        margin: .875rem auto;
+
+    }
+    .attentionBox{
+        font-size: .875rem;
+        color: #242D39;
+        padding: 0 .625rem;
+        line-height: 1.5rem;
+        span{
+            color: #FD543A;
+            font-weight: bold;
+        }
+        .litle{
+            font-size: .75rem;
+            color: #FD543A;
+        }
+        .attention{
+            font-size: .9375rem;
+            font-weight: bold;
+            color: #FD543A;
+        }
+    }
+    .formOne{
+        font-size: 1.0625rem;
+        margin-left: .5rem;
+        padding: 1.5rem 0;
+        border-bottom: 0.0625rem solid #e5e5e5;
+        .formTitle{
+            margin: 0 0 1.5rem;
+        }
+    }
+    .formTwo{
+        font-size: 1.0625rem;
+        margin-left: .5rem;
+        padding: 1.5rem 0;
+        .formTitle{
+            margin: 0 0 1.5rem;
+        }
+    }
+    .submit{
+        height: 3.75rem;
+        line-height: 3.75rem;
+        text-align: center;
+        color: #fff;
+        width: 18.75rem;
+        margin: 1.625rem auto .625rem;
+        background: #1B97FF;
+        border-radius: 1.875rem;
+        font-weight: 600;
+        font-size: 1.25rem;
+    }
+}
+::-webkit-scrollbar {
+  width: 0;
+}
+</style>
+
+<style lang="scss">
+.page_activeForm {
+  .van-cell {
+    height: 4rem;
+    font-size: 1.0625rem;
+    color: #000;
+    margin-bottom: 1px;
+  }
+  .van-field__label {
+    display: flex;
+    align-items: center;
+  }
+  .van-field__value {
+    display: flex;
+    align-items: center;
+  }
+  .van-cell:not(:last-child)::after {
+    border-bottom: 1px solid #e5e5e5;
+  }
+  .van-cell--required::before {
+    top: 1.2rem;
+    font-size: 1rem;
+  }
+  .formOne {
+    .van-radio-group {
+      display: flex;
+    }
+    .van-radio {
+      margin-right: 1.875rem;
+    }
+  }
+
+  .van-checkbox-group {
+    display: flex;
+    flex-wrap: wrap;
+    .van-checkbox {
+      width: 50%;
+      margin-bottom: 1.125rem;
+    }
+  }
+
+  .textareaBox {
+    padding-left: 0;
+    margin-right: 0.875rem;
+    margin-top: 0.625rem;
+    height: 6.25rem;
+    background: #f6f6f6;
+    border-radius: 5px;
+    .van-cell {
+      padding: 0;
+    }
+    .van-cell__value {
+      background: #f6f6f6;
+    }
+    .van-field__body {
+      width: 100%;
+      textarea {
+        width: 100%;
+      }
+    }
+  }
+  .formTwo {
+    .van-radio {
+      margin-bottom: 1.125rem;
+    }
+  }
+    .textareaBox2{
+        margin-top: .625rem;
+        margin-right: .875rem;
+        border-radius:5px;
+         .van-cell{
+            height: 7.5rem;
+            padding: 0;
+        }
+        .van-cell__value{
+            background: #F6F6F6;
+        }
+        .van-field__body{
+            width: 100%;
+            textarea{
+                width: 100%;
+            }
+        }
+    }
+}
+</style>

src/pages/home/activeSuccess.vue

@@ -0,0 +1,90 @@
+<template>
+    <div class="page_activeSuccess">
+        <van-sticky>
+            <div class="activeSuccessTitle">
+                <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
+                <span class="titleName">活动报名表</span>
+            </div>
+        </van-sticky>
+        <div class="successBox">
+            <div class="successImg">
+                <img src="../../assets/images/true.png" alt="">
+                <p>提交成功</p>
+            </div>
+        </div>
+        <div class="msgBox">
+            <p>您已完成填写，</p>
+            <p>工作人员将通过电话或微信联系您并进行信息审核。</p>
+            <img src="../../assets/images/ercode.png" alt="">
+            <p>欢迎扫码加入</p>
+            <p>【酷医云民营血透医护交流群二】微信群，</p>
+            <p>了解行业热点，获取知识！</p>
+        </div>
+        <div class="ercode">微信识别二维码，即可进群</div>
+    </div>
+</template>
+
+
+<style lang="scss" scoped>
+.page_activeSuccess{
+    .activeSuccessTitle{
+        background: #fff;
+        height: 3.125rem;
+        line-height: 3.125rem;
+        display: flex;
+        align-items: center;
+    }
+
+    .jiantou {
+        margin-left: 1.25rem;
+        font-size: 1.5rem;
+        font-weight: 600;
+        margin-right: 6.2rem;
+    }
+
+    .titleName {
+        font-size: 1.125rem;
+        font-weight: 600;
+    }
+    .successImg{
+        margin-top: 3.125rem;
+        img{
+            width: 6.25rem;
+            height: 6.25rem;
+            margin: 0 auto;
+            display: block;
+        }
+        p{
+            font-size: 1.5rem;
+            text-align: center;
+            margin-top: .625rem;
+        }
+    }
+    .msgBox{
+        font-size: .875rem;
+        color: #858585;
+        margin-top: 1.25rem;
+        p{
+            text-align: center;
+            line-height: 1.25rem;
+        }
+        img{
+            width: 9.375rem;
+            height: 9.375rem;
+            margin: 1rem auto .5rem;
+            display: block;
+        }
+    }
+    .ercode{
+        width:14.5rem;
+        height:2.5rem;
+        line-height: 2.5rem;
+        text-align: center;
+        background:rgba(25,121,244,1);
+        border-radius:20px;
+        color: #fff;
+        margin: 1.875rem auto;
+    }
+}
+
+</style>

src/pages/home/index.vue

@@ -82,12 +82,12 @@
             <div>首页</div>
           </van-tabbar-item>
         </router-link>
-        <!--<router-link to="/study">-->
-          <!--<van-tabbar-item>-->
-            <!--<i class="iconfont icon-jishiben iconOne"></i>-->
-            <!--<div>学习</div>-->
-          <!--</van-tabbar-item>-->
-        <!--</router-link>-->
+        <router-link to="/active">
+          <van-tabbar-item>
+            <i class="iconfont icon-jishiben iconOne"></i>
+            <div>致敬医护</div>
+          </van-tabbar-item>
+        </router-link>
         <!--<router-link to="/service">-->
           <!--<van-tabbar-item>-->
             <!--<i class="iconfont icon-fuwu2 iconOne"></i>-->
@@ -148,6 +148,8 @@ export default {
      if (currenttabbar === 'homeIndex') {
       this.active = 0
     } else if (currenttabbar === 'newMy') {
+      this.active = 2
+    } else if (currenttabbar === 'active') {
       this.active = 1
     }
   }

src/pages/main/dialog/AssessmentDialog.vue

@@ -65,8 +65,6 @@
           </div>
         </div>
 
-
-
         <div class="item" ref="symptom_before_dialysis" v-if="isShow('透析机型号')">
           <h2 class="name">透析机型号</h2>
           <div class="content">
@@ -103,7 +101,6 @@
           </div>
         </div>
 
-
         <div class="line"></div>
         <div class="item" v-if="isShow('收缩压')">
           <h2 class="name">收缩压(mmHg)</h2>
@@ -153,10 +150,10 @@
         </div>
 
         <div
-          @click="showSubMenu('blood_access_opera')"
+          @click="showSubMenu('vascular_access_desc')"
           class="item"
-          ref="blood_access_opera"
-          v-if="isShow('血管通路操作')"
+          ref="vascular_access_desc"
+          v-if="isShow('血管通路')"
         >
           <h2 class="name">血管通路</h2>
           <div class="content">
@@ -166,7 +163,6 @@
         </div>
         <div class="line"></div>
 
-
         <div
           @click="showSubMenu('blood_access_part')"
           class="item"
@@ -223,8 +219,6 @@
           </div>
         </div>
 
-
-
         <div
           @click="showSubMenu('internal_fistula_skin')"
           class="item"
@@ -238,7 +232,6 @@
           </div>
         </div>
 
-
         <div
           @click="showSubMenu('venous_catheterization')"
           class="item"
@@ -276,7 +269,6 @@
           </div>
         </div>
 
-
         <div
           @click="showSubMenu('puncture_needle')"
           class="item"
@@ -313,7 +305,6 @@
           </div>
         </div>
 
-
         <div @click="showSubMenu('skin')" class="item" ref="skin" v-if="isShow('皮肤')">
           <h2 class="name">皮肤</h2>
           <div class="content">
@@ -322,9 +313,6 @@
           </div>
         </div>
 
-
-
-
         <div
           @click="showSubMenu('complication')"
           class="item"
@@ -364,7 +352,6 @@
           </div>
         </div>
 
-
         <div
           @click="showSubMenu('emergency_treatment')"
           class="item"
@@ -388,8 +375,6 @@
           </div>
         </div>
 
-
-
         <div class="item" v-if="this.$store.getters.user.template_info.template_id == 6">
           <h2 class="name">透前净体重(kg)</h2>
           <div class="content">
@@ -402,14 +387,6 @@
           </div>
         </div>
 
-
-
-
-
-
-
-
-
         <div
           @click="showSubMenu('hemorrhage')"
           class="item"
@@ -429,14 +406,6 @@
           </div>
         </div>
 
-
-
-
-
-
-
-
-
         <div
           @click="showSubMenu('dialysis_interphase')"
           class="item"
@@ -450,12 +419,8 @@
           </div>
         </div>
 
-
         <div class="line"></div>
 
-
-
-
 <!--        <div-->
 <!--          @click="showSubMenu('blood_access_internal_fistula')"-->
 <!--          class="item"-->
@@ -469,13 +434,6 @@
 <!--          </div>-->
 <!--        </div>-->
 
-
-
-
-
-
-
-
 <!--        <div-->
 <!--          @click="showSubMenu('venous_catheterization_part')"-->
 <!--          class="item"-->
@@ -492,8 +450,6 @@
 <!--          </div>-->
 <!--        </div>-->
 
-
-
         <div
           @click="showSubMenu('ductus_arantii')"
           class="item"
@@ -514,8 +470,6 @@
           </div>
         </div>
 
-
-
         <div
           class="item"
           v-if="isShow('感染')"
@@ -550,7 +504,6 @@
           </div>
         </div>
 
-
         <div class="item" ref="skin_other" v-if="isShow('其他皮肤情况')">
           <h2 class="name">其他皮肤情况</h2>
           <div class="content">
@@ -602,7 +555,7 @@ import { Toast } from "vant";
 import { getDataConfig } from "@/utils/data";
 import DryWeightMenu from "./subMenu/dryWeightMenu";
 
-import request from '@/utils/request'
+import request from "@/utils/request";
 
 export default {
   name: "PrescriptionDialog",
@@ -625,8 +578,8 @@ export default {
   },
   data() {
     return {
-      showTxt:"",
-      hasPermission:true,
+      showTxt: "",
+      hasPermission: true,
       propDryForm: {
         weight: 0,
         doctor: []
@@ -730,7 +683,8 @@ export default {
         }
       },
       deep: true,
-      immediate: true
+      immediate: true,
+      data: []
     }
   },
   methods: {
@@ -1055,13 +1009,13 @@ export default {
           this.propForm.click_ref = "blood_access_part";
           break;
 
-        case "blood_access_opera":
+        case "vascular_access_desc":
           this.isHasOther = 2;
           this.propForm.isShowOther = 1;
 
           this.propForm.type = 7;
           this.isShowDialog = false;
-          this.propForm.title = "血管通路操作";
+          this.propForm.title = "血管通路";
           this.visibility = true;
           this.propForm.list = [];
           this.propForm.optionList = getDataConfig(
@@ -1070,7 +1024,7 @@ export default {
           );
           this.propForm.isMultiple = 1;
           this.propForm.selectId = this.formValue.blood_access_part_opera_id;
-          this.propForm.click_ref = "blood_access_opera";
+          this.propForm.click_ref = "vascular_access_desc";
           break;
 
         case "internal_fistula":
@@ -1491,7 +1445,7 @@ export default {
     QueryPartById: function(val) {
       let vascular_access_part_name = "";
       let vascular_access = getDataConfig("hemodialysis", "vascular_access");
-
+      console.log("vascular_access", vascular_access);
       for (let i = 0; i < vascular_access.length; i++) {
         if (vascular_access[i].id == val) {
           vascular_access_part_name = vascular_access[i].name;
@@ -1621,41 +1575,51 @@ export default {
           break;
       }
     },
-    getPermission(){
-      request.get("/m/api/permission/get",{
-        params:{
-          create_url:"/m/api/assessmentbefore/commit?mode=1",
-          modify_url:"/m/api/assessmentbefore/commit?mode=2",
-          modify_other_url:"/m/api/assessmentbefore/commit?mode=3",
-          module:3
-        }
-      }).then(res => {
-        console.log(res)
-        console.log("透前",this.patient_prop)
-        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.user.admin.id){//创建人是自己
-              if(res.data.data.is_has_modify == false){
-                this.hasPermission = false
-                this.showTxt = "你没有修改透前评估权限"
+    getPermission() {
+      request
+        .get("/m/api/permission/get", {
+          params: {
+            create_url: "/m/api/assessmentbefore/commit?mode=1",
+            modify_url: "/m/api/assessmentbefore/commit?mode=2",
+            modify_other_url: "/m/api/assessmentbefore/commit?mode=3",
+            module: 3
+          }
+        })
+        .then(res => {
+          console.log(res);
+          console.log("透前", this.patient_prop);
+          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.user.admin.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 = "你没有新增透前评估权限"
-            }
           }
-        }
-      })
+        });
     }
   },
   components: {
@@ -1663,7 +1627,7 @@ export default {
     CheckBoxSubMenu
   },
   created() {
-    this.getPermission()
+    this.getPermission();
 
     var date = this.$route.query && this.$route.query.date;
     date *= 1000;
@@ -1692,8 +1656,6 @@ export default {
         this.last_predialysis["additional_weight"].toString()
       );
 
-
-
       this.$set(
         this.formValue,
         "internal_fistula",
@@ -1757,6 +1719,8 @@ export default {
       }
     }
     this.hemorrhage_state = this.formValue.is_hemorrhage == 0;
+    this.data = getDataConfig("hemodialysis", "vascular_access_desc");
+    console.log("投前评估", this.data);
   }
 };
 </script>
@@ -1772,7 +1736,7 @@ export default {
   border: none;
   border-bottom: 1px #e5e5e5 solid;
 }
-.warnTxt{
+.warnTxt {
   font-size: 0.5rem;
   height: 1rem;
   line-height: 1rem;

src/pages/main/dialog/ComputerDialog.vue

@@ -505,8 +505,8 @@
         request.get("/m/api/permission/get",{
           params:{
             create_url:"/m/api/dialysis/start?mode=1",
-            modify_url:"/m/api/dialysis/start?mode=2",
-            modify_other_url:"/m/api/dialysis/start?mode=3",
+            modify_url:"/m/api/startOrder/edit?mode=2",
+            modify_other_url:"/m/api/startOrder/edit?mode=3",
             module:0
           }
         }).then(res => {

src/pages/main/template/DialysisPrintOrderTwo.vue

@@ -1315,18 +1315,18 @@ export default {
         }
         this.check = response.data.data.check;
         this.predialysis = response.data.data.PredialysisEvaluation;
-        //console.log("透前评估", this.predialysis);
+        // console.log("透前评估", this.predialysis);
         this.predialysis.blood_access_part_opera_name = this.bloodAccessParOperaName(
           this.predialysis.blood_access_part_opera_id
         );
-         var  afterdialysis = response.data.data.AssessmentAfterDislysis
+        var afterdialysis = response.data.data.AssessmentAfterDislysis;
         if (afterdialysis.complications_index === undefined) {
           afterdialysis.disequilibrium_syndrome = 1;
         }
         if (afterdialysis.complications_index != undefined) {
           afterdialysis.disequilibrium_syndrome = 2;
         }
-        this.afterdialysis = afterdialysis
+        this.afterdialysis = afterdialysis;
         this.operators = response.data.data.operators;
         this.dialysisOrder =
           response.data.data.dialysisOrder === null

src/pages/main/today/dialysisPrescription.vue

@@ -187,11 +187,11 @@
           <span class="content">{{blood_access}}</span>
           <span class="unit"></span>
         </li>
-        <li v-if="isShow('实际超滤量')">
-          <label>实际超滤量: </label>
-          <span class="content">{{ultrafiltration != '0'? ultrafiltration:''}}</span>
-          <span class="unit">{{ultrafiltration != '0'?"L":""}}</span>
-        </li>
+<!--        <li v-if="isShow('实际超滤量')">-->
+<!--          <label>实际超滤量2: </label>-->
+<!--          <span class="content">{{ultrafiltration != '0'? ultrafiltration:''}}</span>-->
+<!--          <span class="unit">{{ultrafiltration != '0'?"L":""}}</span>-->
+<!--        </li>-->
         <li v-if="isShow('目标KT/V')">
           <label>目标KT/V: </label>
           <span class="content">{{target_ktv != '0'? target_ktv:''}}</span>

src/pages/my/index.vue

@@ -293,27 +293,15 @@ export default {
     console.log("creator", creator);
     if (creator === 0) {
       var adminid = this.$store.getters.user.admin.id;
-      // console.log("创建者id", adminid);
       this.getMyInformationThree(adminid);
       this.adminid = 0;
-      // console.log("ids", adminid);
       var adminid = this.$store.getters.user.admin.id;
       this.ids = adminid;
       return false;
     }
     if (creator !== 0) {
-      // this.getMyOrgInformation(creator);
       this.getMyInformationFour();
-      // this.adminid = creator;
-      // this.ids = creator;
     }
-
-    // console.log("创建者ID", this.creator);
-    //  this.adminid = adminid;
-    //  this.getMyInformation(adminid);
-    //  this.getMyOrganazition(adminid);
-    //   this.getMyInforName(adminid);
-    //   this.creator = this.$store.getters.user.org.creator;
   }
 };
 </script>

src/pages/my/modifyingName.vue

@@ -20,12 +20,13 @@ export default {
       admin_user_id: 0,
       readonly: true,
       ids: 0,
-      id: 0
+      id: 0,
+      orgid: 0
     };
   },
   methods: {
-    getMyInforName(id) {
-      getMyInforName(id).then(response => {
+    getMyInforName(id, orgid) {
+      getMyInforName(id, orgid).then(response => {
         if (response.data.state === 1) {
           var username = response.data.data.Username;
           console.log("编辑姓名", username);
@@ -72,19 +73,24 @@ export default {
         });
       }
       if (creator !== 0) {
-        this.id = creator;
-        saveNameTwo(this.id, this.name).then(response => {
-          var role = response.data.data.role;
-          this.$router.push("/myInfo?id=" + creator);
-        });
+        saveNameTwo(this.admin_user_id, this.name, this.orgid).then(
+          response => {
+            var role = response.data.data.role;
+            this.$router.push(
+              "/myInfo?id=" + this.admin_user_id + "&orgid=" + this.orgid
+            );
+          }
+        );
       }
     }
   },
   created() {
     setRem();
     var id = this.$route.query.id;
-    this.getMyInforName(id);
     this.admin_user_id = id;
+    var orgid = this.$route.query.orgid;
+    this.orgid = orgid;
+    this.getMyInforName(id, orgid);
   }
 };
 </script>

src/pages/my/myInfo.vue

@@ -129,7 +129,9 @@ export default {
       );
     },
     editName() {
-      this.$router.push("/editname?id=" + this.admin_user_id);
+      this.$router.push(
+        "/editname?id=" + this.admin_user_id + "&orgid=" + this.orgid
+      );
     },
     onConfirm(value) {
       if (value === "男") {

src/pages/my/organizationInfo.vue

@@ -85,7 +85,8 @@ export default {
           // console.log("names", names);
           var arr = [];
           arr = names.split(",");
-          this.Names = arr;
+          var arr2 = [...new Set(arr)];
+          this.Names = arr2;
 
           var admin = response.data.data.admin;
           // console.log("admin", admin);

src/pages/patientCenter/allCheck/index.vue

@@ -71,6 +71,7 @@
 
 <script>
 import {
+  GetAllProjectNameByDate,
   getAllInspection,
   getPatientName,
   getInspectionDetail
@@ -91,16 +92,28 @@ export default {
       date: "",
       activeTwo: 0,
       patientid: 0,
-      data: []
+      data: [],
+      projectName: []
     };
   },
   methods: {
+    GetAllProjectNameByDate(date, patientid) {
+      GetAllProjectNameByDate(date, patientid).then(response => {
+        if (response.data.state === 1) {
+          var projectName = response.data.data.projectName;
+          // console.log("projectName", projectName);
+          this.projectName = projectName;
+          this.checkdata = projectName;
+        }
+      });
+    },
+
     getAllInspection() {
       getAllInspection().then(response => {
         if (response.data.state === 1) {
           var inspection = response.data.data.inspection;
-          // console.log("inspection", inspection);
-          this.checkdata = inspection;
+          // console.log("inspection什么意思", inspection);
+          // this.checkdata = inspection;
           this.data = inspection;
           this.getInspection(this.patientid, this.date);
         }
@@ -127,13 +140,14 @@ export default {
       getInspectionDetail(patientid, date, this.project_id).then(response => {
         if (response.data.state === 1) {
           var InspectionDetail = response.data.data.InspectionDetail;
+          // console.log("数据是", InspectionDetail);
           this.InspectionDetail = InspectionDetail;
         }
       });
     },
     getInspection(patientid, date) {
       if (this.active === 0) {
-        this.project_id = this.data[0].project_id;
+        this.project_id = this.projectName[0].project_id;
       }
       getInspectionDetail(patientid, date, this.project_id).then(response => {
         if (response.data.state === 1) {
@@ -163,6 +177,7 @@ export default {
     this.activeTwo = parseInt(this.$route.query.active);
     setRem();
     setHeight();
+    this.GetAllProjectNameByDate(date, patientid);
     this.getAllInspection();
     this.getPatientName(patientid);
   }
@@ -243,7 +258,7 @@ export default {
           text-align: center;
           font-size: 0.75rem;
         }
-        p{
+        p {
           width: 33.3%;
           // text-align: center;
           font-size: 0.75rem;
@@ -265,7 +280,7 @@ export default {
 </style>
 
 <style lang="scss">
-.page_allCheck{
+.page_allCheck {
   .van-tab--active {
     font-size: 1rem;
     color: #000;
@@ -273,5 +288,4 @@ export default {
     flex-basis: 26% !important;
   }
 }
-
 </style>

src/pages/personal/ElectronicSignature.vue

@@ -135,7 +135,7 @@ export default {
       middleAry: [],
       // 配置参数
       config: {
-        lineWidth: 3,
+        lineWidth: 6,
         lineColor: "#000",
         shadowBlur: 1,
         fillStyle: "#fff"

src/router/index.js

@@ -62,9 +62,26 @@ export default new Router({
           name: 'newMy',
           component: () => import('@/pages/my/index')
         },
-        
+        // 活动
+        {
+          path: '/active',
+          name: 'active',
+          component: () => import('@/pages/home/active')
+        },
       ]
     },
+    // 活动报名表
+    {
+      path: '/activeForm',
+      name: 'activeForm',
+      component: () => import('@/pages/home/activeForm')
+    },
+    // 活动报名表成功
+    {
+      path: '/activeSuccess',
+      name: 'activeSuccess',
+      component: () => import('@/pages/home/activeSuccess')
+    },
     // 商城
     {
       path: '/shop',

src/styles/style.scss

@@ -759,7 +759,7 @@ body {
 .CheckBox .van-checkbox__label {
   width: 94%;
   font-size: 0.45rem;
-
+  line-height: 1.25rem !important;
   @media only screen and (max-width: 812px) {
     width: 90%;
   }
@@ -1157,3 +1157,6 @@ body {
   line-height: 24px;
   text-align: center;
 }
+.van-checkbox__label{
+  line-height: 1.25rem;
+}