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

src/lang/zh.js

@@ -255,13 +255,13 @@ export default {
     pastInquiries: '既往查询',
 
     prescriptionTemplate: '处方模版',
-    hospitalRecord:"住院登记",
-    hisTool:"HIS工具",
-    hospitalCharges:'住院收费',
+    hospitalRecord: '住院登记',
+    hisTool: 'HIS工具',
+    hospitalCharges: '住院收费',
 
-    summary_tool:'项目消费明细汇总',
-    labelPrint:'标签打印',
-    faPiao:"发票设置",
+    summary_tool: '项目消费明细汇总',
+    labelPrint: '标签打印',
+    faPiao: '发票设置'
   },
   navbar: {
     logOut: '退出登录',
@@ -368,6 +368,10 @@ export default {
     nursing_record: '透析护理记录',
     special_record: '特殊记录',
     template_summary: '治疗小结',
-    template_plan: '个性化方案'
+    template_plan: '个性化方案',
+    admitting_diagnosis: '入院诊断',
+    discharge_diagnosis: '出院诊断',
+    treatment: '诊疗经过',
+    illness_discharge: '出院时病情'
   }
 }

src/router/modules/patient.js

@@ -160,6 +160,17 @@ export default {
       noCache: true
     }
   },
+  {
+    path: '/patient/patient/:id/hospitalSummary',
+    component: () => import('@/xt_pages/user/hospitalSummary'),
+    hidden: true,
+    is_menu: false,
+    name: 'hospitalSummary',
+    meta: {
+      title: 'hospitalSummary',
+      noCache: true
+    }
+  },
   {
     path: '/patients/course',
     component: () => import('@/xt_pages/user/courseOfDisease'),

src/xt_pages/data/template.vue

@@ -47,7 +47,11 @@ export default {
         { label: this.$t("data_config.course_disease"), key: "course_disease" },
         { label: this.$t("data_config.rescue_record"), key: "rescue_record" },
         { label: this.$t("data_config.template_summary"), key: "template_summary" },
-        { label: this.$t("data_config.template_plan"), key: "template_plan" }
+        { label: this.$t("data_config.template_plan"), key: "template_plan" },
+        { label: this.$t("data_config.admitting_diagnosis"), key: "admitting_diagnosis" },
+        { label: this.$t("data_config.discharge_diagnosis"), key:"discharge_diagnosis"},
+        { label: this.$t("data_config.treatment"), key:"treatment"},
+        { label: this.$t("data_config.illness_discharge"), key:"illness_discharge"},
       ],
       activeName: "education",
       createdTimes: 0

src/xt_pages/dialysis/PatientBox.vue

@@ -55,9 +55,9 @@
       <div class="dislysisInfo">
         <p>体重(前/后kg):
           {{ schedule.assessment_before_dislysis ? schedule.assessment_before_dislysis.weight_before : '' }}
-          <span v-if="schedule.assessment_after_dislysis>0">/{{ schedule.assessment_after_dislysis ? schedule.assessment_after_dislysis.weight_after : '' }}</span> </p>
+          <span v-if="schedule.assessment_after_dislysis && schedule.assessment_after_dislysis.weight_after>0">/{{ schedule.assessment_after_dislysis ? schedule.assessment_after_dislysis.weight_after : '' }}</span> </p>
         <p>目标超滤量:
-          <span v-if="schedule.prescription>0">{{ schedule.prescription ? schedule.prescription.target_ultrafiltration : '' }}</span>
+          <span v-if="schedule.prescription && schedule.prescription.target_ultrafiltration>0">{{ schedule.prescription ? schedule.prescription.target_ultrafiltration : '' }}</span>
        
         </p>
         <p :title="schedule.prescription ? schedule.prescription.dialyzer_perfusion_apparatus : ''">
@@ -410,7 +410,7 @@ export default {
                  prescription.body_fluid = 0
              }
           }
-          console.log("透析处方",prescription)
+          console.log("透析处方323332323223323223",prescription)
           var solution = resp.data.solution; // 透析方案
           var receiver_treatment_access = resp.data.receiver_treatment_access; // 接诊评估
           console.log("receiver_treatment_access",receiver_treatment_access)
