Pārlūkot izejas kodu

Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

See999 4 gadus atpakaļ
vecāks
revīzija
b7420bb93d

+ 1 - 0
src/api/manage.js Parādīt failu

@@ -460,6 +460,7 @@ export function queryInfo(zone, bed, startime, endtime, limit, page) {
460 460
     limit: limit,
461 461
     page: page
462 462
   }
463
+  console.log('params', params)
463 464
   return request({
464 465
     url: '/api/manage/queryinfo',
465 466
     method: 'Get',

+ 7 - 7
src/xt_pages/dialysis/batch_print/batch_print_order_other.vue Parādīt failu

@@ -26,10 +26,10 @@
26 26
               住院号:
27 27
               <div
28 28
                 class="under_line"
29
-                style="width: 50px;text-align: left"
29
+                style="width: 70px;text-align: left"
30 30
                 v-if="record.receive_assessment.admission_number"
31 31
               >{{record.receive_assessment.condition == 1?record.receive_assessment.admission_number:'/'}}</div>
32
-              <div class="under_line" style="width: 50px;" v-else>{{'/'}}</div>
32
+              <div class="under_line" style="width: 70px;" v-else>{{'/'}}</div>
33 33
             </div>
34 34
             <div class="inline_block" style="margin-left:5px;">
35 35
               姓名:
@@ -49,7 +49,7 @@
49 49
               诊断:
50 50
               <div
51 51
                 class="under_line_two"
52
-                style="width: 160px;text-align: left"
52
+                style="width: 150px;text-align: left"
53 53
               >{{record.patient.diagnose}}</div>
54 54
             </div>
55 55
           </div>
@@ -616,7 +616,7 @@
616 616
                 诊断:
617 617
                 <div
618 618
                   class="under_line_two"
619
-                  style="width: 180px;text-align: left"
619
+                  style="width: 150px;text-align: left"
620 620
                 >{{record.patient.diagnose}}</div>
621 621
               </div>
622 622
             </div>
@@ -1135,7 +1135,7 @@
1135 1135
                 style="width: 70px;text-align: left"
1136 1136
                 v-if="record.receive_assessment.admission_number"
1137 1137
               >{{record.receive_assessment.condition == 1?record.receive_assessment.admission_number:'/'}}</div>
1138
-              <div class="under_line" style="width: 50px;" v-else>{{'/'}}</div>
1138
+              <div class="under_line" style="width: 70px;" v-else>{{'/'}}</div>
1139 1139
             </div>
1140 1140
             <div class="inline_block" style="margin-left:5px;">
1141 1141
               姓名:
@@ -1155,7 +1155,7 @@
1155 1155
               诊断:
1156 1156
               <div
1157 1157
                 class="under_line_two"
1158
-                style="width: 160px;text-align: left"
1158
+                style="width: 150px;text-align: left"
1159 1159
               >{{record.patient.diagnose}}</div>
1160 1160
             </div>
1161 1161
           </div>
@@ -1606,7 +1606,7 @@
1606 1606
                   诊断:
1607 1607
                   <div
1608 1608
                     class="under_line_two"
1609
-                    style="width: 180px;text-align: left"
1609
+                    style="width: 150px;text-align: left"
1610 1610
                   >{{record.patient.diagnose}}</div>
1611 1611
                 </div>
1612 1612
               </div>

+ 4 - 4
src/xt_pages/dialysis/batch_print/batch_print_order_other_one.vue Parādīt failu

@@ -20,10 +20,10 @@
20 20
             </div>
21 21
             <div class="inline_block" style="margin-left: 5px;">
22 22
               住院号:
23
-              <div class="under_line" style="width: 50px;text-align: left" v-if="record.receive_assessment.admission_number">
23
+              <div class="under_line" style="width: 70px;text-align: left" v-if="record.receive_assessment.admission_number">
24 24
                 {{record.receive_assessment.condition == 1?record.receive_assessment.admission_number:'/'}}
25 25
               </div>
26
-              <div class="under_line" style="width: 50px;" v-else>
26
+              <div class="under_line" style="width: 70px;" v-else>
27 27
                 {{'/'}}
28 28
               </div>
29 29
             </div>
@@ -45,7 +45,7 @@
45 45
 
46 46
             <div class="inline_block" style="margin-left: 5px;">
47 47
               诊断:
48
-              <div class="under_line_two" style="width: 160px;text-align: left">{{record.patient.diagnose}}</div>
48
+              <div class="under_line_two" style="width: 150px;text-align: left">{{record.patient.diagnose}}</div>
49 49
             </div>
50 50
 
51 51
           </div>
@@ -389,7 +389,7 @@
389 389
 
390 390
               <div class="inline_block" style="margin-left: 10px;">
391 391
                 诊断:
392
-                <div class="under_line_two" style="width: 180px;text-align: left">{{record.patient.diagnose}}</div>
392
+                <div class="under_line_two" style="width: 150px;text-align: left">{{record.patient.diagnose}}</div>
393 393
               </div>
394 394
 
395 395
             </div>

+ 4 - 4
src/xt_pages/dialysis/batch_print/batch_print_order_other_two.vue Parādīt failu

@@ -20,10 +20,10 @@
20 20
             </div>
21 21
             <div class="inline_block" style="margin-left: 5px;">
22 22
               住院号:
23
-              <div class="under_line" style="width: 50px;text-align: left" v-if="record.receive_assessment.admission_number">
23
+              <div class="under_line" style="width: 70px;text-align: left" v-if="record.receive_assessment.admission_number">
24 24
                 {{record.receive_assessment.condition == 1?record.receive_assessment.admission_number:'/'}}
25 25
               </div>
26
-              <div class="under_line" style="width: 50px;" v-else>
26
+              <div class="under_line" style="width: 70px;" v-else>
27 27
                 {{'/'}}
28 28
               </div>
29 29
             </div>
@@ -45,7 +45,7 @@
45 45
 
46 46
             <div class="inline_block" style="margin-left: 5px;">
47 47
               诊断:
48
-              <div class="under_line_two" style="width: 160px;text-align: left">{{record.patient.diagnose}}</div>
48
+              <div class="under_line_two" style="width: 150px;text-align: left">{{record.patient.diagnose}}</div>
49 49
             </div>
50 50
 
51 51
           </div>
@@ -382,7 +382,7 @@
382 382
 
383 383
                 <div class="inline_block" style="margin-left: 10px;">
384 384
                   诊断:
385
-                  <div class="under_line_two" style="width: 180px;text-align: left">{{record.patient.diagnose}}</div>
385
+                  <div class="under_line_two" style="width: 150px;text-align: left">{{record.patient.diagnose}}</div>
386 386
                 </div>
387 387
 
388 388
               </div>

+ 58 - 59
src/xt_pages/dialysis/bulletinBoard.vue Parādīt failu

@@ -143,43 +143,43 @@
143 143
 </template>
144 144
 
145 145
 <script>
146
-import { getBoards } from "@/api/board";
147
-import bulletinboard from "./components/bulletinboard";
148
-import { parseTime } from "@/utils";
149
-import BreadCrumb from "../components/bread-crumb";
150
-import screenfull from "screenfull";
146
+import { getBoards } from '@/api/board'
147
+import bulletinboard from './components/bulletinboard'
148
+import { parseTime } from '@/utils'
149
+import BreadCrumb from '../components/bread-crumb'
150
+import screenfull from 'screenfull'
151 151
 export default {
152 152
   components: { BreadCrumb, bulletinboard },
153
-  name: "bulletinBoard",
153
+  name: 'bulletinBoard',
154 154
   data() {
155 155
     return {
156 156
       dialogTableVisible: false,
157 157
       showSetting: false,
158 158
       crumbs: [
159
-        { path: false, name: "透析管理" },
160
-        { path: "dialysis/board", name: "数据看板" }
159
+        { path: false, name: '透析管理' },
160
+        { path: 'dialysis/board', name: '数据看板' }
161 161
       ],
162
-      orgname: "",
163
-      today: "今天",
164
-      week: "--",
165
-      timer:null,
166
-      rightItem: "board-right-menu-item",
162
+      orgname: '',
163
+      today: '今天',
164
+      week: '--',
165
+      timer: null,
166
+      rightItem: 'board-right-menu-item',
167 167
       boardData: [],
168 168
       showTime: 120,
169 169
       currentPage: 0,
170 170
       loading: true,
171
-      weekDay: ["周日", "周一", "周二", "周三", "周四", "周五", "周六"],
172
-      roonOptions: { 1: "上午", 2: "下午", 3: "晚上" },
171
+      weekDay: ['周日', '周一', '周二', '周三', '周四', '周五', '周六'],
172
+      roonOptions: { 1: '上午', 2: '下午', 3: '晚上' },
173 173
       modeOptions: {}
174
-    };
174
+    }
175 175
   },
176 176
   created() {
177
-    var xtuser = this.$store.getters.xt_user;
178
-    this.orgname = xtuser.org.org_name;
177
+    var xtuser = this.$store.getters.xt_user
178
+    this.orgname = xtuser.org.org_name
179 179
     // this.orgname = "遂溪方济医院";
180
-    this.modeOptions = this.$store.getters.treatment_mode;
181
-    this.initData();
182
-  }, beforeDestroy () {
180
+    this.modeOptions = this.$store.getters.treatment_mode
181
+    this.initData()
182
+  }, beforeDestroy() {
183 183
     clearInterval(this.timer)
184 184
     this.timer = null
185 185
     this.$once('hook:beforeDestroy', () => {
@@ -188,92 +188,91 @@ export default {
188 188
   },
189 189
   methods: {
190 190
     fullscreenboard: function() {
191
-      this.dialogTableVisible = true;
191
+      this.dialogTableVisible = true
192 192
       // let routeData = this.$router.resolve({ path: '/fullscreenboard' })
193 193
       // window.open(routeData.href, '_blank')
194 194
     },
195 195
     outfullscreenboard: function() {
196
-      this.dialogTableVisible = false;
197
-      this.showSetting = false;
196
+      this.dialogTableVisible = false
197
+      this.showSetting = false
198 198
     },
199 199
     togglefullscreen: function() {
200 200
       if (!screenfull.enabled) {
201 201
         this.$message({
202
-          message: "你的浏览器不支持",
203
-          type: "warning"
204
-        });
205
-        return false;
202
+          message: '你的浏览器不支持',
203
+          type: 'warning'
204
+        })
205
+        return false
206 206
       }
207
-      screenfull.toggle();
208
-      this.showSetting = false;
207
+      screenfull.toggle()
208
+      this.showSetting = false
209 209
     },
210 210
     openSetting() {
211 211
       if (this.showSetting == false) {
212
-        this.showSetting = true;
212
+        this.showSetting = true
213 213
       } else {
214
-        this.showSetting = false;
214
+        this.showSetting = false
215 215
       }
216 216
     },
217 217
     initData: function() {
218
-      var _this = this;
219
-      var timeOut = this.showTime * 1000;
220
-      this.currentPage++;
221
-      this.getBoards();
218
+      var _this = this
219
+      var timeOut = this.showTime * 1000
220
+      this.currentPage++
221
+      this.getBoards()
222 222
 
223 223
       this.timer = window.setInterval(() => {
224 224
         setTimeout(this.getBoards(), 0)
225
-      }, timeOut)
226
-
225
+      }, 120000)
227 226
     },
228 227
     getBoards: function() {
229 228
       getBoards(this.currentPage).then(response => {
230
-        this.loading = false;
231
-        var r = response.data;
229
+        this.loading = false
230
+        var r = response.data
232 231
         if (r.state == 0) {
233
-          this.$message.error(r.msg);
234
-          return false;
232
+          this.$message.error(r.msg)
233
+          return false
235 234
         } else {
236 235
           if (r.data.boards.length == 0) {
237
-            this.currentPage = 1;
238
-            this.getBoards();
236
+            this.currentPage = 1
237
+            // this.getBoards()
239 238
           } else {
240
-            this.today = r.data.today;
239
+            this.today = r.data.today
241 240
             this.week =
242
-              r.data.week in this.weekDay ? this.weekDay[r.data.week] : "--";
243
-            this.boardData = r.data.boards;
241
+              r.data.week in this.weekDay ? this.weekDay[r.data.week] : '--'
242
+            this.boardData = r.data.boards
244 243
           }
245 244
         }
246
-      });
245
+      })
247 246
     },
