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

src/xt_pages/outpatientCharges/components/registerDialog9504.vue

@@ -119,7 +119,7 @@
             <el-form-item class="specialFormItem" label="医保卡号：">
                 <div style="display:flex;">
                     <el-input v-model="form.medical_insurance_card"></el-input>
-                    <el-button style="margin-left:10px;" type="primary" @click="reading">读卡</el-button>
+                    <el-button style="margin-left:10px;" type="primary" @click="reading" v-loading="read_loading">读卡</el-button>
 
                 </div>
             </el-form-item>
@@ -183,6 +183,7 @@
     data() {
 
       return {
+        read_loading:false,
         registers: [
           {value: 11, label: "普通门诊"},
           {value: 12, label: '门诊挂号'},
@@ -420,6 +421,7 @@
         })
       },
       reading() {
+
         var that = this
         if (this.form.id_card_type.length == 0 || this.form.id_card_type == 0) {
           this.$message.error("请先选择读卡类型")
@@ -430,14 +432,18 @@
           'admin_user_id':this.$store.getters.xt_user.user.id,
 
         }
+        this.read_loading = true
         axios.get('http://127.0.0.1:9532/sz/api/readcard', {
           params: params
         })
           .then(function (response) {
             if (response.data.state == 0) {
+              this.read_loading = false
+
               that.$message.error(response.data.msg)
               return false
             } else {
+              this.read_loading = false
               var patient = response.data.data.patient
               if (that.form.id_card_type == 1) {
                 that.form.id = patient.id

src/xt_pages/outpatientRegistration/index.vue

@@ -113,7 +113,7 @@
                     <el-form-item class="specialFormItem" label="医保卡号：">
                         <div style="display:flex;">
                             <el-input v-model="form.medicalInsuranceCard"></el-input>
-                            <el-button style="margin-left:10px;" type="primary" @click="readingSZ">读卡</el-button>
+                            <el-button style="margin-left:10px;" type="primary" @click="readingSZ" v-loading="read_loading">读卡</el-button>
                         </div>
                     </el-form-item>
 
@@ -435,6 +435,7 @@
     },
     data() {
       return {
+        read_loading:false,
         registers: [
           { value: 11, label: '普通门诊' },
           { value: 12, label: '门诊挂号' },
@@ -673,6 +674,7 @@
           this.$message.error("请先选择读卡类型")
           return
         }
+        this.read_loading = true
         let params = {
           'id_card_type': this.form.id_card_type,
 
@@ -682,9 +684,13 @@
         })
           .then(function (response) {
             if (response.data.state == 0) {
+              this.read_loading = false
+
               that.$message.error(response.data.msg)
               return false
             } else {
+              this.read_loading = false
+
               var patient = response.data.data.patient
               if (that.form.id_card_type == 1) {
                 that.form.id = patient.id