Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/api/config.js

@@ -225,3 +225,30 @@ export function changeGoodOutOpen(params) {
     params: params
   })
 }
+
+export function changeSelfPrescriptionOpen(params){
+  
+  return request({
+    url:"/api/changeselfprescriptionopen",
+    method:"get",
+    params:params,
+  })
+}
+
+export function changeSelfPrescriptionOutOpen(params){
+ 
+  return request({
+    url:"/api/changeselfprescriptionoutopen",
+    method:"get",
+    params:params,
+  })
+}
+
+export function getSelfPrintList(params){
+  
+  return request({
+    url:"/api/getselfprintlist",
+    method:"get",
+    params:params,
+  })
+}

src/api/drug/drug.js

@@ -764,4 +764,22 @@ export function postSelfDrugOutInfoWarehouse(){
     method:"Get",
     params:params,
   })
+}
+
+export function getSelfDrugBatchNumber(params){
+
+  return request({
+    url:"/api/drug/getselfdrugbatchnumber",
+    method:"get",
+    params:params
+  })
+}
+
+export function postSelfDrugWarehouseOut(params, warehousing_time, dealer_id, manufacturer_id, type, storehouse_id, warehouse_out_id){
+
+   return request({
+    url:"/api/drug/postsetfdrugwarehouseout?warehousing_out_time="+warehousing_time+ '&dealer_id=' + dealer_id + '&manufacturer_id=' + manufacturer_id + '&type=' + type + '&storehouse_id=' + storehouse_id + '&warehouse_out_id=' + warehouse_out_id,
+    method:"post",
+    params:params,
+   })
 }

src/api/his/his.js

@@ -869,6 +869,16 @@ export function modifyFapiaoCodetwo(params) {
 
 
 
+export function GetPSummaryDetail(params) {
+  return request({
+    url: '/api/his/prescription/detail',
+    method: 'get',
+    params: params
+  })
+}
+
+
+
 
 
 

src/api/his/his_tools.js

@@ -84,6 +84,15 @@ export function getBatchPrivateExpenses(params) {
 }
 
 
+export function getPrescriptionInitdata() {
+  return request({
+    url: '/api/his/prescription/initdata',
+    method: 'get',
+  })
+}
+
+
+
 
 
 

src/lang/zh.js

@@ -291,7 +291,8 @@ export default {
 
     DepositManagement: '押金管理',
 
-    summary_tool: '项目消费明细汇总',
+    summary_tool: '结算明细汇总',
+    p_summary_tool: '处方明细汇总',
     labelPrint: '标签打印',
     faPiao: '发票设置',
     chargeDetailManagement: '收费明细',

src/router/modules/hisTool.js

@@ -77,6 +77,11 @@ export default {
       component: () => import('@/xt_pages/outpatientTool/summary'),
       name: 'summary_tool',
       meta: { title: 'summary_tool', noCache: true }
+    }, {
+      path: '/hisTool/p_summary',
+      component: () => import('@/xt_pages/outpatientTool/PrescriptionSmmary'),
+      name: 'p_summary_tool',
+      meta: { title: 'p_summary_tool', noCache: true }
     },
     {
       path: '/hisTool/print',

src/store/modules/globalConfig.js

@@ -773,7 +773,37 @@ const global_config = {
         sodium: 1,
         calcium: 1,
         bicarbonate: 1
-      }
+      },
+      38: {
+        id: 38,
+        name: 'HDF80',
+        dialysis_duration: 1,
+        replacement_way: 1,
+        hemodialysis_machine: 2,
+        blood_filter: 1,
+        perfusion_apparatus: 2,
+        blood_flow_volume: 1,
+        dialysate_flow: 1,
+        kalium: 1,
+        sodium: 1,
+        calcium: 1,
+        bicarbonate: 1
+      },
+      39: {
+        id: 39,
+        name: 'HF16',
+        dialysis_duration: 1,
+        replacement_way: 1,
+        hemodialysis_machine: 2,
+        blood_filter: 1,
+        perfusion_apparatus: 2,
+        blood_flow_volume: 1,
+        dialysate_flow: 1,
+        kalium: 1,
+        sodium: 1,
+        calcium: 1,
+        bicarbonate: 1
+      },
     },
     anticoagulants_confit: { // 抗凝剂
       1: {

src/xt_pages/data/basicConfig.vue

@@ -49,6 +49,14 @@
             <!-- <p style="margin-top:20px;">药品耗材在结算时出库：
                 <el-switch v-model="drug_settle_open" @change="changeSettleOpen"></el-switch>
             </p> -->
+
+            <!-- <p style="margin-top:20px;">药品在保存处方时同步到自备库：
+               <el-switch v-model="self_prescription_out_open" @change="changeSelfPrescriptionOpen"></el-switch>
+            </p>
+
+            <p style="margin-top:20px;">药品在执行时自备药出库：
+               <el-switch v-model="self_drug_out_open" @change="changeSelfPrescriptionOutOpen"></el-switch>
+            </p> -->
         </div>
 
 
@@ -104,7 +112,7 @@
 
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
-import { getAllIsOpenInit,postXtHisIsOpen,postMonitorIsOpen,changeFuncPrint,getDataPrintList,postXtHisProjectIsOpen,changeStockSetting,changeAdviceConfig,changePrescriptionConfig,changeDrugOpenConfig,changeSettleOpenConfig,changeGoodOutOpen} from '@/api/config'
+import { getAllIsOpenInit,postXtHisIsOpen,postMonitorIsOpen,changeFuncPrint,getDataPrintList,postXtHisProjectIsOpen,changeStockSetting,changeAdviceConfig,changePrescriptionConfig,changeDrugOpenConfig,changeSettleOpenConfig,changeGoodOutOpen,changeSelfPrescriptionOpen,changeSelfPrescriptionOutOpen,getSelfPrintList} from '@/api/config'
 
 export default {
   name: "printTemplate",
@@ -128,6 +136,8 @@ export default {
       drug_out_open:false,
       drug_settle_open:false,
       good_out_open:false,
+      self_prescription_out_open:false,
+      self_drug_out_open:false
     };
   },
   methods: {
@@ -463,15 +473,78 @@ export default {
           this.$message.success("保存成功!")
         }
       })
-    }
-    
+    },
 
+    changeSelfPrescriptionOpen(){
+      var self_info_open = 0
+      if(this.self_prescription_out_open == true){
+          self_info_open = 1
+      }
+      if(this.self_prescription_out_open == false){
+         self_info_open =2
+      }
+      var params = {
+        is_open:self_info_open
+      }
+      changeSelfPrescriptionOpen(params).then(response=>{
+        if(response.data.state ==1){
+          var selfPrescriptionOpen = response.data.data.selfPrescriptionOpen
+          this.$message.success("保存成功!")
+        }
+      })
+    },
+    changeSelfPrescriptionOutOpen(){
+        var out_info_open = 0 
+        if(this.self_drug_out_open == true){
+          out_info_open = 1
+        }
+        if(this.self_drug_out_open == false){
+          out_info_open = 2
+        }
+        var params = {
+          is_open:out_info_open,
+        }
+      changeSelfPrescriptionOutOpen(params).then(response=>{
+         if(response.data.state ==1){
+          var selfPrescriptionOpen = response.data.data.selfPrescriptionOutOpen
+          this.$message.success("保存成功!")
+         }
+     })
+    },
+
+    getSelfPrintList(){
+      getSelfPrintList().then(response=>{
+        if(response.data.state ==1){
+         
+          var selfPrescriptionOpen =  response.data.data.selfPrescriptionOpen
+
+          if(selfPrescriptionOpen.is_open ==1){
+            this.self_prescription_out_open = true
+          }
+
+          if(selfPrescriptionOpen.is_open ==2){
+            this.self_prescription_out_open = false
+          }
+
+           var selfPrescriptionOutOpen = response.data.data.selfPrescriptionOutOpen
+
+           if(selfPrescriptionOutOpen.is_open ==1){
+            this.self_drug_out_open = true
+           }
+           if(selfPrescriptionOutOpen.is_open ==2){
+            this.self_drug_out_open = false
+           }
+        }
+      })
+    }
   },
   created() {
     this.getInitIsOpenConfig()
     // this.getMonitorConfig()
     // this.getOrderConfig()
     this.getDataPrintList()
+
+    // this.getSelfPrintList()
   }
 };
 </script>

src/xt_pages/data/prescription.vue

