Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/xt_pages/outpatientCharges/invoicePrint.vue

@@ -12,14 +12,14 @@
       <el-button
       v-if="org_id==10088 || org_id == 0"
       style="position:fixed;right:115px;z-index:999"
-      size="small" type="success" 
-      @click="showclick = !showclick">{{ showclick==false ? '白纸' : '发票' }}</el-button>  
+      size="small" type="success"
+      @click="showclick = !showclick">{{ showclick==false ? '白纸' : '发票' }}</el-button>
     </template>
-    <div class="app-container" style="padding-top:40px;" v-if="org_id != 10217 && org_id != 10485 && org_id != 10375 && org_id != 10567 && org_id != 10188 "><!--&& org_id != 10188 && org_id != 0-->
+    <div class="app-container" style="padding-top:40px;" v-if="org_id != 10217 && org_id != 10485 && org_id != 10375 && org_id != 10567 && org_id != 10188 && org_id != 0"><!--&& org_id != 10188 && org_id != 0-->
         <div class='dialysisPage'>
           <div v-if="org_id != 10106 && org_id != 10215 && org_id != 4 && org_id != 10188 && org_id != 10217 && org_id != 10387&& org_id != 10210 && org_id != 10387 && org_id != 10480 " >
             <printOne v-if="org_id != 10088 && org_id != 10510 && org_id != 0" :paramsObj="invoiceParams"></printOne>
-            <printThree v-if="org_id == 10088 || org_id == 0" :paramsObj="invoiceParams" :show="showclick"></printThree>
+            <printThree v-if="org_id == 10088 " :paramsObj="invoiceParams" :show="showclick"></printThree>
             <printfifteen v-if="org_id == 10510  " :paramsObj="invoiceParams"></printfifteen>
           </div>
           <printTwo v-if="org_id == 10106" :paramsObj="invoiceParams"></printTwo>
@@ -45,7 +45,7 @@
         <printSix :paramsObj="invoiceParams"></printSix>
       </div>
     </div>
-    <div class="app-container" style="padding-top:40px;" v-if="org_id == 10375">
+    <div class="app-container" style="padding-top:40px;" v-if="org_id == 10375 || org_id == 0">
       <div class='dialysisPage'>
         <print-ten :paramsObj="invoiceParams"></print-ten>
       </div>

src/xt_pages/outpatientCharges/invoiceTemplate/printTen.vue

@@ -26,7 +26,7 @@
         </div>
         <div style=" width: 608px;min-height: 200px;">
           <div style="display:flex;justify-content: space-around;">
-            
+
             <div style="">西药费</div>
             <div style="">{{ list.westernMedicineCostTotal ? list.westernMedicineCostTotal.toFixed(2) : '' }}</div>
             <div style="">检查费</div>
@@ -36,7 +36,7 @@
           </div>
 
           <div style="display:flex;justify-content: space-around;">
-           
+
             <div style="">床位费</div>
             <div style="">{{ list.bedCostTotal ? list.bedCostTotal.toFixed(2) : '' }}</div>
             <div style="position:  relative;left: -15px;">中成药</div>
@@ -62,7 +62,7 @@
           </div>
         </div>
         <div style="border-top:1px solid black;width: 608px;">
-          
+
           <div style="border-right: 1px solid black;display: inline-block;width: 360px;padding: 5px;">
             <span>合计（大写）:</span>
             <span>
@@ -135,7 +135,7 @@
           <div style="width:140px">收款人：{{list.admin_user_name}}</div>
         </div>
       </div>
-      
+
   </div>
 </template>
 <script>

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -221,6 +221,15 @@
                                   type="primary"
                                 >读电子凭证
                                 </el-button>
+
+
+                                <el-button
+                                  v-if="(hisPatientInfo.balance_accounts_type != 2 && hisPatientInfo.id > 0  && org_id != 10340)"
+                                  size="small"
+                                  @click="open(55,items.med_type,items.prescriptions[0].order,items.prescriptions)"
+                                  type="primary"
+                                >人脸识别
+                                </el-button>
 <!--                                <el-button-->
 <!--                                  v-if="(hisPatientInfo.id_card_type != 3  && hisPatientInfo.balance_accounts_type != 2 && hisPatientInfo.id > 0 &&  items.prescriptions[0].order.id == 0 && org_id == 10480)"-->
 <!--                                  size="small"-->
@@ -919,13 +928,10 @@
 
     <register-dialog ref='register' :doctors="doctors" :departments="department" :sick="sick" :diagnoses="diagnoses"
                      v-on:confirm="confirm" v-on:cancel="cancel"></register-dialog>
-
     <call-un-association-prescription ref='call_prescription' v-on:call="call" v-on:call-cancel="callCancel"></call-un-association-prescription>
-
     <register-dialog9504 ref='register9504' :doctors="doctors" :departments="department" :sick="sick"
                          :diagnoses="diagnoses"
                          v-on:confirm="registerConfirm" v-on:cancel="registerCancel"></register-dialog9504>
-
     <charge-dialog ref='charge' v-on:confirm="chargeConfirm" v-on:cancel="chargeCancel"></charge-dialog>
     <el-dialog
       class="centerDialog"
@@ -941,8 +947,6 @@
       :visible.sync="statementVisible">
       <statementPrint ref="print" :paramsObj='orderObj'></statementPrint>
     </el-dialog>
-
-
     <el-dialog
       class="centerDialog"
       width="1200px"
@@ -951,7 +955,6 @@
 <!--      <statementPrintT ref="print" :paramsObj='orderObj'></statementPrintT>-->
       <new-statement-print-three ref="print" :paramsObj='orderObj'></new-statement-print-three>
     </el-dialog>
-
     <el-dialog
       class="centerDialog"
       width="1200px"
@@ -960,8 +963,6 @@
       <new-statement-print-two :params-obj="newOrderObj"></new-statement-print-two>
       <!--<newStatementPrint ref="print" :paramsObj='newOrderObj'></newStatementPrint>-->
     </el-dialog>
-
-
     <el-dialog title="输入密码" :visible.sync="pwdFormVisible">
       <el-form :model="form">
         <el-form-item label="密码" :label-width="20">
@@ -973,7 +974,6 @@
         <el-button type="primary" @click="comfirmPWDialog">确 定</el-button>
       </div>
     </el-dialog>
-
     <el-dialog
       class="centerDialog"
       width="1200px"
@@ -3898,6 +3898,36 @@ export default {
             .catch(function(error) {
             })
         }
+      }else if(index == 55){
+        var that = this
+        let params = {
+          "admin_user_id":this.$store.getters.xt_user.user.id,
+          'his_patient_id': this.hisPatientInfo.id,
+        }
+          axios.get('http://127.0.0.1:9532/api/readelebyface', {
+            params: params
+          })
+            .then(function(response) {
+              if (response.data.state == 0) {
+                that.$message.error(response.data.msg)
+                return false
+              } else {
+                if (response.data.data.failed_code == -10) {
+                  // that.$message.error(response.data.data.msg)
+                  that.$confirm(response.data.data.msg, '医保错误信息', {
+                    confirmButtonText: '确 定',
+                    type: 'warning'
+                  }).then(() => {
+
+                  }).catch(() => {
+                  })
+                }else{
+                  that.$message({ message: response.data.data.msg, type: 'success', duration: 5000 })
+                }
+              }
+            })
+            .catch(function(error) {
+            })
       }
     },
     getName(admin_user_id) {