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

src/api/fapiao.js

@@ -35,3 +35,33 @@ export function OpenRedFapiao(params){
     params:params
   })
 }
+
+export function GetSMSCode(params){
+  return request({
+    url:"/api/fapiao/sms/code",
+    methods:"get",
+    params:params
+  })
+}
+
+
+
+export function SMSLogin(params){
+  return request({
+    url:"/api/fapiao/sms/login",
+    methods:"get",
+    params:params
+  })
+}
+
+
+export function GetQRCode(params){
+  return request({
+    url:"/api/fapiao/qrcode/get",
+    methods:"get",
+    params:params
+  })
+}
+
+
+

src/xt_pages/fapiao/fapiao.vue

@@ -10,11 +10,6 @@
           justify-content: space-between;
           margin-bottom: 10px;
         ">
-        <div>
-          <el-button size="small" type="primary"
-                     @click="query">查询
-          </el-button>
-        </div>
       </div>
       <div style="margin-bottom: 10px;">
         <el-date-picker
@@ -46,6 +41,9 @@
           value-format="yyyy-MM-dd"
           align="right"
         ></el-date-picker>
+        <el-button size="small" type="primary"
+                   @click="query">查询
+        </el-button>
       </div>
 
       <el-table

src/xt_pages/fapiao/newSettleDetail.vue

@@ -10,14 +10,6 @@
           justify-content: space-between;
           margin-bottom: 10px;
         ">
-        <div>
-          <el-button size="small" type="primary"
-                     @click="query">查询
-          </el-button>
-          <el-button size="small" type="primary"
-                     @click="auth">认证
-          </el-button>
-        </div>
       </div>
       <div style="margin-bottom: 10px;">
         <el-date-picker
@@ -49,6 +41,12 @@
           value-format="yyyy-MM-dd"
           align="right"
         ></el-date-picker>
+        <el-button size="small" type="primary"
+                   @click="query">查询
+        </el-button>
+        <el-button size="small" type="primary"
+                   @click="auth">认证
+        </el-button>
       </div>
 
       <el-table
@@ -99,17 +97,17 @@
           </template>
         </el-table-column>
 
+
         <el-table-column align="center" width="90" prop="name" label="就诊凭证类型">
           <template slot-scope="scope">
-            <div v-if="scope.row.mdtrt_cert_type =='01'">
-              医保电子凭证
+            <div v-if="scope.row.his_patient.id_card_type == 1">
+              社会保障卡
             </div>
-            <div v-if="scope.row.mdtrt_cert_type =='02'">
+            <div v-if="scope.row.his_patient.id_card_type == 2">
               居民身份证
             </div>
-
-            <div v-if="scope.row.mdtrt_cert_type =='03'">
-              社会保障卡
+            <div v-if="scope.row.his_patient.id_card_type == 4">
+              医保电子凭证
             </div>
           </template>
         </el-table-column>

src/xt_pages/fapiao/patientSettleDetail.vue

@@ -8,7 +8,7 @@
       class="app-container"
       style="display: flex; flex: 1; padding: 10px 20px 0px 20px"
     >
-      <div class="mainLeft">d
+      <div class="mainLeft">
         <div>
           <div
             style="

src/xt_pages/fapiao/settleDetail.vue

@@ -10,20 +10,7 @@
           justify-content: space-between;
           margin-bottom: 10px;
         ">
-        <div>
-          <el-button size="small" type="primary"
-                     @click="login">登录
-          </el-button>
-          <el-button size="small" type="primary"
-                     @click="query">查询
-          </el-button>
-          <el-button size="small" type="primary"
-                     @click="login">短信登录税局
-          </el-button>
-          <el-button size="small" type="primary"
-                     @click="auth">认证
-          </el-button>
-        </div>
+
       </div>
       <div style="margin-bottom: 10px;">
         <el-date-picker
@@ -55,6 +42,15 @@
           value-format="yyyy-MM-dd"
           align="right"
         ></el-date-picker>
+        <el-button size="small" type="primary"
+                   @click="query">查询
+        </el-button>
+        <el-button size="small" type="primary"
+                   @click="login">短信登录税局
+        </el-button>
+        <el-button size="small" type="primary"
+                   @click="auth">认证
+        </el-button>
       </div>
 
       <el-table
@@ -105,15 +101,14 @@
 
         <el-table-column align="center" width="90" prop="name" label="就诊凭证类型">
           <template slot-scope="scope">
-            <div v-if="scope.row.mdtrt_cert_type =='01'">
-              医保电子凭证
+            <div v-if="scope.row.his_patient.id_card_type == 1">
+              社会保障卡
             </div>
-            <div v-if="scope.row.mdtrt_cert_type =='02'">
+            <div v-if="scope.row.his_patient.id_card_type == 2">
               居民身份证
             </div>
-
-            <div v-if="scope.row.mdtrt_cert_type =='03'">
-              社会保障卡
+            <div v-if="scope.row.his_patient.id_card_type == 4">
+              医保电子凭证
             </div>
           </template>
         </el-table-column>
@@ -193,15 +188,15 @@
     >
       <div>
         <el-form :rules="rules" :label-position="labelPosition" label-width="100px" :model="formLabelAlign">
