新分支

src/xt_pages/stock/detail/stockOutDetail.vue

       size="small"
       @click="exportListDetail"
       type="primary"
+      v-if="orgId !=10480 && orgId!=0"
       >明细导出
+     
+    </el-button>
+    <el-button
+      style="float: right;margin-right:10px"
+      size="small"
+      @click="exportListDetailOne"
+      type="primary"
+      v-if="orgId ==10480 || orgId == 0"
+      >明细导出
+     
     </el-button>
      <el-button
       style="float: right;margin-right:10px"
     this.fetchAllAdminUsers();
     this.goodUnit = this.$store.getters.good_unit
     var org_id = this.$store.getters.xt_user.org.id
+   
     this.orgId = org_id
 
 
         return uParseTime(val, "{y}-{m}-{d}");
       }
     },
+    getTimeOne: function(val) {
+      if (val == 0) {
+        return "";
+      } else {
+        return uParseTime(val, "{y}-{m}-{d} {h}:{i}");
+      }
+    },
     PrintAction: function() {
       window.sessionStorage.setItem('start',this.start_time)
       window.sessionStorage.setItem('end',this.end_time)
             total += this.tableDataList[i].count * this.tableDataList[i].price
           }
           this.tableDataList[i].in_price = this.tableDataList[i].WarehousingInfoNight.price
+
+          this.tableDataList[i].expiry_date = this.getTime(this.tableDataList[i].expiry_date)
         }
         obj.total_price = total.toFixed(2)
         console.log("WOHHAHHAHAH",this.tableDataList)
           this.downloadLoading = false
         })
      },
+
+     exportListDetailOne(){
+
+       console.log("hhahah",this.tableDataList)
+       var obj = {index:"合计",out_total_price:0,in_total_price:0}
+       var out_total = 0
+       var in_total =0
+       if(this.tableDataList!=null&&this.tableDataList.length>0){
+           for(let i=0;i<this.tableDataList.length;i++){
+              this.tableDataList[i].index = i+1
+              this.tableDataList[i].good_type_name = this.typeName(this.tableDataList[i].good_type_id)
+              this.tableDataList[i].good_name = this.typeNameOne(this.tableDataList[i].good_id)
+              this.tableDataList[i].specification_name = this.specificationName(this.tableDataList[i].good_id)
+              this.tableDataList[i].batch_number =this.tableDataList[i].WarehousingInfoNight.number
+              this.tableDataList[i].manufacturer_name = this.getManufacturerNameOne(this.tableDataList[i].GoodInfo.manufacturer)
+              this.tableDataList[i].in_price = this.tableDataList[i].WarehousingInfoNight.price
+              this.tableDataList[i].out_count = this.tableDataList[i].count
+              this.tableDataList[i].max_unit = this.tableDataList[i].GoodInfo.max_unit
+              this.tableDataList[i].out_total_price = (this.tableDataList[i].count * this.tableDataList[i].price).toFixed(2)
+              this.tableDataList[i].in_total_price = (this.tableDataList[i].count * this.tableDataList[i].WarehousingInfoNight.price).toFixed(2)
+              this.tableDataList[i].patient_name =  this.getPatientName(this.tableDataList[i].patient_id)
+              this.tableDataList[i].ctimeOne = this.getTime(this.tableDataList[i].ctime)
+              this.tableDataList[i].ctimeTwo = this.getTimeOne(this.tableDataList[i].ctime)
+              this.tableDataList[i].expiry_date = this.getTime(this.tableDataList[i].expiry_date)
+              this.tableDataList[i].project_name ="居民报销"
+            
+              out_total += this.tableDataList[i].count * this.tableDataList[i].price
+              in_total += this.tableDataList[i].count *this.tableDataList[i].WarehousingInfoNight.price
+
+           }
+       }
+       obj.out_total_price = out_total.toFixed(2)
+       obj.in_total_price = in_total.toFixed(2)
+       this.tableDataList.push(obj)
+
+      import('@/vendor/Export2Excel').then(excel => {
+       const tHeader = ['序号','耗材名称', '耗材规格', '批号','生成厂家','耗材类型','报销方式','入库单价','出库单价','出库数量','实际出库数量','单位','出库金额','实际出库金额','实际成本','出库对象','有效日期','出库日期','操作时间','出库单号','备注']
+       const filterVal = ['index','good_name', 'specification_name', 'batch_number','manufacturer_name','good_type_name','project_name','in_price','price','out_count','out_count','max_unit','out_total_price','out_total_price','in_total_price','patient_name','expiry_date','ctimeOne','ctimeTwo','warehouse_out_order_number','remark']
+
+       const data = this.formatJson(filterVal, this.tableDataList)
+
+
+        excel.export_json_to_excel({
+           header: tHeader,
+           data,
+           filename: '耗材出库明细'
+         })
+          this.downloadLoading = false
+        })
+
+     },
      formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]));
      },

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

       >打印
     </el-button>
      <el-button
-      v-if="org_id != 10265"
+      v-if="org_id != 10265 && org_id!=0&&org_id!=10480"
       style="float: right;margin-right:10px"
       size="small"
       @click="exportListDetai"
       @click="exportListDetaiOne"
       type="primary"
       >明细导出
+    </el-button>
+    <el-button
+      v-if="org_id == 10480 || org_id == 0"
+      style="float: right;margin-right:10px"
+      size="small"
+      @click="exportListDetaiTwo"
+      type="primary"
+      >明细导出
     </el-button>
      <el-button
       style="float: right;margin-right:10px"
         return uParseTime(val, "{y}-{m}-{d}");
       }
     },
