Преглед изворни кода

Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

yq1 пре 9 месеци
родитељ
комит
c3bbbd6f2f

+ 30 - 0
src/api/fapiao.js Прегледај датотеку

35
     params:params
35
     params:params
36
   })
36
   })
37
 }
37
 }
38
+
39
+export function GetSMSCode(params){
40
+  return request({
41
+    url:"/api/fapiao/sms/code",
42
+    methods:"get",
43
+    params:params
44
+  })
45
+}
46
+
47
+
48
+
49
+export function SMSLogin(params){
50
+  return request({
51
+    url:"/api/fapiao/sms/login",
52
+    methods:"get",
53
+    params:params
54
+  })
55
+}
56
+
57
+
58
+export function GetQRCode(params){
59
+  return request({
60
+    url:"/api/fapiao/qrcode/get",
61
+    methods:"get",
62
+    params:params
63
+  })
64
+}
65
+
66
+
67
+

+ 3 - 5
src/xt_pages/fapiao/fapiao.vue Прегледај датотеку

10
           justify-content: space-between;
10
           justify-content: space-between;
11
           margin-bottom: 10px;
11
           margin-bottom: 10px;
12
         ">
12
         ">
13
-        <div>
14
-          <el-button size="small" type="primary"
15
-                     @click="query">查询
16
-          </el-button>
17
-        </div>
18
       </div>
13
       </div>
19
       <div style="margin-bottom: 10px;">
14
       <div style="margin-bottom: 10px;">
20
         <el-date-picker
15
         <el-date-picker
46
           value-format="yyyy-MM-dd"
41
           value-format="yyyy-MM-dd"
47
           align="right"
42
           align="right"
48
         ></el-date-picker>
43
         ></el-date-picker>
44
+        <el-button size="small" type="primary"
45
+                   @click="query">查询
46
+        </el-button>
49
       </div>
47
       </div>
50
 
48
 
51
       <el-table
49
       <el-table

+ 12 - 14
src/xt_pages/fapiao/newSettleDetail.vue Прегледај датотеку

10
           justify-content: space-between;
10
           justify-content: space-between;
11
           margin-bottom: 10px;
11
           margin-bottom: 10px;
12
         ">
12
         ">
13
-        <div>
14
-          <el-button size="small" type="primary"
15
-                     @click="query">查询
16
-          </el-button>
17
-          <el-button size="small" type="primary"
18
-                     @click="auth">认证
19
-          </el-button>
20
-        </div>
21
       </div>
13
       </div>
22
       <div style="margin-bottom: 10px;">
14
       <div style="margin-bottom: 10px;">
23
         <el-date-picker
15
         <el-date-picker
49
           value-format="yyyy-MM-dd"
41
           value-format="yyyy-MM-dd"
50
           align="right"
42
           align="right"
51
         ></el-date-picker>
43
         ></el-date-picker>
44
+        <el-button size="small" type="primary"
45
+                   @click="query">查询
46
+        </el-button>
47
+        <el-button size="small" type="primary"
48
+                   @click="auth">认证
49
+        </el-button>
52
       </div>
50
       </div>
53
 
51
 
54
       <el-table
52
       <el-table
99
           </template>
97
           </template>
100
         </el-table-column>
98
         </el-table-column>
101
 
99
 
100
+
102
         <el-table-column align="center" width="90" prop="name" label="就诊凭证类型">
101
         <el-table-column align="center" width="90" prop="name" label="就诊凭证类型">
103
           <template slot-scope="scope">
102
           <template slot-scope="scope">
104
-            <div v-if="scope.row.mdtrt_cert_type =='01'">
105
-              医保电子凭证
103
+            <div v-if="scope.row.his_patient.id_card_type == 1">
104
+              社会保障卡
106
             </div>
105
             </div>
107
-            <div v-if="scope.row.mdtrt_cert_type =='02'">
106
+            <div v-if="scope.row.his_patient.id_card_type == 2">
108
               居民身份证
