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

src/store/modules/globalConfig.js

@@ -1853,16 +1853,20 @@ const global_config = {
       },
       {
         id: 31,
-        name: '对'
+        name: '米'
       },
       {
         id: 32,
-        name: '米'
+        name: '对'
       },
       {
         id: 33,
         name: '万份'
       },
+      {
+        id: 34,
+        name: '副'
+      },
     ],
     body_fluid: [{
       id: 1,

src/xt_pages/dialysis/details/dialog/AssessmentAfterDislysis.vue

@@ -595,6 +595,48 @@
             <el-input v-model="form.other_complication"></el-input>
           </el-form-item>
         </el-col>
+
+        <el-col :span="8" v-if="isShow('URR')">
+            <el-form-item label="URR：">
+               <el-input v-model="form.urr"></el-input>
+            </el-form-item>
+        </el-col>
+        <el-col :span="8" v-if="isShow('透析相关高血压')">
+            <el-form-item label="透析相关高血压：">
+             <el-select v-model="form.hypertenison">
+              <el-option :key="0" label="请选择" :value="0"></el-option>
+              <el-option
+                v-for="item in option"
+                :label="item.name"
+                :value="item.id"
+                :key="item.id"
+              ></el-option>
+             </el-select>
+            </el-form-item>
+        </el-col>
+         <el-col :span="8" v-if="isShow('透析相关低血压')">
+            <el-form-item label="透析相关低血压">
+             <el-select v-model="form.hypopiesia">
+              <el-option :key="0" label="请选择" :value="0"></el-option>
+              <el-option
+                v-for="item in option"
+                :label="item.name"
+                :value="item.id"
+                :key="item.id"
+              ></el-option>
+             </el-select>
+            </el-form-item>
+        </el-col>
+        <el-col :span="8" v-if="isShow('离科方式')">
+            <el-form-item label="离科方式">
+               <el-input v-model="form.leave_office_method"></el-input>
+            </el-form-item>
+        </el-col>
+         <el-col :span="8" v-if="isShow('转归')">
+            <el-form-item label="转归">
+               <el-input v-model="form.lapse"></el-input>
+            </el-form-item>
+        </el-col>
         <el-col :span="24" v-if="isShow('KT/V')">
             <el-form-item label="KT/V：">
               <el-input type="textarea" :rows="4" v-model="form.ktv"></el-input>
@@ -684,7 +726,11 @@ export default {
       isVisibiltyForCruorDialog: false,
       dialogCruorTitle: '凝血',
       sealing_fluid_special_name: '',
-
+      option:[
+        {id:0,name:"请选择"},
+        {id:1,name:"有"},
+        {id:2,name:"无"},
+      ],
       InnerDialogProps: {
         values: [],
         visibility: false,
@@ -754,7 +800,8 @@ export default {
         diastolic_pressure:'',
         additional_weight:'',
         other_complication:'',
-        ktv:""
+        ktv:"",
+        urr:"",
       }
     }
   },

src/xt_pages/dialysis/details/dialog/assessmentBeforeDislysisDialog.vue

@@ -547,8 +547,29 @@
              <el-input v-model="assessmentBeforeDislysis.dehydration"></el-input>
             </el-form-item>
           </el-col>
-          
 
+
+          <el-col :span="8">
+            <el-form-item label="透析前药物:" v-if="isShow('透析前药物')">
+             <el-input v-model="assessmentBeforeDislysis.pre_dialysis_drugs"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="围手术期:" v-if="isShow('围手术期')">
+              <el-select v-model="assessmentBeforeDislysis.period">
+                <el-option :key="0" label="请选择" :value="0"></el-option>
+                <el-option label="无" value="1"></el-option>
+                <el-option label="有" value="2"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          
+          <el-col :span="8">
+            <el-form-item label="预计进食量:" v-if="isShow('预计进食量')">
+             <el-input v-model="assessmentBeforeDislysis.estimated_food_intake"></el-input>
+            </el-form-item>
+          </el-col>
          
           <el-col :span="24">
             <el-form-item label="备注： ">
@@ -712,7 +733,10 @@
           thrombus_av:"",
           thromubus_a:"",
           thromubus_v:"",
-          dehydration:""
+          dehydration:"",
+          pre_dialysis_drugs:"",
+          period:"",
+          estimated_food_intake:"",
         },
 
         InnerDialogProps: {

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -525,6 +525,28 @@
 
             </el-form-item>
           </el-col>
+               
+          
+          <el-col :span="8" v-if="isShows('病情')">
+             <el-form-item label="病情：">
+                <el-select v-model="dialysisPrescription.illness" placeholder="请选择">
+                <el-option :key="0" label="请选择" :value="0"></el-option>
+                <el-option
+                  v-for="(item, index) in  illnessList "
+                  :key="index"
+                  :label="item.name"
+                  :value="item.id"
+                ></el-option>
+              </el-select>
+             </el-form-item>
+          </el-col>
+
+          <el-col :span="8" v-if="isShows('葡萄糖')">
+             <el-form-item label="葡萄糖：">
+                <el-input v-model="dialysisPrescription.amylaceum"></el-input>
+             </el-form-item>
+          </el-col>
+
         </el-row>
 
         <el-row :gutter="20">
@@ -1018,6 +1040,8 @@
           irrigation:"",
           antioxidant_commodity_name:"",
           displace_speed:"",
+          illness:"",
+          amylaceum:"",
         },
 
         anticoagulant: {
@@ -1041,6 +1065,7 @@
         bloods:[],
         irrigations:[],
         dialyzers:[],
+        illnessList:[]
       }
     },
     methods: {
@@ -3527,6 +3552,10 @@
         console.log("透析器",this.dialyzers)
         console.log("灌流器",this.irrigations)
       }
