XMLWAN 4 lat temu
rodzic
commit
2de8284ab4

+ 5 - 5
src/api/patient.js Wyświetl plik

@@ -15,14 +15,14 @@ export function EditDialysisSolution(id, solution) {
15 15
   })
16 16
 }
17 17
 
18
-export function EditAssessmentBeforeDislysis(id, assessment_date, before,mode) {
18
+export function EditAssessmentBeforeDislysis(id, assessment_date, before, mode) {
19 19
   return request({
20
-    url: '/m/api/assessmentbefore/commit?patient=' + id + '&assessment_date=' + assessment_date+"&mode="+mode,
20
+    url: '/m/api/assessmentbefore/commit?patient=' + id + '&assessment_date=' + assessment_date + '&mode=' + mode,
21 21
     method: 'post',
22 22
     data: before,
23
-    headers:{"Permission":1},
24
-
25
-
23
+    headers: {
24
+      'Permission': 1
25
+    }
26 26
 
27 27
   })
28 28
 }

+ 53 - 5
src/api/patient/patient.js Wyświetl plik

@@ -584,9 +584,9 @@ export function SaveBirthday(data) {
584 584
   })
585 585
 }
586 586
 
587
-export function getOrgName(params) {
587
+export function getOrgName(id, params) {
588 588
   return request({
589
-    url: '/m/api/patient/getorgname',
589
+    url: '/m/api/patient/getorgname?id=' + id,
590 590
     method: 'Get',
591 591
     params: params
592 592
   })
@@ -725,7 +725,6 @@ export function getBloodPatient(params) {
725 725
 }
726 726
 
727 727
 export function DeletePatient(id, params) {
728
-  console.log('医嘱id', id)
729 728
   return request({
730 729
     url: '/m/api/patient/deletePatient?id=' + id,
731 730
     method: 'delete',
@@ -762,9 +761,9 @@ export function getMyOrganazition(id, params) {
762 761
   })
763 762
 }
764 763
 
765
-export function getOrgInformation(params) {
764
+export function getOrgInformation(id, params) {
766 765
   return request({
767
-    url: '/m/api/org/getorginformation',
766
+    url: '/m/api/org/getorginformation?id=' + id,
768 767
     method: 'get',
769 768
     params: params
770 769
   })
@@ -793,3 +792,52 @@ export function getMyInforName(id, params) {
793 792
     params: params
794 793
   })
795 794
 }
795
+
796
+export function getPartionDetail(id, params) {
797
+  return request({
798
+    url: '/m/api/patient/getpartiondetail?id=' + id,
799
+    method: 'get',
800
+    params: params
801
+  })
802
+}
803
+
804
+export function UpdatePartition(params) {
805
+  return request({
806
+    url: '/m/api/patient/updatepartition',
807
+    method: 'get',
808
+    params: params
809
+  })
810
+}
811
+
812
+export function getGroupDetail(id, params) {
813
+  return request({
814
+    url: '/m/api/patient/getgroupdetail?id=' + id,
815
+    method: 'get',
816
+    params: params
817
+  })
818
+}
819
+
820
+export function updateGroup(params) {
821
+  return request({
822
+    url: '/m/api/patient/updategroup',
823
+    method: 'get',
824
+    params: params
825
+  })
826
+}
827
+
828
+export function getBedDetail(id, params) {
829
+  return request({
830
+    url: '/m/api/patient/getbeddetail?id=' + id,
831
+    method: 'get',
832
+    params: params
833
+  })
834
+}
835
+
836
+export function updateBed(params) {
837
+  console.log('params', params)
838
+  return request({
839
+    url: '/m/api/patient/updatebed',
840
+    method: 'get',
841
+    params: params
842
+  })
843
+}

+ 74 - 59
src/pages/allDoctorAdvice/index.vue Wyświetl plik

@@ -13,14 +13,14 @@
13 13
         :key="index"
14 14
       >
15 15
         <div v-for="(it, i) in item.child" :key="i">
16
-            <p class="time">
16
+            <p class="time" v-if="i<1">
17 17
               {{ it.advice_date ? getTime(it.advice_date) : "" }}
18 18
             </p>
19 19
           <div class="statOrder">
20 20
             <div v-if="it.advice_type == 1 && it.parent_id == 0">
21 21
               <div class="statOrderTitle">
22
-                <span>长期医嘱</span>
23
-                <span style="margin-left:1rem">
22
+                <span v-if="i<1">长期医嘱</span>
23
+                <span style="margin-left:1rem" v-if="i<1">
24 24
                   {{ getTimes(it.start_time) }}
25 25
                 </span>
26 26
               </div>
@@ -56,24 +56,21 @@
56 56
                        />
57 57
                   </div>
58 58
                 </div>
59
-              </div>
60
-              <div
61
-                class="doctorBox"
62
-                v-if="it.advice_doctor || it.execution_staff || it.checker"
63
-              >
64
-                <p>开嘱医生:{{ getDoctor(it.advice_doctor) }}</p>
65
-                <p>执行护士:{{ getDoctor(item.execution_staff) }}</p>
66
-                <p>核对护士:{{ getDoctor(item.checker) }}</p>
67
-              </div>
68
-            </div>
59
+                  <div class="doctorBox">
60
+                      <p>开嘱医生:{{ getDoctor(it.advice_doctor)}}</p>
61
+                      <p>执行护士:{{ getDoctor(it.execution_staff) }}</p>
62
+                      <p>核对护士:{{ getDoctor(it.checker) }}</p>
63
+                  </div>
64
+               </div>
65
+             </div>
69 66
 
70 67
             <div
71 68
               class="statOrder"
72 69
               v-if="it.advice_type == 3 && it.parent_id == 0"
73 70
             >
74 71
               <div class="longOrderTitle">
75
-                <span>临时医嘱</span>
76
-                <span style="margin-left:1rem">
72
+                <span v-if="i<1">临时医嘱</span>
73
+                <span style="margin-left:1rem" v-if="i<1">
77 74
                   {{ getTimes(item.child[0].start_time) }}
78 75
                 </span>
79 76
               </div>
@@ -89,7 +86,7 @@
89 86
                       <van-icon
90 87
                         class="ellipsis"
91 88
                         name="ellipsis"
92
-                        @click="newShowTwo=true"
89
+                        @click="DeleteTwo(it.id,it.execution_state,index)"
93 90
                        />
94 91
                  </div>
95 92
                 <div v-for="(i, index) in childList" :key="index">
@@ -105,14 +102,13 @@
105 102
                      <van-icon
106 103
                         class="ellipsis"
107 104
                         name="ellipsis"
108
-                        @click="newShowThree=true"
105
+                        @click="DeleteThree(i.id,i.execution_state,index)"
109 106
                        />
110 107
                   </div>
111 108
                 </div>
112 109
               </div>
113 110
               <div
114 111
                 class="doctorBox"
115
-                v-if="it.advice_doctor || it.execution_staff || it.checker"
116 112
               >
117 113
                 <p>开嘱医生:{{ getDoctor(it.advice_doctor) }}</p>
118 114
                 <p>执行护士:{{ getDoctor(it.execution_staff) }}</p>
@@ -121,6 +117,7 @@
121 117
             </div>
122 118
           </div>
123 119
         </div>
120
+
124 121
       </div>
125 122
 
126 123
         <van-action-sheet
@@ -184,7 +181,6 @@ export default {
184 181
       newShowOne: false,
185 182
       newShowTwo: false,
186 183
       newShowThree: false,
187
-      id: 0,
188 184
       index: 0,
189 185
       state: 0
190 186
     };
@@ -222,35 +218,34 @@ export default {
222 218
           let list = Object.values(dataInfo); // list 转换成功的数据
223 219
           let arr = [];
224 220
 
225
-          list.map(item => {
226
-            let arr2 = [];
227
-            if (item.child.length > 1) {
228
-              item.child.map(it => {
229
-                if (arr.indexOf(it.advice_date) == -1) {
230
-                  arr.push(it.advice_date);
231
-                } else {
232
-                  delete it["advice_date"];
233
-                }
234
-              });
235
-              for (var i = item.child.length - 1; i != -1; i--) {
236
-                let obj = {};
237
-                obj.checker = item.child[i].checker;
238
-                obj.execution_staff = item.child[i].execution_staff;
239
-                obj.user_name = item.child[i].advice_doctor;
240
-                if (
241
-                  JSON.stringify(arr2).includes(JSON.stringify(obj)) == false
242
-                ) {
243
-                  console.log("ajsdkljasldkasjdlkasjs");
244
-                  arr2.push(obj);
245
-                } else {
246
-                  console.log("删除");
247
-                  delete item.child[i]["checker"];
248
-                  delete item.child[i]["execution_staff"];
249
-                  delete item.child[i]["advice_doctor"];
250
-                }
251
-              }
252
-            }
253
-          });
221
+          // list.map(item => {
222
+          //   let arr2 = [];
223
+          //   if (item.child.length > 1) {
224
+          //     item.child.map(it => {
225
+          //       if (arr.indexOf(it.advice_date) == -1) {
226
+          //         arr.push(it.advice_date);
227
+          //       } else {
228
+          //         delete it["advice_date"];
229
+          //       }
230
+          //     });
231
+          //     for (var i = item.child.length - 1; i != -1; i--) {
232
+          //       let obj = {};
233
+          //       obj.checker = item.child[i].checker;
234
+          //       obj.execution_staff = item.child[i].execution_staff;
235
+          //       obj.user_name = item.child[i].advice_doctor;
236
+          //       if (
237
+          //         JSON.stringify(arr2).includes(JSON.stringify(obj)) == false
238
+          //       ) {
239
+          //         arr2.push(obj);
240
+          //       } else {
241
+          //         console.log("删除");
242
+          //         delete item.child[i]["checker"];
243
+          //         delete item.child[i]["execution_staff"];
244
+          //         delete item.child[i]["advice_doctor"];
245
+          //       }
246
+          //     }
247
+          //   }
248
+          // });
254 249
 
255 250
           console.log("list是 ", list);
256 251
           this.doctorAdvicedetail = list;
@@ -281,22 +276,29 @@ export default {
281 276
       }
282 277
     },
283 278
     toDelete(id, state, index) {
284
-      console.log("id", id);
285
-      console.log("state", state);
286 279
       this.id = id;
287 280
       this.state = state;
288 281
       this.index = index;
289 282
       this.newShow = true;
290 283
     },
291 284
     Delete(id, state, index) {
292
-      console.log("id", id);
293
-      console.log("state", state);
294 285
       this.id = id;
295 286
       this.state = state;
296 287
       this.index = index;
297 288
       this.newShowOne = true;
298 289
     },
299
-
290
+    DeleteTwo(id, state, index) {
291
+      this.id = id;
292
+      this.state = state;
293
+      this.index = index;
294
+      this.newShowTwo = true;
295
+    },
296
+    DeleteThree(id, state, index) {
297
+      this.id = id;
298
+      this.state = state;
299
+      this.index = index;
300
+      this.newShowThree = true;
301
+    },
300 302
     onCancel() {
301 303
       this.newShow = false;
302 304
     },
@@ -313,10 +315,21 @@ export default {
313 315
         this.DeleteChild(this.id, this.index, this.state);
314 316
       }
315 317
     },
316
-    onSelectTwo() {},
317
-    onCancelTwo() {},
318
-    onCancelThree() {},
319
-    onSelectThree() {},
318
+    onSelectTwo(val) {
319
+      if (val.name === "删除") {
320
+        this.DeletePatient(this.id, this.state, this.index);
321
+      }
322
+      this.newShowTwo = false;
323
+    },
324
+    onCancelTwo() {
325
+      this.newShowTwo = false;
326
+    },
327
+    onCancelThree() {
328
+      this.newShowThree = false;
329
+    },
330
+    onSelectThree() {
331
+      this.DeleteChild(this.id, this.index, this.state);
332
+    },
320 333
     DeletePatient(id, index, state) {
321 334
       if (state == 1) {
322 335
         this.$toast("医嘱已执行,无法删除");
@@ -330,6 +343,7 @@ export default {
330 343
           if (response.data.state === 1) {
331 344
             var msg = response.data.data.msg;
332 345
             this.GetDoctorAdviceDetail(this.id);
346
+            this.doctorAdvicedetail.splice(index, 1);
333 347
             this.newShow = false;
334 348
           }
335 349
         });
@@ -347,22 +361,23 @@ export default {
347 361
         DeleteChild(id).then(response => {
348 362
           if (response.data.state === 1) {
349 363
             var msg = response.data.data.msg;
350
-
351 364
             this.childList.splice(index, 1);
352 365
             this.newShowOne = false;
366
+            this.newShowThree = false;
353 367
           }
354 368
         });
355 369
       });
356 370
     }
357 371
   },
