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

src/xt_pages/data/components/consumables.vue

@@ -730,13 +730,13 @@
             this.goodInfo.goodInfoDialog.formValue.packing_price = response.data.data.goodInfo.packing_price
             this.goodInfo.goodInfoDialog.formValue.default_count_unit = response.data.data.goodInfo.default_count_unit
             this.goodInfo.goodInfoDialog.formValue.register_number = response.data.data.goodInfo.register_number
-            
+
             this.goodInfo.goodInfoDialog.formValue.number = response.data.data.goodInfo.number
-           
+
             this.goodInfo.goodInfoDialog.formValue.is_user = response.data.data.goodInfo.is_user.toString()
 
             this.goodInfo.goodInfoDialog.formValue.is_warehouse = response.data.data.goodInfo.is_warehouse.toString()
-            
+
             this.$refs.addConsumable.show(row.id, this.goodInfo.goodInfoDialog.formValue)
 
           }
@@ -1064,7 +1064,7 @@
         this.goodInfo.goodInfoDialog.formValue.agent = '';
         this.goodInfo.goodInfoDialog.formValue.good_number = '';
         this.goodInfo.goodInfoDialog.formValue.register_number = '';
-       
+
 
 
         this.$refs.addConsumable.show(0)
@@ -1565,8 +1565,8 @@
          }
          console.log("hhhadhh233323232",this.goodInfo.goodInfoData)
 
-         const tHeader = ['耗材名称','耗材种类','耗材类型','医保等级','规格型号','生产厂商','单位','零价','库存警戒','经销商','最新进价','医保编码','社保目录编码']
-         const filterVal = ['good_name', 'good_kind_name','good_type_name','medical_insurance_level_name','specification_name','manufacturer_name','packing_unit','packing_price','stock_warn_count','dealer_name','buy_price','medical_insurance_number','social_security_directory_code']
+         const tHeader = ['耗材名称','耗材种类','耗材类型','医保等级','规格型号','生产厂商','单位','零价','库存警戒','经销商','最新进价','医保编码','社保目录编码','批准文号','医保等级']
+         const filterVal = ['good_name', 'good_kind_name','good_type_name','medical_insurance_level_name','specification_name','manufacturer_name','packing_unit','packing_price','stock_warn_count','dealer_name','buy_price','medical_insurance_number','social_security_directory_code','number','medical_insurance_level']
 
          const data = this.formatJson(filterVal,this.goodInfo.goodInfoData)
 

src/xt_pages/data/components/drugs.vue

@@ -1546,8 +1546,8 @@
           this.list[i].specification_name = this.list[i].dose + this.list[i].dose_unit + this.list[i].min_number + this.list[i].min_unit + "/"+this.list[i].max_unit
          }
 
-         const tHeader = ['药品名称','药品规格','剂量','剂量单位','拆零','拆零单位','包装单位','药品类型','库存警戒','产地','药品剂型','拆零零售价','包装零售价','进货价','药物分类','默认单次用量','默认单次用量单位','生产厂商','经销商','医保编码','社保目录编码']
-         const filterVal = ['drug_name', 'specification_name','dose','dose_unit','min_number','min_unit','max_unit','drug_category_name','drug_stock_limit','drug_origin_place','drug_dosage_form_name','min_price','retail_price','last_price','drug_classify_name','drug_dose','drug_dose_unit_name','manufacturer_name','dealer_name','medical_insurance_number','social_security_directory_code']
+         const tHeader = ['药品名称','药品规格','剂量','剂量单位','拆零','拆零单位','包装单位','药品类型','库存警戒','产地','药品剂型','拆零零售价','包装零售价','进货价','药物分类','默认单次用量','默认单次用量单位','生产厂商','经销商','医保编码','社保目录编码','批准文号','医保等级']
+         const filterVal = ['drug_name', 'specification_name','dose','dose_unit','min_number','min_unit','max_unit','drug_category_name','drug_stock_limit','drug_origin_place','drug_dosage_form_name','min_price','retail_price','last_price','drug_classify_name','drug_dose','drug_dose_unit_name','manufacturer_name','dealer_name','medical_insurance_number','social_security_directory_code','number','medical_insurance_level']
 
          const data = this.formatJson(filterVal,this.list)
 

src/xt_pages/outpatientCharges/listPrint.vue

@@ -17,8 +17,8 @@
       <printOne v-if="org_id != 10106&&org_id != 10215&&org_id != 10265 && org_id != 0" :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
       <printTwo v-if="org_id == 10106 && this.paramsObj.balance_accounts_type != 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></printTwo>
       <print-three v-if="org_id == 10106 && this.paramsObj.balance_accounts_type == 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></print-three>