+    },
+    created(){
+      this.illnessList = getDataConfig('hemodialysis','illness')
+      console.log("列表22222222222",this.illnessList)
     }
   }
 </script>

src/xt_pages/dialysis/details/dialog/monitor_dialog.vue

@@ -406,6 +406,33 @@
             </template>
           </el-table-column>
 
+
+          <el-table-column
+            prop="heparin"
+            align="center"
+            label="血压监测部位"
+            width="140"
+            v-if="isShow('血压监测部位')"
+          >
+           <template slot-scope="scope">
+               {{ getBloodPressure(scope.row.blood_pressure_monitoring_site)}}
+           </template>
+          </el-table-column>
+
+
+          <el-table-column
+            prop="heparin"
+            align="center"
+            label="并发症"
+            width="140"
+            v-if="isShow('并发症')"
+          >
+           <template slot-scope="scope">
+              {{getComplication(scope.row.complication)}}
+           </template>
+          </el-table-column>
+
+
            <el-table-column
             prop="heparin"
             align="center"
@@ -657,7 +684,29 @@
                 </div>
             </el-form-item>
           </el-col>
+        
+         <el-col :span="8" v-if="isShow('血压监测部位')">
+            <el-form-item label="血压监测部位：">
+              <div style="display:flex;">
+                <el-select v-model="form.blood_pressure_monitoring_site" placeholder="请选择" style="width:50%;">
+                  <el-option v-for="(item, index) in bloodPressureMmonitoringSite" :label="item.name" :key="index + 'e'" :value="item.id"></el-option>
+                </el-select>
+                </div>
+            </el-form-item>
+         </el-col>
+
 
+           <el-col :span="8" v-if="isShow('并发症')">
+            <el-form-item label="并发症">
+              <div style="display:flex;">
+                <el-select v-model="form.complication" placeholder="请选择" style="width:50%;">
+                  <el-option v-for="(item, index) in complicationList" :label="item.name" :key="index + 'e'" :value="item.id"></el-option>
+                </el-select>
+                </div>
+            </el-form-item>
+         </el-col>
+
+        
       
           <!-- </el-row>
 
@@ -849,6 +898,8 @@ export default {
         blood_sugar:'',//血糖
         monitor_anticoagulant:'',
         monitor_anticoagulant_value:"",
+        blood_pressure_monitoring_site:"",
+        complication:""
       },
 
       table_current_row: null,
@@ -862,7 +913,9 @@ export default {
       valueOne: 0,
       valueTwo: 0,
       valueThree: 0,
-      anticoagulantsConfit:{}
+      anticoagulantsConfit:{},
+      bloodPressureMmonitoringSite:[],
+      complicationList:[],
     }
   },
   props: {
@@ -890,6 +943,9 @@ export default {
     console.log("sysmptoms3333333333",symptoms)
     this.anticoagulantsConfit = this.$store.getters.anticoagulants_confit
     console.log("抗凝剂",this.anticoagulantsConfit)
+    this.bloodPressureMmonitoringSite = getDataConfig('hemodialysis','blood_pressure_monitoring_site')
+    this.complicationList = getDataConfig('hemodialysis','complication')
+
   },
   methods: {
     venousPressureChange(type) {
@@ -1199,6 +1255,8 @@ export default {
       this.form.blood_sugar = parseFloat(this.form.blood_sugar) == NaN ? 0 : parseFloat(this.form.blood_sugar)
       this.form.monitor_anticoagulant = parseInt(this.form.monitor_anticoagulant)
       this.form.monitor_anticoagulant_value = this.form.monitor_anticoagulant_value
+      this.form.blood_pressure_monitoring_site = this.form.blood_pressure_monitoring_site
+      this.form.complication = this.form.complication
       let mode = '1'
       if (this.form.id > 0) {
         mode = '2'
@@ -1257,6 +1315,8 @@ export default {
             this.form.blood_sugar = parseFloat(this.form.blood_sugar) == NaN ? 0 : parseFloat(this.form.blood_sugar)
             this.form.monitor_anticoagulant = parseInt(this.form.monitor_anticoagulant)
             this.form.monitor_anticoagulant_value = this.form.monitor_anticoagulant_value
+            this.form.blood_pressure_monitoring_site = this.form.blood_pressure_monitoring_site
+            this.form.complication = this.form.complication
             this.$message.error(resp.msg)
           }
         }
@@ -1379,6 +1439,24 @@ export default {
             this.is_has_del_other = res.data.data.is_has_del_other
           }
         })
+    },
+    getBloodPressure(id){
+       var name = ""
+       for(let i=0;i<this.bloodPressureMmonitoringSite.length;i++){
+         if(id == this.bloodPressureMmonitoringSite[i].id){
+            name = this.bloodPressureMmonitoringSite[i].name
+         }
+       }
+       return name
+    },
+    getComplication(id){
+      var name = ""
+      for(let i=0;i<this.complicationList.length;i++){
+         if(id == this.complicationList[i].id){
+            name = this.complicationList[i].name
+         }
+      }
+      return name
     }
   }
 }

