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

@@ -211,6 +211,9 @@
       </div>
     </div>
     <additionalCharges ref='additionalCharges' @click="addCharges" :addtions_charge="addtions_charge"></additionalCharges>
+
+   <register-dialog></register-dialog>
+
     <el-dialog
       class="centerDialog"
       width="900px"
@@ -231,11 +234,13 @@
   import additionalCharges from './components/additionalCharges'
   import { getPatientInformation, getPatientList } from '@/api/project/project'
   import { getPatientInfo, getSchedulePatientList, register, upload,Refund } from '@/api/his/his'
+  import RegisterDialog from "./components/registerDialog";
   import treatPrint from './treatPrint'
 
   const moment = require('moment')
   export default {
     components: {
+      RegisterDialog,
       BreadCrumb,
       noCharge,
       charged,
@@ -243,7 +248,7 @@
       prescriptionTable,
       additionalCharges,
       treatPrint,
-      
+
     },
     data() {
       return {
@@ -485,7 +490,7 @@
         }
       },
       open(index) {
-        console.log('index', index)
+
         if (index == 1) {
 
         } else if (index == 2) {

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -576,6 +576,8 @@
             this.department = response.data.data.department
             this.sick = response.data.data.sick
             this.diagnoses = response.data.data.diagnose
+            this.additions = response.data.data.additions
+
             // var info = response.data.data.info
             // if (info.user_type == 2 || info.user_type == 1) {
             //   this.doctorValue = info.admin_user_id
@@ -710,7 +712,14 @@
               this.doctorValue = admin_info.admin_user_id
               if (admin_info.department_id == 0) {
                 if (this.department.length > 0) {
-                  this.departmentValue = department[0].id
+                  if(department && department.length > 0){
+                    this.departmentValue = department[0].id
+
+                  }else{
+
+                    this.departmentValue = ''
+
+                  }
                 } else {
                   this.departmentValue = ''
                 }

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -118,7 +118,7 @@
       title="打印"
       :visible.sync="innerVisible"
       append-to-body>
-      
+
       <print v-if="index == 2" :paramsObj='paramsObj'></print>
       <treatPrint v-if="index == 6" :paramsObj='paramsObj'></treatPrint>
     </el-dialog>
@@ -210,7 +210,8 @@
         innerVisible:false,
         paramsObj:{},
         recordVisible:false,
-        recordObj:{}
+        recordObj:{},
+        additions:[],
 
       }
     },
@@ -877,7 +878,7 @@
            }
            this.paramsObj = obj
            this.innerVisible = true
-           
+
           //  this.$router.push("/outpatientDoctorStation/print?record="+this.record_date+"&prescription_id="+this.prescription_id+"&ids="+ids+"&patient_id="+this.patientid)
          }
          if(this.index == 6){