248 247
     modeName: function(mode_id) {
249
-      return mode_id in this.modeOptions ? this.modeOptions[mode_id].name : "";
248
+      return mode_id in this.modeOptions ? this.modeOptions[mode_id].name : ''
250 249
     },
251 250
     boradData: function(record) {
252 251
       if (record.dialysis_order) {
253 252
         if (record.dialysis_order.stage == 2) {
254
-          return "已下机";
253
+          return '已下机'
255 254
         } else {
256
-          return "透析中";
255
+          return '透析中'
257 256
         }
258 257
       } else if (record.sign) {
259
-        return "已签到";
258
+        return '已签到'
260 259
       } else {
261
-        return "未签到";
260
+        return '未签到'
262 261
       }
263 262
     },
264 263
     nextSchedule: function(nextlist) {
265 264
       if (nextlist.length == 0) {
266
-        return "——";
265
+        return '——'
267 266
       }
268
-      var dayTime = parseTime(nextlist[0].schedule_date, "{m}月{d}日");
267
+      var dayTime = parseTime(nextlist[0].schedule_date, '{m}月{d}日')
269 268
       var noon =
270 269
         nextlist[0].schedule_type in this.roonOptions
271
-          ? " " + this.roonOptions[nextlist[0].schedule_type]
272
-          : "";
273
-      return dayTime + noon;
270
+          ? ' ' + this.roonOptions[nextlist[0].schedule_type]
271
+          : ''
272
+      return dayTime + noon
274 273
     }