src/xt_pages/dialysis/template/DialysisPrintOrderTen.vue

@@ -322,9 +322,9 @@
                   <div class="inline_block" style="flex:1;">
                     透析(滤)器：
                     <div class="under_line" style="width: 100px;text-align: center">
-                      <!-- {{ prescription.dialyzer_perfusion_apparatus ? prescription.dialyzer_perfusion_apparatus : "/" }} -->
+                      {{ prescription.dialyzer_perfusion_apparatus ? prescription.dialyzer_perfusion_apparatus : "/" }}
 
-                      {{ prescription.dialysis_dialyszers ? prescription.dialysis_dialyszers : "/" }}
+                      <!-- {{ prescription.dialysis_dialyszers ? prescription.dialysis_dialyszers : "/" }} -->
                     </div>
                   </div>
                   <div class="inline_block" style="flex:1;">
@@ -1403,7 +1403,7 @@ export default {
         this.prescription = response.data.data.dialysisPrescription;
 
         this.receiverTreatmentAccess =response.data.data.receiverTreatmentAccess;
-        console.log("透析监测",this.receiverTreatmentAccess)
+        // console.log("透析监测",this.receiverTreatmentAccess)
         this.prescription.mode = this.modeName(this.prescription.mode_id);
         var rwLen = this.replacementWays.length;
         this.prescription.replacement = "";

src/xt_pages/hospitalStation/invoiceTemplate/printOne.vue

@@ -1,118 +1,123 @@
 <template>
     <div id='invoice-print'>
         <div style="display:flex;">
-            <div style="position: absolute;top:50px;left:70px;">{{ list.order_number }}</div>
+            <div style="position: absolute;top:70px;left:70px;">{{ list.order_number }}</div>
             <!-- <div>{{ list.id_card_no }}</div> -->
         </div>
         <div style="display:flex;justify-content: space-between;">
             <!-- <div>{{ list.department_name }}</div> -->
-            <div  style="position: absolute;top:50px;left:300px">{{ list.number }}</div>
+            <div  style="position: absolute;top:70px;left:300px">住院号：{{ list.number }}</div>
             <div></div>
-            <div  style="position: absolute;left:560px;top:50px;">
+            <div  style="position: absolute;left:560px;top:70px;">
                 <span>{{ printDate.slice(0,4) }}</span>
                 <span>{{ printDate.slice(5,7) }}</span>
                 <span>{{ printDate.slice(8,11) }}</span>
             </div>
         </div>
         <div style="display:flex;justify-content: space-between;">
-            <div style="position: absolute;top:70px;left:120px;"> {{ paramsObj.name }}</div>
+            <div style="position: absolute;top:90px;left:120px;"> {{ paramsObj.name }}</div>
+            <div style="position: absolute;top:90px;left:240px;">√</div>
             <!-- <div>{{ list.pay_way }}</div> -->
-            <div style="position: absolute;top:70px;left:460px;">{{ paramsObj.setl_time.split(' ')[0] }}</div>
-            <div style="position: absolute;top:70px;left:560px;">{{ paramsObj.setl_time.split(' ')[0] }}</div>
+            <!-- <div style="position: absolute;top:70px;left:460px;">{{ paramsObj.setl_time.split(' ')[0] }}</div>
+            <div style="position: absolute;top:70px;left:560px;">{{ paramsObj.setl_time.split(' ')[0] }}</div> -->
         </div>
         <div style="display:flex;justify-content: space-between;">
             <!-- <div>{{ paramsObj.gend == 1 ? '男' : '女' }}</div> -->
-            <div style="position: absolute;top:90px;left:260px;">{{ totalPrice - list.psn_cash_money }}</div>
-            <div style="position: absolute;top:90px;left:440px;">{{ list.psn_cash_money }}</div>
-            <div style="position: absolute;top:90px;left:580px;">{{ list.pay_way }}</div>
+            <div style="position: absolute;top:110px;left:260px;">{{ totalPrice - list.psn_cash_money }}</div>
+            <div style="position: absolute;top:110px;left:440px;">{{ list.psn_cash_money }}</div>
+            <div style="position: absolute;top:110px;left:580px;">门特</div>
         </div>
         <div style="display:flex;justify-content: space-between;">
-            <div style="position: absolute;top:140px;left:40px">西药</div>
-            <div style="position: absolute;top:140px;left:110px">{{ list.westernMedicineCostTotal }}</div>
-            <div style="position: absolute;top:140px;left:180px">检查费</div>
-            <div style="position: absolute;top:140px;left:260px">{{ list.checkCostTotal }}</div>
-            <div style="position: absolute;top:140px;left:340px">治疗费</div>
-            <div style="position: absolute;top:140px;left:420px">{{ list.treatCostTotal }}</div>
-            <div style="position: absolute;top:140px;left:500px">床位费</div>
-            <div style="position: absolute;top:140px;left:580px">{{ list.bedCostTotal }}</div>
+            <div style="position: absolute;top:160px;left:40px">西药</div>
+            <div style="position: absolute;top:160px;left:110px">{{ list.westernMedicineCostTotal }}</div>
+            <div style="position: absolute;top:160px;left:180px">检查费</div>
+            <div style="position: absolute;top:160px;left:260px">{{ list.checkCostTotal }}</div>
+            <div style="position: absolute;top:160px;left:340px">治疗费</div>
+            <div style="position: absolute;top:160px;left:420px">{{ list.treatCostTotal }}</div>
+            <div style="position: absolute;top:160px;left:500px">床位费</div>
+            <div style="position: absolute;top:160px;left:580px">{{ list.bedCostTotal }}</div>
         </div>
         <div style="display:flex;justify-content: space-between;">
-            <div style="position: absolute;top:170px;left:40px">中成药</div>
-            <div style="position: absolute;top:170px;left:110px">{{ list.chineseTraditionalMedicineCostTotal }}</div>
-            <div style="position: absolute;top:170px;left:180px">化验费</div>
-            <div style="position: absolute;top:170px;left:260px">{{ list.laboratoryCostTotal }}</div>
-            <div style="position: absolute;top:170px;left:340px">手术费</div>
-            <div style="position: absolute;top:170px;left:420px">{{ list.operationCostTotal }}</div>
-            <div style="position: absolute;top:170px;left:500px">其他费</div>
-            <div style="position: absolute;top:170px;left:580px">{{ list.otherCostTotal }}</div>
+            <div style="position: absolute;top:190px;left:40px">中成药</div>
+            <div style="position: absolute;top:190px;left:110px">{{ list.chineseTraditionalMedicineCostTotal }}</div>
+            <div style="position: absolute;top:190px;left:180px">化验费</div>
+            <div style="position: absolute;top:190px;left:260px">{{ list.laboratoryCostTotal }}</div>
+            <div style="position: absolute;top:190px;left:340px">手术费</div>
+            <div style="position: absolute;top:190px;left:420px">{{ list.operationCostTotal }}</div>
+            <div style="position: absolute;top:190px;left:500px">其他费</div>
+            <div style="position: absolute;top:190px;left:580px">{{ list.otherCostTotal }}</div>
         </div>
         <div style="display:flex;justify-content: space-between;">
-            <div style="position: absolute;top:190px;left:40px"></div>
-            <div style="position: absolute;top:190px;left:110px"></div>
-            <div style="position: absolute;top:190px;left:180px"></div>
-            <div style="position: absolute;top:190px;left:260px"></div>
-            <div style="position: absolute;top:190px;left:340px">材料费</div>
-            <div style="position: absolute;top:190px;left:420px">{{ list.materialCostTotal }}</div>
-            <div style="position: absolute;top:190px;left:500px"></div>
-            <div style="position: absolute;top:190px;left:580px"></div>
+            <div style="position: absolute;top:210px;left:40px"></div>
+            <div style="position: absolute;top:210px;left:110px"></div>
+            <div style="position: absolute;top:210px;left:180px"></div>
+            <div style="position: absolute;top:210px;left:260px"></div>
+            <div style="position: absolute;top:210px;left:340px">材料费</div>
+            <div style="position: absolute;top:210px;left:420px">{{ list.materialCostTotal }}</div>
+            <div style="position: absolute;top:210px;left:500px"></div>
+            <div style="position: absolute;top:210px;left:580px"></div>
         </div>
         <div>
             <span>
-            <span  style="position: absolute;top:240px;left:180px">
+            <span  style="position: absolute;top:260px;left:180px">
                 <span v-if="zhongwen.indexOf('万') > -1 && zhongwen.indexOf('拾') > -1 && zhongwen.indexOf('拾') == 1">
                     {{ zhongwen.substring(0,1) }}
                 </span>
                 <span v-else>零</span>
             </span>
-            <span  style="position: absolute;top:240px;left:220px">
+            <span  style="position: absolute;top:260px;left:220px">
                 <span v-if="zhongwen.indexOf('万') > -1">
                     {{ zhongwen.substring(zhongwen.indexOf('万') - 1,zhongwen.indexOf('万')) }}
                 </span>
                 <span v-else>零</span>
             </span>
-            <span  style="position: absolute;top:240px;left:260px">
+            <span  style="position: absolute;top:260px;left:260px">
                 <span v-if="zhongwen.indexOf('仟') > -1">
                     {{ zhongwen.substring(zhongwen.indexOf('仟') - 1,zhongwen.indexOf('仟')) }}
                 </span>
                 <span v-else>零</span>
             </span>
-            <span  style="position: absolute;top:240px;left:300px">
+            <span  style="position: absolute;top:260px;left:300px">
                 <span v-if="zhongwen.indexOf('佰') > -1">
                     {{ zhongwen.substring(zhongwen.indexOf('佰') - 1,zhongwen.indexOf('佰')) }}
                 </span>
                 <span v-else>零</span>
             </span>
-            <span style="position: absolute;top:240px;left:340px">
+            <span style="position: absolute;top:260px;left:340px">
                 <span v-if="zhongwen.indexOf('拾') > -1">
                     {{ zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) }}
                 </span>
                 <span v-else>零</span>
             </span>
