合并带嘛

src/lang/zh.js

@@ -184,9 +184,6 @@ export default {
     selfPreparedMedicineIndex: '自备药管理',
     selfPreparedMedicine: '自备药管理',
     wareHouseManage: '仓库管理',
-    inventoryTransfer: '库存调拨',
-    wareHouseManage: '仓库管理',
-
     inventoryTransfer: '库存调拨',
 
     // consumablesManagement: '耗材管理',

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -3405,7 +3405,7 @@ export default {
       // }
       // console.log(res)
       // var idstr = res.join(',')
-
+      this.teamList = []
       let teamList = []
       for (let i = 0; i < row.length; i++) {
         let team_id = row[i].id
@@ -3477,7 +3477,7 @@ export default {
               }
             }
 
-            this.teamList = this.teamList.concat(teamList)
+            this.teamList = teamList
             console.log(this.teamList)
           }
         })

src/xt_pages/outpatientCharges/components/chargeDialog.vue

@@ -48,7 +48,7 @@
       <el-form-item label="" style="width:100%;">
 
         <el-radio-group v-model="form.pay_way">
-          <el-radio :label="index" v-for="(item,index) in payWays" :key="index">{{ item.label }}</el-radio>
+          <el-radio :label="item.value" v-for="(item,index) in payWays" :key="index">{{ item.label }}</el-radio>
         </el-radio-group>
       </el-form-item>
 
@@ -316,6 +316,7 @@
           if (valid) {
             let value = {}
             value = this.getValue()
+            console.log(value)
             this.$emit('confirm', value)
             this.loadingtwo = true
           }

src/xt_pages/outpatientDoctorStation/checkPrint.vue

@@ -13,7 +13,7 @@
       </template> -->
 
       <div class='dialysisPage' style="padding-top:40px;">
-        <printOne :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
+        <printOne :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id" :newHisPatient="newHisPatient"></printOne>
       </div>
   </div>
 </template>
@@ -32,7 +32,9 @@ export default {
     printOne,
   },
   props:{
-    paramsObj:Object
+    paramsObj:Object,
+    newHisPatient:Object,
+
   },
   data() {
     return {

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -3407,11 +3407,10 @@
         // }
         // console.log(res)
         // var idstr = res.join(',')
-
+        this.teamList = []
         let teamList = []
         for (let i = 0; i < row.length; i++) {
           let team_id = row[i].id
-          console.log(team_id)
           const params = {
             project_id: row[i].item_id
           }
@@ -3479,8 +3478,7 @@
                 }
               }
 
-              this.teamList = this.teamList.concat(teamList)
-              console.log(this.teamList)
+              this.teamList = teamList
             }
           })
         }

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -27,7 +27,9 @@
                         <el-select v-model="scope.row.single_dose_unit" placeholder="请选择" style="width:50%;"
                                    @change="getAllChangeTwo(scope)" :disabled="prescription.is_medicine_status" >
                             <el-option :label="scope.row.drug.min_unit" :value="scope.row.drug.min_unit"></el-option>
-                            <el-option :label="scope.row.drug.dose_unit"
+                          <el-option :label="scope.row.drug.min_unit" :value="scope.row.drug.min_unit"></el-option>
+
+                          <el-option :label="scope.row.drug.dose_unit"
                                        v-if="scope.row.drug.dose_unit != scope.row.drug.min_unit"
                                        :value="scope.row.drug.dose_unit"></el-option>
                         </el-select>

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -104,15 +104,15 @@
       </div>
       <div class="mainRight">
         <div class="mainHeader">
-          
+
           <el-tabs v-model="titleType" @tab-click="handleClick"
                    style="position: fixed;width: calc(100% - 490px);background:#fff;">
             <el-tab-pane label="电子处方" name="电子处方"></el-tab-pane>
             <el-tab-pane label="透析记录" name="透析记录">
-           
+
             </el-tab-pane>
             <el-tab-pane label="电子病历" name="电子病历"></el-tab-pane>
-           
+
           </el-tabs>
           <div class="mainCell fixedCell" style="float:right" v-if="titleType == '电子处方'">
             <el-button size="small" ref="button_one" @click="open(1)" type="primary"
@@ -177,7 +177,7 @@
         <!--<dialysis-index v-if="titleType == '透析记录'" :record_date="record_date" :patientid='patientid'></dialysis-index>-->
         <dialysis-index v-if="titleType == '透析记录'" :record_date="record_date" :patientid='patientid'
                         :dialysisShow="dialysisShow"></dialysis-index>
-       
+
       </div>
 
     </div>
@@ -293,9 +293,9 @@
           >
         </template>
         <div id='printMain'>