358 372
   created() {
359
-    this.active = parseInt(this.$route.query.active);
360 373
     setRem();
361 374
     setHeight();
362 375
     var id = this.$route.query.id;
376
+    console.log("id是--------", id);
363 377
     this.GetDoctorAdviceDetail(id);
364 378
     var patientid = this.$route.query.patientid;
365 379
     this.id = patientid;
380
+    this.active = parseInt(this.$route.query.active);
366 381
     this.getAllDoctor();
367 382
   }
368 383
 };

+ 7 - 1
src/pages/configureCenter/components/Bed.vue Wyświetl plik

@@ -44,7 +44,7 @@ export default {
44 44
       finished: false,
45 45
       newShow: false,
46 46
       show: false,
47
-      actions: [{ name: "删除" }],
47
+      actions: [{ name: "编辑" }, { name: "删除" }],
48 48
       page: 1,
49 49
       limit: 10,
50 50
       total: 0,
@@ -114,6 +114,9 @@ export default {
114 114
       if (val.name === "删除") {
115 115
         this.DeleteBed(this.id, this.index);
116 116
       }
117
+      if (val.name === "编辑") {
118
+        this.$router.push("/editbed?id=" + this.id + "&active=" + this.active);
119
+      }
117 120
     },
118 121
     onCancel() {
119 122
       this.newShow = false;
@@ -129,6 +132,9 @@ export default {
129 132
             console.log("msg", msg);
130 133
             this.BedNumber.splice(index, 1);
131 134
             this.newShow = false;
135
+          } else {
136
+            this.$toast("该床位尚有排班安排,不能删除");
137
+            this.newShow = false;
132 138
           }
133 139
         });