-            <span  style="position: absolute;top:240px;left:380px">
+            <span  style="position: absolute;top:260px;left:380px">
                 <span v-if="zhongwen.indexOf('元') > -1 && zhongwen.substring(zhongwen.indexOf('元') - 1,zhongwen.indexOf('元')) != '拾'">
                     {{ zhongwen.substring(zhongwen.indexOf('元') - 1,zhongwen.indexOf('元')) }}
                 </span>
                 <span v-else>零</span>
             </span>
-            <span  style="position: absolute;top:240px;left:420px">
+            <span  style="position: absolute;top:260px;left:420px">
                 <span v-if="zhongwen.indexOf('角') > -1">
                     {{ zhongwen.substring(zhongwen.indexOf('角') - 1,zhongwen.indexOf('角')) }}
                 </span>
                 <span v-else>零</span>
             </span>
-            <span  style="position: absolute;top:240px;left:460px">
+            <span  style="position: absolute;top:260px;left:460px">
                 <span v-if="zhongwen.indexOf('分') > -1">
                     {{ zhongwen.substring(zhongwen.indexOf('分') - 1,zhongwen.indexOf('分')) }}
                 </span>
                 <span v-else>零</span>
             </span>
             </span>
-            <span style="position: absolute;top:240px;left:540px">{{ totalPrice }}</span>
+            <span style="position: absolute;top:260px;left:540px">{{ totalPrice }}</span>
         </div>
