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

src/api/his/his.js

@@ -508,6 +508,16 @@ export function changeMedType(params) {
 }
 
 
+export function refunddetail(params) {
+  return request({
+    url: "/api/refunddetail/post",
+    method: "post",
+    params:params,
+  });
+}
+
+
+
 
 
 

src/xt_pages/hospitalStation/newStatementPrintTwo.vue

@@ -93,7 +93,7 @@
           })
             .then(function (response) {
               if (response.data.state == 0) {
-                this.$message.error(response.data.msg);
+                // this.$message.error(response.data.msg);
                 return false
               } else {
                 if (response.data.data.failed_code == -10) {

src/xt_pages/hospitalStation/outpatientChargesManagement.vue

@@ -3018,7 +3018,7 @@
             })
               .then(function(response) {
                 if (response.data.state == 0) {
-                  that.$message.error(response.data.msg);
+                  // that.$message.error(response.data.msg);
                   return false
                 } else {
                   if (response.data.data.failed_code == -10) {

src/xt_pages/hospitalStation/treatTemplate/printOne.vue

@@ -360,7 +360,7 @@
         })
           .then(function(response) {
             if (response.data.state == 0) {
-              that.$message.error(response.data.msg);
+              // that.$message.error(response.data.msg);
               return false
             } else {
               if (response.data.data.failed_code == -10) {

src/xt_pages/outpatientCharges/newStatementPrintTwo.vue

@@ -85,29 +85,29 @@
         if(this.$store.getters.xt_user.org_id == 10138){
           setTimeout(() => {
             const style =
-            '@media print {#prescription-print{font-size:16px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;}@media print {html {zoom: 49%;}}}';
+            '@media print {#prescription-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 49%;}}}';
             const style2 =
-            '@media print {#prescription-print{font-size:16px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;}@media print {html {zoom: 52%;}}}';
+            '@media print {#prescription-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 52%;}}}';
             const style3 =
-            '@media print {#prescription-print{font-size:16px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;}@media print {html {zoom: 55%;}}}';
+            '@media print {#prescription-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 55%;}}}';
             const style4 =
-            '@media print {#prescription-print{font-size:16px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;}@media print {html {zoom: 58%;}}}';
+            '@media print {#prescription-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 58%;}}}';
             const style5 =
-            '@media print {#prescription-print{font-size:16px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;}@media print {html {zoom: 61%;}}}';
+            '@media print {#prescription-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 61%;}}}';
             const style6 =
-            '@media print {#prescription-print{font-size:16px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;}@media print {html {zoom: 66%;}}}';
+            '@media print {#prescription-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 66%;}}}';
             const style7 =
-            '@media print {#prescription-print{font-size:16px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;}@media print {html {zoom: 71%;}}}';
+            '@media print {#prescription-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 71%;}}}';
             const style8 =
-            '@media print {#prescription-print{font-size:16px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;}@media print {html {zoom: 75%;}}}';
+            '@media print {#prescription-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 75%;}}}';
             const style9 =
-            '@media print {#prescription-print{font-size:16px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;}@media print {html {zoom: 80%;}}}';
+            '@media print {#prescription-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 80%;}}}';
             const style10 =
-            '@media print {#prescription-print{font-size:16px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;}@media print {html {zoom: 90%;}}}';
+            '@media print {#prescription-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 90%;}}}';
             const style11 =
-            '@media print {#prescription-print{font-size:16px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;}@media print {html {zoom: 91%;}}}';
+            '@media print {#prescription-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 91%;}}}';
             const style12 =
-            '@media print {#prescription-print{font-size:16px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;}@media print {html {zoom: 91%;}}}';
+            '@media print {#prescription-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 91%;}}}';
             if(this.num >= 13){
               printJS({
                 printable: "prescription-print",
@@ -228,7 +228,7 @@
           }
           getPrivateExpenses(params).then(response => {
             if (response.data.state == 0) {
-              this.$message.error(response.data.msg)
+              // this.$message.error(response.data.msg)
 
               return false
             } else {

src/xt_pages/outpatientCharges/newTreatTemplate/printTwo.vue

@@ -449,7 +449,7 @@
         })
           .then(function(response) {
             if (response.data.state == 0) {
-              that.$message.error(response.data.msg)
+              // that.$message.error(response.data.msg)
               return false
             } else {
               if (response.data.data.failed_code == -10) {

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -214,14 +214,14 @@
                                                     <div style="margin-bottom:10px;float: right">
 
 
-                                                        <div v-if="org_id == 9504 || org_id == 10028 || org_id == 10138">
+                                                        <div v-if="org_id == 9504 || org_id == 10028 || org_id == 10138 || org_id == 0">
 
 
                                                             <el-button
                                                                     v-if="(hisPatientInfo.id > 0 &&  items.prescriptions[0].order.id == 0) || (hisPatientInfo.id > 0 &&  items.prescriptions[0].order.order_status == 3)"
 
                                                                     size="small"
-                                                                    @click="sz_open(8,items.med_type,items.prescriptions[0].order)"
+                                                                    @click="sz_open(8,items.med_type,items.prescriptions[0].order,items.prescriptions)"
                                                                     type="primary"
                                                             >预结算
                                                             </el-button>
@@ -458,7 +458,7 @@
 
                                                     </el-tab-pane>
                                                     <div style="margin-bottom:10px;float: right">
-                                                        <div v-if="org_id == 9504 || org_id == 10028 || org_id == 10138">
+                                                        <div v-if="org_id == 9504 || org_id == 10028 || org_id == 10138 || org_id == 0">
 
                                                             <el-button
                                                                     v-if="(hisPatientInfo.id > 0 && items.curMonthPrescriptions.order.id == 0) || (hisPatientInfo.id > 0 && items.curMonthPrescriptions.order.order_status == 3)"
@@ -723,7 +723,8 @@
     refundNumber,
     register,
     upload,
-    changeMedType
+    changeMedType,
+    refunddetail
   } from '@/api/his/his'
   import RegisterDialog from './components/registerDialog'
   import treatPrint from './treatPrint'
@@ -898,6 +899,8 @@
 
         temp_prescriptions:null,
 
+        temp_ids:"",
+
       }
     },
     created() {
@@ -1031,7 +1034,7 @@
         form['p_type'] = this.current_med_type
         form['diagnosis'] = this.form.diagnosis.join(",")
         form['sick_type'] = this.form.sick_type
-
+        form['ids'] = this.temp_ids
         if (this.activeName == 'first') {
           form['settle_accounts_type'] = 1
 
@@ -1066,6 +1069,7 @@
 
           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 || this.$store.getters.xt_user.org_id == 0) {
             var that = this
+
             axios.get('http://127.0.0.1:9532/sz/api/settle/get', {
               params: form
             })
@@ -3383,8 +3387,22 @@
             this.cal_three = three_count
 
             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.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)
               }
@@ -4519,6 +4537,13 @@
             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_str = ids.join(",")
+            this.temp_ids = ids_str
+
             if (this.activeName == 'first') {
 
               this.$refs.charge.show(this.getTotalFour(prescriptions), this.currentOrder)
@@ -4604,7 +4629,7 @@
             })
               .then(function(response) {
                 if (response.data.state == 0) {
-                  that.$message.error(response.data.msg)
+                  // that.$message.error(response.data.msg)
                   return false
                 } else {
                   if (response.data.data.failed_code == -10) {
@@ -4625,6 +4650,7 @@
               })
             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: {
@@ -4658,9 +4684,35 @@
               })
               .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,
+                patient_id: this.patientInfo.id
+              }
+
+              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' })
+                  }
+                })
+
+              }
 
             break
           case 8:
+            var ids = []
+            for(let i = 0;i < prescriptions.length; i++){
+                ids.push(prescriptions[i].id)
+            }
+            var ids_str = ids.join(",")
+
             if (this.hisPatientInfo.balance_accounts_type == 2) {
 
               this.$confirm('是否进行预结算', '预结算', {
@@ -4674,7 +4726,7 @@
                 form['record_time'] = this.record_date
                 form['admin_user_id'] = this.$store.getters.xt_user.user.id
                 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['sick_type'] = this.form.sick_type
@@ -4701,6 +4753,8 @@
               })
 
             } else {
+
+
               var that = this
               let form = {}
               form['id'] = this.patientInfo.id