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/outpatientChargesManagement.vue

@@ -638,10 +638,12 @@
                 title="提示"
                 :visible.sync="dialogVisible"
                 width="30%"
-                >
+        >
             <span>是否修改医疗类型</span>
 
-            <el-select style="width:50%;" v-model="temp_med_type" placeholder="医疗类型"  v-if="($store.getters.xt_user.org_id == 10028 || $store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10138)" @change="changevalue" >
+            <el-select style="width:50%;" v-model="temp_med_type" placeholder="医疗类型"
+                       v-if="($store.getters.xt_user.org_id == 10028 || $store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10138)"
+                       @change="changevalue">
                 <el-option
                         v-for="(item,index) in medical_care"
                         :key="index"
@@ -649,7 +651,7 @@
                         :value="item.value">
                 </el-option>
             </el-select>
-            <el-select style="width:50%;" v-model="temp_med_type" placeholder="医疗类型"  v-else @change="changevalue" >
+            <el-select style="width:50%;" v-model="temp_med_type" placeholder="医疗类型" v-else @change="changevalue">
                 <el-option
                         v-for="(item,index) in register"
                         :key="index"
@@ -713,6 +715,7 @@
   import additionalCharges from './components/additionalCharges'
   import { getPatientInformation, getPatientList } from '@/api/project/project'
   import {
+    changeMedType,
     getChargeHisPatientInfo,
     getChargeHisPatientList,
     getDayOrMonthHisPrescription,
@@ -720,11 +723,10 @@
     getSchedulePatientList,
     preSettle,
     Refund,
+    refunddetail,
     refundNumber,
     register,
-    upload,
-    changeMedType,
-    refunddetail
+    upload
   } from '@/api/his/his'
   import RegisterDialog from './components/registerDialog'
   import treatPrint from './treatPrint'
