Home Explore Help
Register Sign In
csx
/
Pad_New
Watch 1
Star 0
Fork 0
Code Issues 69 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

更新

XMLWAN 4 years ago
parent
7009e157c6
commit
ee05552af3
15 changed files with 5036 additions and 391 deletions
Split View Show Diff Stats
  1. 9 24
      src/api/login.js
  2. 33 0
      src/api/patient/patient.js
  3. 2 1
      src/kya_pages/homeIndex/index.vue
  4. 1 2
      src/pages/allDoctorAdvice/index.vue
  5. 1 1
      src/pages/configureCenter/components/Bed.vue
  6. 271 166
      src/pages/doctorAdvice/components/DoctorManagement.vue
  7. 0 3
      src/pages/doctorAdvice/index.vue
  8. 6 6
      src/pages/home/index.vue
  9. 2 0
      src/pages/homeIndex/index.vue
  10. 26 9
      src/pages/my/index.vue
  11. 12 8
      src/pages/my/modifyingName.vue
  12. 18 9
      src/pages/my/myInfo.vue
  13. 4494 4
      src/pages/patientCenter/editOrg/index.vue
  14. 10 8
      src/permission.js
  15. 151 150
      src/router/index.js

+ 9 - 24
src/api/login.js View File 

@@ -15,53 +15,46 @@ export function loginByPwd(mobile, password) {
15 15 
 export function isLogin() {
16 16 
   return request({
17 17 
     url: '/m/api/islogin',
18 
-    method: 'get',
18 
+    method: 'get'
19 19 
   })
20 20 
 }
21 21
22 
-
23 
-
24 22 
 export function getCodeInit() {
25 23 
   return request({
26 24 
     url: '/m/api/code',
27 
-    method: 'get',
25 
+    method: 'get'
28 26 
   })
29 27 
 }
30 28
31 
-
32 29 
 export function getVerifyCode(params) {
33 30 
   return request({
34 31 
     url: '/m/api/getcode',
35 32 
     method: 'get',
36 
-    params:params,
33 
+    params: params
37 34 
   })
38 35 
 }
39 36
40 
-
41 37 
 export function loginByCode(params) {
42 38 
   return request({
43 39 
     url: '/m/api/login/cs',
44 40 
     method: 'post',
45 
-    params:params,
41 
+    params: params
46 42 
   })
47 43 
 }
48 44
49 
-
50 
-
51 45 
 export function forgetPassWord(params) {
52 46 
   return request({
53 47 
     url: '/m/api/password/commit',
54 48 
     method: 'post',
55 
-    params:params,
49 
+    params: params
56 50 
   })
57 51 
 }
58 52
59 
-
60 53 
 export function register(params) {
61 54 
   return request({
62 55 
     url: '/m/api/register/commit',
63 56 
     method: 'post',
64 
-    params:params,
57 
+    params: params
65 58 
   })
66 59 
 }
67 60 
 
@@ -69,29 +62,21 @@ export function setName(params) {
69 62 
   return request({
70 63 
     url: '/m/api/register/setname',
71 64 
     method: 'post',
72 
-    params:params,
65 
+    params: params
73 66 
   })
74 67 
 }
75 68
76 
-
77 
-
78 
-
79 69 
 export function login() {
80 70 
   return request({
81 71 
     url: '/m/api/register/login',
82 
-    method: 'post',
72 
+    method: 'post'
83 73 
   })
84 74 
 }
85 75
86 
-
87 
-
88 
-
89 
-
90 
-
91 76 
 export function createOrg(params) {
92 77 
   return request({
93 78 
     url: '/m/api/org/create',
94 79 
     method: 'post',
95 
-    params:params,
80 
+    params: params
96 81 
   })
97 82 
 }

+ 33 - 0
src/api/patient/patient.js View File 

@@ -725,6 +725,7 @@ export function getBloodPatient(params) {
725 725 
 }
726 726
727 727 
 export function DeletePatient(id, params) {
728 
+  console.log('医嘱id', id)
728 729 
   return request({
729 730 
     url: '/m/api/patient/deletePatient?id=' + id,
730 731 
     method: 'delete',
 
@@ -760,3 +761,35 @@ export function getMyOrganazition(id, params) {
760 761 
     params: params
761 762 
   })
762 763 
 }
764 
+
765 
+export function getOrgInformation(params) {
766 
+  return request({
767 
+    url: '/m/api/org/getorginformation',
768 
+    method: 'get',
769 
+    params: params
770 
+  })
771 
+}
772 
+
773 
+export function getAllOrgType(params) {
774 
+  return request({
775 
+    url: '/m/api/patient/getallorgtype',
776 
+    method: 'get',
777 
+    params: params
778 
+  })
779 
+}
780 
+
781 
+export function updateOrg(params, id) {
782 
+  return request({
783 
+    url: '/m/api/patient/editorg?id=' + id,
784 
+    method: 'get',
785 
+    params: params
786 
+  })
787 
+}
788 
+
789 
+export function getMyInforName(id, params) {
790 
+  return request({
791 
+    url: '/m/api/patient/getmyinforname?id=' + id,
792 
+    method: 'get',
793 
+    params: params
794 
+  })
795 
+}

+ 2 - 1
src/kya_pages/homeIndex/index.vue View File 

@@ -258,4 +258,5 @@ export default {
258 258 
   }
259 259 
 }
260 260 
 </style>
261 
-<style lang="scss"></style>
261 
+<style lang="scss">
262 
+</style>

+ 1 - 2
src/pages/allDoctorAdvice/index.vue View File 

@@ -329,8 +329,7 @@ export default {
329 329 
         DeletePatient(id).then(response => {
330 330 
           if (response.data.state === 1) {
331 331 
             var msg = response.data.data.msg;
332 
-
333 
-            this.doctorAdvicedetail.splice(index, 1);
332 
+            this.GetDoctorAdviceDetail(this.id);
334 333 
             this.newShow = false;
335 334 
           }
336 335 
         });

+ 1 - 1
src/pages/configureCenter/components/Bed.vue View File 

@@ -127,7 +127,7 @@ export default {
127 127 
           if (response.data.state === 1) {
128 128 
             var msg = response.data.data.msg;
129 129 
             console.log("msg", msg);
130 
-            this.Number.splice(index, 1);
130 
+            this.BedNumber.splice(index, 1);
131 131 
             this.newShow = false;
132 132 
           }
133 133 
         });

+ 271 - 166
src/pages/doctorAdvice/components/DoctorManagement.vue View File 

@@ -22,124 +22,195 @@
22 22 
         </div>
23 23 
       </div>
24 24
25 
-      <div class="adviceBox" v-show="showOne">
25 
+      <div class="adviceBox">
26 26 
         <van-list
27 
-          v-model="loading"
28 
-          :finished="finished"
29 
-          finished-text="没有更多了"
30 
-          @load="onLoad"
31 
-        >
32 
-          <div
33 
-            class="adviceOne"
34 
-            v-for="(item, index) in doctorAdvice"
35 
-            :key="index"
36 
-          >
37 
-            <div v-for="(it, i) in item.child" :key="i">
38 
-              <div class="adviceTitle" v-if="it.advice_date">
39 
-                <p>{{ it.advice_date ? getTime(it.advice_date) : "" }}</p>
40 
-                <van-icon
41 
-                  class="ellipsis"
42 
-                  name="ellipsis"
43 
-                  @click="Delete(item.groupno, index, it.execution_staff)"
44 
-                />
45 
-              </div>
27 
+         v-model="loading"
28 
+         :finished="finished"
29 
+         @load="onLoad"
30 
+         finished-text="没有更多了"
31 
+         >
46 32
47 
-              <div
48 
-                class="statOrder"
49 
-                v-if="it.advice_type == 1 && it.parent_id == 0"
50 
-              >
51 
-                <div class="statOrderTitle" v-if="i < 3">
52 
-                  <span>长期医嘱</span>
53 
-                  <span style="margin-left:1rem">
54 
-                    {{ getTimes(it.start_time) }}
55 
-                  </span>
56 
-                </div>
57 
-                <div class="orderContent" v-if="i < 3">
58 
-                  <p v-if="it.parent_id === 0">
59 
-                    {{ it.advice_name }} {{ it.advice_desc
60 
-                    }}{{ it.drug_spec_unit }} {{ it.prescribing_number
33 
+          <div class="adviceOne" v-for="(item,index) in this.doctorAdvice" :key="index">
34 
+            <div class="adviceTitle">
35 
+              <p>{{getTime(item.child[0].start_time)}}</p>
36 
+              <van-icon class="ellipsis" name="ellipsis" @click="newShow = true" />
37 
+            </div>
38 
+
39 
+         <div v-for="(it,i) in item.child" :key="i">
40 
+            <div class="statOrder"  v-if="it.advice_type == 1 && it.parent_id == 0" >
41 
+              <div class="statOrderTitle">
42 
+                <span v-if="i<1">长期医嘱</span>
43 
+                <span  v-if="i<1" style="margin-left:1rem">{{getTimes(it.start_time)}}</span>
44 
+              </div>
45 
+              <div class="orderContent" v-if="i<4">
46 
+                <p> {{ it.advice_name }} {{ it.advice_desc
47 
+                     }}{{ it.drug_spec_unit }} {{ it.prescribing_number
61 48 
                     }}{{ it.prescribing_number_unit }} {{ it.single_dose
62 49 
                     }}{{ it.single_dose_unit }} {{ it.delivery_way }}
63 
-                    {{ it.execution_frequency }}
64 
-                  </p>
65 
-                  <div v-for="(i, index) in childList" :key="index">
66 
-                    <p v-if="i.parent_id == it.id">
67 
-                      ▲ {{ i.advice_name }} {{ i.advice_desc
50 
+                    {{ it.execution_frequency }}</p>
51 
+                <div v-for="(i, index) in childList" :key="index">
52 
+                 <p v-if="i.parent_id == it.id">▲
53 
+                   {{ i.advice_name }} {{ i.advice_desc
68 54 
                       }}{{ i.drug_spec_unit }} {{ i.prescribing_number
69 55 
                       }}{{ i.prescribing_number_unit }} {{ i.single_dose
70 56 
                       }}{{ i.single_dose_unit }}
71 
-                      {{ i.delivery_way }}
72 
-                      {{ i.execution_frequency }}
73 
-                    </p>
74 
-                  </div>
75 
-                </div>
76 
-                <div
77 
-                  class="doctorBox"
78 
-                  v-if="
79 
-                    it.user_name ||
80 
-                      it.execution_staff ||
81 
-                      (it.checker && i == item.child.length)
82 
-                  "
83 
-                >
84 
-                  <p>开嘱医生：{{ it.user_name }}</p>
85 
-                  <p>执行护士：{{ getDoctor(it.execution_staff) }}</p>
86 
-                  <p>核对护士：{{ getDoctor(it.checker) }}</p>
57 
+                     {{ i.delivery_way }}
58 
+                    {{ i.execution_frequency }}
59 
+                 </p>
87 60 
                 </div>
88 61 
               </div>
62 
+            </div>
89 63
90 
-              <div
91 
-                class="statOrder"
92 
-                v-if="it.advice_type == 3 && it.parent_id == 0"
93 
-              >
94 
-                <div class="longOrderTitle" v-if="i < 3">
95 
-                  <span>临时医嘱</span>
96 
-                  <span style="margin-left:1rem">
97 
-                    {{ getTimes(item.child[0].start_time) }}
98 
-                  </span>
99 
-                </div>
100 
-                <div class="orderContent" v-if="i < 3">
101 
-                  <p>
102 
-                    {{ it.advice_name }} {{ it.advice_desc
103 
-                    }}{{ it.drug_spec_unit }} {{ it.prescribing_number
64 
+            <div class="statOrder" v-if="it.advice_type == 3 && it.parent_id == 0">
65 
+              <div class="longOrderTitle">
66 
+                <span v-if="i<1">临时医嘱</span>
67 
+                <span v-if="i<1" style="margin-left:1rem">{{getTimes(it.start_time)}}</span>
68 
+              </div>
69 
+              <div class="orderContent" v-if="i<4">
70 
+                <p v-if="it.parent_id == 0">{{ it.advice_name }} {{ it.advice_desc
71 
+                  }}{{ it.drug_spec_unit }} {{ it.prescribing_number
104 72 
                     }}{{ it.prescribing_number_unit }} {{ it.single_dose
105 73 
                     }}{{ it.single_dose_unit }} {{ it.delivery_way }}
106 
-                    {{ it.execution_frequency }}
107 
-                  </p>
108 
-                  <div v-for="(i, index) in childList" :key="index">
109 
-                    <p v-if="i.parent_id == it.id">
110 
-                      ▲ {{ i.advice_name }} {{ i.advice_desc
74 
+                   {{ it.execution_frequency }}</p>
75 
+                <div v-for="(i, index) in childList" :key="index">
76 
+                  <p v-if="i.parent_id == it.id">▲ {{ i.advice_name }} {{ i.advice_desc
111 77 
                       }}{{ i.drug_spec_unit }} {{ i.prescribing_number
112 78 
                       }}{{ i.prescribing_number_unit }} {{ i.single_dose
113 79 
                       }}{{ i.single_dose_unit }}
114 
-                      {{ i.delivery_way }}
115 
-                      {{ i.execution_frequency }}
116 
-                    </p>
117 
-                  </div>
118 
-                </div>
119 
-                <div
120 
-                  class="doctorBox"
121 
-                  v-if="
122 
-                    it.user_name ||
123 
-                      it.execution_staff ||
124 
-                      (it.checker && i == item.child.length)
125 
-                  "
126 
-                >
127 
-                  <p>开嘱医生：{{ it.user_name }}</p>
128 
-                  <p>执行护士：{{ getDoctor(it.execution_staff) }}</p>
129 
-                  <p>核对护士：{{ getDoctor(it.checker) }}</p>
80 
+                     {{ i.delivery_way }}
81 
+                    {{ i.execution_frequency }}</p>
130 82 
                 </div>
131 83 
               </div>
132 84 
             </div>
133 
-            <div
134 
-              class="all"
135 
-              @click="toDoctorAdviceDetail(item.child[0].groupno)"
136 
-            >
137 
-              全部
138 
-            </div>
85 
+         </div>
86 
+             <div class="doctorBox">
87 
+                <p>开嘱医生：{{ item.child[0].user_name }}</p>
88 
+                <p>执行护士：{{ getDoctor(item.child[0].execution_staff) }}</p>
89 
+                <p>核对护士：{{ getDoctor(item.child[0].checker) }}</p>
90 
+              </div>
91 
+            <div class="all" @click="toDoctorAdviceDetail(item.groupno)">全部</div>
139 92 
           </div>
140 93 
         </van-list>
141 94 
       </div>
142 95
96 
+<!--      <div class="adviceBox" v-show="showOne">-->
97 
+<!--        <van-list-->
98 
+<!--          v-model="loading"-->
99 
+<!--          :finished="finished"-->
100 
+<!--          finished-text="没有更多了"-->
101 
+<!--          @load="onLoad"-->
102 
+<!--        >-->
103 
+<!--          <div-->
104 
+<!--            class="adviceOne"-->
105 
+<!--            v-for="(item, index) in doctorAdvice"-->
106 
+<!--            :key="index"-->
107 
+<!--          >-->
108 
+<!--            <div v-for="(it, i) in item.child" :key="i">-->
109 
+<!--              <div class="adviceTitle" v-if="it.advice_date">-->
110 
+<!--                <p>{{ it.advice_date ? getTime(it.advice_date) : "" }}</p>-->
111 
+<!--                <van-icon-->
112 
+<!--                  class="ellipsis"-->
113 
+<!--                  name="ellipsis"-->
114 
+<!--                  @click="Delete(item.groupno, index, it.execution_staff)"-->
115 
+<!--                />-->
116 
+<!--              </div>-->
117 
+
118 
+<!--              <div-->
119 
+<!--                class="statOrder"-->
120 
+<!--                v-if="it.advice_type == 1 && it.parent_id == 0"-->
121 
+<!--              >-->
122 
+<!--                <div class="statOrderTitle" v-if="i < 3">-->
123 
+<!--                  <span>长期医嘱</span>-->
124 
+<!--                  <span style="margin-left:1rem">-->
125 
+<!--                    {{ getTimes(it.start_time) }}-->
126 
+<!--                  </span>-->
127 
+<!--                </div>-->
128 
+<!--                <div class="orderContent" v-if="i < 3">-->
129 
+<!--                  <p v-if="it.parent_id === 0">-->
130 
+<!--                    {{ it.advice_name }} {{ it.advice_desc-->
131 
+<!--                    }}{{ it.drug_spec_unit }} {{ it.prescribing_number-->
132 
+<!--                    }}{{ it.prescribing_number_unit }} {{ it.single_dose-->
133 
+<!--                    }}{{ it.single_dose_unit }} {{ it.delivery_way }}-->
134 
+<!--                    {{ it.execution_frequency }}-->
135 
+<!--                  </p>-->
136 
+<!--                  <div v-for="(i, index) in childList" :key="index">-->
137 
+<!--                    <p v-if="i.parent_id == it.id">-->
138 
+<!--                      ▲ {{ i.advice_name }} {{ i.advice_desc-->
139 
+<!--                      }}{{ i.drug_spec_unit }} {{ i.prescribing_number-->
140 
+<!--                      }}{{ i.prescribing_number_unit }} {{ i.single_dose-->
141 
+<!--                      }}{{ i.single_dose_unit }}-->
142 
+<!--                      {{ i.delivery_way }}-->
143 
+<!--                      {{ i.execution_frequency }}-->
144 
+<!--                    </p>-->
145 
+<!--                  </div>-->
146 
+<!--                </div>-->
147 
+<!--                <div-->
148 
+<!--                  class="doctorBox"-->
149 
+<!--                  v-if="-->
150 
+<!--                    it.user_name ||-->
151 
+<!--                      it.execution_staff ||-->
152 
+<!--                      (it.checker && i == item.child.length)-->
153 
+<!--                  "-->
154 
+<!--                >-->
155 
+<!--                  <p>开嘱医生：{{ it.user_name }}</p>-->
156 
+<!--                  <p>执行护士：{{ getDoctor(it.execution_staff) }}</p>-->
157 
+<!--                  <p>核对护士：{{ getDoctor(it.checker) }}</p>-->
158 
+<!--                </div>-->
159 
+<!--              </div>-->
160 
+
161 
+<!--              <div-->
162 
+<!--                class="statOrder"-->
163 
+<!--                v-if="it.advice_type == 3 && it.parent_id == 0"-->
164 
+<!--              >-->
165 
+<!--                <div class="longOrderTitle" v-if="i < 3">-->
166 
+<!--                  <span>临时医嘱</span>-->
167 
+<!--                  <span style="margin-left:1rem">-->
168 
+<!--                    {{ getTimes(item.child[0].start_time) }}-->
169 
+<!--                  </span>-->
170 
+<!--                </div>-->
171 
+<!--                <div class="orderContent" v-if="i < 3">-->
172 
+<!--                  <p>-->
173 
+<!--                    {{ it.advice_name }} {{ it.advice_desc-->
174 
+<!--                    }}{{ it.drug_spec_unit }} {{ it.prescribing_number-->
175 
+<!--                    }}{{ it.prescribing_number_unit }} {{ it.single_dose-->
176 
+<!--                    }}{{ it.single_dose_unit }} {{ it.delivery_way }}-->
177 
+<!--                    {{ it.execution_frequency }}-->
178 
+<!--                  </p>-->
179 
+<!--                  <div v-for="(i, index) in childList" :key="index">-->
180 
+<!--                    <p v-if="i.parent_id == it.id">-->
181 
+<!--                      ▲ {{ i.advice_name }} {{ i.advice_desc-->
182 
+<!--                      }}{{ i.drug_spec_unit }} {{ i.prescribing_number-->
183 
+<!--                      }}{{ i.prescribing_number_unit }} {{ i.single_dose-->
184 
+<!--                      }}{{ i.single_dose_unit }}-->
185 
+<!--                      {{ i.delivery_way }}-->
186 
+<!--                      {{ i.execution_frequency }}-->
187 
+<!--                    </p>-->
188 
+<!--                  </div>-->
189 
+<!--                </div>-->
190 
+<!--                <div-->
191 
+<!--                  class="doctorBox"-->
192 
+<!--                  v-if="-->
193 
+<!--                    it.user_name ||-->
194 
+<!--                      it.execution_staff ||-->
195 
+<!--                      (it.checker && i == item.child.length)-->
196 
+<!--                  "-->
197 
+<!--                >-->
198 
+<!--                  <p>开嘱医生：{{ it.user_name }}</p>-->
199 
+<!--                  <p>执行护士：{{ getDoctor(it.execution_staff) }}</p>-->
200 
+<!--                  <p>核对护士：{{ getDoctor(it.checker) }}</p>-->
201 
+<!--                </div>-->
202 
+<!--              </div>-->
203 
+<!--            </div>-->
204 
+<!--            <div-->
205 
+<!--              class="all"-->
206 
+<!--              @click="toDoctorAdviceDetail(item.child[0].groupno)"-->
207 
+<!--            >-->
208 
+<!--              全部-->
209 
+<!--            </div>-->
210 
+<!--          </div>-->
211 
+<!--        </van-list>-->
212 
+<!--      </div>-->
213 
+
143 214 
       <div class="noimgBox" v-show="showTwo">
144 215 
         <img src="../../../assets/images/none.png" alt />
145 216 
       </div>
 
@@ -229,6 +300,7 @@ export default {
229 300 
   },
230 301 
   data() {
231 302 
     return {
303 
+      docShow: false,
232 304 
       loading: false,
233 305 
       finished: false,
234 306 
       newShow: false,
 
@@ -240,7 +312,6 @@ export default {
240 312 
       columns: ["全部", "长期医嘱", "临时医嘱"],
241 313 
       startTime: "请选择",
242 314 
       endTime: "请选择",
243 
-      endTimes: "",
244 315 
       minDate: new Date(1970, 0, 1),
245 316 
       maxDate: new Date(2025, 10, 1),
246 317 
       currentDate: new Date(),
 
@@ -248,8 +319,8 @@ export default {
248 319 
       actions1: [{ name: "删除" }],
249 320 
       actions2: [{ name: "删除" }],
250 321 
       form: {
251 
-        type: "",
252 
-        limit: 10,
322 
+        type: 0,
323 
+        limit: 5,
253 324 
         page: 1
254 325 
       },
255 326 
       total: "",
 
@@ -279,7 +350,7 @@ export default {
279 350 
         this.patient_id,
280 351 
         this.type,
281 352 
         this.startTime,
282 
-        this.endTimes,
353 
+        this.endTime,
283 354 
         this.form.limit,
284 355 
         this.form.page
285 356 
       );
 
@@ -354,20 +425,10 @@ export default {
354 425 
       ).then(response => {
355 426 
         if (response.data.state === 1) {
356 427 
           var advice = response.data.data.advice;
428 
+          console.log("advice", advice);
357 429 
           var one = response.data.data.one;
358 
-          console.log("one", one);
359 
-          // this.doctorAdvice = advice;
360 
-          let objarr = [];
361 
-          for (let i = 0; i < advice.length; i++) {
362 
-            if (advice[i].parent_id != 0) {
363 
-              objarr.push(advice[i]);
364 
-            }
365 
-          }
366 
-          this.childList = objarr;
367 
-          var total = response.data.data.total;
368 
-          this.total = total;
369 430 
           let dataInfo = {};
370 
-          advice.forEach((item, index) => {
431 
+          one.forEach((item, index) => {
371 432 
             let { groupno } = item;
372 433 
             if (!dataInfo[groupno]) {
373 434 
               dataInfo[groupno] = {
 
@@ -375,46 +436,91 @@ export default {
375 436 
                 child: []
376 437 
               };
377 438 
             }
378 
-            dataInfo[groupno].child.push(item);
379 439 
           });
380 
-          let list = Object.values(dataInfo); // list 转换成功的数据
381 
-          console.log("list", list);
382 
-          let arr = [];
440 
+          let list = Object.values(dataInfo);
383 441 
           list.map(item => {
384 
-            // console.log(item.child);
385 
-            let arr2 = [];
386 
-            if (item.child.length > 1) {
387 
-              item.child.map((it, index) => {
388 
-                // console.log(it);
389 
-                if (arr.indexOf(it.advice_date) == -1) {
390 
-                  arr.push(it.advice_date);
391 
-                } else {
392 
-                  delete it["advice_date"];
393 
-                }
394 
-              });
395 
-              for (var i = item.child.length - 1; i != -1; i--) {
396 
-                let obj = {};
397 
-                obj.checker = item.child[i].checker;
398 
-                obj.execution_staff = item.child[i].execution_staff;
399 
-                obj.user_name = item.child[i].user_name;
400 
-                if (
401 
-                  JSON.stringify(arr2).includes(JSON.stringify(obj)) == false
402 
-                ) {
403 
-                  arr2.push(obj);
404 
-                } else {
405 
-                  delete item.child[i]["checker"];
406 
-                  delete item.child[i]["execution_staff"];
407 
-                  delete item.child[i]["user_name"];
408 
-                }
442 
+            for (let i = 0; i < advice.length; i++) {
443 
+              if (item.groupno === advice[i].groupno) {
444 
+                item.child.push(advice[i]);
409 445 
               }
410 446 
             }
411 447 
           });
412 
-
413 
-          var doctor = response.data.data.doctor;
414 
-          this.doctor = doctor;
415 
-          this.doctorAdvice = list.reverse();
448 
+          let objarr = [];
449 
+          for (let i = 0; i < advice.length; i++) {
450 
+            if (advice[i].parent_id != 0) {
451 
+              objarr.push(advice[i]);
452 
+            }
453 
+          }
454 
+          this.childList = objarr;
455 
+          let arr = this.doctorAdvice;
456 
+          arr.push(...list.reverse());
457 
+          this.doctorAdvice = arr;
458 
+          console.log("listtwo", this.doctorAdvice);
459 
+          var total = response.data.data.total;
460 
+          this.total = total;
461 
+          console.log("total", total);
416 462 
           this.loading = false;
417 
-          this.finished = true;
463 
+
464 
+          // let objarr = []
465 
+          // for (let i = 0; i < advice.length; i++) {
466 
+          //   if (advice[i].parent_id != 0) {
467 
+          //     objarr.push(advice[i])
468 
+          //   }
469 
+          // }
470 
+          // this.childList = objarr
471 
+          // var total = response.data.data.total
472 
+          // this.total = total
473 
+          //
474 
+          // let dataInfo = {}
475 
+          // advice.forEach((item, index) => {
476 
+          //   let { groupno } = item
477 
+          //   if (!dataInfo[groupno]) {
478 
+          //     dataInfo[groupno] = {
479 
+          //       groupno,
480 
+          //       child: []
481 
+          //     }
482 
+          //   }
483 
+          //   dataInfo[groupno].child.push(item)
484 
+          // })
485 
+          // let list = Object.values(dataInfo) // list 转换成功的数据
486 
+          // console.log('list', list)
487 
+          // let arr = []
488 
+          //
489 
+          // list.map(item => {
490 
+          //   // console.log(item.child);
491 
+          //   let arr2 = []
492 
+          //   if (item.child.length > 1) {
493 
+          //     item.child.map((it, index) => {
494 
+          //       // console.log(it);
495 
+          //       if (arr.indexOf(it.advice_date) == -1) {
496 
+          //         arr.push(it.advice_date)
497 
+          //       } else {
498 
+          //         delete it['advice_date']
499 
+          //       }
500 
+          //     })
501 
+          //     for (var i = item.child.length - 1; i != -1; i--) {
502 
+          //       let obj = {}
503 
+          //       obj.checker = item.child[i].checker
504 
+          //       obj.execution_staff = item.child[i].execution_staff
505 
+          //       obj.user_name = item.child[i].user_name
506 
+          //       if (
507 
+          //         JSON.stringify(arr2).includes(JSON.stringify(obj)) == false
508 
+          //       ) {
509 
+          //         arr2.push(obj)
510 
+          //       } else {
511 
+          //         delete item.child[i]['checker']
512 
+          //         delete item.child[i]['execution_staff']
513 
+          //         delete item.child[i]['user_name']
514 
+          //       }
515 
+          //     }
516 
+          //   }
517 
+          // })
518 
+          //
519 
+          // var doctor = response.data.data.doctor
520 
+          // this.doctor = doctor
521 
+          // this.doctorAdvice = list.reverse()
522 
+          // this.loading = false
523 
+          // this.finished = true
418 524 
         }
419 525 
       });
420 526 
     },
 
@@ -441,25 +547,25 @@ export default {
441 547 
     getTimes(time) {
442 548 
       return uParseTime(time, "{h}:{i}");
443 549 
     },
444 
-    // onLoad() {
445 
-    //   setTimeout(() => {
446 
-    //     this.page++;
447 
-    //     if (this.page <= Math.ceil(this.total / 10)) {
448 
-    //       this.getDoctorAdvices(
449 
-    //         this.patient_id,
450 
-    //         this.form.type,
451 
-    //         this.startTime,
452 
-    //         this.endTimes,
453 
-    //         this.form.limit,
454 
-    //         this.form.page
455 
-    //       );
456 
-    //     } else {
457 
-    //       this.loading = false;
458 
-    //       this.finished = true;
459 
-    //     }
460 
-    //   }, 1000);
461 
-    // },
462 
-    onLoad() {},
550 
+    onLoad() {
551 
+      setTimeout(() => {
552 
+        this.form.page++;
553 
+        console.log("page", this.form.page);
554 
+        if (this.form.page <= Math.ceil(this.total / 5)) {
555 
+          this.getDoctorAdvices(
556 
+            this.patient_id,
557 
+            this.form.type,
558 
+            this.startTime,
559 
+            this.endTime,
560 
+            this.form.limit,
561 
+            this.form.page
562 
+          );
563 
+        } else {
564 
+          this.loading = false;
565 
+          this.finished = true;
566 
+        }
567 
+      }, 5000);
568 
+    },
463 569 
     toDoctorAdviceDetail(id) {
464 570 
       var patientid = this.$route.query.patientid;
465 571 
       this.$router.push(
 
@@ -504,7 +610,6 @@ export default {
504 610 
       }
505 611 
     },
506 612 
     toChildDelete(val) {
507 
-      console.log(val);
508 613 
       if (val.name == "删除") {
509 614 
         this.DeleteChild(this.id, this.index, this.state);
510 615 
       }

+ 0 - 3
src/pages/doctorAdvice/index.vue View File 

@@ -380,7 +380,6 @@ export default {
380 380 
     getBloodDialysisPatientTwo() {
381 381 
       getBloodDialysisPatientTwo(this.page, this.limit).then(response => {
382 382 
         var patient = response.data.data.patient;
383 
-        console.log("patient", patient);
384 383 
         this.patient = patient;
385 384 
         let cityNameList = [];
386 385 
         for (let p in patient) {
 
@@ -563,8 +562,6 @@ export default {
563 562 
     this.patient_id = patientid;
564 563 
     this.getPatientDetail(patientid);
565 564 
     var seacherActive = this.$route.query.seacherActive;
566 
-    console.log("seacherActive是", seacherActive);
567 
-
568 565 
     if (seacherActive == 0) {
569 566 
       this.getBloodDialysisPatientTwo();
570 567 
     }

+ 6 - 6
src/pages/home/index.vue View File 

@@ -94,12 +94,12 @@
94 94 
             <!--<div>服务</div>-->
95 95 
           <!--</van-tabbar-item>-->
96 96 
         <!--</router-link>-->
97 
-        <router-link to="/shop" replace>
98 
-          <van-tabbar-item>
99 
-            <i class="iconfont icon-shangcheng iconOne"></i>
100 
-            <div>商城</div>
101 
-          </van-tabbar-item>
102 
-        </router-link>
97 
+<!--        <router-link to="/shop" replace>-->
98 
+<!--          <van-tabbar-item>-->
99 
+<!--            <i class="iconfont icon-shangcheng iconOne"></i>-->
100 
+<!--            <div>商城</div>-->
101 
+<!--          </van-tabbar-item>-->
102 
+<!--        </router-link>-->
103 103 
         <router-link to="/newMy" replace>
104 104 
           <van-tabbar-item>
105 105 
             <i class="iconfont icon-wode iconOne"></i>

+ 2 - 0
src/pages/homeIndex/index.vue View File 

@@ -162,6 +162,7 @@ export default {
162 162 
     },
163 163 
     toOrgSetting() {
164 164 
       if (this.isCreateOrg) {
165 
+        this.$router.push("/editorg");
165 166 
       } else {
166 167 
         this.$toast({
167 168 
           message: "你尚未创建机构，请先创建机构"
 
@@ -220,6 +221,7 @@ export default {
220 221 
           this.$router.push({ path: "/main" });
221 222 
           break;
222 223 
         case 8:
224 
+          this.$router.push({ path: "/shop" });
223 225 
           break;
224 226 
         case 9:
225 227 
           break;

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

@@ -2,7 +2,6 @@
2 2 
   <div class="page_my">
3 3 
     <div class="myTop">
4 4 
       <img src="../../assets/images/myBanner.png" alt />
5 
-      <router-link to="/myInfo">
6 5 
         <div class="avatar">
7 6 
           <img v-if="roleInfo.avatar != ''" :src="roleInfo.avatar" alt />
8 7 
           <img
 
@@ -11,16 +10,16 @@
11 10 
             alt
12 11 
           />
13 12 
         </div>
14 
-        <div class="userMain">
13 
+        <div class="userMain" @click="toMyIndex">
15 14 
           <div class="userBox">
16 15 
             <div class="userTxt">
17 
-              <p class="userName">{{ roleInfo.user_name }}</p>
16 
+              <span v-if="roleInfo.user_name!=''"><p class="userName">{{ roleInfo.user_name }}</p></span>
17 
+                <span v-if="roleInfo.user_name==''"><p class="userName">{{ userName.name }}</p></span>
18 18 
               <p class="signature">{{ roleInfo.message }}</p>
19 19 
             </div>
20 20 
             <van-icon name="arrow" />
21 21 
           </div>
22 22 
         </div>
23 
-      </router-link>
24 23 
       <div class="invitebox">
25 24 
         <img src="../../assets/images/invite.png" alt />
26 25 
       </div>
 
@@ -42,6 +41,7 @@
42 41 
         </div>
43 42 
       </router-link>
44 43 
     </div>
44 
+
45 45 
     <div class="myBox">
46 46 
         <div class="myBoxOne">
47 47 
           <div class="myInfoLeft">
 
@@ -57,7 +57,7 @@
57 57 
           <p>{{item.org_name}}</p>
58 58 
         </div>
59 59 
         <div class="myInfoRight" v-if="item.is_super_admin == 1">
60 
-          <div class="myInfoRightBtn">管理</div>
60 
+          <div class="myInfoRightBtn" @click="toEditOrg()">管理</div>
61 61 
           <van-icon class="arrow" name="arrow"  @click="toManage"/>
62 62 
         </div>
63 63 
       </div>
 
@@ -126,7 +126,8 @@
126 126 
 import {
127 127 
   getMyInformation,
128 128 
   LoginOut,
129 
-  getMyOrganazition
129 
+  getMyOrganazition,
130 
+  getMyInforName
130 131 
 } from "@/api/patient/patient";
131 132 
 import { uParseTime } from "@/utils/tools";
132 133 
 export default {
 
@@ -135,7 +136,8 @@ export default {
135 136 
       roleInfo: {},
136 137 
       admin_user_id: 0,
137 138 
       adminid: 0,
138 
-      organaziton: []
139 
+      organaziton: [],
140 
+      userName: {}
139 141 
     };
140 142 
   },
141 143 
   methods: {
 
@@ -156,6 +158,7 @@ export default {
156 158 
       getMyInformation(id).then(response => {
157 159 
         if (response.data.state === 1) {
158 160 
           var roleInfo = response.data.data.roleInfo;
161 
+          console.log("roleInfo", roleInfo);
159 162 
           this.admin_user_id = roleInfo.id;
160 163 
           this.adminid = roleInfo.admin_user_id;
161 164 
           this.roleInfo = roleInfo;
 
@@ -167,7 +170,15 @@ export default {
167 170 
         if (response.data.state === 1) {
168 171 
           var organaziton = response.data.data.organaziton;
169 172 
           this.organaziton = organaziton;
170 
-          console.log("organaziton", organaziton);
173 
+        }
174 
+      });
175 
+    },
176 
+    getMyInforName(id) {
177 
+      getMyInforName(id).then(response => {
178 
+        if (response.data.state === 1) {
179 
+          var Rolename = response.data.data.Rolename;
180 
+          var username = response.data.data.Username;
181 
+          this.userName = username;
171 182 
         }
172 183 
       });
173 184 
     },
 
@@ -183,13 +194,19 @@ export default {
183 194 
     },
184 195 
     toManage() {
185 196 
       this.$router.push("/organizationinfo?id=" + this.adminid);
197 
+    },
198 
+    toEditOrg() {
199 
+      this.$router.push("/newMy");
200 
+    },
201 
+    toMyIndex() {
202 
+      this.$router.push("/myInfo?id=" + this.admin_user_id);
186 203 
     }
187 204 
   },
188 205 
   created() {
189 206 
     var adminid = this.$store.getters.user.user.id;
190 
-    console.log("adminid", adminid);
191 207 
     this.getMyInformation(adminid);
192 208 
     this.getMyOrganazition(adminid);
209 
+    this.getMyInforName(adminid);
193 210 
   }
194 211 
 };
195 212 
 </script>

+ 12 - 8
src/pages/my/modifyingName.vue View File 

@@ -11,7 +11,7 @@
11 11 
   </div>
12 12 
 </template>
13 13 
 <script>
14 
-import { getMyInformation, saveName } from "@/api/patient/patient";
14 
+import { saveName, getMyInforName } from "@/api/patient/patient";
15 15 
 export default {
16 16 
   data() {
17 17 
     return {
 
@@ -20,13 +20,17 @@ export default {
20 20 
     };
21 21 
   },
22 22 
   methods: {
23 
-    getMyInformation(id) {
24 
-      getMyInformation(id).then(response => {
23 
+    getMyInforName(id) {
24 
+      getMyInforName(id).then(response => {
25 25 
         if (response.data.state === 1) {
26 
-          var roleInfo = response.data.data.roleInfo;
27 
-          console.log("姓名", roleInfo);
28 
-          this.message = roleInfo.message;
29 
-          this.name = roleInfo.user_name;
26 
+          var Rolename = response.data.data.Rolename;
27 
+          var username = response.data.data.Username;
28 
+          if (Rolename.user_name != "") {
29 
+            this.name = Rolename.user_name;
30 
+          }
31 
+          if (Rolename.user_name == "") {
32 
+            this.name = username.name;
33 
+          }
30 34 
         }
31 35 
       });
32 36 
     },
 
@@ -45,7 +49,7 @@ export default {
45 49 
   },
46 50 
   created() {
47 51 
     var id = this.$route.query.id;
48 
-    this.getMyInformation(id);
52 
+    this.getMyInforName(id);
49 53 
     this.admin_user_id = id;
50 54 
   }
51 55 
 };

+ 18 - 9
src/pages/my/myInfo.vue View File 

@@ -71,7 +71,7 @@
71 71 
 </template>
72 72
73 73 
 <script>
74 
-import { getMyInformation, SaveSex, SaveBirthday } from "@/api/patient/patient";
74 
+import { getMyInforName, SaveSex, SaveBirthday } from "@/api/patient/patient";
75 75 
 import { uParseTime } from "@/utils/tools";
76 76 
 export default {
77 77 
   data() {
 
@@ -84,7 +84,11 @@ export default {
84 84 
       minDate: new Date(1900, 0, 1),
85 85 
       maxDate: new Date(2025, 10, 1),
86 86 
       currentDate: new Date(),
87 
-      roleInfo: {},
87 
+      roleInfo: {
88 
+        avatar: "",
89 
+        user_name: "",
90 
+        message: ""
91 
+      },
88 92 
       admin_user_id: "",
89 93 
       form: {
90 94 
         sex: ""
 
@@ -92,11 +96,11 @@ export default {
92 96 
     };
93 97 
   },
94 98 
   methods: {
95 
-    getMyInformation(id) {
96 
-      getMyInformation(id).then(response => {
99 
+    getMyInforName(id) {
100 
+      getMyInforName(id).then(response => {
97 101 
         if (response.data.state === 1) {
98 
-          var roleInfo = response.data.data.roleInfo;
99 
-          console.log("roleInfo", roleInfo);
102 
+          var roleInfo = response.data.data.Rolename;
103 
+          var username = response.data.data.Username;
100 104 
           if (roleInfo.sex === 1) {
101 105 
             this.sex = "男";
102 106 
           }
 
@@ -104,8 +108,13 @@ export default {
104 108 
             this.sex = "女";
105 109 
           }
106 110 
           this.birthday = this.getTime(roleInfo.birthday);
107 
-
108 
-          this.roleInfo = roleInfo;
111 
+          this.roleInfo.user_name = roleInfo.user_name;
112 
+          this.roleInfo.avatar = roleInfo.avatar;
113 
+          this.roleInfo.message = roleInfo.message;
114 
+          if (roleInfo.user_name == "") {
115 
+            this.roleInfo.user_name = username.name;
116 
+          }
117 
+          this.userName = username;
109 118 
         }
110 119 
       });
111 120 
     },
 
@@ -173,8 +182,8 @@ export default {
173 182 
   },
174 183 
   created() {
175 184 
     var id = this.$route.query.id;
176 
-    this.getMyInformation(id);
177 185 
     this.admin_user_id = id;
186 
+    this.getMyInforName(id);
178 187 
   }
179 188 
 };
180 189 
 </script>

File diff suppressed because it is too large
+ 4494 - 4
src/pages/patientCenter/editOrg/index.vue


+ 10 - 8
src/permission.js View File 

@@ -1,8 +1,8 @@
1 
-import router from "./router";
2 
-import store from "./store";
3 
-import  isLogin  from "@/api/login";
1 
+import router from './router'
2 
+import store from './store'
3 
+import isLogin from '@/api/login'
4 4
5 
-const loginWhiteList = ["/", "/login", "/privacy", "/forgetPassword", "/userAgreement","/myIndex","/patients","/addPatints","/nopassword","/forget","/register","/setname",'/join','/createorg']; // 登录验证白名单
5 
+const loginWhiteList = ['/', '/login', '/privacy', '/forgetPassword', '/userAgreement', '/nopassword', '/forget', '/register', '/setname', '/join', '/createorg'] // 登录验证白名单
6 6
7 7 
 router.beforeEach((to, from, next) => {
8 8 
   // 线上注释
 
@@ -10,11 +10,13 @@ router.beforeEach((to, from, next) => {
10 10 
   //   return
11 11 
   if (store.getters.user.admin == null) {
12 12 
     if (loginWhiteList.indexOf(to.path) !== -1) {
13 
-      next();
13 
+      next()
14 14 
     } else {
15 
-      next({ path: "/" });
15 
+      next({
16 
+        path: '/'
17 
+      })
16 18 
     }
17 19 
   } else {
18 
-    next();
20 
+    next()
19 21 
   }
20 
-});
22 
+})

+ 151 - 150
src/router/index.js View File 

@@ -1,143 +1,140 @@
1 
-import Vue from "vue";
2 
-import Router from "vue-router";
1 
+import Vue from 'vue'
2 
+import Router from 'vue-router'
3 3
4 
-Vue.use(Router);
4 
+Vue.use(Router)
5 5
6 6 
 export default new Router({
7 
-  routes: [
8 
-    {
9 
-      path: "/",
10 
-      name: "Home",
11 
-      component: () => import("@/pages/home/verifyToken")
7 
+  routes: [{
8 
+      path: '/',
9 
+      name: 'Home',
10 
+      component: () => import('@/pages/home/verifyToken')
12 11 
     },
13 12 
     {
14 
-      path: "/login",
15 
-      name: "Home",
16 
-      component: () => import("@/pages/home/login")
13 
+      path: '/login',
14 
+      name: 'Home',
15 
+      component: () => import('@/pages/home/login')
17 16 
     },
18 17 
     {
19 
-      path: "/nopassword",
20 
-      name: "Home",
21 
-      component: () => import("@/pages/home/noPassword")
18 
+      path: '/nopassword',
19 
+      name: 'Home',
20 
+      component: () => import('@/pages/home/noPassword')
22 21 
     },
23 22 
     {
24 
-      path: "/setname",
25 
-      name: "Home",
26 
-      component: () => import("@/pages/home/register/name")
23 
+      path: '/setname',
24 
+      name: 'Home',
25 
+      component: () => import('@/pages/home/register/name')
27 26 
     },
28 27 
     {
29 
-      path: "/register",
30 
-      name: "Home",
31 
-      component: () => import("@/pages/home/register/register")
28 
+      path: '/register',
29 
+      name: 'Home',
30 
+      component: () => import('@/pages/home/register/register')
32 31 
     },
33 32 
     {
34 
-      path: "/join",
35 
-      name: "Home",
36 
-      component: () => import("@/pages/home/noJoinedGroup")
33 
+      path: '/join',
34 
+      name: 'Home',
35 
+      component: () => import('@/pages/home/noJoinedGroup')
37 36 
     },
38 37 
     {
39 
-      path: "/forget",
40 
-      name: "Home",
41 
-      component: () => import("@/pages/home/forgetPassword")
38 
+      path: '/forget',
39 
+      name: 'Home',
40 
+      component: () => import('@/pages/home/forgetPassword')
42 41 
     },
43 42 
     {
44 
-      path: "/createorg",
45 
-      name: "Home",
46 
-      component: () => import("@/pages/home/createOrg")
43 
+      path: '/createorg',
44 
+      name: 'Home',
45 
+      component: () => import('@/pages/home/createOrg')
47 46 
     },
48 47 
     // 首页
49 48 
     {
50 
-      path: "/myIndex",
51 
-      name: "myIndex",
52 
-      component: () => import("@/pages/home/index"),
53 
-      children: [
54 
-        {
55 
-          path: "/homeIndex",
56 
-          component: () => import("@/pages/homeIndex/index.vue"),
49 
+      path: '/myIndex',
50 
+      name: 'myIndex',
51 
+      component: () => import('@/pages/home/index'),
52 
+      children: [{
53 
+          path: '/homeIndex',
54 
+          component: () => import('@/pages/homeIndex/index.vue'),
57 55 
           meta: {
58 56 
             noCache: true // 不会被 <keep-alive> 缓存
59 57 
           }
60 58 
         },
61 59 
         // 我的
62 60 
         {
63 
-          path: "/newMy",
64 
-          name: "newMy",
65 
-          component: () => import("@/pages/my/index")
61 
+          path: '/newMy',
62 
+          name: 'newMy',
63 
+          component: () => import('@/pages/my/index')
66 64 
         },
67 65 
         // 商城
68 66 
         {
69 
-          path: "/shop",
70 
-          name: "shop",
71 
-          component: () => import("@/pages/shop/index")
67 
+          path: '/shop',
68 
+          name: 'shop',
69 
+          component: () => import('@/pages/shop/index')
72 70 
         }
73 71 
       ]
74 72 
     },
75 73
76 74 
     {
77 
-      path: "/perfectOrg",
78 
-      component: () => import("@/pages/org"),
75 
+      path: '/perfectOrg',
76 
+      component: () => import('@/pages/org'),
79 77 
       meta: {
80 78 
         noCache: true // 不会被 <keep-alive> 缓存
81 79 
       }
82 80 
     },
83 81 
     {
84 
-      path: "/manageconsole",
85 
-      name: "console",
86 
-      component: () => import("@/pages/console/managementConsole")
82 
+      path: '/manageconsole',
83 
+      name: 'console',
84 
+      component: () => import('@/pages/console/managementConsole')
87 85 
     },
88 86 
     {
89 
-      path: "/manageconsole/staff",
90 
-      name: "staff",
87 
+      path: '/manageconsole/staff',
88 
+      name: 'staff',
91 89 
       component: () =>
92 
-        import("@/pages/console/managementConsole/staff_role/staffManagement")
90 
+        import('@/pages/console/managementConsole/staff_role/staffManagement')
93 91 
     },
94 92 
     {
95 
-      path: "/staff/editstaff",
96 
-      name: "editstaff",
93 
+      path: '/staff/editstaff',
94 
+      name: 'editstaff',
97 95 
       component: () =>
98 
-        import("@/pages/console/managementConsole/staff_role/editStaff")
96 
+        import('@/pages/console/managementConsole/staff_role/editStaff')
99 97 
     }, {
100 
-      path: "/staff/addstaff",
101 
-      name: "addstaff",
98 
+      path: '/staff/addstaff',
99 
+      name: 'addstaff',
102 100 
       component: () =>
103 
-        import("@/pages/console/managementConsole/staff_role/addStaff")
101 
+        import('@/pages/console/managementConsole/staff_role/addStaff')
104 102 
     },
105 103
106 104 
     {
107 
-      path: "/manageconsole/role",
108 
-      name: "role",
105 
+      path: '/manageconsole/role',
106 
+      name: 'role',
109 107 
       component: () =>
110 
-        import("@/pages/console/managementConsole/staff_role/privilegeManagement")
108 
+        import('@/pages/console/managementConsole/staff_role/privilegeManagement')
111 109 
     },
112 110
113 
-
114 111 
     {
115 
-      path: "/role/user",
116 
-      name: "user",
112 
+      path: '/role/user',
113 
+      name: 'user',
117 114 
       component: () =>
118 
-        import("@/pages/console/managementConsole/staff_role/newUser")
115 
+        import('@/pages/console/managementConsole/staff_role/newUser')
119 116 
     },
120 117
121 118 
     {
122 
-      path: "/role/addnewuser",
123 
-      name: "user",
119 
+      path: '/role/addnewuser',
120 
+      name: 'user',
124 121 
       component: () =>
125 
-        import("@/pages/console/managementConsole/staff_role/newAddStaff")
122 
+        import('@/pages/console/managementConsole/staff_role/newAddStaff')
126 123 
     }, {
127 
-      path: "/role/stafflist",
128 
-      name: "user",
124 
+      path: '/role/stafflist',
125 
+      name: 'user',
129 126 
       component: () =>
130 
-        import("@/pages/console/managementConsole/staff_role/employeeList")
131 
-    },{
132 
-      path: "/role/usermanage",
133 
-      name: "user",
127 
+        import('@/pages/console/managementConsole/staff_role/employeeList')
128 
+    }, {
129 
+      path: '/role/usermanage',
130 
+      name: 'user',
134 131 
       component: () =>
135 
-        import("@/pages/console/managementConsole/staff_role/userManage")
136 
-    },{
137 
-      path: "/role/addrole",
138 
-      name: "add_role",
132 
+        import('@/pages/console/managementConsole/staff_role/userManage')
133 
+    }, {
134 
+      path: '/role/addrole',
135 
+      name: 'add_role',
139 136 
       component: () =>
140 
-        import("@/pages/console/managementConsole/staff_role/newAddRole")
137 
+        import('@/pages/console/managementConsole/staff_role/newAddRole')
141 138 
     },
142 139
143 140 
     //
 
@@ -148,134 +145,132 @@ export default new Router({
148 145 
     //     import("@/pages/console/managementConsole/staff_role/privilegeManagement")
149 146 
     // },
150 147
151 
-
152 
-
153 148 
     {
154 
-      path: "/role/editrole",
155 
-      name: "editrole",
149 
+      path: '/role/editrole',
150 
+      name: 'editrole',
156 151 
       component: () =>
157 
-        import("@/pages/console/managementConsole/staff_role/editRole")
152 
+        import('@/pages/console/managementConsole/staff_role/editRole')
158 153 
     },
159 154 
     {
160 
-      path: "/role/subpurview",
161 
-      name: "purview",
155 
+      path: '/role/subpurview',
156 
+      name: 'purview',
162 157 
       component: () =>
163 
-        import("@/pages/console/managementConsole/staff_role/subPurview")
158 
+        import('@/pages/console/managementConsole/staff_role/subPurview')
164 159 
     },
165 160 
     {
166 
-      path: "/role/otherpurview",
167 
-      name: "purview",
161 
+      path: '/role/otherpurview',
162 
+      name: 'purview',
168 163 
       component: () =>
169 
-        import("@/pages/console/managementConsole/staff_role/otherPurview")
164 
+        import('@/pages/console/managementConsole/staff_role/otherPurview')
170 165 
     }, {
171 
-      path: "/role/functionpurview",
172 
-      name: "purview",
166 
+      path: '/role/functionpurview',
167 
+      name: 'purview',
173 168 
       component: () =>
174 
-        import("@/pages/console/managementConsole/staff_role/functionPurview")
169 
+        import('@/pages/console/managementConsole/staff_role/functionPurview')
175 170 
     },
176 171 
     // 患者中心
177 172 
     {
178 
-      path: "/patients",
179 
-      name: "patients",
180 
-      component: () => import("@/pages/patientManagement/patientManagement")
173 
+      path: '/patients',
174 
+      name: 'patients',
175 
+      component: () => import('@/pages/patientManagement/patientManagement')
181 176 
     },
182 177 
     // 新增病人
183 178 
     {
184 
-      path: "/addPatints",
185 
-      name: "addpatients",
186 
-      component: () => import("@/pages/patients/addPatient")
179 
+      path: '/addPatints',
180 
+      name: 'addpatients',
181 
+      component: () => import('@/pages/patients/addPatient')
187 182 
     },
188 183 
     // 全部病程
189 184 
     {
190 
-      path: "/coursedetail",
191 
-      name: "coursedetail",
192 
-      component: () => import("@/pages/allCourseManagement/index")
185 
+      path: '/coursedetail',
186 
+      name: 'coursedetail',
187 
+      component: () => import('@/pages/allCourseManagement/index')
193 188 
     },
194 189 
     // 全部干体重
195 190 
     {
196 
-      path: "/dryweight",
197 
-      name: "dryweight",
198 
-      component: () => import("@/pages/allDryWeight/index")
191 
+      path: '/dryweight',
192 
+      name: 'dryweight',
193 
+      component: () => import('@/pages/allDryWeight/index')
199 194 
     },
200 195 
     // 基本信息
201 196 
     {
202 
-      path: "/editPatient",
203 
-      name: "editPatient",
204 
-      component: () => import("@/pages/patients/editPatient")
197 
+      path: '/editPatient',
198 
+      name: 'editPatient',
199 
+      component: () => import('@/pages/patients/editPatient')
205 200 
     },
206 201 
     // 全部排班
207 202 
     {
208 
-      path: "/editScheduling",
209 
-      name: "editscheduling",
210 
-      component: () => import("@/pages/allScheduling/index")
203 
+      path: '/editScheduling',
204 
+      name: 'editscheduling',
205 
+      component: () => import('@/pages/allScheduling/index')
211 206 
     },
212 207 
     // 全部透后宣教
213 208 
     {
214 
-      path: "/editEducation",
215 
-      name: "editeducation",
216 
-      component: () => import("@/pages/allEducation/index")
209 
+      path: '/editEducation',
210 
+      name: 'editeducation',
211 
+      component: () => import('@/pages/allEducation/index')
217 212 
     },
218 213 
     // 全部抢救记录
219 214 
     {
220 
-      path: "/rescuerecord",
221 
-      name: "rescuerecord",
222 
-      component: () => import("@/pages/allRescue/index")
215 
+      path: '/rescuerecord',
216 
+      name: 'rescuerecord',
217 
+      component: () => import('@/pages/allRescue/index')
223 218 
     },
224 219 
     //
225 220 
     {
226 
-      path: "/patientdetail",
227 
-      name: "patientdetail",
228 
-      component: () => import("@/pages/doctorAdvice/index")
221 
+      path: '/patientdetail',
222 
+      name: 'patientdetail',
223 
+      component: () => import('@/pages/doctorAdvice/index')
229 224 
     },
230 225 
     // 搜索
231 226 
     {
232 
-      path: "/search",
233 
-      name: "search",
234 
-      component: () => import("@/pages/search/index")
227 
+      path: '/search',
228 
+      name: 'search',
229 
+      component: () => import('@/pages/search/index')
235 230 
     },
236 231 
     // 我的信息
237 232 
     {
238 
-      path: "/myInfo",
239 
-      name: "myInfo",
240 
-      component: () => import("@/pages/my/myInfo")
233 
+      path: '/myInfo',
234 
+      name: 'myInfo',
235 
+      component: () => import('@/pages/my/myInfo')
241 236 
     },
242 237 
     // 意见反馈
243 238 
     {
244 
-      path: "/feedBack",
245 
-      name: "feedBack",
246 
-      component: () => import("@/pages/my/feedBack")
239 
+      path: '/feedBack',
240 
+      name: 'feedBack',
241 
+      component: () => import('@/pages/my/feedBack')
247 242 
     },
248 243 
     // 关于我们
249 244 
     {
250 
-      path: "/about",
251 
-      name: "about",
252 
-      component: () => import("@/pages/my/aboutUs")
245 
+      path: '/about',
246 
+      name: 'about',
247 
+      component: () => import('@/pages/my/aboutUs')
253 248 
     },
254 249 
     // 公司介绍
255 250 
     {
256 
-      path: "/introduce",
257 
-      name: "introduce",
258 
-      component: () => import("@/pages/my/companyIntroduction")
251 
+      path: '/introduce',
252 
+      name: 'introduce',
253 
+      component: () => import('@/pages/my/companyIntroduction')
259 254 
     },
260 255 
     // 更改名字
261 256 
     {
262 
-      path: "/editname",
263 
-      name: "editname",
264 
-      component: () => import("@/pages/my/modifyingName")
257 
+      path: '/editname',
258 
+      name: 'editname',
259 
+      component: () => import('@/pages/my/modifyingName')
265 260 
     },
266 261 
     // 更改名字
267 262 
     {
268 
-      path: "/personalsign",
269 
-      name: "personalsign",
270 
-      component: () => import("@/pages/my/personalSign")
263 
+      path: '/personalsign',
264 
+      name: 'personalsign',
265 
+      component: () => import('@/pages/my/personalSign')
271 266 
     },
272 267
273 268 
     // 全部长期透析记录
274 269
275 270 
     {
276 
-      path: "/alllongdialysis",
277 
-      name: "longdialysis",
278 
-      component: () => import("@/pages/allLongDialysis/index")
271 
+      path: '/alllongdialysis',
272 
+      name: 'longdialysis',
273 
+      component: () => import('@/pages/allLongDialysis/index')
279 274 
     },
280 275 
     //,
281 276 
     {
 
@@ -301,21 +296,27 @@ export default new Router({
301 296 
       name: '/addgroup',
302 297 
       component: () => import('@/pages/configureCenter/newGrouping')
303 298 
     },
304 
-    // 新增传位号
299 
+    // 新增床位号
305 300 
     {
306 301 
       path: '/addbed',
307 302 
       name: '/addbed',
308 303 
       component: () => import('@/pages/configureCenter/newBed')
309 304 
     },
305 
+    // 我的页面管理
306 
+    {
307 
+      path: '/editorg',
308 
+      name: '/editorg',
309 
+      component: () => import('@/pages/patientCenter/editOrg/index')
310 
+    },
310 311 
     {
311 312 
       path: '/organizationinfo',
312 313 
       name: '/organizationinfo',
313 314 
       component: () => import('@/pages/my/organizationInfo')
314 315 
     },
315 316 
     {
316 
-      path: "/main",
317 
-      name: "main",
318 
-      component: () => import("@/pages/main/index"),
317 
+      path: '/main',
318 
+      name: 'main',
319 
+      component: () => import('@/pages/main/index'),
319 320 
       meta: {
320 321 
         noCache: true // 不会被 <keep-alive> 缓存
321 322 
       }
 
@@ -326,9 +327,9 @@ export default new Router({
326 327 
       component: () => import('@/pages/product/index')
327 328 
     },
328 329 
     {
329 
-      path: "/monitoring",
330 
-      name: "monitorPage",
331 
-      component: () => import("@/pages/monitoring/index")
330 
+      path: '/monitoring',
331 
+      name: 'monitorPage',
332 
+      component: () => import('@/pages/monitoring/index')
332 333 
     },
333 334 
     {
334 335 
       path: '/details',
 
@@ -398,6 +399,6 @@ export default new Router({
398 399 
       path: '/modifypsw',
399 400 
       name: 'modifyPassword',
400 401 
       component: () => import('@/pages/my/modifyPassword')
401 
-    },
402 
+    }
402 403 
   ]
403 404 
 })