+        <div style="position: absolute;top:300px;left:320px">银联：0</div>
+        <div style="position: absolute;top:300px;left:380px">现金：{{ list.psn_cash_money }}</div>
+        <div style="position: absolute;top:300px;left:500px">记账：0</div>
+        <div style="position: absolute;top:300px;left:560px">社保卡：0</div>
         <div>
-            <div style="position: absolute;top:320px;left:70px">{{ org_name }}</div>
-            <div v-if="org_id == 9990" style="position: absolute;top:320px;left:300px">钱玉玲</div>
-            <div v-if="org_id == 9990" style="position: absolute;top:320px;left:420px">陈国杰</div>
+            <div style="position: absolute;top:340px;left:120px">{{ org_name }}</div>
+            <div v-if="org_id == 9990" style="position: absolute;top:340px;left:300px">钱玉玲</div>
+            <div v-if="org_id == 9990" style="position: absolute;top:340px;left:420px">陈国杰</div>
         </div>
     </div>
 </template>
@@ -135,28 +140,33 @@ export default {
         }
     },
     created(){
-        console.log('paramsObj',this.paramsObj);
+        console.log('paramsObj',this.paramsObj)
         let params = {
             order_id: this.paramsObj.order_id,
             patient_id: this.paramsObj.patient_id,
-        };
-        this.getInvoice(params);
-        var data = new Date();
-        var month =data.getMonth() < 9 ? "0" + (data.getMonth() + 1) : data.getMonth() + 1;
-        var date = data.getDate() <= 9 ? "0" + data.getDate() : data.getDate();
-        this.printDate = data.getFullYear() + "-" + month + "-" + date;
+        }
+        this.getInvoice(params)
+        // var data = new Date();
+        // var month =data.getMonth() < 9 ? "0" + (data.getMonth() + 1) : data.getMonth() + 1;
+        // var date = data.getDate() <= 9 ? "0" + data.getDate() : data.getDate();
+        // this.printDate = data.getFullYear() + "-" + month + "-" + date;
         // this.smalltoBIG(982732.21)
-        this.org_id = this.$store.getters.xt_user.org_id;
+        this.org_id = this.$store.getters.xt_user.org_id
         this.org_name = this.$store.getters.xt_user.org.org_name
     },
     methods:{
         getInvoice(params){
             getInvoice(params).then((res) => {
-                console.log('res',res);
-                this.list = res.data.data;
+                console.log('res',res)
+                this.list = res.data.data
                 this.totalPrice = this.list.westernMedicineCostTotal + this.list.checkCostTotal + this.list.treatCostTotal + this.list.bedCostTotal + this.list.chineseTraditionalMedicineCostTotal +
-                                    this.list.laboratoryCostTotal + this.list.operationCostTotal + this.list.otherCostTotal + this.list.materialCostTotal;
+                                    this.list.laboratoryCostTotal + this.list.operationCostTotal + this.list.otherCostTotal + this.list.materialCostTotal
                 this.smalltoBIG(this.totalPrice)
+                // var data = new Date(res.data.data.date * 1000);
+                var data = new Date(this.paramsObj.setl_time);
+                var month =data.getMonth() < 9 ? "0" + (data.getMonth() + 1) : data.getMonth() + 1;
+                var date = data.getDate() <= 9 ? "0" + data.getDate() : data.getDate();
+                this.printDate = data.getFullYear() + "-" + month + "-" + date;
             })
         },
         smalltoBIG(n) {
@@ -186,7 +196,7 @@ export default {
             }
 
             var unit = "仟佰拾亿仟佰拾万仟佰拾元角分", str = "";
-            n += "00";
+            n += "00";  
 
             var indexpoint = n.indexOf('.');  // 如果是小数，截取小数点前面的位数
 
@@ -211,7 +221,7 @@ export default {
                 let params = {
                     order_id: val.order_id,
                     patient_id: val.patient_id,
-                };
+                }
                 this.getInvoice(params)
 
             },

src/xt_pages/hospitalStation/outpatientChargesManagement.vue

@@ -108,8 +108,12 @@
                         size="small" @click="open(7)" type="primary"
                       >撤销入院
                       </el-button>
+                      <el-button
+                        size="small" @click="invoicePrint" type="primary"
+                      >发票打印
+                      </el-button>
                     </div>
-
+                    
 
 
                 </div>
@@ -329,6 +333,13 @@
             <new-statement-print-two :params-obj="newOrderObj"></new-statement-print-two>
             <!--<newStatementPrint ref="print" :paramsObj='newOrderObj'></newStatementPrint>-->
         </el-dialog>
+        <el-dialog
+                class="centerDialog"
+                width="1200px"
+                title="打印"
+                :visible.sync="invoiceVisible">
+            <invoice-print ref="print" :invoiceParams='invoiceParams'></invoice-print>
+        </el-dialog>
     </div>
 
 </template>
@@ -364,6 +375,7 @@
   import NewStatementPrintTwo from './newStatementPrintTwo'
   import RegisterDialog9504 from './components/registerDialog9504'
   import ChargePrescriptionTable from "./components/ChargePrescriptionTable";
+  import invoicePrint from './invoicePrint'
 
   const moment = require('moment');
   export default {
@@ -381,7 +393,8 @@
       medicalInsuranceRefund,
       additionalCharges,
       treatPrint,
-      statementPrint
+      statementPrint,
+      invoicePrint
 
     },
     data() {
@@ -467,7 +480,9 @@
         sick: [],
         diagnoses: [],
 
-        department: []
+        department: [],
+        invoiceVisible:false,
+        invoiceParams:{},
 
       }
     },
