XMLWAN 4 年之前
父節點
當前提交
c401c79869

+ 33 - 12
package-lock.json 查看文件

@@ -2332,6 +2332,7 @@
2332 2332
       "resolved": "http://registry.npm.taobao.org/boom/download/boom-2.10.1.tgz",
2333 2333
       "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
2334 2334
       "dev": true,
2335
+      "optional": true,
2335 2336
       "requires": {
2336 2337
         "hoek": "2.x.x"
2337 2338
       }
@@ -5800,7 +5801,8 @@
5800 5801
         "ansi-regex": {
5801 5802
           "version": "2.1.1",
5802 5803
           "bundled": true,
5803
-          "dev": true
5804
+          "dev": true,
5805
+          "optional": true
5804 5806
         },
5805 5807
         "aproba": {
5806 5808
           "version": "1.2.0",
@@ -5821,12 +5823,14 @@
5821 5823
         "balanced-match": {
5822 5824
           "version": "1.0.0",
5823 5825
           "bundled": true,
5824
-          "dev": true
5826
+          "dev": true,
5827
+          "optional": true
5825 5828
         },
5826 5829
         "brace-expansion": {
5827 5830
           "version": "1.1.11",
5828 5831
           "bundled": true,
5829 5832
           "dev": true,
5833
+          "optional": true,
5830 5834
           "requires": {
5831 5835
             "balanced-match": "^1.0.0",
5832 5836
             "concat-map": "0.0.1"
@@ -5841,17 +5845,20 @@
5841 5845
         "code-point-at": {
5842 5846
           "version": "1.1.0",
5843 5847
           "bundled": true,
5844
-          "dev": true
5848
+          "dev": true,
5849
+          "optional": true
5845 5850
         },
5846 5851
         "concat-map": {
5847 5852
           "version": "0.0.1",
5848 5853
           "bundled": true,
5849
-          "dev": true
5854
+          "dev": true,
5855
+          "optional": true
5850 5856
         },
5851 5857
         "console-control-strings": {
5852 5858
           "version": "1.1.0",
5853 5859
           "bundled": true,
5854
-          "dev": true
5860
+          "dev": true,
5861
+          "optional": true
5855 5862
         },
5856 5863
         "core-util-is": {
5857 5864
           "version": "1.0.2",
@@ -5968,7 +5975,8 @@
5968 5975
         "inherits": {
5969 5976
           "version": "2.0.3",
5970 5977
           "bundled": true,
5971
-          "dev": true
5978
+          "dev": true,
5979
+          "optional": true
5972 5980
         },
5973 5981
         "ini": {
5974 5982
           "version": "1.3.5",
@@ -5980,6 +5988,7 @@
5980 5988
           "version": "1.0.0",
5981 5989
           "bundled": true,
5982 5990
           "dev": true,
5991
+          "optional": true,
5983 5992
           "requires": {
5984 5993
             "number-is-nan": "^1.0.0"
5985 5994
           }
@@ -5994,6 +6003,7 @@
5994 6003
           "version": "3.0.4",
5995 6004
           "bundled": true,
5996 6005
           "dev": true,
6006
+          "optional": true,
5997 6007
           "requires": {
5998 6008
             "brace-expansion": "^1.1.7"
5999 6009
           }
@@ -6001,12 +6011,14 @@
6001 6011
         "minimist": {
6002 6012
           "version": "0.0.8",
6003 6013
           "bundled": true,
6004
-          "dev": true
6014
+          "dev": true,
6015
+          "optional": true
6005 6016
         },
6006 6017
         "minipass": {
6007 6018
           "version": "2.2.4",
6008 6019
           "bundled": true,
6009 6020
           "dev": true,
6021
+          "optional": true,
6010 6022
           "requires": {
6011 6023
             "safe-buffer": "^5.1.1",
6012 6024
             "yallist": "^3.0.0"
@@ -6025,6 +6037,7 @@
6025 6037
           "version": "0.5.1",
6026 6038
           "bundled": true,
6027 6039
           "dev": true,
6040
+          "optional": true,
6028 6041
           "requires": {
6029 6042
             "minimist": "0.0.8"
6030 6043
           }
@@ -6105,7 +6118,8 @@
6105 6118
         "number-is-nan": {
6106 6119
           "version": "1.0.1",
6107 6120
           "bundled": true,
6108
-          "dev": true
6121
+          "dev": true,
6122
+          "optional": true
6109 6123
         },
6110 6124
         "object-assign": {
6111 6125
           "version": "4.1.1",
@@ -6117,6 +6131,7 @@
6117 6131
           "version": "1.4.0",
6118 6132
           "bundled": true,
6119 6133
           "dev": true,
6134
+          "optional": true,
6120 6135
           "requires": {
6121 6136
             "wrappy": "1"
6122 6137
           }
@@ -6202,7 +6217,8 @@
6202 6217
         "safe-buffer": {
6203 6218
           "version": "5.1.1",
6204 6219
           "bundled": true,
6205
-          "dev": true
6220
+          "dev": true,
6221
+          "optional": true
6206 6222
         },
6207 6223
         "safer-buffer": {
6208 6224
           "version": "2.1.2",
@@ -6238,6 +6254,7 @@
6238 6254
           "version": "1.0.2",
6239 6255
           "bundled": true,
6240 6256
           "dev": true,
6257
+          "optional": true,
6241 6258
           "requires": {
6242 6259
             "code-point-at": "^1.0.0",
6243 6260
             "is-fullwidth-code-point": "^1.0.0",
@@ -6257,6 +6274,7 @@
6257 6274
           "version": "3.0.1",
6258 6275
           "bundled": true,
6259 6276
           "dev": true,
6277
+          "optional": true,
6260 6278
           "requires": {
6261 6279
             "ansi-regex": "^2.0.0"
6262 6280
           }
@@ -6300,12 +6318,14 @@
6300 6318
         "wrappy": {
6301 6319
           "version": "1.0.2",
6302 6320
           "bundled": true,
6303
-          "dev": true
6321
+          "dev": true,
6322
+          "optional": true
6304 6323
         },
6305 6324
         "yallist": {
6306 6325
           "version": "3.0.2",
6307 6326
           "bundled": true,
6308
-          "dev": true
6327
+          "dev": true,
6328
+          "optional": true
6309 6329
         }
6310 6330
       }
6311 6331
     },
@@ -6763,7 +6783,8 @@
6763 6783
       "version": "2.16.3",
6764 6784
       "resolved": "http://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
6765 6785
       "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
6766
-      "dev": true
6786
+      "dev": true,
6787
+      "optional": true
6767 6788
     },
6768 6789
     "home-or-tmp": {
6769 6790
       "version": "2.0.0",

+ 1 - 0
src/api/patient/patient.js 查看文件

@@ -346,6 +346,7 @@ export function DeleteRescueRecord(id, params) {
346 346
 }
347 347
 
348 348
 export function toSearchPatient(keyword) {
349
+  console.log('keyword', keyword)
349 350
   const params = {
350 351
     keyword: keyword
351 352
   }

+ 61 - 61
src/pages/allLongDialysis/index.vue 查看文件

@@ -97,16 +97,16 @@
97 97
   </div>
98 98
 </template>
99 99
 <script>
100
-import { getLongDialysisDetail } from '@/api/patient/patient'
101
-import { uParseTime } from '@/utils/tools'
102
-import { setRem, setHeight } from '@/libs/functionRem'
103
-import '../../styles/resetStyle.scss'
100
+import { getLongDialysisDetail } from "@/api/patient/patient";
101
+import { uParseTime } from "@/utils/tools";
102
+import { setRem, setHeight } from "@/libs/functionRem";
103
+import "../../styles/resetStyle.scss";
104 104
 export default {
105
-  data () {
105
+  data() {
106 106
     return {
107 107
       patientid: 0,
108 108
       active: 0,
109
-      patient_name: '',
109
+      patient_name: "",
110 110
       patient: {},
111 111
       longDialysisDetail: {},
112 112
       anticoagulantsSet: {
@@ -120,129 +120,129 @@ export default {
120 120
       displace_liqui_part_option: [],
121 121
       blood_access_option: [],
122 122
       dialysisrecord: []
123
-    }
123
+    };
124 124
   },
125 125
   methods: {
126
-    getLongDialysisDetail (id) {
126
+    getLongDialysisDetail(id) {
127 127
       getLongDialysisDetail(id).then(response => {
128 128
         if (response.data.state === 1) {
129
-          var longDialysisDetail = response.data.data.longDialysisDetail
129
+          var longDialysisDetail = response.data.data.longDialysisDetail;
130 130
           if (longDialysisDetail.mode_id == 1) {
131
-            longDialysisDetail.mode_id = 'HD'
131
+            longDialysisDetail.mode_id = "HD";
132 132
           }
133 133
           if (longDialysisDetail.mode_id == 2) {
134
-            longDialysisDetail.mode_id = 'HDF'
134
+            longDialysisDetail.mode_id = "HDF";
135 135
           }
136 136
           if (longDialysisDetail.mode_id == 3) {
137
-            longDialysisDetail.mode_id = 'HD+HP'
137
+            longDialysisDetail.mode_id = "HD+HP";
138 138
           }
139 139
           if (longDialysisDetail.mode_id == 4) {
140
-            longDialysisDetail.mode_id = 'HP'
140
+            longDialysisDetail.mode_id = "HP";
141 141
           }
142 142
           if (longDialysisDetail.mode_id == 5) {
143
-            longDialysisDetail.mode_id = 'HF'
143
+            longDialysisDetail.mode_id = "HF";
144 144
           }
145 145
           if (longDialysisDetail.mode_id == 6) {
146
-            longDialysisDetail.mode_id = 'SCUF'
146
+            longDialysisDetail.mode_id = "SCUF";
147 147
           }
148 148
           if (longDialysisDetail.mode_id == 7) {
149
-            longDialysisDetail.mode_id = 'IUF'
149
+            longDialysisDetail.mode_id = "IUF";
150 150
           }
151 151
           if (longDialysisDetail.mode_id == 8) {
152
-            longDialysisDetail.mode_id = 'HFHD'
152
+            longDialysisDetail.mode_id = "HFHD";
153 153
           }
154 154
           if (longDialysisDetail.mode_id == 9) {
155
-            longDialysisDetail.mode_id = 'HFHD+HP'
155
+            longDialysisDetail.mode_id = "HFHD+HP";
156 156
           }
157 157
           if (longDialysisDetail.mode_id == 10) {
158
-            longDialysisDetail.mode_id = 'PHF'
158
+            longDialysisDetail.mode_id = "PHF";
159 159
           }
160 160
           if (longDialysisDetail.mode_id == 11) {
161
-            longDialysisDetail.mode_id = 'HFR'
161
+            longDialysisDetail.mode_id = "HFR";
162 162
           }
163 163
           if (longDialysisDetail.mode_id == 12) {
164
-            longDialysisDetail.mode_id = 'HDF+HP'
164
+            longDialysisDetail.mode_id = "HDF+HP";
165 165
           }
166 166
           if (longDialysisDetail.mode_id == 13) {
167
-            longDialysisDetail.mode_id = 'CRRT'
167
+            longDialysisDetail.mode_id = "CRRT";
168 168
           }
169 169
           if (longDialysisDetail.mode_id == 14) {
170
-            longDialysisDetail.mode_id = '腹水回输'
170
+            longDialysisDetail.mode_id = "腹水回输";
171 171
           }
172 172
           if (longDialysisDetail.mode_id == 15) {
173
-            longDialysisDetail.mode_id = 'HD前置换'
173
+            longDialysisDetail.mode_id = "HD前置换";
174 174
           }
175 175
           if (longDialysisDetail.mode_id == 16) {
176
-            longDialysisDetail.mode_id = 'HD后置换'
176
+            longDialysisDetail.mode_id = "HD后置换";
177 177
           }
178 178
           if (longDialysisDetail.mode_id == 17) {
179
-            longDialysisDetail.mode_id = 'HDF前置换'
179
+            longDialysisDetail.mode_id = "HDF前置换";
180 180
           }
181 181
           if (longDialysisDetail.mode_id == 18) {
182
-            longDialysisDetail.mode_id = 'HDF后置换'
182
+            longDialysisDetail.mode_id = "HDF后置换";
183 183
           }
184 184
           if (longDialysisDetail.displace_liqui_part == 0) {
185
-            longDialysisDetail.displace_liqui_part = ''
185
+            longDialysisDetail.displace_liqui_part = "";
186 186
           }
187 187
           if (longDialysisDetail.displace_liqui_part == 1) {
188
-            longDialysisDetail.displace_liqui_part = '前稀释'
188
+            longDialysisDetail.displace_liqui_part = "前稀释";
189 189
           }
190 190
           if (longDialysisDetail.displace_liqui_part == 2) {
191
-            longDialysisDetail.displace_liqui_part = '后稀释'
191
+            longDialysisDetail.displace_liqui_part = "后稀释";
192 192
           }
193
-          this.longDialysisDetail = longDialysisDetail
193
+          this.longDialysisDetail = longDialysisDetail;
194 194
 
195
-          var patient = response.data.data.patient
195
+          var patient = response.data.data.patient;
196 196
 
197
-          this.patient_name = patient.name
197
+          this.patient_name = patient.name;
198 198
         }
199
-      })
199
+      });
200 200
     },
201
-    toReturn () {
201
+    toReturn() {
202 202
       this.$router.push(
203
-        '/patientdetail?patientid=' + this.patientid + '&active=' + this.active
204
-      )
203
+        "/patientdetail?patientid=" + this.patientid + "&active=" + this.active
204
+      );
205 205
     },
206
-    getTime (time) {
206
+    getTime(time) {
207 207
       // return uParseTime(time, "{y}-{m}-{d} {h}:{i}:{s}");
208
-      return uParseTime(time, '{y}-{m}-{d}')
208
+      return uParseTime(time, "{y}-{m}-{d}");
209 209
     },
210
-    getBloodAccessOption (id) {
210
+    getBloodAccessOption(id) {
211 211
       for (let i = 0; i < this.blood_access_option.length; i++) {
212 212
         if ((this.blood_access_option[i].id = id)) {
213
-          return this.blood_access_option[i].name
213
+          return this.blood_access_option[i].name;
214 214
         }
215 215
       }
216 216
     },
217
-    getSpecialMedicine (id) {
217
+    getSpecialMedicine(id) {
218 218
       for (let i = 0; i < this.special_medicine_option.length; i++) {
219 219
         if ((this.special_medicine_option[i].id = id)) {
220
-          return this.special_medicine_option[i].name
220
+          return this.special_medicine_option[i].name;
221 221
         }
222 222
       }
223 223
     }
224 224
   },
225
-  created () {
226
-    this.active = parseInt(this.$route.query.active)
227
-    setRem()
228
-    setHeight()
229
-    var id = this.$route.query.id
225
+  created() {
226
+    this.active = parseInt(this.$route.query.active);
227
+    setRem();
228
+    setHeight();
229
+    var id = this.$route.query.id;
230 230
 
231
-    var patientid = this.$route.query.patientid
232
-    this.patientid = patientid
231
+    var patientid = this.$route.query.patientid;
232
+    this.patientid = patientid;
233 233
 
234
-    this.getLongDialysisDetail(id)
235
-    this.anticoagulantsSet = this.$store.getters.anticoagulants_set
236
-    this.replacementWays = this.$store.getters.replacement_ways
237
-    this.anticoagulantsConfit = this.$store.getters.anticoagulants_confit
238
-    this.blood_filters = this.$store.getters.blood_filters
239
-    this.dialysate_formulation = this.$store.getters.dialysate_formulation
240
-    this.body_fluid_option = this.$store.getters.body_fluid
241
-    this.special_medicine_option = this.$store.getters.special_medicine
242
-    this.displace_liqui_part_option = this.$store.getters.displace_liqui
243
-    this.blood_access_option = this.$store.getters.blood_access
234
+    this.getLongDialysisDetail(id);
235
+    this.anticoagulantsSet = this.$store.getters.anticoagulants_set;
236
+    this.replacementWays = this.$store.getters.replacement_ways;
237
+    this.anticoagulantsConfit = this.$store.getters.anticoagulants_confit;
238
+    this.blood_filters = this.$store.getters.blood_filters;
239
+    this.dialysate_formulation = this.$store.getters.dialysate_formulation;
240
+    this.body_fluid_option = this.$store.getters.body_fluid;
241
+    this.special_medicine_option = this.$store.getters.special_medicine;
242
+    this.displace_liqui_part_option = this.$store.getters.displace_liqui;
243
+    this.blood_access_option = this.$store.getters.blood_access;
244 244
   }
245
-}
245
+};
246 246
 </script>
247 247
 <style lang="scss" scoped>
248 248
 .page_allLongDialysis {

+ 3 - 3
src/pages/configureCenter/components/Bed.vue 查看文件

@@ -152,8 +152,8 @@ export default {
152 152
 <style lang="scss" scoped>
153 153
 .Bed {
154 154
   margin-bottom: 3.125rem;
155
-  .BedBox{
156
-    >div:last-child{
155
+  .BedBox {
156
+    > div:last-child {
157 157
       border: none;
158 158
     }
159 159
   }
@@ -192,7 +192,7 @@ export default {
192 192
     }
193 193
   }
194 194
 }
195
-::-webkit-scrollbar{
195
+::-webkit-scrollbar {
196 196
   width: 0;
197 197
 }
198 198
 </style>

+ 2 - 1
src/pages/configureCenter/editBed.vue 查看文件

@@ -1,7 +1,7 @@
1 1
 <template>
2 2
   <div class="page_editBed">
3 3
     <div class="newBedTitle">
4
-      <i class="iconfont icon-zuojiantou jiantou" @click="toReturn"></i>
4
+      <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
5 5
       <span class="titleName">编辑床位</span>
6 6
       <span @click="spread" id="copy">修改</span>
7 7
     </div>
@@ -214,6 +214,7 @@ export default {
214 214
     this.getAllGroupOne();
215 215
     var id = this.$route.query.id;
216 216
     this.getBedDetail(id);
217
+    localStorage.setItem("test", this.active);
217 218
   }
218 219
 };
219 220
 </script>

+ 1 - 1
src/pages/configureCenter/editGrouping.vue 查看文件

@@ -1,7 +1,7 @@
1 1
 <template>
2 2
   <div class="page_editGrouping">
3 3
     <div class="newGroupingTitle">
4
-      <i class="iconfont icon-zuojiantou jiantou" @click="toReturn"></i>
4
+      <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
5 5
       <span class="titleName">编辑分组</span>
6 6
       <span @click="spread" id="copy">修改</span>
7 7
     </div>

+ 1 - 1
src/pages/configureCenter/editPartion.vue 查看文件

@@ -1,7 +1,7 @@
1 1
 <template>
2 2
   <div class="page_editPartition">
3 3
     <div class="newPartitionTitle">
4
-      <i class="iconfont icon-zuojiantou jiantou" @click="toReturn"></i>
4
+      <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
5 5
       <span class="titleName">编辑分区</span>
6 6
       <span @click="spread" id="copy">修改</span>
7 7
     </div>

+ 5 - 4
src/pages/configureCenter/index.vue 查看文件

@@ -41,9 +41,10 @@ export default {
41 41
     }
42 42
   },
43 43
   created() {
44
-    if (this.$route.query.active) {
45
-      this.active = parseInt(this.$route.query.active);
46
-    }
44
+    // if (this.$route.query.active) {
45
+    // this.active = parseInt(this.$route.query.active);
46
+    // console.log("ac", this.active);
47
+    // }
47 48
   }
48 49
 };
49 50
 </script>
@@ -76,7 +77,7 @@ export default {
76 77
   .van-tabs__line {
77 78
     background: #5b98ff;
78 79
   }
79
-  .van-tab--active{
80
+  .van-tab--active {
80 81
     font-size: 1rem;
81 82
     color: #000;
82 83
     font-weight: bold;

+ 1 - 1
src/pages/configureCenter/newBed.vue 查看文件

@@ -1,7 +1,7 @@
1 1
 <template>
2 2
   <div class="page_newBed">
3 3
     <div class="newBedTitle">
4
-      <i class="iconfont icon-zuojiantou jiantou" @click="toReturn"></i>
4
+      <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
5 5
       <span class="titleName">新增床位</span>
6 6
     </div>
7 7
     <div class="infoBox">

+ 1 - 1
src/pages/configureCenter/newGrouping.vue 查看文件

@@ -1,7 +1,7 @@
1 1
 <template>
2 2
   <div class="page_newGrouping">
3 3
     <div class="newGroupingTitle">
4
-      <i class="iconfont icon-zuojiantou jiantou" @click="toReturn"></i>
4
+      <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
5 5
       <span class="titleName">新增分组</span>
6 6
     </div>
7 7
     <div class="infoBox">

+ 1 - 1
src/pages/configureCenter/newPartition.vue 查看文件

@@ -1,7 +1,7 @@
1 1
 <template>
2 2
   <div class="page_newPartition">
3 3
     <div class="newPartitionTitle">
4
-      <i class="iconfont icon-zuojiantou jiantou" @click="toReturn"></i>
4
+      <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
5 5
       <span class="titleName">新增分区</span>
6 6
     </div>
7 7
     <div class="infoBox">

+ 5 - 2
src/pages/doctorAdvice/components/DoctorManagement.vue 查看文件

@@ -36,7 +36,7 @@
36 36
               <van-icon class="ellipsis" name="ellipsis" @click="Delete(item.start_time, index, item.child[0].execution_staff)" />
37 37
             </div>
38 38
 
39
-         <div v-for="(it,i) in item.child" :key="i">
39
+         <div v-for="(it,i) in item.child.slice(0,3)" :key="i">
40 40
             <div class="statOrder"  v-if="it.advice_type == 1 && it.parent_id == 0">
41 41
               <div class="statOrderTitle">
42 42
                 <span v-if="i<1">长期医嘱</span>
@@ -337,7 +337,10 @@ export default {
337 337
           // console.log("list", list);
338 338
           list.map(item => {
339 339
             for (let i = 0; i < advice.length; i++) {
340
-              if (item.start_time === advice[i].start_time) {
340
+              if (
341
+                item.start_time === advice[i].start_time &&
342
+                advice[i].parent_id === 0
343
+              ) {
341 344
                 item.child.push(advice[i]);
342 345
               }
343 346
             }

+ 1 - 1
src/pages/doctorAdvice/index.vue 查看文件

@@ -669,7 +669,7 @@ export default {
669 669
   .van-popup {
670 670
     transform: none;
671 671
   }
672
-  .van-tab--active{
672
+  .van-tab--active {
673 673
     font-size: 1rem;
674 674
     color: #000;
675 675
     font-weight: bold;

+ 11 - 14
src/pages/homeIndex/index.vue 查看文件

@@ -166,7 +166,7 @@ export default {
166 166
       org_arr: [],
167 167
       banners: [],
168 168
       apps: [],
169
-      isSubSuperAdmin:false,
169
+      isSubSuperAdmin: false,
170 170
       option1: [
171 171
         { text: "新款商品", value: 0 },
172 172
         { text: "全部商品全部商品全部商品全部商品全部商品全部商品", value: 1 },
@@ -289,7 +289,7 @@ export default {
289 289
       }
290 290
     },
291 291
     toCreateOrg() {
292
-      this.show = false
292
+      this.show = false;
293 293
       this.$router.push({ path: "/perfectOrg" });
294 294
     },
295 295
     toPatients() {
@@ -323,12 +323,11 @@ export default {
323 323
             this.value1 = this.$store.getters.user.org.id;
324 324
             this.show = false;
325 325
           } else {
326
-            console.log(1)
326
+            console.log(1);
327 327
             this.show = true;
328
-            console.log(2)
328
+            console.log(2);
329 329
             this.apps = response.data.data.apps;
330 330
             this.banners = response.data.data.banners;
331
-            
332 331
           }
333 332
         } else {
334 333
           this.$toast({
@@ -342,7 +341,6 @@ export default {
342 341
     }
343 342
   },
344 343
   created() {
345
-    
346 344
     this.GetHomeData();
347 345
     setRem();
348 346
   }
@@ -505,32 +503,31 @@ export default {
505 503
     top: 3.125rem;
506 504
     z-index: 9;
507 505
   }
508
-  .toparrow{
506
+  .toparrow {
509 507
     text-align: right;
510 508
     margin-right: 1.75rem;
511
-    img{
509
+    img {
512 510
       width: 1.875rem;
513 511
     }
514 512
   }
515
-  .tipsBox{
513
+  .tipsBox {
516 514
     width: 18.75rem;
517 515
     height: 5.625rem;
518 516
     margin: 0 auto;
519 517
     background: #fff;
520
-    border-radius: .25rem;
518
+    border-radius: 0.25rem;
521 519
     text-align: center;
522 520
     padding-top: 1.25rem;
523
-    p{
521
+    p {
524 522
       font-size: 1rem;
525 523
       line-height: 1.5rem;
526 524
     }
527 525
   }
528
-  
529 526
 }
530 527
 </style>
531 528
 <style lang="scss">
532
-.page_homeIndex{
533
-  .van-dropdown-menu__title{
529
+.page_homeIndex {
530
+  .van-dropdown-menu__title {
534 531
     padding-left: 0;
535 532
   }
536 533
 }

+ 8 - 2
src/pages/my/index.vue 查看文件

@@ -245,7 +245,13 @@ export default {
245 245
   },
246 246
   created() {
247 247
     var adminid = this.$store.getters.user.user.id;
248
-    this.adminid = adminid
248
+    if (adminid === 0) {
249
+      var adminid = this.$store.getters.user.admin.id;
250
+      this.getMyInformation(adminid);
251
+      this.getMyOrganazition(adminid);
252
+      this.getMyInforName(adminid);
253
+    }
254
+    this.adminid = adminid;
249 255
     this.getMyInformation(adminid);
250 256
     this.getMyOrganazition(adminid);
251 257
     this.getMyInforName(adminid);
@@ -376,7 +382,7 @@ export default {
376 382
   .myBox {
377 383
     margin: 0.8125rem 0;
378 384
     background: #fff;
379
-    > a:last-child>div {
385
+    > a:last-child > div {
380 386
       border: none;
381 387
     }
382 388
     > div:last-child {

+ 17 - 7
src/pages/my/modifyingName.vue 查看文件

@@ -3,10 +3,10 @@
3 3
     <div class="modifyingNameTitle">
4 4
       <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
5 5
       <span class="titleName">修改姓名</span>
6
-      <span @click="saveName">保存</span>
6
+      <span @click="spread" id="copy">修改</span>
7 7
     </div>
8 8
     <div class="nameBox">
9
-      <van-field v-model="name" placeholder="请填写姓名" />
9
+      <van-field v-model="name" placeholder="请填写姓名" :readonly="readonly" />
10 10
     </div>
11 11
   </div>
12 12
 </template>
@@ -16,7 +16,8 @@ export default {
16 16
   data() {
17 17
     return {
18 18
       name: "",
19
-      admin_user_id: 0
19
+      admin_user_id: 0,
20
+      readonly: true
20 21
     };
21 22
   },
22 23
   methods: {
@@ -34,6 +35,16 @@ export default {
34 35
         }
35 36
       });
36 37
     },
38
+    spread() {
39
+      var spancontent = document.getElementById("copy").innerHTML;
40
+      if (spancontent == "修改") {
41
+        this.readonly = false;
42
+        document.getElementById("copy").innerHTML = "保存";
43
+      }
44
+      if (spancontent == "保存") {
45
+        this.saveName();
46
+      }
47
+    },
37 48
     saveName() {
38 49
       if (this.name === "") {
39 50
         this.$toast("姓名不能为空");
@@ -66,7 +77,7 @@ export default {
66 77
     display: flex;
67 78
     align-items: center;
68 79
     justify-content: space-between;
69
-    span{
80
+    span {
70 81
       font-size: 1rem;
71 82
     }
72 83
   }
@@ -85,11 +96,10 @@ export default {
85 96
 }
86 97
 </style>
87 98
 
88
-
89 99
 <style lang="scss">
90 100
 .page_modifyingName {
91
-  .nameBox{
92
-    .van-field__control{
101
+  .nameBox {
102
+    .van-field__control {
93 103
       font-size: 1rem;
94 104
     }
95 105
   }

+ 17 - 5
src/pages/my/personalSign.vue 查看文件

@@ -3,7 +3,7 @@
3 3
     <div class="personalSignTitle">
4 4
       <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
5 5
       <span class="titleName">个性签名</span>
6
-      <span @click="SaveMessage">保存</span>
6
+       <span @click="spread" id="copy">修改</span>
7 7
     </div>
8 8
     <div class="nameBox">
9 9
       <van-field
@@ -13,6 +13,7 @@
13 13
         type="textarea"
14 14
         placeholder="请填写个性签名"
15 15
         maxlength="20"
16
+        :readonly="readonly"
16 17
       />
17 18
     </div>
18 19
   </div>
@@ -23,7 +24,8 @@ export default {
23 24
   data() {
24 25
     return {
25 26
       message: "",
26
-      admin_user_id: ""
27
+      admin_user_id: "",
28
+      readonly: true
27 29
     };
28 30
   },
29 31
   methods: {
@@ -36,6 +38,16 @@ export default {
36 38
         }
37 39
       });
38 40
     },
41
+    spread() {
42
+      var spancontent = document.getElementById("copy").innerHTML;
43
+      if (spancontent == "修改") {
44
+        this.readonly = false;
45
+        document.getElementById("copy").innerHTML = "保存";
46
+      }
47
+      if (spancontent == "保存") {
48
+        this.SaveMessage();
49
+      }
50
+    },
39 51
     SaveMessage() {
40 52
       const params = {
41 53
         id: this.admin_user_id,
@@ -71,7 +83,7 @@ export default {
71 83
     display: flex;
72 84
     align-items: center;
73 85
     justify-content: space-between;
74
-    span{
86
+    span {
75 87
       font-size: 1rem;
76 88
     }
77 89
   }
@@ -92,8 +104,8 @@ export default {
92 104
 
93 105
 <style lang="scss">
94 106
 .page_personalSign {
95
-  .nameBox{
96
-    .van-field__control{
107
+  .nameBox {
108
+    .van-field__control {
97 109
       font-size: 1rem;
98 110
     }
99 111
   }

+ 4 - 4
src/pages/patientManagement/patientManagement.vue 查看文件

@@ -294,10 +294,10 @@ export default {
294 294
 <style lang="scss">
295 295
 .page_patientManagement {
296 296
   .searchBox {
297
-    .van-search{
297
+    .van-search {
298 298
       border-radius: 1.875rem;
299 299
     }
300
-    .van-search__content{
300
+    .van-search__content {
301 301
       border-radius: 1.875rem;
302 302
     }
303 303
     .van-cell__value {
@@ -318,12 +318,12 @@ export default {
318 318
       padding-top: 2.75rem;
319 319
     }
320 320
   }
321
-  .van-tab--active{
321
+  .van-tab--active {
322 322
     font-size: 1rem;
323 323
     color: #000;
324 324
     font-weight: bold;
325 325
   }
326
-  .van-tabs__line{
326
+  .van-tabs__line {
327 327
     background-color: #5b98ff;
328 328
   }
329 329
 }

+ 1 - 2
src/router/index.js 查看文件

@@ -285,7 +285,7 @@ export default new Router({
285 285
       name: 'longdialysis',
286 286
       component: () => import('@/pages/allLongDialysis/index')
287 287
     },
288
-    //,
288
+    //, 
289 289
     {
290 290
       path: '/alldoctoradvice',
291 291
       name: '/alldoctoradvice',
@@ -333,7 +333,6 @@ export default new Router({
333 333
       path: '/editbed',
334 334
       name: 'editbed',
335 335
       component: () => import('@/pages/configureCenter/editBed')
336
-
337 336
     },
338 337
     {
339 338
       path: '/allinspection',