@@ -617,7 +617,6 @@ export default {
     },
     open(schedual){
      
-     
       this.date = schedual.schedule_date
       this.patient_id = schedual.patient_id
       this.modedata = 1

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -109,11 +109,9 @@
       <ul>
         <li v-if="isShow('目标超滤量')">
           <label>目标超滤量 : </label>
-          <span class="content">{{
-            target_ultrafiltration != "0" ? target_ultrafiltration : ""
-          }}</span>
-          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 36 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.org_id != 9555" class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
-          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 36 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id != 40 || this.$store.getters.xt_user.template_info.template_id != 43 || this.$store.getters.xt_user.template_info.template_id != 45 || this.$store.getters.xt_user.template_info.org_id == 9555" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
+          <span class="content">{{ target_ultrafiltration != "0" ? target_ultrafiltration : ""}}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 36 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.org_id != 9555 && this.$store.getters.xt_user.template_info.org_id != 9671"  class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 36 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id != 40 || this.$store.getters.xt_user.template_info.template_id != 43 || this.$store.getters.xt_user.template_info.template_id != 45 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 9671" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
         </li>
         <li v-if="isShow('葡萄糖')">
           <label>葡萄糖 : </label>
@@ -433,6 +431,7 @@ export default {
   },
   computed: {
     note: function () {
+      // console.log("世界人民呃232323223232323323223",this.prescription)
       return this.getValueStr('remark', 'remark')
     },
     target_ultrafiltration: function() {
@@ -712,10 +711,10 @@ export default {
     displace_speed:function(){
       return this.getValueStr('displace_speed','displace_speed')
     },
-
+  
   },
   created() {
-    console.log("中国出口233232323233223",this.prescription)
+   
     var perfusion_apparatus = this.$store.getters.perfusion_apparatus
     var map = {}
     for (let index = 0; index < perfusion_apparatus.length; index++) {
@@ -736,6 +735,7 @@ export default {
   },
   methods: {
     getValueStr(pkey, skey) {
+      
       if (
         (this.prescription == null || this.prescription.id == '') &&
         (this.solution == null || this.solution.id == '')
@@ -779,6 +779,7 @@ export default {
        return name
     }
   }
+  
 }
 </script>
 

src/xt_pages/dialysis/details/NavIgation.vue

@@ -623,7 +623,6 @@ export default {
       this.$refs.finish_dialog.show(this.dialysis_order);
     },
     showPrescription: function() {
-      console.log("粗32323232",this.prescription)
       this.$refs.prescription.show(this.prescription,this.schedual,this.last_dialysis_prescribe,this.his_is_open);
     },
     showAccepts: function() {
@@ -635,7 +634,7 @@ export default {
       this.$refs.assessmentBefore.show(this.predialysis_evaluation,this.last_dryWeight_dislysis,this.last_predialysis_evaluation,this.lastAssessment);
     },
     showDoubleCheck: function() {
-       
+      
       this.$refs.doubleCheck.show();
     },
     showrTeatmentSummary: function() {

src/xt_pages/dialysis/details/acceptsAssessment.vue

@@ -137,7 +137,8 @@
         conditions: {
           '1': '住院',
           '2': '门诊',
-          '3': '手术期'
+          '3': '手术期',
+          '4': '急诊'
         },
         consciousnesses:[],
         appetites: [],

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

@@ -371,7 +371,7 @@
             <span v-if="scope.row.parent_id == 0">
               {{getXuserName(scope.row.execution_staff)}}
             </span>
-            <span v-else></span>
+            <span v-else>{{getXuserName(scope.row.execution_staff)}}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -385,7 +385,7 @@
             <span v-if="scope.row.parent_id == 0">
               {{getXuserName(scope.row.checker)}}
             </span>
-            <span v-else></span>
+            <span v-else>{{getXuserName(scope.row.checker)}}</span>
           </template>
         </el-table-column>
       </el-table>
@@ -853,11 +853,7 @@
       'dialysis_order.id': function() {
         this.form['dialysis_order_id'] = this.dialysis_order.id
       },
-      doctor_advices: function() {
-        // this.handleSpanTempArr()
-        // this.hoverOrderArr = []
-        // this.handleStyle()
-      }
+     
     },
     methods: {
       getContent: function() {
@@ -2329,6 +2325,7 @@
 
       },
       getDialysisScheduleDetail() {
+        console.log("触发伏组件")
         if(this.$route.query.showView && this.$route.query.showView == true){
           return
         }
@@ -2336,6 +2333,7 @@
           if (response.data.state == 1) {
             var doctor_advices = response.data.data.doctor_advices
             this.doctorAdvices = doctor_advices
+            this.doctor_advices = doctor_advices
           }
         })
       }
@@ -2564,7 +2562,7 @@
       this.patientid = this.$route.query.patient_id
       this.request_record_date = this.record_date
 
-      this.getDialysisScheduleDetail()
+      // this.getDialysisScheduleDetail()
        //获取自备药
       this.getSelfMedicalList()
     },mounted(){

src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue

@@ -1750,7 +1750,7 @@ export default {
   created(){
     //获取自备药
     this.getSelfMedicalList()
-    console.log("模板数据",this.adviceTemplates)
+    
   }
 };
 </script>

src/xt_pages/dialysis/details/dialog/adviceDialog/EditGroupAdvice.vue

@@ -2305,6 +2305,7 @@ export default {
           var advice = response.data.data.advice;
           this.$message.success("保存成功!");
           this.groupEditFormVisible = false;
+          this.$parent.getDialysisScheduleDetail()
         }
       });
     },

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

@@ -1296,7 +1296,7 @@
       this.record_date = date ? uParseTime(date, "{y}-{m}-{d}") : parseTime(new Date(), '{y}-{m}-{d}')
       //获取皮肤
       this.skins = getDataConfig('hemodialysis','skin')
-      console.log("皮肤",this.skins)
+      
       this.pinholings = getDataConfig('hemodialysis','pinholing')
       console.log("针眼",this.pinholings)
       this.catheter_maintenancelist = getDataConfig('hemodialysis','catheter_maintenance')

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

@@ -1384,41 +1384,7 @@
         this.InnerDialogProps.visibility = true
         switch (val) {
           case '5': // 透析器/灌流器
-            // var arr = this.dialysisPrescription.dialyzer_perfusion_apparatus
-            // console.log("arr333333",arr)
-            // var newArr =  arr.split(",")
-            // console.log("透析器/灌流器",newArr)
-            // var Arr = []
-            // for(let i=0;i<newArr.length;i++){
-            //   for(let j=0;j<this.dialyzerPerfusionApparatus.length;j++){
-            //      var newarr = newArr[i].toUpperCase()
-
-            //      var dialy = this.dialyzerPerfusionApparatus[j].name.toUpperCase()
-
-            //      if(newarr == dialy){
-            //         Arr.push(this.dialyzerPerfusionApparatus[j].name)
-            //      }
-            //   }
-            // }
-            // var arrtwo = Arr.join(",")
-            // console.log("Arr",arrtwo)
-            //  var arr = this.dialysisPrescription.dialyzer_perfusion_apparatus
-            //  var newArr =  arr.split(",")
-            // console.log("透析器/灌流器",newArr)
-            // var Arr = []
-            // for(let i=0;i<newArr.length;i++){
-            //   for(let j=0;j<this.dialyzerPerfusionApparatus.length;j++){
-            //      var newarr = newArr[i].toUpperCase()
-            //
-            //      var dialy = this.dialyzerPerfusionApparatus[j].name.toUpperCase()
-            //
-            //      if(newarr == dialy){
-            //         Arr.push(this.dialyzerPerfusionApparatus[j].name)
-            //      }
-            //   }
-            // }
-            // var arrtwo = Arr.join(",")
-            // console.log("Arr",arrtwo)
+
             this.InnerDialogProps.values = this.dialyzerPerfusionApparatus
             this.InnerDialogProps.titles = '透析器/灌流器'
             this.InnerDialogProps.type = 'dialyzer_perfusion_apparatus'
@@ -1957,7 +1923,7 @@
         return uParseTime(val, '{y}-{m}-{d} {h}:{i}')
       },
       show(pre, schedual, last, his_is_open) {
-        console.log('pre222222', this.predialysis)
+        
         if (pre != undefined) {
           if (pre.oxygen_uptake == 1) {
             this.oxygenShow = true
@@ -2071,8 +2037,8 @@
         if (pre.id > 0) {
           this.dialysisPrescription.mode_id = pre.mode_id
         }
-        console.log('this.dialysisPrescription.mode_id', this.dialysisPrescription.mode_id)
-        console.log('this.schedual', schedual.mode_id)
+        // console.log('this.dialysisPrescription.mode_id', this.dialysisPrescription.mode_id)
+        // console.log('this.schedual', schedual.mode_id)
         if (pre.mode_id == 2 || pre.mode_id == 5 || pre.mode_id == 12 || schedual.mode_id == 2 || schedual.mode_id == 5 || schedual.mode_id == 12) {
           this.zhiShow = true
           this.huShow = true
@@ -2107,10 +2073,10 @@
         } else {
           last_weight_after = this.last_record.weight_after
         }
-
+        console.log("last2323232323232332",last)
         if (this.predialysis == null || this.predialysis.id == 0) {
           if (last != null) {
-
+            
             this.dialysisPrescription.niprocart = last.niprocart
             this.dialysisPrescription.jms = last.jms
             this.dialysisPrescription.fistula_needle_set = last.fistula_needle_set
@@ -2125,6 +2091,7 @@
             this.dialysisPrescription.tubing_hemodialysis = last.tubing_hemodialysis
             this.dialysisPrescription.package = last.package
             this.dialysisPrescription.a_liquid = last.a_liquid
+            
 
             weight_before = 0
 
@@ -2134,31 +2101,6 @@
           weight_before = this.predialysis.weight_before
         }
 
-        //获取最后一次血管通路
-        //   console.log("最后一次血管通路",this.predialysis)
-        //  if(this.predialysis!=null){
-        //     if(this.lastAssessment!=null){
-        //       var blood_id = 0
-        //       for(let i= 0;i<this.blood_access_option.length;i++){
-        //           if(this.lastAssessment.blood_access_part_opera_id == this.blood_access_option[i].name){
-        //             blood_id = this.blood_access_option[i].id
-        //           }
-        //       }
-        //        console.log("中国人名职员",this.lastAssessment)
-        //        this.dialysisPrescription.blood_access = blood_id
-        //     }else{
-        //       if(this.last_prescription!=null){
-        //           var blood_id = 0
-        //           for(let i= 0;i<this.blood_access_option.length;i++){
-        //               if(this.last_prescription.blood_access_part_opera_id == this.blood_access_option[i].name){
-        //                 blood_id = this.blood_access_option[i].id
-        //               }
-        //           }
-        //            this.dialysisPrescription.blood_access = blood_id
-        //       }
-        //     }
-
-        //  }
 
         if (weight_before > 0 && last_weight_after > 0) {
           this.add_weight = parseFloat(weight_before - last_weight_after).toFixed(
@@ -2206,10 +2148,6 @@
           this.anticoagulant.weichi_unit = 'ml'
           this.anticoagulant.zongliang_unit = 'ml'
         }
-
-        console.log('首季9999', this.dialysisPrescription.anticoagulant_zongliang)
-        console.log("收集",this.dialysisPrescription.anticoagulant_shouji)
-        console.log("weichi",this.dialysisPrescription.anticoagulant_weichi)
         if(this.$store.getters.xt_user.template_info.template_id == 41 && this.dialysisPrescription.anticoagulant == 2){
           this.dialysisPrescription.anticoagulant_zongliang = ""
           this.dialysisPrescription.anticoagulant_zongliang = parseInt(this.dialysisPrescription.anticoagulant_shouji) +  parseInt(this.dialysisPrescription.anticoagulant_weichi)
@@ -2218,6 +2156,7 @@
 
       },
       handleCommit: function() {
+        console.log("触发了么2323323233223")
         if (this.dialysisPrescription.anticoagulant == '低分子肝素') {
           this.dialysisPrescription.anticoagulant = 3
         }
@@ -2257,7 +2196,7 @@
             ParamsQuery['patient'] = this.patient.id
             ParamsQuery['record_date'] = this.record_date
             ParamsQuery['mode'] = '1'
-
+            ParamsQuery['patient_id'] = this.patient.id
             console.log('第一', ParamsQuery)
             postPrescription(ParamsQuery).then(response => {
               if (response.data.state == 0) {
@@ -2300,6 +2239,7 @@
               ParamsQuery['patient'] = this.patient.id
               ParamsQuery['record_date'] = this.record_date
               ParamsQuery['mode'] = '1'
+              ParamsQuery['patient_id'] = this.patient.id
                console.log('第二')
               postPrescription(ParamsQuery).then(response => {
                 if (response.data.state == 0) {
@@ -2347,8 +2287,9 @@
               ParamsQuery['patient'] = this.patient.id
               ParamsQuery['record_date'] = this.record_date
               ParamsQuery['mode'] = '1'
+              ParamsQuery['patient_id'] = this.patient.id
               console.log('第三')
-
+            
               postPrescription(ParamsQuery).then(response => {
                 if (response.data.state == 0) {
                   this.$message.error(response.data.msg)
@@ -2420,6 +2361,7 @@
               ParamsQuery['record_date'] = this.record_date
               // console.log(this.prescription);
               console.log('第四')
+              ParamsQuery['patient_id'] = this.patient.id
               postPrescription(ParamsQuery).then(response => {
                 if (response.data.state == 0) {
                   this.$message.error(response.data.msg)
@@ -2461,6 +2403,7 @@
               ParamsQuery['patient'] = this.patient.id
               ParamsQuery['record_date'] = this.record_date
               ParamsQuery['mode'] = '1'
+              ParamsQuery['patient_id'] = this.patient.id
               console.log('第五')
               postPrescription(ParamsQuery).then(response => {
                 if (response.data.state == 0) {
@@ -2504,6 +2447,7 @@
                 ParamsQuery['record_date'] = this.record_date
                 ParamsQuery['mode'] = '1'
                 console.log('第6')
+                ParamsQuery['patient_id'] = this.patient.id
                 postPrescription(ParamsQuery).then(response => {
                   if (response.data.state == 0) {
                     this.$message.error(response.data.msg)
@@ -2552,6 +2496,7 @@
                 ParamsQuery['record_date'] = this.record_date
                 ParamsQuery['mode'] = '1'
                 console.log('第七')
+                ParamsQuery['patient_id'] = this.patient.id
                 postPrescription(ParamsQuery).then(response => {
                   if (response.data.state == 0) {
                     this.$message.error(response.data.msg)
@@ -2621,7 +2566,9 @@
                 ParamsQuery['patient'] = this.patient.id
                 ParamsQuery['record_date'] = this.record_date
                 ParamsQuery['mode'] = '1'
+                ParamsQuery['patient_id'] = this.patient.id
                 console.log('第八')
+                
                 postPrescription(ParamsQuery).then(response => {
                   if (response.data.state == 0) {
                     this.$message.error(response.data.msg)
@@ -2660,14 +2607,15 @@
             ParamsQuery['patient'] = this.patient.id
             ParamsQuery['record_date'] = this.record_date
             ParamsQuery['mode'] = '2'
-
+            ParamsQuery['patient_id'] = this.patient.id
+          
             if (
               this.$store.getters.xt_user.user.id !=
               this.dialysisPrescription.creater
             ) {
               ParamsQuery['mode'] = '3'
             }
-            console.log('第九')
+            console.log('第九',ParamsQuery)
             postPrescription(ParamsQuery).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
@@ -3221,13 +3169,12 @@
       isShows(name) {
         var filedList = store.getters.xt_user.fileds
         for (let i = 0; i < filedList.length; i++) {
-          if (
-            filedList[i].module == 1 &&
-            filedList[i].filed_name_cn == name &&
-            filedList[i].is_show == 1
-          ) {
+         
+          if (filedList[i].module == 1 && filedList[i].filed_name_cn == name && filedList[i].is_show == 1) {
+
             return true
           }
+
         }
         return false
       },

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

@@ -47,6 +47,7 @@
         <el-checkbox :label="replacement_total"></el-checkbox>
         <el-checkbox :label="blood_flow_volume"></el-checkbox>
         <el-checkbox :label="dialysate_flow"></el-checkbox>
+        <el-checkbox :label="displace_liqui_value"></el-checkbox>
      </el-checkbox-group>
     </el-form>
     <el-form :inline="true" class="demo-form-inline newInline" :model="doubleReview" label-width="105px">
@@ -197,10 +198,11 @@
         anticoagulant_weichi:"维持:",
         anticoagulant_zongliang:"总量:",
         displace_liqui_part:"置换液:",
-        replacement_total:"置换总量:",
+        replacement_total:"置换量:",
         blood_flow_volume:"处方血流量:",
         dialysate_flow:"透析液流量:",
-        blood_access_part_opera_id:"通路类型:"
+        blood_access_part_opera_id:"通路类型:",
+        displace_liqui_value:"置换液总量:",
       }
     }, methods: {
       
@@ -222,7 +224,7 @@
                   '{y}-{m}-{d} {h}:{i}'
                 ).split(' ')[1]
 
-                console.log('真性感')
+                
             }
 
           }else if(this.$store.getters.xt_user.user.id != this.double_check.creater && this.double_check.modifier == 0){
@@ -235,17 +237,14 @@
           if(this.doubleReview.modifier == 0){
             this.doubleReview.modifier = ""
           }
-          console.log( this.first_check_time )
-          console.log( this.check_time )
-
-
+       
         } else {
           var nowDate = new Date()
           var nowHours = nowDate.getHours()
           var nowMinutes = nowDate.getMinutes()
-          if(this.$store.getters.xt_user.user.id != this.double_check.creater && this.double_check.modifier == 0){
-            this.check_time = (nowHours < 10 ? '0' + nowHours : nowHours) + ':' + (nowMinutes < 10 ? '0' + nowMinutes : nowMinutes)
-          }
+          // if(this.$store.getters.xt_user.user.id != this.double_check.creater && this.double_check.modifier == 0){
+          //   this.check_time = (nowHours < 10 ? '0' + nowHours : nowHours) + ':' + (nowMinutes < 10 ? '0' + nowMinutes : nowMinutes)
+          // }
           this.first_check_time = (nowHours < 10 ? '0' + nowHours : nowHours) + ':' + (nowMinutes < 10 ? '0' + nowMinutes : nowMinutes)
           console.log( this.first_check_time )
           console.log( this.check_time )
@@ -326,7 +325,7 @@
            
 
             let doublecheck_resp = response.data.data.doubleCheck
-            console.log("双核2332322323",doublecheck_resp)
+            console.log("处方233232323232232332",this.prescription)
             var doubleCheck = this.double_check
             for (var index in doublecheck_resp) {        
               this.$set(doubleCheck, index, doublecheck_resp[index])
@@ -582,7 +581,7 @@
       changeBoxOne(val){
          var arr = []
          var str = val.join(';')
-         console.log("strw222222222",str)
+        
         if(str.indexOf('透析模式')!=-1 && this.prescription!=null){
             arr.push("透析模式:"+(this.getMode(this.prescription.mode_id)?this.getMode(this.prescription.mode_id):""))
         }
@@ -633,19 +632,19 @@
         }
 
        if(str.indexOf("置换液")!=-1 && this.prescription!=null){
-           arr.push("置换液:"+(this.prescription.displace_liqui_part?this.prescription.displace_liqui_part:""))
+           arr.push("置换液:"+(this.getDisplace(this.prescription.displace_liqui_part)?this.getDisplace(this.prescription.displace_liqui_part):""))
         } 
 
        if(str.indexOf("置换液")!=-1 && this.prescription==null){
            arr.push("置换液:")
         } 
       
-       if(str.indexOf("置换总量")!=-1 && this.prescription!=null){
-           arr.push("置换总量:"+(this.prescription.replacement_total?this.prescription.replacement_total:""))
+       if(str.indexOf("置换量")!=-1 && this.prescription!=null){
+           arr.push("置换量:"+(this.prescription.replacement_total?this.prescription.replacement_total:""))
         } 
 
-        if(str.indexOf("置换总量")!=-1 && this.prescription==null){
-           arr.push("置换总量:")
+        if(str.indexOf("置换量")!=-1 && this.prescription==null){
+           arr.push("置换量:")
         } 
 
        if(str.indexOf("处方血流量")!=-1 && this.prescription!=null){
@@ -663,6 +662,12 @@
        if(str.indexOf("透析液流量")!=-1 && this.prescription==null){
            arr.push("透析液流量:")
         } 
+        if(str.indexOf("置换液总量")!=-1 && this.prescription!=null){
+           arr.push("置换液总量:"+(this.prescription.displace_liqui_value?this.prescription.displace_liqui_value:""))
+        } 
+        if(str.indexOf("置换液总量")!=-1 && this.prescription == null){
+           arr.push("置换液总量:")
+        }
         console.log("arr",arr)
         this.doubleReview.dialysis_parameter_desc = arr.join(";")
         if(val.length>0){
@@ -674,8 +679,7 @@
       changeBoxTwo(val){
          var arr = []
          var str = val.join(';')
-         console.log("strw222222222",str)
- 
+         
           if(str.indexOf('通路类型')!=-1 && this.predialysis_evaluation.id!=0){
             arr.push("通路类型:"+this.getBloodAccess(this.predialysis_evaluation.blood_access_part_opera_id))
           
@@ -710,7 +714,7 @@
       changeBoxThree(val){
          var arr = []
          var str = val.join(';')
-         console.log("strw222222222",str)
+      
          if(str.indexOf('泵前补液测管未夹')!=-1){
            arr.push("泵前补液测管未夹:")
          }
@@ -867,6 +871,7 @@
        }
        return name
      },
+   
      getBloodAccess(id){
        
         let vascular_access_desc = getDataConfig(
@@ -880,7 +885,18 @@
           }
         }
         return name
-     }
+     },
+     getDisplace(id){
+       var name = ""
+       var arr = this.$store.getters.displace_liqui
+       console.log("arr233233233223",arr)
+       for(let i=0;i<arr.length;i++){
+        if(id == arr[i].id){
+          name = arr[i].name
+        }
+       }
+       return name
+     },
     },
 
     props: {
@@ -920,52 +936,128 @@
     },
     watch: {
       isVisibility(val) {
-        
+         
         if(this.prescription!=null && this.prescription.id!=0){
+          if(this.prescription.dialyzer_perfusion_apparatus !="" || this.prescription.dialysis_dialyszers!="" || this.prescription.dialysis_irrigation!=""){
+            this.diazes = "透析器/灌流器:"
+            this.diazes = this.diazes + this.prescription.dialyzer_perfusion_apparatus
+            this.diazes = this.diazes + this.prescription.dialysis_dialyszers+this.prescription.dialysis_irrigation
+          }else{
+            this.diazes = ""
+            this.diazes = this.diazes 
+          }
+          
+          if(this.prescription.dialysate_formulation!=""){
+            this.dialysate_formulation = "透析液配方:"
+             this.dialysate_formulation = this.dialysate_formulation + this.GetDialysateFormulationById(this.prescription.dialysate_formulation)
+          }else{
+            this.dialysate_formulation = this.dialysate_formulation 
+          }
+          
+          if(this.prescription.kalium!=""){
+            this.kalium = "钾:"
+           this.kalium = this.kalium + (this.prescription.kalium?this.prescription.kalium:"")
+          }else{
+            this.kalium = this.kalium 
+          }
+       
+          if(this.prescription.calcium!=""){
+           this.calcium = "钙:"
+           this.calcium = this.calcium + (this.prescription.calcium?this.prescription.calcium:"")
+          }else{
+            this.calcium = this.calcium
+          }
+         
+          if(this.prescription.mode_id > 0){
+            this.dialys_mode= "透析模式:"
+            this.dialys_mode = this.dialys_mode + this.getMode(this.prescription.mode_id) 
+          }else{
+             this.dialys_mode = this.dialys_mode
+          }
+          
+          if(this.prescription.dialysis_duration_hour !="" || this.prescription.dialysis_duration_minute!=""){
+            this.long_time ="透析时长:"
+            this.long_time = this.long_time + (this.prescription.dialysis_duration_hour?this.prescription.dialysis_duration_hour:"") +"小时" +(this.prescription.dialysis_duration_minute?this.prescription.dialysis_duration_minute:"") +"分"
+          }else{
+             this.long_time = this.long_time
+          }
+          
+          if(this.prescription.target_ultrafiltration!=""){
+           this.target_ultrafiltration = "目标超滤量:"
+           this.target_ultrafiltration = this.target_ultrafiltration + (this.prescription.target_ultrafiltration?this.prescription.target_ultrafiltration:"")
+          }else{
+            this.target_ultrafiltration = this.target_ultrafiltration
+          }
+          
+          if(this.prescription.anticoagulant!=""){
+            this.anticoagulant = "抗凝剂:"
+            this.anticoagulant = this.anticoagulant + (this.getAnticoagulant(this.prescription.anticoagulant)?this.getAnticoagulant(this.prescription.anticoagulant):"")
+          }else{
+            this.anticoagulant = this.anticoagulant 
+          }
+         
+          if(this.prescription.anticoagulant_shouji!=""){
+            this.anticoagulant_shouji="首剂:"
+            this.anticoagulant_shouji = this.anticoagulant_shouji + (this.prescription.anticoagulant_shouji?this.prescription.anticoagulant_shouji:"")
+          }else{
+             this.anticoagulant_shouji = this.anticoagulant_shouji
+          }
+          
+          if(this.prescription.anticoagulant_weichi!=""){
+             this.anticoagulant_weichi = "维持:"
+             this.anticoagulant_weichi = this.anticoagulant_weichi + (this.prescription.anticoagulant_weichi?this.prescription.anticoagulant_weichi:"")
+          }else{
+           this.anticoagulant_weichi = this.anticoagulant_weichi 
+          }
           
-          this.diazes = this.diazes + this.prescription.dialyzer_perfusion_apparatus
-          this.diazes = this.diazes + this.prescription.dialysis_dialyszers+this.prescription.dialysis_irrigation
-          this.prescription.dialyzer_perfusion_apparatus = ""
-          this.prescription.dialysis_dialyszers = ""
-          this.prescription.dialysis_irrigation = ""
-          this.dialysate_formulation = this.dialysate_formulation + this.GetDialysateFormulationById(this.prescription.dialysate_formulation)
-          // this.prescription.dialysate_formulation = ""
-          this.kalium = this.kalium + (this.prescription.kalium?this.prescription.kalium:"")
-          this.prescription.kalium = ""
-          this.calcium = this.calcium + (this.prescription.calcium?this.prescription.calcium:"")
-          this.prescription.calcium = ""
-          this.dialys_mode = this.dialys_mode + this.getMode(this.prescription.mode_id)
-          this.prescription.mode_id= ""
-          this.long_time = this.long_time + (this.prescription.dialysis_duration_hour?this.prescription.dialysis_duration_hour:"") +"小时" +this.prescription.dialysis_duration_minute +"分"
-          this.prescription.dialysis_duration_hour=""
-          this.target_ultrafiltration = this.target_ultrafiltration + (this.prescription.target_ultrafiltration?this.prescription.target_ultrafiltration:"")
-          this.prescription.target_ultrafiltration = ""
-          this.anticoagulant = this.anticoagulant + this.getAnticoagulant(this.prescription.anticoagulant)
-          this.prescription.anticoagulant=""
-          this.anticoagulant_shouji = this.anticoagulant_shouji + (this.prescription.anticoagulant_shouji?this.prescription.anticoagulant_shouji:"")
-          this.prescription.anticoagulant_shouji = ""
-          this.anticoagulant_weichi = this.anticoagulant_weichi + (this.prescription.anticoagulant_weichi?this.prescription.anticoagulant_weichi:"")
-         this.prescription.anticoagulant_weichi=""
-         this.anticoagulant_zongliang = this.anticoagulant_zongliang+(this.prescription.anticoagulant_zongliang?this.prescription.anticoagulant_zongliang:"")
-         this.prescription.anticoagulant_zongliang = ""
-         this.displace_liqui_part = this.displace_liqui_part + (this.prescription.displace_liqui_part?this.prescription.displace_liqui_part:"")
-          this.prescription.displace_liqui_part
-          this.replacement_total = this.replacement_total + (this.prescription.replacement_total?this.prescription.replacement_total:"")
-          this.prescription.replacement_total= ""
-          this.dialysate_flow = this.dialysate_flow + (this.prescription.dialysate_flow?this.prescription.dialysate_flow:"")
-          this.prescription.dialysate_flow= ""
+          if(this.prescription.anticoagulant_zongliang!=""){
+             this.anticoagulant_zongliang = "总量:"
+             this.anticoagulant_zongliang = this.anticoagulant_zongliang+(this.prescription.anticoagulant_zongliang?this.prescription.anticoagulant_zongliang:"")
+          }else{
+             this.anticoagulant_zongliang = this.anticoagulant_zongliang
+          }
+       
+          if(this.prescription.displace_liqui_part!=""){
+             this.displace_liqui_part="置换液:"
+            this.displace_liqui_part = this.displace_liqui_part + (this.getDisplace(this.prescription.displace_liqui_part)?this.getDisplace(this.prescription.displace_liqui_part):"")
+          }else{
+             this.displace_liqui_part = this.getDisplace(this.displace_liqui_part)
+          }
+          
+          if(this.prescription.replacement_total!=""){
+             this.replacement_total = "置换量:"
+             this.replacement_total = this.replacement_total + (this.prescription.replacement_total?this.prescription.replacement_total:"")
+          }else{
+             this.replacement_total = this.replacement_total
+          }
+        
+          if(this.prescription.dialysate_flow!=""){
+             this.dialysate_flow = "透析液流量:"
+             this.dialysate_flow = this.dialysate_flow + (this.prescription.dialysate_flow?this.prescription.dialysate_flow:"")
+          }else{
+             this.dialysate_flow = this.dialysate_flow
+          }
+         
+          if(this.prescription.displace_liqui_value!=""){
+            this.displace_liqui_value = "置换液总量:"
+            this.displace_liqui_value = this.displace_liqui_value + this.prescription.displace_liqui_value
+            console.log("置换液总量",this.displace_liqui_value)
+          }
+        
         }
         if(this.predialysis_evaluation!=null && this.predialysis_evaluation.id!=0){
+          this.puncture_needle = "穿刺针:"
           this.puncture_needle = this.puncture_needle + this.predialysis_evaluation.puncture_needle
           this.blood_access_part_opera_id = this.blood_access_part_opera_id + this.getBloodAccess(this.predialysis_evaluation.blood_access_part_opera_id)
         } 
         if(this.double_check !=null && this.double_check.id!=0){
-           console.log("双人核对",this.double_check)
+        
            if(this.double_check.dialysis_item_desc.indexOf("透析器/灌流器")!=-1){
              this.checkList.push("透析器/灌流器:"+this.prescription.dialyzer_perfusion_apparatus)
-             console.log("222222",this.checkList)
+            
            }
            if(this.double_check.dialysis_item_desc.indexOf("穿刺针")!=-1){
+          
               this.checkList.push("穿刺针:"+(this.predialysis_evaluation.puncture_needle?this.predialysis_evaluation.puncture_needle:""))
            }
            if(this.double_check.dialysis_item_desc.indexOf("透析液配方:")!=-1){
@@ -978,6 +1070,7 @@
                this.checkList.push("钙:"+(this.prescription.calcium?this.prescription.calcium:""))
            }
            if(this.double_check.dialysis_parameter_desc.indexOf("透析模式:")!=-1){
+              
               this.checkListOne.push("透析模式:"+this.getMode(this.prescription.mode_id))
            }
            if(this.double_check.dialysis_parameter_desc.indexOf("透析时长")!=-1){
@@ -987,7 +1080,7 @@
               this.checkListOne.push("目标超滤量:"+(this.prescription.target_ultrafiltration?this.prescription.target_ultrafiltration:""))
            }
            if(this.double_check.dialysis_parameter_desc.indexOf("抗凝剂")!=-1){
-              this.checkListOne.push("抗凝剂:"+this.getAnticoagulant(this.prescription.anticoagulant))
+              this.checkListOne.push("抗凝剂:"+this.getAnticoagulant(this.prescription.anticoagulant?this.prescription.anticoagulant:""))
            }
            if(this.double_check.dialysis_parameter_desc.indexOf("首剂")!=-1){
               this.checkListOne.push("首剂:"+(this.prescription.anticoagulant_shouji?this.prescription.anticoagulant_shouji:""))
@@ -999,10 +1092,10 @@
               this.checkListOne.push("总量:"+(this.prescription.anticoagulant_zongliang?this.prescription.anticoagulant_zongliang:""))
            }
           if(this.double_check.dialysis_parameter_desc.indexOf("置换液")!=-1){
-              this.checkListOne.push("置换液:"+(this.prescription.displace_liqui_part?this.prescription.displace_liqui_part:""))
+              this.checkListOne.push("置换液:"+(this.getDisplace(this.prescription.displace_liqui_part)?this.getDisplace(this.prescription.displace_liqui_part):""))
            }
-           if(this.double_check.dialysis_parameter_desc.indexOf("置换总量")!=-1){
-             this.checkListOne.push("置换总量:"+(this.prescription.replacement_total?this.prescription.replacement_total:""))
+           if(this.double_check.dialysis_parameter_desc.indexOf("置换量")!=-1){
+             this.checkListOne.push("置换量:"+(this.prescription.replacement_total?this.prescription.replacement_total:""))
            }
            if(this.double_check.dialysis_parameter_desc.indexOf("处方血流量")!=-1){
              this.checkListOne.push("处方血流量:"+(this.prescription.blood_flow_volume?this.prescription.blood_flow_volume:""))
@@ -1010,6 +1103,10 @@
            if(this.double_check.dialysis_parameter_desc.indexOf("透析液流量")!=-1){
              this.checkListOne.push("透析液流量:"+(this.prescription.dialysate_flow?this.prescription.dialysate_flow:""))
            }
+
+           if(this.double_check.dialysis_parameter_desc.indexOf("置换液总量")!=-1){
+             this.checkListOne.push("置换液总量:"+(this.prescription.displace_liqui_value?this.prescription.displace_liqui_value:""))
+           }
            if(this.double_check.vascular_access_desc.indexOf("通路类型")!=-1){
              this.checkListTwo.push("通路类型:"+this.getBloodAccess(this.predialysis_evaluation.blood_access_part_opera_id))
            }

src/xt_pages/dialysis/details/index.vue

@@ -981,6 +981,7 @@ export default {
           var schedual = resp.data.schedual // 患者排班信息
           console.log("排班22222222222",schedual)
           var prescription = resp.data.prescription // 透析处方
+        
           if (prescription != null) {
             if (prescription.body_fluid == -2) {
               prescription.body_fluid = 0
@@ -993,7 +994,7 @@ export default {
                prescription.plasma_separator  = ""
             }
           }
-
+        
           var solution = resp.data.solution // 透析方案
           console.log("透析方案22223333333333",solution)
           var receiver_treatment_access = resp.data.receiver_treatment_access // 接诊评估
@@ -1204,7 +1205,8 @@ export default {
         } else {
           this.$message.error(resp.msg)
         }
-
+       
+       // 目标超滤量是否默认上次数据
         if (this.lastDialysisPrescribe != null) {
           delete this.lastDialysisPrescribe.target_ultrafiltration
         }
@@ -1334,11 +1336,21 @@ export default {
     },
     requestDialysisSchedules: function() {
       var ymd = parseTime(this.selected_date, '{y}-{m}-{d}')
+      console.log("ymd233223232",ymd)
+      console.log("prescription",this.prescription)
       getDialysisSchedules(ymd).then(rs => {
         var resp = rs.data
         if (resp.state == 1) {
           var schedules = resp.data.schedules
-          console.log("当前排班信息4444444444444444",schedules)
+          // if(this.prescription!=null){
+          //   for(let i=0;i<schedules.length;i++){
+          //     if(this.prescription.patient_id == schedules[i].patient_id){
+          //       this.prescription = schedules[i].prescription
+          //     }
+          //   }
+          // }
+         
+          console.log("hh2332223323232",schedules)
           this.zone_schedules = this.processedDialysisSchedules(schedules, this.zone_options)
           const patientArr = JSON.parse(JSON.stringify(this.zone_schedules))
           if (this.activeName == 'first') {

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -3232,11 +3232,8 @@
           }, 400)
         }
       }
-    },
-    created(){
-      console.log("中华任命工商过多水分我333323232",this.org_id)
-      console.log("jjjjjjjjjjjjjjjjjjjjjjjjjjjj",this.drugs)
     }
+  
 
   }
 </script>

src/xt_pages/hospitalStation/doctorDesk.vue

@@ -410,14 +410,25 @@
         this.$refs.multipleTable3.toggleAllSelection()
       },
       printThisPage() {
-        const style =
+        if(this.org_id == 10138){
+          const style =
           '@media print {#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:350px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 88%;}}#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:350px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 87%;}}}'
-        printJS({
-          printable: 'printMain',
-          type: 'html',
-          style: style,
-          scanStyles: false
-        })
+          printJS({
+            printable: 'printMain',
+            type: 'html',
+            style: style,
+            scanStyles: false
+          })
+        }else{
+          const style =
+          '@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 200px;font-size:14px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 88%;}}#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}.NoCell{display: flex;justify-content: space-between;margin-bottom: 10px;}.underLine{display: inline-block;border-bottom: 1px solid #000;text-align: center;line-height: 24px;}.basicCell{display: flex;} .basicCell span{line-height: 24px;margin-bottom: 10px;}}'
+          printJS({
+            printable: 'printMain',
+            type: 'html',
+            style: style,
+            scanStyles: false
+          })
+        }
         this.innerVisible = false
         // this.$nextTick(() => {
         //   this.$refs.print.printThisPage()

src/xt_pages/hospitalStation/print.vue

@@ -12,10 +12,11 @@
           >
         </template>
 
-        <div class='dialysisPage' style="padding-top:40px;">
+        <div class='dialysisPage'>
             <div v-if="org_id != 10138">
-                <printOne v-if="org_id != 10088" 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>
-                <printFour v-else 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"></printFour>
+                <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>
+                <printFour v-if="org_id == 10088" 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"></printFour>
+                <printFive v-if="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"></printFive>
             </div>
             <div v-else>
                 <printThree 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"></printThree>
@@ -37,6 +38,7 @@
   import printOne from "./template/printOne"
   import printThree from "./template/printThree"
   import printFour from "./template/printFour"
+  import printFive from "./template/printFive"
   import { getAllDoctorList,getAllHisPatientList,getPrescriptionPrint } from "@/api/project/project"
   export default {
     name: "dialysisPrintOrder",
@@ -44,7 +46,8 @@
       BreadCrumb,
       printOne,
       printThree,
-      printFour
+      printFour,
+      printFive
     },
     props:{
       paramsObj:Object,
@@ -372,11 +375,15 @@
 </style>
 
 <style lang="scss">
-
+    .dialysisPage{
+      padding-top:40px;
+    }
     .newContainer{
     .dialysisPage::-webkit-scrollbar {
         height: 15px;
     }
+    
+    
 
     .el-date-editor{
     .el-input__inner{

src/xt_pages/hospitalStation/template/printFive.vue

@@ -0,0 +1,375 @@
+<template>
+  <div id='prescriptionPrint'>
+    <div v-for="(item,index) in advicePrint" :key="index">
+      <div id='prescription-print' class="prescription-print" style="page-break-after: always;">
+          <div class="printTitle" v-if="prescriptions[0].med_type == '1111'">{{orgname}}第一类精神处方笺</div>
+          <div class="printTitle"  v-if="prescriptions[0].med_type == '1112'">{{orgname}}第二类精神处方笺</div>
+          <div class="printTitle" v-if="prescriptions[0].med_type != '1111' && prescriptions[0].med_type != '1112'">{{orgname}}处方笺</div>
+          <div class="NoCell">
+              <div><span style="font-size:20px;font-weight:bold;">No</span><div class="underLine" style="width:120px;">{{ (item.prescription_number + (index + 1)).substring(item.prescription_number.length-6) }}</div></div>
+              <div style="display:flex;">
+                  <div style="display: flex;flex-direction: column-reverse;">开具日期</div>
+                  <div class="underLine" style="width:60px;">{{getTime(item.ctime)?getTime(item.ctime).split(' ')[0].slice(0,4):""}}</div><div style="display: flex;flex-direction: column-reverse;">年</div>
+                  <div class="underLine" style="width:60px;">{{getTime(item.ctime)?getTime(item.ctime).split(' ')[0].slice(5,7):""}}</div><div style="display: flex;flex-direction: column-reverse;">月</div>
+                  <div class="underLine" style="width:60px;">{{getTime(item.ctime)?getTime(item.ctime).split(' ')[0].slice(8,11):""}}</div><div style="display: flex;flex-direction: column-reverse;">日</div>
+              </div>
+          </div>
+          <div class="basicCell">
+              <span>透析号</span>
+              <span class="underLine" style="width:100px;">{{ item.patient.dialysis_no ? item.patient.dialysis_no : '' }}</span>
+              <span>治疗区</span>
+              <span class="underLine" style="width:100px;">{{item.info?getDepart(item.info.departments):''}}</span>
+              <span>费别</span>
+              <span class="underLine" style="width:100px;"></span>
+          </div>
+          <div class="basicCell">
+              <span>姓名</span>
+              <span class="underLine" style="width:100px;">{{item.patient.name?item.patient.name:""}}</span>
+              <span>性别</span>
+              <span class="underLine" style="width:60px;">
+                <span v-if="item.patient.gender == 1">男</span>
+                <span v-if="item.patient.gender == 2">女</span>
+              </span>
+              <span>年龄</span>
+              <span class="underLine" style="width:60px;">{{getAge(item.patient)?getAge(item.patient):""}}岁</span>
+              <span>电话</span>
+              <span class="underLine" style="width:120px;">{{item.patient.phone}}</span>
+          </div>
+          <div class="basicCell" style="margin-bottom:30px;">
+              <span>临床诊断</span>
+              <span class="underLine" style="width:100%;flex:1;text-align:left;padding-left:10px;">{{getDiagnosis(item.info.diagnosis)}}</span>
+          </div>
+          <div class="prescriptionBox" style="border-top: 1px solid #000;border-bottom: 1px solid #000;">
+              <div class="Rp">Rp:</div>
+              <div class="drugsBox" v-for="(it,index) in item.advices" :key="index">
+                  <!-- <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div> -->
+                  <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;<span v-if="it.drug.min_unit != it.drug.dose_unit">{{it.drug.dose}}{{it.drug.dose_unit}}&nbsp;* &nbsp;</span>{{it.drug.min_number}}{{it.drug.min_unit}}/{{it.drug.max_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div>
+                  <div style="margin-left:100px;"><span>用法：{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.execution_frequency}}&nbsp;{{it.delivery_way}}&nbsp;</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
+              </div>
+              <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
+                <div class="drugsOne">{{it.item_name?it.item_name:""}}:&nbsp;{{it.price}}元/{{it.count}}次</div>
+               </div>
+
+              <div class="drugsBox" v-for="(it,index) in item.project" :key="index">
+                  <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.type == 2?getProjectName(it.project_id)?getProjectName(it.project_id):"":it.good_info.good_name}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.count}}{{unit}}</div>
+                  <div style="margin-left:100px;"><span>用法：{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.delivery_way}}</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
+              </div>
+              <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
+                <div class="drugsOne">{{it.project_id?it.project_id:""}}:&nbsp;{{it.price.toFixed(2)}}元/{{it.count}}次</div>
+               </div>
+               <div style="text-align:center;" >(以下空白)</div>
+
+          </div>
+          <div class="NoCell" style="margin-top:20px;">
+              <div style="display:flex;">
+                <span>医师</span>
+                <span class="underLine" style="width:100px;">{{item.doctor?item.doctor:""}}</span>
+              </div>
+              <div style="display:flex;">
+                <span>金额</span>
+                <span class="underLine" style="width:100px;"></span>
+              </div>
+          </div>
+          <div class="NoCell">
+              <div style="display:flex;">
+                <span>药师（审核、核对、发药）</span>
+                <span class="underLine" style="width:100px;"></span>
+              </div>
+              <div style="display:flex;">
+                <span>调配</span>
+                <span class="underLine" style="width:100px;"></span>
+              </div>
+          </div>
+          <div style="page-break-after:always"></div>
+      </div>
+    </div>
+
+  </div>
+
+
+</template>
+<script>
+import { jsGetAge, uParseTime } from '@/utils/tools'
+import {getAllDoctorList,getPrescriptionPrint,getHisPatientDetail} from "@/api/project/project"
+import {getInitData} from "@/api/his/his"
+export default {
+    props:{
+      patient_id:Number,
+      record_date:String,
+      prescription_id:Number,
+      ids:String
+    },
+    data(){
+      return {
+        doctorList:[],
+        advicePrint:{},
+        patient:{},
+        tableData:[],
+        prescriptionInfo:[],
+        hisPatient:{},
+        department:[],
+        prescriptions:[],
+        projectList:[],
+        orgname:"",
+        diagnoses:[],
+        org_id: 0
+      }
+    },
+   methods:{
+     getAge(patient){
+       var thisLen = patient.id_card_no.length
+       var birth = ''
+       if (thisLen == 15) {
+         birth = '19' + patient.id_card_no.substr(6, 6)
+       } else {
+         birth = patient.id_card_no.substr(6, 8)
+       }
+       var births =
+         birth.substr(0, 4) +
+         '-' +
+         birth.substr(4, 2) +
+         '-' +
+         birth.substr(6, 2)
+       return jsGetAge(births, '-')
+
+     },
+
+     getAllDoctorList(){
+      getAllDoctorList().then(response=>{
+        if(response.data.state == 1){
+               var doctor =  response.data.data.doctor
+
+               this.doctorList = doctor
+             }
+         })
+     },
+
+      getDoctor(id){
+        var name = ""
+        for(let i=0;i<this.doctorList.length;i++){
+          if(id == this.doctorList[i].admin_user_id){
+              name = this.doctorList[i].user_name
+          }
+        }
+        return name
+      },
+      getTime(value, temp) {
+        if (value != undefined) {
+            return uParseTime(value, temp)
+        }
+        return ''
+     },
+       getPrescriptionPrint(){
+         var params = {
+          // patient_id:this.patient_id,
+          // record_date:this.record_date,
+          // prescription_id:this.prescription_id,
+          patient_id:this.patient_id,
+          record_date:this.record_date,
+          prescription_id:this.prescription_id,
+          ids:this.ids
+        }
+        console.log("params",params)
+       getPrescriptionPrint(params).then(response=>{
+         if(response.data.state == 1){
+            var advicePrint =  response.data.data.advicePrint
+            console.log("adviceprint9999",advicePrint)
+            this.advicePrint = advicePrint
+            this.prescriptions = advicePrint
+            console.log("处方222222",this.prescriptions)
+            var hisPatient = response.data.data.hisPatient
+            console.log("hisPatient",hisPatient)
+            this.hisPatient = hisPatient
+            var projectlist =  response.data.data.projectlist
+            console.log("所有项目列表",projectlist)
+            this.projectList = projectlist
+          }
+       })
+     },
+     getHisPatientDetail(){
+          const params = {
+              patient_id:this.patient_id
+          }
+       getHisPatientDetail(params).then(response=>{
+          if(response.data.state == 1){
+             var hisPatient =  response.data.data.hisPatient
+             console.log("挂号病人",hisPatient)
+             this.hisPatient = hisPatient
+          }
+       })
+     },
+     getInitData(){
+       getInitData().then(response=>{
+          if(response.data.state == 1){
+            this.department = response.data.data.department
+            this.diagnoses = response.data.data.diagnose
+            console.log("争端",this.diagnoses)
+          }
+       })
+     },
+     getDepart(id){
+         var name = ""
+       for(let i=0;i<this.department.length;i++){
+           if(id == this.department[i].id){
+               name = this.department[i].name
+           }
+       }
+       return name
+     },
+    getTotalOne(id) {
+
+        var total = 0
+        var addtotal = 0
+        for (let i = 0; i < this.prescriptions.length; i++) {
+          if(id == this.prescriptions[i].id){
+            if (this.prescriptions[i].project != null) {
+              for (let a = 0; a < this.prescriptions[i].project.length; a++) {
+                total = total + this.prescriptions[i].project[a].price * this.prescriptions[i].project[a].count
+              }
+            }
+
+            if (this.prescriptions[i].additionalcharge != null) {
+              for (let a = 0; a < this.prescriptions[i].additionalcharge.length; a++) {
+                addtotal = addtotal + this.prescriptions[i].additionalcharge[a].price * this.prescriptions[i].additionalcharge[a].count
+              }
+            }
+              addtotal =  Math.floor(addtotal * 100) / 100
+        }
+
+       }
+
+      for (let i = 0; i < this.prescriptions.length; i++) {
+          if(id == this.prescriptions[i].id){
+            if (this.prescriptions[i].advices != null) {
+              for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
+                total = total + this.prescriptions[i].advices[a].price * this.prescriptions[i].advices[a].prescribing_number
+              }
+            }
+
+            if (this.prescriptions[i].additionalcharge != null) {
+              for (let a = 0; a < this.prescriptions[i].additionalcharge.length; a++) {
+                addtotal = addtotal + this.prescriptions[i].additionalcharge[a].price * this.prescriptions[i].additionalcharge[a].count
+              }
+            }
+              addtotal =  Math.floor(addtotal * 100) / 100
+        }
+       }
+
+        return total + addtotal
+      },
+
+     getProjectName(id){
+        var project_name = ""
+        for(let i=0;i<this.projectList.length;i++){
+           if(id == this.projectList[i].id){
+               project_name = this.projectList[i].project_name
+           }
+        }
+        return project_name
+     },
+
+     getDiagnosis(id){
+        let arr = id.split(',')
+        var name = ""
+        for(let i=0;i<this.diagnoses.length;i++){
+          if(arr.indexOf(String(this.diagnoses[i].id)) > -1){
+             name += this.diagnoses[i].class_name + ' '
+          }
+        }
+        return name
+     }
+
+   },
+   created(){
+      this.getAllDoctorList()
+      this.getInitData()
+      this.getPrescriptionPrint()
+      this.getHisPatientDetail()
+      var xtuser = this.$store.getters.xt_user;
+      this.orgname = xtuser.org.org_name;
+      this.org_id = xtuser.org.id
+   },
+   watch:{
+     ids:function(val){
+      this.ids = val
+      this.getPrescriptionPrint()
+    }
+   }
+}
+</script>
+
+
+<style lang="scss" scoped>
+.prescription-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;
+    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+    margin-bottom: 20px;
+    padding:20px 10px;
+}
+.printTitle{
+    font-size: 22px;
+    text-align: center;
+    font-weight: bold;
+}
+.infoTitle{
+    display: flex;
+    border-bottom: 2px solid #000;
+    margin-top:10px;
+    line-height: 24px;
+    padding:0 10px;
+}
+.infoTitle p{
+    width: 200px;
+}
+.infoMain{
+    display: flex;
+    flex-wrap: wrap;
+    border-bottom: 2px solid #000;
+    padding:0 10px;
+}
+.infoMain div{
+    width: 50%;
+    line-height: 24px;
+}
+.prescriptionBox{
+    padding:0 10px;
+    min-height:450px;
+}
+.Rp{
+    font-size: 22px;
+    font-weight: bold;
+}
+.drugsBox{
+    padding-left: 40px;
+    margin-bottom: 10px;
+}
+.drugsBox div{
+    line-height: 20px;
+}
+.drugsOne{
+    line-height: 24px;
+}
+.drugsOne span{
+    margin-right: 20px;
+}
+.doctorBox{
+    display: flex;
+    justify-content: space-between;
+    padding:0 10px;
+    line-height: 24px;
+    border-bottom: 2px solid #000;
+}
+.actionBar{
+    display: flex;
+    justify-content: space-between;
+    line-height: 24px;
+    padding:0 10px;
+}
+.actionBar p{
+    width:150px;
+}
+.NoCell{display: flex;justify-content: space-between;margin-bottom: 10px;}
+.underLine{display: inline-block;border-bottom: 1px solid #000;text-align: center;line-height: 24px;}
+.basicCell{display: flex;} .basicCell span{line-height: 24px;margin-bottom: 10px;}
+</style>

src/xt_pages/outpatientCharges/components/prescriptionTable.vue

@@ -3,8 +3,8 @@
     <el-table v-if="prescription.type == 1" :data="prescription.advices" border style="width: 99%;"
               :row-style="{ color: '#303133' }"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
-      <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
-      <el-table-column align="center" prop="name" label="名称">
+      <el-table-column fixed align="center" type="index" width="40" label="序号"></el-table-column>
+      <el-table-column fixed align="center" prop="name" label="名称">
         <template slot-scope="scope"><span :title='scope.row.drug_name'>{{ scope.row.drug_name }}</span></template>
       </el-table-column>
 
@@ -48,14 +48,14 @@
       </el-table-column>
 
 
-      <el-table-column align="center" prop="name" width="60" label="医保编码">
+      <el-table-column align="center" prop="name" width="120" label="医保编码">
         <template slot-scope="scope">
           <div> {{scope.row.code}}</div>
         </template>
       </el-table-column>
 
 
-      <el-table-column align="center" prop="name" width="60" label="规格/型号">
+      <el-table-column align="center" prop="name" width="80" label="规格/型号">
         <template slot-scope="scope">
           <div> {{scope.row.spec}}</div>
         </template>
@@ -68,7 +68,7 @@
       </el-table-column>
 
 
-      <el-table-column align="center" prop="name" width="60" label="生产厂家">
+      <el-table-column align="center" prop="name" width="120" label="生产厂家">
         <template slot-scope="scope">
           <div> {{getName(scope.row.name_id)}}</div>
         </template>
@@ -76,7 +76,7 @@
 
 
 
-      <el-table-column align="center" prop="name" width="60" label="全自费金额">
+      <el-table-column align="center" prop="name" width="90" label="全自费金额">
         <template slot-scope="scope">
           <div> {{scope.row.fulamt_ownpay_amt}}元</div>
         </template>
@@ -84,21 +84,21 @@
 
 
 
-      <el-table-column align="center" prop="name" width="60" label="超限价金额">
+      <el-table-column align="center" prop="name" width="90" label="超限价金额">
         <template slot-scope="scope">
           <div> {{scope.row.overlmt_amt}}元</div>
         </template>
       </el-table-column>
 
 
-      <el-table-column align="center" prop="name" width="60" label="先行自付金额">
+      <el-table-column align="center" prop="name" width="90" label="先行自付金额">
         <template slot-scope="scope">
           <div> {{scope.row.preselfpay_amt}}元</div>
         </template>
       </el-table-column>
 
 
-      <el-table-column align="center" prop="name" width="60" label="符合正常范围金额">
+      <el-table-column align="center" prop="name" width="90" label="符合正常范围金额">
         <template slot-scope="scope">
           <div> {{scope.row.inscp_scp_amt}}元</div>
         </template>
@@ -120,8 +120,8 @@
     <el-table v-if="prescription.type == 2" :data="prescription.project" border style="width: 99%;"
               :row-style="{ color: '#303133' }"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
-      <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
-      <el-table-column align="center" prop="project_name" label="名称">
+      <el-table-column fixed align="center" type="index" width="40" label="序号"></el-table-column>
+      <el-table-column fixed align="center" prop="project_name" label="名称">
         <template slot-scope="scope">{{ scope.row.project_name }}</template>
       </el-table-column>
       <el-table-column align="center" prop="statistical_classification" width="100" label="组">
@@ -152,14 +152,14 @@
 
 
 
-      <el-table-column align="center" prop="name" width="60" label="医保编码">
+      <el-table-column align="center" prop="name" width="120" label="医保编码">
         <template slot-scope="scope">
           <div> {{scope.row.medical_code}}</div>
         </template>
       </el-table-column>
 
 
-      <el-table-column align="center" prop="name" width="60" label="规格/型号">
+      <el-table-column align="center" prop="name" width="80" label="规格/型号">
         <template slot-scope="scope">
           <div> {{scope.row.spec}}</div>
         </template>
@@ -172,7 +172,7 @@
       </el-table-column>
 
 
-      <el-table-column align="center" prop="name" width="60" label="生产厂家">
+      <el-table-column align="center" prop="name" width="120" label="生产厂家">
         <template slot-scope="scope">
           <div> {{getName(scope.row.name_id)}}</div>
         </template>
@@ -180,7 +180,7 @@
 
 
 
-      <el-table-column align="center" prop="name" width="60" label="全自费金额">
+      <el-table-column align="center" prop="name" width="90" label="全自费金额">
         <template slot-scope="scope">
           <div> {{scope.row.fulamt_ownpay_amt}}元</div>
         </template>
@@ -188,21 +188,21 @@
 
 
 
-      <el-table-column align="center" prop="name" width="60" label="超限价金额">
+      <el-table-column align="center" prop="name" width="90" label="超限价金额">
         <template slot-scope="scope">
           <div> {{scope.row.overlmt_amt}}元</div>
         </template>
       </el-table-column>
 
 
-      <el-table-column align="center" prop="name" width="60" label="先行自付金额">
+      <el-table-column align="center" prop="name" width="90" label="先行自付金额">
         <template slot-scope="scope">
           <div> {{scope.row.preselfpay_amt}}元</div>
         </template>
       </el-table-column>
 
 
-      <el-table-column align="center" prop="name" width="60" label="符合正常范围金额">
+      <el-table-column align="center" prop="name" width="90" label="符合正常范围金额">
         <template slot-scope="scope">
           <div> {{scope.row.inscp_scp_amt}}元</div>
         </template>

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -4238,7 +4238,7 @@
 
     .settlementTabs {
         flex: 1;
-
+        width: 100%;
     .el-tab-pane {
         height: 100%;
     }
@@ -4322,5 +4322,8 @@
     }
 
     }
+    ::-webkit-scrollbar {
+      height: 20px;
+    }
 </style>
 

src/xt_pages/outpatientDoctorStation/checkTemplate/printOne.vue

@@ -169,7 +169,7 @@ export default {
               
             })
           
-            this.total = total
+            this.total = total.toFixed(2)
             this.pre_time = this.advicePrint[0].pre_time
             this.doctor = this.advicePrint[0].doctor
             this.projectPrint = data

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -453,7 +453,7 @@
           })
         }else{
           const style =
-          '@media print {#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 200px;font-size:14px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 88%;}}#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}}'
+          '@media print {#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 200px;font-size:14px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 88%;}}#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}.NoCell{display: flex;justify-content: space-between;margin-bottom: 10px;}.underLine{display: inline-block;border-bottom: 1px solid #000;text-align: center;line-height: 24px;}.basicCell{display: flex;} .basicCell span{line-height: 24px;margin-bottom: 10px;}}'
           printJS({
             printable: 'printMain',
             type: 'html',

src/xt_pages/outpatientDoctorStation/print.vue

@@ -14,8 +14,9 @@
 
     <div class='dialysisPage' style="padding-top:40px;">
       <div v-if="org_id != 10138">
-        <printOne v-if="org_id != 10088" 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>
-        <printFour v-else 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"></printFour>
+        <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>
+        <printFour v-if="org_id == 10088" 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"></printFour>
+        <printFive v-if="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"></printFive>
       </div>
       <div v-else>
         <printThree 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"></printThree>
@@ -37,6 +38,7 @@ import print from "print-js";
 import printOne from "./template/printOne"
 import printThree from "./template/printThree"
 import printFour from "./template/printFour"
+import printFive from "./template/printFive"
 import { getAllDoctorList,getAllHisPatientList,getPrescriptionPrint } from "@/api/project/project"
 export default {
   name: "dialysisPrintOrder",
@@ -44,7 +46,8 @@ export default {
     BreadCrumb,
     printOne,
     printThree,
-    printFour
+    printFour,
+    printFive
   },
   props:{
     paramsObj:Object

src/xt_pages/outpatientDoctorStation/template/printFive.vue

@@ -0,0 +1,375 @@
+<template>
+  <div id='prescriptionPrint'>
+    <div v-for="(item,index) in advicePrint" :key="index">
+      <div id='prescription-print' class="prescription-print" style="page-break-after: always;">
+          <div class="printTitle" v-if="prescriptions[0].med_type == '1111'">{{orgname}}第一类精神处方笺</div>
+          <div class="printTitle"  v-if="prescriptions[0].med_type == '1112'">{{orgname}}第二类精神处方笺</div>
+          <div class="printTitle" v-if="prescriptions[0].med_type != '1111' && prescriptions[0].med_type != '1112'">{{orgname}}处方笺</div>
+          <div class="NoCell">
+              <div><span style="font-size:20px;font-weight:bold;">No</span><div class="underLine" style="width:120px;"></div></div>
+              <div style="display:flex;">
+                  <div style="display: flex;flex-direction: column-reverse;">开具日期</div>
+                  <div class="underLine" style="width:60px;">{{getTime(item.ctime)?getTime(item.ctime).split(' ')[0].slice(0,4):""}}</div><div style="display: flex;flex-direction: column-reverse;">年</div>
+                  <div class="underLine" style="width:60px;">{{getTime(item.ctime)?getTime(item.ctime).split(' ')[0].slice(5,7):""}}</div><div style="display: flex;flex-direction: column-reverse;">月</div>
+                  <div class="underLine" style="width:60px;">{{getTime(item.ctime)?getTime(item.ctime).split(' ')[0].slice(8,11):""}}</div><div style="display: flex;flex-direction: column-reverse;">日</div>
+              </div>
+          </div>
+          <div class="basicCell">
+              <span>透析号</span>
+              <span class="underLine" style="width:100px;">{{ item.patient.dialysis_no ? item.patient.dialysis_no : '' }}</span>
+              <span>治疗区</span>
+              <span class="underLine" style="width:100px;">{{item.info?getDepart(item.info.departments):''}}</span>
+              <span>费别</span>
+              <span class="underLine" style="width:100px;"></span>
+          </div>
+          <div class="basicCell">
+              <span>姓名</span>
+              <span class="underLine" style="width:100px;">{{item.patient.name?item.patient.name:""}}</span>
+              <span>性别</span>
+              <span class="underLine" style="width:60px;">
+                <span v-if="item.patient.gender == 1">男</span>
+                <span v-if="item.patient.gender == 2">女</span>
+              </span>
+              <span>年龄</span>
+              <span class="underLine" style="width:60px;">{{getAge(item.patient)?getAge(item.patient):""}}岁</span>
+              <span>电话</span>
+              <span class="underLine" style="width:120px;">{{item.patient.phone}}</span>
+          </div>
+          <div class="basicCell" style="margin-bottom:30px;">
+              <span>临床诊断</span>
+              <span class="underLine" style="width:100%;flex:1;text-align:left;padding-left:10px;">{{getDiagnosis(item.info.diagnosis)}}</span>
+          </div>
+          <div class="prescriptionBox" style="border-top: 1px solid #000;border-bottom: 1px solid #000;">
+              <div class="Rp">Rp:</div>
+              <div class="drugsBox" v-for="(it,index) in item.advices" :key="index">
+                  <!-- <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div> -->
+                  <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;<span v-if="it.drug.min_unit != it.drug.dose_unit">{{it.drug.dose}}{{it.drug.dose_unit}}&nbsp;* &nbsp;</span>{{it.drug.min_number}}{{it.drug.min_unit}}/{{it.drug.max_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div>
+                  <div style="margin-left:100px;"><span>用法：{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.execution_frequency}}&nbsp;{{it.delivery_way}}&nbsp;</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
+              </div>
+              <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
+                <div class="drugsOne">{{it.item_name?it.item_name:""}}:&nbsp;{{it.price}}元/{{it.count}}次</div>
+               </div>
+
+              <div class="drugsBox" v-for="(it,index) in item.project" :key="index">
+                  <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.type == 2?getProjectName(it.project_id)?getProjectName(it.project_id):"":it.good_info.good_name}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.count}}{{unit}}</div>
+                  <div style="margin-left:100px;"><span>用法：{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.delivery_way}}</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
+              </div>
+              <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
+                <div class="drugsOne">{{it.project_id?it.project_id:""}}:&nbsp;{{it.price.toFixed(2)}}元/{{it.count}}次</div>
+               </div>
+               <div style="text-align:center;" >(以下空白)</div>
+
+          </div>
+          <div class="NoCell" style="margin-top:20px;">
+              <div style="display:flex;">
+                <span>医师</span>
+                <span class="underLine" style="width:100px;">{{item.doctor?item.doctor:""}}</span>
+              </div>
+              <div style="display:flex;">
+                <span>金额</span>
+                <span class="underLine" style="width:100px;"></span>
+              </div>
+          </div>
+          <div class="NoCell">
+              <div style="display:flex;">
+                <span>药师（审核、核对、发药）</span>
+                <span class="underLine" style="width:100px;"></span>
+              </div>
+              <div style="display:flex;">
+                <span>调配</span>
+                <span class="underLine" style="width:100px;"></span>
+              </div>
+          </div>
+          <div style="page-break-after:always"></div>
+      </div>
+    </div>
+
+  </div>
+
+
+</template>
+<script>
+import { jsGetAge, uParseTime } from '@/utils/tools'
+import {getAllDoctorList,getPrescriptionPrint,getHisPatientDetail} from "@/api/project/project"
+import {getInitData} from "@/api/his/his"
+export default {
+    props:{
+      patient_id:Number,
+      record_date:String,
+      prescription_id:Number,
+      ids:String
+    },
+    data(){
+      return {
+        doctorList:[],
+        advicePrint:{},
+        patient:{},
+        tableData:[],
+        prescriptionInfo:[],
+        hisPatient:{},
+        department:[],
+        prescriptions:[],
+        projectList:[],
+        orgname:"",
+        diagnoses:[],
+        org_id: 0
+      }
+    },
+   methods:{
+     getAge(patient){
+       var thisLen = patient.id_card_no.length
+       var birth = ''
+       if (thisLen == 15) {
+         birth = '19' + patient.id_card_no.substr(6, 6)
+       } else {
+         birth = patient.id_card_no.substr(6, 8)
+       }
+       var births =
+         birth.substr(0, 4) +
+         '-' +
+         birth.substr(4, 2) +
+         '-' +
+         birth.substr(6, 2)
+       return jsGetAge(births, '-')
+
+     },
+
+     getAllDoctorList(){
+      getAllDoctorList().then(response=>{
+        if(response.data.state == 1){
+               var doctor =  response.data.data.doctor
+
+               this.doctorList = doctor
+             }
+         })
+     },
+
+      getDoctor(id){
+        var name = ""
+        for(let i=0;i<this.doctorList.length;i++){
+          if(id == this.doctorList[i].admin_user_id){
+              name = this.doctorList[i].user_name
+          }
+        }
+        return name
+      },
+      getTime(value, temp) {
+        if (value != undefined) {
+            return uParseTime(value, temp)
+        }
+        return ''
+     },
+       getPrescriptionPrint(){
+         var params = {
+          // patient_id:this.patient_id,
+          // record_date:this.record_date,
+          // prescription_id:this.prescription_id,
+          patient_id:this.patient_id,
+          record_date:this.record_date,
+          prescription_id:this.prescription_id,
+          ids:this.ids
+        }
+        console.log("params",params)
+       getPrescriptionPrint(params).then(response=>{
+         if(response.data.state == 1){
+            var advicePrint =  response.data.data.advicePrint
+            console.log("adviceprint9999",advicePrint)
+            this.advicePrint = advicePrint
+            this.prescriptions = advicePrint
+            console.log("处方222222",this.prescriptions)
+            var hisPatient = response.data.data.hisPatient
+            console.log("hisPatient",hisPatient)
+            this.hisPatient = hisPatient
+            var projectlist =  response.data.data.projectlist
+            console.log("所有项目列表",projectlist)
+            this.projectList = projectlist
+          }
+       })
+     },
+     getHisPatientDetail(){
+          const params = {
+              patient_id:this.patient_id
+          }
+       getHisPatientDetail(params).then(response=>{
+          if(response.data.state == 1){
+             var hisPatient =  response.data.data.hisPatient
+             console.log("挂号病人",hisPatient)
+             this.hisPatient = hisPatient
+          }
+       })
+     },
+     getInitData(){
+       getInitData().then(response=>{
+          if(response.data.state == 1){
+            this.department = response.data.data.department
+            this.diagnoses = response.data.data.diagnose
+            console.log("争端",this.diagnoses)
+          }
+       })
+     },
+     getDepart(id){
+         var name = ""
+       for(let i=0;i<this.department.length;i++){
+           if(id == this.department[i].id){
+               name = this.department[i].name
+           }
+       }
+       return name
+     },
+    getTotalOne(id) {
+
+        var total = 0
+        var addtotal = 0
+        for (let i = 0; i < this.prescriptions.length; i++) {
+          if(id == this.prescriptions[i].id){
+            if (this.prescriptions[i].project != null) {
+              for (let a = 0; a < this.prescriptions[i].project.length; a++) {
+                total = total + this.prescriptions[i].project[a].price * this.prescriptions[i].project[a].count
+              }
+            }
+
+            if (this.prescriptions[i].additionalcharge != null) {
+              for (let a = 0; a < this.prescriptions[i].additionalcharge.length; a++) {
+                addtotal = addtotal + this.prescriptions[i].additionalcharge[a].price * this.prescriptions[i].additionalcharge[a].count
+              }
+            }
+              addtotal =  Math.floor(addtotal * 100) / 100
+        }
+
+       }
+
+      for (let i = 0; i < this.prescriptions.length; i++) {
+          if(id == this.prescriptions[i].id){
+            if (this.prescriptions[i].advices != null) {
+              for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
+                total = total + this.prescriptions[i].advices[a].price * this.prescriptions[i].advices[a].prescribing_number
+              }
+            }
+
+            if (this.prescriptions[i].additionalcharge != null) {
+              for (let a = 0; a < this.prescriptions[i].additionalcharge.length; a++) {
+                addtotal = addtotal + this.prescriptions[i].additionalcharge[a].price * this.prescriptions[i].additionalcharge[a].count
+              }
+            }
+              addtotal =  Math.floor(addtotal * 100) / 100
+        }
+       }
+
+        return total + addtotal
+      },
+
+     getProjectName(id){
+        var project_name = ""
+        for(let i=0;i<this.projectList.length;i++){
+           if(id == this.projectList[i].id){
+               project_name = this.projectList[i].project_name
+           }
+        }
+        return project_name
+     },
+
+     getDiagnosis(id){
+        let arr = id.split(',')
+        var name = ""
+        for(let i=0;i<this.diagnoses.length;i++){
+          if(arr.indexOf(String(this.diagnoses[i].id)) > -1){
+             name += this.diagnoses[i].class_name + ' '
+          }
+        }
+        return name
+     }
+
+   },
+   created(){
+      this.getAllDoctorList()
+      this.getInitData()
+      this.getPrescriptionPrint()
+      this.getHisPatientDetail()
+      var xtuser = this.$store.getters.xt_user;
+      this.orgname = xtuser.org.org_name;
+      this.org_id = xtuser.org.id
+   },
+   watch:{
+     ids:function(val){
+      this.ids = val
+      this.getPrescriptionPrint()
+    }
+   }
+}
+</script>
+
+
+<style lang="scss" scoped>
+.prescription-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;
+    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+    margin-bottom: 20px;
+    padding:20px 10px;
+}
+.printTitle{
+    font-size: 22px;
+    text-align: center;
+    font-weight: bold;
+}
+.infoTitle{
+    display: flex;
+    border-bottom: 2px solid #000;
+    margin-top:10px;
+    line-height: 24px;
+    padding:0 10px;
+}
+.infoTitle p{
+    width: 200px;
+}
+.infoMain{
+    display: flex;
+    flex-wrap: wrap;
+    border-bottom: 2px solid #000;
+    padding:0 10px;
+}
+.infoMain div{
+    width: 50%;
+    line-height: 24px;
+}
+.prescriptionBox{
+    padding:0 10px;
+    min-height:450px;
+}
+.Rp{
+    font-size: 22px;
+    font-weight: bold;
+}
+.drugsBox{
+    padding-left: 40px;
+    margin-bottom: 10px;
+}
+.drugsBox div{
+    line-height: 20px;
+}
+.drugsOne{
+    line-height: 24px;
+}
+.drugsOne span{
+    margin-right: 20px;
+}
+.doctorBox{
+    display: flex;
+    justify-content: space-between;
+    padding:0 10px;
+    line-height: 24px;
+    border-bottom: 2px solid #000;
+}
+.actionBar{
+    display: flex;
+    justify-content: space-between;
+    line-height: 24px;
+    padding:0 10px;
+}
+.actionBar p{
+    width:150px;
+}
+.NoCell{display: flex;justify-content: space-between;margin-bottom: 10px;}
+.underLine{display: inline-block;border-bottom: 1px solid #000;text-align: center;line-height: 24px;}
+.basicCell{display: flex;} .basicCell span{line-height: 24px;margin-bottom: 10px;}
+</style>

src/xt_pages/stock/cancelStockOrderAdd.vue

@@ -560,7 +560,12 @@ export default {
                }
             }     
           }
-
+          const loading = this.$loading({
+            lock: true,
+            text: 'Loading',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+          })
           const params = {
             cancelStock: this.recordInfo.recordData
           };
@@ -576,6 +581,7 @@ export default {
           ).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg);
+              loading.close()
               return false;
             } else {
              var msg =  response.data.data.msg
@@ -601,7 +607,8 @@ export default {
               });
               this.recordInfo.recordData = [];
               this.$router.back(-1);
-             }        
+             }  
+             loading.close()      
             }
           });
         } else {

src/xt_pages/stock/cancelStockOrderEdit.vue

@@ -527,7 +527,12 @@
                 }
               }     
             }
-
+            const loading = this.$loading({
+              lock: true,
+              text: 'Loading',
+              spinner: 'el-icon-loading',
+              background: 'rgba(0, 0, 0, 0.7)'
+            })
             const params = {
               'cancelStock': this.recordInfo.recordData
             }
@@ -536,6 +541,7 @@
             editCancelStockInfo(params, this.return_time, this.$route.query.id, this.$route.query.type,this.form.manufacturer,this.form.dealer).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
+                loading.close()
                 return false
               } else {
                 var msg =  response.data.data.msg
@@ -561,7 +567,8 @@
                   });
                   this.recordInfo.recordData = [];
                   this.$router.back(-1);
-                }        
+                }  
+                loading.close()       
               }
             })
           } else {

src/xt_pages/stock/drugs/components/drugCancelDetail.vue

@@ -70,46 +70,6 @@
       </div>
     </div>
 
-    
-
-    <!-- <div class="cell clearfix">
-      <label class="title"><span class="name">单据类型</span> : </label>
-      <el-select
-        size="small"
-        v-model="order_type"
-        clearable
-        placeholder="单据类型"
-        @change="changeType"
-      >
-        <el-option
-          v-for="item in orderTypeArr"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"
-        >
-        </el-option>
-      </el-select>
-    </div> -->
-<!-- 
-    <div class="cell clearfix">
-      <label class="title"><span class="name">其它</span> : </label>
-      <el-select
-        size="small"
-        v-model="manufacturer_id"
-        clearable
-        placeholder="厂商"
-        @change="changeManufacturer"
-      >
-        <el-option
-          v-for="item in manufacturer"
-          :key="item.id"
-          :label="item.manufacturer_name"
-          :value="item.id"
-        >
-        </el-option>
-      </el-select>
-    </div> -->
-
     <el-row :gutter="12" style="margin-top: 10px">
       <el-table
         :data="tableData"
@@ -135,6 +95,7 @@
             <span v-if="scope.row.drug_type == 1">西药</span>
             <span v-if="scope.row.drug_type == 2">草药</span>
             <span v-if="scope.row.drug_type == 3">成药</span>
+            <!-- {{getTypeList(scope.row.drug_type)}} -->
           </template>
         </el-table-column>
 
@@ -273,6 +234,7 @@ export default {
       tableData:[],
       tableList:[],
       tableDataList:[],
+      drugTypeList:[],
     };
   },
   methods: {
@@ -386,6 +348,7 @@ export default {
          if(response.data.state == 1){
            var order =  response.data.data.order
            var list = response.data.data.orderPrint
+           //this.drugTypeList = response.data.data.drugTypeList
            for(let i=0;i<list.length;i++){
              list[i].child = []
             for(let j=0;j<order.length;j++){
@@ -436,15 +399,16 @@ export default {
     },
     exportList(){
        for(let i=0;i<this.tableDataList.length;i++){
-          if(this.tableDataList[i].drug_type == 1){
-            this.tableDataList[i].drug_type == "西药"
-          }
-          if(this.tableDataList[i].drug_type == 2){
-            this.tableDataList[i].drug_type == "草药"
-          }
-         if(this.tableDataList[i].drug_type == 3){
-            this.tableDataList[i].drug_type == "成药"
-          }
+        //   if(this.tableDataList[i].drug_type == 1){
+        //     this.tableDataList[i].drug_type == "西药"
+        //   }
+        //   if(this.tableDataList[i].drug_type == 2){
+        //     this.tableDataList[i].drug_type == "草药"
+        //   }
+        //  if(this.tableDataList[i].drug_type == 3){
+        //     this.tableDataList[i].drug_type == "成药"
+        //   }
+          this.tableList[i].drug_type = this.getTypeList(scope.row.drug_type)
           this.tableDataList[i].index = i+1
           this.tableDataList[i].unit = this.tableDataList[i].dose + this.tableDataList[i].dose_unit + "*"+this.tableDataList[i].min_number + this.tableDataList[i].min_unit+"/"+this.tableDataList[i].max_unit
           this.tableDataList[i].user_name = this.getAdminUser(this.tableDataList[i].creater)
@@ -516,7 +480,16 @@ export default {
          }
       }
       return total
-    }
+    },
+    getTypeList(id){
+      var name = ""
+      for(let i=0;i<this.drugTypeList.length;i++){
+        if(id == this.drugTypeList[i].value){
+          name = this.drugTypeList[i].name
+        }
+      }
+      return name
+    } 
   }
 };
 </script>

src/xt_pages/stock/drugs/components/drugInOrder.vue

@@ -73,46 +73,6 @@
       </div>
     </div>
 
-    
-
-    <!-- <div class="cell clearfix">
-      <label class="title"><span class="name">单据类型</span> : </label>
-      <el-select
-        size="small"
-        v-model="order_type"
-        clearable
-        placeholder="单据类型"
-        @change="changeType"
-      >
-        <el-option
-          v-for="item in orderTypeArr"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"
-        >
-        </el-option>
-      </el-select>
-    </div> -->
-
-    <!-- <div class="cell clearfix">
-      <label class="title"><span class="name">其它</span> : </label>
-      <el-select
-        size="small"
-        v-model="manufacturer_id"
-        clearable
-        placeholder="厂商"
-        @change="changeManufacturer"
-      >
-        <el-option
-          v-for="item in manufacturer"
-          :key="item.id"
-          :label="item.manufacturer_name"
-          :value="item.id"
-        >
-        </el-option>
-      </el-select>
-    </div> -->
-
     <el-row :gutter="12" style="margin-top: 10px">
       <el-table
         :data="cancelStockDate"
@@ -138,6 +98,7 @@
             <span v-if="scope.row.drug_type == 1">西药</span>
             <span v-if="scope.row.drug_type == 2">草药</span>
             <span v-if="scope.row.drug_type == 3">成药</span>
+            <!-- {{getTypeList(scope.row.drug_type)}} -->
           </template>
         </el-table-column>
 
@@ -276,6 +237,7 @@ export default {
       dealer: [],
       tableList:[],
       tabelePrintList:[],
+      drugTypeList:[],
     };
   },
   methods: {
@@ -384,6 +346,9 @@ export default {
       getDrugIndetail(params).then(response=>{
         if(response.data.state == 1){
           var drugInOrder = response.data.data.detail
+          var drugTypeParent = response.data.data.drugTypeParent
+          console.log("药品类型",drugTypeParent)
+        //  this.drugTypeList = drugTypeParent
           var total_price = 0
           for(let i=0;i<drugInOrder.length;i++){
              drugInOrder[i].specification_name  = drugInOrder[i].dose + drugInOrder[i].dose_unit + "*" + drugInOrder[i].min_number +  drugInOrder[i].min_unit + "/" + drugInOrder[i].max_unit
@@ -523,16 +488,7 @@ export default {
        for(let i=0;i<newArr.length;i++){
           newArr.specification_name = ""
           newArr.index = i+1
-          if(newArr[i].drug_type == 1){
-             newArr[i].drugtype = "西药"
-          }
-          if(newArr[i].drug_type == 2){
-             newArr[i].drugtype = "草药"
-          }
-          if(newArr[i].drug_type == 3){
-             newArr[i].drugtype = "成药"
-          }
-        
+         newArr[i].drugtype = this.getTypeList(newArr[i].drug_type)
          newArr[i].specification_name = newArr[i].dose + newArr[i].dose_unit +"*" + newArr[i].min_number + newArr[i].min_unit +  "/" + newArr[i].max_unit
 
          newArr[i].time = this.getTime(newArr[i].ctime)
@@ -553,7 +509,15 @@ export default {
         })
 
      },
-    
+    getTypeList(id){
+      var name = ""
+      for(let i=0;i<this.drugTypeList.length;i++){
+        if(id == this.drugTypeList[i].value){
+           name = this.drugTypeList[i].name
+        }
+      }
+      return name
+    }
   }
 };
 </script>

src/xt_pages/stock/drugs/components/drugOutDetail.vue

@@ -136,6 +136,7 @@
             <span v-if="scope.row.drug_type == 1">西药</span>
             <span v-if="scope.row.drug_type == 2">草药</span>
             <span v-if="scope.row.drug_type == 3">成药</span>
+            <!-- {{getTypeList(scope.row.drug_type)}} -->
           </template>
         </el-table-column>
 
@@ -285,6 +286,7 @@ export default {
       drugList:[],
       tablePrint:[],
       org_id:0,
+      drugTypeList:[],
     };
   },
   methods: {
@@ -441,6 +443,8 @@ export default {
           for(let i=0;i<order.length;i++){
             order[i].total_price = order[i].total_price.toFixed(2)
           }
+        //  this.drugTypeList = response.data.data.drugTypeList
+          
           this.tableData = order
            let objInfo = {}
           order.forEach((item,index)=>{
@@ -558,15 +562,8 @@ export default {
        const filterVal = ['index','warehouse_out_order_number', 'drugtype', 'drug_name','specification_name','time','user_name','price','count','total_price']
        for(let i=0;i<this.tableData.length;i++){
          this.tableData[i].index = i+1
-         if(this.tableData[i].drug_type == 1){
-            this.tableData[i].drugtype = "西药"
-         }
-         if(this.tableData[i].drug_type == 2){
-            this.tableData[i].drugtype = "草药"
-         }
-         if(this.tableData[i].drug_type == 3){
-            this.tableData[i].drugtype = "成药"
-         }
+   
+        this.tableData[i].drugtype = this.getTypeList(this.tableData[i].drugtype)
         this.tableData[i].specification_name = this.tableData[i].dose + this.tableData[i].dose_unit +"*" + this.tableData[i].min_number + this.tableData[i].min_unit +  "/" + this.tableData[i].max_unit
         this.tableData[i].time = this.getTime(this.tableData[i].ctime)
         this.tableData[i].user_name = this.getAdminUser(this.tableData[i].creater)
@@ -744,6 +741,15 @@ export default {
         }
         return (count*price)
       },
+      getTypeList(id){
+        var name = ""
+        for(let i=0;i<this.drugTypeList.length;i++){
+          if(id == this.drugTypeList[i].value){
+            name = this.drugTypeList[i].name
+          }
+        }
+        return name
+      } 
   }
 };
 </script>

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -41,6 +41,7 @@
           style="width: 100%"
           border
           max-height="450"
+          v-loading="listLoading"
           :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
         >
           <el-table-column align="center" width="200" fixed="left">
@@ -329,7 +330,7 @@
         warehousing_time: '',
         adminUserOptions: null,
         currentIndex: 0,
-
+        listLoading: false,
         recordInfo: {
           recordData: [],
           stock_in_code: '',
@@ -717,7 +718,7 @@
                 return false
               } else {
                 this.$message.success('入库成功')
-
+                this.listLoading = false
                 this.$router.back(-1)
               }
             })

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

@@ -106,6 +106,7 @@
           style="width: 100%"
           border
           max-height="450"
+          v-loading="listLoading"
           :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
         >
           <el-table-column align="center" width="200">
@@ -442,6 +443,7 @@ export default {
       manufacturerList:[],
       dealerList:[],
       org_id:0,
+      listLoading:false,
     };
   },
   methods: {
@@ -700,10 +702,11 @@ export default {
           ).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg);
+              this.listLoading = false
               return false;
             } else {
               this.$message.success("入库成功");
-
+              this.listLoading = false
               this.$router.back(-1);
             }
           });

src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue

@@ -26,15 +26,6 @@
 
     <div class="app-container">
   
-
-      <!-- <drugs-stock-dialog
-        ref="dialog" :propForm="propForm"
-        :visibility="isVisibility"
-        v-on:dialog-comfirm="comfirm"
-        v-on:dialog-cancle="cancle"
-      ></drugs-stock-dialog> -->
-
-
       <div class="cell clearfix">
         <label class="title"><span class="name">出库时间</span> : </label>
         <el-date-picker
@@ -54,6 +45,7 @@
     
       <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
         <el-table
+           v-loading="listLoading"
           :data="recordInfo.recordData"
           :class="signAndWeighBoxPatients"
           style="width: 100%"
@@ -116,23 +108,7 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <!-- <el-table-column align="center" width="150">
-            <template slot="header" slot-scope="scope" >
-                  <span>批号</span>
-              </template>
-                <template slot-scope="scope">
-                  <el-form-item style="padding-top: 20px">
-                    <el-select v-model="scope.row.batch_number" filterable placeholder="请选择" @change="changeBatchNumber(scope.row)">
-                      <el-option
-                        v-for="(item,index) in numberList"
-                        :key="index"
-                        :label="item.batch_number"
-                        :value="item.id">
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-              </template>
-          </el-table-column> -->
+          
           <el-table-column width="200" align="center">
             <template slot="header" slot-scope="scope">
               <span>出库数量<span style="color: red">*</span></span>
@@ -368,7 +344,8 @@ export default {
       drugTypeList:[],
       totalPrice:0,
       unitList:[],
-      numberList:[]
+      numberList:[],
+      listLoading: false,
     };
   },
   methods: {
@@ -575,8 +552,12 @@ export default {
           const params = {
             stockOut: this.recordInfo.recordData
           };
-          console.log("params222222",params)
-        
+          const loading = this.$loading({
+            lock: true,
+            text: 'Loading',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+          })
           postDrugWarehouseOut(
             params,
             this.warehouse_out_time,
@@ -586,26 +567,24 @@ export default {
           ).then(response => {
             if (response.data.state == 0) {
               this.$message.error("库存不足");
+              loading.close()
               return false;
             } else {
+              this.loading = false
+              loading.close()
               var msg = response.data.data.msg
               var drug_name =  response.data.data.drug_name
-              console.log("drug_name",drug_name)
               var dose = response.data.data.dose
-              console.log("dose",dose)
               var dose_unit = response.data.data.dose_unit
-              console.log("dose_unit",dose_unit)
               var min_number = response.data.data.min_number
-              console.log("min_number",min_number)
               var min_unit =  response.data.data.min_unit
-              console.log("min_unit",min_unit)
               var max_unit =  response.data.data.max_unit
-              console.log("max_unit",max_unit)
               var str = drug_name + " " + dose + dose_unit + "*" + min_number + min_unit+"/"+max_unit
-              console.log("str22222222",str)
+      
               if(msg == 1){
                 this.$message.error(str + "库存不足")
               }else{
+                loading.close()
                 this.$message.success("出库成功");
                 this.recordInfo.recordData = [];
                 this.$router.back(-1);

src/xt_pages/stock/drugs/drugStockOutOrderEdit.vue

@@ -583,6 +583,12 @@
                }
 
             }
+            const loading = this.$loading({
+              lock: true,
+              text: 'Loading',
+              spinner: 'el-icon-loading',
+              background: 'rgba(0, 0, 0, 0.7)'
+            })
             const params = {
               'stockOut': this.recordInfo.recordData
             }
@@ -591,6 +597,7 @@
             editDrugWarehouseoutInfo(params, this.warehouse_out_time, this.$route.query.id, this.$route.query.type, this.form.manufacturer, this.form.dealer).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
+                loading.close()
                 return false
               } else {
                 var msg = response.data.data.msg
@@ -601,13 +608,15 @@
                 var min_unit =  response.data.data.min_unit
                 var max_unit =  response.data.data.max_unit
                 var str = drug_name + " " + dose + dose_unit + "*" + min_number + min_unit+"/"+max_unit
-               
+               loading.close()  
               if(msg == 1){
                 this.$message.error(str + "库存不足,请入库")
+                loading.close()
               }else{
                 this.$message.success("出库成功");
                 this.recordInfo.recordData = [];
                 this.$router.back(-1);
+                loading.close()
               }
               }
             })

src/xt_pages/stock/stockInOrderAdd.vue

@@ -676,6 +676,12 @@
                  }
               }
             }
+            const loading = this.$loading({
+              lock: true,
+              text: 'Loading',
+              spinner: 'el-icon-loading',
+              background: 'rgba(0, 0, 0, 0.7)'
+            })
             const params = {
               'stockIn': this.recordInfo.recordData
             }
@@ -684,10 +690,11 @@
             postWarehouse(params, this.warehousing_time, this.form.manufacturer, this.form.dealer, this.type).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
+                loading.close()
                 return false
               } else {
+                loading.close()
                 this.$message.success('入库成功')
-
                 this.$router.back(-1)
               }
             })

src/xt_pages/stock/stockInOrderEdit.vue

@@ -667,7 +667,12 @@ export default {
             stockIn: this.recordInfo.recordData
           };
           console.log("params2222",params)
-          
+          const loading = this.$loading({
+            lock: true,
+            text: 'Loading',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+          })
           EditWarehouse(
             params,
             this.warehousing_time,
@@ -678,10 +683,11 @@ export default {
           ).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg);
+              loading.close()
               return false;
             } else {
+              loading.close()
               this.$message.success("入库成功");
-
               this.$router.back(-1);
             }
           });

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -594,7 +594,12 @@ export default {
           const params = {
             stockOut: this.recordInfo.recordData
           };
- 
+          const loading = this.$loading({
+            lock: true,
+            text: 'Loading',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+          })
           postWarehouseOut(
             params,
             this.warehouse_out_time,
@@ -604,6 +609,7 @@ export default {
           ).then(response => {
             if (response.data.state == 0) {
               this.$message.error("库存不足")
+              loading.close()
               return false;
             } else {
                var msg = response.data.data.msg
@@ -614,12 +620,13 @@ export default {
                if(msg == 1){
                   this.$message.error(str)
                }
+              
                if(msg == 2){
                  this.$message.success("出库成功");
                  this.recordInfo.recordData = [];
                  this.$router.back(-1);
                }
-             
+               loading.close()
              
             }
           });

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -523,10 +523,10 @@
         this.$router.go(-1)
       },
        submit() {
+       
         this.$refs['tableForm'].validate((valid) => {
           if (valid) {
             const array = this.recordInfo.recordData
-            console.log("2332232323232323",array)
             for (let i = 0; i < array.length; i++) {
               if (array[i].good_type_id == 0) {
                 this.$message.error('商品类型不能为空')
@@ -566,6 +566,12 @@
                }
              }
             }
+              const loading = this.$loading({
+                lock: true,
+                text: 'Loading',
+                spinner: 'el-icon-loading',
+                background: 'rgba(0, 0, 0, 0.7)'
+            })
             const params = {
               'warehouse_out_time':this.warehouse_out_time,
               'stockOut': this.recordInfo.recordData,
@@ -577,11 +583,13 @@
             editWarehouseoutInfo(params, this.warehouse_out_time, warehout_id, this.$route.query.type, this.form.manufacturer, this.form.dealer).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
+                loading.close()
                 return false
               } else {
                 if(response.data.data.msg == 1){
                   this.$message.success('保存成功')
                   this.$router.back(-1)
+                   loading.close()
                 }
 
                 if(response.data.data.msg == 5){
@@ -600,7 +608,7 @@
                 if(response.data.data.msg == 6){
                   this.$message.error("该耗材的退库数量大于入库数量,无法出库,请新增出库另一个批次")
                 }
-                
+                loading.close()
               }
             })
           } else {

src/xt_pages/stock/stockPrint.vue

@@ -41,19 +41,29 @@
                                    <td>
                                       <span v-if="getWareInfo(item.xt_warehouse_info)>0">{{getWareInfo(item.xt_warehouse_info)}}{{item.packing_unit}}</span>
                                    </td>
-                                   <td>
+                                   <td v-if="end_time == ''">
                                       <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id== 10245 || org_id == 9779">
                                         <span>
-                                          {{getWareInfo(item.xt_warehouse_info) - getOverFlushInfo(item.xt_warehouse_info) + getCancelSotckInfo(item.cancel_stock_info) }}
-                                          </span>
+                                          {{getWareInfo(item.xt_warehouse_info) - getOverFlushInfo(item.xt_warehouse_info) + getCancelSotckInfo(item.cancel_stock_info)}}
                                         </span>
-                                        <span v-else>{{getAutoCount(item.id) + getOutCount(item.id)}} </span>
+                                      </span>
+                                      <span v-else>{{getAutoCount(item.id) + getOutCount(item.id)}} </span>
+                                   </td>
+
+                                   <td v-if="end_time!=''">
+                                    {{getAutoCount(item.id) + getOutCount(item.id)}} 
                                    </td>
                                   
-                                   <td>
-                                     <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9779">{{getOverFlushInfo(item.xt_warehouse_info)}}</span>
-                                     <span v-else>{{getWareInfo(item.xt_warehouse_info) - getAutoCount(item.id) - getOutCount(item.id) + getCancelCount(item.id) }}</span>
-                                    
+                                   <td v-if="end_time == ''">
+                                     <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9779">
+                                        {{getOverFlushInfo(item.xt_warehouse_info)}}
+                                     </span>
+                                     <span v-else>
+                                       {{getWareInfo(item.xt_warehouse_info) - getAutoCount(item.id) - getOutCount(item.id) + getCancelCount(item.id) }}
+                                     </span>
+                                   </td>
+                                   <td v-if="end_time!=''">
+                                    {{getWareInfo(item.xt_warehouse_info) - getAutoCount(item.id) - getOutCount(item.id) + getCancelCount(item.id) }}
                                    </td>
                                 </tr>
                             </tbody>
@@ -120,18 +130,17 @@ export default {
         const params = {
           page: this.page,
           limit: this.limit,
-          keywords: this.keywords,
+          keywords:this.keyword,
           start_time:this.start_time,
           end_time:this.end_time,
           type:this.type_name,
         }
+        console.log("打印",params)
         getAllStockList(params).then(response=>{
          if(response.data.state == 1){
            var list = response.data.data.list
-          //  console.log("list22222",list)
            this.tableList = list
            var total = response.data.data.total
-          //  console.log("total",total)
            this.total = total
            var manufacturerList = response.data.data.manufacturerList
            this.manufacturerList = manufacturerList
@@ -198,23 +207,20 @@ export default {
      },
      getStockDrugCount(){
         var params ={
-          keywords: this.keywords,
+          keywords: this.keyword,
           start_time:this.start_time,
           end_time:this.end_time,
         }
+      console.log("打印按钮",params)
       getStockDrugCount(params).then(response=>{
          if(response.data.state == 1){
            var count = response.data.data.count
-          //  console.log("入库统计",count)
            this.countList = count
            var outlist = response.data.data.outList
-          //  console.log("出库数量",outlist)
            this.outCountList = outlist
            var autoCount = response.data.data.autoCount
-          //  console.log("autoCount",autoCount)
            this.autoCountList = autoCount
            var totalCount = response.data.data.totalCount
-          //  console.log("totalcount",totalCount)
            this.cancelCountList = totalCount
          }
       })
@@ -304,33 +310,32 @@ export default {
         total += arr[i].stock_count
       }
      }
+     console.log("totla23323232",total)
      return total
    },
    getCancelSotckInfo(arr){
-     console.log("2332323232322332",arr)
      var cancle_toal = 0
      if(arr.length >0){
       for(let z=0;z<arr.length;z++){
         cancle_toal += arr[z].count
       }
      }
-     console.log("total",cancle_toal)
      return cancle_toal
    }
    },
     created(){
       this.org_id =  this.$store.getters.xt_user.org_id
-      console.log("机构ID232323323233232",this.org_id)
+     
       var starttime =  this.$route.query.start_time
       this.start_time = starttime
       var endtime =  this.$route.query.end_time
       this.end_time = endtime
-      var type_name = this.$route.query.type_name
+      var type_name = parseInt(this.$route.query.type_name)
       this.type_name = type_name
       var keyword = this.$route.query.keyword
       this.keyword = keyword
-      this.page = this.$route.query.page
-      this.limit = this.$route.query.limit
+      this.page = parseInt(this.$route.query.page)
+      this.limit = parseInt(this.$route.query.limit)
       this.getlist()
       this.GetAllGoodType()
       this.getStockDrugCount()

src/xt_pages/stock/stockQuery.vue

@@ -125,7 +125,9 @@
 
        <el-table-column label="剩余库存量" align="center" v-if="showThree">
          <template slot-scope="scope">
-          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9779 || org_id == 10106 || org_id == 9504 || org_id ==  10215 || org_id == 10088 || org_id == 10191">{{getOverFlushInfo(scope.row.xt_warehouse_info)}}</span>
+          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9779 || org_id == 10106 || org_id == 9504 || org_id ==  10215 || org_id == 10088 || org_id == 10191">
+            {{getOverFlushInfo(scope.row.xt_warehouse_info)}}
+          </span>
           <span v-else>{{getWareInfo(scope.row.xt_warehouse_info) - getAutoCount(scope.row.id) - getOutCount(scope.row.id) + getCancelCount(scope.row.id) }}</span>
          </template>
        </el-table-column>
@@ -431,19 +433,23 @@ export default {
         end_time:this.end_time,
         type:this.type_name,
       };
+     console.log("params232322323",params)
     getAllStockList(params).then(response=>{
          if(response.data.state == 1){
          
           if(this.end_time == ""){
-             this.showOne = true
              this.showTwo = false
-             this.showThree = true
              this.showFour = false
+             this.showThree = true
+             this.showOne = true
+            
+            
           }
           if(this.end_time !=""){
-            this.showOne = false
-            this.showTwo = true
             this.showThree = false
+            this.showTwo = true
+            console.log("hh3223322323",this.showTwo)
+            this.showOne = false
             this.showFour = true
           }
           var list = response.data.data.list
@@ -495,10 +501,11 @@ export default {
     },
     getStockDrugCount(){
         var params ={
-           keywords: this.$route.query.keywords,
+           keywords: this.keywords,
            start_time:this.start_time,
            end_time:this.end_time,
         }
+      console.log("参数23233223",params)
       getStockDrugCount(params).then(response=>{
          if(response.data.state == 1){
            var outlist = response.data.data.outList

src/xt_pages/user/components/PatientDetail.vue

@@ -955,7 +955,8 @@
               <div class="proj">
                 <span class="proj_title">日期：</span>
                 <!-- {{ getTime(patientPrint.created_time) }} -->
-                {{printDate}}
+                <span v-if="org_id ==3907 || org_id == 9671">{{ getTime(patientPrint.created_time) }}</span>
+                <span v-else>{{printDate}}</span> 
               </div>
               <div class="proj"><span class="proj_title">医生签名：</span></div>
             </div>

src/xt_pages/user/components/PatientSidebar.vue

@@ -106,6 +106,10 @@ export default {
               name: '1-9',
               label: '阶段小结'
             },
+            // {
+            //   name: '1-10',
+            //   label: '住院小结'
+            // },
             {
               name: '1-3',
               label: '检验检查'
@@ -189,6 +193,8 @@ export default {
         this.$router.push({path:'/patients/patients/'+this.id+'/inspectionInfectious'})
       }else if (name == '1-9'){
         this.$router.push({path:'/patient/patient/'+this.id+'/templateSummary'})
+      }else if(name == '1-10'){
+        this.$router.push({path:'/patient/patient/'+this.id+'/hospitalSummary'})
       }
     },
     changePatient(value) {