-          <el-form-item label="税局账号">
-            <el-input v-model="formLabelAlign.name"></el-input>
-          </el-form-item>
-          <el-form-item label="税局密码">
-            <el-input v-model="formLabelAlign.region"></el-input>
-          </el-form-item>
-          <el-form-item label="手机号码">
-            <el-input v-model="formLabelAlign.type"></el-input>
-          </el-form-item>
+<!--          <el-form-item label="税局账号">-->
+<!--            <el-input v-model="formLabelAlign.name"></el-input>-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="税局密码">-->
+<!--            <el-input v-model="formLabelAlign.region"></el-input>-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="手机号码">-->
+<!--            <el-input v-model="formLabelAlign.type"></el-input>-->
+<!--          </el-form-item>-->
           <el-form-item label="短信验证码" prop="verify">
             <div style="display: inline-block;width: 50%;">
               <el-input v-model="formLabelAlign.verify"></el-input>
@@ -214,7 +209,7 @@
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="login_dialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="login_dialogVisible = false">确 定</el-button>
+        <el-button type="primary" @click="loginSJ()">确 定</el-button>
       </span>
     </el-dialog>
 
@@ -251,7 +246,9 @@ import { jsGetAge, uParseTime } from '@/utils/tools'
 import {
   getOrderFapiaoList,
   OpenBlueFapiao,
-  OpenRedFapiao
+  OpenRedFapiao,
+  GetSMSCode,
+  SMSLogin, GetQRCode
 } from '../../api/fapiao'
 
 import { getDialysisRecordInitData } from '@/api/dialysis_record'
@@ -345,10 +342,47 @@ export default {
   },
 
   methods: {
+    loginSJ(){
+      let params = {
+        "code":this.formLabelAlign.verify,
+      }
+      SMSLogin(params).then((response) => {
+        if (response.data.state == 0) {
+          this.login_dialogVisible = false
+          this.$message.error(response.data.msg)
+          return false
+        } else {
+          this.login_dialogVisible = false
+          // this.$message.success(response.data.msg)
+          // this.$message.success(response.data.data.msg)
+          this
+            .$confirm(response.data.data.msg, '信息', {
+              confirmButtonText: '确 定',
+              type: 'warning'
+            })
+            .then(() => {
+            })
+            .catch(() => {
+            })
+
+        }
+      })
+    },
     login(){
       this.login_dialogVisible = true
     },
     verify_click(){
+      let params = {
+        "admin_user_id":this.$store.getters.xt_user.user.id,
+      }
+      GetSMSCode(params).then((response) => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg)
+          return false
+        } else {
+          this.$message.success(response.data.data.msg)
+        }
+      })
       this.countdown = 60
       this.time = setInterval(() => {
         if (this.countdown > 0) {
@@ -359,22 +393,84 @@ export default {
       }, 1000)
     },
     auth(){
-        this.qr_dialogVisible =true
-        this.$nextTick(() =>{
-          var qrcode = new QRCode(this.$refs.qrCodeUrl, {
-            text: 'https://blog.csdn.net/weixin_42601136', // 需要转换为二维码的内容
-            width: 120,
-            height: 120,
-            
-            colorDark: '#000000',
-            colorLight: '#ffffff',
-            correctLevel: QRCode.CorrectLevel.H
-          })
-        })
+      let params = {
+      }
+      GetQRCode(params).then((response) => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg)
+          return false
+        } else {
+          if(response.data.data.cus_status == 1){
+            this.$nextTick(() =>{
+              var qrcode = new QRCode(this.$refs.qrCodeUrl, {
+                text: response.data.data.qr_code, // 需要转换为二维码的内容
+                width: 120,
+                height: 120,
+                colorDark: '#000000',
+                colorLight: '#ffffff',
+                correctLevel: QRCode.CorrectLevel.H
+              })
+            })
+            this.qr_dialogVisible =true
+          }else if(response.data.data.cus_status == -1){
+            // this.$message.error(response.data.msg)/*  */
+            this
+              .$confirm(response.data.data.msg, '信息', {
+                confirmButtonText: '确 定',
+                type: 'warning'
+              })
+              .then(() => {
+              })
+              .catch(() => {
+              })
+          }else if(response.data.data.cus_status == 2){
+            // this.$message.error(response.data.data.msg)
+            this
+              .$confirm(response.data.data.msg, '信息', {
+                confirmButtonText: '确 定',
+                type: 'warning'
+              })
+              .then(() => {
+              })
+              .catch(() => {
+              })
+
+          }else if(response.data.data.cus_status == -3){
+            // this.$message.error(response.data.data.msg)
+            this
+              .$confirm(response.data.data.msg, '信息', {
+                confirmButtonText: '确 定',
+                type: 'warning'
+              })
+              .then(() => {
+              })
+              .catch(() => {
+              })
+
+          }else if(response.data.data.cus_status == -4){
+            // this.$message.error(response.data.data.msg)
+            this
+              .$confirm(response.data.data.msg, '信息', {
+                confirmButtonText: '确 定',
+                type: 'warning'
+              })
+              .then(() => {
+              })
+              .catch(() => {
+              })
+
+          }
+          // this.$message.success(response.data.msg)
+        }
+      })
+
+
+
+
 
     },
     query(){
-
+      this.getHisOrderList()
     },download(){
 
 
@@ -676,7 +772,7 @@ export default {
       if(this.countdown ==0){
         clearInterval(this.time)
       }
-      
+
     }
 
   }