@@ -821,7 +821,232 @@ export default {
           sodium: 1,
           calcium: 1,
           bicarbonate: 1
-        }
+        },
+        {
+          id: 25,
+          name: 'HD高通',
+          dialysis_duration: 1,
+          replacement_way: 1,
+          hemodialysis_machine: 2,
+          blood_filter: 1,
+          perfusion_apparatus: 2,
+          blood_flow_volume: 1,
+          dialysate_flow: 1,
+          kalium: 1,
+          sodium: 1,
+          calcium: 1,
+          bicarbonate: 1
+        },
+        {
+        id: 26,
+        name: 'CVVH',
+        dialysis_duration: 1,
+        replacement_way: 1,
+        hemodialysis_machine: 2,
+        blood_filter: 1,
+        perfusion_apparatus: 2,
+        blood_flow_volume: 1,
+        dialysate_flow: 1,
+        kalium: 1,
+        sodium: 1,
+        calcium: 1,
+        bicarbonate: 1
+      },
+      {
+        id: 27,
+        name: 'CVVHD',
+        dialysis_duration: 1,
+        replacement_way: 1,
+        hemodialysis_machine: 2,
+        blood_filter: 1,
+        perfusion_apparatus: 2,
+        blood_flow_volume: 1,
+        dialysate_flow: 1,
+        kalium: 1,
+        sodium: 1,
+        calcium: 1,
+        bicarbonate: 1
+      },
+      {
+        id: 28,
+        name: 'CVVHDF',
+        dialysis_duration: 1,
+        replacement_way: 1,
+        hemodialysis_machine: 2,
+        blood_filter: 1,
+        perfusion_apparatus: 2,
+        blood_flow_volume: 1,
+        dialysate_flow: 1,
+        kalium: 1,
+        sodium: 1,
+        calcium: 1,
+        bicarbonate: 1
+      },
+      {
+        id: 29,
+        name: 'PE',
+        dialysis_duration: 1,
+        replacement_way: 1,
+        hemodialysis_machine: 2,
+        blood_filter: 1,
+        perfusion_apparatus: 2,
+        blood_flow_volume: 1,
+        dialysate_flow: 1,
+        kalium: 1,
+        sodium: 1,
+        calcium: 1,
+        bicarbonate: 1
+      },
+      {
+        id: 30,
+        name: '血浆胆红素吸附+HP',
+        dialysis_duration: 1,
+        replacement_way: 1,
+        hemodialysis_machine: 2,
+        blood_filter: 1,
+        perfusion_apparatus: 2,
+        blood_flow_volume: 1,
+        dialysate_flow: 1,
+        kalium: 1,
+        sodium: 1,
+        calcium: 1,
+        bicarbonate: 1
+      },
+      {
+        id: 31,
+        name: 'HPD',
+        dialysis_duration: 1,
+        replacement_way: 1,
+        hemodialysis_machine: 2,
+        blood_filter: 1,
+        perfusion_apparatus: 2,
+        blood_flow_volume: 1,
+        dialysate_flow: 1,
+        kalium: 1,
+        sodium: 1,
+        calcium: 1,
+        bicarbonate: 1
+      },
+      {
+        id: 32,
+        name: 'HDP',
+        dialysis_duration: 1,
+        replacement_way: 1,
+        hemodialysis_machine: 2,
+        blood_filter: 1,
+        perfusion_apparatus: 2,
+        blood_flow_volume: 1,
+        dialysate_flow: 1,
+        kalium: 1,
+        sodium: 1,
+        calcium: 1,
+        bicarbonate: 1
+      },
+      {
+        id: 33,
+        name: 'HFD',
+        dialysis_duration: 1,
+        replacement_way: 1,
+        hemodialysis_machine: 2,
+        blood_filter: 1,
+        perfusion_apparatus: 2,
+        blood_flow_volume: 1,
+        dialysate_flow: 1,
+        kalium: 1,
+        sodium: 1,
+        calcium: 1,
+        bicarbonate: 1
+      },
+      {
+        id: 34,
+        name: 'HDF100',
+        dialysis_duration: 1,
+        replacement_way: 1,
+        hemodialysis_machine: 2,
+        blood_filter: 1,
+        perfusion_apparatus: 2,
+        blood_flow_volume: 1,
+        dialysate_flow: 1,
+        kalium: 1,
+        sodium: 1,
+        calcium: 1,
+        bicarbonate: 1
+      },
+      {
+        id: 35,
+        name: 'HDF600',
+        dialysis_duration: 1,
+        replacement_way: 1,
+        hemodialysis_machine: 2,
+        blood_filter: 1,
+        perfusion_apparatus: 2,
+        blood_flow_volume: 1,
+        dialysate_flow: 1,
+        kalium: 1,
+        sodium: 1,
+        calcium: 1,
+        bicarbonate: 1
+      },
+      {
+        id: 36,
+        name: 'HDF800',
+        dialysis_duration: 1,
+        replacement_way: 1,
+        hemodialysis_machine: 2,
+        blood_filter: 1,
+        perfusion_apparatus: 2,
+        blood_flow_volume: 1,
+        dialysate_flow: 1,
+        kalium: 1,
+        sodium: 1,
+        calcium: 1,
+        bicarbonate: 1
+      },
+     {
+        id: 37,
+        name: 'HDF1000',
+        dialysis_duration: 1,
+        replacement_way: 1,
+        hemodialysis_machine: 2,
+        blood_filter: 1,
+        perfusion_apparatus: 2,
+        blood_flow_volume: 1,
+        dialysate_flow: 1,
+        kalium: 1,
+        sodium: 1,
+        calcium: 1,
+        bicarbonate: 1
+      },
+     {
+        id: 38,
+        name: 'HDF80',
+        dialysis_duration: 1,
+        replacement_way: 1,
+        hemodialysis_machine: 2,
+        blood_filter: 1,
+        perfusion_apparatus: 2,
+        blood_flow_volume: 1,
+        dialysate_flow: 1,
+        kalium: 1,
+        sodium: 1,
+        calcium: 1,
+        bicarbonate: 1
+      },
+     {
+        id: 39,
+        name: 'HF16',
+        dialysis_duration: 1,
+        replacement_way: 1,
+        hemodialysis_machine: 2,
+        blood_filter: 1,
+        perfusion_apparatus: 2,
+        blood_flow_volume: 1,
+        dialysate_flow: 1,
+        kalium: 1,
+        sodium: 1,
+        calcium: 1,
+        bicarbonate: 1
+      },
       ],
       addPlan: {
         id: 0,

src/xt_pages/dialysis/batch_print/batch_print_order_seventyeight.vue

@@ -341,7 +341,8 @@
                       <div class="inline_block" style=" flex: 1">
                         预增脱水量：
                         <div class="under_line" style="width: 50%; text-align: left">
-                          0
+                            {{ record.assessment_before_dislysis.dehydration?record.assessment_before_dislysis.dehydration:"" }}
+                          
                         </div>L
                       </div>
                     </div>

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -702,6 +702,28 @@
                           >
                             血浆胆红素吸附
                           </div>
+                          <div
+                            class="under_line"
+                            style="
+                              width: 100px;
+                              text-align: center;
+                              font-weight: 600;
+                            "
+                            v-if="record.prescription.mode_id == 24"
+                          >
+                            I-HDF
+                          </div>
+                          <div
+                            class="under_line"
+                            style="
+                              width: 100px;
+                              text-align: center;
+                              font-weight: 600;
+                            "
+                            v-if="record.prescription.mode_id == 25"
+                          >
+                            HD高通
+                          </div>
                           <div
                             class="under_line"
                             style="

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyeight.vue

@@ -771,6 +771,7 @@
                         L
                       </div>
                       <div
+                        v-if="org_id!=10677"
                         class="inline_block"
                         style="margin-left: 10px; flex: 1"
                       >

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -170,13 +170,13 @@
         </li> -->
 
 
-        <li v-if="isShow('处方脱水量') && this.$store.getters.xt_user.template_info.org_id != 10597 && this.$store.getters.xt_user.template_info.org_id != 10571  && this.$store.getters.xt_user.template_info.org_id != 10612 && this.$store.getters.xt_user.template_info.org_id != 10598 && this.$store.getters.xt_user.template_info.org_id != 10677 && this.$store.getters.xt_user.template_info.org_id != 10679">
+        <li v-if="isShow('处方脱水量') && this.$store.getters.xt_user.template_info.org_id != 10597 && this.$store.getters.xt_user.template_info.org_id != 10571  && this.$store.getters.xt_user.template_info.org_id != 10612 && this.$store.getters.xt_user.template_info.org_id != 10598 && this.$store.getters.xt_user.template_info.org_id != 10677 && this.$store.getters.xt_user.template_info.org_id != 10679 && this.$store.getters.xt_user.template_info.org_id != 10702">
           <label>处方脱水量 : </label>
           <span class="content">{{ prescription_water != "0" ? prescription_water : "" }}</span>
           <span class="unit">{{ prescription_water != "0" ? "ml" : "" }}</span>
         </li>
 
-        <li v-if="isShow('处方脱水量') && this.$store.getters.xt_user.template_info.org_id == 10597 ||  this.$store.getters.xt_user.template_info.org_id == 10571 || this.$store.getters.xt_user.template_info.org_id == 10612  || this.$store.getters.xt_user.template_info.org_id == 10598 || this.$store.getters.xt_user.template_info.org_id == 10677 || this.$store.getters.xt_user.template_info.org_id == 10679">
+        <li v-if="isShow('处方脱水量') && this.$store.getters.xt_user.template_info.org_id == 10597 ||  this.$store.getters.xt_user.template_info.org_id == 10571 || this.$store.getters.xt_user.template_info.org_id == 10612  || this.$store.getters.xt_user.template_info.org_id == 10598 || this.$store.getters.xt_user.template_info.org_id == 10677 || this.$store.getters.xt_user.template_info.org_id == 10679 || this.$store.getters.xt_user.template_info.org_id == 10702">
           <label>处方脱水量 : </label>
           <span class="content">{{ prescription_water != "0" ? prescription_water : "" }}</span>
           <span class="unit">{{ prescription_water != "0" ? "L" : "" }}</span>

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

@@ -143,7 +143,7 @@
                     </el-col>
 
                     <el-col :span="8"
-                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id != 10597&& this.$store.getters.xt_user.template_info.org_id != 10571 && this.$store.getters.xt_user.template_info.org_id != 10612 && this.$store.getters.xt_user.template_info.org_id != 10598 && this.$store.getters.xt_user.template_info.org_id != 10677 && this.$store.getters.xt_user.template_info.org_id != 10679">
+                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id != 10597&& this.$store.getters.xt_user.template_info.org_id != 10571 && this.$store.getters.xt_user.template_info.org_id != 10612 && this.$store.getters.xt_user.template_info.org_id != 10598 && this.$store.getters.xt_user.template_info.org_id != 10677 && this.$store.getters.xt_user.template_info.org_id != 10679 && this.$store.getters.xt_user.template_info.org_id != 10702">
                         <el-form-item label="处方脱水量(ml)：" prop="prescription_water" :rules="isCheckmust('处方脱水量')">
                             <el-input
                                     type="number"
@@ -153,7 +153,7 @@
                     </el-col>
 
                     <el-col :span="8"
-                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id ==10571 || this.$store.getters.xt_user.template_info.org_id ==10612 || this.$store.getters.xt_user.template_info.org_id ==10598 || this.$store.getters.xt_user.template_info.org_id ==10612 || this.$store.getters.xt_user.template_info.org_id ==10677 || this.$store.getters.xt_user.template_info.org_id==10679">
+                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id ==10571 || this.$store.getters.xt_user.template_info.org_id ==10612 || this.$store.getters.xt_user.template_info.org_id ==10598 || this.$store.getters.xt_user.template_info.org_id ==10612 || this.$store.getters.xt_user.template_info.org_id ==10677 || this.$store.getters.xt_user.template_info.org_id==10679 || this.$store.getters.xt_user.template_info.org_id==10702">
                         <el-form-item label="处方脱水量(L)：" prop="prescription_water" :rules="isCheckmust('处方脱水量')">
                             <el-input
                                     type="number"
@@ -5409,6 +5409,17 @@ mu
           }
           
            
+        }
+        if(this.$store.getters.xt_user.template_info.org_id==10702){
+          if(this.predialysis!=undefined){
+          if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
+            this.dialysisPrescription.target_ultrafiltration = this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight
+          }
+          console.log("hahhahahahhah",this.dialysisPrescription.prescription_water)
+          if(this.dialysisPrescription.prescription_water==0 || this.dialysisPrescription.prescription_water==""){
+            this.dialysisPrescription.prescription_water = this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight
+          }
+        }
         }
       },
       stockType: function() {

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

@@ -392,14 +392,14 @@
             "
           >
             <template slot-scope="scope">
-             <span v-if="org_id == 10440 || org_id == 9671 || org_id ==10206 || org_id ==10612 || org_id ==10617">
+             <span v-if="org_id == 10440 || org_id == 9671 || org_id ==10206 || org_id ==10612 || org_id ==10617 || org_id ==10702">
               {{
                 scope.row.ultrafiltration_volume
                   ? scope.row.ultrafiltration_volume
                   : "0"
               }}
               </span>
-               <span v-if="org_id != 10440 && org_id!=9671 && org_id!=10206 && org_id!=10612 && org_id!=10617">
+               <span v-if="org_id != 10440 && org_id!=9671 && org_id!=10206 && org_id!=10612 && org_id!=10617 && org_id!=10702">
               {{
                 scope.row.ultrafiltration_volume
                   ? scope.row.ultrafiltration_volume

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -94,8 +94,8 @@
           <td v-if="isShow('跨膜压')"> {{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : "" }} </td>
           <td v-if="isShow('跨膜压1')"> {{ monitor.transmembrane_pressure_one ? monitor.transmembrane_pressure_one : "/" }} </td>
           <td v-if="isShow('超滤量')"> 
-            <span v-if="org_id!=9671 && org_id!=10440">{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}  </span> 
-            <span v-if="org_id ==9671 || org_id==10440">{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "0" }}  </span> 
+            <span v-if="org_id!=9671 && org_id!=10440 && org_id!=10702">{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}  </span> 
+            <span v-if="org_id ==9671 || org_id==10440 || org_id == 10702">{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "0" }}  </span> 
           </td>
           <td v-if="isShow('超滤量1')"> 
             {{ monitor.ultrafiltration_volume_one ? monitor.ultrafiltration_volume_one : "/" }}

src/xt_pages/dialysis/template/DialysisPrintOrderSeventyeight.vue

@@ -322,7 +322,7 @@
                       <div
                         style="width: 50%; text-align: center;display: inline-block;border-bottom: 1px solid #999;"
                       >
-                        0
+                         {{predialysis.dehydration?predialysis.dehydration:"" }}
                       </div>L
                     </div>
                   </div>

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyeight.vue

@@ -787,6 +787,7 @@
                       ml/min
                     </div>
                     <div
+                      v-if="org_id!=10677"
                       class="inline_block"
                       style="margin-left: 10px; flex: 1"
                     >

src/xt_pages/hospitalStation/inHospitalHistory.vue

@@ -72,6 +72,7 @@
           <template slot-scope="scope">
             <div v-if="scope.row.med_type == 11">普通住院</div>
             <div v-if="scope.row.med_type == 14">门诊特殊病</div>
+            <div v-if="scope.row.med_type == 240101">门诊视同住院</div>
           </template>
         </el-table-column>
 
@@ -86,8 +87,9 @@
         </el-table-column>
         <el-table-column align="center" prop="name" label="状态" width="70">
           <template slot-scope="scope">
-            <div v-if="scope.row.in_hospital_status == 1 && scope.row.out_hospital_status == 0">{{"在院"}}</div>
-            <div v-if="scope.row.in_hospital_status == 1 && scope.row.out_hospital_status == 1">{{"已出院"}}</div>
+            <div v-if="scope.row.status == 0">{{"已经撤销出院"}}</div>
+            <div v-if="scope.row.status == 1 &&  scope.row.in_hospital_status == 1 && scope.row.out_hospital_status == 0">{{"在院"}}</div>
+            <div v-if="scope.row.status == 1 &&  scope.row.in_hospital_status == 1 && scope.row.out_hospital_status == 1">{{"已出院"}}</div>
           </template>
         </el-table-column>
 <!--        <el-table-column align="center" prop="name" label="操作" width="180">-->

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -976,6 +976,20 @@ export default {
             }
           }
 
+          // for (let i = 0; i < response.data.data.list_three.length; i++) {
+          //   //已就诊
+          //   if (response.data.data.list_three[i].prescription.length > 0) {
+          //     let obj = {
+          //       name: response.data.data.list_three[i].name,
+          //       number: "",
+          //       id: response.data.data.list_three[i].id,
+          //       his_patient_id: 0,
+          //       first_letter: response.data.data.list_three[i].first_letter
+          //     }
+          //     this.cure_data.push(obj)
+          //   }
+          // }
+
           this.all_data = this.all_data.concat(this.cure_data)
           this.all_data = this.all_data.concat(this.un_cure_data)
 
