Browse Source

龙岗二院需求

XMLWAN 3 years ago
parent
commit
38f13d75b8

+ 2 - 1
.babelrc View File

@@ -16,7 +16,7 @@
16 16
     "transform-runtime",
17 17
     [
18 18
       "import",
19
-      { "libraryName": "vant", "libraryDirectory": "es", "style": true }
19
+      { "libraryName": "vant", "libraryDirectory": "es", "style": true },
20 20
     ]
21 21
   ],
22 22
   "env": {
@@ -29,4 +29,5 @@
29 29
       ]
30 30
     }
31 31
   }
32
+  
32 33
 }

+ 17 - 11
package-lock.json View File

@@ -141,21 +141,21 @@
141 141
       }
142 142
     },
143 143
     "@babel/helper-module-imports": {
144
-      "version": "7.8.3",
145
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz",
146
-      "integrity": "sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg==",
144
+      "version": "7.10.1",
145
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.1.tgz",
146
+      "integrity": "sha512-SFxgwYmZ3HZPyZwJRiVNLRHWuW2OgE5k2nrVs6D9Iv4PPnXVffuEHy83Sfx/l4SqF+5kyJXjAyUmrG7tNm+qVg==",
147 147
       "dev": true,
148 148
       "requires": {
149
-        "@babel/types": "^7.8.3"
149
+        "@babel/types": "^7.10.1"
150 150
       },
151 151
       "dependencies": {
152 152
         "@babel/types": {
153
-          "version": "7.8.7",
154
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.7.tgz",
155
-          "integrity": "sha512-k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw==",
153
+          "version": "7.10.1",
154
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.1.tgz",
155
+          "integrity": "sha512-L2yqUOpf3tzlW9GVuipgLEcZxnO+96SzR6fjXMuxxNkIgFJ5+07mHCZ+HkHqaeZu8+3LKnNJJ1bKbjBETQAsrA==",
156 156
           "dev": true,
157 157
           "requires": {
158
-            "esutils": "^2.0.2",
158
+            "@babel/helper-validator-identifier": "^7.10.1",
159 159
             "lodash": "^4.17.13",
160 160
             "to-fast-properties": "^2.0.0"
161 161
           }
@@ -183,6 +183,12 @@
183 183
         "@babel/types": "7.0.0-beta.44"
184 184
       }
185 185
     },
186
+    "@babel/helper-validator-identifier": {
187
+      "version": "7.10.1",
188
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
189
+      "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==",
190
+      "dev": true
191
+    },
186 192
     "@babel/highlight": {
187 193
       "version": "7.0.0-beta.44",
188 194
       "resolved": "http://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0-beta.44.tgz",
@@ -15661,9 +15667,9 @@
15661 15667
       "integrity": "sha1-woMOnZlKX+zSJhUGR3wnB/5Yl1Y="
15662 15668
     },
15663 15669
     "vant": {
15664
-      "version": "2.5.5",
15665
-      "resolved": "https://registry.npmjs.org/vant/-/vant-2.5.5.tgz",
15666
-      "integrity": "sha512-w7APepClXcEMFJvvYsJkNDWCCb+a5SR9eAMMIYM/1VCwn7r7AxoAtJSCaZsmw3vhSxnMSnM/+Ftz7t3o0eoK4Q==",
15670
+      "version": "2.8.4",
15671
+      "resolved": "https://registry.npmjs.org/vant/-/vant-2.8.4.tgz",
15672
+      "integrity": "sha512-mWjsPctQGaUtI9FOWPFrgrx3oTz1Mw64XikO2BfkobnoEBH50FCdsf2DB3raMMh4OcO6YS1KlM76wJwcHVbypQ==",
15667 15673
       "requires": {
15668 15674
         "@babel/runtime": "7.x",
15669 15675
         "@vant/icons": "1.2.1",

+ 1 - 1
package.json View File

@@ -28,7 +28,7 @@
28 28
     "mint-ui": "^2.2.13",
29 29
     "moment": "^2.24.0",
30 30
     "print-js": "^1.0.54",
31
-    "vant": "^2.5.5",
31
+    "vant": "^2.8.4",
32 32
     "vue": "^2.5.2",
33 33
     "vue-cropper": "^0.4.9",
34 34
     "vue-cropperjs": "^3.0.0",

+ 21 - 21
src/main.js View File

@@ -1,18 +1,18 @@
1 1
 // The Vue build version to load with the `import` command
2 2
 // (runtime-only or standalone) has been set in webpack.base.conf with an alias.
3
-import Vue from "vue";
4
-import App from "./App";
5
-import router from "./router";
6
-import MintUI from "mint-ui";
7
-import store from "./store";
8
-import "mint-ui/lib/style.css";
9
-import "./assets/styles/iconfont.css";
10
-import "./permission";
3
+import Vue from 'vue'
4
+import App from './App'
5
+import router from './router'
6
+import MintUI from 'mint-ui'
7
+import store from './store'
8
+import 'mint-ui/lib/style.css'
9
+import './assets/styles/iconfont.css'
10
+import './permission'
11 11
 
12 12
 // import "lib-flexible";
13 13
 
14
-import "@/styles/reset.scss";
15
-import "@/styles/variables.scss";
14
+import '@/styles/reset.scss'
15
+import '@/styles/variables.scss'
16 16
 // import "@/styles/style.scss";
17 17
 // eslint-disable-next-line import/no-duplicates
18 18
 // import Vant from "vant";
@@ -20,9 +20,9 @@ import "@/styles/variables.scss";
20 20
 // import "vant/lib/icon/local.css";
21 21
 // import '@/styles/vant-css/index.css'
22 22
 // import "@/styles/media.scss";
23
-import ElementUI from "element-ui";
24
-import "element-ui/lib/theme-chalk/index.css";
25
-import pinyin from "js-pinyin";
23
+import ElementUI from 'element-ui'
24
+import 'element-ui/lib/theme-chalk/index.css'
25
+import pinyin from 'js-pinyin'
26 26
 // import "./libs/rem.js";
27 27
 // import "./libs/dpr.js";
28 28
 import {
@@ -62,7 +62,7 @@ import {
62 62
   Overlay,
63 63
   Loading
64 64
   // eslint-disable-next-line no-irregular-whitespace,import/no-duplicates
65
-} from "vant";
65
+} from 'vant'
66 66
 Vue.use(DropdownMenu)
67 67
   .use(DropdownItem)
68 68
   .use(Tab)
@@ -97,7 +97,7 @@ Vue.use(DropdownMenu)
97 97
   .use(RadioGroup)
98 98
   .use(Radio)
99 99
   .use(Overlay)
100
-  .use(Loading);
100
+  .use(Loading)
101 101
 // import "@/lib/flexible.js";
102 102
 
103 103
 // main.js
@@ -108,21 +108,21 @@ Vue.use(DropdownMenu)
108 108
 // Vue.use(AlertPlugin)
109 109
 // Vue.use(ToastPlugin)
110 110
 
111
-Vue.use(MintUI);
111
+Vue.use(MintUI)
112 112
 // Vue.use(Vant)
113
-Vue.use(ElementUI);
114
-Vue.config.productionTip = false;
113
+Vue.use(ElementUI)
114
+Vue.config.productionTip = false
115 115
 
116 116
 /* eslint-disable no-new */
117 117
 var vue = new Vue({
118
-  el: "#app",
118
+  el: '#app',
119 119
   router,
120 120
   store,
121 121
   components: {
122 122
     App
123 123
   },
124
-  template: "<App/>"
125
-});
124
+  template: '<App/>'
125
+})
126 126
 export default vue
127 127
 
128 128
 // eslint-disable-next-line no-undef

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

@@ -430,7 +430,7 @@ export default {
430 430
     },
431 431
     getDoctor (id) {
432 432
       for (let i = 0; i < this.doctor.length; i++) {
433
-        if ((this.doctor[i].admin_user_id = id)) {
433
+        if ((this.doctor[i].admin_user_id == id)) {
434 434
           return this.doctor[i].user_name
435 435
         }
436 436
       }

+ 188 - 187
src/pages/doctorAdvice/components/Scheduling.vue View File

@@ -115,46 +115,46 @@ import {
115 115
   getPatientDetail,
116 116
   getScheduling,
117 117
   DeleteScheduling
118
-} from "@/api/patient/patient";
119
-import { uParseTime } from "@/utils/tools";
120
-import Vue from "vue";
121
-import { Dialog } from "vant";
122
-const moment = require("moment");
118
+} from '@/api/patient/patient'
119
+import { uParseTime } from '@/utils/tools'
120
+import Vue from 'vue'
121
+import { Dialog } from 'vant'
122
+const moment = require('moment')
123 123
 export default {
124 124
   props: {
125 125
     active: Number,
126 126
     schedulingId: String
127 127
   },
128
-  data() {
128
+  data () {
129 129
     return {
130 130
       newShow: false,
131 131
       typeShow: false,
132 132
       startShow: false,
133 133
       endShow: false,
134
-      type: "全部",
134
+      type: '全部',
135 135
       types: 0,
136 136
       columns: [
137
-        "HD",
138
-        "HDF",
139
-        "HD+HP",
140
-        "HP",
141
-        "HF",
142
-        "SCUF",
143
-        "IUF",
144
-        "HFHD",
145
-        "HFHD+HP",
146
-        "PHF",
147
-        "HFR",
148
-        "HDF+HP",
149
-        "CRRT",
150
-        "腹水回输"
137
+        'HD',
138
+        'HDF',
139
+        'HD+HP',
140
+        'HP',
141
+        'HF',
142
+        'SCUF',
143
+        'IUF',
144
+        'HFHD',
145
+        'HFHD+HP',
146
+        'PHF',
147
+        'HFR',
148
+        'HDF+HP',
149
+        'CRRT',
150
+        '腹水回输'
151 151
       ],
152
-      startTime: "请选择",
153
-      endTime: "请选择",
152
+      startTime: '请选择',
153
+      endTime: '请选择',
154 154
       minDate: new Date(1970, 0, 1),
155 155
       maxDate: new Date(2025, 10, 1),
156 156
       currentDate: new Date(),
157
-      actions: [{ name: "查看全部" }, { name: "全部删除" }],
157
+      actions: [{ name: '查看全部' }, { name: '全部删除' }],
158 158
       showOne: true,
159 159
       showTwo: false,
160 160
       limit: 10,
@@ -163,70 +163,70 @@ export default {
163 163
       loading: false,
164 164
       finished: false,
165 165
       list: [],
166
-      patient_id: "",
166
+      patient_id: '',
167 167
       scheduLing: [],
168 168
       list: [],
169 169
       id: 0,
170 170
       index: 0,
171 171
       immediateCheck: false,
172 172
       flag: true
173
-    };
173
+    }
174 174
   },
175 175
   methods: {
176
-    onCancel() {
177
-      this.typeShow = false;
176
+    onCancel () {
177
+      this.typeShow = false
178 178
     },
179
-    onConfirm(value) {
180
-      this.page = 1;
181
-      if (value === "全部") {
182
-        this.types = 0;
179
+    onConfirm (value) {
180
+      this.page = 1
181
+      if (value === '全部') {
182
+        this.types = 0
183 183
       }
184
-      if (value === "HD") {
185
-        this.types = 1;
184
+      if (value === 'HD') {
185
+        this.types = 1
186 186
       }
187
-      if (value === "HDF") {
188
-        this.types = 2;
187
+      if (value === 'HDF') {
188
+        this.types = 2
189 189
       }
190
-      if (value === "HD+HP") {
191
-        this.types = 3;
190
+      if (value === 'HD+HP') {
191
+        this.types = 3
192 192
       }
193
-      if (value === "HP") {
194
-        this.types = 4;
193
+      if (value === 'HP') {
194
+        this.types = 4
195 195
       }
196
-      if (value === "HF") {
197
-        this.types = 5;
196
+      if (value === 'HF') {
197
+        this.types = 5
198 198
       }
199
-      if (value === "SCUF") {
200
-        this.types = 6;
199
+      if (value === 'SCUF') {
200
+        this.types = 6
201 201
       }
202
-      if (value === "IUF") {
203
-        this.types = 7;
202
+      if (value === 'IUF') {
203
+        this.types = 7
204 204
       }
205
-      if (value === "HFHD") {
206
-        this.types = 8;
205
+      if (value === 'HFHD') {
206
+        this.types = 8
207 207
       }
208
-      if (value === "HFHD+HP") {
209
-        this.types = 9;
208
+      if (value === 'HFHD+HP') {
209
+        this.types = 9
210 210
       }
211
-      if (value === "PHF") {
212
-        this.types = 10;
211
+      if (value === 'PHF') {
212
+        this.types = 10
213 213
       }
214
-      if (value === "HFR") {
215
-        this.types = 11;
214
+      if (value === 'HFR') {
215
+        this.types = 11
216 216
       }
217 217
 
218
-      if (value === "HDF+HP") {
219
-        this.types = 12;
218
+      if (value === 'HDF+HP') {
219
+        this.types = 12
220 220
       }
221
-      if (value === "CRRT") {
222
-        this.types = 13;
221
+      if (value === 'CRRT') {
222
+        this.types = 13
223 223
       }
224
-      if (value === "腹水回输") {
225
-        this.types = 14;
224
+      if (value === '腹水回输') {
225
+        this.types = 14
226 226
       }
227
-      this.type = value;
228
-      this.typeShow = false;
229
-      this.scheduLing = [];
227
+      this.type = value
228
+      this.typeShow = false
229
+      this.scheduLing = []
230 230
       this.getScheduling(
231 231
         this.patient_id,
232 232
         this.limit,
@@ -234,22 +234,22 @@ export default {
234 234
         this.startTime,
235 235
         this.endTime,
236 236
         this.types
237
-      );
237
+      )
238 238
     },
239
-    getstartTime(value) {
240
-      this.page = 1;
241
-      let year = value.getFullYear();
242
-      let month = value.getMonth() + 1;
243
-      let day = value.getDate();
239
+    getstartTime (value) {
240
+      this.page = 1
241
+      let year = value.getFullYear()
242
+      let month = value.getMonth() + 1
243
+      let day = value.getDate()
244 244
       if (month >= 1 && month <= 9) {
245
-        month = `0${month}`;
245
+        month = `0${month}`
246 246
       }
247 247
       if (day >= 1 && day <= 9) {
248
-        day = `0${day}`;
248
+        day = `0${day}`
249 249
       }
250 250
 
251
-      this.startTime = `${year}-${month}-${day}`;
252
-      this.scheduLing = [];
251
+      this.startTime = `${year}-${month}-${day}`
252
+      this.scheduLing = []
253 253
       this.getScheduling(
254 254
         this.patient_id,
255 255
         this.limit,
@@ -257,23 +257,23 @@ export default {
257 257
         this.startTime,
258 258
         this.endTime,
259 259
         this.types
260
-      );
261
-      this.startShow = false;
260
+      )
261
+      this.startShow = false
262 262
     },
263
-    getstartTime2(value) {
264
-      this.page = 1;
265
-      let year = value.getFullYear();
266
-      let month = value.getMonth() + 1;
267
-      let day = value.getDate();
263
+    getstartTime2 (value) {
264
+      this.page = 1
265
+      let year = value.getFullYear()
266
+      let month = value.getMonth() + 1
267
+      let day = value.getDate()
268 268
       if (month >= 1 && month <= 9) {
269
-        month = `0${month}`;
269
+        month = `0${month}`
270 270
       }
271 271
       if (day >= 1 && day <= 9) {
272
-        day = `0${day}`;
272
+        day = `0${day}`
273 273
       }
274 274
 
275
-      this.endTime = `${year}-${month}-${day}`;
276
-      this.scheduLing = [];
275
+      this.endTime = `${year}-${month}-${day}`
276
+      this.scheduLing = []
277 277
       this.getScheduling(
278 278
         this.patient_id,
279 279
         this.limit,
@@ -281,28 +281,28 @@ export default {
281 281
         this.startTime,
282 282
         this.endTime,
283 283
         this.types
284
-      );
285
-      this.endShow = false;
284
+      )
285
+      this.endShow = false
286 286
     },
287
-    getPatientDetail(patientid) {
287
+    getPatientDetail (patientid) {
288 288
       getPatientDetail(patientid).then(response => {
289 289
         if (response.data.state === 1) {
290
-          var patientDetail = response.data.data.patientDetail;
290
+          var patientDetail = response.data.data.patientDetail
291 291
           if (patientDetail.blood_patients == 0) {
292
-            this.scheduLing = [];
293
-            this.showOne = false;
294
-            this.showTwo = true;
292
+            this.scheduLing = []
293
+            this.showOne = false
294
+            this.showTwo = true
295 295
           }
296 296
           if (patientDetail.blood_patients == 1) {
297
-            this.showOne = true;
298
-            this.showTwo = false;
297
+            this.showOne = true
298
+            this.showTwo = false
299 299
           }
300 300
           // console.log('病人详情', patientDetail)
301
-          this.patientName = patientDetail.name;
301
+          this.patientName = patientDetail.name
302 302
         }
303
-      });
303
+      })
304 304
     },
305
-    getScheduling(id) {
305
+    getScheduling (id) {
306 306
       getScheduling(
307 307
         id,
308 308
         this.limit,
@@ -312,74 +312,74 @@ export default {
312 312
         this.types
313 313
       ).then(response => {
314 314
         if (response.data.state === 1) {
315
-          var scheduling = response.data.data.scheduling;
315
+          var scheduling = response.data.data.scheduling
316 316
           for (let i = 0; i < scheduling.length; i++) {
317 317
             if (scheduling[i].schedule_type === 1) {
318
-              scheduling[i].schedule_type = "上午";
318
+              scheduling[i].schedule_type = '上午'
319 319
             }
320 320
             if (scheduling[i].schedule_type === 2) {
321
-              scheduling[i].schedule_type = "中午";
321
+              scheduling[i].schedule_type = '中午'
322 322
             }
323 323
             if (scheduling[i].schedule_type === 3) {
324
-              scheduling[i].schedule_type = "下午";
324
+              scheduling[i].schedule_type = '下午'
325 325
             }
326 326
 
327 327
             if (scheduling[i].mode_id === 1) {
328
-              scheduling[i].mode_id = "HD";
328
+              scheduling[i].mode_id = 'HD'
329 329
             }
330 330
             if (scheduling[i].mode_id === 2) {
331
-              scheduling[i].mode_id = "HDF";
331
+              scheduling[i].mode_id = 'HDF'
332 332
             }
333 333
             if (scheduling[i].mode_id === 3) {
334
-              scheduling[i].mode_id = "HD+HP";
334
+              scheduling[i].mode_id = 'HD+HP'
335 335
             }
336 336
             if (scheduling[i].mode_id === 4) {
337
-              scheduling[i].mode_id = "HP";
337
+              scheduling[i].mode_id = 'HP'
338 338
             }
339 339
             if (scheduling[i].mode_id === 5) {
340
-              scheduling[i].mode_id = "HF";
340
+              scheduling[i].mode_id = 'HF'
341 341
             }
342 342
             if (scheduling[i].mode_id === 6) {
343
-              scheduling[i].mode_id = "SCUF";
343
+              scheduling[i].mode_id = 'SCUF'
344 344
             }
345 345
             if (scheduling[i].mode_id === 7) {
346
-              scheduling[i].mode_id = "IUF";
346
+              scheduling[i].mode_id = 'IUF'
347 347
             }
348 348
             if (scheduling[i].mode_id === 8) {
349
-              scheduling[i].mode_id = "HFHD";
349
+              scheduling[i].mode_id = 'HFHD'
350 350
             }
351 351
             if (scheduling[i].mode_id === 9) {
352
-              scheduling[i].mode_id = "HFHD+HP";
352
+              scheduling[i].mode_id = 'HFHD+HP'
353 353
             }
354 354
             if (scheduling[i].mode_id === 10) {
355
-              scheduling[i].mode_id = "PHF";
355
+              scheduling[i].mode_id = 'PHF'
356 356
             }
357 357
             if (scheduling[i].mode_id === 11) {
358
-              scheduling[i].mode_id = "HFR";
358
+              scheduling[i].mode_id = 'HFR'
359 359
             }
360 360
             if (scheduling[i].mode_id === 12) {
361
-              scheduling[i].mode_id = "HDF+HP";
361
+              scheduling[i].mode_id = 'HDF+HP'
362 362
             }
363 363
             if (scheduling[i].mode_id === 13) {
364
-              scheduling[i].mode_id = "CRRT";
364
+              scheduling[i].mode_id = 'CRRT'
365 365
             }
366 366
             if (scheduling[i].mode_id === 14) {
367
-              scheduling[i].mode_id = "腹水回输";
367
+              scheduling[i].mode_id = '腹水回输'
368 368
             }
369 369
           }
370
-          let arr = this.scheduLing;
371
-          arr.push(...scheduling);
370
+          let arr = this.scheduLing
371
+          arr.push(...scheduling)
372 372
           // console.log('班次', scheduling)
373
-          this.scheduLing = arr;
374
-          var total = response.data.data.total;
373
+          this.scheduLing = arr
374
+          var total = response.data.data.total
375 375
           // console.log('total', total)
376
-          this.total = total;
377
-          this.loading = false;
376
+          this.total = total
377
+          this.loading = false
378 378
           // console.log('1823792742736487362847623876执行这里')
379 379
         }
380
-      });
380
+      })
381 381
     },
382
-    getScheduling1(id) {
382
+    getScheduling1 (id) {
383 383
       getScheduling(
384 384
         id,
385 385
         this.limit,
@@ -389,76 +389,76 @@ export default {
389 389
         this.types
390 390
       ).then(response => {
391 391
         if (response.data.state === 1) {
392
-          var scheduling = response.data.data.scheduling;
392
+          var scheduling = response.data.data.scheduling
393 393
           for (let i = 0; i < scheduling.length; i++) {
394 394
             if (scheduling[i].schedule_type === 1) {
395
-              scheduling[i].schedule_type = "上午";
395
+              scheduling[i].schedule_type = '上午'
396 396
             }
397 397
             if (scheduling[i].schedule_type === 2) {
398
-              scheduling[i].schedule_type = "中午";
398
+              scheduling[i].schedule_type = '中午'
399 399
             }
400 400
             if (scheduling[i].schedule_type === 3) {
401
-              scheduling[i].schedule_type = "下午";
401
+              scheduling[i].schedule_type = '下午'
402 402
             }
403 403
 
404 404
             if (scheduling[i].mode_id === 1) {
405
-              scheduling[i].mode_id = "HD";
405
+              scheduling[i].mode_id = 'HD'
406 406
             }
407 407
             if (scheduling[i].mode_id === 2) {
408
-              scheduling[i].mode_id = "HDF";
408
+              scheduling[i].mode_id = 'HDF'
409 409
             }
410 410
             if (scheduling[i].mode_id === 3) {
411
-              scheduling[i].mode_id = "HD+HP";
411
+              scheduling[i].mode_id = 'HD+HP'
412 412
             }
413 413
             if (scheduling[i].mode_id === 4) {
414
-              scheduling[i].mode_id = "HP";
414
+              scheduling[i].mode_id = 'HP'
415 415
             }
416 416
             if (scheduling[i].mode_id === 5) {
417
-              scheduling[i].mode_id = "HF";
417
+              scheduling[i].mode_id = 'HF'
418 418
             }
419 419
             if (scheduling[i].mode_id === 6) {
420
-              scheduling[i].mode_id = "SCUF";
420
+              scheduling[i].mode_id = 'SCUF'
421 421
             }
422 422
             if (scheduling[i].mode_id === 7) {
423
-              scheduling[i].mode_id = "IUF";
423
+              scheduling[i].mode_id = 'IUF'
424 424
             }
425 425
             if (scheduling[i].mode_id === 8) {
426
-              scheduling[i].mode_id = "HFHD";
426
+              scheduling[i].mode_id = 'HFHD'
427 427
             }
428 428
             if (scheduling[i].mode_id === 9) {
429
-              scheduling[i].mode_id = "HFHD+HP";
429
+              scheduling[i].mode_id = 'HFHD+HP'
430 430
             }
431 431
             if (scheduling[i].mode_id === 10) {
432
-              scheduling[i].mode_id = "PHF";
432
+              scheduling[i].mode_id = 'PHF'
433 433
             }
434 434
             if (scheduling[i].mode_id === 11) {
435
-              scheduling[i].mode_id = "HFR";
435
+              scheduling[i].mode_id = 'HFR'
436 436
             }
437 437
             if (scheduling[i].mode_id === 12) {
438
-              scheduling[i].mode_id = "HDF+HP";
438
+              scheduling[i].mode_id = 'HDF+HP'
439 439
             }
440 440
             if (scheduling[i].mode_id === 13) {
441
-              scheduling[i].mode_id = "CRRT";
441
+              scheduling[i].mode_id = 'CRRT'
442 442
             }
443 443
             if (scheduling[i].mode_id === 14) {
444
-              scheduling[i].mode_id = "腹水回输";
444
+              scheduling[i].mode_id = '腹水回输'
445 445
             }
446 446
           }
447 447
 
448
-          this.scheduLing = scheduling;
449
-          var total = response.data.data.total;
450
-          this.total = total;
451
-          this.loading = false;
448
+          this.scheduLing = scheduling
449
+          var total = response.data.data.total
450
+          this.total = total
451
+          this.loading = false
452 452
         }
453
-      });
453
+      })
454 454
     },
455
-    getTime(time) {
455
+    getTime (time) {
456 456
       // return uParseTime(time, "{y}-{m}-{d} {h}:{i}:{s}");
457
-      return uParseTime(time, "{y}-{m}-{d}");
457
+      return uParseTime(time, '{y}-{m}-{d}')
458 458
     },
459
-    onLoad() {
459
+    onLoad () {
460 460
       setTimeout(() => {
461
-        this.page++;
461
+        this.page++
462 462
         // console.log(this.page)
463 463
         if (this.page <= Math.ceil(this.total / 10)) {
464 464
           this.getScheduling(
@@ -468,68 +468,69 @@ export default {
468 468
             this.limit,
469 469
             this.page,
470 470
             this.types
471
-          );
471
+          )
472 472
         } else {
473
-          this.loading = false;
474
-          this.finished = true;
473
+          this.loading = false
474
+          this.finished = true
475 475
         }
476
-      }, 3000);
476
+      }, 3000)
477 477
     },
478
-    toEditSchduling(id) {
479
-      var patientid = this.$route.query.patientid;
478
+    toEditSchduling (id) {
479
+      var patientid = this.$route.query.patientid
480 480
       this.$router.push(
481
-        "/editScheduling?id=" +
481
+        '/editScheduling?id=' +
482 482
           id +
483
-          "&patientid=" +
483
+          '&patientid=' +
484 484
           patientid +
485
-          "&active=" +
485
+          '&active=' +
486 486
           this.active
487
-      );
487
+      )
488 488
     },
489
-    toDelete(id, index) {
490
-      this.id = id;
491
-      this.index = index;
492
-      this.newShow = true;
489
+    toDelete (id, index) {
490
+      this.id = id
491
+      this.index = index
492
+      this.newShow = true
493 493
     },
494
-    onCancelOne(value) {
495
-      if (value.name == "查看全部") {
496
-        var patientid = this.$route.query.patientid;
494
+    onCancelOne (value) {
495
+      if (value.name == '查看全部') {
496
+        var patientid = this.$route.query.patientid
497 497
         this.$router.push(
498
-          "/editScheduling?id=" +
498
+          '/editScheduling?id=' +
499 499
             this.id +
500
-            "&patientid=" +
500
+            '&patientid=' +
501 501
             patientid +
502
-            "&active=" +
502
+            '&active=' +
503 503
             this.active
504
-        );
504
+        )
505 505
       }
506
-      if (value.name == "全部删除") {
507
-        this.DeleteScheduling(this.id, this.index);
506
+      if (value.name == '全部删除') {
507
+        this.DeleteScheduling(this.id, this.index)
508 508
       }
509 509
     },
510
-    DeleteScheduling(id, index) {
510
+    DeleteScheduling (id, index) {
511 511
       Dialog.confirm({
512
-        title: "删除提示!",
513
-        message: "确认删除该条信息吗?,删除后将无法恢复!"
512
+        title: '删除提示!',
513
+        message: '确认删除该条信息吗?,删除后将无法恢复!'
514 514
       }).then(() => {
515 515
         DeleteScheduling(id).then(response => {
516 516
           if (response.data.state === 1) {
517
-            var msg = response.data.data.msg;
518
-            console.log("msg", msg);
519
-            this.scheduLing.splice(index, 1);
520
-            this.newShow = false;
517
+            var msg = response.data.data.msg
518
+            console.log('msg', msg)
519
+            this.scheduLing.splice(index, 1)
520
+            this.newShow = false
521 521
           }
522
-        });
523
-      });
522
+        })
523
+      })
524 524
     }
525
+
525 526
   },
526
-  created() {
527
-    var patientid = this.$route.query.patientid;
528
-    this.getPatientDetail(patientid);
529
-    this.getScheduling(patientid);
530
-    this.patient_id = patientid;
527
+  created () {
528
+    var patientid = this.$route.query.patientid
529
+    this.getPatientDetail(patientid)
530
+    this.getScheduling(patientid)
531
+    this.patient_id = patientid
531 532
   }
532
-};
533
+}
533 534
 </script>
534 535
 
535 536
 <style lang="scss" scoped>

+ 10 - 1
src/pages/main/dialog/subMenu/MsgTip.vue View File

@@ -80,6 +80,7 @@
80 80
           <span class="text" id="txms">{{ weight_loss }}</span>
81 81
         </div>
82 82
       </div>
83
+
83 84
       <div class="item" style="display:block;">
84 85
         <div class="name" style="width:100%;text-align:left;line-height:1.5rem;font-size:0.7rem;" for="txms">上次透后称重(kg)<span style="text-align:right;float: right;color:#ec6618;">{{getLastAfterWeight(last_record)}}</span></div>
85 86
         <div class="content" style="margin-top:5px;margin-left:0;">
@@ -110,9 +111,15 @@ export default {
110 111
   created () {
111 112
     if (this.predialysis.weight_before > 0 && this.last_record.weight_after > 0) {
112 113
       this.add_weight = parseFloat(
113
-        (this.predialysis.weight_before - this.predialysis.additional_weight) - (this.last_record.weight_after - this.last_predialysis.additional_weight)
114
+        (this.predialysis.weight_before - this.predialysis.additional_weight) - (this.last_record.weight_after - this.last_record.additional_weight)
114 115
       ).toFixed(2)
115 116
     }
117
+    // var weightbefor = parseFloat(this.predialysis.weight_before - this.predialysis.additional_weight)
118
+    // console.log('aa', weightbefor)
119
+    // var weightafter = parseFloat(this.last_record.weight_after - this.last_record.additional_weight)
120
+    // console.log('hh', this.last_record.weight_after, 'ooo', this.last_record.additional_weight)
121
+    // console.log('bbb', weightafter)
122
+    // console.log('this.add_weight', this.add_weight)
116 123
     let loss = ''
117 124
     if (this.predialysis.weight_before > 0 && this.record.weight_after > 0) {
118 125
       loss = parseFloat(this.predialysis.weight_before - this.record.weight_after).toFixed(2)
@@ -176,6 +183,7 @@ export default {
176 183
       }
177 184
     },
178 185
     getBeforeWeight (predialysis) {
186
+      console.log('透前沉重------', predialysis)
179 187
       if (predialysis.id > 0) {
180 188
         if (predialysis.weight_before > 0) {
181 189
           return parseFloat(predialysis.weight_before - predialysis.additional_weight).toFixed(1)
@@ -194,6 +202,7 @@ export default {
194 202
       }
195 203
     },
196 204
     getLastAfterWeight (last_record) {
205
+      console.log('上次透后沉重', last_record)
197 206
       if (last_record.id > 0) {
198 207
         if (last_record.weight_after > 0) {
199 208
           let additional_weight = 0

+ 23 - 3
src/pages/main/dialysis/AdviceTable.vue View File

@@ -1482,6 +1482,7 @@ import {
1482 1482
 } from "@/api/patient/patient";
1483 1483
 import { uParseTime } from "@/utils/tools";
1484 1484
 import { Dialog } from "vant";
1485
+import { GetAllStaff} from "@/api/admin_user";
1485 1486
 const moment = require("moment");
1486 1487
 export default {
1487 1488
   props: {
@@ -1721,10 +1722,11 @@ export default {
1721 1722
     },
1722 1723
     getDoctor(id) {
1723 1724
       for (let i = 0; i < this.doctor.length; i++) {
1724
-        if ((this.doctor[i].admin_user_id = id)) {
1725
-          return this.doctor[i].name;
1725
+        if ((this.doctor[i].user_id == id)) {
1726
+          return this.doctor[i].user_name;
1726 1727
         }
1727 1728
       }
1729
+
1728 1730
     },
1729 1731
     Delete(id, index, staff) {
1730 1732
       this.id = id;
@@ -1813,7 +1815,24 @@ export default {
1813 1815
           this.patient_id = patient.id;
1814 1816
          }
1815 1817
       })
1816
-    }
1818
+    },
1819
+    GetAllStaff(){
1820
+      GetAllStaff().then(response=>{
1821
+        if(response.data.state === 1){
1822
+          var admins = response.data.data.admins
1823
+          console.log("admins",admins)
1824
+         let obj = {}
1825
+         let newArr = []
1826
+          newArr = admins.reduce((item, next) => {
1827
+            obj[next.user_id] ? ' ' : obj[next.user_id] = true && item.push(next)
1828
+            return item
1829
+          }, [])
1830
+          console.log("newArr",newArr)
1831
+          this.doctor = newArr
1832
+        }
1833
+      })
1834
+    },
1835
+
1817 1836
   },
1818 1837
   created() {
1819 1838
     var patientid = this.$route.query.patient_id
@@ -1821,6 +1840,7 @@ export default {
1821 1840
     localStorage.setItem("docActive", this.active);
1822 1841
     this.date = this.$route.query.date
1823 1842
     this.patient_name =this.$route.query.patient_name
1843
+    this.GetAllStaff()
1824 1844
   },
1825 1845
   watch: {
1826 1846
     $route(to, from) {

+ 1 - 15
src/pages/main/dialysis/DialysisTab.vue View File

@@ -42,20 +42,6 @@
42 42
 <!--    </div>-->
43 43
 <!--  </div>-->
44 44
   <!-- <div>
45
-    <van-tabs v-model="active" sticky @click="onClick">
46
-      <van-tab title="长期透析处方">
47
-        <long-table></long-table>
48
-      </van-tab>
49
-      <van-tab title="透析记录">
50
-        <record-table></record-table>
51
-      </van-tab>
52
-      <van-tab title="排班信息">
53
-        <schedul-table></schedul-table>
54
-      </van-tab>
55
-      <van-tab title="宣教信息">
56
-         <mission-table></mission-table>
57
-      </van-tab>
58
-    </van-tabs>
59 45
   </div> -->
60 46
 </template>
61 47
 
@@ -173,7 +159,7 @@ export default {
173 159
   }
174 160
   .van-tab{
175 161
     line-height: 1.46rem;
176
-    font-size: 0.46rem;
162
+    font-size: 0.45rem;
177 163
     padding: 0 0.13rem;
178 164
   }
179 165
   .van-tabs__line{

+ 3 - 4
src/pages/main/dialysis/LongTable.vue View File

@@ -1271,21 +1271,20 @@ export default {
1271 1271
          if(response.data.state == 1){
1272 1272
           var patient =  response.data.data.patient
1273 1273
           this.newpatientid = patient.id
1274
-           console.log("newpatientid",this.newpatientid)
1275 1274
            this.GetLongDialysisRecord(this.newpatientid);
1275
+           this.onLoad()
1276 1276
            this.getPatientDetail(this.newpatientid);
1277 1277
          }
1278 1278
       })
1279
-    }
1279
+    },
1280
+
1280 1281
   },
1281 1282
   created() {
1282 1283
     var patient_id = this.$route.query.patient_id
1283
-    console.log("病人ID",patient_id)
1284 1284
     this.getNewPatientId(patient_id)
1285 1285
     this.date = this.$route.query.date
1286 1286
     this.patient_name = this.$route.query.patient_name
1287 1287
     this.blood_access_option = this.$store.getters.blood_access;
1288
-
1289 1288
     this.anticoagulantsSet = this.$store.getters.anticoagulants_set;
1290 1289
     this.replacementWays = this.$store.getters.replacement_ways;
1291 1290
     this.anticoagulantsConfit = this.$store.getters.anticoagulants_confit;

+ 1 - 1
src/pages/main/dialysis/RecordTable.vue View File

@@ -924,7 +924,7 @@ export default {
924 924
     },
925 925
     toToday(date){
926 926
       this.$router.push(
927
-        '/details?patient_id=' + this.patient_id + '&date=' + date + '&patient_name=' + this.patient_name + '&active1=' + 2
927
+        '/details?patient_id=' + this.patientid + '&date=' + date + '&patient_name=' + this.patient_name + '&active1=' + 2
928 928
       )
929 929
     }
930 930
   },

+ 8 - 7
src/pages/main/dialysis/SchedulTable.vue View File

@@ -1,6 +1,6 @@
1 1
 <template>
2 2
   <!-- <div>
3
-    <van-list width="100%" v-model="loading" :finished="finished" @load="onLoad">
3
+    <van-list width="100%" v-model="loading" :finished="finished" @load="onLoad" >
4 4
       <div class="blueBorder"></div>
5 5
       <div class="schedulTable">
6 6
         <div class="tableTit">
@@ -35,6 +35,7 @@
35 35
       <img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/data.jpg" alt />
36 36
     </div>
37 37
   </div> -->
38
+
38 39
   <div class="newScheduling">
39 40
     <div>
40 41
       <div class="toolBox">
@@ -290,7 +291,7 @@ export default {
290 291
       list: [],
291 292
       id: 0,
292 293
       index: 0,
293
-      immediateCheck: false,
294
+      immediateCheck: true,
294 295
       flag: true,
295 296
       date:0,
296 297
       patient_name:"",
@@ -583,7 +584,6 @@ export default {
583 584
     onLoad() {
584 585
       setTimeout(() => {
585 586
         this.page++;
586
-        // console.log(this.page)
587 587
         if (this.page <= Math.ceil(this.total / 10)) {
588 588
           this.getScheduling(
589 589
             this.patient_id,
@@ -635,7 +635,6 @@ export default {
635 635
         DeleteScheduling(id).then(response => {
636 636
           if (response.data.state === 1) {
637 637
             var msg = response.data.data.msg;
638
-            console.log("msg", msg);
639 638
             this.scheduLing.splice(index, 1);
640 639
             this.newShow = false;
641 640
           }
@@ -647,11 +646,13 @@ export default {
647 646
          if(response.data.state == 1){
648 647
           var patient =  response.data.data.patient
649 648
           this.patient_id = patient.id
649
+           this.getScheduling(patient.id);
650 650
           this.getPatientDetail(patient.id);
651
-          this.getScheduling(patient.id);
651
+
652 652
          }
653 653
       })
654
-    }
654
+    },
655
+
655 656
   },
656 657
   created() {
657 658
     var patientid = this.$route.query.patient_id
@@ -660,7 +661,7 @@ export default {
660 661
     this.date = date
661 662
     var patient_name = this.$route.query.patient_name
662 663
     this.patient_name = patient_name
663
-  }
664
+  },
664 665
 };
665 666
 </script>
666 667
 

+ 3 - 3
src/pages/main/records/CaseHistory.vue View File

@@ -22,7 +22,7 @@
22 22
 <!--    </div>-->
23 23
 <!--  </div>-->
24 24
   <div class="newCase">
25
-    <van-tabs v-model="index">
25
+    <van-tabs v-model="index" sticky>
26 26
       <van-tab title="基本信息">
27 27
         <records-tab></records-tab>
28 28
       </van-tab>
@@ -64,8 +64,8 @@ export default {
64 64
       patient: 0
65 65
     }
66 66
   },
67
-  mounted(){
68
-    if(this.$route.query.active2){
67
+  mounted () {
68
+    if (this.$route.query.active2) {
69 69
       this.index = parseInt(this.$route.query.active2)
70 70
     }
71 71
   },