-      <list-print-two v-if="org_id == 10215" :list="list" :patient="patient" :order="order" :admin="admin"></list-print-two>
-      <print-two10265  v-if="org_id == 10265  " :list="list" :patient="patient" :order="order" :admin="admin" :hospital_record="hospital_record"></print-two10265>
+      <list-print-two v-if="org_id == 10215 " :list="list" :patient="patient" :order="order" :admin="admin"></list-print-two>
+      <print-two10265  v-if="org_id == 10265 || org_id == 0" :list="list" :patient="patient" :order="order" :admin="admin" :hospital_record="hospital_record"></print-two10265>
     </div>
   </div>
 </template>
@@ -59,7 +59,7 @@
         p_admin:{},
         charge_admin:{},
         org_id:'',
-        hospital_record:null
+        hospital_record:{}
       }
     },
     created() {
@@ -93,7 +93,7 @@
             this.$message.error(response.data.msg)
             return false
           } else {
-            if(this.org_id == 10265){
+            if(this.org_id == 10265 || this.org_id == 0){
               this.order = response.data.data.order
               this.patient = response.data.data.patient
               this.admin = response.data.data.admin_info

src/xt_pages/outpatientCharges/listTemplate/printTwo10265.vue

@@ -14,8 +14,8 @@
       <div class="listInfo">
         <div>入院科室：血透</div>
         <div>出院科室：血透</div>
-        <div>入院日期：{{hospital_record.in_hosptial_time}}</div>
-        <div>出院日期：{{hospital_record.out_hosptial_time}}</div>
+        <div>入院日期：{{hospital_record.in_hosptial_time.split(' ')[0]}}</div>
+        <div>出院日期：{{hospital_record.out_hosptial_time.split(' ')[0]}}</div>
         <div>住院天数:{{getDay(hospital_record.in_hosptial_time.split(' ')[0] ,hospital_record.out_hosptial_time.split(' ')[0])}}</div>
       </div>
 
@@ -122,7 +122,6 @@ export default {
       default: function () {
         return {};
       },
-
     },
     order: {
       type: Object,
@@ -162,25 +161,25 @@ export default {
     },
     getJaiTotal(){
       var total = 0
-      for(let i =0; this.list.length; i++){
-        total = total + this.list[i].jiaTotal
+      for(let i =0; i < this.list.length; i++){
+        total = parseFloat(total) + parseFloat(this.list[i].jiaTotal)
 
       }
-      return total
+      return total.toFixed(2)
     }, getYiTotal(){
       var total = 0
-      for(let i =0; this.list.length; i++){
-        total = total + this.list[i].yiTotal
+      for(let i =0; i<  this.list.length; i++){
+        total = parseFloat(total) + parseFloat(this.list[i].yiTotal)
 
       }
-      return total
+      return total.toFixed(2)
     }, getBingTotal(){
       var total = 0
-      for(let i =0; this.list.length; i++){
-        total = total + this.list[i].bingTotal
+      for(let i =0; i < this.list.length; i++){
+        total = parseFloat(total) + parseFloat(this.list[i].bingTotal)
 
       }
-      return total
+      return total.toFixed(2)
     },
 
     getNowTime: function () {

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -2750,7 +2750,7 @@ export default {
                   } else {
                     that.radio = 1
                     that.changeRadioAndPatient(1)
-                    that.$message({ message: '挂号成功', type: 'success', duration: 5000 })
+                    that.$message({ message: '登记成功', type: 'success', duration: 5000 })
                   }
 
                 }
@@ -4360,7 +4360,7 @@ export default {
                 this.form.diagnosis = []
               } else {
                 for (let i = 0; i < response.data.data.info.diagnosis.split(',').length; i++) {
-                  this.form.diagnosis.push(parseInt(response.data.data.info.diagnosis.split(',')[i]))
+                  this.form.diagnosis.push(response.data.data.info.diagnosis.split(',')[i])
                 }
               }
               this.sick_history = this.info.sick_history
@@ -4378,7 +4378,7 @@ export default {
                 this.form.diagnosis = []
               } else {
                 for (let i = 0; i < response.data.data.last_info.diagnosis.split(',').length; i++) {
-                  this.form.diagnosis.push(parseInt(response.data.data.last_info.diagnosis.split(',')[i]))
+                  this.form.diagnosis.push(response.data.data.last_info.diagnosis.split(',')[i])
                 }
               }