107
               居民身份证
109
             </div>
108
             </div>
110
-
111
-            <div v-if="scope.row.mdtrt_cert_type =='03'">
112
-              社会保障卡
109
+            <div v-if="scope.row.his_patient.id_card_type == 4">
110
+              医保电子凭证
113
             </div>
111
             </div>
114
           </template>
112
           </template>
115
         </el-table-column>
113
         </el-table-column>

+ 1 - 1
src/xt_pages/fapiao/patientSettleDetail.vue Прегледај датотеку

8
       class="app-container"
8
       class="app-container"
9
       style="display: flex; flex: 1; padding: 10px 20px 0px 20px"
9
       style="display: flex; flex: 1; padding: 10px 20px 0px 20px"
10
     >
10
     >
11
-      <div class="mainLeft">d
11
+      <div class="mainLeft">
12
         <div>
12
         <div>
13
           <div
13
           <div
14
             style="
14
             style="

+ 141 - 45
src/xt_pages/fapiao/settleDetail.vue Прегледај датотеку

10
           justify-content: space-between;
10
           justify-content: space-between;
11
           margin-bottom: 10px;
11
           margin-bottom: 10px;
12
         ">
12
         ">
13
-        <div>
14
-          <el-button size="small" type="primary"
15
-                     @click="login">登录
16
-          </el-button>
17
-          <el-button size="small" type="primary"
18
-                     @click="query">查询
19
-          </el-button>
20
-          <el-button size="small" type="primary"
21
-                     @click="login">短信登录税局
22
-          </el-button>
23
-          <el-button size="small" type="primary"
24
-                     @click="auth">认证
25
-          </el-button>
26
-        </div>
13
+
27
       </div>
14
       </div>
28
       <div style="margin-bottom: 10px;">
15
       <div style="margin-bottom: 10px;">
29
         <el-date-picker
16
         <el-date-picker
55
           value-format="yyyy-MM-dd"
42
           value-format="yyyy-MM-dd"
56
           align="right"
43
           align="right"
57
         ></el-date-picker>
44
         ></el-date-picker>
45
+        <el-button size="small" type="primary"
46
+                   @click="query">查询
47
+        </el-button>
48
+        <el-button size="small" type="primary"
49
+                   @click="login">短信登录税局
50
+        </el-button>
51
+        <el-button size="small" type="primary"
52
+                   @click="auth">认证
53
+        </el-button>
58
       </div>
54
       </div>
59
 
55
 
60
       <el-table
56
       <el-table
105
 
101
 
106
         <el-table-column align="center" width="90" prop="name" label="就诊凭证类型">
102
         <el-table-column align="center" width="90" prop="name" label="就诊凭证类型">
107
           <template slot-scope="scope">
103
           <template slot-scope="scope">
108
-            <div v-if="scope.row.mdtrt_cert_type =='01'">
109
-              医保电子凭证
104
+            <div v-if="scope.row.his_patient.id_card_type == 1">
105
+              社会保障卡
110
             </div>
106
             </div>
111
-            <div v-if="scope.row.mdtrt_cert_type =='02'">
107
+            <div v-if="scope.row.his_patient.id_card_type == 2">
112
               居民身份证
108
               居民身份证
113
             </div>
109
             </div>
114
-
115
-            <div v-if="scope.row.mdtrt_cert_type =='03'">
116
-              社会保障卡
110
+            <div v-if="scope.row.his_patient.id_card_type == 4">
111
+              医保电子凭证
117
             </div>
112
             </div>
118
           </template>
113
           </template>
119
         </el-table-column>
114
         </el-table-column>
193
     >
188
     >
194
       <div>
189
       <div>
195
         <el-form :rules="rules" :label-position="labelPosition" label-width="100px" :model="formLabelAlign">