@@ -2797,6 +2812,18 @@
 
         }
 
+      },
+      invoicePrint(obj){
+        console.log(this.hisPatientInfo)
+        let paramsObj = {
+          order_id: this.hisPatientInfo.id,
+          patient_id: this.hisPatientInfo.patient_id,
+          name:this.hisPatientInfo.name,
+          gend:this.hisPatientInfo.gend,
+          setl_time:this.hisPatientInfo.out_hosptial_time
+        }
+        this.invoiceParams = paramsObj
+        this.invoiceVisible = true
       }
     },
     mounted() {

src/xt_pages/outpatientCharges/newStatementPrint.vue

@@ -71,14 +71,26 @@
         var ptime = Math.round(new Date().getTime() / 1000);
         this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
 
-        const style =
+        if(this.org_id != 9990){
+          const style =
           '@media print {.statementTitle{font-size: 28px;text-align: center;font-weight: bold;margin-bottom: 10px;}.statementTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 16px;border-color: #000;}}';
-        printJS({
-          printable: "statement-print",
-          type: "html",
-          style: style,
-          scanStyles: false
-        });
+          printJS({
+            printable: "statement-print",
+            type: "html",
+            style: style,
+            scanStyles: false
+          });
+        }else {
+          const style =
+          '@media print {#statement-print{font-size:12px;width:600px;margin:0 auto;}.statementTitle{font-size: 22px;text-align: center;margin-bottom: 10px;}.statementTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 16px;border-color: #000;}}';
+          printJS({
+            printable: "statement-print",
+            type: "html",
+            style: style,
+            scanStyles: false
+          });
+        }
+        
 
         // if (this.org_template_info.template_id == 1) {
         //   printJS({

src/xt_pages/outpatientCharges/statementTemplate/printTwo.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="statement-print" class="statement-print">
-    <div class="statementTitle" v-if="info.insutype == '310'">珠海市职工基本医疗保险门慢就医结算单</div>
-    <div class="statementTitle" v-if="info.insutype == '390'">珠海市城乡居民基本医疗保险门慢就医结算单</div>
+    <div class="statementTitle" style="margin-top:20px;" v-if="info.insutype == '310'">珠海市职工基本医疗保险门慢就医结算单</div>
+    <div class="statementTitle" style="margin-top:20px;" v-if="info.insutype == '390'">珠海市城乡居民基本医疗保险门慢就医结算单</div>
 
     <div style="display:flex">
       <div style="width:70%">医疗机构名称：{{info.fixmedins_name}}</div>
@@ -19,8 +19,8 @@
 
     </div>
     <div style="display:flex;justify-content: space-between;border-bottom:1px solid #000;padding-bottom:10px;">
-      <div style="flex:1;">单据编码：{{info.number}}</div>
-      <div style="width:33%">就诊时间：{{getTime(info.date)}}</div>
+      <div style="flex:1;">单据编码：{{order_infos.number}}</div>
+      <div style="width:33%">就诊时间：{{getTime(order_infos.date)}}</div>
       <div>金额单位：元</div>
     </div>
     <div style="display:flex">
@@ -29,7 +29,7 @@
     </div>
     <div style="display:flex">
       <div style="width:50%">社保卡号</div>
-      <div style="width:50%">诊断：{{info.diagnosis}}</div>
+      <div style="width:50%">诊断：慢性肾脏病5期</div>
     </div>
     <div style="display:flex">
       <div style="width:50%" v-if="info.psn_type == '11'">人员类别:在职</div>
@@ -89,7 +89,7 @@
     <div style="display:flex;border-bottom:1px solid #000;padding-bottom:10px;">
       <div>个人自付：</div>
       <div>其中：1.乙类自付 {{info.preselfpay_amt?info.preselfpay_amt:''}}</div>
-      <div>2.自费 {{info.overlmt_selfpay?info.overlmt_selfpay:''}}</div>
+      <div style="margin-left:20px;">2.自费 {{info.overlmt_selfpay?info.overlmt_selfpay:''}}</div>
     </div>
     <div style="display:flex;padding-top:10px;">
       <div style="width:33%">参保人签名：</div>
@@ -162,6 +162,10 @@
 
 
 <style lang="scss" scoped>
+  #statement-print{
+    width: 600px;
+    margin: 0 auto;
+  }
   .statement-print {
     -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
     -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
@@ -171,9 +175,8 @@
   }
 
   .statementTitle {
-    font-size: 28px;
+    font-size: 22px;
     text-align: center;
-    font-weight: bold;
     margin-bottom: 10px;
   }
 