275 274
   }
276
-};
275
+}
277 276
 </script>
278 277
 
279 278
 <style lang="scss" scoped>

+ 6 - 6
src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue Parādīt failu

@@ -12,10 +12,10 @@
12 12
         </div>
13 13
         <div class="inline_block" style="margin-left: 5px;">
14 14
           住院号:
15
-          <div class="under_line" style="width: 50px;text-align: left" v-if="receiverTreatmentAccess.admission_number">
15
+          <div class="under_line" style="width: 70px;text-align: left" v-if="receiverTreatmentAccess.admission_number">
16 16
             {{patientInfo_source_2?receiverTreatmentAccess.admission_number: '/'}}
17 17
           </div>
18
-          <div class="under_line" style="width: 50px;text-align: left" v-else>
18
+          <div class="under_line" style="width: 70px;text-align: left" v-else>
19 19
             {{'/'}}
20 20
           </div>
21 21
         </div>
@@ -36,7 +36,7 @@
36 36
         </div>
37 37
         <div class="inline_block" style="margin-left: 5px;">
38 38
           诊断:
39
-          <div class="under_line" style="width: 160px;text-align: left">{{patientInfo.diagnose}}</div>
39
+          <div class="under_line" style="width: 150px;text-align: left">{{patientInfo.diagnose}}</div>
40 40
         </div>