@@ -1155,6 +1169,7 @@ export default {
             }
           }
 
+
           //排班
           for (let i = 0; i < response.data.data.list_two.length; i++) {
             // console.log('hahhahahahahahahah', response.data.data.list_two)
@@ -1183,6 +1198,20 @@ export default {
               this.cure_data.push(obj)
             }
           }
+          // for (let i = 0; i < response.data.data.list_three.length; i++) {
+          //   //已就诊
+          //   if (response.data.data.list_three[i].prescription.length > 0) {
+          //     let obj = {
+          //       name: response.data.data.list_three[i].name,
+          //       number: "",
+          //       id: response.data.data.list_three[i].id,
+          //       his_patient_id: 0,
+          //       first_letter: response.data.data.list_three[i].first_letter
+          //     }
+          //     this.cure_data.push(obj)
+          //   }
+          // }
+
           // console.log('gggg',this.un_cure_data);
           this.all_data = this.all_data.concat(this.cure_data)
           this.all_data = this.all_data.concat(this.un_cure_data)
@@ -1285,6 +1314,20 @@ export default {
             }
           }
 
+          // for (let i = 0; i < response.data.data.list_three.length; i++) {
+          //   //已就诊
+          //   if (response.data.data.list_three[i].prescription.length > 0) {
+          //     let obj = {
+          //       name: response.data.data.list_three[i].name,
+          //       number: "",
+          //       id: response.data.data.list_three[i].id,
+          //       his_patient_id: 0,
+          //       first_letter: response.data.data.list_three[i].first_letter
+          //     }
+          //     this.cure_data.push(obj)
+          //   }
+          // }
+
           this.all_data = this.all_data.concat(this.cure_data)
           this.all_data = this.all_data.concat(this.un_cure_data)
 
@@ -1795,6 +1838,20 @@ export default {
             }
           }
 
+          // for (let i = 0; i < response.data.data.list_three.length; i++) {
+          //     //已就诊
+          //     if (response.data.data.list_three[i].prescription.length > 0) {
+          //       let obj = {
+          //         name: response.data.data.list_three[i].name,
+          //         number: "",
+          //         id: response.data.data.list_three[i].id,
+          //         his_patient_id: 0,
+          //         first_letter: response.data.data.list_three[i].first_letter
+          //       }
+          //       this.cure_data.push(obj)
+          //     }
+          // }
+
           this.all_data = this.all_data.concat(this.cure_data)
           this.all_data = this.all_data.concat(this.un_cure_data)
 

src/xt_pages/outpatientTool/PrescriptionSmmary.vue

@@ -10,8 +10,6 @@
           <el-tab-pane label="明细" name="明细"></el-tab-pane>
           <el-tab-pane label="汇总" name="汇总"></el-tab-pane>
         </el-tabs>
-<!--        <detail v-if="titleType == '明细'"></detail>-->
-<!--        <gather v-if="titleType == '汇总'"></gather>-->
         <pdetail v-if="titleType == '明细'"></pdetail>
         <pgather  v-if="titleType == '汇总'"></pgather>
       </div>
@@ -23,20 +21,12 @@
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
 import Pdetail from './components/pdetail.vue'
 import Pgather from './components/pgather.vue'
-
-
 const moment = require('moment')