@@ -756,8 +758,8 @@
     },
     data() {
       return {
-        temp_med_type:"",
-        dialogVisible:false,
+        temp_med_type: '',
+        dialogVisible: false,
         form: {
           p_type: '',
           sick_type: '',
@@ -780,8 +782,8 @@
           { value: 18, label: '预防接种' },
           { value: 19, label: '门诊输血' },
           { value: 91, label: '新冠肺炎门诊' },
-          {value: 1111, label: "精一"},
-          {value: 1112, label: "精二"},
+          { value: 1111, label: '精一' },
+          { value: 1112, label: '精二' }
         ],
 
         medical_care_two: [
@@ -795,8 +797,8 @@
           { value: '18', label: '预防接种' },
           { value: '19', label: '门诊输血' },
           { value: '91', label: '新冠肺炎门诊' },
-          {value: '1111', label: "精一"},
-          {value: '1112', label: "精二"},
+          { value: '1111', label: '精一' },
+          { value: '1112', label: '精二' }
         ],
 
         register: [
@@ -897,9 +899,9 @@
         department: [],
         all_patient: [],
 
-        temp_prescriptions:null,
+        temp_prescriptions: null,
 
-        temp_ids:"",
+        temp_ids: ''
 
       }
     },
@@ -922,11 +924,11 @@
       this.getPatientList()
     },
     methods: {
-      openDialog(item){
+      openDialog(item) {
         this.dialogVisible = true
         this.temp_prescriptions = item
       },
-      comfirmChangeMedType(){
+      comfirmChangeMedType() {
         let params = {
           id: this.temp_prescriptions.id,
           med_type: this.temp_med_type.toString()
@@ -936,13 +938,11 @@
             this.changeRadioAndPatient(1)
             this.dialogVisible = false
 
-
           } else {
             this.$message.error(response.data.msg)
           }
         })
 
-
       },
       changevalue(val) {
         this.$forceUpdate()
@@ -1032,7 +1032,7 @@
         form['org_id'] = this.$store.getters.xt_user.org_id
 
         form['p_type'] = this.current_med_type
-        form['diagnosis'] = this.form.diagnosis.join(",")
+        form['diagnosis'] = this.form.diagnosis.join(',')
         form['sick_type'] = this.form.sick_type
         form['ids'] = this.temp_ids
         if (this.activeName == 'first') {
@@ -1898,7 +1898,7 @@
             for (let i = 0; i < this.all_table_data.length; i++) {
               let isHasUnCharge = false
               for (let b = 0; b < this.all_table_data[i].prescription.length; b++) {
-                if (this.all_table_data[i].order_status != 2) {
+                if (this.all_table_data[i].order_status != 2 ||  this.all_table_data[i].order_status != 3) {
                   isHasUnCharge = true
                 } else {
                   if (this.all_table_data[i].his_patient_id > 0) {
@@ -1909,7 +1909,7 @@
 
                 }
               }
-              if (this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2) {
+              if (this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2 &&  this.all_table_data[i].order_status != 3) {
                 isHasUnCharge = true
 
               }
@@ -1945,7 +1945,7 @@
                 for (let i = 0; i < this.all_table_data.length; i++) {
                   let isHasUnCharge = false
                   for (let b = 0; b < this.all_table_data[i].prescription.length; b++) {
-                    if (this.all_table_data[i].order_status != 2) {
+                    if (this.all_table_data[i].order_status != 2 ||  this.all_table_data[i].order_status != 3) {
                       isHasUnCharge = true
                     } else {
                       if (this.all_table_data[i].his_patient_id > 0) {
@@ -1957,7 +1957,7 @@
                     }
 
                   }
-                  if (this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2) {
+                  if (this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2 &&  this.all_table_data[i].order_status != 3) {
                     isHasUnCharge = true
 
                   }
@@ -2118,7 +2118,7 @@
             for (let i = 0; i < this.all_table_data.length; i++) {
               let isHasUnCharge = false
               for (let b = 0; b < this.all_table_data[i].prescription.length; b++) {
-                if (this.all_table_data[i].order_status != 2) {
+                if (this.all_table_data[i].order_status != 2 ||  this.all_table_data[i].order_status != 3) {
                   isHasUnCharge = true
                 } else {
                   if (this.all_table_data[i].his_patient_id > 0) {
@@ -2129,7 +2129,7 @@
 
                 }
               }
-              if (this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2) {
+              if (this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2 &&  this.all_table_data[i].order_status != 3) {
                 isHasUnCharge = true
 
               }
@@ -2719,7 +2719,7 @@
 
         } else if (index == 8) {
           if (this.$store.getters.xt_user.org_id != 10028 || this.$store.getters.xt_user.org_id != 9504 || this.$store.getters.xt_user.org_id != 10138) {
-            if (this.form.diagnosis.length  == 0) {
+            if (this.form.diagnosis.length == 0) {
               that.$message.error('诊断不能为空,请选择诊断内容')
               return
             }
@@ -2738,7 +2738,7 @@
           form['record_time'] = this.record_date
 
           form['p_type'] = med_type
-          form['diagnosis'] = this.form.diagnosis.join(",")
+          form['diagnosis'] = this.form.diagnosis.join(',')
           form['sick_type'] = this.form.sick_type
 
           form['admin_user_id'] = this.$store.getters.xt_user.user.id
@@ -3292,7 +3292,7 @@
             for (let i = 0; i < this.all_table_data.length; i++) {
               let isHasUnCharge = false
               for (let b = 0; b < this.all_table_data[i].prescription.length; b++) {
-                if (this.all_table_data[i].order_status != 2) {
+                if (this.all_table_data[i].order_status != 2 || this.all_table_data[i].order_status != 3) {
                   isHasUnCharge = true
                 } else {
                   if (this.all_table_data[i].his_patient_id > 0) {
@@ -3303,7 +3303,7 @@
 
                 }
               }
-              if (this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2) {
+              if (this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2 && this.all_table_data[i].order_status != 3) {
                 isHasUnCharge = true
 
               }
@@ -3339,7 +3339,7 @@
                 for (let i = 0; i < this.all_table_data.length; i++) {
                   let isHasUnCharge = false
                   for (let b = 0; b < this.all_table_data[i].prescription.length; b++) {
-                    if (this.all_table_data[i].order_status != 2) {
+                    if (this.all_table_data[i].order_status != 2 || this.all_table_data[i].order_status != 3) {
                       isHasUnCharge = true
                     } else {
                       if (this.all_table_data[i].his_patient_id > 0) {
@@ -3351,7 +3351,7 @@
                     }
 
                   }
-                  if (this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2) {
+                  if (this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2 && this.all_table_data[i].order_status != 3) {
                     isHasUnCharge = true
 
                   }
@@ -3389,23 +3389,41 @@
             this.current_index = 0
             let ids = []
             let temp_order_id = 0
-            for (let i = 0; i < this.patientTableData.length; i++) {
-              // console.log(this.patientTableData[i])
+            if (this.radio == 2) {
+
+              for (let i = 0; i < this.patientTableData.length; i++) {
+                // console.log(this.patientTableData[i])
+
+                if (this.hisPatientInfo.id == this.patientTableData[i].his_patient_id) {
+                  ids.push(this.patientTableData[i].order_id)
+                  // this.$refs.tab.setCurrentRow(this.patientTableData[i])
+                  // this.getPatientInformation(this.patientTableData[i].id, this.patientTableData[i].order.number, this.patientTableData[i].his_patient.id, this.patientTableData[i].order.id)
+                }
 
-              if (this.hisPatientInfo.id == this.patientTableData[i].his_patient_id) {
-                ids.push(this.patientTableData[i].order_id)
-                // this.$refs.tab.setCurrentRow(this.patientTableData[i])
-                // this.getPatientInformation(this.patientTableData[i].id, this.patientTableData[i].order.number, this.patientTableData[i].his_patient.id, this.patientTableData[i].order.id)
               }
 
-            }
+              temp_order_id = ids[ids.length - 1]
+              for (let i = 0; i < this.patientTableData.length; i++) {
+                if (temp_order_id == this.patientTableData[i].order_id) {
+                  this.$refs.tab.setCurrentRow(this.patientTableData[i])
+                  this.getPatientInformation(this.patientTableData[i].id, this.patientTableData[i].order.number, this.patientTableData[i].his_patient.id, this.patientTableData[i].order.id)
+                }
+              }
+            }else{
+
+              for (let i = 0; i < this.patientTableData.length; i++) {
+                // console.log(this.patientTableData[i])
+
+                if (this.hisPatientInfo.id == this.patientTableData[i].his_patient_id) {
+                  // ids.push(this.patientTableData[i].order_id)
+                  this.$refs.tab.setCurrentRow(this.patientTableData[i])
+                  this.getPatientInformation(this.patientTableData[i].id, this.patientTableData[i].order.number, this.patientTableData[i].his_patient.id, this.patientTableData[i].order.id)
+                }
 
-            temp_order_id = ids[ids.length - 1]
-            for (let i = 0; i < this.patientTableData.length; i++) {
-              if (temp_order_id == this.patientTableData[i].order_id) {
-                this.$refs.tab.setCurrentRow(this.patientTableData[i])
-                this.getPatientInformation(this.patientTableData[i].id, this.patientTableData[i].order.number, this.patientTableData[i].his_patient.id, this.patientTableData[i].order.id)
               }
+
+
+
             }
           }
         })
@@ -3526,7 +3544,7 @@
             for (let i = 0; i < this.all_table_data.length; i++) {
               let isHasUnCharge = false
               for (let b = 0; b < this.all_table_data[i].prescription.length; b++) {
-                if (this.all_table_data[i].order_status != 2) {
+                if (this.all_table_data[i].order_status != 2 ||  this.all_table_data[i].order_status != 3) {
                   isHasUnCharge = true
                 } else {
                   if (this.all_table_data[i].his_patient_id > 0) {
@@ -3537,7 +3555,7 @@
 
                 }
               }
-              if (this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2) {
+              if (this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2 &&  this.all_table_data[i].order_status != 3) {
                 isHasUnCharge = true
 
               }
@@ -3573,7 +3591,7 @@
                 for (let i = 0; i < this.all_table_data.length; i++) {
                   let isHasUnCharge = false
                   for (let b = 0; b < this.all_table_data[i].prescription.length; b++) {
-                    if (this.all_table_data[i].order_status != 2) {
+                    if (this.all_table_data[i].order_status != 2 ||  this.all_table_data[i].order_status != 3) {
                       isHasUnCharge = true
                     } else {
                       if (this.all_table_data[i].his_patient_id > 0) {
@@ -3585,7 +3603,7 @@
                     }
 
                   }
-                  if (this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2) {
+                  if (this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2 &&  this.all_table_data[i].order_status != 3) {
                     isHasUnCharge = true
 
                   }
@@ -3750,7 +3768,7 @@
             for (let i = 0; i < this.all_table_data.length; i++) {
               let isHasUnCharge = false
               for (let b = 0; b < this.all_table_data[i].prescription.length; b++) {
-                if (this.all_table_data[i].order_status != 2) {
+                if (this.all_table_data[i].order_status != 2 || this.all_table_data[i].order_status != 3) {
                   isHasUnCharge = true
                 } else {
                   if (this.all_table_data[i].his_patient_id > 0) {
@@ -3761,7 +3779,7 @@
 
                 }
               }
-              if (this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2) {
+              if (this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2 && this.all_table_data[i].order_status != 3) {
                 isHasUnCharge = true
 
               }
@@ -3797,7 +3815,7 @@
                 for (let i = 0; i < this.all_table_data.length; i++) {
                   let isHasUnCharge = false
                   for (let b = 0; b < this.all_table_data[i].prescription.length; b++) {
-                    if (this.all_table_data[i].order_status != 2) {
+                    if (this.all_table_data[i].order_status != 2 || this.all_table_data[i].order_status != 3) {
                       isHasUnCharge = true
                     } else {
                       if (this.all_table_data[i].his_patient_id > 0) {
@@ -3809,7 +3827,7 @@
                     }
 
                   }
-                  if (this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2) {
+                  if (this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2 &&  this.all_table_data[i].order_status != 3) {
                     isHasUnCharge = true
 
                   }
@@ -4265,19 +4283,17 @@
             if (this.info.id > 0) {
               this.form.p_type = response.data.data.info.register_type
               this.form.sick_type = response.data.data.info.sick_type
-              if(response.data.data.info.diagnosis.length == 0){
+              if (response.data.data.info.diagnosis.length == 0) {
 
                 this.form.diagnosis = []
 
-              }else{
+              } else {
 
-                for(let i = 0; i < response.data.data.info.diagnosis.split(",").length; i++){
-                  this.form.diagnosis.push(parseInt(response.data.data.info.diagnosis.split(",")[i]))
+                for (let i = 0; i < response.data.data.info.diagnosis.split(",").length; i++) {
+                  this.form.diagnosis.push(parseInt(response.data.data.info.diagnosis.split(',')[i]))
 
                 }
 
-
-
               }
               this.sick_history = this.info.sick_history
               if (this.info.register_type == 0) {
@@ -4290,12 +4306,12 @@
             } else {
               this.form.p_type = 14
               this.form.sick_type = this.sick[0].id
-              if(response.data.data.last_info.diagnoses.length == 0){
-                this.form.diagnosis=[]
+              if (response.data.data.last_info.diagnoses.length == 0) {
+                this.form.diagnosis = []
 
-              }else{
-                for(let i = 0; i < response.data.data.last_info.diagnosis.split(",").length; i++){
-                  this.form.diagnosis.push(parseInt(response.data.data.last_info.diagnosis.split(",")[i]))
+              } else {
+                for (let i = 0; i < response.data.data.last_info.diagnosis.split(",").length; i++) {
+                  this.form.diagnosis.push(parseInt(response.data.data.last_info.diagnosis.split(',')[i]))
                 }
               }
 
@@ -4506,7 +4522,7 @@
             }
 
             params['p_type'] = med_type
-            params['diagnosis'] = this.form.diagnosis.join(",")
+            params['diagnosis'] = this.form.diagnosis.join(',')
 
             axios.get('http://127.0.0.1:9532/sz/api/upload/get', {
               params: params,
@@ -4537,11 +4553,11 @@
             this.currentOrder = order
             this.current_med_type = med_type
 
-              var ids = []
-            for(let i = 0;i < prescriptions.length; i++){
-                ids.push(prescriptions[i].id)
+            var ids = []
+            for (let i = 0; i < prescriptions.length; i++) {
+              ids.push(prescriptions[i].id)
             }
-            var ids_str = ids.join(",")
+            var ids_str = ids.join(',')
             this.temp_ids = ids_str
 
             if (this.activeName == 'first') {
@@ -4650,42 +4666,42 @@
               })
             break
           case 7:
-              if (this.hisPatientInfo.balance_accounts_type != 2) {
-            var that = this
-            axios.get('http://127.0.0.1:9532/sz/api/detail/cancel', {
-              params: {
-                order_id: this.order.id,
-                record_time: this.record_date,
-                admin_user_id: this.$store.getters.xt_user.user.id,
-                patient_id: this.patientInfo.id
+            if (this.hisPatientInfo.balance_accounts_type != 2) {
+              var that = this
+              axios.get('http://127.0.0.1:9532/sz/api/detail/cancel', {
+                params: {
+                  order_id: this.order.id,
+                  record_time: this.record_date,
+                  admin_user_id: this.$store.getters.xt_user.user.id,
+                  patient_id: this.patientInfo.id
 
-              }
-            })
-              .then(function(response) {
-                if (response.data.state == 0) {
-                  that.$message.error(response.data.msg)
-                  return false
-                } else {
-                  if (response.data.data.failed_code == -10) {
+                }
+              })
+                .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.$confirm(response.data.data.msg, '医保错误信息', {
-                      confirmButtonText: '确 定',
-                      type: 'warning'
-                    }).then(() => {
+                      that.$confirm(response.data.data.msg, '医保错误信息', {
+                        confirmButtonText: '确 定',
+                        type: 'warning'
+                      }).then(() => {
 
-                    }).catch(() => {
-                    })
+                      }).catch(() => {
+                      })
 
-                  } else {
-                    that.$message({ message: '明细撤销成功', type: 'success' })
-                    that.changeRadioAndPatient(1)
+                    } else {
+                      that.$message({ message: '明细撤销成功', type: 'success' })
+                      that.changeRadioAndPatient(1)
+                    }
                   }
-                }
-              })
-              .catch(function(error) {
-              })
-              }else{
-              let  params = {
+                })
+                .catch(function(error) {
+                })
+            } else {
+              let params = {
                 order_id: this.order.id,
                 record_time: this.record_date,
                 admin_user_id: this.$store.getters.xt_user.user.id,
@@ -4693,25 +4709,25 @@
               }
 
               refunddetail(params).then(response => {
-                  if (response.data.state == 0) {
-                    this.$message.error(response.data.msg)
-                    this.loadingtwo = false
-                    return false
-                  } else {
-                    this.changeRadioAndPatient(1)
-                    this.$message({ message: '撤销明细成功', type: 'success' })
-                  }
-                })
+                if (response.data.state == 0) {
+                  this.$message.error(response.data.msg)
+                  this.loadingtwo = false
+                  return false
+                } else {
+                  this.changeRadioAndPatient(1)
+                  this.$message({ message: '撤销明细成功', type: 'success' })
+                }
+              })
 
-              }
+            }
 
             break
           case 8:
             var ids = []
-            for(let i = 0;i < prescriptions.length; i++){
-                ids.push(prescriptions[i].id)
+            for (let i = 0; i < prescriptions.length; i++) {
+              ids.push(prescriptions[i].id)
             }
-            var ids_str = ids.join(",")
+            var ids_str = ids.join(',')
 
             if (this.hisPatientInfo.balance_accounts_type == 2) {
 
@@ -4728,7 +4744,7 @@
                 form['org_id'] = this.$store.getters.xt_user.org_id
                 form['ids'] = ids_str
                 form['p_type'] = med_type
-                form['diagnosis'] = this.form.diagnosis.join(",")
+                form['diagnosis'] = this.form.diagnosis.join(',')
                 form['sick_type'] = this.form.sick_type
 
                 if (this.activeName == 'first') {
@@ -4754,7 +4770,6 @@
 
             } else {
 
-
               var that = this
               let form = {}
               form['id'] = this.patientInfo.id
@@ -4764,7 +4779,7 @@
               form['org_id'] = this.$store.getters.xt_user.org_id
 
               form['p_type'] = med_type
-              form['diagnosis'] = this.form.diagnosis.join(",")
+              form['diagnosis'] = this.form.diagnosis.join(',')
               form['sick_type'] = this.form.sick_type
 
               if (this.activeName == 'first') {

src/xt_pages/outpatientCharges/summary.vue

@@ -85,7 +85,9 @@
                     <template slot-scope="scope">{{scope.row.department_name}}</template>
                 </el-table-column>
                 <el-table-column align="center" width="90" prop="name" label="医疗类型">
-                    <template slot-scope="scope"><div>{{getMedType(scope.row.med_type)}}</div></template>
+                    <template slot-scope="scope">
+                        <div>{{getMedType(scope.row.med_type)}}</div>
+                    </template>
                 </el-table-column>
                 <el-table-column align="center" width="100" prop="name" label="收费日期">
                     <template slot-scope="scope">
@@ -382,15 +384,7 @@
         }
 
       }, toRefund(row) {
-
-        console.log("~~~~~")
-        console.log(row)
-        console.log(this.$store.getters.xt_user.org_id )
-
-
-
-        if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990) {
-          var that = this
+        if (row.his_patient.balance_accounts_type == 2) {
           this.$confirm('是否退费', '退费', {
             confirmButtonText: '确 定',
             cancelButtonText: '取 消',
@@ -398,110 +392,136 @@
           }).then(() => {
             let params = {
               'order_id': row.id,
-              'patient_id': row.patient_id,
-              'record_time': that.getTimes(row.settle_accounts_date),
-              'admin_user_id': that.$store.getters.xt_user.user.id
+              'patient_id':  row.patient_id,
+              'record_time':this.getTimes(row.settle_accounts_date),
             }
-            axios.get('http://127.0.0.1:9532/api/refund/post', {
-              params: params
+            Refund(params).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                this.$message({ message: '退费成功', type: 'success' })
+                this.getHisOrderList()
+              }
             })
-              .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: '退费成功', type: 'success', duration: 5000 })
-                    that.getHisOrderList()
-
-                  }
-                }
-              })
-              .catch(function(error) {
-              })
           }).catch(() => {
           })
 
-        } else if (this.$store.getters.xt_user.org_id == 0 || this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138) {
+        } else {
+
+          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990) {
             var that = this
-          this.$confirm('是否退费', '退费', {
-            confirmButtonText: '确 定',
-            cancelButtonText: '取 消',
-            type: 'warning'
-          }).then(() => {
-            let params = {
-              'order_id': row.id,
-              'patient_id': row.patient_id,
-              'record_time': this.getTimes(row.settle_accounts_date),
-              'admin_user_id': this.$store.getters.xt_user.user.id
-            }
-            axios.get('http://127.0.0.1:9532/sz/api/refund/get', {
-              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.$confirm(response.data.data.msg, '医保错误信息', {
-                      confirmButtonText: '确 定',
-                      type: 'warning'
-                    }).then(() => {
+            this.$confirm('是否退费', '退费', {
+              confirmButtonText: '确 定',
+              cancelButtonText: '取 消',
+              type: 'warning'
+            }).then(() => {
+              let params = {
+                'order_id': row.id,
+                'patient_id': row.patient_id,
+                'record_time': that.getTimes(row.settle_accounts_date),
+                'admin_user_id': that.$store.getters.xt_user.user.id
+              }
+              axios.get('http://127.0.0.1:9532/api/refund/post', {
+                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: '退费成功', type: 'success', duration: 5000 })
+                      that.getHisOrderList()
 
-                    }).catch(() => {
-                    })
+                    }
+                  }
+                })
+                .catch(function(error) {
+                })
+            }).catch(() => {
+            })
 
+          } else if (this.$store.getters.xt_user.org_id == 0 || this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138) {
+            var that = this
+            this.$confirm('是否退费', '退费', {
+              confirmButtonText: '确 定',
+              cancelButtonText: '取 消',
+              type: 'warning'
+            }).then(() => {
+              let params = {
+                'order_id': row.id,
+                'patient_id': row.patient_id,
+                'record_time': this.getTimes(row.settle_accounts_date),
+                'admin_user_id': this.$store.getters.xt_user.user.id
+              }
+              axios.get('http://127.0.0.1:9532/sz/api/refund/get', {
+                params: params
+              })
+                .then(function(response) {
+                  if (response.data.state == 0) {
+                    that.$message.error(response.data.msg)
+                    return false
                   } else {
-                    that.$message({ message: '退费成功', type: 'success', duration: 5000 })
-                    that.getHisOrderList()
+                    if (response.data.data.failed_code == -10) {
+                      that.$confirm(response.data.data.msg, '医保错误信息', {
+                        confirmButtonText: '确 定',
+                        type: 'warning'
+                      }).then(() => {
+
+                      }).catch(() => {
+                      })
+
+                    } else {
+                      that.$message({ message: '退费成功', type: 'success', duration: 5000 })
+                      that.getHisOrderList()
+                    }
                   }
-                }
-              })
-              .catch(function(error) {
-              })
+                })
+                .catch(function(error) {
+                })
 
-          }).catch(() => {
-          })
+            }).catch(() => {
+            })
 
-        } else {
-          this.$confirm('是否退费', '退费', {
-            confirmButtonText: '确 定',
-            cancelButtonText: '取 消',
-            type: 'warning'
-          }).then(() => {
-            let params = {
-              'order_id': this.order.id,
-              'patient_id': this.patientInfo.id,
-              'record_time': this.record_date
+          } else {
+            this.$confirm('是否退费', '退费', {
+              confirmButtonText: '确 定',
+              cancelButtonText: '取 消',
+              type: 'warning'
+            }).then(() => {
+              let params = {
+                'order_id': row.id,
+                'patient_id':  row.patient_id,
+                'record_time':this.getTimes(row.settle_accounts_date),
 
-            }
-            Refund(params).then(response => {
-              if (response.data.state == 0) {
-                this.$message.error(response.data.msg)
-                return false
-              } else {
-                this.$message({ message: '退费成功', type: 'success' })
-                this.getHisOrderList()
               }
+              Refund(params).then(response => {
+                if (response.data.state == 0) {
+                  this.$message.error(response.data.msg)
+                  return false
+                } else {
+                  this.$message({ message: '退费成功', type: 'success' })
+                  this.getHisOrderList()
+                }
+              })
+            }).catch(() => {
             })
-          }).catch(() => {
-          })
+          }
         }
-      },
-      toPrint(row) {
+      }, toPrint(row) {
         if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10138) {
-         if(row.mdtrt_id.indexOf("H") > -1){
-          this.statementVisible9504 = true
+          if (row.mdtrt_id.indexOf('H') > -1) {
+            this.statementVisible9504 = true
             let obj = {
               order_id: row.id,
               patient_id: row.patient_id,
@@ -509,20 +529,19 @@
               admin_user_id: this.$store.getters.xt_user.user.id
             }
             this.orderObj9504 = obj
-         }else{
-           
-           this.statementVisible9504 = true
+          } else {
+
+            this.statementVisible9504 = true
             let obj = {
               order_id: row.id,
               patient_id: row.patient_id,
               record_time: this.getTimes(row.settle_accounts_date),
               admin_user_id: this.$store.getters.xt_user.user.id,
-              balance_accounts_type:2
+              balance_accounts_type: 2
             }
             this.orderObj9504 = obj
-         }
+          }
 
-         
         } else {
           this.statementVisible = true
           let obj = {

src/xt_pages/workforce/appointment.vue

@@ -2772,16 +2772,16 @@
                 let weekOfday = parseInt(moment().format('d')) 
                 start_time =  this.getTimestamp(moment().subtract(weekOfday + 6, 'days').format('YYYY-MM-DD')) -28800
                 end_time =  this.getTimestamp(moment().subtract(weekOfday, 'days').format('YYYY-MM-DD')) -28800
-                // console.log("start",start_time)
-                // console.log("end",end_time)
+                console.log("start",start_time)
+                console.log("end",end_time)
              }
             
             //本周
              if(this.form.lastweek == "2"){
                 start_time = this.getTimestamp(this.weekDayArr[0])
                 end_time = this.getTimestamp(this.weekDayArr[6])
-                // console.log("start",start_time)
-                // console.log("end",end_time)
+                console.log("start",start_time)
+                console.log("end",end_time)
              }
 
             var label = ""
@@ -2801,7 +2801,8 @@
               copy_endtime:copy_endtime,
             }
          
-         
+           console.log("param22222",params)
+           
            this.$refs[formName].validate(valid=>{
               if(valid){
                 copyPatientSchedule(params).then(response=>{