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/summary.vue

         <el-table-column align="center" prop="name" label="操作">
           <template slot-scope="scope">
             <el-button size="mini" type="primary" @click="toDetail(scope.row)">详情</el-button>
-            <el-button size="mini" type="primary" @click="toPrint(scope.row)" v-if="scope.row.order_status == 2">结算单</el-button>
+            <el-button size="mini" type="primary" @click="toPrint(scope.row)" v-if="(scope.row.order_status == 2 || this.$store.getters.xt_user.org_id == 9504) && (scope.row.order_status == 2 || this.$store.getters.xt_user.org_id == 9919)">结算单</el-button>
           </template>
         </el-table-column>
       </el-table>
       <allListPrint :paramsObj='paramsObj'></allListPrint>
     </el-dialog>
 
+    <el-dialog
+            class="centerDialog"
+            width="1200px"
+            title="打印"
+            :visible.sync="statementVisible9504">
+      <!--<statementPrint ref="print" :paramsObj='orderObj'></statementPrint>-->
+      <!--<new-statement-print ref="print" :paramsObj='orderObj9504'></new-statement-print>-->
+      <new-statement-print-two ref="print" :paramsObj='orderObj9504'></new-statement-print-two>
+    </el-dialog>
+
 
   </div>
 </template>
   import NewStatementPrint from './newStatementPrint'
   import listPrint from './listPrint'
   import allListPrint from './allListPrint'
+  import NewStatementPrintTwo from './newStatementPrintTwo'
 
 
   export default {
     components: {
+      NewStatementPrintTwo,
       NewStatementPrint,
       BreadCrumb,
       listPrint,
       return {
         orderObj: {},
         statementVisible: false,
+        statementVisible9504:false,
+        orderObj9504:{},
         crumbs: [
           { path: false, name: '门诊收费' },
           { path: false, name: '项目消费明细汇总' }
     },
     methods: {
       toPrint(row){
-        this.statementVisible = true
-        let obj = {
-          order_id: row.id
+        if(this.$store.getters.xt_user.org_id == 9504){
+          this.statementVisible9504 = true
+          let obj = {
+            order_id: row.id,
+            patient_id: row.patient_id,
+            record_time: this.getTimes(row.settle_accounts_date),
+            admin_user_id: this.$store.getters.xt_user.user.id,
+          }
+          this.orderObj9504 = obj
+        }else {
+          this.statementVisible = true
+          let obj = {
+            order_id: row.id
+          }
+          this.orderObj = obj
         }
-        this.orderObj = obj
 
       },
       export_detail(){

src/xt_pages/role/components/AdminInfoForm.vue

                 }
                 this.form.user_title = admin.user_title
                 this.form.role = admin.role_ids
+               
                 this.form.department_id = admin.department_id
+                if(admin.department_id == 0){
+                   this.form.department_id = ""
+                }
                 this.form.role_ids = []
                 for (let i = 0; i < this.form.role.split(",").length; i++) {
                   if (this.form.role.split(',')[i].length > 0) {
                 }
                 this.isSubSuperAdmin = resp.data.isSubSuperAdmin
                 this.org = resp.data.org
+                
+               
                 this.form.sex = admin.sex
+                if(admin.sex == 0){
+                   this.form.sex = ""
+                }
                 this.form.age = admin.age
+                if(admin.age == 0){
+                  this.form.age = ""
+                }
                 this.form.nation = admin.nation
                 this.form.card_type = admin.card_type
+                if(admin.card_type == 0){
+                  this.form.card_type = ""
+                }
                 this.form.id_card = admin.id_card
                 this.form.education = admin.education
+                if(admin.education == 0){
+                  this.form.education = ""
+                }
                 this.form.study_major_name = admin.study_major_name
                 this.form.work_major_name = admin.work_major_name
                 this.form.role_type = admin.role_type
+                if(admin.role_type == 0){
+                  this.form.role_type = ""
+                }
                 this.form.medical_code = admin.medical_code
                 this.form.doctor_code = admin.doctor_code
                 this.form.licensing = admin.licensing
+                if(admin.licensing == 0){
+                  this.form.licensing = ""
+                }
                 this.form.job_number = admin.job_number
                 this.form.prescription_qualification_identification = admin.prescription_qualification_identification
+                if(admin.prescription_qualification_identification == 0){
+                   this.form.prescription_qualification_identification = ""
+                }
                 this.form.identification_outpatients = admin.identification_outpatients
                 this.form.start_time = this.getTime(admin.start_time)
                 this.form.medical_range_code = admin.medical_range_code
                 this.form.doctor_number = admin.doctor_number
                 this.form.is_active = admin.is_active
                 console.log("2222222",this.form.is_active)
+               
                 this.form.active_status = admin.active_status
+                if(admin.active_status == 0){
+                   this.form.active_status = ""
+                }
               
                 var id = 0
                 for(let i=0;i<this.numberList.length;i++){
                 }
                 console.log("id2222222",id)
                 this.form.outpatient_illnessCategory = id
-              
+                 if(id == 0){
+                   this.form.outpatient_illnessCategory = ""
+                 }
                 //如果当前用户是超级管理员而且编辑自己的信息
 
                 if(!this.isSubSuperAdmin) {