518合并代码

src/xt_pages/outpatientTool/components/detailStatistics.vue

@@ -181,7 +181,7 @@ export default {
         type: this.item_type,
         keyword: this.keywords
       }
-     console.log("patient_id 233232323232323",this.patient_id)
+    //  console.log("patient_id 233232323232323",this.patient_id)
      getHisSummaryDetailList(params).then(response=>{
        if(response.data.state == 1){
           var list =  response.data.data.list
@@ -205,7 +205,7 @@ export default {
             obj.total_price += (this.tableData[i].cnt * this.tableData[i].pric)  
           }
           obj.total_price = (obj.total_price).toFixed(2)
-          console.log("tabledate23232332233223",this.tableData)
+          // console.log("tabledate23232332233223",this.tableData)
           this.tableData.push(obj)
           var new_arr = []
        
@@ -249,7 +249,7 @@ export default {
       return total_price
     },
     getActPay(){
-      console.log("hh23h323223323",this.list)
+      // console.log("hh23h323223323",this.list)
       var act_pay = 0
       for(let i=0;i<this.list.length;i++){
         for(let j=0;j<this.list[i].orders.length;j++){

src/xt_pages/outpatientTool/components/gatherStatistics.vue

@@ -47,7 +47,6 @@
     </div>
     <el-table :data="list" border :row-style="{ color: '#303133' }" ref="table"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
-              show-summary
               max-height="600"
               v-loading="detail_loading"
               highlight-current-row>
@@ -212,7 +211,12 @@ export default {
                 this.list = []
                 this.list =  this.list.concat(obj.details)
                 for(let i=0;i<this.list.length;i++){
-                  this.list[i].index = i
+                  if(this.list[i].is_total == 1){
+                     this.list[i].index = "合计"
+                  }else{
+                    this.list[i].index = i+1
+                  }
+                 
                 }
               }
               let newobj = {}
@@ -221,21 +225,52 @@ export default {
               this.list = []
               this.list.push(newobj)
               var new_arr = []
-              if(this.keywords!=""){
-                   let newobj = {}
-                   newobj['total'] = this.order.medfee_sumamt
-                   newobj['is_total'] = 1
-                   this.list.push(newobj)
-                   this.list =  this.list.concat(obj.details)
-                   for(let i=0;i<this.list.length;i++){
-                     if(this.list[i].is_total ==2){
-                        if(this.list[i].name.indexOf(this.keywords)>-1){
-                        new_arr.push(this.list[i])
+               if(this.keywords!=""){
+                 for(let i=0;i<this.list.length;i++){
+                   if(this.list[i].is_total == 2){
+                      if(this.list[i].name.indexOf(this.keywords)>-1){
+                           new_arr.push(this.list[i])
                        }
                      }
+                   
+                  }
+                  var new_arr_two = []
+                 
+                  for(let i=0;i<tempDetails.length;i++){
+                    if(tempDetails[i].advice_id >0){
+                       tempDetails[i].name = tempDetails[i].advice.advice_name
+                    }
+                    if(tempDetails[i].project_id > 0){
+                       if(tempDetails[i].type == 2 ){
+                         tempDetails[i].name = tempDetails[i].project.project_name
+                       }
+                       if(tempDetails[i].type == 3){
+                         tempDetails[i].name = tempDetails[i].good_info.good_name
+                       }
+                    }
+                    if(tempDetails[i].name.indexOf(this.keywords) > -1){
+                       new_arr_two.push(tempDetails[i])
+                    }
                   }
-                  this.list = []
-                  this.list = new_arr
+                   this.list = []
+                
+                   this.list = new_arr
+                    obj.details = []
+                    obj.details = this.setNewData(new_arr_two)
+
+                    obj.total = this.getTotal(obj.details)
+                    obj.details.push({
+                      total: obj.total,
+                      is_total: 1,
+                    })
+                    for(let i=0;i<obj.details.length;i++){
+                       if(obj.details[i].is_total == 1){
+                          obj.details[i].index = "合计"
+                       }else{
+                         obj.details[i].index = i+1
+                       }
+                    }
+                    this.list = obj.details
                 }
             }else{
               //获取所有项目类型进行去重
@@ -273,17 +308,16 @@ export default {
                 this.list = []
                 this.list =  this.list.concat(obj.details)
                 for(let i=0;i<this.list.length;i++){
-                  this.list[i].index = i+1
+                  if(this.list[i].is_total == 1){
+                     this.list[i].index = "合计"
+                  }else{
+                    this.list[i].index = i+1
+                  }
+                 
                 }
                 var new_arr = []
                 if(this.keywords!=""){
-                    obj.details.push({
-                      total: obj.total,
-                      is_total: 1,
-                    })
-                  
-                   this.list =  this.list.concat(obj.details)
-                   console.log("list233232232332323223",this.list)
+       
                    for(let i=0;i<this.list.length;i++){
                      if(this.list[i].is_total == 2){
                         if(this.list[i].name.indexOf(this.keywords)>-1){
@@ -292,8 +326,44 @@ export default {
                      }
                    
                   }
-                  this.list = []
-                  this.list = new_arr
+                  var new_arr_two = []
+                  for(let i=0;i<tempDetails.length;i++){
+                    if(tempDetails[i].advice_id >0){
+                       tempDetails[i].name = tempDetails[i].advice.advice_name
+                    }
+                    if(tempDetails[i].project_id > 0){
+                       if(tempDetails[i].type == 2 ){
+                         tempDetails[i].name = tempDetails[i].project.project_name
+                       }
+                       if(tempDetails[i].type == 3){
+                         tempDetails[i].name = tempDetails[i].good_info.good_name
+                       }
+                    }
+                    if(tempDetails[i].name.indexOf(this.keywords) > -1){
+                       new_arr_two.push(tempDetails[i])
+                    }
+                  }
+                   this.list = []
+                
+                   
+                   this.list = new_arr
+                    obj.details = []
+                    obj.details = this.setNewData(new_arr_two)
+
+                    obj.total = this.getTotal(obj.details)
+                    obj.details.push({
+                      total: obj.total,
+                      is_total: 1,
+                    })
+                    for(let i=0;i<obj.details.length;i++){
+                       if(obj.details[i].is_total == 1){
+                          obj.details[i].index = "合计"
+                       }else{
+                         obj.details[i].index = i+1
+                       }
+                    }
+                    console.log("obj23323232323232323232",obj.details)
+                    this.list = obj.details
                 }
              }
           }

src/xt_pages/outpatientTool/gatherPrint.vue

@@ -185,6 +185,66 @@
               newobj['is_total'] = 1
               
               this.list.push(newobj)
+
+              var new_arr = []
+              if(this.$route.query.keyword!=""){
+       
+                   for(let i=0;i<this.list.length;i++){
+                     if(this.list[i].is_total == 2){
+                        if(this.list[i].name.indexOf(this.$route.query.keyword)>-1){
+                           new_arr.push(this.list[i])
+                       }
+                     }
+                   
+                  }
+                  var new_arr_two = []
+                  for(let i=0;i<tempDetails.length;i++){
+                    if(tempDetails[i].advice_id >0){
+                       tempDetails[i].name = tempDetails[i].advice.advice_name
+                    }
+                    if(tempDetails[i].project_id > 0){
+                       if(tempDetails[i].type == 2 ){
+                         tempDetails[i].name = tempDetails[i].project.project_name
+                       }
+                       if(tempDetails[i].type == 3){
+                         tempDetails[i].name = tempDetails[i].good_info.good_name
+                       }
+                    }
+                    if(tempDetails[i].name.indexOf(this.$route.query.keyword) > -1){
+                       new_arr_two.push(tempDetails[i])
+                    }
+                  }
+                   this.list = []
+                
+                   
+                   this.list = new_arr
+                    obj.details = []
+                    obj.details = this.setNewData(new_arr_two)
+
+                    obj.total = this.getTotal(obj.details)
+                    obj.details.push({
+                      total: obj.total,
+                      is_total: 1,
+                    })
+                    for(let i=0;i<obj.details.length;i++){
+                       if(obj.details[i].is_total == 1){
+                          obj.details[i].index = "合计"
+                       }else{
+                         obj.details[i].index = i+1
+                       }
+                    }
+                 
+                    this.list = obj.details
+                    this.chineseTraditionalMedicineCostTotal = response.data.data.chineseTraditionalMedicineCostTotal
+                    this.checkCostTotal = response.data.data.checkCostTotal
+                    this.materialCostTotal = response.data.data.materialCostTotal
+                    this.laboratoryCostTotal = response.data.data.laboratoryCostTotal
+                    this.bedCostTotal = response.data.data.bedCostTotal
+                    this.operationCostTotal = response.data.data.operationCostTotal
+                    this.zhenChaCostTotal = response.data.data.zhenChaCostTotal
+                    this.otherCostTotal = response.data.data.otherCostTotal
+
+                }
             }else{
               //获取所有项目类型进行去重
               let med_chrgitm_types = []
@@ -219,18 +279,70 @@
                 })
                
                 this.list =  this.list.concat(obj.details)
-                console.log("oh2323232323233223232323233",this.list)
+              
                 for(let i=0;i<this.list.length;i++){
                   this.list[i].index = i+1
                 }
-                 this.chineseTraditionalMedicineCostTotal = response.data.data.chineseTraditionalMedicineCostTotal
-                  this.checkCostTotal = response.data.data.checkCostTotal
-                  this.materialCostTotal = response.data.data.materialCostTotal
-                  this.laboratoryCostTotal = response.data.data.laboratoryCostTotal
-                  this.bedCostTotal = response.data.data.bedCostTotal
-                  this.operationCostTotal = response.data.data.operationCostTotal
-                  this.zhenChaCostTotal = response.data.data.zhenChaCostTotal
-                  this.otherCostTotal = response.data.data.otherCostTotal
+              var new_arr = []
+              if(this.$route.query.keyword!=""){
+                console.log("锦鲤3332232332233223322332",this.list)
+                for(let i=0;i<this.list.length;i++){
+                     if(this.list[i].is_total == 2){
+                        if(this.list[i].name.indexOf(this.$route.query.keyword)>-1){
+                           new_arr.push(this.list[i])
+                       }
+                     }
+                   
+                  }
+                  var new_arr_two = []
+                  for(let i=0;i<tempDetails.length;i++){
+                    if(tempDetails[i].advice_id >0){
+                       tempDetails[i].name = tempDetails[i].advice.advice_name
+                    }
+                    if(tempDetails[i].project_id > 0){
+                       if(tempDetails[i].type == 2 ){
+                         tempDetails[i].name = tempDetails[i].project.project_name
+                       }
+                       if(tempDetails[i].type == 3){
+                         tempDetails[i].name = tempDetails[i].good_info.good_name
+                       }
+                    }
+                    if(tempDetails[i].name.indexOf(this.$route.query.keyword) > -1){
+                       new_arr_two.push(tempDetails[i])
+                    }
+                  }
+                  this.list = []
+                  console.log("new_arr2323232333333232",new_arr)
+                   
+                   this.list = new_arr
+                    obj.details = []
+                    obj.details = this.setNewData(new_arr_two)
+
+                    obj.total = this.getTotal(obj.details)
+                    obj.details.push({
+                      total: obj.total,
+                      is_total: 1,
+                    })
+                    for(let i=0;i<obj.details.length;i++){
+                       if(obj.details[i].is_total == 1){
+                          obj.details[i].index = "合计"
+                       }else{
+                         obj.details[i].index = i+1
+                       }
+                    }
+                    console.log("obj23323232323232323232",obj.details)
+                    this.list = obj.details
+              }
+                this.chineseTraditionalMedicineCostTotal = response.data.data.chineseTraditionalMedicineCostTotal
+                this.checkCostTotal = response.data.data.checkCostTotal
+                this.materialCostTotal = response.data.data.materialCostTotal
+                this.laboratoryCostTotal = response.data.data.laboratoryCostTotal
+                this.bedCostTotal = response.data.data.bedCostTotal
+                this.operationCostTotal = response.data.data.operationCostTotal
+                this.zhenChaCostTotal = response.data.data.zhenChaCostTotal
+                this.otherCostTotal = response.data.data.otherCostTotal
+
+              
              }
           }
         }

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -81,6 +81,17 @@
         <el-button size="small" icon="el-icon-delete" @click="batchDelete">删除</el-button>
         <el-button size="small" type="primary" @click="toPrint">打印</el-button>
         <el-button size="small" type="primary" @click="toExport">导出</el-button>
+
+        <span>&nbsp;&nbsp;</span>
+        <label class="title"><span class="name">出库方式</span> :</label>
+        <el-select size="small" v-model="way_type" filterable placeholder="请选择仓库" style="width:200px" @change="changeWay">
+            <el-option
+              v-for="(option, index) in wayList"
+              :key="index"
+              :label="option.name"
+              :value="option.id">
+            </el-option>
+        </el-select> 
       </div>
 
       <el-table
@@ -509,6 +520,13 @@ export default {
       storehouse_id:0,
       is_sys:0,
       org_id:0,
+      way_type:0,
+      wayList:[
+        { id:0,name:"全部"},
+        { id:1,name:"手动出库"},
+        { id:2,name:"自动出库"},
+        { id:3,name:"调拨出库"}
+      ]
     };
   },
   methods: {
@@ -521,6 +539,7 @@ export default {
         type: this.type,
         keywords: this.searchKey,
         storehouse_id:this.storehouse_id,
+        way_type:this.way_type,
       };
       this.warehouseOutDate = [];
       getDrugWarehouseOutList(Params).then(response => {
@@ -551,6 +570,7 @@ export default {
         type: this.type,
         keywords: this.searchKey,
         storehouse_id:this.storehouse_id,
+        way_type:this.way_type,
       };
       this.warehouseOutDate = [];
       getDrugWarehouseOutList(Params).then(response => {
@@ -1294,6 +1314,9 @@ export default {
     },
     changeStoreHouse(){
       this.GetWarehouseOut()
+    },
+    changeWay(){
+       this.GetWarehouseOut()
     }
   }
 };

src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue

@@ -719,7 +719,7 @@ export default {
             this.recordInfo.recordData[i].min_price = val.min_price
             this.recordInfo.recordData[i].number = val.number
             this.recordInfo.recordData[i].unit = val.max_unit
-            
+            this.recordInfo.recordData[i].retail_price = val.retail_price
             if(val.retail_price == 0){
               this.recordInfo.recordData[i].price = ""
             }else{
@@ -758,10 +758,11 @@ export default {
         this.getDrugBatchNumber(val.drug_id)
         for(let i=0;i<this.recordInfo.recordData.length;i++){
           if(this.recordInfo.recordData[i].drug_id == val.drug_id){
-             if(this.recordInfo.recordData[i].unit == val.max_unit){
-                this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].price
+             if(this.recordInfo.recordData[i].max_unit == val.max_unit){
+                this.recordInfo.recordData[i].price = 0
+                this.recordInfo.recordData[i].price = val.retail_price
              }
-             if(this.recordInfo.recordData[i].min_unit == val.min_unit){
+             if(this.recordInfo.recordData[i].max_unit == val.min_unit){
                this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].min_price
              }
           }
@@ -771,6 +772,7 @@ export default {
             }
           }
         }
+        console.log('23323223333233232',this.recordInfo.recordData)
       },
       changeBatchNumber(val){
        
@@ -817,6 +819,7 @@ export default {
     tempObj["warehouse_info_id"] = 0
     tempObj["count"] = ""
     tempObj["admin_user_id"] =  this.$store.getters.xt_user.user.user_name
+    tempObj["retail_price"] = 0;
     this.recordInfo.recordData.push(tempObj);
     this.GetConfigInfo();
     this.propForm.goodUnit = this.$store.getters.good_unit;

src/xt_pages/stock/stockOutOrder.vue

@@ -82,6 +82,16 @@
         <el-button size="small" icon="el-icon-delete" @click="batchDelete">删除</el-button>
         <el-button size="small" type="primary" @click="toPrint">打印</el-button>
         <el-button size="small" type="primary" @click="toExport">导出</el-button>
+        <span>&nbsp;&nbsp;</span>
+        <label class="title"><span class="name">出库方式</span> :</label>
+        <el-select size="small" v-model="way_type" filterable placeholder="请选择仓库" style="width:200px" @change="changeWay">
+            <el-option
+              v-for="(option, index) in wayList"
+              :key="index"
+              :label="option.name"
+              :value="option.id">
+            </el-option>
+        </el-select> 
       </div>
 
       <el-table
@@ -820,6 +830,13 @@ export default {
       houselist:[],
       storehouse_id:0,
       is_sys:0,
+      way_type:0,
+      wayList:[
+        { id:0,name:"全部"},
+        { id:1,name:"手动出库"},
+        { id:2,name:"自动出库"},
+        { id:3,name:"调拨出库"}
+      ]
     };
   },
   methods: {
@@ -832,6 +849,7 @@ export default {
         type: this.type,
         keywords: this.searchKey,
         storehouse_id:this.storehouse_id,
+        way_type:this.way_type,
       };
       this.warehouseOutDate = [];
       getWarehouseOutList(Params).then(response => {
@@ -860,6 +878,7 @@ export default {
         end_time: this.end_time,
         type: this.type,
         storehouse_id:this.storehouse_id,
+        way_type:this.way_type,
       };
       this.warehouseOutDate = [];
       getWarehouseOutList(Params).then(response => {
@@ -1678,9 +1697,7 @@ export default {
              this.exportList[i].good_type_id = ""
           }
         }
-        console.log("hhhh323223",this.goodType)
        
-      
         const tHeader = ['耗材名称', '耗材类型', '规格&单位','出库数量','出货价','总价','生产厂商','经销商','生产日期','有效期','备注']
         const filterVal = ['good_name', 'good_type_id', 'unit','count','price','total_price','manufacturer','dealer','product_date','expiry_date','remark']
         console.log("table",this.exportList)
@@ -1741,6 +1758,9 @@ export default {
    },
    changeStoreHouse(){
      this.GetWarehouseOut()
+   },
+   changeWay(){
+     this.GetWarehouseOut()
    }
   }
 };