134 140
       });

+ 6 - 1
src/pages/configureCenter/components/Grouping.vue Wyświetl plik

@@ -40,7 +40,7 @@ export default {
40 40
       loading: false,
41 41
       finished: false,
42 42
       newShow: false,
43
-      actions: [{ name: "删除" }],
43
+      actions: [{ name: "编辑" }, { name: "删除" }],
44 44
       page: 1,
45 45
       limit: 10,
46 46
       group: [],
@@ -94,6 +94,11 @@ export default {
94 94
       if (val.name === "删除") {
95 95
         this.DeleteGroup(this.id, this.number, this.index);
96 96
       }
97
+      if (val.name === "编辑") {
98
+        this.$router.push(
99
+          "/editgroup?id=" + this.id + "&active=" + this.active
100
+        );
101
+      }
97 102
     },
98 103
     DeleteGroup(id, number, index) {
99 104
       if (number !== "") {

+ 6 - 2
src/pages/configureCenter/components/Partition.vue Wyświetl plik

@@ -23,6 +23,7 @@
23 23
         <van-icon class="addIcon" name="add" @click="addPartition" />新增
24 24
       </div>
25 25
     </div>
26
+
26 27
     <van-action-sheet
27 28
       v-model="newShow"
28 29
       :actions="actions"
@@ -45,7 +46,7 @@ export default {
45 46
       loading: false,
46 47
       finished: false,
47 48
       newShow: false,
48
-      actions: [{ name: "删除" }],
49
+      actions: [{ name: "编辑" }, { name: "删除" }],
49 50
       page: 1,
50 51
       limit: 10,
51 52
       zone: [],
@@ -113,12 +114,15 @@ export default {
113 114
       if (val.name === "删除") {
114 115
         this.DeleteZone(this.id, this.number, this.index);
115 116
       }
117
+      if (val.name === "编辑") {
118
+        this.$router.push("/editpartition?id=" + this.id);
119
+      }
116 120
     },
117 121
     Delete(id, number, index) {
122
+      this.newShow = true;
118 123
       this.id = id;
119 124
       this.index = index;
120 125
       this.number = number;
121
-      this.newShow = true;
122 126
     },
123 127
     DeleteZone(id, number, index) {
124 128
       if (number !== "") {

+ 5 - 8
src/pages/doctorAdvice/components/DoctorManagement.vue Wyświetl plik

@@ -30,10 +30,10 @@
30 30
          finished-text="没有更多了"
31 31
          >
32 32
 
33
-          <div class="adviceOne" v-for="(item,index) in this.doctorAdvice" :key="index">
33
+          <div class="adviceOne" v-for="(item,index) in this.doctorAdvice" :key="index" v-show="showOne">
34 34
             <div class="adviceTitle">
35 35
               <p>{{getTime(item.child[0].start_time)}}</p>
36
-              <van-icon class="ellipsis" name="ellipsis" @click="newShow = true" />
36
+              <van-icon class="ellipsis" name="ellipsis" @click="Delete(item.groupno, index, item.child[0].execution_staff)" />
37 37
             </div>
38 38
 
39 39
          <div v-for="(it,i) in item.child" :key="i">
@@ -415,7 +415,6 @@ export default {
415 415
       );
416 416
       this.endShow = false;
417 417
     },
418
-    changeData(val) {},
419 418
     getDoctorAdvices(patientid) {
420 419
       if (this.type === "全部") {
421 420
         this.form.type = 0;
@@ -436,7 +435,7 @@ export default {
436 435
       ).then(response => {
437 436
         if (response.data.state === 1) {
438 437
           var advice = response.data.data.advice;
439
-          console.log("advice", advice);
438
+          // console.log("advice", advice);
440 439
           var one = response.data.data.one;
441 440
           let dataInfo = {};
442 441
           one.forEach((item, index) => {
@@ -463,14 +462,12 @@ export default {
463 462
             }
464 463
           }
465 464
           this.childList = objarr;
466
-          console.log("list", list);
467 465
           let arr = this.doctorAdvice;
468 466
           arr.push(...list.reverse());
469 467
           this.doctorAdvice = arr;
470
-          console.log("listtwo", this.doctorAdvice);
471 468
           var total = response.data.data.total;
472 469
           this.total = total;
473
-          console.log("total", total);
470
+          // console.log("total", total);
474 471
           this.loading = false;
475 472
         }
476 473
       });
@@ -501,7 +498,7 @@ export default {
501 498
     onLoad() {
502 499
       setTimeout(() => {
503 500
         this.form.page++;
504
-        console.log("page", this.form.page);
501
+        // console.log("page", this.form.page);
505 502
         if (this.form.page <= Math.ceil(this.total / 5)) {
506 503
           this.getDoctorAdvices(
507 504
             this.patient_id,

+ 1 - 1
src/pages/homeIndex/index.vue Wyświetl plik

@@ -179,7 +179,7 @@ export default {
179 179
     },
180 180
     toOrgSetting() {
181 181
       if (this.isCreateOrg) {
182
-        this.$router.push("/editorg");
182
+        this.$router.push("/editorg?id=" + this.value1);
183 183
       } else {
184 184
         this.$toast({
185 185
           message: "你尚未创建机构,请先创建机构"

+ 25 - 9
src/pages/my/index.vue Wyświetl plik

@@ -56,9 +56,9 @@
56 56
           <span v-if="item.org_logo !==''"><img :src="item.org_logo"></span>
57 57
           <p>{{item.org_name}}</p>
58 58
         </div>
59
-        <div class="myInfoRight" v-if="item.is_super_admin == 1">
60
-          <div class="myInfoRightBtn" @click="toEditOrg()">管理</div>
61
-          <van-icon class="arrow" name="arrow"  @click="toManage"/>
59
+        <div class="myInfoRight">
60
+          <div v-if="item.creator == $store.getters.user.org.creator" class="myInfoRightBtn" @click="toEditOrg(item.id)">管理</div>
61
+          <van-icon class="arrow" name="arrow"  @click="toManage(item.creator,item.id)"/>
62 62
         </div>
63 63
       </div>
64 64
     </div>
@@ -130,6 +130,7 @@ import {
130 130
   getMyInforName
131 131
 } from "@/api/patient/patient";
132 132
 import { uParseTime } from "@/utils/tools";
133
+import { GetHomeData } from "@/api/home";
133 134
 export default {
134 135
   data() {
135 136
     return {
@@ -137,7 +138,8 @@ export default {
137 138
       admin_user_id: 0,
138 139
       adminid: 0,
139 140
       organaziton: [],
140
-      userName: {}
141
+      userName: {},
142
+      creator: 0
141 143
     };
142 144
   },
143 145
   methods: {
@@ -154,6 +156,15 @@ export default {
154 156
         }
155 157
       });
156 158
     },
159
+    GetHomeData() {
160
+      GetHomeData().then(response => {
161
+        if (response.data.state === 1) {
162
+          var orgs = response.data.data.orgs;
163
+          console.log("orgs", orgs);
164
+          this.organaziton = orgs;
165
+        }
166
+      });
167
+    },
157 168
     getMyInformation(id) {
158 169
       getMyInformation(id).then(response => {
159 170
         if (response.data.state === 1) {
@@ -165,11 +176,12 @@ export default {
165 176
         }
166 177
       });
167 178
     },
179
+
168 180
     getMyOrganazition(id) {
169 181
       getMyOrganazition(id).then(response => {
170 182
         if (response.data.state === 1) {
171 183
           var organaziton = response.data.data.organaziton;
172
-          this.organaziton = organaziton;
184
+          // this.organaziton = organaziton;
173 185
         }
174 186
       });
175 187
     },
@@ -192,11 +204,11 @@ export default {
192 204
     toMyInfo() {
193 205
       this.$router.push("/myInfo?id=" + this.admin_user_id);
194 206
     },
195
-    toManage() {
196
-      this.$router.push("/organizationinfo?id=" + this.adminid);
207
+    toManage(id, orgid) {
208
+      this.$router.push("/organizationinfo?id=" + id + "&orgid=" + orgid);
197 209
     },
198
-    toEditOrg() {
199
-      this.$router.push("/newMy");
210
+    toEditOrg(id) {
211
+      this.$router.push("/editorg?id=" + id);
200 212
     },
201 213
     toMyIndex() {
202 214
       this.$router.push("/myInfo?id=" + this.admin_user_id);
@@ -204,9 +216,13 @@ export default {
204 216
   },
205 217
   created() {
206 218
     var adminid = this.$store.getters.user.user.id;
219
+
207 220
     this.getMyInformation(adminid);
208 221
     this.getMyOrganazition(adminid);
209 222
     this.getMyInforName(adminid);
223
+    this.GetHomeData();
224
+    this.creator = this.$store.getters.user.org.creator;
225
+    console.log("id是dongxi", this.creator);
210 226
   }
211 227
 };
212 228
 </script>

+ 14 - 9
src/pages/my/organizationInfo.vue Wyświetl plik

@@ -7,7 +7,8 @@
7 7
     <div class="organizeBox">
8 8
       <div class="organizeBoxOne">
9 9
         <div class="organizeBoxOneLeft">
10
-          <img src="../../assets/images/m01.png" alt />
10
+          <span v-if="org_logo==''"><img src="../../assets/images/m01.png" alt /></span>
11
+          <span v-if="org_logo!=''"><img :src="org_logo" alt /></span>
11 12
           <p>{{ org_short_name }}</p>
12 13
         </div>
13 14
         <van-icon class="arrow" name="arrow" />
@@ -27,13 +28,13 @@
27 28
       </div>
28 29
       <div class="organizeBoxTwo">
29 30
         <div>角色</div>
30
-        <div class="rolebox">
31
+        <div class="rolebox" v-if="role_name !=''">
31 32
           <div class="roleboxBtn">{{ role_name }}</div>
32 33
         </div>
33 34
       </div>
34 35
       <div class="organizeBoxTwo">
35 36
         <div>职位</div>
36
-        <div class="organizeBoxTwoTxt">{{ positionName }}</div>
37
+        <div class="organizeBoxTwoTxt" v-if="positionName!=''">{{ positionName }}</div>
37 38
       </div>
38 39
     </div>
39 40
   </div>
@@ -51,16 +52,19 @@ export default {
51 52
       org_short_name: "",
52 53
       telephone: "",
53 54
       role_name: "",
54
-      positionName: ""
55
+      positionName: "",
56
+      org_logo: ""
55 57
     };
56 58
   },
57 59
   methods: {
58
-    getOrgName() {
59
-      getOrgName().then(response => {
60
+    getOrgName(id) {
61
+      getOrgName(id).then(response => {
60 62
         if (response.data.state === 1) {
61 63
           var name = response.data.data.name;
64
+          this.org_short_name = name.org_name;
65
+          this.org_logo = name.org_logo;
62 66
           this.telephone = name.telephone;
63
-          // console.log("name", name);
67
+          console.log("name", name);
64 68
         }
65 69
       });
66 70
     },
@@ -124,10 +128,11 @@ export default {
124 128
   },
125 129
   created() {
126 130
     this.user_name = this.$store.getters.user.user.user_name;
127
-    this.org_short_name = this.$store.getters.user.org.org_short_name;
131
+    // this.org_short_name = this.$store.getters.user.org.org_short_name;
128 132
     var id = this.$route.query.id;
129 133
     console.log("id", id);
130
-    this.getOrgName();
134
+    var orgid = this.$route.query.orgid;
135
+    this.getOrgName(orgid);
131 136
     this.getRoleName(id);
132 137
     this.getAllOrganization(id);
133 138
   }

+ 26 - 9
src/pages/patientCenter/editOrg/index.vue Wyświetl plik

@@ -3,12 +3,15 @@
3 3
     <div class="createOrganizationTitle">
4 4
       <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
5 5
       <span class="titleName">创建医院/组织/团队</span>
6
+       <div style="margin-left:40px">
7
+        <span @click="spread" id="copy">修改</span>
8
+      </div>
6 9
     </div>
7 10
     <div class="tips">填写真实信息,获取更精准服务</div>
8 11
     <div class="infoBox">
9 12
       <div class="infoOne">
10 13
         <p class="infoTitle">机构名称</p>
11
-        <van-field v-model="orgForm.org_name" placeholder="请填写机构名称"/>
14
+        <van-field v-model="orgForm.org_name" placeholder="请填写机构名称" :readonly="readonly"/>
12 15
       </div>
13 16
       <div class="infoOne">
14 17
         <p class="infoTitle">机构类型</p>
@@ -21,6 +24,7 @@
21 24
             @confirm="chooseCityTwo"
22 25
             :columns-num="2"
23 26
             @change="onChangeTwo"
27
+            :readonly="readonly"
24 28
           />
25 29
         </van-popup>
26 30
       </div>
@@ -34,23 +38,23 @@
34 38
             @cancel="show2=false"
35 39
             @confirm="chooseCity"
36 40
             @change="onChange"
41
+            :readonly="readonly"
37 42
           />
38 43
         </van-popup>
39 44
       </div>
40 45
       <div class="infoOne">
41 46
         <p class="infoTitle">详细地址</p>
42
-        <van-field v-model="orgForm.address" placeholder="请填写"/>
47
+        <van-field v-model="orgForm.address" placeholder="请填写" :readonly="readonly"/>
43 48
       </div>
44 49
       <div class="infoOne">
45 50
         <p class="infoTitle">联系人</p>
46
-        <van-field v-model="orgForm.contact_name" placeholder="请填写"/>
51
+        <van-field v-model="orgForm.contact_name" placeholder="请填写" :readonly="readonly"/>
47 52
       </div>
48 53
       <div class="infoOne">
49 54
         <p class="infoTitle">联系电话</p>
50
-        <van-field v-model="orgForm.telephone" placeholder="请填写"/>
55
+        <van-field v-model="orgForm.telephone" placeholder="请填写" :readonly="readonly"/>
51 56
       </div>
52 57
     </div>
53
-    <div class="create" @click="updateOrg()">保存</div>
54 58
     <div class="problem">
55 59
       遇到问题?点击
56 60
       <span @click="contact = true">联系客服</span>
@@ -86,6 +90,7 @@ export default {
86 90
   components: {},
87 91
   data() {
88 92
     return {
93
+      readonly:true,
89 94
       org_area: "",
90 95
       type_name: "",
91 96
       contact: false,
@@ -4291,8 +4296,8 @@ export default {
4291 4296
     callPhone() {
4292 4297
       window.location.href = "tel://075586526342";
4293 4298
     },
4294
-    getOrgInformation() {
4295
-      getOrgInformation().then(response => {
4299
+    getOrgInformation(id) {
4300
+      getOrgInformation(id).then(response => {
4296 4301
         if (response.data.state === 1) {
4297 4302
           var information = response.data.data.information;
4298 4303
           console.log("information", information);
@@ -4314,6 +4319,16 @@ export default {
4314 4319
         }
4315 4320
       });
4316 4321
     },
4322
+    spread() {
4323
+      var spancontent = document.getElementById("copy").innerHTML;
4324
+      if (spancontent == "修改") {
4325
+        this.readonly = false;
4326
+        document.getElementById("copy").innerHTML = "保存";
4327
+      }
4328
+      if (spancontent == "保存") {
4329
+        this.updateOrg();
4330
+      }
4331
+    },
4317 4332
     updateOrg() {
4318 4333
       if (this.orgForm.org_name.trim().length <= 0) {
4319 4334
         Toast("机构名字不能为空");
@@ -4363,10 +4378,12 @@ export default {
4363 4378
           var orgtype = response.data.data.orgType;
4364 4379
         }
4365 4380
       });
4366
-    }
4381
+    },
4382
+ 
4367 4383
   },
4368 4384
   created() {
4369
-    this.getOrgInformation();
4385
+    var id = this.$route.query.id;
4386
+    this.getOrgInformation(id);
4370 4387
     this.getAllOrgType();
4371 4388
   }
4372 4389
 };

+ 27 - 10
src/pages/patients/editPatient.vue Wyświetl plik

@@ -4,7 +4,7 @@
4 4
       <div class="addPatientsTitle">
5 5
         <i class="iconfont icon-zuojiantou jiantou" @click="toReturn"></i>
6 6
         <span class="titleName">编辑患者</span>
7
-        <div @click="updatedPatient"><p>保存</p></div>
7
+        <span @click="spread" id="copy">修改</span>
8 8
       </div>
9 9
     </van-sticky>
10 10
     <div class="basicTitle">基本信息</div>
@@ -13,6 +13,7 @@
13 13
         v-model="patientForm.name"
14 14
         required
15 15
         label="姓名"
16
+        :readonly="readonly"
16 17
         placeholder="请输入"
17 18
       />
18 19
       <van-field
@@ -21,7 +22,7 @@
21 22
         right-icon="arrow"
22 23
         placeholder="请选择"
23 24
         required
24
-        readonly
25
+        :readonly="readonly"
25 26
         @click="show = true"
26 27
       />
27 28
       <van-popup v-model="show" position="bottom" :style="{ height: '40%' }">
@@ -33,12 +34,13 @@
33 34
         label="身份证号"
34 35
         @blur="checkIdCardNo"
35 36
         placeholder="请输入"
37
+        :readonly="readonly"
36 38
       />
37 39
       <van-field
38 40
         v-model="patientForm.birthday"
39 41
         required
40 42
         label="出生日期"
41
-        readonly
43
+        :readonly="readonly"
42 44
         placeholder="请输入"
43 45
       />
44 46
       <van-field
@@ -47,6 +49,7 @@
47 49
         required
48 50
         label="手机号"
49 51
         placeholder="请输入"
52
+        :readonly="readonly"
50 53
       />
51 54
       <van-cell>
52 55
         <!-- 使用 title 插槽来自定义标题 -->
@@ -77,6 +80,7 @@
77 80
           clearable
78 81
           required
79 82
           label="透析号"
83
+          :readonly="readonly"
80 84
         >
81 85
           <van-button
82 86
             slot="button"
@@ -91,7 +95,7 @@
91 95
           v-model="patientForm.patientsoure"
92 96
           right-icon="arrow"
93 97
           required
94
-          readonly
98
+          :readonly="readonly"
95 99
           placeholder="请选择"
96 100
           @click="show3 = true"
97 101
         />
@@ -103,7 +107,7 @@
103 107
           v-model="patientForm.lapseto"
104 108
           right-icon="arrow"
105 109
           required
106
-          readonly
110
+          :readonly="readonly"
107 111
           placeholder="请选择"
108 112
           @click="show4 = true"
109 113
         />
@@ -151,7 +155,7 @@
151 155
           label="首次透析日期"
152 156
           v-model="patientForm.fistDate"
153 157
           right-icon="arrow"
154
-          readonly
158
+          :readonly="readonly"
155 159
           placeholder="请选择"
156 160
           @click="show2 = true"
157 161
         />
@@ -172,6 +176,7 @@
172 176
           label="诊断"
173 177
           type="textarea"
174 178
           maxlength="50"
179
+          :readonly="readonly"
175 180
           placeholder="请输入主要诊断信息"
176 181
         />
177 182
       </div>
@@ -183,6 +188,7 @@
183 188
           v-model="patientForm.requipmentId"
184 189
           label="设备ID"
185 190
           placeholder="请输入"
191
+          :readonly="readonly"
186 192
         />
187 193
 
188 194
         <van-cell>
@@ -227,7 +233,7 @@
227 233
           label="首次透析日期"
228 234
           v-model="patientForm.memberFistDate"
229 235
           right-icon="arrow"
230
-          readonly
236
+          :readonly="readonly"
231 237
           placeholder="请选择"
232 238
           @click="show12 = true"
233 239
         />
@@ -249,7 +255,7 @@
249 255
           label="病种"
250 256
           v-model="patientForm.patient_type"
251 257
           right-icon="arrow"
252
-          readonly
258
+          :readonly="readonly"
253 259
           placeholder="请选择"
254 260
           @click="show14 = true"
255 261
         />
@@ -268,7 +274,7 @@
268 274
           label="治疗方式"
269 275
           v-model="patientForm.treatmentMethod"
270 276
           right-icon="arrow"
271
-          readonly
277
+          :readonly="readonly"
272 278
           placeholder="请选择"
273 279
           @click="show13 = true"
274 280
         />
@@ -403,7 +409,8 @@ export default {
403 409
       ],
404 410
       illnesslist: [],
405 411
       radio: "1",
406
-      showOne: false
412
+      showOne: false,
413
+      readonly: true
407 414
     };
408 415
   },
409 416
   methods: {
@@ -763,6 +770,16 @@ export default {
763 770
         "-" +
764 771
         birth.substr(6, 2);
765 772
     },
773
+    spread() {
774
+      var spancontent = document.getElementById("copy").innerHTML;
775
+      if (spancontent == "修改") {
776
+        this.readonly = false;
777
+        document.getElementById("copy").innerHTML = "保存";
778
+      }
779
+      if (spancontent == "保存") {
780
+        this.updatedPatient();
781
+      }
782
+    },
766 783
     updatedPatient() {
767 784
       if (this.patientForm.name === "") {
768 785
         this.$toast("姓名不能为空");

+ 27 - 1
src/router/index.js Wyświetl plik

@@ -272,7 +272,7 @@ export default new Router({
272 272
       name: 'longdialysis',
273 273
       component: () => import('@/pages/allLongDialysis/index')
274 274
     },
275
-    //,
275
+    //, 
276 276
     {
277 277
       path: '/alldoctoradvice',
278 278
       name: '/alldoctoradvice',
@@ -290,6 +290,19 @@ export default new Router({
290 290
       name: '/addpartition',
291 291
       component: () => import('@/pages/configureCenter/newPartition')
292 292
     },
293
+    // 编辑分区
294
+    {
295
+      path: '/editpartition',
296
+      name: 'editpartition',
297
+      component: () => import('@/pages/configureCenter/editPartion')
298
+
299
+    },
300
+    // 编辑分组
301
+    {
302
+      path: '/editgroup',
303
+      name: 'editgroup',
304
+      component: () => import('@/pages/configureCenter/editGrouping')
305
+    },
293 306
     // 新增分组
294 307
     {
295 308
       path: '/addgroup',
@@ -302,6 +315,19 @@ export default new Router({
302 315
       name: '/addbed',
303 316
       component: () => import('@/pages/configureCenter/newBed')
304 317
     },
318
+    // 编辑床位号
319
+    {
320
+      path: '/editbed',
321
+      name: 'editbed',
322
+      component: () => import('@/pages/configureCenter/editBed')
323
+
324
+    },
325
+    {
326
+      path: '/allinspection',
327
+      name: '/allinspection',
328
+      component: () => import('@/pages/patientCenter/allCheck/index')
329
+
330
+    },
305 331
     // 我的页面管理
306 332
     {
307 333
       path: '/editorg',