Просмотр исходного кода

Merge branch '20200710_pc_vue_new_branch' into 20200916_pc_vue_new_branch

csx 4 лет назад
Родитель
Сommit
232bdc2176

+ 14 - 7
src/api/his/his.js Просмотреть файл

@@ -63,16 +63,23 @@ export function createHisPrescription(data, params) {
63 63
 
64 64
 
65 65
 
66
+export function register(params) {
67
+  return request({
68
+    url: "/api/register/get",
69
+    method: "get",
70
+    params:params,
71
+  });
72
+}
66 73
 
74
+export function upload(params) {
75
+  return request({
76
+    url: "/api/upload/get",
77
+    method: "get",
78
+    params:params,
79
+  });
80
+}
67 81
 
68 82
 
69
-// export function createCaseHistory(params) {
70
-//   return request({
71
-//     url: "/api/doctorworkstation/casehistory/create",
72
-//     method: "post",
73
-//     params:params
74
-//   });
75
-// }
76 83
 
77 84
 
78 85
 

+ 60 - 13
src/xt_pages/outpatientCharges/outpatientChargesManagement.vue Просмотреть файл

@@ -41,9 +41,13 @@
41 41
           <el-button size="small" @click="open(1)" type="primary" style="margin-left:10px;">打印处置单</el-button>
42 42
           <el-button size="small" @click="open(2)" type="primary">打印治疗单</el-button>
43 43
           <el-button size="small" @click="open(3)" type="primary">打印</el-button>
44
-          <el-button v-if="hisPatientInfo == null || hisPatientInfo.id == 0 " size="small" @click="open(6)" type="primary">挂号</el-button>
45
-          <el-button v-if="hisPatientInfo != null && hisPatientInfo.id > 0 " size="small" @click="open(4)" type="primary">收费</el-button>
46
-          <el-button size="small" v-if="state == '已收费'" @click="open(5)" type="primary">退费</el-button>
44
+          <el-button v-loading="loadingone" v-if="hisPatientInfo == null || hisPatientInfo.id == 0 " size="small" @click="open(6)"
45
+                     type="primary">挂号
46
+          </el-button>
47
+          <el-button v-loading="loadingtwo" v-if="hisPatientInfo != null && hisPatientInfo.id > 0 " size="small" @click="open(4)"
48
+                     type="primary">收费
49
+          </el-button>
50
+          <el-button size="small" @click="open(5)" type="primary">退费</el-button>
47 51
         </div>
48 52
         <div class="mainCenter">
49 53
           <div class="centerLeft">
@@ -111,7 +115,7 @@
111 115
   import prescriptionTable from './components/prescriptionTable'
112 116
   import additionalCharges from './components/additionalCharges'
113 117
   import { getPatientInformation, getPatientList } from '@/api/project/project'
114
-  import { getPatientInfo, getSchedulePatientList } from '@/api/his/his'
118
+  import { getPatientInfo, getSchedulePatientList, register,upload } from '@/api/his/his'
115 119
 
116 120
   const moment = require('moment')
117 121
   export default {
@@ -134,18 +138,19 @@
134 138
         record_date: '',
135 139
         tableData: [],
136 140
         editableTabsValue: '1',
141
+        loadingone:false,
137 142
         editableTabs: [{
138 143
           title: '处方1',
139 144
           name: '1'
140 145
         }],
141 146
         tabIndex: 1,
142 147
         hisPatientInfo: {},
143
-
148
+        loadingtwo:false,
144 149
         patientTableData: [{
145 150
           name: '杨美英',
146 151
           mdtrt_id: '1709946'
147 152
         }],
148
-        patientInfo: {},
153
+        patientInfo: { id: 0 },
149 154
         doctor: {},
150 155
         total: 0,
151 156
         state: '未收费',
@@ -171,16 +176,16 @@
171 176
       this.getPatientList()
172 177
     },
173 178
     methods: {
174
-      tabclickEvent(val){
175
-        for (let i= 0; i<this.prescriptions.length; i++){
176
-          if(this.prescriptions[i].name == val.name){
179
+      tabclickEvent(val) {
180
+        for (let i = 0; i < this.prescriptions.length; i++) {
181
+          if (this.prescriptions[i].name == val.name) {
177 182
             this.curPrescriptions = {}
178
-             var temp = this.deepClone(this.prescriptions[i])
183
+            var temp = this.deepClone(this.prescriptions[i])
179 184
             this.curPrescriptions = temp
180 185
             console.log(this.curPrescriptions)
181 186
           }
182 187
         }
183
-      },deepClone(source) {
188
+      }, deepClone(source) {
184 189
         if (!source && typeof source !== 'object') {
185 190
           throw new Error('error arguments', 'shallowClone')
186 191
         }
@@ -203,7 +208,7 @@
203 208
               total = total + this.prescriptions[i].advices[a].price * this.prescriptions[i].advices[a].prescribing_number
204 209
             }
205 210
           }
206
-          if(this.prescriptions[i].project != null) {
211
+          if (this.prescriptions[i].project != null) {
207 212
             for (let b = 0; b < this.prescriptions[i].project.length; b++) {
208 213
               total = total + this.prescriptions[i].project[b].price * this.prescriptions[i].project[b].count
209 214
             }
@@ -221,12 +226,54 @@
221 226
         } else if (index == 2) {
222 227
 
223 228
         } else if (index == 4) {
229
+
230
+          let params = {
231
+            'id': this.patientInfo.id,
232
+            'record_time': this.record_date
233
+          }
234
+          this.loadingtwo = true
235
+          upload(params).then(response => {
236
+            if (response.data.state == 0) {
237
+              this.$message.error(response.data.msg)
238
+              this.loadingtwo = false
239
+
240
+              return false
241
+
242
+            } else {
243
+              this.loadingtwo = false
244
+
245
+            }
246
+          })
247
+
224 248
           this.state = '已收费'
225 249
           this.$message({ message: '收费成功', type: 'success' })
226 250
         } else if (index == 5) {
227 251
           this.$message({ message: '退费成功', type: 'success' })
228
-        }
252
+        } else if (index == 6) {
229 253
 
254
+          if (this.patientInfo.id == 0) {
255
+            this.$message.error('请先选择要挂号的病人')
256
+            return
257
+          }
258
+          let params = {
259
+            'id': this.patientInfo.id,
260
+            'record_time': this.record_date
261
+          }
262
+          this.loadingone = true
263
+          register(params).then(response => {
264
+            if (response.data.state == 0) {
265
+              this.$message.error(response.data.msg)
266
+              this.loadingone = false
267
+
268
+              return false
269
+
270
+            } else {
271
+              this.loadingone = false
272
+              var his_info = response.data.data.his_info
273
+              this.hisPatientInfo = his_info
274
+            }
275
+          })
276
+        }
230 277
       },
231 278
       addTab(targetName) {
232 279
         let newTabName = ++this.tabIndex + ''

+ 10 - 10
src/xt_pages/outpatientCharges/summaryDetail.vue Просмотреть файл

@@ -7,7 +7,7 @@
7 7
             <div class="mainCenter">
8 8
                 <div class="centerLeft">
9 9
                     <div class="tabsBox">
10
-                        <el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button>
10
+                        <!--<el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button>-->
11 11
                         <el-tabs class="preTabs" v-model="editableTabsValue" type="card" closable @tab-remove="removeTab" :before-leave="moreState">
12 12
                             <el-tab-pane
13 13
                                 v-for="(item, index) in editableTabs"
@@ -23,48 +23,48 @@
23 23
                                     </el-table-column>
24 24
                                     <el-table-column align="center" prop="name" width="50" label="组套">
25 25
                                         <template slot-scope="scope">
26
-                                            
26
+
27 27
                                         </template>
28 28
                                     </el-table-column>
29 29
                                     <el-table-column align="center" prop="name" width="50" :label="'单次\n用量'">
30 30
                                         <template slot-scope="scope">
31
-                                            
31
+
32 32
                                         </template>
33 33
                                     </el-table-column>
34 34
                                     <el-table-column align="center" prop="name" width="50" label="用法">
35 35
                                         <template slot-scope="scope">
36
-                                            
36
+
37 37
                                         </template>
38 38
                                     </el-table-column>
39 39
                                     <el-table-column align="center" prop="name" width="50" label="频率">
40 40
                                         <template slot-scope="scope">
41
-                                            
41
+
42 42
                                         </template>
43 43
                                     </el-table-column>
44 44
                                     <el-table-column align="center" prop="name" width="50" label="天数">
45 45
                                         <template slot-scope="scope">
46
-                                            
46
+
47 47
                                         </template>
48 48
                                     </el-table-column>
49 49
                                     <el-table-column align="center" prop="name" width="100" label="总量">
50 50
                                         <template slot-scope="scope">
51
-                                            
51
+
52 52
                                         </template>
53 53
                                     </el-table-column>
54 54
                                     <el-table-column align="center" prop="name" width="50" label="单价">
55 55
                                         <template slot-scope="scope">
56
-                                            
56
+
57 57
                                         </template>
58 58
                                     </el-table-column>
59 59
                                     <el-table-column align="center" prop="name" width="50" label="备注">
60 60
                                         <template slot-scope="scope">
61
-                                            
61
+
62 62
                                         </template>
63 63
                                     </el-table-column>
64 64
                                 </el-table>
65 65
                             </el-tab-pane>
66 66
                         </el-tabs>
67
-                        
67
+
68 68
                     </div>
69 69
                     <div class="costBox">
70 70
                         <span>处方编号:2134348971237883</span>

+ 1 - 1
src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue Просмотреть файл

@@ -42,7 +42,7 @@
42 42
         </el-form>
43 43
         <div class="tabsBox">
44 44
 
45
-          <el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button>
45
+          <!--<el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button>-->
46 46
           <el-tabs class="preTabs" v-model="editableTabsValue" type="card" closable @tab-remove="removeTab"
47 47
                    :before-leave="moreState" @tab-click="tabclickEvent">
48 48
             <el-tab-pane