-
 export default {
   components: {
     Pgather,
     Pdetail,
-    Gather,
-    Settle,
-    Detail,
-    SummaryDetail,
     BreadCrumb
-
   },
   data() {
     return {

src/xt_pages/outpatientTool/components/detail.vue

@@ -30,10 +30,6 @@
 
             <el-select size="small" v-model="item_time_type" placeholder="请选择"
                        style="width:150px;margin-left:10px;" @change="changeTimeItem">
-              <el-option
-                label="处方时间"
-                value="0">
-              </el-option>
               <el-option
                 label="结算时间"
                 value="1">
@@ -150,7 +146,7 @@ export default {
       tableData: [],
       chargeDate: [moment(new Date()).add('year', 0).format('YYYY-MM-DD'), moment(new Date()).add('year', 0).format('YYYY-MM-DD')],
       item_type: '0',
-      item_time_type:'0',
+      item_time_type:'1',
       items: [
         { id: 1, name: '药品' },
         { id: 2, name: '项目' },
@@ -770,7 +766,8 @@ export default {
           colspan: _col
         }
       }
-    }, export_detail() {
+    },
+    export_detail() {
 
       let list = []
       for (let i = 0; i < this.tableData.length; i++) {

src/xt_pages/outpatientTool/components/gather.vue

@@ -26,10 +26,7 @@
         </el-select>
         <el-select size="small" v-model="item_time_type" placeholder="请选择"
                    style="width:150px;margin-left:10px;" @change="changeTimeItem">
-          <el-option
-            label="处方时间"
-            value="0">
-          </el-option>
+
           <el-option
             label="结算时间"
             value="1">
@@ -116,7 +113,7 @@ export default {
       tableData: [],
       chargeDate: [moment(new Date()).add('year', 0).format('YYYY-MM-DD'), moment(new Date()).add('year', 0).format('YYYY-MM-DD')],
       item_type: '0',
-      item_time_type:'0',
+      item_time_type:'1',
       items: [
         { id: 1, name: '药品' },
         { id: 2, name: '所有项目' },

src/xt_pages/outpatientTool/components/pdetail.vue

@@ -6,18 +6,27 @@
   <div>
     <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
       <div>
-        <!--<el-button size="small" style="margin-left:10px;" class="filter-item" type="primary"-->
-        <!--@click="Action">-->
-        <!--导出-->
-        <!--</el-button>-->
-        <el-input size="small" style="width:150px;" v-model="keywords" @input="searchAction"
-                  @keyup.enter.native='searchAction'
-                  placeholder="请输入患者姓名"
-                  class="filter-item"/>
+
+        <el-autocomplete
+          class="checkSearch"
+          popper-class="my-autocomplete"
+          v-model="search_value"
+          :fetch-suggestions="querySearchAsync"
+          :trigger-on-focus="false"
+          placeholder="病人透析号/姓名"
+          @select="handleSelect"
+        >
+          <i class="el-icon-search el-input__icon" slot="suffix"></i>
+          <template slot-scope="{ item }">
+            <div class="name">{{ item.name }}</div>
+          </template>
+        </el-autocomplete>
+
+
         <el-select size="small" v-model="item_type" placeholder="请选择"
-                   style="width:150px;margin-left:10px;" @change="changeItem">
+                   style="width:150px;margin-left:10px;" >
           <el-option
-            label="全部"
+            label="不限"
             value="0">
           </el-option>
           <el-option
@@ -28,17 +37,6 @@
           </el-option>
         </el-select>
 
-        <el-select size="small" v-model="item_time_type" placeholder="请选择"
-                   style="width:150px;margin-left:10px;" @change="changeTimeItem">
-          <el-option
-            label="处方时间"
-            value="0">
-          </el-option>
-          <el-option
-            label="结算时间"
-            value="1">
-          </el-option>
-        </el-select>
 
         <el-date-picker
           v-model="chargeDate"
@@ -46,7 +44,6 @@
           value-format="yyyy-MM-dd"
           range-separator="至"
           start-placeholder="开始日期"
-          @change="handleDateChange"
           end-placeholder="结束日期">
         </el-date-picker>
         <!--<el-radio v-model="radio" label="1">明细</el-radio>-->
@@ -62,16 +59,14 @@
           <el-button slot="reference" style="margin:0 10px;" type="primary" size="small">打印</el-button>
 
         </el-popover> -->
-        <el-button size="small" type="primary" @click="export_detail">报表下载</el-button>
+        <el-button size="small" type="primary" @click="getSummaryDetailList">查询</el-button>
+        <el-button size="small" type="primary" @click="export_detail">下载报表</el-button>
+
       </div>
     </div>
     <el-table :data="tableData" border :row-style="{ color: '#303133' }" ref="table"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
-              :span-method="merge"
-              show-summary
-              :summary-method="getTotal"
               max-height="600"
-
               v-loading="detail_loading"
               highlight-current-row>
 
@@ -79,17 +74,25 @@
         <template slot-scope="scope">{{ scope.row.name }}</template>
       </el-table-column>
       <el-table-column align="center" prop="name" label="处方日期">
-        <template slot-scope="scope">{{ scope.row.name }}</template>
+        <template slot-scope="scope">{{ scope.row.record_date }}</template>
       </el-table-column>
       <!--<el-table-column align="center" prop="name" label="患者类型">-->
       <!--<template slot-scope="scope"></template>-->
       <!--</el-table-column>-->
       <el-table-column align="center" prop="name" label="费用类型">
-        <template slot-scope="scope">{{ scope.row.name }}</template>
+        <template slot-scope="scope">
+          <div v-if="scope.row.type == 1">{{getDrugType(scope.row.item_cost_type)}}</div>
+          <div v-if="scope.row.type == 2">{{getCostType(scope.row.item_cost_type)}}</div>
+          <div v-if="scope.row.type == 3">耗材</div>
+
+        </template>
       </el-table-column>
 
       <el-table-column align="center" prop="name" label="处方类型">
-        <template slot-scope="scope">{{ scope.row.name }}</template>
+        <template slot-scope="scope">
+          <div v-if="scope.row.med_type == 11">普通门诊</div>
+          <div v-if="scope.row.med_type == 14">门诊特殊病</div>
+        </template>
       </el-table-column>
 
 
@@ -106,26 +109,21 @@
       </el-table-column>
 
       <el-table-column align="center" prop="name" label="单位">
-        <template slot-scope="scope">{{scope.row.count}}</template>
+        <template slot-scope="scope">{{scope.row.unit}}</template>
       </el-table-column>
 
       <el-table-column align="center" prop="name" label="单价">
         <template slot-scope="scope">{{scope.row.price.toFixed(2)}}</template>
       </el-table-column>
 
-      <el-table-column align="center" prop="name" label="金额">
+      <el-table-column align="center" prop="sum" label="金额">
         <template slot-scope="scope">
           <div>{{((scope.row.price*scope.row.count).toFixed(2))}}</div>
         </template>
       </el-table-column>
 
       <el-table-column align="center" prop="name" label="是否结算">
-        <template slot-scope="scope">{{scope.row.price.toFixed(2)}}</template>
-      </el-table-column>
-
-
-      <el-table-column align="center" prop="name" label="结算日期">
-        <template slot-scope="scope">{{scope.row.price.toFixed(2)}}</template>
+        <template slot-scope="scope">{{scope.row.order_status == 2?'已结算':'未结算'}}</template>
       </el-table-column>
 
     </el-table>
@@ -137,7 +135,11 @@
 
 <script>
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
-import { GetSummaryDetail } from '@/api/his/his'
+import { GetPSummaryDetail } from '@/api/his/his'
+import { getPrescriptionInitdata } from '@/api/his/his_tools'
+
+import { PostSearch } from '@/api/patient'
+
 import { uParseTime } from '@/utils/tools'
 import axios from 'axios'
 import pako from 'pako';
@@ -166,9 +168,12 @@ export default {
       detail_loading: false,
       tempArr: [],
       pos: 0,
-
+      patient_id:0,
       sameRowArr: [],
       keywords: '',
+      search_value:"",
+      drugTypeList:[],
+      costClassifyList:[],
       tableData: [],
       chargeDate: [moment(new Date()).add('year', 0).format('YYYY-MM-DD'), moment(new Date()).add('year', 0).format('YYYY-MM-DD')],
       item_type: '0',
@@ -181,6 +186,83 @@ export default {
     }
   },
   methods: {
+    export_detail() {
+
+      let list = []
+      for (let i = 0; i < this.tableData.length; i++) {
+        let order = this.tableData[i]
+        let name = order.name
+        let item_name = order.item_name
+        let count = order.count
+        let price = order.price.toFixed(2)
+        let pay_sumamt = (order.price.toFixed(2) * order.count).toFixed(2)
+        let total = order.total.toFixed(2)
+
+        let obj = {
+          '患者姓名': name,
+          '项目名称': item_name,
+          '数量': count,
+          '单价': price,
+          '费用': pay_sumamt,
+          '费用总额': total
+        }
+        list.push(obj)
+      }
+      import('@/vendor/Export2Excel').then(excel => {
+        const tHeader = ['患者姓名', '项目名称', '数量', '单价', '费用', '费用总额']
+        const filterVal = ['患者姓名', '项目名称', '数量', '单价', '费用', '费用总额']
+        const data = this.formatJson(filterVal, list)
+        excel.export_json_to_excel1({
+          header: tHeader,
+          data,
+          filename: '明细',
+          ref: this.$refs['table'].$el
+        })
+      })
+
+    },
+    getCostType(type){
+      console.log(this.costClassifyList)
+      console.log(type)
+      var name = "";
+      for (let i = 0; i < this.costClassifyList.length; i++) {
+        if (type == this.costClassifyList[i].value) {
+          name = this.costClassifyList[i].name;
+        }
+      }
+      return name;
+    },
+    getDrugType(type){
+      console.log(this.drugTypeList)
+      console.log(type)
+
+      var name = "";
+      for (let i = 0; i < this.drugTypeList.length; i++) {
+        if (type == this.drugTypeList[i].value) {
+          name = this.drugTypeList[i].name;
+        }
+      }
+      return name;
+    },
+    handleSelect(val) {
+      this.patient_id = val.id
+      this.search_value = val.name
+    },
+    querySearchAsync(keyword, cb) {
+      let key = ''
+      if (keyword != undefined) {
+        key = keyword
+      }
+      let searchArray = []
+      PostSearch(key).then(response => {
+        if (response.data.state == 1) {
+          searchArray = response.data.data.patient
+          cb(searchArray)
+        } else {
+          cb([])
+        }
+      })
+    },
     handleDateChangetwo(value) {
       this.$confirm('提示', '接口优化升级，如有数据需要，请联系客服！', {
         confirmButtonText: '确 定',
@@ -188,7 +270,6 @@ export default {
         type: 'warning'
       }).then(() => {
 
-
       }).catch(() => {
       })
 
@@ -224,11 +305,10 @@ export default {
       // }else{
       //   this.getSummaryDetailListtwo()
       // }
-      this.getSummaryDetailList()
-
+      // this.getSummaryDetailList()
 
     },
-    Action(){
+    Action() {
       var that = this
       axios.get('http://127.0.0.1:9531/handelExcel', {
         params: {}
@@ -237,18 +317,17 @@ export default {
           if (response.data.state == 0) {
             that.$message.error(response.data.msg)
 
-
             return false
           } else {
 
             var list = []
-            for(let i = 0; i < response.data.data.list.length; i++){
-              let team =  response.data.data.list[i]
-              for(let b = 0; b < team.list.length; b++){
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              let team = response.data.data.list[i]
+              for (let b = 0; b < team.list.length; b++) {
                 let name = ""
-                if(team.list[b].type == 2){
+                if (team.list[b].type == 2) {
                   name = team.list[b].project.project_name
-                }else{
+                } else {
 
                   name = team.list[b].good_info.good_name
 
@@ -270,8 +349,8 @@ export default {
             }
 
             import('@/vendor/Export2Excel').then(excel => {
-              const tHeader = [ '客户组合编码', '客户组合名称', '客户单项编码', '客户单项名称', '中心组合编码', '中心组合名称', '中心单项编码', '中心单项名称']
-              const filterVal = [ '客户组合编码', '客户组合名称', '客户单项编码', '客户单项名称', '中心组合编码', '中心组合名称', '中心单项编码', '中心单项名称']
+              const tHeader = ['客户组合编码', '客户组合名称', '客户单项编码', '客户单项名称', '中心组合编码', '中心组合名称', '中心单项编码', '中心单项名称']
+              const filterVal = ['客户组合编码', '客户组合名称', '客户单项编码', '客户单项名称', '中心组合编码', '中心组合名称', '中心单项编码', '中心单项名称']
               const data = that.formatJson(filterVal, list)
               excel.export_json_to_excel({
                 header: tHeader,
@@ -280,17 +359,13 @@ export default {
               })
             })
 
-
           }
         })
         .catch(function(error) {
 
         })
 
-
-
-
-    },formatJson(filterVal, jsonData) {
+    }, formatJson(filterVal, jsonData) {
       return jsonData.map(v => filterVal.map(j => v[j]))
     },
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
@@ -321,108 +396,83 @@ export default {
     },
     changeItem() {
       this.getSummaryDetailList()
-    },changeTimeItem(){
+    }, changeTimeItem() {
 
       this.getSummaryDetailList()
 
+    }, uniqueProjectAndAdvice(array) {
+      // res用来存储结果
+      var res = []
+      for (var i = 0, arrayLen = array.length; i < arrayLen; i++) {
+        for (var j = 0, resLen = res.length; j < resLen; j++) {
+          if (array[i].item_id === res[j].item_id && array[i].price === res[j].price) {
+            break
+          }
+        }
+        // 如果array[i]是唯一的，那么执行完循环，j等于resLen
+        if (j === resLen) {
+          res.push(array[i])
+        }
+      }
+      return res
     },
     searchAction() {
       this.item_type = '0'
       this.getSummaryDetailList()
 
-    },  getSummaryDetailListtwo() {
-      this.detail_loading = true
-      let start_time = this.chargeDate[0]
-      let end_time = this.chargeDate[1]
-      let params = {
-        start_time: start_time,
-        end_time: end_time,
-        type: this.item_type,
-        keyword: this.keywords
+    },handleSpanTempArr() {
+      this.tempArr = []
+
+      for (let i = 0; i < this.tableData.length; i++) {
+        if (i === 0) {
+          this.tempArr.push(1)
+          this.pos = 0
+        } else {
+          // 判断当前元素与上一个元素是否相同
+          if (this.tableData[i].patient_id === this.tableData[i - 1].patient_id) {
+            this.tempArr[this.pos] += 1
+            this.tempArr.push(0)
+          } else {
+            this.tempArr.push(1)
+            this.pos = i
+          }
+        }
       }
-      GetSummaryDetail(params).then(response => {
+
+      let sameRowArr = [], sIdx = 0
+      this.tableData.forEach((item, index) => {
+        item.index = index
+        if (index === 0) {
+          sameRowArr.push([index])
+        } else {
+          if (item.patient_id === this.tableData[index - 1].patient_id) {
+            sameRowArr[sIdx].push(index)
+          } else {
+            sIdx = sIdx + 1
+            sameRowArr.push([index])
+          }
+        }
+      })
+      this.sameRowArr = sameRowArr
+    },getInit(){
+      getPrescriptionInitdata().then(response => {
         if (response.data.state == 0) {
           this.detail_loading = false
 
           this.$message.error(response.data.msg)
           return false
         } else {
-          this.detail_loading = false
-
-          this.$confirm('提示', '接口优化升级，如有数据需要，请联系客服！', {
-            confirmButtonText: '确 定',
-            cancelButtonText: '取 消',
-            type: 'warning'
-          }).then(() => {
-
-
-          }).catch(() => {
-          })
-
-
+          this.drugTypeList = response.data.data.drugTypeList;
+          this.costClassifyList = response.data.data.costClassifyList;
         }
 
-
-
-
-        //
-        // console.log('去重前')
-        // console.log(advice)
-        // console.log(project)
-        // //
-        // //
-
-        // //
-        // console.log('去重后')
-        //
-        // console.log(advice.length)
-        // console.log(project.length)
-        //
-        // for (let i = 0; i < project.length; i++) {
-        //   let obj = {}
-        //   let count = 0
-        //   for (let a = 0; a < tempPatientsTwo.length; a++) {
-        //     if (project[i].patient_id == tempPatientsTwo[a].patient_id && project[i].item_id == tempPatientsTwo[a].item_id && project[i].price == tempPatientsTwo[a].price) {
-        //       count = count + tempPatientsTwo[a].count
-        //       obj['count'] = count
-        //
-        //     }
-        //     obj['price'] = project[i].price
-        //     obj['type'] = project[i].type
-        //     obj['item_name'] = project[i].item_name
-        //     obj['item_id'] = project[i].item_id
-        //     obj['name'] = project[i].name
-        //     obj['patient_id'] = project[i].patient_id
-        //     obj['count'] = count
-        //     this.tableData.push(obj)
-        //   }
-        // }
-        //
-        //
-        // for (let i = 0; i < advice.length; i++) {
-        //   let obj = {}
-        //   let count = 0
-        //   for (let a = 0; a < tempPatientsTwo.length; a++) {
-        //     if (advice[i].patient_id == tempPatientsTwo[a].patient_id && advice[i].item_id == tempPatientsTwo[a].item_id && advice[i].price == tempPatientsTwo[a].price) {
-        //       count = count + tempPatientsTwo[a].count
-        //       obj['count'] = count
-        //
-        //     }
-        //     obj['price'] = advice[i].price
-        //     obj['type'] = advice[i].type
-        //     obj['item_name'] = advice[i].item_name
-        //     obj['item_id'] = advice[i].item_id
-        //     obj['name'] = advice[i].name
-        //     obj['patient_id'] = advice[i].patient_id
-        //     this.tableData.push(obj)
-        //   }
-        // }
-        // console.log(this.tableData.length)
-        // this.tableData = this.sort(this.tableData)
-
       })
+
     },
     getSummaryDetailList() {
+      if(this.search_value.length == 0){
+        this.patient_id = 0
+      }
       this.detail_loading = true
       let start_time = this.chargeDate[0]
       let end_time = this.chargeDate[1]
@@ -430,26 +480,22 @@ export default {
         start_time: start_time,
         end_time: end_time,
         type: this.item_type,
-        keyword: this.keywords,
-        time_type:this.item_time_type
+        patient_id: this.patient_id,
       }
-      GetSummaryDetail(params).then(response => {
+      GetPSummaryDetail(params).then(response => {
         if (response.data.state == 0) {
           this.detail_loading = false
 
           this.$message.error(response.data.msg)
           return false
         } else {
-
-
           this.detail_loading = false
-
           this.tableData = []
           let tempPatients = []
           let tempPatientsTwo = []
           //
           let tempData = response.data
-          let allData =  response.data
+          let allData = response.data
           tempData = this.uniquepid(tempData)
           //
           let order_infos = []
@@ -476,40 +522,37 @@ export default {
               order_info: []
             }
             let orders = tempPatients[i].orders
-
             for (let c = 0; c < orders.length; c++) {
               let newObj = {}
               newObj['count'] = orders[c].cnt
               newObj['price'] = orders[c].pric
-              newObj['item_total'] = orders[c].det_item_fee_sumamt
+
+              newObj['order_status'] = orders[c].order_status
+              newObj['med_type'] = orders[c].med_type
+              newObj['record_date'] = orders[c].record_date
+              newObj['unit'] = orders[c].unit
+
+              newObj['item_cost_type'] = orders[c].item_cost_type
+
+              // newObj['item_total'] = orders[c].det_item_fee_sumamt
 
               if (orders[c].advice_id > 0 && orders[c].project_id == 0) {
                 newObj['type'] = 1
                 newObj['item_name'] = orders[c].item_name
                 newObj['item_id'] = orders[c].item_id
-
-                if (orders[c].min_unit != orders[c].dose_unit) {
-                  newObj['item_spec'] =  orders[c].dose + orders[c].dose_unit + '*' + orders[c].min_number + orders[c].min_unit + '/' + orders[c].max_unit
-                } else {
-
-                  newObj['item_spec'] = ''
-                }
-
+                newObj['item_spec'] = orders[c].spec
               }
               if (orders[c].advice_id == 0 && orders[c].project_id > 0) {
-                newObj['type'] = 2
                 newObj['item_id'] = orders[c].item_id
-
                 if (orders[c].p_type == 2) {
-                  newObj['item_spec'] =""
-                  newObj['item_name'] = orders[c].item_name
-
+                  newObj['type'] = 2
 
+                  newObj['item_spec'] = ""
+                  newObj['item_name'] = orders[c].item_name
                 } else if (orders[c].p_type == 3) {
-                  newObj['item_spec'] =  orders[c].specification_name
+                  newObj['type'] = 3
+                  newObj['item_spec'] = orders[c].spec
                   newObj['item_name'] = orders[c].item_name
-
-
                 }
               }
               obj.order_info.push(newObj)
@@ -517,9 +560,7 @@ export default {
             }
             tempPatientsTwo.push(obj)
           }
-          console.log(tempPatientsTwo)
 
-          //
           for (let d = 0; d < tempPatientsTwo.length; d++) {
             tempPatientsTwo[d]['new_order_info'] = []
             let project = []
@@ -543,13 +584,19 @@ export default {
                 }
               }
 
-
-
               obj['price'] = project[i].price
               obj['type'] = project[i].type
               obj['item_name'] = project[i].item_name
               obj['item_spec'] = project[i].item_spec
-              obj['item_total'] = project[i].item_total
+
+              obj['order_status'] = project[i].order_status
+              obj['med_type'] = project[i].med_type
+              obj['record_date'] = project[i].record_date
+              obj['item_cost_type'] = project[i].item_cost_type
+              obj['unit'] = project[i].unit
+
+
+              // obj['item_total'] = project[i].item_total
 
               obj['item_id'] = project[i].item_id
               obj['name'] = tempPatientsTwo[d].name
@@ -572,8 +619,14 @@ export default {
               obj['item_name'] = advice[i].item_name
               obj['item_spec'] = advice[i].item_spec
               obj['item_id'] = advice[i].item_id
+              obj['unit'] = advice[i].unit
+
               obj['name'] = tempPatientsTwo[d].name
-              obj['item_total'] = advice[i].item_total
+              obj['order_status'] = advice[i].order_status
+              obj['med_type'] = advice[i].med_type
+              obj['record_date'] = advice[i].record_date
+              obj['item_cost_type'] = advice[i].item_cost_type
+              // obj['item_total'] = advice[i].item_total
               obj['patient_id'] = tempPatientsTwo[d].patient_id
               obj['count'] = count
               tempPatientsTwo[d].new_order_info.push(obj)
@@ -584,17 +637,14 @@ export default {
             let total = 0
             for (let b = 0; b < tempPatientsTwo[i].new_order_info.length; b++) {
               let new_name = tempPatientsTwo[i].new_order_info[b].item_name
-              if (new_name != undefined){
+              if (new_name != undefined) {
                 if (new_name.length != 0) {
                   console.log(parseFloat(tempPatientsTwo[i].new_order_info[b].count) * parseFloat(tempPatientsTwo[i].new_order_info[b].price))
                   total = parseFloat(total) + parseFloat((parseFloat(tempPatientsTwo[i].new_order_info[b].count) * parseFloat(tempPatientsTwo[i].new_order_info[b].price)).toFixed(2))
                 }
 
-
-
               }
 
-
             }
             tempPatientsTwo[i]['total'] = total
           }
@@ -603,11 +653,6 @@ export default {
             if (tempPatientsTwo[i].new_order_info.length > 0) {
 
               for (let b = 0; b < tempPatientsTwo[i].new_order_info.length; b++) {
-                // let new_name = tempPatientsTwo[i].new_order_info[b].item_name
-                // console.log('2 ' + new_name)
-                //
-                // new_name = new_name.replace('（ ', '')
-                // new_name = new_name.replace(' ）', '')
 
                 let obj = {
                   name: tempPatientsTwo[i].name,
@@ -617,53 +662,50 @@ export default {
                   item_name: tempPatientsTwo[i].new_order_info[b].item_name,
                   item_id: tempPatientsTwo[i].new_order_info[b].item_id,
                   count: tempPatientsTwo[i].new_order_info[b].count,
-                  item_spec: tempPatientsTwo[i].new_order_info[b].item_spec
-                }
+                  item_spec: tempPatientsTwo[i].new_order_info[b].item_spec,
+                  order_status: tempPatientsTwo[i].new_order_info[b].order_status,
+                  med_type: tempPatientsTwo[i].new_order_info[b].med_type,
+                  record_date: tempPatientsTwo[i].new_order_info[b].record_date,
+                  item_cost_type: tempPatientsTwo[i].new_order_info[b].item_cost_type,
+                  unit: tempPatientsTwo[i].new_order_info[b].unit,
 
 
-                // if(b == 0){
+                }
                 obj['total'] = tempPatientsTwo[i].total
-                // }else{
-                //   obj['total'] = 0
-                // }
                 this.tableData.push(obj)
 
-
-
-
               }
             }
           }
-          console.log( this.tableData)
+          console.log(this.tableData)
           this.handleSpanTempArr()
+          console.log(this.tableData)
+
           // this.tableData = tempPatientsTwo
 
           // console.log(tempPatientsTwo.length)
           //
-          let advices = []
-          let projects = []
-          let goods = []
-          for(let i = 0; i < order_infos.length; i++){
-            if(order_infos[i].advice_id > 0 && order_infos[i].project_id == 0){
-              advices.push(order_infos[i].advice)
-            }
-            if(order_infos[i].advice_id == 0 && order_infos[i].project_id > 0){
-              if(order_infos[i].project.type == 3){
-                goods.push(order_infos[i].project)
-              }
-            }
-            if(order_infos[i].advice_id == 0 && order_infos[i].project_id > 0){
-              if(order_infos[i].project.type == 2){
-                projects.push(order_infos[i].project)
-              }
-            }
-          }
+          // let advices = []
+          // let projects = []
+          // let goods = []
+          // for (let i = 0; i < order_infos.length; i++) {
+          //   if (order_infos[i].advice_id > 0 && order_infos[i].project_id == 0) {
+          //     advices.push(order_infos[i].advice)
+          //   }
+          //   if (order_infos[i].advice_id == 0 && order_infos[i].project_id > 0) {
+          //     if (order_infos[i].project.type == 3) {
+          //       goods.push(order_infos[i].project)
+          //     }
+          //   }
+          //   if (order_infos[i].advice_id == 0 && order_infos[i].project_id > 0) {
+          //     if (order_infos[i].project.type == 2) {
+          //       projects.push(order_infos[i].project)
+          //     }
+          //   }
+          // }
 
         }
 
-
-
-
         //
         // console.log('去重前')
         // console.log(advice)
@@ -720,145 +762,11 @@ export default {
         // this.tableData = this.sort(this.tableData)
 
       })
-    }, uniqueProjectAndAdvice(array) {
-      // res用来存储结果
-      var res = []
-      for (var i = 0, arrayLen = array.length; i < arrayLen; i++) {
-        for (var j = 0, resLen = res.length; j < resLen; j++) {
-          if (array[i].item_id === res[j].item_id && array[i].price === res[j].price) {
-            break
-          }
-        }
-        // 如果array[i]是唯一的，那么执行完循环，j等于resLen
-        if (j === resLen) {
-          res.push(array[i])
-        }
-      }
-      return res
-    }, sort(arr) {
-      for (var i = 0; i < arr.length - 1; i++) {
-        for (var j = 0; j < arr.length - i - 1; j++) {
-          if (arr[j].patient_id > arr[j + 1].patient_id) {// 相邻元素两两对比
-            var hand = arr[j]
-            arr[j] = arr[j + 1]
-            arr[j + 1] = hand
-
-          }
-        }
-      }
-      return arr
-    }, handleSpanTempArr() {
-      this.tempArr = []
-
-      for (let i = 0; i < this.tableData.length; i++) {
-        if (i === 0) {
-          this.tempArr.push(1)
-          this.pos = 0
-        } else {
-          // 判断当前元素与上一个元素是否相同
-          if (this.tableData[i].patient_id === this.tableData[i - 1].patient_id) {
-            this.tempArr[this.pos] += 1
-            this.tempArr.push(0)
-          } else {
-            this.tempArr.push(1)
-            this.pos = i
-          }
-        }
-      }
-
-      let sameRowArr = [], sIdx = 0
-      this.tableData.forEach((item, index) => {
-        item.index = index
-        if (index === 0) {
-          sameRowArr.push([index])
-        } else {
-          if (item.patient_id === this.tableData[index - 1].patient_id) {
-            sameRowArr[sIdx].push(index)
-          } else {
-            sIdx = sIdx + 1
-            sameRowArr.push([index])
-          }
-        }
-      })
-      this.sameRowArr = sameRowArr
-    }, merge({ row, column, rowIndex, columnIndex }) {
-      if (columnIndex === 0 || columnIndex === 6) {
-        const _row = this.tempArr[rowIndex]
-        const _col = _row > 0 ? 1 : 0
-        return {
-          rowspan: _row,
-          colspan: _col
-        }
-      }
-    }, export_detail() {
-
-      let list = []
-      for (let i = 0; i < this.tableData.length; i++) {
-        let order = this.tableData[i]
-        let name = order.name
-        let item_name = order.item_name
-        let count = order.count
-        let price = order.price.toFixed(2)
-        let pay_sumamt = (order.price.toFixed(2) * order.count).toFixed(2)
-        let total = order.total.toFixed(2)
-
-        let obj = {
-          '患者姓名': name,
-          '项目名称': item_name,
-          '数量': count,
-          '单价': price,
-          '费用': pay_sumamt,
-          '费用总额': total
-        }
-        list.push(obj)
-      }
-      import('@/vendor/Export2Excel').then(excel => {
-        const tHeader = ['患者姓名', '项目名称', '数量', '单价', '费用', '费用总额']
-        const filterVal = ['患者姓名', '项目名称', '数量', '单价', '费用', '费用总额']
-        const data = this.formatJson(filterVal, list)
-        excel.export_json_to_excel1({
-          header: tHeader,
-          data,
-          filename: '明细',
-          ref: this.$refs['table'].$el
-        })
-      })
-
-    }, formatJson(filterVal, jsonData) {
-      return jsonData.map(v => filterVal.map(j => v[j]))
-    }, getTotal(param) {
-      const { columns, data } = param
-      const sums = []
-      columns.forEach((column, index) => {
-        if (index === 0) {
-          sums[index] = '合计'
-          return
-        }
-        const values = data.map(item => Number(item[column.property]))
-        if (column.property === 'total') {
-          // sums[index] = values.reduce((prev, curr) => {
-          //   const value = Number(curr)
-          //   if (!isNaN(value)) {
-          //     return prev + curr
-          //   } else {
-          //     return prev
-          //   }
-          // }, 0)
-          // sums[index] = sums[index].toFixed(2)
-          let num = 0
-          data.map(item => {
-            num += item.price * item.count
-          })
-          sums[index] = num.toFixed(2)
-        } else {
-          sums[index] = ''
-        }
-      })
-
-      return sums
-    }
+    },
   },
+
   created() {
+    this.getInit()
     this.getSummaryDetailList()
 
   }

src/xt_pages/outpatientTool/components/pgather.vue

@@ -6,15 +6,25 @@
         <!--@click="Action">-->
         <!--导出-->
         <!--</el-button>-->
-        <el-input size="small" style="width:150px;" v-model="keywords" @input="searchAction"
-                  @keyup.enter.native='searchAction'
-                  placeholder="请输入患者姓名"
+        <el-autocomplete
+          class="checkSearch"
+          popper-class="my-autocomplete"
+          v-model="search_value"
+          :fetch-suggestions="querySearchAsync"
+          :trigger-on-focus="false"
+          placeholder="病人透析号/姓名"
+          @select="handleSelect"
+        >
+          <i class="el-icon-search el-input__icon" slot="suffix"></i>
+          <template slot-scope="{ item }">
+            <div class="name">{{ item.name }}</div>
+          </template>
+        </el-autocomplete>
 
-                  class="filter-item"/>
         <el-select size="small" v-model="item_type" placeholder="请选择"
-                   style="width:150px;margin-left:10px;" @change="changeItem">
+                   style="width:150px;margin-left:10px;" >
           <el-option
-            label="全部"
+            label="不限"
             value="0">
           </el-option>
           <el-option
@@ -24,68 +34,65 @@
             :value="item.id">
           </el-option>
         </el-select>
-        <el-select size="small" v-model="item_time_type" placeholder="请选择"
-                   style="width:150px;margin-left:10px;" @change="changeTimeItem">
-          <el-option
-            label="处方时间"
-            value="0">
-          </el-option>
-          <el-option
-            label="结算时间"
-            value="1">
-          </el-option>
-        </el-select>
+
+
         <el-date-picker
           v-model="chargeDate"
           type="daterange"
           value-format="yyyy-MM-dd"
           range-separator="至"
           start-placeholder="开始日期"
-          @change="changeDate"
           end-placeholder="结束日期">
         </el-date-picker>
-        <!--<el-radio v-model="radio" label="1">明细</el-radio>-->
-        <!--<el-radio v-model="radio" label="2">汇总</el-radio>-->
       </div>
       <div>
-        <!-- <el-popover
-          placement="bottom"
-          width="210"
-          trigger="click">
-          <el-button size="small" ref="button_two" @click="open(1)">打印清单</el-button>
-          <el-button size="small" ref="button_six" @click="open(2)">打印汇总</el-button>
-          <el-button slot="reference" style="margin:0 10px;" type="primary" size="small">打印</el-button>
-
-        </el-popover> -->
+        <el-button size="small" type="primary" @click="getSummaryDetailList">查询</el-button>
         <el-button size="small" type="primary" @click="export_detail">报表下载</el-button>
       </div>
     </div>
     <el-table :data="tableData" border :row-style="{ color: '#303133' }" ref="tables"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
               v-loading="gather_loading"
-              show-summary
               max-height="600"
-              :span-method="merge"
-              :summary-method="getTotal"
               highlight-current-row>
 
       <el-table-column align="center" prop="name" label="费用分类">
-        <template slot-scope="scope">{{ scope.row.name }}</template>
+        <template slot-scope="scope">
+          <div v-if="scope.row.type == 1">{{getDrugType(scope.row.item_cost_type)}}</div>
+          <div v-if="scope.row.type == 2">{{getCostType(scope.row.item_cost_type)}}</div>
+          <div v-if="scope.row.type == 3">耗材</div>
+        </template>
       </el-table-column>
-      <!--<el-table-column align="center" prop="name" label="患者类型">-->
-      <!--<template slot-scope="scope"></template>-->
-      <!--</el-table-column>-->
 
-      <el-table-column align="center" prop="item_name" label="处方类型">
-        <template slot-scope="scope">{{scope.row.item_name}}</template>
+      <el-table-column align="center" prop="name" label="处方类型">
+        <template slot-scope="scope">
+          <div v-if="scope.row.med_type == 11">普通门诊</div>
+          <div v-if="scope.row.med_type == 14">门诊特殊病</div>
+        </template>
       </el-table-column>
       <el-table-column align="center" prop="price" label="项目名称">
-        <template slot-scope="scope">{{scope.row.price.toFixed(2)}}</template>
+        <template slot-scope="scope">{{scope.row.item_name}}</template>
       </el-table-column>
-      <el-table-column align="center" prop="sum" label="费用总额">
-        <template slot-scope="scope">
-          <div>{{scope.row.sum.toFixed(2)}}</div>
-        </template>
+      <el-table-column align="center" prop="price" label="规格型号">
+        <template slot-scope="scope">{{scope.row.spec}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="price" label="数量">
+        <template slot-scope="scope">{{scope.row.count}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="price" label="单位">
+        <template slot-scope="scope">{{scope.row.unit}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="price" label="单价">
+        <template slot-scope="scope">{{scope.row.price}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="sum" label="金额">
+        <template slot-scope="scope">{{(scope.row.count * scope.row.price).toFixed(2)}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="settle" label="已结算金额">
+        <template slot-scope="scope">{{scope.row.total_settle.toFixed(2)}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="un_settle" label="未结算金额">
+        <template slot-scope="scope">{{scope.row.total_un_settle.toFixed(2)}}</template>
       </el-table-column>
 
     </el-table>
@@ -95,7 +102,10 @@
 
 <script>
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
-import { GetSummaryDetail } from '@/api/his/his'
+import { GetPSummaryDetail } from '@/api/his/his'
+import { PostSearch } from '@/api/patient'
+import { getPrescriptionInitdata } from '@/api/his/his_tools'
+
 import { uParseTime } from '@/utils/tools'
 // import NewStatementPrint from './newStatementPrint'
 const moment = require('moment')
@@ -112,27 +122,80 @@ export default {
       sameRowArr: [],
       keywords: '',
       pos:0,
-
+      costClassifyList:[],
+      drugTypeList:[],
+      search_value:"",
       tableData: [],
       chargeDate: [moment(new Date()).add('year', 0).format('YYYY-MM-DD'), moment(new Date()).add('year', 0).format('YYYY-MM-DD')],
       item_type: '0',
+      patient_id:0,
       item_time_type:'0',
       items: [
-        { id: 1, name: '药品' },
-        { id: 2, name: '所有项目' },
-        { id: 4, name: '检验费' },
-        { id: 5, name: '治疗费' },
-        { id: 6, name: '护理费' },
-        { id: 7, name: '其他' },
-
-        { id: 3, name: '耗材' },
+        { id: 1, name: '未结算' },
+        { id: 2, name: '结算' },
 
       ]
 
     }
   },
   methods: {
+    getInit(){
+      getPrescriptionInitdata().then(response => {
+        if (response.data.state == 0) {
+          this.detail_loading = false
 
+          this.$message.error(response.data.msg)
+          return false
+        } else {
+          this.drugTypeList = response.data.data.drugTypeList;
+          this.costClassifyList = response.data.data.costClassifyList;
+        }
+
+      })
+
+    },
+    getCostType(type){
+      console.log(this.costClassifyList)
+      console.log(type)
+      var name = "";
+      for (let i = 0; i < this.costClassifyList.length; i++) {
+        if (type == this.costClassifyList[i].value) {
+          name = this.costClassifyList[i].name;
+        }
+      }
+      return name;
+    },
+    getDrugType(type){
+      console.log(this.drugTypeList)
+      console.log(type)
+
+      var name = "";
+      for (let i = 0; i < this.drugTypeList.length; i++) {
+        if (type == this.drugTypeList[i].value) {
+          name = this.drugTypeList[i].name;
+        }
+      }
+      return name;
+    },
+    handleSelect(val) {
+      this.patient_id = val.id
+      this.search_value = val.name
+    },
+    querySearchAsync(keyword, cb) {
+      let key = ''
+      if (keyword != undefined) {
+        key = keyword
+      }
+      let searchArray = []
+      PostSearch(key).then(response => {
+        if (response.data.state == 1) {
+          searchArray = response.data.data.patient
+          cb(searchArray)
+        } else {
+          cb([])
+        }
+      })
+    },
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
       if (columnIndex === 0) {
         if (rowIndex % 2 === 0) {
@@ -169,6 +232,10 @@ export default {
       this.getSummaryDetailList()
     },
     getSummaryDetailList() {
+      console.log(this.search_value)
+      if(this.search_value.length == 0){
+        this.patient_id = 0
+      }
       this.gather_loading = true
       let start_time = this.chargeDate[0]
       let end_time = this.chargeDate[1]
@@ -176,265 +243,20 @@ export default {
         start_time: start_time,
         end_time: end_time,
         type: this.item_type,
-        keyword: this.keywords,
-        time_type:this.item_time_type,
+        patient_id:this.patient_id
       }
-      GetSummaryDetail(params).then(response => {
+      GetPSummaryDetail(params).then(response => {
         if (response.data.state == 0) {
           this.gather_loading = false
-
           this.$message.error(response.data.msg)
           return false
         } else {
           this.gather_loading = false
-
-          let tempPatients = []
-          let tempPatientsTwo = []
           this.tableData = []
           let tempData = response.data
-          let data = response.data
-          let orders = this.uniquepid(tempData)
-          console.log(orders)
-
-          for (let i = 0; i < orders.length; i++) {
-            let obj = {
-              patient_id: orders[i].p_id,
-              name: orders[i].p_name,
-              orders: []
-            }
-            for (let b = 0; b < data.length; b++) {
-              if (orders[i].p_id == data[b].p_id) {
-                obj.orders = obj.orders.concat(data[b])
-              }
-            }
-            tempPatients.push(obj)
-          }
-          console.log(tempPatients)
-
-          for (let i = 0; i < tempPatients.length; i++) {
-            let obj = {
-              patient_id: tempPatients[i].patient_id,
-              name: tempPatients[i].name,
-              order_info: []
-            }
-            let orders = tempPatients[i].orders
-            for (let c = 0; c < orders.length; c++) {
-              let newObj = {}
-
-              newObj['count'] = orders[c].cnt
-              newObj['price'] = orders[c].pric
-              if (orders[c].advice_id > 0 && orders[c].project_id == 0) {
-                newObj['type'] = 1
-                newObj['item_name'] = orders[c].item_name
-                newObj['item_id'] = orders[c].item_id
-
-              }
-              if (orders[c].advice_id == 0 && orders[c].project_id > 0) {
-                newObj['item_id'] = orders[c].item_id
-                if (orders[c].p_type == 2) {
-                  newObj['type'] = 2
-                  newObj['item_name'] = orders[c].item_name
-                } else if (orders[c].p_type == 3) {
-                  newObj['type'] = 3
-                  newObj['item_name'] = orders[c].item_name
-                }
-              }
-              obj.order_info.push(newObj)
-            }
-            tempPatientsTwo.push(obj)
-          }
-          console.log(tempPatientsTwo)
-
-          for (let d = 0; d < tempPatientsTwo.length; d++) {
-            tempPatientsTwo[d]['new_order_info'] = []
-            let project = []
-            let advice = []
-            for (let b = 0; b < tempPatientsTwo[d].order_info.length; b++) {
-              if (tempPatientsTwo[d].order_info[b].type == 1) {
-                advice.push(tempPatientsTwo[d].order_info[b])
-              } else {
-                project.push(tempPatientsTwo[d].order_info[b])
-              }
-            }
-            // project = this.uniqueProjectAndAdvice(project)
-            // advice = this.uniqueProjectAndAdvice(advice)
-
-            let obj = {}
-            let price = 0
-
-            let obj2 = {}
-            let price2 = 0
-
-            let obj3 = {}
-            let price3 = 0
-
-            for (let i = 0; i < project.length; i++) {
-              if (project[i].type == 2) {
-                price = parseFloat(price.toString()) + parseFloat((parseFloat(project[i].count.toString()) * parseFloat(project[i].price.toString()).toFixed(2)).toString())
-              } else if (project[i].type == 3) {
-                price3 = parseFloat(price3.toString()) + parseFloat((parseFloat(project[i].count.toString()) * parseFloat(project[i].price.toString()).toFixed(2)).toString())
-              }
-            }
-
-
-            for (let i = 0; i < advice.length; i++) {
-              price2 = parseFloat(price2.toString()) + parseFloat((parseFloat(advice[i].count.toString()) * parseFloat(advice[i].price.toString()).toFixed(2)).toString())
-            }
-
-
-            switch (parseInt(this.item_type)) {
-              case 0:
-
-                obj['sum'] = price + price2 + price3
-                obj['price'] = price
-                obj['item_name'] = '项目'
-                obj['name'] = tempPatientsTwo[d].name
-                obj['patient_id'] = tempPatientsTwo[d].patient_id
-                this.tableData.push(obj)
-
-                obj2['sum'] = 0
-                obj2['price'] = price2
-                obj2['item_name'] = '药品'
-                obj2['name'] = tempPatientsTwo[d].name
-                obj2['patient_id'] = tempPatientsTwo[d].patient_id
-                this.tableData.push(obj2)
-
-                obj3['sum'] = 0
-                obj3['price'] = price3
-                obj3['item_name'] = '耗材'
-                obj3['name'] = tempPatientsTwo[d].name
-                obj3['patient_id'] = tempPatientsTwo[d].patient_id
-                this.tableData.push(obj3)
-                break
-              case 1:
-                obj2['sum'] = price2
-                obj2['price'] = price2
-                obj2['item_name'] = '药品'
-                obj2['name'] = tempPatientsTwo[d].name
-                obj2['patient_id'] = tempPatientsTwo[d].patient_id
-                this.tableData.push(obj2)
-                break
-              case 2:
-
-                obj['sum'] = price
-                obj['price'] = price
-                obj['item_name'] = '项目'
-                obj['name'] = tempPatientsTwo[d].name
-                obj['patient_id'] = tempPatientsTwo[d].patient_id
-                this.tableData.push(obj)
-                break
-              case 3:
-                obj3['sum'] = price3
-                obj3['price'] = price3
-                obj3['item_name'] = '耗材'
-                obj3['name'] = tempPatientsTwo[d].name
-                obj3['patient_id'] = tempPatientsTwo[d].patient_id
-                this.tableData.push(obj3)
-                break
-              case 4:
-
-                obj['sum'] = price
-                obj['price'] = price
-                obj['item_name'] = '检验'
-                obj['name'] = tempPatientsTwo[d].name
-                obj['patient_id'] = tempPatientsTwo[d].patient_id
-                this.tableData.push(obj)
-                break
-              case 5:
-
-                obj['sum'] = price
-                obj['price'] = price
-                obj['item_name'] = '治疗'
-                obj['name'] = tempPatientsTwo[d].name
-                obj['patient_id'] = tempPatientsTwo[d].patient_id
-                this.tableData.push(obj)
-                break
-              case 6:
-
-                obj['sum'] = price
-                obj['price'] = price
-                obj['item_name'] = '护理'
-                obj['name'] = tempPatientsTwo[d].name
-                obj['patient_id'] = tempPatientsTwo[d].patient_id
-                this.tableData.push(obj)
-                break
-              case 7:
-
-                obj['sum'] = price
-                obj['price'] = price
-                obj['item_name'] = '其他'
-                obj['name'] = tempPatientsTwo[d].name
-                obj['patient_id'] = tempPatientsTwo[d].patient_id
-                this.tableData.push(obj)
-                break
-
-            }
-
-
-
-          }
-
-          this.handleSpanTempArr()
-          // this.tableData = tempPatientsTwo
-
-          // console.log(tempPatientsTwo.length)
-          //
+          this.setMonthPrescription(tempData)
 
         }
-        //
-        // console.log('去重前')
-        // console.log(advice)
-        // console.log(project)
-        // //
-        // //
-
-        // //
-        // console.log('去重后')
-        //
-        // console.log(advice.length)
-        // console.log(project.length)
-        //
-        // for (let i = 0; i < project.length; i++) {
-        //   let obj = {}
-        //   let count = 0
-        //   for (let a = 0; a < tempPatientsTwo.length; a++) {
-        //     if (project[i].patient_id == tempPatientsTwo[a].patient_id && project[i].item_id == tempPatientsTwo[a].item_id && project[i].price == tempPatientsTwo[a].price) {
-        //       count = count + tempPatientsTwo[a].count
-        //       obj['count'] = count
-        //
-        //     }
-        //     obj['price'] = project[i].price
-        //     obj['type'] = project[i].type
-        //     obj['item_name'] = project[i].item_name
-        //     obj['item_id'] = project[i].item_id
-        //     obj['name'] = project[i].name
-        //     obj['patient_id'] = project[i].patient_id
-        //     obj['count'] = count
-        //     this.tableData.push(obj)
-        //   }
-        // }
-        //
-        //
-        // for (let i = 0; i < advice.length; i++) {
-        //   let obj = {}
-        //   let count = 0
-        //   for (let a = 0; a < tempPatientsTwo.length; a++) {
-        //     if (advice[i].patient_id == tempPatientsTwo[a].patient_id && advice[i].item_id == tempPatientsTwo[a].item_id && advice[i].price == tempPatientsTwo[a].price) {
-        //       count = count + tempPatientsTwo[a].count
-        //       obj['count'] = count
-        //
-        //     }
-        //     obj['price'] = advice[i].price
-        //     obj['type'] = advice[i].type
-        //     obj['item_name'] = advice[i].item_name
-        //     obj['item_id'] = advice[i].item_id
-        //     obj['name'] = advice[i].name
-        //     obj['patient_id'] = advice[i].patient_id
-        //     this.tableData.push(obj)
-        //   }
-        // }
-        // console.log(this.tableData.length)
-        // this.tableData = this.sort(this.tableData)
 
       })
     }, uniqueProjectAndAdvice(array) {
@@ -517,7 +339,7 @@ export default {
         }
         console.log(data)
         const values = data.map(item => Number(item[column.property]))
-        if (column.property === 'sum') {
+        if (column.property === 'settle' || column.property === 'un_settle') {
           sums[index] = values.reduce((prev, curr) => {
             const value = Number(curr)
             if (!isNaN(value)) {
@@ -538,17 +360,17 @@ export default {
       let list = []
       for (let i = 0; i < this.tableData.length; i++) {
         let order = this.tableData[i]
-        let name = order.name
-        let item_name = order.item_name
-        let pay_sumamt = order.price.toFixed(2)
-        let total = order.sum.toFixed(2)
+        // let name = order.name
+        // let item_name = order.item_name
+        // let pay_sumamt = order.price.toFixed(2)
+        // let total = order.sum.toFixed(2)
 
 
         let obj = {
-          '患者姓名': name,
-          '项目类别': item_name,
-          '费用': pay_sumamt,
-          '费用总额':total,
+          '患者姓名': "",
+          '项目类别': "",
+          '费用': "",
+          '费用总额':"",
         }
         list.push(obj)
       }
@@ -566,9 +388,186 @@ export default {
 
     }, formatJson(filterVal, jsonData) {
       return jsonData.map(v => filterVal.map(j => v[j]))
-    }
+
+    }, setMonthPrescription(prescriptions) {
+
+      for (let a = 0; a < prescriptions.length; a++) {
+        if(prescriptions[a].order_status == 4){
+          prescriptions[a].order_status = 1
+        }
+      }
+
+        var advices = []
+      var projects = []
+      var goods = []
+      var ad_ids = []
+      var pro_ids = []
+      var gd_ids = []
+
+
+      for (let a = 0; a < prescriptions.length; a++) {
+        if(prescriptions[a].p_type == 1){
+          advices.push(prescriptions[a])
+          let obj = {
+            item_id:prescriptions[a].item_id,
+            price:prescriptions[a].pric,
+            med_type:prescriptions[a].med_type,
+            order_status:prescriptions[a].order_status,
+
+          }
+          ad_ids.push(obj)
+        }
+
+        if(prescriptions[a].p_type == 2){
+          projects.push(prescriptions[a])
+          let obj = {
+            item_id:prescriptions[a].item_id,
+            price:prescriptions[a].pric,
+            med_type:prescriptions[a].med_type,
+            order_status:prescriptions[a].order_status,
+
+          }
+          pro_ids.push(obj)
+
+        }
+
+        if(prescriptions[a].p_type == 3){
+          goods.push(prescriptions[a])
+          let obj = {
+            item_id:prescriptions[a].item_id,
+            price:prescriptions[a].pric,
+            med_type:prescriptions[a].med_type,
+            order_status:prescriptions[a].order_status,
+
+
+          }
+          gd_ids.push(obj)
+        }
+      }
+
+      let drug_ids = this.unique_two(ad_ids)
+      let project_ids = this.unique_two(pro_ids)
+      let goods_ids = this.unique_two(gd_ids)
+
+      for (let i = 0; i < drug_ids.length; i++) {
+          let obj = {}
+          let count = 0
+          let total_settle = 0
+          let total_un_settle = 0
+
+          for (let a = 0; a < prescriptions.length; a++) {
+            if (drug_ids[i].price == prescriptions[a].pric && drug_ids[i].item_id == prescriptions[a].item_id &&drug_ids[i].med_type == prescriptions[a].med_type &&drug_ids[i].order_status == prescriptions[a].order_status) {
+              obj['item_cost_type'] = prescriptions[a].item_cost_type
+              obj['unit'] = prescriptions[a].unit
+              obj['med_type'] =  prescriptions[a].med_type
+              obj['type'] =  prescriptions[a].p_type
+
+              obj['item_name'] =prescriptions[a].item_name
+              obj['spec'] = prescriptions[a].spec
+              obj['unit'] = prescriptions[a].unit
+              obj['price'] = prescriptions[a].pric
+              count = count + prescriptions[a].cnt
+              if(prescriptions[a].order_status == 2){
+                total_settle = total_settle + (prescriptions[a].pric * prescriptions[a].cnt)
+              }else{
+                total_un_settle = total_un_settle + (prescriptions[a].pric * prescriptions[a].cnt)
+              }
+            }
+          }
+          obj['count'] = count
+          obj['total_settle'] = total_settle
+          obj['total_un_settle'] = total_un_settle
+          this.tableData.push(obj)
+        }
+
+      for (let i = 0; i < project_ids.length; i++) {
+        let obj = {}
+        let count = 0
+        let total_settle = 0
+        let total_un_settle = 0
+
+        for (let a = 0; a < prescriptions.length; a++) {
+          if (project_ids[i].price == prescriptions[a].pric && project_ids[i].item_id == prescriptions[a].item_id &&project_ids[i].med_type == prescriptions[a].med_type&&project_ids[i].order_status == prescriptions[a].order_status) {
+            obj['item_cost_type'] = prescriptions[a].item_cost_type
+            obj['unit'] = prescriptions[a].unit
+            obj['med_type'] =  prescriptions[a].med_type
+            obj['type'] =  prescriptions[a].p_type
+
+
+            obj['item_name'] =prescriptions[a].item_name
+            obj['spec'] = prescriptions[a].spec
+            obj['unit'] = prescriptions[a].unit
+            obj['price'] = prescriptions[a].pric
+            count = count + prescriptions[a].cnt
+            if(prescriptions[a].order_status == 2){
+              total_settle = total_settle + (prescriptions[a].pric * prescriptions[a].cnt)
+            }else{
+              total_un_settle = total_un_settle + (prescriptions[a].pric * prescriptions[a].cnt)
+            }
+          }
+        }
+        obj['count'] = count
+        obj['total_settle'] = total_settle
+        obj['total_un_settle'] = total_un_settle
+        this.tableData.push(obj)
+      }
+
+      for (let i = 0; i < goods_ids.length; i++) {
+        let obj = {}
+        let count = 0
+        let total_settle = 0
+        let total_un_settle = 0
+
+        for (let a = 0; a < prescriptions.length; a++) {
+          if (goods_ids[i].price == prescriptions[a].pric && goods_ids[i].item_id == prescriptions[a].item_id &&goods_ids[i].med_type == prescriptions[a].med_type&&goods_ids[i].order_status == prescriptions[a].order_status) {
+            obj['item_cost_type'] = prescriptions[a].item_cost_type
+            obj['unit'] = prescriptions[a].unit
+            obj['med_type'] =  prescriptions[a].med_type
+            obj['type'] =  prescriptions[a].p_type
+
+            obj['item_name'] =prescriptions[a].item_name
+            obj['spec'] = prescriptions[a].spec
+            obj['unit'] = prescriptions[a].unit
+            obj['price'] = prescriptions[a].pric
+            count = count + prescriptions[a].cnt
+            if(prescriptions[a].order_status == 2){
+              total_settle = total_settle + (prescriptions[a].pric * prescriptions[a].cnt)
+            }else{
+              total_un_settle = total_un_settle + (prescriptions[a].pric * prescriptions[a].cnt)
+            }
+          }
+        }
+        obj['count'] = count
+        obj['total_settle'] = total_settle
+        obj['total_un_settle'] = total_un_settle
+        this.tableData.push(obj)
+      }
+
+
+
+
+
+
+    },  unique_two(array) {
+      // res用来存储结果
+      var res = []
+      for (var i = 0, arrayLen = array.length; i < arrayLen; i++) {
+        for (var j = 0, resLen = res.length; j < resLen; j++) {
+          if (array[i].item_id === res[j].item_id && array[i].price === res[j].price && array[i].med_type === res[j].med_type && array[i].order_status === res[j].order_status) {
+            break
+          }
+        }
+        // 如果array[i]是唯一的，那么执行完循环，j等于resLen
+        if (j === resLen) {
+          res.push(array[i])
+        }
+      }
+      return res
+    },
   },
   created() {
+    this.getInit()
+
     this.getSummaryDetailList()
 
   }

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -896,11 +896,19 @@ export default {
           this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
         }else if(this.orgId == 10485){
           this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
+        }else if(this.orgId ==10138){
+          this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
+        }else if(this.orgId == 10278){
+          this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
+        }else if(this.orgId == 10610){
+          this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
+        }else if(this.orgId==10537){
+          this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
         }else{
           this.tableOut[i].total_price = (this.getStockCount(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
         }
 
-        if(this.orgId  == 10265 || this.orgId ==10215 || this.orgId == 9919 || this.orgId == 9671 || this.orgId == 10402){
+        if(this.orgId  == 10265 || this.orgId ==10215 || this.orgId == 9919 || this.orgId == 9671 || this.orgId == 10402 || this.orgId==10138 || this.orgId==10278||this.orgId==10537||this.orgId==10610||this.orgId==0){
 
          this.tableOut[i].out_count = this.getMySelfCount(this.tableOut[i].good_id)
         }
@@ -908,7 +916,7 @@ export default {
           this.tableOut[i].out_count = this.getWarehouseOut(this.tableOut[i].good_id)
          
         }
-        if(this.orgId!=10265 && this.orgId !=10215  && this.orgId != 9671 &&this.orgId!=10210&&this.orgId!=9675 && this.orgId!=9956&& this.orgId!=10217 && this.orgId!=10188 && this.orgId!=10191 && this.orgId!=9919 && this.orgId!=0&& this.orgId!=10402 && this.orgId != 10489 && this.orgId!=10375 && this.orgId!=10485){
+        if(this.orgId!=10265 && this.orgId !=10215  && this.orgId != 9671 &&this.orgId!=10210&&this.orgId!=9675 && this.orgId!=9956&& this.orgId!=10217 && this.orgId!=10188 && this.orgId!=10191 && this.orgId!=9919 && this.orgId!=0&& this.orgId!=10402 && this.orgId != 10489 && this.orgId!=10375 && this.orgId!=10485&&this.orgId!=0&&this.orgId!=10138&&this.orgId!=10278&&this.orgId!=10537&&this.orgId!=10610&&this.orgId==0){
           this.tableOut[i].out_count = this.getStockCount(this.tableOut[i].good_id)
         }
         this.tableOut[i].manufacturer_name = this.getManufacturerNameOne(this.tableOut[i].manufacturer)

src/xt_pages/stock/selfPreparedMedicine/addWarehouseOut.vue

@@ -27,14 +27,7 @@
         </div>
       </div>
       <div class="app-container" v-loading="loading">
-        <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 style="color: red">*</span>患者</span>
@@ -358,7 +351,7 @@
   import BreadCrumb from "../../components/bread-crumb";
   import { getDataConfig, getDictionaryDataConfig } from "@/utils/data";
   import { getAllDrugList, postSearchDrugList } from "@/api/data";
-    import { getallPatientList,postSearchSelfDrugList,postSelfDrugOutInfoWarehouse} from "@/api/drug/drug"
+    import { getallPatientList,postSearchSelfDrugList,postSelfDrugWarehouseOut,getSelfDrugBatchNumber} from "@/api/drug/drug"
   export default {
     components: { BreadCrumb },
     name: "stockIn",
@@ -766,126 +759,140 @@
         this.$router.go(-1);
       },
       submit() {
-        this.$refs["tableForm"].validate((valid) => {
-          if (valid) {
-            this.loading = true;
-            const array = this.recordInfo.recordData;
-            if (this.patient_id == 0) {
-              this.$message.error("患者不能为空!");
-              this.loading = false;
-              return false;
+      this.$refs["tableForm"].validate((valid) => {
+        if (valid) {
+          const array = this.recordInfo.recordData;
+          let total = 0;
+          for (let i = 0; i < array.length; i++) {
+            if (array[i].drug_id == 0) {
+              this.$message.error("药品名称或者药品规格名称不能为空");
+              return;
             }
+            total = total + array[i].price * array[i].return_count;
+          }
+          if (this.patient_id == 0) {
+            this.$message.error("患者不能为空!");
+            return false;
+          }
+          if (this.recordInfo.recordData.length <= 0) {
+            this.$message.success("请添加出库商品");
+            return;
+          }
+          for (let i = 0; i < this.recordInfo.recordData.length; i++) {
+            this.recordInfo.recordData[i].total_price = 0
+            this.recordInfo.recordData[i].price = 0
 
-            for (let i = 0; i < array.length; i++) {
-              if (array[i].drug_id == 0) {
-                this.$message.error("药品名称或者药品规格名称不能为空");
-                this.loading = false;
-                return;
+            for (let j = 0; j < this.manufacturerList.length; j++) {
+              if (this.recordInfo.recordData[i].manufacturer ==  this.manufacturerList[j].manufacturer_name) {
+                this.recordInfo.recordData[i].manufacturer = this.manufacturerList[j].id;
               }
             }
-  
-            if (this.recordInfo.recordData.length <= 0) {
-              this.$message.success("请添加入库商品");
-              this.loading = false;
-              return;
-            }
-  
-            for (let i = 0; i < this.recordInfo.recordData.length; i++) {
-              if (this.recordInfo.recordData[i].dealer == "") {
+            if (this.recordInfo.recordData[i].dealer == "") {
                 this.recordInfo.recordData[i].dealer = 0;
+            }
+            for (let z = 0; z < this.dealerList.length; z++) {
+              if (this.recordInfo.recordData[i].dealer ==this.dealerList[z].dealer_name) {
+                this.recordInfo.recordData[i].dealer = this.dealerList[z].id;
               }
-              this.recordInfo.recordData[i].last_price =
-                this.recordInfo.recordData[i].last_price.toString();
-              this.recordInfo.recordData[i].retail_price =
-                this.recordInfo.recordData[i].retail_price.toString();
-              if (this.recordInfo.recordData[i].dealer == "") {
-                this.recordInfo.recordData[i].dealer = 0;
+            }
+
+            for (let y = 0; y < this.numberList.length; y++) {
+              if (this.recordInfo.recordData[i].batch_number ==this.numberList[y].id) {
+                this.recordInfo.recordData[i].batch_number = this.numberList[y].batch_number;
+                this.recordInfo.recordData[i].warehouse_info_id = this.numberList[y].id;
               }
-              for (let j = 0; j < this.manufacturerList.length; j++) {
-                if (
-                  this.recordInfo.recordData[i].manufacturer ==
-                  this.manufacturerList[j].manufacturer_name
-                ) {
-                  this.recordInfo.recordData[i].manufacturer =
-                    this.manufacturerList[j].id;
+            }
+            // for (let s = 0; s < this.doctorList.length; s++) {
+            //   if (this.recordInfo.recordData[i].admin_user_id == this.doctorList[s].user_name) {
+            //      this.recordInfo.recordData[i].admin_user_id = this.doctorList[s].admin_user_id;
+            //   }
+            // }
+
+            this.recordInfo.recordData[i].last_price = 0
+            this.recordInfo.recordData[i].stock_count = this.recordInfo.recordData[i].stock_count.toString();
+          }
+          const params = {
+            stockOut: this.recordInfo.recordData,
+          };
+          console.log("param22222222",params)
+          const loading = this.$loading({
+            lock: true,
+            text: "Loading",
+            spinner: "el-icon-loading",
+            background: "rgba(0, 0, 0, 0.7)",
+          });
+          postSelfDrugWarehouseOut(
+            params,
+            this.warehouse_out_time,
+            this.form.dealer,
+            this.form.manufacturer,
+            this.type,
+            this.patient_id,
+            this.warehouse_out_id,
+          ).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;
+              var dose = response.data.data.dose;
+              var dose_unit = response.data.data.dose_unit;
+              var min_number = response.data.data.min_number;
+              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;
+              var warehousingOutInfo = response.data.data.warehousingOutInfo
+              var warehouseOut = response.data.data.warehouseOut
+              this.warehouse_out_id = warehouseOut.id
+              var dealerList = response.data.data.dealerList
+              var manufacturerList = response.data.data.manufacturerList
+              var drugTypeList = response.data.data.drugTypeList
+              for(let i=0;i<warehousingOutInfo.length;i++){
+                for(let j=0;j<dealerList.length;j++){
+                   if(warehousingOutInfo[i].dealer == dealerList[j].id){
+                      warehousingOutInfo[i].dealer = dealerList[j].dealer_name
+                   }   
                 }
-              }
-  
-              for (let z = 0; z < this.dealerList.length; z++) {
-                if (
-                  this.recordInfo.recordData[i].dealer ==
-                  this.dealerList[z].dealer_name
-                ) {
-                  this.recordInfo.recordData[i].dealer = this.dealerList[z].id;
+
+                for(let z=0;z<manufacturerList.length;z++){
+                  if(warehousingOutInfo[i].manufacturer == manufacturerList[z].id){
+                     warehousingOutInfo[i].manufacturer = manufacturerList[z].manufacturer_name
+                  }
+                }
+                warehousingOutInfo[i].drug_name = warehousingOutInfo[i].drug.drug_name
+                warehousingOutInfo[i].name = warehousingOutInfo[i].drug.dose + warehousingOutInfo[i].drug.dose_unit +"*"+warehousingOutInfo[i].drug.min_number +warehousingOutInfo[i].drug.min_unit+"/"+warehousingOutInfo[i].drug.max_unit
+                warehousingOutInfo[i].product_date = this.getTimeOne(warehousingOutInfo[i].product_date)
+                warehousingOutInfo[i].expiry_date =  this.getTimeOne(warehousingOutInfo[i].expiry_date)
+                warehousingOutInfo[i].last_price = warehousingOutInfo[i].price
+                warehousingOutInfo[i].max_unit = warehousingOutInfo[i].count_unit
+                warehousingOutInfo[i].count = warehousingOutInfo[i].count.toString()
+                warehousingOutInfo[i].patient_id = warehousingOutInfo[i].patient_id
+                for(let z=0;z<drugTypeList.length;z++){
+                   if(warehousingOutInfo[i].drug.drug_type == drugTypeList[z].value){
+                      warehousingOutInfo[i].drug_type = drugTypeList[z].name
+                   }
                 }
               }
-            }
-            const params = {
-              stockIn: this.recordInfo.recordData,
-            };
-  
-            postSelfDrugOutInfoWarehouse(
-              params,
-              this.warehousing_time,
-              this.patient_id,
-              this.warehouse_out_id,
-            ).then((response) => {
-              if (response.data.state == 0) {
-                this.loading = false;
-                this.$message.error(response.data.msg);
-                return false;
+              if (msg == 1) {
+                this.$message.error(str + "库存不足");
               } else {
-                this.loading = false;
+                loading.close();
                 this.$message.success("保存成功");
-                this.listLoading = false;
-                var info = response.data.data.info
-                this.warehousing_id = info.id
-                var list = response.data.data.list
-                var manufacturerList = response.data.data.manufacturerList
-                var dealerList = response.data.data.dealerList
-                var drugTypeList = response.data.data.drugTypeList
-                for(let i=0;i<list.length;i++){
-                  for(let j=0;j<manufacturerList.length;j++){
-                     if(list[i].manufacturer_id == manufacturerList[j].id){
-                        list[i].manufacturer_id = manufacturerList[j].manufacturer_name
-                     }
-                  }
-                  for(let s=0;s<dealerList.length;s++){
-                    if(list[i].dealer_id == dealerList[s].id){
-                       list[i].dealer_id = dealerList[s].manufacturer_name
-                    }
-                  }
-  
-                  list[i].expiry_date = this.getTimeOne(list[i].expiry_date)
-                  list[i].product_date = this.getTimeOne(list[i].product_date)
-                  list[i].drug_name = list[i].drug.drug_name
-                  list[i].name = list[i].drug.dose + list[i].drug.dose_unit +"*"+list[i].drug.min_number +list[i].drug.min_unit+"/"+list[i].drug.max_unit
-                  for(let z=0;z<drugTypeList.length;z++){
-                     if(list[i].drug.drug_type == drugTypeList[z].value){
-                        list[i].drug_type = drugTypeList[z].name
-                     }
-                  }
-                  list[i].last_price = list[i].price
-                  list[i].warehousing_count = list[i].warehousing_count.toString()
-                  list[i].unitList = []
-                  var obj = {id:1,name:""}
-                  obj.name = list[i].drug.max_unit
-                  var objOne = {id:2,name:""}
-                  objOne.name = list[i].drug.min_unit
-                  list[i].unitList.push(obj)
-                  list[i].unitList.push(objOne)
-                }
-                this.recordInfo.recordData = []
-                this.recordInfo.recordData = list
+                this.recordInfo.recordData = [];
+                this.recordInfo.recordData = warehousingOutInfo
                 this.showCheck = true
-                this.showReturnCheck = false
-                // this.$router.back(-1);
+               
               }
-            });
-          } else {
-            return false;
-          }
-        });
+            }
+          });
+        } else {
+          return false;
+        }
+       });
       },
       changeManufacturer(val) {},
       changeDealer(val) {
@@ -970,6 +977,8 @@
         this.currentIndex = val;
       },
       handleSelect(val) {
+
+        
         var arr = [];
 
         for (let i = 0; i < this.recordInfo.recordData.length; i++) {
@@ -987,8 +996,7 @@
         var total_count = 0;
         for (let i = 0; i < val.drug_warehouse_info.length; i++) {
           if (val.max_unit == val.drug_warehouse_info[i].max_unit) {
-            val.drug_warehouse_info[i].stock_max_number =
-              val.drug_warehouse_info[i].stock_max_number * val.min_number;
+             val.drug_warehouse_info[i].stock_max_number = val.drug_warehouse_info[i].stock_max_number * val.min_number;
           }
         }
 
@@ -1057,7 +1065,20 @@
           }
         }
       },
-        querySearchAsync(keyword, cb) {
+      getDrugBatchNumber(id) {
+        var params = {
+          id: id,
+        };
+        getSelfDrugBatchNumber(params).then((response) => {
+          if (response.data.state == 1) {
+            var list = response.data.data.list;
+
+            this.numberList = [];
+            this.numberList = list;
+          }
+        });
+       },
+      querySearchAsync(keyword, cb) {
           let key = "";
           if (keyword != undefined) {
             key = keyword;
@@ -1099,7 +1120,41 @@
             }
           });
       },
-  
+      getWarehoseInfo(arr, max_unit, min_unit, min_number) {
+        var total = 0;
+        var max_str = "";
+        var min_str = "";
+        if (arr.length > 0) {
+          for (let i = 0; i < arr.length; i++) {
+            total += parseInt(arr[i].stock_max_number + arr[i].stock_min_number);
+          }
+        }
+        if (total < min_number) {
+          min_str = total + min_unit;
+        }
+        if (total == 0) {
+          min_str = "";
+          max_str = "";
+        }
+        if (total >= min_number) {
+          if (parseInt(total / min_number) != 0) {
+            max_str = parseInt(total / min_number) + max_unit;
+          }
+          if (total % min_number != 0) {
+            min_str = (total % min_number) + min_unit;
+          }
+        }
+        return max_str + min_str;
+      },
+      getWarehoseInfoTwo(arr) {
+        var total = 0;
+        if (arr.length > 0) {
+          for (let i = 0; i < arr.length; i++) {
+            total += parseInt(arr[i].stock_max_number + arr[i].stock_min_number);
+          }
+        }
+        return total;
+      },
     
     
     },