+    getTimeOne: function(val) {
+      if (val == 0) {
+        return "";
+      } else {
+        return uParseTime(val, "{y}-{m}-{d} {h}:{i}");
+      }
+    },
     PrintAction: function() {
       //  window.sessionStorage.setItem('start_out_time',this.start_time)
       //  window.sessionStorage.setItem('end_out_time',this.end_time)
 
           }
            console.log("toal_p3232332332233232",total_price)
-           order.push({
-            warehouse_out_order_number: "合计",
-            is_total: 1,
-            specification_name:"",
-            ctime:"",
-            total_price:total_price,
-          });
-
+           if(this.org_id!=0&&this.org_id!=10480){
+              order.push({
+              warehouse_out_order_number: "合计",
+              is_total: 1,
+              specification_name:"",
+              ctime:"",
+              total_price:total_price,
+            });
+           }
+          
           for(let i=0;i<order.length;i++){
             order[i].total_price = order[i].total_price.toFixed(2)
           }
        const data = this.formatJson(filterVal, this.tableData)
 
 
+       excel.export_json_to_excel({
+           header: tHeader,
+           data,
+           filename: '药品出库明细'
+         })
+          this.downloadLoading = false
+      })
+    },
+
+    exportListDetaiTwo(){
+      var obj = {index:"合计",out_total_price:0,in_total_price:0}
+       var out_total = 0
+       var in_total =0
+      console.log("tatbledateawowowo",this.tableData)
+ 
+      for(let i=0;i<this.tableData.length;i++){
+         if(this.tableData[i].is_total == 0){
+            this.tableData[i].index = i+1
+            if(this.tableData[i].drug_type == 1){
+              this.tableData[i].drugtype = "西药"
+            }
+            if(this.tableData[i].drug_type == 2){
+              this.tableData[i].drugtype = "草药"
+            }
+            if(this.tableData[i].drug_type == 3){
+              this.tableData[i].drugtype = "成药"
+            }
+            this.tableData[i].specification_name = this.tableData[i].dose + this.tableData[i].dose_unit +"*" + this.tableData[i].min_number + this.tableData[i].min_unit +  "/" + this.tableData[i].max_unit
+            this.tableData[i].time = this.getTime(this.tableData[i].ctime)
+            this.tableData[i].user_name = this.getAdminUser(this.tableData[i].creater)
+            this.tableData[i].manufacturer_name = this.getManufacturerName(this.tableData[i].manufacturer)
+            this.tableData[i].out_count = this.tableData[i].count
+            this.tableData[i].in_retail_price = (this.tableData[i].in_price/this.tableData[i].min_number).toFixed(2)
+            this.tableData[i].total = (this.tableData[i].count * this.tableData[i].price)
+            this.tableData[i].patient_name = this.getPatientName(this.tableData[i].patient_id) 
+            if(this.tableData[i].count_unit == this.tableData[i].min_unit && this.tableData[i].max_unit!=this.tableData[i].min_unit){
+                this.tableData[i].out_total_price = (this.tableData[i].count * this.tableData[i].price)
+                this.tableData[i].in_total_price =  this.tableData[i].in_retail_price * this.tableData[i].count
+            }
+            if(this.tableData[i].count_unit == this.tableData[i].max_unit && this.tableData[i].max_unit !=this.tableData[i].min_unit){
+              this.tableData[i].out_total_price = (this.tableData[i].count * this.tableData[i].price)*this.tableData[i].min_number
+              this.tableData[i].in_total_price =  this.tableData[i].min_number * (this.tableData[i].count * this.tableData[i].in_retail_price)
+            }
+            if(this.tableData[i].count_unit == this.tableData[i].max_unit && this.tableData[i].max_unit ==this.tableData[i].min_unit){
+              this.tableData[i].out_total_price = (this.tableData[i].count * this.tableData[i].price)*this.tableData[i].min_number
+
+              this.tableData[i].in_total_price =  this.tableData[i].min_number * (this.tableData[i].count * this.tableData[i].in_retail_price)
+            }
+
+            this.tableData[i].project_name = "居民医保"
+
+            this.tableData[i].expiry_date = this.getTime(this.tableData[i].expiry_date)
+
+            
+            this.tableData[i].ctimeOne = this.getTime(this.tableData[i].ctime)
+
+            this.tableData[i].ctimeTwo = this.getTimeOne(this.tableData[i].ctime)
+            
+            out_total += this.tableData[i].out_total_price 
+            in_total += this.tableData[i].in_total_price
+         }
+       }
+       obj.out_total_price = out_total.toFixed(2)
+       obj.in_total_price = in_total.toFixed(2)
+       this.tableData.push(obj)
+
+      import('@/vendor/Export2Excel').then(excel => {
+        const tHeader = ['序号','药品名称', '药品规格', '批号','生成厂家','药品类型','报销方式','入库单价','出库单价','出库数量','实际出库数量','单位','出库金额','实际出库金额','实际成本','出库对象','有效日期','出库日期','操作时间','出库单号','备注']
+        const filterVal = ['index','drug_name', 'specification_name', 'batch_number','manufacturer_name','drug_type','project_name','in_price','price','out_count','out_count','max_unit','out_total_price','out_total_price','in_total_price','patient_name','expiry_date','ctimeOne','ctimeTwo','warehouse_out_order_number','remark']
+
+       console.log("hwhhwhwhwhwhw",this.tableData)
+        
+      
+      
+       const data = this.formatJson(filterVal, this.tableData)
+
+
        excel.export_json_to_excel({
            header: tHeader,
            data,