41 41
       </div>
42 42
 
@@ -601,10 +601,10 @@
601 601
         </div>
602 602
         <div class="inline_block" style="margin-left: 5px;">
603 603
           住院号:
604
-          <div class="under_line" style="width: 50px;text-align: left" v-if="receiverTreatmentAccess.admission_number">
604
+          <div class="under_line" style="width: 70px;text-align: left" v-if="receiverTreatmentAccess.admission_number">
605 605
             {{patientInfo_source_2?receiverTreatmentAccess.admission_number:'/'}}
606 606
           </div>
607
-          <div class="under_line" style="width: 50px;text-align: left" v-else>
607
+          <div class="under_line" style="width: 70px;text-align: left" v-else>
608 608
             {{'/'}}
609 609
           </div>
610 610
         </div>
@@ -625,7 +625,7 @@
625 625
         </div>
626 626
         <div class="inline_block" style="margin-left: 5px;">
627 627
           诊断:
628
-          <div class="under_line" style="width:160px;text-align: left">{{patientInfo.diagnose}}</div>
628
+          <div class="under_line" style="width:150px;text-align: left">{{patientInfo.diagnose}}</div>
629 629
         </div>
630 630
       </div>
631 631
 

+ 1 - 1
src/xt_pages/management/components/UserForm.vue Parādīt failu

@@ -1694,7 +1694,7 @@ export default {
1694 1694
       ).then(response => {
1695 1695
         if (response.data.state === 1) {
1696 1696
           var information = response.data.data.infor;
1697
-          console.log("information",information)
1697
+          console.log("information", information);
1698 1698
           for (let index = 0; index < information.length; index++) {
1699 1699
             if (information[index].class === 0) {
1700 1700
               information[index].class = "";