-          <print ref="print" v-if="selecting_schs1.length > 0" :paramsObj='paramsObj'></print>
-          <treatPrint ref="treatPrint" v-if="selecting_schs2.length > 0" :paramsObj='paramsObj2'></treatPrint>
-          <checkPrint ref="checkPrint" v-if="selecting_schs3.length > 0" :paramsObj='paramsObj3'></checkPrint>
+          <print ref="print" v-if="selecting_schs1.length > 0" :paramsObj='paramsObj' :newHisPatient="hisPatientInfo"></print>
+          <treatPrint ref="treatPrint" v-if="selecting_schs2.length > 0" :paramsObj='paramsObj2' :newHisPatient="hisPatientInfo"></treatPrint>
+          <checkPrint ref="checkPrint" v-if="selecting_schs3.length > 0" :paramsObj='paramsObj3' :newHisPatient="hisPatientInfo"></checkPrint>
         </div>
 
       </el-dialog>
@@ -319,7 +319,7 @@
       <recordPrint :patientid="patientid" ref="recordPrint">
     </recordPrint>
     </el-dialog>
-    
+
     <el-dialog
       :visible.sync="startVisibility"
       :close-on-click-modal="false"
@@ -360,7 +360,7 @@
                 </div>
                 <div class="printCell" style="display:flex;justify-content: space-around;">
                   <span style="display: block;width: 50%;">净重值：{{ main_collection.assessmentbefor.weight_before - main_collection.assessmentbefor.additional_weight }}Kg</span>
-                  
+
                   <span style="display: block;width: 50%;">
                     首剂： <span v-if="main_collection.dialysissolution.anticoagulant == 1">{{main_collection.dialysissolution.anticoagulant_shouji}} mg</span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 2">
@@ -393,8 +393,8 @@
                   <span v-if="main_collection.dialysissolution.anticoagulant == 11">
                     {{main_collection.dialysissolution.anticoagulant_shouji}}iu
                    </span>
-                    </span> 
-                 
+                    </span>
+
                 </div>
                 <div class="printCell" style="display:flex;justify-content: space-around;">
                   <span style="display: block;width: 50%;">体重增加：{{ (main_collection.assessmentbefor.weight_before - assessmentAfterDislysis.weight_after).toFixed(2) }}Kg</span>
@@ -434,11 +434,11 @@
                     iu/h
                    </span>
                   </span>
-                
+
                 </div>
                 <div class="printCell" style="display:flex;justify-content: space-around;">
                   <span style="display: block;width: 50%;">处方脱水量：{{ main_collection.prescription.target_ultrafiltration }}
-                    <span v-if="$store.getters.xt_user.org.id == 10278">ml</span> 
+                    <span v-if="$store.getters.xt_user.org.id == 10278">ml</span>
                     <span v-else>L</span>
                     </span>
                   <span style="display: block;width: 50%;">
@@ -5187,7 +5187,7 @@ export default {
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
        })
