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

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

csx пре 3 година
родитељ
комит
b9ce6290f7

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

1126
                     })
1126
                     })
1127
                   } else {
1127
                   } else {
1128
                     that.$message({ message: '挂号成功', type: 'success' })
1128
                     that.$message({ message: '挂号成功', type: 'success' })
1129
-                    that.form.settlementValue = ''
1130
-                    that.form.medicalInsuranceCard = ''
1129
+
1131
                     that.form.name = ''
1130
                     that.form.name = ''
1132
                     that.form.sex = ''
1131
                     that.form.sex = ''
1133
-                    that.form.certificates = ''
1134
                     that.form.medicalCare = ''
1132
                     that.form.medicalCare = ''
1135
                     that.form.birthday = ''
1133
                     that.form.birthday = ''
1136
                     that.form.age = ''
1134
                     that.form.age = ''
1147
                     that.form.social_type = ''
1145
                     that.form.social_type = ''
1148
                     that.loadingone = false
1146
                     that.loadingone = false
1149
 
1147
 
1148
+                    that.form.settlementValue = ''
1149
+                    that.form.medicalInsuranceCard = ''
1150
+
1151
+                    that.form.certificates = 2
1152
+                    that.form.id_card_type = 1
1150
                     that.form.p_type = 14
1153
                     that.form.p_type = 14
1151
                     that.form.sick_type = that.sick[0].id
1154
                     that.form.sick_type = that.sick[0].id
1152
                     that.form.diagnosis = that.diagnoses[0].id
1155
                     that.form.diagnosis = that.diagnoses[0].id

+ 2 - 2
src/xt_pages/outpatientRegistration/registrationHistory.vue Прегледај датотеку

720
         return ''
720
         return ''
721
       }, toReturnSZPatient(val) {
721
       }, toReturnSZPatient(val) {
722
         if(val.balance_accounts_type == 2){
722
         if(val.balance_accounts_type == 2){
723
-          this.$confirm('是否退费', '退费', {
723
+          this.$confirm('是否退号', '退号 ', {
724
             confirmButtonText: '确 定',
724
             confirmButtonText: '确 定',
725
             cancelButtonText: '取 消',
725
             cancelButtonText: '取 消',
726
             type: 'warning'
726
             type: 'warning'
753
           }).then(() => {
753
           }).then(() => {
754
             axios.get('http://127.0.0.1:9532/sz/api/refundnumber/get', {
754
             axios.get('http://127.0.0.1:9532/sz/api/refundnumber/get', {
755
               params: {
755
               params: {
756
-                order_id: 0,
756
+                his_patient_id: val.id,
757
                 record_time: this.getTime(val.record_date, '{y}-{m}-{d}'),
757
                 record_time: this.getTime(val.record_date, '{y}-{m}-{d}'),
758
                 admin_user_id: this.$store.getters.xt_user.user.id,
758
                 admin_user_id: this.$store.getters.xt_user.user.id,
759
                 patient_id: val.patient_id
759
                 patient_id: val.patient_id