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

@@ -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
 
               }
@@ -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
 
                   }

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 = {