190
         <el-form :rules="rules" :label-position="labelPosition" label-width="100px" :model="formLabelAlign">
196
-          <el-form-item label="税局账号">
197
-            <el-input v-model="formLabelAlign.name"></el-input>
198
-          </el-form-item>
199
-          <el-form-item label="税局密码">
200
-            <el-input v-model="formLabelAlign.region"></el-input>
201
-          </el-form-item>
202
-          <el-form-item label="手机号码">
203
-            <el-input v-model="formLabelAlign.type"></el-input>
204
-          </el-form-item>
191
+<!--          <el-form-item label="税局账号">-->
192
+<!--            <el-input v-model="formLabelAlign.name"></el-input>-->
193
+<!--          </el-form-item>-->
194
+<!--          <el-form-item label="税局密码">-->
195
+<!--            <el-input v-model="formLabelAlign.region"></el-input>-->
196
+<!--          </el-form-item>-->
197
+<!--          <el-form-item label="手机号码">-->
198
+<!--            <el-input v-model="formLabelAlign.type"></el-input>-->
199
+<!--          </el-form-item>-->
205
           <el-form-item label="短信验证码" prop="verify">
200
           <el-form-item label="短信验证码" prop="verify">
206
             <div style="display: inline-block;width: 50%;">
201
             <div style="display: inline-block;width: 50%;">
207
               <el-input v-model="formLabelAlign.verify"></el-input>
202
               <el-input v-model="formLabelAlign.verify"></el-input>
214
       </div>
209
       </div>
215
       <span slot="footer" class="dialog-footer">
210
       <span slot="footer" class="dialog-footer">
216
         <el-button @click="login_dialogVisible = false">取 消</el-button>
211
         <el-button @click="login_dialogVisible = false">取 消</el-button>
217
-        <el-button type="primary" @click="login_dialogVisible = false">确 定</el-button>
212
+        <el-button type="primary" @click="loginSJ()">确 定</el-button>
218
       </span>
213
       </span>
219
     </el-dialog>
214
     </el-dialog>
220
 
215
 
251
 import {
246
 import {
252
   getOrderFapiaoList,
247
   getOrderFapiaoList,
253
   OpenBlueFapiao,
248
   OpenBlueFapiao,
254
-  OpenRedFapiao
249
+  OpenRedFapiao,
250
+  GetSMSCode,
251
+  SMSLogin, GetQRCode
255
 } from '../../api/fapiao'
252
 } from '../../api/fapiao'
256
 
253
 
257
 import { getDialysisRecordInitData } from '@/api/dialysis_record'
254
 import { getDialysisRecordInitData } from '@/api/dialysis_record'
345
   },
342
   },
346
 
343
 
