Browse Source

中能建打印单更改

XMLWAN 4 years ago
parent
commit
43c5e69a24

+ 2 - 2
config/dev.env.js View File

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

+ 11 - 0
src/api/login.js View File

@@ -80,3 +80,14 @@ export function createOrg(params) {
80 80
     params: params
81 81
   })
82 82
 }
83
+
84
+export function getMyMobile(id) {
85
+  const params = {
86
+    id: id
87
+  }
88
+  return request({
89
+    url: '/m/api/org/getMyMobile',
90
+    method: 'get',
91
+    params: params
92
+  })
93
+}

+ 7 - 2
src/api/patient/patient.js View File

@@ -606,9 +606,14 @@ export function getOrgName(id, params) {
606 606
   })
607 607
 }
608 608
 
609
-export function getRoleName(id, params) {
609
+export function getRoleName(id, orgid) {
610
+  const params = {
611
+    id: id,
612
+    orgid: orgid
613
+  }
614
+  console.log('params', params)
610 615
   return request({
611
-    url: '/m/api/patient/getrolename?id=' + id,
616
+    url: '/m/api/patient/getrolename',
612 617
     method: 'get',
613 618
     params: params
614 619
   })

+ 9 - 11
src/pages/my/index.vue View File

@@ -183,7 +183,7 @@ export default {
183 183
       LoginOut(this.adminid).then(response => {
184 184
         if (response.data.state === 1) {
185 185
           var msg = response.data.data.msg;
186
-          console.log("msg是", msg);
186
+          // console.log("msg是", msg);
187 187
           this.$store.dispatch("SetScheduals", {});
188 188
           this.$store.dispatch("SetWaitScheduals", {});
189 189
           this.isRouterAlive = false;
@@ -199,7 +199,7 @@ export default {
199 199
       GetHomeData().then(response => {
200 200
         if (response.data.state === 1) {
201 201
           var orgs = response.data.data.orgs;
202
-          console.log("orgs", orgs);
202
+          // console.log("orgs", orgs);
203 203
           this.organaziton = orgs;
204 204
           this.isCreateOrg = response.data.data.isCreateOrg;
205 205
         }
@@ -209,7 +209,7 @@ export default {
209 209
       getMyInformation(id).then(response => {
210 210
         if (response.data.state === 1) {
211 211
           var roleInfo = response.data.data.roleInfo;
212
-          console.log("roleInfo", roleInfo);
212
+
213 213
           this.admin_user_id = roleInfo.id;
214 214
           this.adminid = roleInfo.admin_user_id;
215 215
           this.roleInfo = roleInfo;
@@ -241,8 +241,6 @@ export default {
241 241
       }
242 242
     },
243 243
     toManage(id, orgid) {
244
-      console.log("id是什么", id);
245
-      console.log("机构ID", orgid);
246 244
       this.$router.push("/organizationinfo?id=" + id + "&orgid=" + orgid);
247 245
     },
248 246
     toEditOrg() {
@@ -256,7 +254,7 @@ export default {
256 254
       getMyInformationThree(id).then(response => {
257 255
         if (response.data.state === 1) {
258 256
           var roleInfo = response.data.data.roleInfo;
259
-          console.log("无机构", roleInfo);
257
+          // console.log("无机构", roleInfo);
260 258
           this.roleInfo = roleInfo;
261 259
           this.roleInfo.user_name = roleInfo.name;
262 260
           this.admin_user_id = roleInfo.id;
@@ -277,7 +275,7 @@ export default {
277 275
     getMyInformationFour() {
278 276
       getMyInformationFour().then(response => {
279 277
         var Username = response.data.data.Username;
280
-        console.log("userName", Username);
278
+        // console.log("userName", Username);
281 279
         this.roleInfo = Username;
282 280
         this.adminid = Username.admin_user_id;
283 281
         this.ids = Username.admin_user_id;
@@ -288,13 +286,13 @@ export default {
288 286
     setRem();
289 287
     this.GetHomeData();
290 288
     var creator = this.$store.getters.user.org.creator;
291
-    console.log("creator", creator);
289
+    // console.log("creator", creator);
292 290
     if (creator === 0) {
293 291
       var adminid = this.$store.getters.user.admin.id;
294
-      console.log("创建者id", adminid);
292
+      // console.log("创建者id", adminid);
295 293
       this.getMyInformationThree(adminid);
296 294
       this.adminid = 0;
297
-      console.log("ids", adminid);
295
+      // console.log("ids", adminid);
298 296
       var adminid = this.$store.getters.user.admin.id;
299 297
       this.ids = adminid;
300 298
       return false;
@@ -306,7 +304,7 @@ export default {
306 304
       // this.ids = creator;
307 305
     }
308 306
 
309
-    console.log("创建者ID", this.creator);
307
+    // console.log("创建者ID", this.creator);
310 308
     //  this.adminid = adminid;
311 309
     //  this.getMyInformation(adminid);
312 310
     //  this.getMyOrganazition(adminid);

+ 24 - 5
src/pages/my/modifyPassword.vue View File

@@ -78,7 +78,12 @@
78 78
 <script>
79 79
 // import { getCode, NextStep } from "@/api/login/login";
80 80
 import "@/styles/newStyle.scss";
81
-import { getCodeInit, getVerifyCode, forgetPassWord } from "@/api/login";
81
+import {
82
+  getCodeInit,
83
+  getVerifyCode,
84
+  forgetPassWord,
85
+  getMyMobile
86
+} from "@/api/login";
82 87
 import { checkMobile } from "@/utils/tools";
83 88
 import { hex_md5 } from "@/utils/md5";
84 89
 import { setRem } from "@/libs/functionRem";
@@ -93,7 +98,7 @@ export default {
93 98
       }
94 99
     };
95 100
     return {
96
-      showMessage:false,
101
+      showMessage: false,
97 102
       phone: "",
98 103
       code: "",
99 104
       psd: "",
@@ -119,9 +124,13 @@ export default {
119 124
     };
120 125
   },
121 126
   created() {
122
-    setRem()
127
+    setRem();
123 128
     this.GetCodeInit();
124
-    this.forgetForm.phone = this.$store.getters.user.admin.mobile;
129
+    var creator = this.$store.getters.user.org.creator;
130
+    console.log("创建者", creator);
131
+    // 获取当前登录者的手机号码
132
+    this.getMyMobile(creator);
133
+    // this.forgetForm.phone = this.$store.getters.user.admin.mobile;
125 134
   },
126 135
   methods: {
127 136
     modifyAndLogin() {
@@ -163,6 +172,7 @@ export default {
163 172
       getCodeInit().then(response => {
164 173
         if (response.data.state === 1) {
165 174
           this.aespass = response.data.data.aespass;
175
+          console.log("hhh", this.aespass);
166 176
         }
167 177
       });
168 178
     },
@@ -232,6 +242,15 @@ export default {
232 242
     },
233 243
     change(value) {
234 244
       this.forgetForm.phone = value.replace(/[^0-9]+/g, "");
245
+    },
246
+    getMyMobile(id) {
247
+      getMyMobile(id).then(response => {
248
+        if (response.data.state == 1) {
249
+          var mobile = response.data.data.mobile;
250
+          console.log("mobile", mobile);
251
+          this.forgetForm.phone = mobile.mobile;
252
+        }
253
+      });
235 254
     }
236 255
   },
237 256
   computed: {
@@ -442,7 +461,7 @@ export default {
442 461
     margin-left: 2.5rem;
443 462
   }
444 463
   .dialog-footer {
445
-    font-size:1rem;
464
+    font-size: 1rem;
446 465
     > span:nth-of-type(1) {
447 466
       color: #9b9b9b;
448 467
     }

+ 19 - 51
src/pages/my/organizationInfo.vue View File

@@ -30,8 +30,8 @@
30 30
       </div>
31 31
       <div class="organizeBoxTwo">
32 32
         <div>角色</div>
33
-        <div class="rolebox" v-if="role_name != ''">
34
-          <div class="roleboxBtn">{{ role_name }}</div>
33
+        <div class="rolebox" v-for="(item,index) in Names" :key="index">
34
+          <div class="roleboxBtn" v-if="item!=''">{{item}}</div>
35 35
         </div>
36 36
       </div>
37 37
       <div class="organizeBoxTwo">
@@ -54,7 +54,8 @@ export default {
54 54
       telephone: "",
55 55
       role_name: "",
56 56
       positionName: "",
57
-      org_logo: ""
57
+      org_logo: "",
58
+      Names: []
58 59
     };
59 60
   },
60 61
   methods: {
@@ -65,60 +66,28 @@ export default {
65 66
           this.org_short_name = name.org_name;
66 67
           this.org_logo = name.org_logo;
67 68
           this.telephone = name.telephone;
68
-          console.log("name", name);
69
+          // console.log("name", name);
69 70
         }
70 71
       });
71 72
     },
72
-    getRoleName(id) {
73
-      getRoleName(id).then(response => {
73
+    getRoleName(id, orgid) {
74
+      getRoleName(id, orgid).then(response => {
74 75
         if (response.data.state === 1) {
75 76
           var name = response.data.data.name;
76
-          console.log("角色", name);
77
+          // console.log("角色", name);
77 78
           this.role_name = name.role_name;
78 79
           var positionName = response.data.data.positionName;
79
-          if (positionName.user_title === 1) {
80
-            positionName.user_title = "医士";
81
-          }
82
-          if (positionName.user_title === 2) {
83
-            positionName.user_title = "医师";
84
-          }
85
-          if (positionName.user_title === 3) {
86
-            positionName.user_title = "住院医师";
87
-          }
88
-          if (positionName.user_title === 4) {
89
-            positionName.user_title = "主治医师";
90
-          }
91
-          if (positionName.user_title === 5) {
92
-            positionName.user_title = "副主任医师";
93
-          }
94
-          if (positionName.user_title === 6) {
95
-            positionName.user_title = "主任医师";
96
-          }
97
-          if (positionName.user_title === 7) {
98
-            positionName.user_title = "护士";
99
-          }
100
-          if (positionName.user_title === 8) {
101
-            positionName.user_title = "护师";
102
-          }
103
-          if (positionName.user_title === 9) {
104
-            positionName.user_title = "主管护师";
105
-          }
106
-          if (positionName.user_title === 10) {
107
-            positionName.user_title = "副主任护师";
108
-          }
109
-          if (positionName.user_title === 11) {
110
-            positionName.user_title = "主任护师";
111
-          }
112
-          if (positionName.user_title === 12) {
113
-            positionName.user_title = "运营专员";
114
-          }
115
-          if (positionName.user_title === 13) {
116
-            positionName.user_title = "运营主管";
117
-          }
118
-          console.log("职称", positionName);
119
-          this.positionName = positionName.user_title;
80
+          // console.log("positionName", positionName);
81
+          this.positionName = positionName.user_title_name;
82
+          var names = response.data.data.names;
83
+          // console.log("names", names);
84
+          var arr = [];
85
+          arr = names.split(",");
86
+          this.Names = arr;
87
+          // console.log("职称", positionName);
88
+
120 89
           var admin = response.data.data.admin;
121
-          console.log("admin", admin);
90
+          // console.log("admin", admin);
122 91
           if (admin.is_super_admin === 1) {
123 92
             this.role_name = "超级管理员";
124 93
           }
@@ -131,10 +100,9 @@ export default {
131 100
     this.user_name = this.$store.getters.user.user.user_name;
132 101
     // this.org_short_name = this.$store.getters.user.org.org_short_name;
133 102
     var id = this.$route.query.id;
134
-    console.log("id", id);
135 103
     var orgid = this.$route.query.orgid;
136 104
     this.getOrgName(orgid);
137
-    this.getRoleName(id);
105
+    this.getRoleName(id, orgid);
138 106
   }
139 107
 };
140 108
 </script>