Browse Source

合并带嘛

csx 2 years ago
parent
commit
0a4adfe648
1 changed files with 16 additions and 3 deletions
  1. 16 3
      src/xt_pages/outpatientCharges/listPrint.vue

+ 16 - 3
src/xt_pages/outpatientCharges/listPrint.vue View File

112
               }, []) // 设置cur默认类型为数组,并且初始值为空的数组
112
               }, []) // 设置cur默认类型为数组,并且初始值为空的数组
113
               let tempOrderInfo = []
113
               let tempOrderInfo = []
114
               for (let i = 0; i < med_chrgitm_types.length; i++) {
114
               for (let i = 0; i < med_chrgitm_types.length; i++) {
115
+
115
                 let obj = {
116
                 let obj = {
116
                   details: [],
117
                   details: [],
117
                   med_chrgitm_name:this.getType(med_chrgitm_types[i]),
118
                   med_chrgitm_name:this.getType(med_chrgitm_types[i]),
121
                   noMedicineTotal:0,
122
                   noMedicineTotal:0,
122
                   bingTotal:0,
123
                   bingTotal:0,
123
                   otherTotal:0,
124
                   otherTotal:0,
125
+                  sort:0,
126
+                }
127
+
128
+                if(med_chrgitm_types[i] == '09'){
129
+                  obj.sort = 99
130
+                } else if(med_chrgitm_types[i] == '05'){
131
+                  obj.sort = 98
132
+                } else if(med_chrgitm_types[i] == '03'){
133
+                  obj.sort = 97
124
                 }
134
                 }
125
 
135
 
136
+
137
+
126
                 let tempDetails = []
138
                 let tempDetails = []
127
                 for (let b = 0; b < response.data.data.order_info.length; b++) {
139
                 for (let b = 0; b < response.data.data.order_info.length; b++) {
128
                   if (med_chrgitm_types[i] == response.data.data.order_info[b].med_chrgitm_type) {
140
                   if (med_chrgitm_types[i] == response.data.data.order_info[b].med_chrgitm_type) {
135
                 obj.noMedicineTotal = this.getNoMedicineTotal(tempDetails)
147
                 obj.noMedicineTotal = this.getNoMedicineTotal(tempDetails)
136
                 obj.bingTotal = this.getBingTotal(tempDetails)
148
                 obj.bingTotal = this.getBingTotal(tempDetails)
137
                 obj.otherTotal = this.getOtherTotal(tempDetails)
149
                 obj.otherTotal = this.getOtherTotal(tempDetails)
138
-
139
                 obj.details = this.set10265NewData(tempDetails)
150
                 obj.details = this.set10265NewData(tempDetails)
140
                 this.list.push(obj)
151
                 this.list.push(obj)
141
               }
152
               }
142
-              console.log(this.list)
153
+
154
+              this.list.sort((a,b) => a.sort < b.sort ? 1 : a.sort > b.sort ? -1 : 0)
155
+              console.log(  this.list)
156
+
143
             }else{
157
             }else{
144
               this.order = response.data.data.order
158
               this.order = response.data.data.order
145
               this.patient = response.data.data.patient
159
               this.patient = response.data.data.patient
146
-              console.log(this.patient)
147
               this.admin = response.data.data.admin_info
160
               this.admin = response.data.data.admin_info
148
               for (let i = 0; i < response.data.data.order_info.length; i++) {
161
               for (let i = 0; i < response.data.data.order_info.length; i++) {
149
                 var infos = response.data.data.order_info[i]
162
                 var infos = response.data.data.order_info[i]