我的页面bug修改

src/api/admin_user.js

@@ -1,193 +1,156 @@
 import request from '@/utils/request'
 
-export function GetElectronicSignature(){
-    return request({
-        url:'/m/api/getelectronicsignature',
-        method:'get',
-    })
+export function GetElectronicSignature() {
+  return request({
+    url: '/m/api/getelectronicsignature',
+    method: 'get'
+  })
 }
 
-export function SaveElectronicSignature(es){
-    return request({
-        url:'/m/api/savelectronicsignature',
-        method:'post',
-        data:es,
-    })
+export function SaveElectronicSignature(es, id) {
+  console.log('id', id)
+  return request({
+    url: '/m/api/savelectronicsignature?id=' + id,
+    method: 'post',
+    data: es
+  })
 }
 
-export function GetMyInfo(){
-    return request({
-        url:'/m/api/my',
-        method:'get',
-    })
+export function GetMyInfo() {
+  return request({
+    url: '/m/api/my',
+    method: 'get'
+  })
 }
 
-
-
-export function GetAllStaff(){
+export function GetAllStaff() {
   return request({
-    url:'/m/api/staff',
-    method:'get',
+    url: '/m/api/staff',
+    method: 'get'
   })
 }
 
-
-
-export function EditAdmin(params){
+export function EditAdmin(params) {
   return request({
-    url:'/m/api/staff/edit',
-    method:'post',
-    params:params,
+    url: '/m/api/staff/edit',
+    method: 'post',
+    params: params
   })
 }
 
-
-export function AdminInitData(){
+export function AdminInitData() {
   return request({
-    url:'/m/api/staff/init',
-    method:'get',
+    url: '/m/api/staff/init',
+    method: 'get'
   })
 }
 
-export function GetAdminUserInfo(params){
+export function GetAdminUserInfo(params) {
   return request({
-    url:'/m/api/staff/get',
-    method:'get',
-    params:params,
+    url: '/m/api/staff/get',
+    method: 'get',
+    params: params
   })
 }
 
-
-
-export function StopAdminUser(params){
+export function StopAdminUser(params) {
   return request({
-    url:'/m/api/staff/stop',
-    method:'post',
-    params:params,
+    url: '/m/api/staff/stop',
+    method: 'post',
+    params: params
   })
 }
 
-export function CreateAdminUser(params){
+export function CreateAdminUser(params) {
   return request({
-    url:'/m/api/staff/create',
-    method:'post',
-    params:params,
+    url: '/m/api/staff/create',
+    method: 'post',
+    params: params
   })
 }
 
-export function CreateRole(params){
+export function CreateRole(params) {
   return request({
-    url:'/m/api/role/create',
-    method:'post',
-    params:params,
+    url: '/m/api/role/create',
+    method: 'post',
+    params: params
   })
 }
 
-
-
-
-export function GetAllPurview(params){
+export function GetAllPurview(params) {
   return request({
-    url:'/m/api/permission',
-    method:'get',
-    params:params,
+    url: '/m/api/permission',
+    method: 'get',
+    params: params
   })
 }
 
-
-export function GetRoleInfo(params){
+export function GetRoleInfo(params) {
   return request({
-    url:'/m/api/rolepurview',
-    method:'get',
-    params:params,
+    url: '/m/api/rolepurview',
+    method: 'get',
+    params: params
   })
 }
 
-
-export function EditRoleInfo(params){
+export function EditRoleInfo(params) {
   return request({
-    url:'/m/api/role/edit',
-    method:'post',
-    params:params,
+    url: '/m/api/role/edit',
+    method: 'post',
+    params: params
   })
 }
 
-
-export function DeleteRoleInfo(params){
+export function DeleteRoleInfo(params) {
   return request({
-    url:'/m/api/role/del',
-    method:'post',
-    params:params,
+    url: '/m/api/role/del',
+    method: 'post',
+    params: params
   })
 }
 
-
-export function AddUserRole(params){
+export function AddUserRole(params) {
   return request({
-    url:'/m/api/role/addStaff',
-    method:'post',
-    params:params,
+    url: '/m/api/role/addStaff',
+    method: 'post',
+    params: params
   })
 }
 
-export function GetAllFunctionPurview(){
+export function GetAllFunctionPurview() {
   return request({
-    url:'/m/api/role/funtionpurview',
-    method:'get',
+    url: '/m/api/role/funtionpurview',
+    method: 'get'
   })
 }
 
-
-
-
-
-
-export function EditPurview(params){
+export function EditPurview(params) {
   return request({
-    url:'/m/api/permission/post',
-    method:'post',
-    params: params,
+    url: '/m/api/permission/post',
+    method: 'post',
+    params: params
   })
 }
 
-
-
-
-export function EditFuncPurview(params){
+export function EditFuncPurview(params) {
   return request({
-    url:'/m/api/functionpermission/post',
-    method:'post',
-    params:params,
+    url: '/m/api/functionpermission/post',
+    method: 'post',
+    params: params
   })
 }
 
-
-export function GetFunctionRoleInfo(params){
+export function GetFunctionRoleInfo(params) {
   return request({
-    url:'/m/api/func_role/get',
-    method:'get',
-    params:params,
+    url: '/m/api/func_role/get',
+    method: 'get',
+    params: params
   })
 }
 
-
-
-
-export function GetAllRole(){
+export function GetAllRole() {
   return request({
-    url:'/m/api/role',
-    method:'get',
+    url: '/m/api/role',
+    method: 'get'
   })
 }
-
-
-
-
-
-
-
-
-
-
-
-

src/api/patient/patient.js

@@ -931,3 +931,12 @@ export function getRolePosition(params) {
     params: params
   })
 }
+
+export function getMobile(params) {
+  console.log('params', params)
+  return request({
+    url: '/m/api/patient/getmobile',
+    method: 'get',
+    params: params
+  })
+}

src/pages/home/activeForm.vue

@@ -17,9 +17,9 @@
                 <p>以上解释权归酷医云所有，敬请留意</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.mobile" label="收件手机" required placeholder="请填写" readonly/>
             <van-field v-model="form.address" label="收件地址" required placeholder="请填写"/>
-            <van-field v-model="form.position" label="您的职务" @click="show = true" readonly required placeholder="请填写"/>
+            <van-field v-model="position"  label="您的职务" @click="show = true" readonly required placeholder="请填写"/>
             <van-field v-model="form.hospital_name" label="医院名称" required placeholder="请填写"/>
             <div class="formOne">
                 <div class="formTitle"><span style="color:#ee0a24">*</span>目前医院/机构是否正在使用透析管理系统？</div>
@@ -72,7 +72,7 @@
 </template>
 
 <script>
-import { submitForm } from "@/api/patient/patient";
+import { submitForm, getMobile } from "@/api/patient/patient";
 export default {
   data() {
     return {
@@ -80,6 +80,7 @@ export default {
       radioOne: "0",
       resultTwo: [],
       result: [],
+      position: "",
       form: {
         name: "",
         mobile: "",
@@ -94,11 +95,76 @@ export default {
         other_message: "",
         system_name: ""
       },
-      show:false,
-      columns: ['医生', '护士', '主任', '技师', '运营','护士长','库存','其他'],
+      show: false,
+      columns: [
+        "医生",
+        "护士",
+        "主任",
+        "技师",
+        "运营",
+        "护士长",
+        "库存",
+        "其他"
+      ]
     };
   },
+
   methods: {
+    getMobile() {
+      getMobile().then(response => {
+        if (response.data.state === 1) {
+          var mobile = response.data.data.mobile;
+          this.form.mobile = mobile.mobile;
+          console.log("mobile", mobile);
+        }
+      });
+    },
+    onConfirm(val) {
+      if (val === "医生") {
+        this.position = val;
+        this.show = false;
+        this.form.position = 1;
+      }
+      if (val === "护士") {
+        this.position = val;
+        this.show = false;
+        this.form.position = 2;
+      }
+      if (val === "主任") {
+        this.position = val;
+        this.show = false;
+        this.form.position = 3;
+      }
+      if (val === "技师") {
+        this.position = val;
+        this.show = false;
+        this.form.position = 4;
+      }
+      if (val === "运营") {
+        this.position = val;
+        this.show = false;
+        this.form.position = 5;
+      }
+      if (val === "护士长") {
+        this.position = val;
+        this.show = false;
+        this.form.position = 6;
+      }
+      if (val === "库存") {
+        this.position = val;
+        this.show = false;
+        this.form.position = 7;
+      }
+      if (val === "其他") {
+        this.position = val;
+        this.show = false;
+        this.form.position = 8;
+      }
+      console.log("val是", val);
+    },
+    onCancel() {
+      this.show = false;
+    },
     submitForm() {
       if (this.form.name == "") {
         this.$toast("收件姓名不能为空");
@@ -178,12 +244,15 @@ export default {
         if (response.data.state === 1) {
           var table = response.data.data.table;
           this.$router.push({ path: "/activeSuccess" });
-          console.log("aaa")
+          console.log("aaa");
         } else {
           this.$toast("您已提交过信息,请勿重复提交");
         }
       });
     }
+  },
+  created() {
+    this.getMobile();
   }
 };
 </script>
@@ -212,58 +281,57 @@ export default {
     font-size: 1.125rem;
     font-weight: 600;
   }
-    .formBox{
-        width:21rem;
-        height:99rem;
-        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;
-        }
-        .attention{
-            font-size: .9375rem;
-            font-weight: bold;
-            color: #FD543A;
-        }
+  .formBox {
+    width: 21rem;
+    height: 99rem;
+    background: rgba(255, 255, 255, 1);
+    border-radius: 15px;
+    margin: 0.875rem auto;
+  }
+  .attentionBox {
+    font-size: 0.875rem;
+    color: #242d39;
+    padding: 0 0.625rem;
+    line-height: 1.5rem;
+    span {
+      color: #fd543a;
+      font-weight: bold;
     }
-    .formOne{
-        font-size: 1.0625rem;
-        margin-left: .5rem;
-        padding: 1.5rem 0;
-        border-bottom: 0.0625rem solid #e5e5e5;
-        .formTitle{
-            margin: 0 0 1.5rem;
-        }
+    .attention {
+      font-size: 0.9375rem;
+      font-weight: bold;
+      color: #fd543a;
     }
-    .formTwo{
-        font-size: 1.0625rem;
-        margin-left: .5rem;
-        padding: 1.5rem 0;
-        .formTitle{
-            margin: 0 0 1.5rem;
-        }
+  }
+  .formOne {
+    font-size: 1.0625rem;
+    margin-left: 0.5rem;
+    padding: 1.5rem 0;
+    border-bottom: 0.0625rem solid #e5e5e5;
+    .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;
+  }
+  .formTwo {
+    font-size: 1.0625rem;
+    margin-left: 0.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 0.625rem;
+    background: #1b97ff;
+    border-radius: 1.875rem;
+    font-weight: 600;
+    font-size: 1.25rem;
+  }
 }
 ::-webkit-scrollbar {
   width: 0;
@@ -336,23 +404,23 @@ export default {
       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%;
-            }
-        }
+  .textareaBox2 {
+    margin-top: 0.625rem;
+    margin-right: 0.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/my/index.vue

@@ -78,7 +78,7 @@
 
         <div class="myInfoRight">
           <div
-            v-if="item.creator == $store.getters.user.org.creator"
+            v-if="item.creator == cretor || position == '子管理员'"
             class="myInfoRightBtn"
             @click="toEditOrg()"
           >
@@ -178,7 +178,8 @@ export default {
       ids: 0,
       isCreateOrg: false,
       org_id: 0,
-      cretor: 0
+      cretor: 0,
+      position: ""
     };
   },
   methods: {
@@ -205,9 +206,9 @@ export default {
           console.log("orgs", orgs);
           this.organaziton = orgs;
           this.isCreateOrg = response.data.data.isCreateOrg;
-          // var cretor = response.data.data.cretor;
+          var cretor = response.data.data.cretor;
           //  console.log("cretor", cretor);
-          // this.cretor = cretor;
+          this.cretor = cretor;
         }
       });
     },
@@ -292,8 +293,8 @@ export default {
     getRolePosition() {
       getRolePosition().then(response => {
         if (response.data.state === 1) {
-          var orgs = response.data.data.cretorPosition;
-          console.log("position", orgs);
+          var cretorPosition = response.data.data.cretorPosition;
+          this.position = cretorPosition.role_name;
         }
       });
     }

src/pages/personal/ElectronicSignature.vue

@@ -139,7 +139,8 @@ export default {
         lineColor: "#000",
         shadowBlur: 1,
         fillStyle: "#fff"
-      }
+      },
+      cretor: 0
     };
   },
   created() {
@@ -153,6 +154,8 @@ export default {
     //   },
     //   { passive: false }
     // );
+    var id = this.$router.push("id");
+    this.cretor = id;
   },
   mounted() {
     const canvas = document.querySelector("#canvas");
@@ -355,7 +358,7 @@ export default {
       xhr.onreadystatechange = function() {
         if (xhr.readyState == 4) {
           var returnData = JSON.parse(xhr.responseText);
-          SaveElectronicSignature(returnData).then(response => {
+          SaveElectronicSignature(returnData, this.cretor).then(response => {
             if (response.data.state == 1) {
               _this.electronicsignature =
                 response.data.data.electronic_signature.url;

src/router/index.js

@@ -67,7 +67,7 @@ export default new Router({
           path: '/active',
           name: 'active',
           component: () => import('@/pages/home/active')
-        },
+        }
       ]
     },
     // 活动报名表
@@ -302,7 +302,7 @@ export default new Router({
       name: 'longdialysis',
       component: () => import('@/pages/allLongDialysis/index')
     },
-    //, 
+    //,
     {
       path: '/alldoctoradvice',
       name: '/alldoctoradvice',