347
   methods: {
344
   methods: {
345
+    loginSJ(){
346
+      let params = {
347
+        "code":this.formLabelAlign.verify,
348
+      }
349
+      SMSLogin(params).then((response) => {
350
+        if (response.data.state == 0) {
351
+          this.login_dialogVisible = false
352
+          this.$message.error(response.data.msg)
353
+          return false
354
+        } else {
355
+          this.login_dialogVisible = false
356
+          // this.$message.success(response.data.msg)
357
+          // this.$message.success(response.data.data.msg)
358
+          this
359
+            .$confirm(response.data.data.msg, '信息', {
360
+              confirmButtonText: '确 定',
361
+              type: 'warning'
362
+            })
363
+            .then(() => {
364
+            })
365
+            .catch(() => {
366
+            })
367
+
368
+        }
369
+      })
370
+    },
348
     login(){
371
     login(){
349
       this.login_dialogVisible = true
372
       this.login_dialogVisible = true
350
     },
373
     },
351
     verify_click(){
374
     verify_click(){
375
+      let params = {
376
+        "admin_user_id":this.$store.getters.xt_user.user.id,
377
+      }
378
+      GetSMSCode(params).then((response) => {
379
+        if (response.data.state == 0) {
380
+          this.$message.error(response.data.msg)
381
+          return false
382
+        } else {
383
+          this.$message.success(response.data.data.msg)
384
+        }
385
+      })
352
       this.countdown = 60
386
       this.countdown = 60
353
       this.time = setInterval(() => {
387
       this.time = setInterval(() => {
354
         if (this.countdown > 0) {
388
         if (this.countdown > 0) {
359
       }, 1000)
393
       }, 1000)
360
     },
394
     },
361
     auth(){
395
     auth(){
362
-        this.qr_dialogVisible =true
363
-        this.$nextTick(() =>{
364
-          var qrcode = new QRCode(this.$refs.qrCodeUrl, {
365
-            text: 'https://blog.csdn.net/weixin_42601136', // 需要转换为二维码的内容
366
-            width: 120,
367
-            height: 120,
368
-            
369
-            colorDark: '#000000',
370
-            colorLight: '#ffffff',
371
-            correctLevel: QRCode.CorrectLevel.H
372
-          })
373
-        })
396
+      let params = {
397
+      }
398
+      GetQRCode(params).then((response) => {
399
+        if (response.data.state == 0) {
400
+          this.$message.error(response.data.msg)
401
+          return false
402
+        } else {
403
+          if(response.data.data.cus_status == 1){
404
+            this.$nextTick(() =>{
405
+              var qrcode = new QRCode(this.$refs.qrCodeUrl, {
406
+                text: response.data.data.qr_code, // 需要转换为二维码的内容
407
+                width: 120,
408
+                height: 120,
409
+                colorDark: '#000000',
410
+                colorLight: '#ffffff',
411
+                correctLevel: QRCode.CorrectLevel.H
412
+              })
413
+            })
414
+            this.qr_dialogVisible =true
415
+          }else if(response.data.data.cus_status == -1){
416
+            // this.$message.error(response.data.msg)/*  */
417
+            this
418
+              .$confirm(response.data.data.msg, '信息', {
419
+                confirmButtonText: '确 定',
420
+                type: 'warning'
421
+              })
422
+              .then(() => {
423
+              })
424
+              .catch(() => {
425
+              })
426
+          }else if(response.data.data.cus_status == 2){
427
+            // this.$message.error(response.data.data.msg)
428
+            this
429
+              .$confirm(response.data.data.msg, '信息', {
430
+                confirmButtonText: '确 定',
431
+                type: 'warning'
432
+              })
433
+              .then(() => {
434
+              })
435
+              .catch(() => {
436
+              })
437
+
438
+          }else if(response.data.data.cus_status == -3){
439
+            // this.$message.error(response.data.data.msg)
440
+            this
441
+              .$confirm(response.data.data.msg, '信息', {
442
+                confirmButtonText: '确 定',
443
+                type: 'warning'
444
+              })
445
+              .then(() => {
446
+              })
447
+              .catch(() => {
448
+              })
449
+
450
+          }else if(response.data.data.cus_status == -4){
451
+            // this.$message.error(response.data.data.msg)
452
+            this
453
+              .$confirm(response.data.data.msg, '信息', {
454
+                confirmButtonText: '确 定',
455
+                type: 'warning'
456
+              })
457
+              .then(() => {
458
+              })
459
+              .catch(() => {
460
+              })
461
+
462
+          }
463
+          // this.$message.success(response.data.msg)
464
+        }
465
+      })
466
+
467
+
468
+
469
+
374
 
470
 
375
     },
471
     },
376
     query(){
472
     query(){
377
-
473
+      this.getHisOrderList()
378
     },download(){
474
     },download(){
379
 
475
 
380
 
476
 
676
       if(this.countdown ==0){
772
       if(this.countdown ==0){
677
         clearInterval(this.time)
773
         clearInterval(this.time)
678
       }
774
       }
679
-      
775
+
680
     }
776
     }
681
 
777
 
682
   }
778
   }