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

                      v-if="this.hisPatientInfo && this.hisPatientInfo.id == 0"
                      type="primary">挂号
           </el-button>
-          <el-button v-loading="loadingtwo" size="small"
+          <el-button v-loading="loadingtwo" v-if="this.info.prescription_status == 1" size="small"
                      @click="open(4)"
                      type="primary">收费
           </el-button>
 
 
       }, cancel() {
-        
+
         this.$refs.register.hide()
 
 

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

                 </div>
 
               </el-tab-pane>
-              <el-tab-pane label="医嘱模板" name="2">
-                <div style="margin-bottom:5px;">
-                  <!--<el-input style="width:50%;" v-model="input" placeholder=""></el-input>-->
-                  <el-select style="float: right;width: 49%;" v-model="value" placeholder="">
-                    <el-option
-                      v-for="item in options"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value">
-                    </el-option>
-                  </el-select>
-                </div>
-                <div style="width: 100%;flex:1;overflow-y: auto;">
-                  <el-table ref="multipleTableTwo" :height="multipleTableHeight != '' ? multipleTableHeight : '200'"
-                            :data="advices_template" border
-                            :row-style="{ color: '#303133' }"
-                            :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
-                            highlight-current-row
-                            @select='selectTemplate'
-                            @select-all="changeTemplateData"
-
-                  >
-                    <el-table-column type="selection" width="40" align="center"></el-table-column>
-                    <el-table-column prop="name" label="名称">
-                      <template slot-scope="scope">{{scope.row.name}}</template>
-                    </el-table-column>
-                    <!--<el-table-column label="规格" width="60">-->
-                    <!--<template slot-scope="scope">33</template>-->
-                    <!--</el-table-column>-->
-                    <!--<el-table-column label="库存" width="60">-->
-                    <!--<template slot-scope="scope">22</template>-->
-                    <!--</el-table-column>-->
-                    <!--<el-table-column label="单价" width="40">-->
-                    <!--<template slot-scope="scope">12</template>-->
+              <!--<el-tab-pane label="医嘱模板" name="2">-->
+                <!--<div style="margin-bottom:5px;">-->
+                  <!--&lt;!&ndash;<el-input style="width:50%;" v-model="input" placeholder=""></el-input>&ndash;&gt;-->
+                  <!--<el-select style="float: right;width: 49%;" v-model="value" placeholder="">-->
+                    <!--<el-option-->
+                      <!--v-for="item in options"-->
+                      <!--:key="item.value"-->
+                      <!--:label="item.label"-->
+                      <!--:value="item.value">-->
+                    <!--</el-option>-->
+                  <!--</el-select>-->
+                <!--</div>-->
+                <!--<div style="width: 100%;flex:1;overflow-y: auto;">-->
+                  <!--<el-table ref="multipleTableTwo" :height="multipleTableHeight != '' ? multipleTableHeight : '200'"-->
+                            <!--:data="advices_template" border-->
+                            <!--:row-style="{ color: '#303133' }"-->
+                            <!--:header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"-->
+                            <!--highlight-current-row-->
+                            <!--@select='selectTemplate'-->
+                            <!--@select-all="changeTemplateData"-->
+
+                  <!--&gt;-->
+                    <!--<el-table-column type="selection" width="40" align="center"></el-table-column>-->
+                    <!--<el-table-column prop="name" label="名称">-->
+                      <!--<template slot-scope="scope">{{scope.row.name}}</template>-->
                     <!--</el-table-column>-->
-                  </el-table>
-                </div>
-              </el-tab-pane>
+                    <!--&lt;!&ndash;<el-table-column label="规格" width="60">&ndash;&gt;-->
+                    <!--&lt;!&ndash;<template slot-scope="scope">33</template>&ndash;&gt;-->
+                    <!--&lt;!&ndash;</el-table-column>&ndash;&gt;-->
+                    <!--&lt;!&ndash;<el-table-column label="库存" width="60">&ndash;&gt;-->
+                    <!--&lt;!&ndash;<template slot-scope="scope">22</template>&ndash;&gt;-->
+                    <!--&lt;!&ndash;</el-table-column>&ndash;&gt;-->
+                    <!--&lt;!&ndash;<el-table-column label="单价" width="40">&ndash;&gt;-->
+                    <!--&lt;!&ndash;<template slot-scope="scope">12</template>&ndash;&gt;-->
+                    <!--&lt;!&ndash;</el-table-column>&ndash;&gt;-->
+                  <!--</el-table>-->
+                <!--</div>-->
+              <!--</el-tab-pane>-->
             </el-tabs>
           </div>
           <div style="height:100%;" v-show="showTwo">
         }
         this.curPrescriptions = this.prescriptions[0]
         this.$refs.call_prescription.close()
+        this.$emit('setData',this.prescriptions)
 
       },
       callCancel(){
         }
         this.curPrescriptions = this.prescriptions[0]
         this.request_record_date = this.record_date
-
+        this.$emit('setData',this.prescriptions)
 
       },
       GetNextOrLastHisPrescription(params) {

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

         </div>
         <!--<desk-prescription ref="prescriptions"   :prescriptions="prescriptions" :patientInfo="patientInfo" :hisPatientInfo="hisPatientInfo"-->
         <!--v-if="titleType == '处方'" style="flex:1;"></desk-prescription>-->
-        <desk-prescription  :addtions_charge="addtions_charge" :diagnoses="diagnoses" :other_sick="other_sick" :record_date="record_date"
+        <desk-prescription v-on:setData="setData"  :addtions_charge="addtions_charge" :diagnoses="diagnoses" :other_sick="other_sick" :record_date="record_date"
                           ref="prescriptions" :prescriptions="prescriptions" :patientInfo="patientInfo"
                           :hisPatientInfo="hisPatientInfo" @event1="changetwo($event)"
                           v-if="titleType == '电子处方'" style="flex:1;" v-on:change="changeTab"></desk-prescription>
       }
     },
     methods: {
+      setData(val){
+        this.prescriptions = val
+      },
       getDictionaryDataConfig(module, filed_name) {
         console.log(getDictionaryDataConfig(module, filed_name))
         return getDictionaryDataConfig(module, filed_name)