-   
+
        var params = {
          patient_id:this.patientInfo.id,
          record_date:this.record_date,

src/xt_pages/outpatientDoctorStation/print.vue

@@ -18,7 +18,7 @@
 9675:测试
  -->
     <div class="dialysisPage" style="padding-top: 40px">
-      <div v-if="org_id != 10138 && org_id != 10278 && org_id != 10243">
+      <div v-if="org_id != 10138 && org_id != 10278 && org_id != 10243 && org_id != 0">
 
         <printOne v-if="org_id != 10088 && org_id != 10215" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
 
@@ -68,7 +68,7 @@
           :advicePrint="advicePrint"
           :ids="ids"
           :patient="patient"
-          :hisPatient="hisPatient"
+          :newHisPatient="newHisPatient"
           :doctorPorject="doctorPorject"
           :patient_id="patient_id"
           :record_date="record_date"
@@ -105,6 +105,7 @@ export default {
   },
   props: {
     paramsObj: Object,
+    newHisPatient:Object
   },
   data() {
     return {

src/xt_pages/outpatientDoctorStation/template/printThree.vue

@@ -37,13 +37,14 @@
           </div>
           <div style="display: flex">
             <div style="width: 33%; display: flex">
-              费别：<span class="under_line"
-                ><span>{{
-                  faber && faber.transBody
-                    ? getName(faber.transBody.outputlist1)
-                    : "自费"
-                }}</span></span
-              >
+              费别：
+              <span class="under_line">
+                <span v-if="newHisPatient.id > 0">{{
+                    newHisPatient.balance_accounts_type == 1 ? '医保':'自费'
+                }}</span>
+                   <span v-else>{{
+                     }}</span>
+            </span>
             </div>
             <div style="width: 33%; display: flex">
               电脑号：<span class="under_line">{{
@@ -258,6 +259,7 @@ export default {
     prescription_id: Number,
     his_patient_id:Number,
     ids: String,
+    newHisPatient:Object,
   },
   data() {
     return {
@@ -269,6 +271,7 @@ export default {
       prescriptionInfo: [],
       doc_name: "",
       hisPatient: {},
+
       department: [],
       prescriptions: [],
       projectList: [],

src/xt_pages/outpatientDoctorStation/treatPrint.vue

@@ -11,12 +11,12 @@
           >打印</el-button
         >
       </template> -->
-            
+
       <div class='dialysisPage' style="padding-top:40px;">
         <!-- 此下条为本地开发下页面 -->
         <!-- <printTwo v-if="org_id == 4" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printTwo> -->
         <printOne v-if="org_id != 10138 && org_id != 10278 && org_id !=4&& org_id !=0" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
-        <printTwo v-else v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printTwo>
+        <printTwo v-else v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id" :newHisPatient="newHisPatient"></printTwo>
       </div>
   </div>
 </template>
@@ -42,7 +42,8 @@ export default {
     printTwo
   },
   props:{
-    paramsObj:Object
+    paramsObj:Object,
+    newHisPatient:Object
   },
   data() {
     return {
@@ -78,7 +79,7 @@ export default {
             scanStyles: false
           });
         },500)
-        
+
       }else{
         const style =
         '@media print {#prescription-print{font-size:14px;}.prescription-print:last-child {page-break-after: auto;}.prescription-print{font-size: 14px;}.printTitle{font-size: 18px;text-align: center;font-weight: bold;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:5px;padding:0 10px;}.infoTitle div{width: 300px;margin-bottom:5px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;}.prescriptionBox{padding:0 10px;min-height:380px;}.Rp{font-size: 22px;font-weight: bold;line-height:1px;}.drugsBox{padding-left: 40px;margin-bottom: 10px;margin-bottom: 10px;}.drugsBox p{line-height: 1px;padding-bottom:10px !important;} .drugsOne{line-height: 1px;margin-bottom:10px !important;} .drugsOne span{margin-right: 20px;} .doctorBox{display: flex; justify-content: space-between; padding:0 10px; border-bottom: 2px solid #000;} .actionBar{display: flex; justify-content: space-between; padding:0 10px;margin:5px 0;} .actionBar div{width:150px;}}';
@@ -89,7 +90,7 @@ export default {
           scanStyles: false
         });
       }
-      
+
 
       // if (this.org_template_info.template_id == 1) {
       //   printJS({
@@ -104,10 +105,10 @@ export default {
       getAllDoctorList().then(response=>{
         if(response.data.state == 1){
                var doctor =  response.data.data.doctor
-               
+
                this.doctorList = doctor
              }
-         })   
+         })
      },
     getAllHisPatientList(){
          const params = {
@@ -133,7 +134,7 @@ export default {
             // console.log(this.patientTableData[0])
             // this.choosePatient(this.patientTableData[0])
             this.cal_one = cal_one
-            this.cal_two = cal_two   
+            this.cal_two = cal_two
          }
       })
     },
@@ -167,7 +168,7 @@ export default {
     searchAction(){
 
     }
-    
+
   },
 
   created() {
@@ -191,7 +192,7 @@ export default {
         var prescription_id = this.paramsObj.prescription_id
         this.prescription_id = prescription_id
         this.ids = this.paramsObj.ids
-        
+
       },
       deep:true
     }
@@ -364,7 +365,7 @@ export default {
   .dialysisPage::-webkit-scrollbar {
     height: 15px;
   }
-  
+
   .el-date-editor{
     .el-input__inner{
       padding-right:0px;

src/xt_pages/outpatientDoctorStation/treatTemplate/printTwo.vue

@@ -34,11 +34,14 @@
       </div>
       <div style="display: flex">
         <div style="width: 33%; display: flex">
-          费别：<span class="under_line">{{
-            faber && faber.transBody
-              ? getName(faber.transBody.outputlist1)
-              : "自费"
-          }}</span>
+          费别：
+          <span class="under_line">
+                <span v-if="newHisPatient.id > 0">{{
+                    newHisPatient.balance_accounts_type == 1 ? '医保':'自费'
+                  }}</span>
+                   <span v-else>{{
+                     }}</span>
+            </span>
         </div>
         <div style="width: 33%; display: flex">
           电脑号：<span class="under_line">{{
@@ -325,6 +328,7 @@ export default {
     record_date: String,
     prescription_id: Number,
     ids: String,
+    newHisPatient:Object,
   },
   data() {
     return {