Browse Source

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

csx 4 years ago
parent
commit
085e785294

+ 2 - 2
src/xt_pages/outpatientCharges/outpatientChargesManagement.vue View File

@@ -55,7 +55,7 @@
55 55
                      v-if="this.hisPatientInfo && this.hisPatientInfo.id == 0"
56 56
                      type="primary">挂号
57 57
           </el-button>
58
-          <el-button v-loading="loadingtwo" size="small"
58
+          <el-button v-loading="loadingtwo" v-if="this.info.prescription_status == 1" size="small"
59 59
                      @click="open(4)"
60 60
                      type="primary">收费
61 61
           </el-button>
@@ -365,7 +365,7 @@
365 365
 
366 366
 
367 367
       }, cancel() {
368
-        
368
+
369 369
         this.$refs.register.hide()
370 370
 
371 371
 

+ 39 - 38
src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue View File

@@ -198,44 +198,44 @@
198 198
                 </div>
199 199
 
200 200
               </el-tab-pane>
201
-              <el-tab-pane label="医嘱模板" name="2">
202
-                <div style="margin-bottom:5px;">
203
-                  <!--<el-input style="width:50%;" v-model="input" placeholder=""></el-input>-->
204
-                  <el-select style="float: right;width: 49%;" v-model="value" placeholder="">
205
-                    <el-option
206
-                      v-for="item in options"
207
-                      :key="item.value"
208
-                      :label="item.label"
209
-                      :value="item.value">
210
-                    </el-option>
211
-                  </el-select>
212
-                </div>
213
-                <div style="width: 100%;flex:1;overflow-y: auto;">
214
-                  <el-table ref="multipleTableTwo" :height="multipleTableHeight != '' ? multipleTableHeight : '200'"
215
-                            :data="advices_template" border
216
-                            :row-style="{ color: '#303133' }"
217
-                            :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
218
-                            highlight-current-row
219
-                            @select='selectTemplate'
220
-                            @select-all="changeTemplateData"
221
-
222
-                  >
223
-                    <el-table-column type="selection" width="40" align="center"></el-table-column>
224
-                    <el-table-column prop="name" label="名称">
225
-                      <template slot-scope="scope">{{scope.row.name}}</template>
226
-                    </el-table-column>
227
-                    <!--<el-table-column label="规格" width="60">-->
228
-                    <!--<template slot-scope="scope">33</template>-->
229
-                    <!--</el-table-column>-->
230
-                    <!--<el-table-column label="库存" width="60">-->
231
-                    <!--<template slot-scope="scope">22</template>-->
232
-                    <!--</el-table-column>-->
233
-                    <!--<el-table-column label="单价" width="40">-->
234
-                    <!--<template slot-scope="scope">12</template>-->
201
+              <!--<el-tab-pane label="医嘱模板" name="2">-->
202
+                <!--<div style="margin-bottom:5px;">-->
203
+                  <!--&lt;!&ndash;<el-input style="width:50%;" v-model="input" placeholder=""></el-input>&ndash;&gt;-->
204
+                  <!--<el-select style="float: right;width: 49%;" v-model="value" placeholder="">-->
205
+                    <!--<el-option-->
206
+                      <!--v-for="item in options"-->
207
+                      <!--:key="item.value"-->
208
+                      <!--:label="item.label"-->
209
+                      <!--:value="item.value">-->
210
+                    <!--</el-option>-->
211
+                  <!--</el-select>-->
212
+                <!--</div>-->
213
+                <!--<div style="width: 100%;flex:1;overflow-y: auto;">-->
214
+                  <!--<el-table ref="multipleTableTwo" :height="multipleTableHeight != '' ? multipleTableHeight : '200'"-->
215
+                            <!--:data="advices_template" border-->
216
+                            <!--:row-style="{ color: '#303133' }"-->
217
+                            <!--:header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"-->
218
+                            <!--highlight-current-row-->
219
+                            <!--@select='selectTemplate'-->
220
+                            <!--@select-all="changeTemplateData"-->
221
+
222
+                  <!--&gt;-->
223
+                    <!--<el-table-column type="selection" width="40" align="center"></el-table-column>-->
224
+                    <!--<el-table-column prop="name" label="名称">-->
225
+                      <!--<template slot-scope="scope">{{scope.row.name}}</template>-->
235 226
                     <!--</el-table-column>-->
236
-                  </el-table>
237
-                </div>
238
-              </el-tab-pane>
227
+                    <!--&lt;!&ndash;<el-table-column label="规格" width="60">&ndash;&gt;-->
228
+                    <!--&lt;!&ndash;<template slot-scope="scope">33</template>&ndash;&gt;-->
229
+                    <!--&lt;!&ndash;</el-table-column>&ndash;&gt;-->
230
+                    <!--&lt;!&ndash;<el-table-column label="库存" width="60">&ndash;&gt;-->
231
+                    <!--&lt;!&ndash;<template slot-scope="scope">22</template>&ndash;&gt;-->
232
+                    <!--&lt;!&ndash;</el-table-column>&ndash;&gt;-->
233
+                    <!--&lt;!&ndash;<el-table-column label="单价" width="40">&ndash;&gt;-->
234
+                    <!--&lt;!&ndash;<template slot-scope="scope">12</template>&ndash;&gt;-->
235
+                    <!--&lt;!&ndash;</el-table-column>&ndash;&gt;-->
236
+                  <!--</el-table>-->
237
+                <!--</div>-->
238
+              <!--</el-tab-pane>-->
239 239
             </el-tabs>
240 240
           </div>
241 241
           <div style="height:100%;" v-show="showTwo">
@@ -461,6 +461,7 @@
461 461
         }
462 462
         this.curPrescriptions = this.prescriptions[0]
463 463
         this.$refs.call_prescription.close()
464
+        this.$emit('setData',this.prescriptions)
464 465
 
465 466
       },
466 467
       callCancel(){
@@ -496,7 +497,7 @@
496 497
         }
497 498
         this.curPrescriptions = this.prescriptions[0]
498 499
         this.request_record_date = this.record_date
499
-
500
+        this.$emit('setData',this.prescriptions)
500 501
 
501 502
       },
502 503
       GetNextOrLastHisPrescription(params) {

+ 4 - 1
src/xt_pages/outpatientDoctorStation/doctorDesk.vue View File

@@ -67,7 +67,7 @@
67 67
         </div>
68 68
         <!--<desk-prescription ref="prescriptions"   :prescriptions="prescriptions" :patientInfo="patientInfo" :hisPatientInfo="hisPatientInfo"-->
69 69
         <!--v-if="titleType == '处方'" style="flex:1;"></desk-prescription>-->
70
-        <desk-prescription  :addtions_charge="addtions_charge" :diagnoses="diagnoses" :other_sick="other_sick" :record_date="record_date"
70
+        <desk-prescription v-on:setData="setData"  :addtions_charge="addtions_charge" :diagnoses="diagnoses" :other_sick="other_sick" :record_date="record_date"
71 71
                           ref="prescriptions" :prescriptions="prescriptions" :patientInfo="patientInfo"
72 72
                           :hisPatientInfo="hisPatientInfo" @event1="changetwo($event)"
73 73
                           v-if="titleType == '电子处方'" style="flex:1;" v-on:change="changeTab"></desk-prescription>
@@ -217,6 +217,9 @@
217 217
       }
218 218
     },
219 219
     methods: {
220
+      setData(val){
221
+        this.prescriptions = val
222
+      },
220 223
       getDictionaryDataConfig(module, filed_name) {
221 224
         console.log(getDictionaryDataConfig(module, filed_name))
222 225
         return getDictionaryDataConfig(module, filed_name)