src/xt_pages/outpatientCharges/summary.vue

@@ -511,7 +511,7 @@
       invoicePrint(obj){
         console.log(obj)
         let paramsObj = {
-          order_id: obj.order_info.order_id,
+          order_id: obj.id,
           patient_id: obj.patient_id,
           name:obj.patient.name,
           age:obj.age,

src/xt_pages/outpatientDoctorStation/components/deskRecord.vue

@@ -541,7 +541,7 @@
        this.getlist()
        this.getInitData()
        this.wayOptions = getDataConfig("patient", "reimbursement_ways");
-       console.log("232322323",this)
+       this.allergic_history = this.case_history.allergic_history
        if(this.patientInfo.gender = 1){
          this.patientInfo.gender = '男'
        }else if(this.patientInfo.gender = 2){
@@ -568,6 +568,7 @@
       case_history:{
         handler(val){
           console.log("南京人明",this.case_history)
+          this.allergic_history = this.case_history.allergic_history
           if(this.case_history.breathing == 0){
             this.case_history.breathing = ""
           }
@@ -578,7 +579,7 @@
             this.case_history.diagnose = ""
           }
           this.form.id = this.case_history.id
-          this.allergic_history = this.case_history.allergic_history
+         
           this.watchSign++
         },
         deep:true

src/xt_pages/qcd/basicInformationAnalysis.vue

@@ -710,7 +710,7 @@ export default {
       //本月的结束时间
       var monthEndDate = new Date(nowYear, nowMonth+1, 0);
       var timeEnd=Date.parse(monthEndDate)/1000-1;//s
-        // console.log("本月最后一天",timeEnd)
+      console.log("本月最后一天",timeEnd)
       //本月
       if(state == 0){
        //统计透析总量

src/xt_pages/stock/drugs/drugStockInOrderDetailPrint.vue

@@ -11,7 +11,7 @@
           <div style="font-size:22px;font-weight:bold;text-align:center;">{{ orgName }}</div>
           <div class="order-title" style="font-size:18px;padding-top:0;">药品入库登记表</div>
          
-          <div style="float: right;margin-bottom: 10px;">{{getDateTwo()}}</div>
+          <div style="float: right;margin-bottom: 1px;">{{getDateTwo()}}</div>
 
           <table class="print-table" border="1">
             <tbody>
@@ -68,7 +68,7 @@
           </table>
         
 
-          <div style="display:flex;margin-top:20px;float:right;">
+          <div style="display:flex;margin-top:1px;float:right;">
             <div style="width:50px;">审批：</div><div style="width:100px;"></div>
             <div style="width:80px;">药材主任：</div><div style="width:100px;"></div>
             <div style="width:50px;">会计：</div><div style="width:100px;"><span v-if='orgId == 10024'>徐立琼</span></div>

src/xt_pages/stock/drugs/drugStockOutOrderDetailPrint.vue

@@ -58,13 +58,20 @@
           </table>
         
 
-          <div style="display:flex;margin-top:20px;float:right;">
+          <div v-if="orgId != 10024" style="display:flex;margin-top:20px;float:right;">
             <div style="width:50px;">审批：</div><div style="width:100px;"></div>
             <div style="width:80px;">药材主任：</div><div style="width:100px;"></div>
             <div style="width:50px;">会计：</div><div style="width:100px;"></div>
             <div style="width:50px;">审核：</div><div style="width:100px;"></div>
             <div style="width:70px;">制单人：</div><div style="width:100px;"></div>
           </div>
+          <div v-if="orgId == 10024" style="display:flex;margin-top:20px;float:right;">
+            <div style="width:70px;">领料人：</div><div style="width:100px;"></div>
+            <div style="width:80px;">审批：</div><div style="width:100px;"></div>
+            <div style="width:50px;">会计：</div><div style="width:100px;">徐立琼</div>
+            <div style="width:50px;">审核：</div><div style="width:100px;">徐立琼</div>
+            <div style="width:70px;">制单人：</div><div style="width:100px;">徐立琼</div>
+          </div>
         </div>
 
       </div>
@@ -116,7 +123,9 @@
         is_inject:"",
         page:1,
         limit:10000,
-        keywords:""
+        keywords:"",
+        orgId:'',
+        orgName:""
       }
     },
     methods: {
@@ -209,9 +218,46 @@
         }
         return name
       },
+      handleSpanTempArr(){
+        this.tempArr = []
+
+        for (let i = 0; i < this.warehousingOutInfo.warehousingOutData.length; i++) {
+          if (i === 0) {
+            this.tempArr.push(1)
+            this.pos = 0
+          } else {
+            // 判断当前元素与上一个元素是否相同
+            if (this.warehousingOutInfo.warehousingOutData[i].drug_id === this.warehousingOutInfo.warehousingOutData[i - 1].drug_id) {
+              this.tempArr[this.pos] += 1
+              this.tempArr.push(0)
+            } else {
+              this.tempArr.push(1)
+              this.pos = i
+            }
+          }
+        }
+
+        let sameRowArr = [], sIdx = 0
+        this.warehousingOutInfo.warehousingOutData.forEach((item, index) => {
+          item.index = index
+          if (index === 0) {
+            sameRowArr.push([index])
+          } else {
+            if (item.drug_id === this.warehousingOutInfo.warehousingOutData[index - 1].drug_id) {
+              sameRowArr[sIdx].push(index)
+            } else {
+              sIdx = sIdx + 1
+              sameRowArr.push([index])
+            }
+          }
+        })
+        this.sameRowArr = sameRowArr
+      },
     },
     created() {
+      this.orgName = this.$store.getters.xt_user.org.org_name;
       const order_id = this.$route.query.id
+      this.orgId = this.$store.getters.xt_user.org.id;
       this.GetOrderDetail(order_id)
       this.getList()
     }

src/xt_pages/stock/stockInOrderDetailPrint.vue

@@ -15,7 +15,7 @@
                         <div style="font-size:22px;font-weight:bold;">{{ orgName }}</div>
                         <span style="font-weight:500;font-size:18px;">耗材入库登记单</span>
                     </div>
-                    <div style="text-align:right;margin-bottom:20px;font-size: 18px;">
+                    <div style="text-align:right;margin-bottom:1px;font-size: 18px;">
                       打印时间：{{time_now}}
                     </div>
                     <div class="table_panel">
@@ -60,9 +60,9 @@
                             </tbody>
                         </table>
 
-                        <div style="display:flex;margin-top:20px;float:right;">
+                        <div style="display:flex;margin-top:1px;float:right;">
                             <div style="width:50px;">审批：</div><div style="width:100px;"></div>
-                            <div style="width:80px;">药材主任：</div><div style="width:100px;"></div>
+                            <div style="width:80px;" v-if='orgId != 10024'>药材主任：</div><div style="width:100px;"></div>
                             <div style="width:50px;">会计：</div><div style="width:100px;"><span v-if='orgId == 10024'>徐立琼</span></div>
                             <div style="width:50px;">审核：</div><div style="width:100px;"><span v-if='orgId == 10024'>徐立琼</span></div>
                             <div style="width:70px;">制单人：</div><div style="width:100px;">{{ getXuserName(this.WarehouseInfo.warehouse.creater) }}</div>
@@ -130,7 +130,7 @@ export default {
     },
     methods:{
       printAction: function() {
-          const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 1px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 10px 5px; white-space: pre-line;} .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
+          const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 14px; padding: 1px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 12px; padding: 10px 5px; white-space: pre-line;} .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
           printJS({
           printable: 'print_content',
           type: 'html',

src/xt_pages/stock/stockOutOrderDetailPrint.vue

@@ -12,6 +12,7 @@
             <div id="print_content">
                 <div class="print_main_content">
                     <div class="order_title_panl">
+                        <div style="font-size:22px;font-weight:bold;">{{ orgName }}</div>
                         <span class="main_title">耗材出库登记单</span>
                     </div>
                     <div style="text-align:right;margin-bottom:20px;font-size: 18px;">
@@ -46,13 +47,20 @@
                             </tbody>
                         </table>
 
-                        <div style="display:flex;margin-top:20px;float:right;">
-                            <div style="width:50px;">审批：</div><div style="width:100px;"></div>
-                            <div style="width:80px;">药材主任：</div><div style="width:100px;"></div>
-                            <div style="width:50px;">会计：</div><div style="width:100px;"></div>
-                            <div style="width:50px;">审核：</div><div style="width:100px;"></div>
-                            <div style="width:70px;">制单人：</div><div style="width:100px;"></div>
-                       </div>
+                        <div v-if="orgId != 10024" style="display:flex;margin-top:20px;float:right;">
+                          <div style="width:50px;">审批：</div><div style="width:100px;"></div>
+                          <div style="width:80px;">药材主任：</div><div style="width:100px;"></div>
+                          <div style="width:50px;">会计：</div><div style="width:100px;"></div>
+                          <div style="width:50px;">审核：</div><div style="width:100px;"></div>
+                          <div style="width:70px;">制单人：</div><div style="width:100px;"></div>
+                        </div>
+                        <div v-if="orgId == 10024" style="display:flex;margin-top:20px;float:right;">
+                          <div style="width:70px;">领料人：</div><div style="width:100px;"></div>
+                          <div style="width:80px;">审批：</div><div style="width:100px;"></div>
+                          <div style="width:50px;">会计：</div><div style="width:100px;">徐立琼</div>
+                          <div style="width:50px;">审核：</div><div style="width:100px;">徐立琼</div>
+                          <div style="width:70px;">制单人：</div><div style="width:100px;">徐立琼</div>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -100,6 +108,8 @@ export default {
             is_charge:"",
             list:[],
             wareoutList:[],
+            orgId:'',
+            orgName:'',
         }
     },
     methods:{
@@ -259,7 +269,8 @@ export default {
       
     },
     created(){
-
+      this.orgName = this.$store.getters.xt_user.org.org_name;
+      this.orgId = this.$store.getters.xt_user.org.id;
       const order_id = this.$route.query.id;
       const warehouse_out_time = this.$route.query.warehouse_out_time
       this.GetConfigInfo()